Fix by Nikita Kozlov for segfault when assembling #403593.

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

6 files changed, 44 insertions, 164 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index a160db6eda05..3cd7410da204 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.148 2012/02/02 17:18:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.149 2012/02/16 03:10:04 vapier Exp $
+
+*mdadm-3.2.3-r1 (16 Feb 2012)
+
+  16 Feb 2012; Mike Frysinger <vapier@gentoo.org> -mdadm-3.2.1.ebuild,
+  -files/mdadm-3.2.1-syslog-updates.patch, -mdadm-3.2.3.ebuild,
+  +mdadm-3.2.3-r1.ebuild, +files/mdadm-3.2.3-segv-assemble.patch:
+  Fix by Nikita Kozlov for segfault when assembling #403593.
 
   02 Feb 2012; Mike Frysinger <vapier@gentoo.org> mdadm-3.2.3.ebuild:
   Move into ~arch.
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index f77a96961d14..336c6ed821fc 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -7,7 +7,7 @@ AUX mdadm-3.0-dont-make-man.patch 278 RMD160 a0275251626d91dc53b3fadfab6543961f5
 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-3.2.3-segv-assemble.patch 506 RMD160 abcd51cb76ed8bad42b2bb9b33f15c8c23488484 SHA1 edbe1aeaca59bce903b7ce6d0fdcc52ebc6abd87 SHA256 4f1c91bb2a9a2b7354c119ac3dfc83acecae389bbe3e48c38950cb24892b0c66
 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
@@ -17,28 +17,26 @@ 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
 DIST mdadm-3.2.3.tar.bz2 366770 RMD160 3f5b3edb4a99e5d9ecd8d519ba540c98f6b543d9 SHA1 511f4104fe4035515925613e358bef0ea0823148 SHA256 0ff49a04c6250834ce1b5be5a1581532e70e2221a87e1eedec46d6656b37ab40
 EBUILD mdadm-3.1.4.ebuild 2265 RMD160 3ecc8441938b6280e174272ef926c8f9b3f15a97 SHA1 2c5de61b9a6f53adfb01d575a3ec88d6b3117a70 SHA256 832f1f81afb743e62e51c598261c93cf778c5bd4276586e08fb72818cffe4db6
 EBUILD mdadm-3.1.5.ebuild 2223 RMD160 0ef216b3ea0f49a15fb63a322dfe1cf97764a8cb SHA1 85f876251597fe31f6a700481bd9b969aa6cdc28 SHA256 5d429930b7b7af3d1f117c676a3f97d1b8b17bbdb86eb15fcb2e229989bcca3e
