Grab patch from Fedora.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 35 insertions, 14 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 4abc4ca4eb01..1d93b7d66881 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.147 2006/02/24 01:49:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.148 2006/03/07 00:26:30 vapier Exp $
+
+  07 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12r-umount-nosysfs.patch, util-linux-2.12r-r3.ebuild:
+  Grab patch from Fedora.
 
   24 Feb 2006; Mike Frysinger <vapier@gentoo.org>
   +files/util-linux-2.13-no-nls.patch, util-linux-2.13_pre6.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 33cf7700b0c9..23859361339b 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5a02bc045ea583fadba27d313601d6d7 ChangeLog 23768
-RMD160 9c1fed2e50a080e59a17da1a9eea3068691f4d3c ChangeLog 23768
-SHA256 1c432b0852dd156727e5dbdb48fbfb2a249cecc6978e278606866ef2d7b6bf48 ChangeLog 23768
+MD5 2461458aff7c3f3bfc1663a93fe0104b ChangeLog 23921
+RMD160 94d6a89b453753422a4b1f10ba9a5c550ac2f879 ChangeLog 23921
+SHA256 102bcd3d8ea23933ee39209b53242c943e0b2f26a9681f8a09ad554e3a111705 ChangeLog 23921
 MD5 fc01656c85a58c998f5487eb72f44035 files/crypto-loop.confd 442
 RMD160 cd8177c5b6976f2d5f5f997281a31ce18a64092a files/crypto-loop.confd 442
 SHA256 47c8d7029e0fdf77425c2c5d593a46315d6b3b2539a019af228bcf88ed8168d6 files/crypto-loop.confd 442
@@ -115,6 +115,9 @@ SHA256 694784331e989ff984b22b4c422ab735dba1e024b663449694bdf32e45ff2db0 files/ut
 MD5 badd26600f4c31ecb524385ea1b7030c files/util-linux-2.12r-fdisk-frame-pointers.patch 355
 RMD160 e16e25ffd75a8e46fa2e4067b5178c7410491bad files/util-linux-2.12r-fdisk-frame-pointers.patch 355
 SHA256 afa3f0d16504f73db4ba4e5287e9b757da552e6751e58bd6dba9bcf380a2081a files/util-linux-2.12r-fdisk-frame-pointers.patch 355
+MD5 2ac8d002e13e5fa925551bb42798c363 files/util-linux-2.12r-umount-nosysfs.patch 432
+RMD160 cfb2ac318ac2d821d30b1c4d065d1d361845034a files/util-linux-2.12r-umount-nosysfs.patch 432
+SHA256 d7b3c5f7268e6ecb086bfb188f01f544099079ed9b4ca0f8d87e97269cb91976 files/util-linux-2.12r-umount-nosysfs.patch 432
 MD5 8f7bbfae57e5b38000b7274ee98cf2dd files/util-linux-2.13-no-nls.patch 299
 RMD160 cd294b26622ea3964d5e8531ba77f278c4fe1913 files/util-linux-2.13-no-nls.patch 299
 SHA256 06effc857b04f1dde5bfe6b158ca8c4fd1253c1320c5f0e4b9e6eb603cdbab50 files/util-linux-2.13-no-nls.patch 299
@@ -136,19 +139,19 @@ SHA256 38c4becdaf20362abfc59fad70cb16a62d6bcb95b25f0ebbf9b0952deb734c2e util-lin
 MD5 d15a79f3ee1b51bf3363bc483887b4e8 util-linux-2.12r-r2.ebuild 5927
 RMD160 fbdc18f3e7d1e2ca13a5eb603f79fde692f9fb1b util-linux-2.12r-r2.ebuild 5927
 SHA256 15950032fde8382b72b3f8b1a626f9d6a6a3e7d6b83b92ab104fad61199167f8 util-linux-2.12r-r2.ebuild 5927
