Added fix for snapshots on kernel >=2.6.19 (bug #192036). Fixed tests and disabled them.

Package-Manager: portage-2.1.4_rc4

5 files changed, 242 insertions, 5 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 7bf1aa1724b6..7a711ff899f0 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.77 2007/10/22 14:33:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.78 2007/12/03 20:13:28 dev-zero Exp $
+
+*evms-2.5.5-r10 (03 Dec 2007)
+
+  03 Dec 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/evms-2.5.5-snapshot.patch, +evms-2.5.5-r10.ebuild:
+  Added fix for snapshots on kernel >=2.6.19 (bug #192036). Fixed tests and
+  disabled them.
 
   22 Oct 2007; Raúl Porcel <armin76@gentoo.org> evms-2.5.5-r9.ebuild:
   Re-add ~ia64 wrt #190828
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 120da11bd7ec..3d106cef8508 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -62,6 +62,10 @@ AUX evms-2.5.5-pagesize.patch 2288 RMD160 6db07f143f2e82a318b04121dbf7dedbbd7154
 MD5 43b7b8e3a11ada886a92f0c8f9d18ce4 files/evms-2.5.5-pagesize.patch 2288
 RMD160 6db07f143f2e82a318b04121dbf7dedbbd715423 files/evms-2.5.5-pagesize.patch 2288
 SHA256 66b992dbf22969b48c8854269f83f91e935096f418f28b6876e512fe7c446ca2 files/evms-2.5.5-pagesize.patch 2288
+AUX evms-2.5.5-snapshot.patch 1169 RMD160 31b240ecda48ced74933ed2df96b0af5ce6c5e7e SHA1 5b27363dd4b4ad004e8afe41670824ab39728ef1 SHA256 a116d8790628920621ec879733625f31aced70b22f79c5f76afbbd084a0e7edf
+MD5 205d3217e75b5e76b94502a17dd1774e files/evms-2.5.5-snapshot.patch 1169
+RMD160 31b240ecda48ced74933ed2df96b0af5ce6c5e7e files/evms-2.5.5-snapshot.patch 1169
+SHA256 a116d8790628920621ec879733625f31aced70b22f79c5f76afbbd084a0e7edf files/evms-2.5.5-snapshot.patch 1169
 AUX evms-2.5.5-use_disk_group.patch 1225 RMD160 7c69acdb48758c465429c56e4954214bbb0fed4e SHA1 2c05af9ac5108dc3aefe58257d3f3101f3039d64 SHA256 6ebd11a08a018a364f1155e9e961e421ecf8c96643b0253106fffe9ebf677184
 MD5 baad56a65d2426219e2cfba9daf1dae7 files/evms-2.5.5-use_disk_group.patch 1225
 RMD160 7c69acdb48758c465429c56e4954214bbb0fed4e files/evms-2.5.5-use_disk_group.patch 1225
@@ -83,6 +87,10 @@ MD5 be9a8d57ec7c718e34a5841012d91d62 files/evms2-start.sh 384
 RMD160 ab9713e9ad046c22b069229f1b99c338c1f01f21 files/evms2-start.sh 384
 SHA256 993d7ca52936780698f46bc9fc148c326db545986baee4b0f9786264d905cb5a files/evms2-start.sh 384
 DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
+EBUILD evms-2.5.5-r10.ebuild 5891 RMD160 a14b13fa97228efcaf7392825fa290a3b8336902 SHA1 e5f04fc8db8bd34949d4a398c96ffc2c89b6ca25 SHA256 cc57d4b43e758c91121b4ad8e08cb73ffeaa2ae06fe5efa2f981693c28afc0cc
+MD5 8da54c34497f2c6e32f5cd50147c2cc2 evms-2.5.5-r10.ebuild 5891
+RMD160 a14b13fa97228efcaf7392825fa290a3b8336902 evms-2.5.5-r10.ebuild 5891
+SHA256 cc57d4b43e758c91121b4ad8e08cb73ffeaa2ae06fe5efa2f981693c28afc0cc evms-2.5.5-r10.ebuild 5891
 EBUILD evms-2.5.5-r5.ebuild 4892 RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 SHA1 cd0fb789199199050b320debcb53f2cbc4f693b9 SHA256 4a96bd738031df807ea56a3b4e8e63c13998e8cd64262233151ea894488b9a82
 MD5 a0b777cc181e4b21c770511f5ac4ce04 evms-2.5.5-r5.ebuild 4892
 RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 evms-2.5.5-r5.ebuild 4892
@@ -99,14 +107,17 @@ EBUILD evms-2.5.5-r9.ebuild 5523 RMD160 f194583819705d65e57d76d6b371268bd88e8cea
 MD5 82acaa756d56693b0853b0a68835b451 evms-2.5.5-r9.ebuild 5523
 RMD160 f194583819705d65e57d76d6b371268bd88e8cea evms-2.5.5-r9.ebuild 5523
 SHA256 1853dc06d667577ab269c337e01e45099980051d4debe6b88c70c2fca9bbcac7 evms-2.5.5-r9.ebuild 5523
-MISC ChangeLog 15876 RMD160 a68375503ca1eaac32e269236572da9075e4ecdd SHA1 16999a705c891250cd4d00fcae37cbd1bab6d7ea SHA256 cc929d39e04c5cbb43d56ba84eec5e2355308067c0269622721187dc0bdc030b
-MD5 033fb499e816c0dc32770476afaab7e8 ChangeLog 15876
-RMD160 a68375503ca1eaac32e269236572da9075e4ecdd ChangeLog 15876
-SHA256 cc929d39e04c5cbb43d56ba84eec5e2355308067c0269622721187dc0bdc030b ChangeLog 15876
+MISC ChangeLog 16115 RMD160 32735f0105873d7673f8668dcb46e6fa9e4162c7 SHA1 8cda12d44fa84d85fb07d565237b5f93078c0adf SHA256 d39efe54521a6e377a4a00783e3444f7e68a7c8e3964e1155c9b00ad1f66316d
+MD5 ab59196c6148a243c96aadb6b65fa4c1 ChangeLog 16115
+RMD160 32735f0105873d7673f8668dcb46e6fa9e4162c7 ChangeLog 16115
+SHA256 d39efe54521a6e377a4a00783e3444f7e68a7c8e3964e1155c9b00ad1f66316d ChangeLog 16115
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b metadata.xml 383
+MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r10 235
+RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r10 235
+SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r10 235
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r5 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r5 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r5 235
diff --git a/sys-fs/evms/evms-2.5.5-r10.ebuild b/sys-fs/evms/evms-2.5.5-r10.ebuild
new file mode 100644
index 000000000000..e45d18ffeafe
--- /dev/null
+++ b/sys-fs/evms/evms-2.5.5-r10.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r10.ebuild,v 1.1 2007/12/03 20:13:28 dev-zero Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils flag-o-matic multilib toolchain-funcs autotools linux-info
+
+DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
+HOMEPAGE="http://www.sourceforge.net/projects/evms"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gtk hb hb2 ncurses nls"
+
+#EVMS uses libuuid from e2fsprogs
+RDEPEND="virtual/libc
+	sys-fs/e2fsprogs
+	sys-fs/device-mapper
+	>=sys-apps/baselayout-1.9.4-r6
+	gtk? ( =x11-libs/gtk+-1*
+		=dev-libs/glib-1* )
+	hb? ( !hb2? ( =sys-cluster/heartbeat-1* ) )
+	hb2? ( >=sys-cluster/heartbeat-2 )
+	ncurses? ( sys-libs/ncurses
+		>=dev-libs/glib-2.12.4-r1 )"
+DEPEND="${RDEPEND}"
+
+# While the test-concept holds, many of them fail due to unknown reasons.
+# Since upstream is almost dead, we have to ignore that for now.
+RESTRICT="test"
+
+pkg_setup() {
+	if use hb && use hb2 ; then
+		ewarn "It's not possible to have support for heartbeat version 1 and 2 at the same time."
+		ewarn "Assuming  that you want heartbeat-2, if not, please do not enable the hb2 use flag."
+	fi
+
+	get_running_version
+	if [ ${KV_PATCH} -lt 19 ] || [ ${KV_MINOR} -eq 4 ] ; then
+		ewarn "This revision of EVMS may not work correctly with kernels prior to 2.6.19 when"
+		ewarn "using snapshots due to API changes. Please update your kernel or use EVMS 2.5.5-r9."
+		ebeep 5
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch \
+		"${FILESDIR}/${PV}/md_super_fix.patch" \
+		"${FILESDIR}/${PV}/ntfs_unmkfs.patch" \
+		"${FILESDIR}/${PV}/raid5_degrade_fix_v2.patch" \
+		"${FILESDIR}/${PV}/raid5_remove_spare_fix.patch" \
+		"${FILESDIR}/${PV}/raid5_remove_spare_fix_2.patch" \
+		"${FILESDIR}/${PV}/raid5_algorithm.patch" \
+		"${FILESDIR}/${PV}/cli_reload_options.patch" \
+		"${FILESDIR}/${PV}/cli_query_segfault.patch" \
+		"${FILESDIR}/${PV}/get_geometry.patch" \
+		"${FILESDIR}/${PV}/BaseName.patch" \
+		"${FILESDIR}/${PV}/disk_cache.patch"
+
+	epatch \
+		"${FILESDIR}/${P}-as-needed.patch" \
+		"${FILESDIR}/${P}-glib_dep.patch" \
+		"${FILESDIR}/${P}-ocfs2.patch" \
+		"${FILESDIR}/${P}-use_disk_group.patch" \
+		"${FILESDIR}/${P}-pagesize.patch" \
+		"${FILESDIR}/${P}-snapshot.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	# Bug #54856
+	# filter-flags "-fstack-protector"
+	replace-flags -O3 -O2
+	replace-flags -Os -O2
+
+	local excluded_interfaces=""
+	use ncurses || excluded_interfaces="--disable-text-mode"
+	use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
+
+	# hb2 should override hb
+	local myconf="$(use_enable hb ha) --disable-hb2"
+	use hb2 && myconf="--disable-ha --enable-hb2"
+
+	# We have to link statically against glib because evmsn resides in /sbin
+	econf \
+		--libdir=/$(get_libdir) \
+		--sbindir=/sbin \
+		--includedir=/usr/include \
+		--with-static-glib \
+		$(use_with debug) \
+		$(use_enable nls) \
+		${myconf} \
+		${excluded_interfaces} || die "Failed configure"
+	emake || die "Failed emake"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Make install died"
+	dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
+
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}/evms2-start.sh" evms-start.sh || die "rcscript addon failed"
+
+	# install the sample configuration into the doc dir
+	dodoc "${D}/etc/evms.conf.sample"
+	rm -f "${D}/etc/evms.conf.sample"
+
+	# the kernel patches may come handy for people compiling their own kernel
+	docinto kernel/2.4
+	dodoc kernel/2.4/*
+	docinto kernel/2.6
+	dodoc kernel/2.6/*
+
+	# move static libraries to /usr/lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a "${D}/usr/$(get_libdir)"
+
+	# Create linker scripts for dynamic libs in /lib, else gcc
+	# links to the static ones in /usr/lib first.  Bug #4411.
+	for x in "${D}/usr/$(get_libdir)"/*.a ; do
+		if [ -f ${x} ] ; then
+			local lib="${x##*/}"
+			gen_usr_ldscript ${lib/\.a/\.so}
+		fi
+	done
+
+	# the gtk+ frontend should live in /usr/sbin
+	if use gtk ; then
+		dodir /usr/sbin
+		mv -f "${D}"/sbin/evmsgui "${D}"/usr/sbin
+	fi
+
+	# Needed for bug #51252
+	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
+
+	newinitd "${FILESDIR}"/evms.initd-2.5.5-r9 evms || die
+	newconfd "${FILESDIR}"/evms.conf-2.5.5-r9 evms || die
+}
+
+src_test() {
+	if [[ -z ${EVMS_TEST_VOLUME} ]] ; then
+		eerror "This is a volume manager and it therefore needs a volume"
+		eerror "for testing. You have to define EVMS_TEST_VOLUME as"
+		eerror "a volume evms can operate on."
+		eerror "Example: export EVMS_TEST_VOLUME=sda"
+		eerror "Note: The volume-name can not be a symlink."
+		eerror "WARNING: EVMS WILL DESTROY EVERYTHING ON IT."
+		einfo "If you don't have an empty disk, you can use the loopback-device:"
+		einfo "- Create a large file using dd (this creates a 4GB file):"
+		einfo "  dd if=/dev/zero of=/tmp/evms_test_file bs=1M count=4096"
+		einfo "- Activate a loop device on this file:"
+		einfo "  losetup /dev/loop0 /tmp/evms_test_file"
+		einfo "- export EVMS_TEST_VOLUME=loop0"
+		einfo "The disk has to be at least 4GB!"
+		einfo "To deactivate the loop-device afterwards:"
+		einfo "- losetup -d /dev/loop0"
+		hasq userpriv ${FEATURES} && ewarn "These tests have to run as root. Disable userpriv!"
+		die "need test-volume"
+	fi
+
+	if hasq userpriv ${FEATURES} ; then
+		eerror "These tests need root privileges. Disable userpriv!"
+		die "userpriv is not supported"
+	fi
+
+	einfo "Disabling sandbox for:"
+	einfo " - /dev/${EVMS_TEST_VOLUME}"
+	addwrite /dev/${EVMS_TEST_VOLUME}
+	einfo " - /dev/evms"
+	addwrite /dev/evms
+	einfo " - /var/lock/evms-engine"
+	addwrite /var/lock/evms-engine
+
+	cd "${S}/tests/suite"
+	PATH="${S}/ui/cli:${S}/tests:/sbin:${PATH}" ./run_tests ${EVMS_TEST_VOLUME} || die "tests failed"
+}
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r10 b/sys-fs/evms/files/digest-evms-2.5.5-r10
new file mode 100644
index 000000000000..33b12c6760ce
--- /dev/null
+++ b/sys-fs/evms/files/digest-evms-2.5.5-r10
@@ -0,0 +1,3 @@
+MD5 45b463f0cbade194dc0a08be432b572e evms-2.5.5.tar.gz 2286321
+RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 evms-2.5.5.tar.gz 2286321
+SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c evms-2.5.5.tar.gz 2286321
diff --git a/sys-fs/evms/files/evms-2.5.5-snapshot.patch b/sys-fs/evms/files/evms-2.5.5-snapshot.patch
new file mode 100644
index 000000000000..1a27085581c0
--- /dev/null
+++ b/sys-fs/evms/files/evms-2.5.5-snapshot.patch
@@ -0,0 +1,31 @@
+--- evms-2.5.5/engine/dm-targets.c.orig	2005-11-07 15:46:41.000000000 +0000
++++ evms-2.5.5/engine/dm-targets.c	2007-09-08 23:54:23.000000000 +0100
+@@ -921,14 +921,14 @@
+  *
+  * Generate an ASCII constructor string for a snapshot target.
+  * A snapshot string has the form:
+- *   <org_major>:<org_minor> <snap_major>:<snap_minor> <p|n> <chunk_size> <org_parent_major>:<org_parent_minor>
++ *   <org_major>:<org_minor> <snap_major>:<snap_minor> <p|n> <chunk_size>
+  **/
+ static int snapshot_build_params(dm_target_t *target)
+ {
+ 	dm_target_snapshot_t *snapshot = target->data.snapshot;
+ 	char *format = (dm_get_version() == 3) ?
+-			"%x:%x %x:%x %c %u %x:%x" :
+-			"%u:%u %u:%u %c %u %u:%u";
++			"%x:%x %x:%x %c %u" :
++			"%u:%u %u:%u %c %u" ;
+ 	int rc = ENOMEM;
+ 
+ 	LOG_PROC_ENTRY();
+@@ -938,9 +938,7 @@
+ 		snprintf(target->params, 50, format,
+ 			 snapshot->origin.major, snapshot->origin.minor,
+ 			 snapshot->snapshot.major, snapshot->snapshot.minor,
+-			 (snapshot->persistent) ? 'p' : 'n', snapshot->chunk_size,
+-			 snapshot->origin_parent.major,
+-			 snapshot->origin_parent.minor);
++			 (snapshot->persistent) ? 'p' : 'n', snapshot->chunk_size);
+ 		rc = 0;
+ 	}
+