Version bump.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 173 insertions, 5 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 1ea411fd9511..59a6c3e4f2e7 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.142 2011/03/27 03:35:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.143 2011/04/08 00:13:19 vapier Exp $
+
+*mdadm-3.2.1 (08 Apr 2011)
+
+  08 Apr 2011; Mike Frysinger <vapier@gentoo.org> +mdadm-3.2.1.ebuild,
+  +files/mdadm-3.2.1-mdassemble.patch, +files/mdadm-3.2.1-syslog-updates.patch:
+  Version bump.
 
 *mdadm-3.1.5 (27 Mar 2011)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 627cd2ef8584..f8c3d16a78e7 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -6,6 +6,8 @@ AUX mdadm-2.6.4-mdassemble.patch 465 RMD160 4abcfcd75242d552f674a850ea116835a8f5
 AUX mdadm-3.0-dont-make-man.patch 278 RMD160 a0275251626d91dc53b3fadfab6543961f5d7608 SHA1 0c74b7f10fab185442654bb965ac557daa567c17 SHA256 bfc42300913a178c3bcd5f9af4c721893224b2741beddcfba6498d012b1d5679
 AUX mdadm-3.1.4-cflags.patch 842 RMD160 b542ab7cbfdddd578f75dd0b0ad4ef8352b563a9 SHA1 275155e3936bd3be197386e2d6e17c6d475cb851 SHA256 debf37081d731d86a5657f3bbf30feb90d401b9958c6eb014f05d1d155a3b298
 AUX mdadm-3.1.5-cflags.patch 850 RMD160 295d2d0e5ca55f0832ac2e42b3cca62151e3ad25 SHA1 48db7f26bc60506b4942922a997f2891d43c409a SHA256 1ebe42ca18830b2aec578f0d72e3e36275ac0caa351f7acec6a0caa3f9f8126a
+AUX mdadm-3.2.1-mdassemble.patch 487 RMD160 ed00053428541825842f2cbfa62fee2c0942624e SHA1 2d6fe2b6e4f8f0a5b91684c0d0ca6f262a9d19a4 SHA256 505f9fec01fd8a40f773fd6709337b2b29fc30a600cddd3075a647198279592c
+AUX mdadm-3.2.1-syslog-updates.patch 2173 RMD160 f8a52b1a0c1fa024fac161c9e667b3b97c479f15 SHA1 240e1a3de06ebe50ae2ec2bfc9f1a170383fca12 SHA256 c572de251c86dcf9b22bc97327b346c586ff8e133b68e2baffbc8b7b2fdec680
 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79
 AUX mdadm.rc 574 RMD160 69640d0b1fbd11bd7078c0e7791d247420653b73 SHA1 39044e7d6ad63c44669baf9775230670f04b201c SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7
 AUX mdraid.confd 225 RMD160 944896151ffdaf7b172c8d045d3cf9bd9083fabd SHA1 41b2e6441e1bac71657290a6764774fb0d452721 SHA256 1b7918c4bdd024607bcb49d7cea0a77cb70502d2fbb4dbe07024bb5b5699c8e0
@@ -14,14 +16,16 @@ AUX raid-start.sh-3.0 799 RMD160 6495c44ea5be6e18a2b76e0c724f2dbf36073f90 SHA1 2
 AUX raid-stop.sh 645 RMD160 a2855fbdad1222044a9de5b7a9f441592d42960b SHA1 daa2052a3835ca178005a96a3675759a96119203 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
 DIST mdadm-3.1.5.tar.bz2 292709 RMD160 e0542c4556988cae551b3399f0f0d27e42b68bda SHA1 e71859f16e1184df2c033a9e24a6f3f262bbf9a5 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3
+DIST mdadm-3.2.1.tar.bz2 348062 RMD160 a05f6786b13f649899195e3bbb744d1704c0d004 SHA1 4e85f65748c8070a6b4befa1eab0688baaf93127 SHA256 7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125
 EBUILD mdadm-3.1.4.ebuild 2259 RMD160 dd57b9f961df1d63bbfc0941ab92952dee1b9d84 SHA1 7f7ffcd4d95eff9b0de5974bd6f90bdb35543991 SHA256 a5a107a11fb2239e7bef97f4145add52d5b51f3296013c4a46087277d68b744f
 EBUILD mdadm-3.1.5.ebuild 2218 RMD160 ff8f295f8651c971fbb2900ea1fe51bea10bac54 SHA1 b2a198d8756b68178776cd4424700a91665d31af SHA256 87afd15af12fca345e6bccd3957bcca02591986fcc75239494d7049146e5d29b
