Fix by Derick Swanepoel to have umount respect -n when using -r #98675.

Package-Manager: portage-2.0.51.22-r2

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index af5b78990b4e8d7d255d56f839bea75bc4656748..965ee6569e8a7498e292e302d79ca6ac18e83b81 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.110 2005/09/13 23:56:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.111 2005/09/14 03:17:38 vapier Exp $
+
+  14 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch,
+  util-linux-2.12q-r2.ebuild:
+  Fix by Derick Swanepoel to have umount respect -n when using -r #98675.
 
   13 Sep 2005; Mike Frysinger <vapier@gentoo.org>
   +files/util-linux-2.12-only-root-can-remount.patch,

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index d5071951f80d0747e89f97a9dbcade0b4d1df98b..1df1eef83bc0551f177c4b0eb93dd011a93988c0 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,8 +4,8 @@ Hash: SHA1
 MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 5497e9050dc8cde95a0e015edcd59c81 util-linux-2.12i-r1.ebuild 3960
-MD5 7b72b4f6e03a9ff3f8b22d19ab70146e util-linux-2.12q-r2.ebuild 5462
-MD5 8b1e95795afacd2efcb617ab782897b8 ChangeLog 18798
+MD5 5f6bfcc9cec96a297071615eadca2dbc util-linux-2.12q-r2.ebuild 5579
+MD5 7ec017e092d564a2362a94271d03642d ChangeLog 19022
 MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlinks.patch 864
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
 MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239
@@ -35,10 +35,11 @@ MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
 MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505
 MD5 b360252f16d707f668b605d7a2abb791 files/util-linux-2.12q-dont-umask.patch 439
 MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156
+MD5 8a13c61b447c1533df4b919cf2646fea files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch 467
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJ2c9gIKl8Uu19MoRAp9FAJ9VJF3v1D6PR3o2z2pbJZ54gy58cwCeNy46
-p4Tsjisbpa8ACCyrDjb0rAs=
-=muRA
+iD8DBQFDJ5ZhgIKl8Uu19MoRAqcnAKCELR5+KqJao2LihGGCfdmCglOflQCfSErF
+UISx1CegpX9La5rUhixyNWM=
+=DZdM
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch b/sys-apps/util-linux/files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch
new file mode 100644 (file)
index 0000000..2b8f4ad
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch
@@ -0,0 +1,18 @@
+Make umount respect the -n option when using -r
+
+Patch by Derick Swanepoel
+
+http://bugs.gentoo.org/98675
+
+--- mount/umount.c
++++ mount/umount.c
+@@ -349,7 +349,8 @@
+                       remnt.mnt_type = remnt.mnt_fsname = NULL;
+                       remnt.mnt_dir = xstrdup(node);
+                       remnt.mnt_opts = xstrdup("ro");
+-                      update_mtab(node, &remnt);
++                      if (!nomtab && mtab_is_writable())
++                              update_mtab(node, &remnt);
+                       return 0;
+               } else if (errno != EBUSY) {    /* hmm ... */
+                       perror("remount");

diff --git a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild b/sys-apps/util-linux/util-linux-2.12q-r2.ebuild
index ea006f95b880a3fde140f0d899b15daac64711b1..8a540f9256553ab75d77e63fa1968cf0bd9186f4 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12q-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.12q-r2.ebuild,v 1.2 2005/09/13 23:56:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12q-r2.ebuild,v 1.3 2005/09/14 03:17:38 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -62,6 +62,9 @@ src_unpack() {
        # Disable the -r option for non-root users #105805
        epatch "${FILESDIR}"/${PN}-2.12-only-root-can-remount.patch
 
+       # Respect -n with -r and umount #98675
+       epatch "${FILESDIR}"/${PN}-2.12q-umount-dont-write-mtab-with-remount.patch
+
        # Fix unreadable df output when using devfs ... this check is kind of 
        # a hack, but whatever, the output isnt critical at all :P
        [[ -e /dev/.devfsd ]] && epatch "${FILESDIR}"/no-symlink-resolve.patch