-MD5 fa04ec3f0adf75e0c5dba347872173b1 util-linux-2.12r-r3.ebuild 5940
-RMD160 3d1eae83d6a97e52ab0d4d131db89fe7f20792a9 util-linux-2.12r-r3.ebuild 5940
-SHA256 b14cc8fa436ebb31bc8980a7ccc90fddc0e509dc4d8cc600b43a0a803091d0df util-linux-2.12r-r3.ebuild 5940
+MD5 087816ac2ec3193b51211c0635fd5477 util-linux-2.12r-r3.ebuild 6019
+RMD160 aa6872001841bc98469317b4bb0dc508c5291768 util-linux-2.12r-r3.ebuild 6019
+SHA256 ff094d393a1db530e57b56facb48269d1b02c6058ac72bba58f63d73e5a4006c util-linux-2.12r-r3.ebuild 6019
 MD5 0fa072288048ab73c7da495402392575 util-linux-2.12r.ebuild 5546
 RMD160 0f307e042a76b7da21677eba076cb00ef940332d util-linux-2.12r.ebuild 5546
 SHA256 a1c0b47b741da937bb8fc38a0802e502258cf9b4ff25341e3034cb54b6f709c1 util-linux-2.12r.ebuild 5546
-MD5 d75dbc5b279d7e38ac1f0cbd72afd4bb util-linux-2.13_pre6.ebuild 4120
-RMD160 d8b7dc597f905a8c8de8127166fda7fac6b2efe0 util-linux-2.13_pre6.ebuild 4120
-SHA256 5d7b58604812f65e7ae10d45864ce4dc15e48ccea208a8d12c7852cb923311c9 util-linux-2.13_pre6.ebuild 4120
+MD5 9eab906159390965cfd5eb376a6292ff util-linux-2.13_pre6.ebuild 4002
+RMD160 0f04ca3d177c2afa55dca51d95b573b55b792114 util-linux-2.13_pre6.ebuild 4002
+SHA256 b2771a51ff218bdb10c27780db394198dea8d3c3b6803186c5a840515260c8e3 util-linux-2.13_pre6.ebuild 4002
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD/mZv2+ySkm8kpY0RAplEAKC2i3CJe3LSgXcXZfTpHTHNBdqzywCgpE4j
-zdAdInlUXhjSyyT2M2PN0GY=
-=e6Y3
+iD8DBQFEDNOE2+ySkm8kpY0RAqxmAJ9OjVuBrPl2h/Qx6BSdIEEU6eWxxACfaEyB
+TxSv3WnVK3rhWDueVLtLeiU=
+=cvbi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch b/sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch
new file mode 100644
index 000000000000..eb0d40599eff
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch
@@ -0,0 +1,11 @@
+--- util-linux-2.12r/mount/umount.c.orig	2006-03-03 11:29:57.000000000 -0500
++++ util-linux-2.12r/mount/umount.c	2006-03-03 11:30:07.000000000 -0500
+@@ -724,7 +724,7 @@
+ 	if (all) {
+ 		/* nodev stuff: sysfs, usbfs, oprofilefs, ... */
+ 		if (types == NULL)
+-			types = "noproc,nodevfs,nodevpts";
++			types = "noproc,nodevfs,nodevpts,nosysfs";
+ 		result = umount_all (types, test_opts);
+ 	} else if (argc < 1) {
+ 		usage (stderr, 2);
diff --git a/sys-apps/util-linux/util-linux-2.12r-r3.ebuild b/sys-apps/util-linux/util-linux-2.12r-r3.ebuild
index 6d2ae1f3be45..ddfa8782ca5d 100644
--- a/sys-apps/util-linux/util-linux-2.12r-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.12r-r3.ebuild,v 1.1 2006/01/23 23:47:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r3.ebuild,v 1.2 2006/03/07 00:26:30 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -109,6 +109,9 @@ src_unpack() {
 	# Bug #108988 unable to always seek when omiting frame pointers 
 	epatch "${FILESDIR}"/${PN}-2.12r-fdisk-frame-pointers.patch
 
+	# Patches from Fedora
+	epatch "${FILESDIR}"/${PN}-2.12r-umount-nosysfs.patch
+
 	# Enable random features
 	local mconfigs="MCONFIG"
 	use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG"