Fix segfault #119245 by Nathan Blomquist.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 75 insertions, 7 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index b3d9632976d2..50d38800e208 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.21 2006/01/11 05:02:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.22 2006/01/17 03:40:40 vapier Exp $
+
+*mdadm-2.2-r1 (17 Jan 2006)
+
+  17 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/mdadm-2.2-update-segv.patch, +mdadm-2.2-r1.ebuild:
+  Fix segfault #119245 by Nathan Blomquist.
 
 *mdadm-2.2 (11 Jan 2006)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 4a5c936826fd..35b2755ee053 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 532e4f5b27cc178815a46fa8d4778be3 ChangeLog 5340
+MD5 acfd6f6fe1f216c197cafe36f81c10dd ChangeLog 5524
 MD5 29424204ff8bad1b89969061398f354e files/digest-mdadm-1.11.0 64
 MD5 2f8e7421a23b99428a0f7ed81360532b files/digest-mdadm-1.12.0 64
 MD5 94803322fcea6ec0f31f730af32df156 files/digest-mdadm-1.9.0-r1 59
 MD5 10269af15b3bfdd348686bd88249fe2a files/digest-mdadm-2.1 62
-MD5 6418d19a4b3cbc55500c1cb381aa8bed files/digest-mdadm-2.2 62
+MD5 6418d19a4b3cbc55500c1cb381aa8bed files/digest-mdadm-2.2-r1 62
 MD5 c0f39d9acef8dee3159359691bf76b94 files/mdadm-1.9.0-dont-make-man.patch 260
+MD5 e5ff1be8339b5b576278f1a167b164fa files/mdadm-2.2-update-segv.patch 534
 MD5 77fed3360e9b6bdfd0721b77c495b750 files/mdadm.rc 849
 MD5 b29646ea704acba09b98ff59f87ebff3 files/raid-start.sh 1518
 MD5 1e1df57960f4ac52fb4ca327048bbcaa files/raid-stop.sh 805
@@ -15,12 +16,12 @@ MD5 df12771ceeb641ef4fbbadbf745573b6 mdadm-1.11.0.ebuild 1188
 MD5 4240e55745ee26c80f06c89a61329e92 mdadm-1.12.0.ebuild 1196
 MD5 087b416e7f17ebbe4f6eb4c96d2519a2 mdadm-1.9.0-r1.ebuild 1235
 MD5 cda31de501f452502de1ce7c7d8cd579 mdadm-2.1.ebuild 1165
-MD5 0bf4050c79d0c57bc79210c577300052 mdadm-2.2.ebuild 1166
+MD5 e4fd9131d9bd9179507762825c14c1cb mdadm-2.2-r1.ebuild 1222
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDxJG02+ySkm8kpY0RArOAAJ4wI0QOLg06DYHnPIqcXio/7+n9HACfQRb+
-6EwutrlWGb9FxyUR+F3qw28=
-=nfmZ
+iD8DBQFDzGev2+ySkm8kpY0RAuFyAJ4wGE4Vv3qA2xbb6e1bzDjIAoqB6ACfT2A/
+0USggMxo4lRBImH9IQzNw3k=
+=gjFj
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/digest-mdadm-2.2-r1 b/sys-fs/mdadm/files/digest-mdadm-2.2-r1
new file mode 100644
index 000000000000..a6a8374d21f2
--- /dev/null
+++ b/sys-fs/mdadm/files/digest-mdadm-2.2-r1
@@ -0,0 +1 @@
+MD5 c8df672f809aa4a43a88a2516d421d6e mdadm-2.2.tar.bz2 106815
diff --git a/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch b/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch
new file mode 100644
index 000000000000..1c1e37ecf4b2
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch
@@ -0,0 +1,16 @@
+Fix segfault when update is NULL
+
+http://bugs.gentoo.org/119245
+http://www.mail-archive.com/linux-raid@vger.kernel.org/msg03242.html
+
+--- Assemble.c
++++ Assemble.c
+@@ -219,7 +219,7 @@
+ 		}
+ 		if (dfd >= 0) close(dfd);
+ 
+-		if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) &&
++		if (ident->uuid_set && update && strcmp(update, "uuid")!= 0 &&
+ 		    (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) {
+ 			if ((inargv && verbose >= 0) || verbose > 0)
+ 				fprintf(stderr, Name ": %s has wrong uuid.\n",
diff --git a/sys-fs/mdadm/mdadm-2.2-r1.ebuild b/sys-fs/mdadm/mdadm-2.2-r1.ebuild
new file mode 100644
index 000000000000..35708ffabfc8
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.2-r1.ebuild,v 1.1 2006/01/17 03:40:40 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/mdadm"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
+IUSE="static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-update-segv.patch #119245
+	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	exeinto /$(get_libdir)/rcscripts/addons
+	doexe "${FILESDIR}"/raid-{start,stop}.sh || die "addon failed"
+	dodoc INSTALL TODO "ANNOUNCE-${PV}"
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+}