Add fix from upstream for blkid segfaults #301787 by Alec M.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 147 insertions, 26 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index cb467fe57b3e..331cf84c9697 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.299 2010/02/09 01:54:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.300 2010/02/09 01:55:11 vapier Exp $
+
+*util-linux-2.17-r1 (09 Feb 2010)
+
+  09 Feb 2010; Mike Frysinger <vapier@gentoo.org>
+  +files/0001-libblkid-fix-segfault-in-drdb.patch,
+  +util-linux-2.17-r1.ebuild:
+  Add fix from upstream for blkid segfaults #301787 by Alec M.
 
   09 Feb 2010; Mike Frysinger <vapier@gentoo.org> util-linux-2.16.2.ebuild:
   Mark alpha/ia64/s390/sh stable #301179.
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 44b2454c3466..f461d41078b3 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,42 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch 1790 RMD160 2f9f49edb7b3f654af01c7de72284b7bf1cd431c SHA1 285db975b2e6c98e876302b2c1397f4c734bf1e9 SHA256 3568943453f765bc246eb05cdcc8269f79f8de0feaabc6539d2e6759b4ed9d49
+AUX 0001-libblkid-fix-segfault-in-drdb.patch 1035 RMD160 d0448b1c0a9eabcc3fd4d18c3f92de468056f3e2 SHA1 066f177bb5ef156053d4deb36c6e0b8577ed1bf7 SHA256 2a2bf7340f21cb3d77f3641ef7fc4aff629b1a392c6f0e52329fc05ae9c567fa
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
-AUX util-linux-2.13-ioprio-syscalls.patch 353 RMD160 a71a1423c1b6fa96320285d8a29fd1963c18d8d1 SHA1 bfc15114d82572e87e02486cf2d91d4ad82a3e57 SHA256 1f8cf8fb0da439072a423f1161ae401ea348c84e8b16811161ce3e46ef9d1aed
-AUX util-linux-2.13-setuid-checks.patch 1860 RMD160 9146bad2a5593424f52cea4615e4fe53cff60654 SHA1 c4da69c54a735c9fa717ef9c0dc07d11cd731181 SHA256 aec9802cace8538a77e006721b05bf50436b116f5e56d7468ca85ffc253d7e0a
-AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f279af SHA1 d85ad97b602daec290cc28858269ae4bcc0666f3 SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392
-AUX util-linux-2.13.1-no-a.out.patch 659 RMD160 8398db67db7224038e51cd9febc239d0cd6072d7 SHA1 29573af66b0e1fd68cfacf7109ad8470fbebc432 SHA256 4b70927a0c635c514d2ee71a33d71e43292e70b4fcfaae2fc789383f3486b51b
-AUX util-linux-2.14-AC_BIG_ENDIAN.patch 6651 RMD160 19e09c9c00461306065c194188529ffb137e7c7f SHA1 1b51e7c12014e817a3125b6dcc5bef47cb344aac SHA256 77f699a5e648dd89126172ae4c36b99dac7b1eb146c6036d0373851fe71eb304
-AUX util-linux-2.15-cpuid-pic.patch 1434 RMD160 d6d461897ce6e758c6d277be4c846386cd94277a SHA1 8f1422d4602a6b4a5405d40bb395ce6fb0912676 SHA256 14ecbf5b30ffdd7efc6ceb5ef00c79b27cc594eb5fd29eaac4a3fd0a49f4be13
-AUX util-linux-2.15-locale.patch 1274 RMD160 ce2007a531bedc76f3ac27078f41b82be48d6c80 SHA1 da93816a3a41cb33ee22447f9192436f47b291f0 SHA256 0218a8ca39897f75e45c511f53bd1b48979a0160378f04c3599f2b19949691fa
-AUX util-linux-2.15-losetup-symlinks.patch 1524 RMD160 fed4bda6cb83bc15871907efa0a0fb23946f7e37 SHA1 8f7d26566ec788c359fa2057e46537deb2dfa5e3 SHA256 a2f51275b6c3565bcb3b2ef15d43344dee69c01acdf45cca76fb71ed3572874b
-AUX util-linux-2.15-old-libselinux.patch 1642 RMD160 f207621bd9e0f24a45235d12509114370731eb15 SHA1 08ce02ab9a10b42fdc4e09e5bb7175b1eb45223f SHA256 e03ee13926175d27a49e8fed96c7ec79f77ca089181aedb0e169736a49cf0a74
 DIST util-linux-2.16.1-loop-aes.patch.bz2 58371 RMD160 d759cff55d8e45a007c1a08e57fc2fc71a01b403 SHA1 5d26a6bccb301cde31358a8caae30c4729347836 SHA256 e5e4e53d1d486b8ed1fbc68f44843e67a893e810c1d8074ba8ee7ffc47382966
