Grab fixes from upstream for #270168 by Tadas and #269264 by Mario Bachmann.

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

6 files changed, 232 insertions, 10 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index b9cb55f1a49b..6928fd6e3444 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.265 2009/05/18 17:41:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.266 2009/05/23 21:14:31 vapier Exp $
+
+  23 May 2009; Mike Frysinger <vapier@gentoo.org> util-linux-2.14.2.ebuild,
+  files/util-linux-2.15-old-libselinux.patch:
+  Apply selinux fix from upstream for #270168 by Tadas.
+
+*util-linux-2.15-r1 (23 May 2009)
+
+  23 May 2009; Mike Frysinger <vapier@gentoo.org> +util-linux-2.15-r1.ebuild,
+  +files/util-linux-2.15-losetup-symlinks.patch,
+  +files/util-linux-2.15-old-libselinux.patch:
+  Grab fixes from upstream for #270168 by Tadas and #269264 by Mario
+  Bachmann.
 
   18 May 2009; Raúl Porcel <armin76@gentoo.org> util-linux-2.14.2.ebuild:
   ia64/sparc stable wrt #268765
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7e2d9562562d..835a482e2f29 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
 AUX no-symlink-resolve.patch 316 RMD160 a38941174577c046e982d696b245e8c64d491caa SHA1 8cb06d4ed19ab4330b1e3841d0f824d19ea66a7c SHA256 e02ba35bde41df4fcbf215a4598427711bd8104b883f9bd7aeab76c1c8741db9
@@ -30,18 +33,25 @@ AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f
 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-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 loop-AES-v3.2c.tar.bz2 222421 RMD160 d6b3781103aa64aa6db738083ff2d1adb4f9ca8f SHA1 63102863459370e35f4edb26e83f548f8ce1a7bb SHA256 c0313b445cb41ef586ba9774fc7cbf41114d93064b3417cf8512da6f746d3542
 DIST util-linux-ng-2.13.1.1.tar.bz2 2829838 RMD160 a9197881ff75214cfdcd9e9aaa372495f4ba0dda SHA1 9eb78ee1fc20ab11712fb58b3bb96c528d918e16 SHA256 5d3739fa2ba45ffffa0c61667a0b767a360be2fefec6b0dd165bab124cea5861
-DIST util-linux-ng-2.14.1-20081015.diff.bz2 51788 RMD160 eb657a6e5a0cdd3545716ce2af55ad100bde3a84 SHA1 4bb9ca2385ddf55dec21f631d4f8df5e802fa24b SHA256 5db0c61f1ab07ceda04a6ee465c2d2ca4abc7ff3a5f92c2114361b3cffbf818f
-DIST util-linux-ng-2.14.1.tar.bz2 2929618 RMD160 23484769f7b73aeb3170333e7656ae2c9613d380 SHA1 4b738db04b27278329af216b15e96752e5af8cc3 SHA256 bf289c5399ab78674d9662ff2906a63ab540e88bf8bb1d3c7326dc8b1bef802c
 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-20090511.diff.bz2 54329 RMD160 55e872443de3b567a7fadc46f4a29882e26bc437 SHA1 c8399ccb99c4c27893dded3c67fe6bf5fceb5236 SHA256 899bcdd2aa92537009cee085b84afcd763a45cd2a7f22988369349e8c0d6392d
 DIST util-linux-ng-2.15.tar.bz2 10184100 RMD160 93df61ee935cd9a524df68b28bc4e3adcef8d3ef SHA1 7fe31e5e56fdccfa0433fcccb1b4ce147fbbfc17 SHA256 db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd
 EBUILD util-linux-2.13.1.1.ebuild 2546 RMD160 592f2c38b3c01a58d2bc430f11a7db697be21cdc SHA1 aaac3b9b08bcb7918753c5ac46afa2c02608f0b2 SHA256 6954ec92e5e04058f1900df62fc1efc445fe8444f4b28e36aaef40eda332f707
