Updated raid5_degrade patch (bug #187944, thanks to Daniel Marmander), added hb and hb2 USE flags (bug #177516, thanks to Peter Fern), added init.d-script needed for baselayout-2).

Package-Manager: portage-2.1.3.3

7 files changed, 116 insertions, 31 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index a666a25fb80d..63125f307634 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,15 @@
 # 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.67 2007/07/15 20:23:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.68 2007/08/30 22:01:52 dev-zero Exp $
+
+*evms-2.5.5-r7 (30 Aug 2007)
+
+  30 Aug 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/2.5.5/raid5_degrade_fix_v2.patch, +files/evms.initd,
+  -files/evms2-start.sh, -evms-2.5.5-r6.ebuild, +evms-2.5.5-r7.ebuild:
+  Updated raid5_degrade patch (bug #187944, thanks to Daniel Marmander), added
+  hb and hb2 USE flags (bug #177516, thanks to Peter Fern), added
+  init.d-script needed for baselayout-2).
 
 *evms-2.5.5-r6 (15 Jul 2007)
 
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index e70828bd4ab0..59d51fb04f44 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -34,6 +34,10 @@ AUX 2.5.5/raid5_degrade_fix.patch 1533 RMD160 0cfc05d686faf41abc5f9363c3a59833ce
 MD5 06dd078a53af7de2b7d8b287fd91b874 files/2.5.5/raid5_degrade_fix.patch 1533
 RMD160 0cfc05d686faf41abc5f9363c3a59833ce04811a files/2.5.5/raid5_degrade_fix.patch 1533
 SHA256 8c2eb03ec4d18150349ca91344e5d63e9a807e3033760baae69f5110e36c2a2c files/2.5.5/raid5_degrade_fix.patch 1533
+AUX 2.5.5/raid5_degrade_fix_v2.patch 1672 RMD160 13da04afcf3416c8899080542a8b0543a603cd83 SHA1 baecc5d8e55c082ffe5dc82c3f55dd407985aab0 SHA256 d401d5005c1f27b9f698205ff3f1165c9eb0136170d377e1fc0b60a6d13802fa
+MD5 ec9a4d05d6d67b3f1953fb63ebb2a41e files/2.5.5/raid5_degrade_fix_v2.patch 1672
+RMD160 13da04afcf3416c8899080542a8b0543a603cd83 files/2.5.5/raid5_degrade_fix_v2.patch 1672
+SHA256 d401d5005c1f27b9f698205ff3f1165c9eb0136170d377e1fc0b60a6d13802fa files/2.5.5/raid5_degrade_fix_v2.patch 1672
 AUX 2.5.5/raid5_remove_spare_fix.patch 1055 RMD160 29479755e318978554d5fa769580a48491eb2ebe SHA1 35dcf840504a74496a44cae6defa8f0611e39d54 SHA256 6640d497cd00287d0bd8d013d646106df600a9c13250a4f8f8b1fada3fe919f7
 MD5 b38bf2b91d8787ddcf8742fc67a51772 files/2.5.5/raid5_remove_spare_fix.patch 1055
 RMD160 29479755e318978554d5fa769580a48491eb2ebe files/2.5.5/raid5_remove_spare_fix.patch 1055
@@ -62,23 +66,23 @@ AUX evms-2.5.5-use_disk_group.patch 1225 RMD160 7c69acdb48758c465429c56e4954214b
 MD5 baad56a65d2426219e2cfba9daf1dae7 files/evms-2.5.5-use_disk_group.patch 1225
 RMD160 7c69acdb48758c465429c56e4954214bbb0fed4e files/evms-2.5.5-use_disk_group.patch 1225
 SHA256 6ebd11a08a018a364f1155e9e961e421ecf8c96643b0253106fffe9ebf677184 files/evms-2.5.5-use_disk_group.patch 1225
-AUX evms2-start.sh 382 RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a SHA1 0d84590bd35b9ef91d74eb55456f0b8e56079ed1 SHA256 ea36fbde78590067029405ab18b09106b083913688ea4863c2e63eece8e74021
-MD5 5eb632aa94b0537e1983f935e3706d74 files/evms2-start.sh 382
-RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a files/evms2-start.sh 382
-SHA256 ea36fbde78590067029405ab18b09106b083913688ea4863c2e63eece8e74021 files/evms2-start.sh 382
+AUX evms.initd 665 RMD160 b174a09ac012b9da4de84ca0fafb02dba1960cc7 SHA1 af70be657842965b4cfcd92cdd7d2beb29a8555b SHA256 468c9676746c884289918878b36f372172f5bf175bd525b908e4d2a1d4ef646b
+MD5 e3e5e5bcbf276fc87c021bdb197dc904 files/evms.initd 665
+RMD160 b174a09ac012b9da4de84ca0fafb02dba1960cc7 files/evms.initd 665
+SHA256 468c9676746c884289918878b36f372172f5bf175bd525b908e4d2a1d4ef646b files/evms.initd 665
 DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
 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
 SHA256 4a96bd738031df807ea56a3b4e8e63c13998e8cd64262233151ea894488b9a82 evms-2.5.5-r5.ebuild 4892
-EBUILD evms-2.5.5-r6.ebuild 4941 RMD160 e1c9bd25e54ec114db3ac213ecbd566649d56467 SHA1 0c5b4f658dd273dcff3257ba888ac1ac36573e36 SHA256 8f6e24b566a4edd428ebc83954a8ccfdcb6932f83853e16c764fa239d31c1587
-MD5 025b8aed751408494bfba5825af7020f evms-2.5.5-r6.ebuild 4941
-RMD160 e1c9bd25e54ec114db3ac213ecbd566649d56467 evms-2.5.5-r6.ebuild 4941
-SHA256 8f6e24b566a4edd428ebc83954a8ccfdcb6932f83853e16c764fa239d31c1587 evms-2.5.5-r6.ebuild 4941
-MISC ChangeLog 14091 RMD160 3d7178a00bea425a21ba187c56844b95ce22dee2 SHA1 e98cf896cd70f23e982c2eda76b3ee42f4924bdd SHA256 2777aaeca76d35278806616fa1b6fa065ca1896010f114cbcee20f0875c75bfa
-MD5 3ebe42f0fb134a6426cfe82e9bfdab74 ChangeLog 14091
-RMD160 3d7178a00bea425a21ba187c56844b95ce22dee2 ChangeLog 14091
-SHA256 2777aaeca76d35278806616fa1b6fa065ca1896010f114cbcee20f0875c75bfa ChangeLog 14091
+EBUILD evms-2.5.5-r7.ebuild 5422 RMD160 20bf6b941fc54bbf731f0083c8912fd48182f9c0 SHA1 334e8a1cc6961b24356dc405b142898ff0de8012 SHA256 beb06bba6114a9880ce4f36ab4e4443335c30e1ca1af6c494e6d24b51a63874e
+MD5 6385b6852f66cab6ca0d36500de4d224 evms-2.5.5-r7.ebuild 5422
+RMD160 20bf6b941fc54bbf731f0083c8912fd48182f9c0 evms-2.5.5-r7.ebuild 5422
+SHA256 beb06bba6114a9880ce4f36ab4e4443335c30e1ca1af6c494e6d24b51a63874e evms-2.5.5-r7.ebuild 5422
+MISC ChangeLog 14495 RMD160 ec9c9f2b99344348bebbbb6b04d85d8ad68616ca SHA1 8a67af49b519bde8aa7631f24518cd0a56d21e78 SHA256 f770383eb885cfa98e528d37ce41680af5cdecb116eedd40ff877faa0aed87a4
+MD5 cc5491d42c71b234c3bc3d1d77975cf3 ChangeLog 14495
+RMD160 ec9c9f2b99344348bebbbb6b04d85d8ad68616ca ChangeLog 14495
+SHA256 f770383eb885cfa98e528d37ce41680af5cdecb116eedd40ff877faa0aed87a4 ChangeLog 14495
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
@@ -86,6 +90,6 @@ SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b metadata
 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
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r6 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r6 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r6 235
+MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r7 235
+RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r7 235
+SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r7 235
diff --git a/sys-fs/evms/evms-2.5.5-r6.ebuild b/sys-fs/evms/evms-2.5.5-r7.ebuild
index efe5fa706bd6..70b6ddec5344 100644
--- a/sys-fs/evms/evms-2.5.5-r6.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-r6.ebuild,v 1.1 2007/07/15 20:23:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r7.ebuild,v 1.1 2007/08/30 22:01:52 dev-zero Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gtk ncurses nls"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gtk hb hb2 ncurses nls"
 
 #EVMS uses libuuid from e2fsprogs
 RDEPEND="virtual/libc
@@ -23,17 +23,26 @@ RDEPEND="virtual/libc
 	>=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}"
 
+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
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PV}/md_super_fix.patch"
 	epatch "${FILESDIR}/${PV}/ntfs_unmkfs.patch"