-DIST util-linux-ng-2.14.2-20090214.diff.bz2 51898 RMD160 9ea70000e907a5233419d882d2a0a65e1442fbc9 SHA1 f5be6295afa02d3123928ada854589995a549c5e SHA256 c281b8b0a7c1650129a32185e20816a6bc37b0a5363fc5a4a0a7953e4705627a
-DIST util-linux-ng-2.14.2.tar.bz2 2956769 RMD160 ae81ed940157a37b33170365ac77699ffb14e128 SHA1 8d5ba161627dcf9295cc649c46ea15c333ff6b68 SHA256 108e63e9a007f6a8c0eff841dd38e0fe3b635c98b35bfac2d89b4b1a1ce0630e
-DIST util-linux-ng-2.15.1-20090624.diff.bz2 54618 RMD160 45e96010da6d01c31b001ed2ae8902ca355a5300 SHA1 69851c0ad1389986dce1f07b7b58f7ed61741ab7 SHA256 05e02004965ceac1ceb776f14c9931a54e3f1eafe3de92bf041e37c8a95af118
-DIST util-linux-ng-2.15.1.tar.bz2 3389810 RMD160 27e48bb213d7c2d15a82360089e2bb73a0c993c7 SHA1 7dd5be36e1626d33b39404f29a69765fe719ed16 SHA256 77b291bed080fc58ba1979e4a5c32f5bb1a37d09a84c56020b8d871ef31e7c16
-DIST util-linux-ng-2.16-20090725.diff.bz2 57349 RMD160 ad172122dfd7ab9001f18335aca5829b4e5ff73d SHA1 3491c6045f4e291648f1fe1f8b29d6177b81304e SHA256 577cf79cf4a19e71683cfa00cba05ca7d0bf1a2ec89317e9b0d10964ac267578
 DIST util-linux-ng-2.16.1.tar.bz2 3489006 RMD160 1531884c047ab2d799ddb1f8b8fcc89284fa6399 SHA1 53ba63988a82e8e3a71c96df5488959617e2a3ed SHA256 8f9fd83144f35dbd57d53eea914acd6dfad54b414ded0723f6efe06b3a167f36
 DIST util-linux-ng-2.16.2.tar.bz2 3521956 RMD160 8c27748d804ad00efb153bf62f8c74756413888b SHA1 ace7a87ea61154210d9a11dd66b1b49d8130a828 SHA256 b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
-DIST util-linux-ng-2.16.tar.bz2 3470040 RMD160 bb704fc0fdeaee2cc64abf239dfb22a7b6c8e291 SHA1 8d39c85337f8aa97cce23fefe4414335b1f79d97 SHA256 a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
 DIST util-linux-ng-2.17-20100120.diff.bz2 57932 RMD160 5525da9a83d0134b1e59e14e25b3c1a212acaa78 SHA1 e7cf9c9160fb81c099987d71971a35c3c94f8cdf SHA256 7ea15a8f3aa5c2c4073449f64ef3b1db898d81d583eb04718615fca160c57443
 DIST util-linux-ng-2.17.tar.bz2 3767857 RMD160 adedfb12e415b5e48067c579ada4b6a9317e72dd SHA1 3be54ede41d0aff87a717a0d75c8f3c0171f85f6 SHA256 8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3