-EBUILD util-linux-2.14.1.ebuild 2662 RMD160 875be20d417b3a4a2f1cd469e30e9280f1f14708 SHA1 63aedd3e6dd039b38b8637db26a0d0b0d2f99b77 SHA256 82ceb5da0a8ddfbb6cb58bc71cc63073aa59e9863000494559187e29470ac32f
-EBUILD util-linux-2.14.2.ebuild 2535 RMD160 82d4c0386c24316d036fb16744a5483192198fda SHA1 6e17f7225a22e384244ddd7850ac41818b8845fc SHA256 6998fa0261a4c42c01f8c22f07af305028f40d4e685171d00b28c35fde04b1ea
+EBUILD util-linux-2.14.2.ebuild 2624 RMD160 dc67e2cf5f0e7a8613e937608ebf20aec94ee382 SHA1 f6fb481c37ab3bc7a8fbbbcffc5b9644e05c0eea SHA256 ba32dade9f65e1990c2fc1beac8ae45bd4d1e153bcb0e8644996b66bc4fa1816
+EBUILD util-linux-2.15-r1.ebuild 2739 RMD160 5d072d09e32c0b632aacff3d09714bebf61fae97 SHA1 25ea82ee54c228b945a17804d075d0e363b1e5bd SHA256 1a01031c207bdd179828e0c082b4560afa98402779768f99f5fe4306a8de139a
 EBUILD util-linux-2.15.ebuild 2594 RMD160 a0b41b2aefaf88b930369a200bfb35904844334d SHA1 548005bd90ce8ad9817f1204ab790dd89965b915 SHA256 50986e05c68de97596a2b405319dea7715dca4b02c54a2a5c528d7190e0797e8
 EBUILD util-linux-9999.ebuild 2112 RMD160 4c302634deb9bea06c8ba2647ec0fbdbcf2ae930 SHA1 5b3e888032ecebe8e1c5504347279dd13e6241d5 SHA256 04848332d95c545ba2553a82b912ce2aa67586deece74c63d04bc8a531c94ee8
-MISC ChangeLog 40357 RMD160 74e5dd26324e94a96c248007c885fa3d19f00f29 SHA1 036dfdace6719ef4d0ff008012153ccafb081851 SHA256 e0c3804aca0160f844bfa2de52426c8e7fc6619947a14be7368507711b5d8721
+MISC ChangeLog 40826 RMD160 5edb12146ba19563edbcef25917c5d0dab7c9726 SHA1 08603ba476a966eb5a72db0554a6b6f593564896 SHA256 39bda75b1f9b9cb849e5544826f0ddc2e81ad17ef52aa0a39481b7e4119d0e7c
 MISC metadata.xml 247 RMD160 233aa38a3ce28f169d18de949377c5c26f23bdff SHA1 b908dc27f495e4313a30a8883346d6cef6467f27 SHA256 4e9e787bd294b0810c142758275e148780035c7d00618e7808d34fe14f26c3b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYZz0ACgkQn/5bYzqsSmGKlQCfWGrd0YjN1W/6Q8J1rgBxTdV8