-	epatch "${FILESDIR}/${PV}/raid5_degrade_fix.patch"
+	epatch "${FILESDIR}/${PV}/raid5_degrade_fix_v2.patch"
 	epatch "${FILESDIR}/${PV}/raid5_remove_spare_fix.patch"
 	epatch "${FILESDIR}/${PV}/raid5_remove_spare_fix_2.patch"
 	epatch "${FILESDIR}/${PV}/raid5_algorithm.patch"
@@ -62,6 +71,10 @@ src_compile() {
 	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) \
@@ -70,6 +83,7 @@ src_compile() {
 		--with-static-glib \
 		$(use_with debug) \
 		$(use_enable nls) \
+		${myconf} \
 		${excluded_interfaces} || die "Failed configure"
 	emake || die "Failed emake"
 }
@@ -112,6 +126,8 @@ src_install() {
 
 	# Needed for bug #51252
 	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
+
+	newinitd "${FILESDIR}/evms.initd"
 }
 
 src_test() {
diff --git a/sys-fs/evms/files/2.5.5/raid5_degrade_fix_v2.patch b/sys-fs/evms/files/2.5.5/raid5_degrade_fix_v2.patch
new file mode 100644
index 000000000000..c49df204587e
--- /dev/null
+++ b/sys-fs/evms/files/2.5.5/raid5_degrade_fix_v2.patch
@@ -0,0 +1,41 @@
+--- evms-2.5.5a/plugins/md/raid5_mgr.c	2006-02-22 10:05:17.000000000 -0600
++++ evms-2.5.5b/plugins/md/raid5_mgr.c	2006-05-05 12:48:46.492961984 -0500
+@@ -102,6 +102,7 @@
+ 	md_super_info_t info;
+ 	mdu_disk_info_t d;
+ 	int i, count, length = 0;
++	int conf_disks;
+ 	int rc = 0;
+ 
+ 	LOG_ENTRY();
+@@ -117,9 +118,27 @@
+ 	conf->failed_disk_index = -1;
+ 
+ 	LOG_DEBUG("%s: info.raid_disks: %d, info.nr_disks: %d.\n", vol->name, info.raid_disks, info.nr_disks);
+-	conf->stripe.nr_disks = (info.raid_disks > info.nr_disks) ? info.raid_disks : info.nr_disks;
+-	conf->disks = EngFncs->engine_alloc(sizeof(disk_info_t) * conf->stripe.nr_disks);
+-	conf->stripe.chunks = EngFncs->engine_alloc(sizeof(chunk_t) * conf->stripe.nr_disks);
++	conf_disks = (info.raid_disks > info.nr_disks) ? info.raid_disks : info.nr_disks;
++	
++	/* 
++	 * If a spare is added to fix a degrade array and recovery is running,
++	 * its index could be greater than nr_disks.
++	 * We should take this into account when allocating memory for disks.
++	 *
++	 * Check disk index of each member and adjust conf_disks if necessary.
++	 */
++	LIST_FOR_EACH(vol->members, iter, member) {
++		if (member->dev_number >= conf_disks) {
++			LOG_WARNING("%s: Changing number of disk entries:"
++			            " current value %d, new value %d.\n",
++			            vol->name, conf_disks, member->dev_number+1);
++			conf_disks = member->dev_number + 1;
++		}
++	}
++	
++	conf->disks = EngFncs->engine_alloc(sizeof(disk_info_t) * conf_disks);
++	conf->stripe.nr_disks = conf_disks;
++	conf->stripe.chunks = EngFncs->engine_alloc(sizeof(chunk_t) * conf_disks);
+ 
+ 	/* Set the volume to which the stripe belongs. */
+ 	conf->stripe.volume = vol;
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r6 b/sys-fs/evms/files/digest-evms-2.5.5-r7
index 33b12c6760ce..33b12c6760ce 100644
--- a/sys-fs/evms/files/digest-evms-2.5.5-r6
+++ b/sys-fs/evms/files/digest-evms-2.5.5-r7
diff --git a/sys-fs/evms/files/evms.initd b/sys-fs/evms/files/evms.initd
new file mode 100755
index 000000000000..c416fed0d145
--- /dev/null
+++ b/sys-fs/evms/files/evms.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/files/evms.initd,v 1.1 2007/08/30 22:01:52 dev-zero Exp $
+
+depend() {
+	if [[ -e /lib/librc.so ]]; then
+		# on baselayout-1 this causes
+		# a dependency loop with checkroot (before *)
+		before checkroot
+	fi
+}
+
+start() {
+	if [[ ! -e /lib/librc.so ]]; then
+		eerror "The ${SVCNAME} init script is written for baselayout-2"
+		eerror "Please do not use it with baselayout-1"
+		return 1
+	fi
+	if [[ -z ${CDBOOT} ]] ; then
+		ebegin "Activating EVMS"
+		evms_activate
+		retval=$?
+		eend ${retval}
+	fi
+}
diff --git a/sys-fs/evms/files/evms2-start.sh b/sys-fs/evms/files/evms2-start.sh
deleted file mode 100644
index 022e57fafdf2..000000000000
--- a/sys-fs/evms/files/evms2-start.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# /lib/rcscripts/addons/evms-start.sh:  Setup evms volumes at boot
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/files/evms2-start.sh,v 1.1 2005/05/27 03:07:46 vapier Exp $
-
-if [[ -z ${CDBOOT} ]] ; then
-	ebegin "Activating EVMS"
-	evms_activate
-	retval=$?
-	eend ${retval}
-fi