-EBUILD util-linux-2.14.2.ebuild 2960 RMD160 bb86a67ebe82888e5f0e9917463f280729c03952 SHA1 eecccb3d0059756fd79d38c00ded2357c59ce834 SHA256 e36620d0c48b56c71c7c08b6034f4b3f600619e3f9956bcfd8dbccd19a94aff8
-EBUILD util-linux-2.15.1.ebuild 2611 RMD160 47356112e60c06cebe6ac1dbaa8044c7c478acc8 SHA1 1c3510c2e37697ad1250e583aabfd04dadca4aa3 SHA256 b7285a7b88833ed06b5f52412eae67bc9347b23469f73d2c5fa64a51f2fdae0b
-EBUILD util-linux-2.16-r1.ebuild 2511 RMD160 6ad4dc42e6eeee38e58ee9987b52adf51d28c4ec SHA1 eb8bb2227defc66536e4294db53cd822ad5678cd SHA256 d12a8f68cd739f51d88aa7a19dc794f338ba06d1dbf2e95513f5debbfddca21a
 EBUILD util-linux-2.16.1.ebuild 2579 RMD160 a3634e859af22b6231d1e024d226529e5e9e99be SHA1 e7ca1f320f52d3c713e382923c8663954b057617 SHA256 438b76c9003f643950b7d16da81b97f4423876d46e6832ac982aa30da56c6a38
-EBUILD util-linux-2.16.2.ebuild 2619 RMD160 51d19549d2e3a9e363858a74e3528eadbd268d9e SHA1 b83b4e387208a2d283ab48ae9bea05f869c675cc SHA256 39cc25537b3b19b18949ce8cf8ef6dd316fc142d3f579897710d9314e0e3338c
+EBUILD util-linux-2.16.2.ebuild 2614 RMD160 65127143816c862eff06f4ddf1fa61138cc81189 SHA1 02348e0fdb6dc0347ce38ef5e8d4ae91b67bc705 SHA256 4caa133fa6b3090fe0f7e72e7a398bb29ce39f9b6c6b9cf065a550948fbb2520
+EBUILD util-linux-2.17-r1.ebuild 2701 RMD160 53aee5255405596ca1054a344ba3291d4a1337b9 SHA1 63e4db0aa929f73d633b8a35b91adaf110ac8244 SHA256 7a716f822397684f3888035aa9d97bfb09364b779d22c9c0bd8e2f24de7b19a2
 EBUILD util-linux-2.17.ebuild 2630 RMD160 699e758f0d33872a873c5172ed5cf2ca7bf4af3c SHA1 512eeda6b7178e39246b1738790146412d894442 SHA256 f01102e7fe9016cad08b899219e0de1bfad4d07aaaaec7b5c8e923ed56476dac
 EBUILD util-linux-9999.ebuild 2630 RMD160 5d43edb79aee7b5ee9007f34ade094f28bbc59f4 SHA1 de01bb30e5a93fdd79c3120ac06105b1c2627944 SHA256 d20f9093ac903a641831c5aff4725b9523205faec28aeb70861a4c6707bfa692
-MISC ChangeLog 45492 RMD160 dfa4c17119d0be37678c380211a28c98119e5558 SHA1 6c9fa30b44919b4ed7b7f8add9c392af2c7ef44d SHA256 b332ca86cd1011ecb6df0602edc7f5f18ca86a579137939adbc5d5208afe414e
+MISC ChangeLog 45841 RMD160 73f6a7923621276ce1d1aea7d13efe8bae9c5c9d SHA1 fca4fbe72f7f9fe478c9b407feaaaa64460097c8 SHA256 c329c4b48579faa88568903ebae3a3722b8ab4bf16e153dad3046298886cbe4d
 MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktrRGgACgkQkKaRLQcq0GLZQgCgnudIsqdH8TuSI66tcLx80of2