-MISC ChangeLog 21905 RMD160 63763506d7f257d0e104d62111d71d8c0609b567 SHA1 339461608b11729cd90a16f675c2fd343e34458a SHA256 0bb9b0676cafd228ab9bbedccc34d3559dde6e9a5f3d302133ac85653ef3f758
+EBUILD mdadm-3.2.1.ebuild 2241 RMD160 202c2cc23aafce9657b1924423aa221b8eddffd7 SHA1 ca8550951a4ba67d208900cdbf433050763267b8 SHA256 ece8c62682c54dc7762820935aa72b1dd08dac06c9b8f29f929cc059e3ef9316
+MISC ChangeLog 22101 RMD160 69ac2ae512f9ed4a90b47c83669cb2a86a8d7292 SHA1 a0fe5a428ef3585f6d89df9a94981b377a9f9856 SHA256 ed7822c91457a18b82d2e35d053c0100cba21d5f799c532756de8309e51f4939
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2OsHwACgkQaC/OocHi7Jb1NgD/XIKDiqA3WIcrQ2IOyQeQmO+A
-E9G36jFF9YVx1goctvsBAJdsHsQfKUKHXNP5B2t7oaZRnMoRuS6mAaNZ/UUYfLCX
-=xs2L
+iF4EAREIAAYFAk2eUyUACgkQaC/OocHi7JaDAwD9FylKRshSLle4T/dHRc0jJRrx
+Zve9dPAFIPHAu1gL0UEA/iQkkEpFytBWmrynzHUjezenxDy44lwgjUFXKr9GRohp
+=TQuY
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch
new file mode 100644
index 000000000000..6e12dc2534a0
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/211426
+
+make default mdassemble sane
+
+--- a/Makefile
++++ b/Makefile
+@@ -181,8 +181,7 @@
+ 	$(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
+ 
+ mdassemble : $(ASSEMBLE_SRCS) $(INCL)
+-	rm -f $(OBJS)
+-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
+ 
+ mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
+ 	rm -f $(OBJS)
diff --git a/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch b/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch
new file mode 100644
index 000000000000..1e0b46eadca3
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch
@@ -0,0 +1,61 @@
+From 226f1bda813f15e4b977da95e420ec09ff10eac9 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 7 Apr 2011 19:59:21 -0400
+Subject: [PATCH 2/4] mdadm: add missing --syslog option to monitor help
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ReadMe.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/ReadMe.c b/ReadMe.c
+index 00b24d4..57c10f3 100644
+--- a/ReadMe.c
++++ b/ReadMe.c
+@@ -506,6 +506,7 @@ char Help_monitor[] =
+ "  --mail=       -m   : Address to mail alerts of failure to\n"
+ "  --program=    -p   : Program to run when an event is detected\n"
+ "  --alert=           : same as --program\n"
++"  --syslog      -y   : Report alerts via syslog\n"
+ "  --increment=  -r   : Report RebuildNN events in the given increment. default=20\n"
+ "  --delay=      -d   : seconds of delay between polling state. default=60\n"
+ "  --config=     -c   : specify a different config file\n"
+-- 
+1.7.4.1
+
+From 38cf2f1179517e54c54cbed85f76950ea9e918ea Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 7 Apr 2011 20:02:05 -0400
+Subject: [PATCH 3/4] mdadm: respect --syslog in monitor mode
+
+A few places don't accept syslog as a monitor mode, so fix that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Monitor.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Monitor.c b/Monitor.c
+index 337785d..a3ea724 100644
+--- a/Monitor.c
++++ b/Monitor.c
+@@ -143,7 +143,7 @@ int Monitor(struct mddev_dev *devlist,
+ 			fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
+ 			       alert_cmd);
+ 	}
+-	if (scan && !mailaddr && !alert_cmd) {
++	if (scan && !mailaddr && !alert_cmd && !dosyslog) {
+ 		fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n");
+ 		return 1;
+ 	}
+@@ -335,7 +335,7 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info)
+ {
+ 	int priority;
+ 
+-	if (!info->alert_cmd && !info->mailaddr) {
++	if (!info->alert_cmd && !info->mailaddr && !info->dosyslog) {
+ 		time_t now = time(0);
+ 
+ 		printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
+-- 
+1.7.4.1
diff --git a/sys-fs/mdadm/mdadm-3.2.1.ebuild b/sys-fs/mdadm/mdadm-3.2.1.ebuild
new file mode 100644
index 000000000000..d452ab8c30b6
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v 1.1 2011/04/08 00:13:19 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://neil.brown.name/blog/mdadm"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# until it's safe !
+#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND=""
+RDEPEND=">=sys-apps/util-linux-2.16"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.1.5-cflags.patch #336175
+	use static && append-ldflags -static
+}
+
+mdadm_emake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		"$@" \
+		|| die
+}
+
+src_compile() {
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	into /
+	dosbin mdassemble || die
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-3.0 raid-start.sh || die
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
+	newinitd "${FILESDIR}"/mdraid.rc-3.1.1 mdraid || die
+	newconfd "${FILESDIR}"/mdraid.confd mdraid || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s:/lib/rcscripts/:/$(get_libdir)/rcscripts/:" \
+		"${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}