Fixed application of umount-l patch in combination with loop-aes patch (bug #375165)

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 5d707436f9f763f56ac9e24820facb0656e7c9f2..78872fe0b35ab10d9393da037ba44e015294d5cd 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.359 2011/11/11 13:35:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.360 2011/11/12 20:49:10 polynomial-c Exp $
+
+  12 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  util-linux-2.19.1-r1.ebuild,
+  +files/util-linux-2.19.1-remove-useless-if-stuff-from-loopaes-patchset.diff:
+  non-maintainer commit: Fixed application of umount-l patch in combination
+  with loop-aes patch. This fixes bug #375165.
 
   11 Nov 2011; Tony Vroon <chainsaw@gentoo.org> util-linux-2.19.1-r1.ebuild:
   Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney &

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index f6a78002f4cf3ec70883053b48fd91edf6872577..4cbf35ae06325d6a1b99719db4a1e3099c9e868a 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
@@ -9,6 +9,7 @@ AUX util-linux-2.18-ncursesw.patch 2163 RMD160 dbf1cd9fbb6c017d0980a7a1806479351
 AUX util-linux-2.18-slang.patch 3000 RMD160 dade7c73b8a1b1f3e40a7fd2090be7ccab69bdc6 SHA1 2cde75d7b0d8ce8b671acfb5252423790354a9d3 SHA256 d373ba30d0d60913880fabb4ea2b8adb3a0bca8ca6994c1bb0bb16148dbc41d4
 AUX util-linux-2.19-old-libc.patch 1051 RMD160 708207aefb228964da41ea83c2aadc2b4b887f15 SHA1 39648c38903ebdbb92a76967885ec9e6238d61ec SHA256 25a077162ed3e6e3f26a4cba96180d0bc60fc400e990621885453ba14f0542a8
 AUX util-linux-2.19.1-mount-a-segv.patch 2610 RMD160 67beca8dda0e48a80246c0904329944b978d445a SHA1 8eb682296c0b948a8931d71f0780f446bdd79027 SHA256 c24dc0ed811e6c0ebc69f15c818cf89aeb1dc12b5f2f62163402ad4479d7aec9
+AUX util-linux-2.19.1-remove-useless-if-stuff-from-loopaes-patchset.diff 786 RMD160 04227ea36c30916e4f3bc7abe9b2eba8281ff879 SHA1 96f5fa88a17c5e050bdccd31798e5e1678d46506 SHA256 111d4afd85efd2057280387ba0464b645c8793b9d21430d97bb17c3be0ce80c9
 AUX util-linux-2.19.1-umount-l-nfs.patch 2721 RMD160 60e0ccf77633bec6b7a1576810aadd937e464b46 SHA1 ec611d245d42a4ec721fdcc0301f433577d4a45c SHA256 f889de8dba4cb412ec0afcd2605c4f97e0870c6325dd0200e8c8c06794b4bf64
 AUX util-linux-2.20-dmesg-newline.patch 2629 RMD160 b13b0ab0fcfc6399300d60e19740643b453f6b91 SHA1 710d253bdc47253f621dbf305429baae3ef58245 SHA256 818c0a9fba08fe927f3af286bbae1d66dd3b1f32a0fa27722da7def019b3be0a
 AUX util-linux-2.20-sysfs-init.patch 1019 RMD160 049412722104e6a27c49e3098928583cb54ebcb1 SHA1 c76e32a9fc3c18e4fc98406afd937fc711ac8fec SHA256 44b9c38794d73db5c5fd0f0ede8055c77668ddd4df916bc52cc36f8c7c02f108
@@ -24,19 +25,29 @@ DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f
 DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
 EBUILD util-linux-2.17.2.ebuild 3015 RMD160 57dac717c0d9f30dbfa07cd40dec812d18c0cfe3 SHA1 903a657757ee19a86e1f6109d0ef36c3a10e6bb7 SHA256 c2bc733ccecd90d10664a821ab7c56cb26be6e0fa8448b3fd26878241bce6d20
 EBUILD util-linux-2.18-r1.ebuild 3271 RMD160 998c66452f87b053114d10625cc4f2e39ae4bd00 SHA1 14d9df40e418ec6155ba2dfc7b5ca2b30eb6f3d6 SHA256 7e6cca4e22388a373cf61538b4ff9973f706a71119e4bb66bef556175dde0170
-EBUILD util-linux-2.19.1-r1.ebuild 3291 RMD160 2099f480a901afa157ec7a550b4afa21e160003a SHA1 9746ea8ff160840c5553c632d1fc964bfd80f140 SHA256 7c2a8c34951a7aa1c2106d77da8d0d6088325e7d1e940e15bb9310cea14fd72c
+EBUILD util-linux-2.19.1-r1.ebuild 3390 RMD160 0fbc8ec3c714ea21ab776c89d4fa5ec8101dc5bd SHA1 79a4b80353796a6f8953f5dbf9227ee826daea5b SHA256 bfc513e5a4416ad527bb975dc0936b969e9d0d601399b03075bec9cab5a23704
 EBUILD util-linux-2.19.1.ebuild 3162 RMD160 dd57955b2e9ebbc7717d2b8ce12cbdceb64e2e8d SHA1 567fcdf55eb499143aef82e34aa8cf620e5abe77 SHA256 70630679959a63448654b9152d67a2ed5a05c251f5bd08bf3a1ac77bfc6ebcad
 EBUILD util-linux-2.19.ebuild 3059 RMD160 29645f9660d0caf38bd2eb3d7a97d1d0ba544e94 SHA1 e3df015f117c4867f04abc3b8b1e1be82d8cbea5 SHA256 224395e264f11496a12b8f150022bf408428fbac16b893106dbddca5d77e1724
 EBUILD util-linux-2.20-r1.ebuild 3603 RMD160 94c708f72542f798267b09359d06b8af5e7acd2a SHA1 236b5845513a733fa0ee9e2f88fabcad76abcb58 SHA256 6493ca8bd8a1b2d73b0481b1b31a370968fb631a05deca11d9d542b0d629088c
 EBUILD util-linux-2.20.1.ebuild 3511 RMD160 14aa2bf1198cfd271159372e40c65e180af408fb SHA1 8fac03e38d238e106a2129c6d2bf9e0fe3dccf1c SHA256 f132471fcac5c1d0a5285a7f04d0bd16134a395113fcaba16d268e8fbc800655
 EBUILD util-linux-2.20.ebuild 3366 RMD160 d8185e3b3ab8524448105a7975a54690ac17d99a SHA1 4ab44773dc2cc452da27e1e80d9d6b59727bddc0 SHA256 98a183811b923cc453d7b406117d95ab271b8e5dbb50deeda698becfabf65994
 EBUILD util-linux-9999.ebuild 3448 RMD160 21727d169154d7fe78d202456f3b64419eefb7ef SHA1 784f68b5c0ef9f02f0f705c15b69c1f3ead84164 SHA256 8cc2b05c9faacb2f85f7f28d5bff329c7d6c32df5f83ae8efec6f2cc4b86d167
-MISC ChangeLog 54537 RMD160 d2c09a148b52e105f4f5e27a6bda9167db4c7565 SHA1 f5ccc805cebb58dd7c0b8da69376914cfb76c2d3 SHA256 2dde5362017cbeaf797cd33cd3018fa516818efc933ede76ba9ecb0bbacd9fc6
+MISC ChangeLog 54829 RMD160 defff98db3a7d959de2a09804cb551c5947beaf4 SHA1 6b5cabd33d2b61640593d0956bd08188e59b34dd SHA256 238314fb9c4bba9fa171a8bbae3d45869bbcc7962be268fdeccc58a55f8962a0
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk69JJ8ACgkQp5vW4rUFj5qF9wCeKYB0QjZVZH7/RQZgdA0H4ZGp
-u6QAoIKcnwa19/2V2xL6IovWnFcWmbq5
-=PF/r
+iQIcBAEBCgAGBQJOvtvMAAoJEPiazRVxLXTFQ7MQAKsJG9uagUePbfHwJ9bw3HX3
+U+0KoHP+SqcomFJveWCJJ1cSpqrrKamkv+Xxgw7cNrDRajGKSzdXIAAp+zL9ImSk
+fnW56WYOd7/UCBvZiUeqM7JDrmWeOnc34V7V1UpLpPGQJSMk1MEA/l2sbqMnQnoN
+pK1dTeuiKyoOL5wrIc6UE2f8E7qi9zVmLMLSb9YYnHCK9Vy0oHlXb5aBU2Fy4Et3
+ug8G/gKrRVsNpm62aef2QH7F59bdmzz2OCqu4YzOgcp+wgEVDgKalYyI1RdvlNDG
+V7KPbezaRYvMhWzDIZuSv0lEI7mI8wPDMOyGKlcY/p9ouShVq1KEejp+Kpyc/i7x
+AYix7JFSIMQFWoE1eFyTwsSZ92WaoXobKRxfEyC2L4FakdELWUf+NpVxEQd0eGb9
+nkYW59Y34PTlwnO6SJjGxaY2HToNL3XMKwnsW4DNoF3vdTbEhmnyqOTe7oM82vcT
+dhy2NZB5LqzzunsUyzVrg9UtYNAcXlto6deawNx0dOrzke/othz4aD4EtB9D9My3
+lGQFATXwJgpfG+BZIxJqLIl+NOz9QQSWUY8WIfbQ+Er5/o7SohGrKTgLsAeyJdnr
+zI+LQwUXYhsqF8LgyfQRyhDXCHXIHTLVKjWTut6zwtUNCvkGViy1UikxcXBCE62j
+IXCRrVOzP0YelPvs3pT9
+=uxea
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/files/util-linux-2.19.1-remove-useless-if-stuff-from-loopaes-patchset.diff b/sys-apps/util-linux/files/util-linux-2.19.1-remove-useless-if-stuff-from-loopaes-patchset.diff
new file mode 100644 (file)
index 0000000..4e990b0
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.19.1-remove-useless-if-stuff-from-loopaes-patchset.diff
@@ -0,0 +1,27 @@
+This code coming from the loop-aes patch breaks the umount-l patch from
+Gentoo bug #370051.
+
+Signed-off-by: Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>
+X-Gentoo-Bug: 375165
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/375165
+
+--- util-linux-2.19.1/mount/umount.c
++++ util-linux-2.19.1/mount/umount.c
+@@ -581,9 +581,6 @@
+ 
+       file = canonicalize(arg); /* mtab paths are canonicalized */
+ 
+-/* This is too buggy code. If find_loopdev_by_backing_file() actually finds matching */
+-/* loop device, and assigns file=loopdev, then writable /etc/mtab case fails horribly */
+-#if 0
+       /* if file is a regular file, check if it is associated
+        * with some loop device
+        */
+@@ -603,7 +600,6 @@
+                       break;
+               }
+       }
+-#endif
+ 
+       if (verbose > 1)
+               printf(_("Trying to unmount %s\n"), file);

diff --git a/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
index 9860345189a95889c4d7935e596797baee5645ca..f8a30c67f07e817e153acecb19fb161000fcf46d 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.19.1-r1.ebuild,v 1.7 2011/11/11 13:35:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.8 2011/11/12 20:49:10 polynomial-c Exp $
 
 EAPI="3"
 
@@ -45,7 +45,11 @@ src_prepare() {
                autopoint --force
                eautoreconf
        else
-               use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
+               if use loop-aes ; then
+                       epatch "${WORKDIR}"/util-linux-*.diff \
+                               "${FILESDIR}"/${P}-remove-useless-if-stuff-from-loopaes-patchset.diff
+               fi
+                       
        fi
        epatch "${FILESDIR}"/${P}-mount-a-segv.patch #366213
        epatch "${FILESDIR}"/${P}-umount-l-nfs.patch #370051