+7LsAnA8eKvujxIIZNWzyqEu/aJIidIhO
+=C3FC
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.15-losetup-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.15-losetup-symlinks.patch
new file mode 100644
index 000000000000..8dbd3288a42f
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.15-losetup-symlinks.patch
@@ -0,0 +1,48 @@
+http://bugs.gentoo.org/269264
+
+From 72f6902e435612f848cbe9993ce6298da8af996c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 10 May 2009 16:57:31 -0400
+Subject: [PATCH] losetup: handle symlinks in /dev/loop/
+
+The loop_scandir() expects all the files in /dev/loop/ to be actual
+devices and not symlinks to devices.  However, udev by default sets up
+symlinks in /dev/loop/ thereby breaking the fallback scan logic when
+looking for devices more than the default number of 8.
+
+Simple way to reproduce is:
+ - <detach all devices>
+ - cd /dev/loop
+ - rm -f [2-7]
+ - losetup 0 autogen.sh
+ - mv 1 8
+ - for n in {1..7} ; do ln -s 0 $n ; done
+ - losetup -f
+	<error but should have found /dev/loop/8>
+
+[kay.sievers@vrfy.org:
+       just a note, udev does not do that by default. It is
+       devfs-nonsense, which the "default" never did.]
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Reported-by: Mario Bachmann <grafgrimm77@gmx.de>
+---
+ mount/lomount.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mount/lomount.c b/mount/lomount.c
+index d62198e..c173409 100644
+--- a/mount/lomount.c
++++ b/mount/lomount.c
+@@ -256,7 +256,7 @@ loop_scandir(const char *dirname, int **ary, int hasprefix)
+ 	*ary = NULL;
+ 
+ 	while((d = readdir(dir))) {
+-		if (d->d_type != DT_BLK && d->d_type != DT_UNKNOWN)
++		if (d->d_type != DT_BLK && d->d_type != DT_UNKNOWN && d->d_type != DT_LNK)
+ 			continue;
+ 		n = name2minor(hasprefix, d->d_name);
+ 		if (n == -1 || n < NLOOPS_DEFAULT)
+-- 
+1.6.3
+
diff --git a/sys-apps/util-linux/files/util-linux-2.15-old-libselinux.patch b/sys-apps/util-linux/files/util-linux-2.15-old-libselinux.patch
new file mode 100644
index 000000000000..337e54327ae8
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.15-old-libselinux.patch
@@ -0,0 +1,54 @@
+http://bugs.gentoo.org/270168
+
+From 28d39b6dd71e6a054aa06c66f683a1e15439e56b Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 21 May 2009 13:20:10 +0200
+Subject: [PATCH] mount: fix undefined reference to `security_get_initial_context'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+> Gentoo-hardened stable have: sys-libs/libselinux-1.34.14
+> I have:
+> mount.c:(.text+0x12ce): undefined reference to `security_get_initial_context'
+
+Reported-by: Максим Бритов <maxim.britov@gmail.com>
+Addresses-Gentoo-Bug: #270168
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ configure.ac  |    5 +++++
+ mount/mount.c |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af946a1..b174bce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -656,6 +656,11 @@ fi
+ if test "x$have_selinux" = xyes; then
+   SELINUX_LIBS="-lselinux -lsepol"
+   SELINUX_LIBS_STATIC="-lselinux -lsepol"
++  old_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $SELINUX_LIBS"
++  # This function is missing in old libselinux 1.xx versions
++  AC_CHECK_FUNCS([security_get_initial_context])
++  LDFLAGS="$old_LDFLAGS"
+ fi
+ AC_SUBST([SELINUX_LIBS])
+ AC_SUBST([SELINUX_LIBS_STATIC])
+diff --git a/mount/mount.c b/mount/mount.c
+index f48f9d4..cc5b88a 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -1561,7 +1561,7 @@ mount_retry:
+ 
+  out:
+ 
+-#ifdef HAVE_LIBSELINUX
++#if defined(HAVE_LIBSELINUX) && defined(HAVE_SECURITY_GET_INITIAL_CONTEXT)
+   if (res != EX_FAIL && verbose && is_selinux_enabled() > 0) {
+       security_context_t raw = NULL, def = NULL;
+ 
+-- 
+1.6.3
+
diff --git a/sys-apps/util-linux/util-linux-2.14.2.ebuild b/sys-apps/util-linux/util-linux-2.14.2.ebuild
index 567a4b2c4515..5a1b9b69962c 100644
--- a/sys-apps/util-linux/util-linux-2.14.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.14.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.14.2.ebuild,v 1.9 2009/05/18 17:41:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.14.2.ebuild,v 1.10 2009/05/23 21:14:31 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils
-[[ ${PV} == "9999" ]] && inherit git
+inherit eutils autotools
+[[ ${PV} == "9999" ]] && inherit git autotools
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-ng-${MY_PV}
@@ -38,12 +38,14 @@ src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git_src_unpack
 		cd "${S}"
-		./autogen.sh || die
+		eautoreconf
 	else
 		unpack ${A}
 		cd "${S}"
 		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
+		epatch "${FILESDIR}"/${PN}-2.15-old-libselinux.patch #270168
 		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
+		eautoreconf
 	fi
 	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
 }
diff --git a/sys-apps/util-linux/util-linux-2.15-r1.ebuild b/sys-apps/util-linux/util-linux-2.15-r1.ebuild
new file mode 100644
index 000000000000..5d70a76c09d6
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.15-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 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.15-r1.ebuild,v 1.1 2009/05/23 21:14:31 vapier Exp $
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
+inherit eutils autotools
+[[ ${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=""
+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.15-20090511.diff.bz2 )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="crypt loop-aes nls old-linux selinux slang uclibc unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	>=sys-libs/ncurses-5.2-r2
+	>=sys-libs/e2fsprogs-libs-1.41
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${A}
+		cd "${S}"
+		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
+		epatch "${FILESDIR}"/${P}-cpuid-pic.patch #269001
+		epatch "${FILESDIR}"/${P}-losetup-symlinks.patch #269264
+		epatch "${FILESDIR}"/${P}-old-libselinux.patch #270168
+		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
+		eautoreconf
+	fi
+	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+}
+
+src_compile() {
+	econf \
+		--with-fsprobe=blkid \
+		$(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) \
+		|| die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc AUTHORS NEWS README* TODO docs/*
+
+	if use crypt ; then
+		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+	fi
+}
+
+pkg_postinst() {
+	ewarn "The loop-aes code has been split out of USE=crypt and into USE=loop-aes."
+	ewarn "If you need support for it, make sure to update your USE accordingly."
+}