-HM8AnAzNUDmwurtloN39OsGilVwPWczh
-=ThZG
+iF4EAREIAAYFAktwwOQACgkQTwhj9JtAlp7OGAD/R8SkFQX88OOFHqVDYwkuY6Ru
+J/7i817cOM68KLOgCqQA/1j48ZQvWvG1pwekuDmaCY7S/gn3lQq04ViObgRZ/5Tb
+=AUJd
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/0001-libblkid-fix-segfault-in-drdb.patch b/sys-apps/util-linux/files/0001-libblkid-fix-segfault-in-drdb.patch
new file mode 100644
index 000000000000..9acc8849a6de
--- /dev/null
+++ b/sys-apps/util-linux/files/0001-libblkid-fix-segfault-in-drdb.patch
@@ -0,0 +1,33 @@
+From 10f494e1a0ac09e144a42fcaeb72663674eb30fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matthias=20K=C3=B6nig?= <mk@phasorlab.de>
+Date: Tue, 12 Jan 2010 13:58:28 +0100
+Subject: [PATCH] libblkid: fix segfault in drdb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Check if blkid_probe_get_buffer() returns NULL to avoid dereferencing
+a zero pointer resulting in a segfault.
+
+Signed-off-by: Matthias König <mk@phasorlab.de>
+---
+ shlibs/blkid/src/superblocks/drbd.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/shlibs/blkid/src/superblocks/drbd.c b/shlibs/blkid/src/superblocks/drbd.c
+index e0bbb4d..a56486e 100644
+--- a/shlibs/blkid/src/superblocks/drbd.c
++++ b/shlibs/blkid/src/superblocks/drbd.c
+@@ -78,7 +78,8 @@ static int probe_drbd(blkid_probe pr, const struct blkid_idmag *mag)
+ 		blkid_probe_get_buffer(pr,
+ 		off,
+ 		sizeof(struct md_on_disk_08));
+-
++	if (!md)
++		return -1;
+ 
+ 	if (be32_to_cpu(md->magic) != DRBD_MD_MAGIC_08)
+ 		return -1;
+-- 
+1.6.6.1
+
diff --git a/sys-apps/util-linux/util-linux-2.17-r1.ebuild b/sys-apps/util-linux/util-linux-2.17-r1.ebuild
new file mode 100644
index 000000000000..cee5a1bc5657
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.17-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.17-r1.ebuild,v 1.1 2010/02/09 01:55:11 vapier Exp $
+
+EAPI="2"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
+inherit eutils toolchain-funcs libtool
+[[ ${PV} == "9999" ]] && inherit git autotools
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-ng-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
+		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17-20100120.diff.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	>=sys-libs/ncurses-5.2-r2
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	perl? ( dev-lang/perl )
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		autopoint --force
+		eautoreconf
+	else
+		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
+	fi
+	epatch "${FILESDIR}"/0001-libblkid-fix-segfault-in-drdb.patch #301787
+	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-agetty \
+		--enable-cramfs \
+		$(use_enable old-linux elvtune) \
+		--disable-init \
+		--disable-kill \
+		--disable-last \
+		--disable-mesg \
+		--enable-partx \
+		--enable-raw \
+		--enable-rdev \
+		--enable-rename \
+		--disable-reset \
+		--disable-login-utils \
+		--enable-schedutils \
+		--disable-wall \
+		--enable-write \
+		--without-pam \
+		$(use unicode || echo --with-ncurses) \
+		$(use_with selinux) \
+		$(use_with slang) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc AUTHORS NEWS README* TODO docs/*
+
+	if ! use perl ; then #284093
+		rm "${D}"/usr/bin/chkdupexe || die
+		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
+	fi
+
+	# need the libs in /
+	gen_usr_ldscript -a blkid uuid
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	rm -f "${D}"/usr/$(get_libdir)/*.la
+
+	if use crypt ; then
+		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+	fi
+}