diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-03-07 00:26:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-07 00:26:30 +0000 |
| commit | 83ea570f3b02b00c1a89d8d0ff68383e2455a7ce (patch) | |
| tree | 59ebc86fd73d6517694a08312b5aeea865fd16c8 /sys-apps | |
| parent | set prefix to / so we dont have to hack around duplicate /usr paths #125272 b... (diff) | |
| download | gentoo-2-83ea570f3b02b00c1a89d8d0ff68383e2455a7ce.tar.gz gentoo-2-83ea570f3b02b00c1a89d8d0ff68383e2455a7ce.tar.bz2 gentoo-2-83ea570f3b02b00c1a89d8d0ff68383e2455a7ce.zip | |
Grab patch from Fedora.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch | 11 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.12r-r3.ebuild | 5 |
3 files changed, 20 insertions, 2 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/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" |