Fix by Nikita Kozlov for segfault when assembling #403593.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

5 files changed, 28 insertions, 146 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/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"
 }