-EBUILD mdadm-3.2.1.ebuild 2088 RMD160 c47998464429b1259f646aab3f596679fc4eae70 SHA1 eba277314c7962cf85f52dfad759069661b571df SHA256 9350c7cc56e44efad784447dc4a238cbf0adf30808802dc412ffcb4362fdbbe7
-EBUILD mdadm-3.2.3.ebuild 2125 RMD160 d72967aa0ac093aa970f2fe92f0a151c3e620df9 SHA1 48da4c21c3e67cce54c5fede03db7b7a7331b95b SHA256 289d759ae396cd7021cf1f0a027f87006a00df3bdc817a1418af522fe2067ae1
-MISC ChangeLog 22582 RMD160 1fa6deaa0dc2b443d13a27ee4f5526d3fab4c999 SHA1 bdafb00c7a89a38877a9797bea0433b48d09643e SHA256 b677066e9d990c78ab79f797b7df7b5c7119f6c5e12f994bc3ee504a4e5cf4de
+EBUILD mdadm-3.2.3-r1.ebuild 1919 RMD160 695a090b50261d8f95ffcbfad94e52ae6fcc07a9 SHA1 7a8432f1c7c21f8c651b711629b785d3c36d6cf8 SHA256 b21f5326774a98026f88147934d3fd414c6cd40cb2b1321158b4976248234741
+MISC ChangeLog 22876 RMD160 49208d396c0137448cc5018aab3a6d54266b068b SHA1 9a1b06fe7962f10ccfd2ca448dc901843b2970ce SHA256 98f5e7c0c10e668e54eb8defea76b15d4a385d19f96bb596052fcd206ea00ad3
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPKsV4AAoJELEHsLL7fEFWWxEP/R1a4KYsm/fb1IoSwsHrcACS
-23r+Z64bEa//L/KZOO+/K5WVr67FbyoeL6+OBFKVlT58/0qvwE32EG1+QS/JFTiT
-5+rUxxl9YJCgaZb66f8a3wGqYVp7IXurzf4ryVkaFECBt5GFq0l9YRr4YEwVvMOI
-Zqw81DOChKguFh/69agZ72yrqPoguSz3JqoQQGfw/fgXpC0pBLrTchT1W3wp3C+b
-NPU4WaEDtNczORgk8F1vvjcLIszGIkAsDtho0CzASDWTcYJLcGeQtXvoT24LylnZ
-juTh6csov2GjkmmdUTmHXKOoAqYiSoETIK4nZgfAMIDFcW1MqyPfWRzFKrnC7TC3
-CBrPKsP5lUIX4GyB7n5cE4lFveg0lLxQi8TNGZFB5vvVW0b6krEXaDbu+z7wbRSD
-NJhYUBYpuonKyuOfdSQ5L/SzjCaDhjeBgC0gUqIGXpLY5MIi03+/gm0Lodx4qx3Z
-Jp2J2kiDs1p2ylXGczu4/l0Ya9EDyADFmZu+7Mb09jzcQLvOfmkeG6ZpMexTFyMa
-nCCiqBj/xwnriRN8y78C3Y2q7e4tbRLTbp1yCfGoOU2vdvJqrjANocgZuTeycFVN
-SFrhIJ8RGEE2INnHE/uXdmuN0nlC5RMlCMYO62KHVui4HvvQy6VPLPGRbF5JDxCV
-nKzCAL8s/Qzta4vkIrRZ
-=M1kE
+iQIcBAEBAgAGBQJPPHOWAAoJELEHsLL7fEFW2nkQAKE/KibNhCx1V8CfI4q+eh9F
+k+d/kUWWZJGnRCygxyDTytmIOK7dNZpX/G9uJA6iF12x/n6sAY0WLsDdIwVC9qkj
+jY9DHPEKTXWkGSoFzSUqYbxvoX94/aPzvmMLUpb+PtXVA5adkxEWg03ncdxjEmjO
+38xuNj21vf1i8XbO9FxEp93FfswvkmnbN0odWxTG54AZeCNq6SdMPA7evhvuHw5O
+Pnt6FHRrvVWh9sdNP3bYKfJCcMHaNuws1VanVCmH9dn4T1i8onzQcMq2rvxM5zsE
+e+zrpjtMvWCclD221MG65A+E1Pxmve7zc2SYpXSrR+MTpnLPdD8UkOV4yFYArbsS
+d0P4A25wEr867Pw1O0IcUnq1PgtX7bYWHJlRe3ccbT4T8u5g0zSzR6h9uw972gyo
+rPo9SJhgkYkMT+ux3d2wVFJBAFd6epm1a5+7UDpKm8cwYOtZHE/rUMIqoSfhYnem
+ZDLJnpO/VkTUwwRQiLD2TJQkNi7LJmGvswTeOsqhayaFRnvZpcxf6CdHl56FQG8E
+yJ6ziBSazx3In3+j/RAiCkI2ziZXmmpknB7S+DjeoJGgDi/ge6vBHNKPheDrirUP
+Pp+84UDCKQK977m6eD+esZ+I0scvbil5P3nk/zXQQb5jy41wFB+X0kLfsz4QwNeM
+YMJIfY/sA1KImRATQQpf
+=AhvY
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 1e0b46eadca3..000000000000
--- a/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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/files/mdadm-3.2.3-segv-assemble.patch b/sys-fs/mdadm/files/mdadm-3.2.3-segv-assemble.patch
new file mode 100644
index 000000000000..e88d5aacf76c
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.3-segv-assemble.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/403593
+
+the merging of code in upstream commit 2244d1a9877d18bdc42a5204d31f41920d369e87
+introduced this bug.  patch by Nikita Kozlov.
+
+--- a/config.c
++++ b/config.c
+@@ -1045,7 +1045,7 @@ struct mddev_ident *conf_match(struct supertype *st,
+ 					array_list->devname);
+ 			continue;
+ 		}
+-		if (array_list->devices &&
++		if (array_list->devices && devname &&
+ 		    !match_oneof(array_list->devices, devname)) {
+ 			if (verbose >= 2 && array_list->devname)
+ 				fprintf(stderr, Name
diff --git a/sys-fs/mdadm/mdadm-3.2.1.ebuild b/sys-fs/mdadm/mdadm-3.2.1.ebuild
deleted file mode 100644
index 04be7630085a..000000000000
--- a/sys-fs/mdadm/mdadm-3.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.2 2011/11/12 21:06:44 vapier Exp $
-
-EAPI="2"
-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/baselayout-2
-	>=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_prepare() {
-	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
-}
-
-mdadm_emake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		"$@" \
-		|| die
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	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}
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
-	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
-	newinitd "${FILESDIR}"/mdraid.rc 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"
-}
diff --git a/sys-fs/mdadm/mdadm-3.2.3.ebuild b/sys-fs/mdadm/mdadm-3.2.3-r1.ebuild
index c87feea80b49..68cf3a34ebf1 100644
--- a/sys-fs/mdadm/mdadm-3.2.3.ebuild
+++ b/sys-fs/mdadm/mdadm-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.3.ebuild,v 1.2 2012/02/02 17:18:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.3-r1.ebuild,v 1.1 2012/02/16 03:10:04 vapier Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs
@@ -23,10 +23,8 @@ RDEPEND="!<sys-apps/baselayout-2
 RESTRICT="test"
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch  # Merged upstream
-	#epatch "${FILESDIR}"/${PN}-3.2.1-syslog-updates.patch # Merged upstream
 	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
-	#epatch "${FILESDIR}"/${PN}-3.1.5-cflags.patch #336175 # Merged upstream
+	epatch "${FILESDIR}"/${PN}-3.2.3-segv-assemble.patch #211426
 }
 
 mdadm_emake() {
@@ -69,8 +67,7 @@ src_install() {
 }
 
 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 "If you're not relying on kernel auto-detect of your RAID devices,"
+	elog "you need to add 'mdraid' to your 'boot' runlevel:"
 	elog "rc-update add mdraid boot"
 }