Disable mount sloppy test since it violates the sandbox #453778 by Konstantin Münning.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 48 insertions, 19 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index da6468fcd4f9..e10ff8f2e1f6 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.148 2013/05/03 19:14:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.149 2013/05/04 17:18:38 vapier Exp $
+
+  04 May 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/autofs-5.0.7-mount-sloppy.patch, autofs-5.0.7-r1.ebuild:
+  Disable mount sloppy test since it violates the sandbox #453778 by Konstantin
+  Münning.
 
 *autofs-5.0.7-r1 (03 May 2013)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 4ca0acc1cfad..61f7bcc2a071 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX autofs-4.1.4-clean-up-maps.patch 1779 SHA256 e7e782016fd1af945107805eac243c0d6355b13366932c7d25447013c5a2c445 SHA512 479d6a6bf094980c73ca5f0b0bbc1321c666072d02848e7083f178b1bf93cd99ee0eea8817f9df29eddf159a792651330a2d2d4f7a35015edb535a0cb35d4938 WHIRLPOOL 0512674c720e91750e9fcba79c7dfb1d950074d8150eeacf433820018c79d52fb91221f385ad456e3c2da533d9e333a6b94f397d872cd2343b406e005a02e007
 AUX autofs-4.1.4-fix-install-ldap-samples-and-maps.patch 2645 SHA256 188e73bcee6e2a10e1b5957a59a48ba1df7af534535e84359aaffb6f3e5986e7 SHA512 937251e1e386d7aa754e68b9e5586b3dbc8e8bf072f3faf49c5e828be6f0d69e20979afeafe514189d2d91d5f898c0e888ecb51264428fadfd1e47ff3af4dabb WHIRLPOOL 6f47561e22e1806ce180589d2840b785418c52ec9ab590ff4d9e2bd9439b01f13172bc66ca402f65ced29154faf535726263edd100ba3334a67cfaa5facfc889
@@ -16,6 +16,7 @@ AUX autofs-5.0.6-ipv6_name_lookup_regression.patch 1278 SHA256 fdc02dbb0896dbfc7
 AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch 4102 SHA256 7ea48494b1df75500333148f5e763028f883fda23639c0d32cb5b9bdee3f109b SHA512 6948861073c039aaf42b0ed3d4aec598f13a7a177aaa2563f270d8c50422629f88031617939ec4b23501be32894255cb2100df51d3c753f692efa64d0c1f50bd WHIRLPOOL aed6e1750f5b23d1eadee7113035c3df53aa8d1801452410efe025be860518addefedfb2d861012d8b111ed8fcc20230957a46bc9ac10d32eeeec28b16f9322f
 AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch 3895 SHA256 4f063e952349c0a4dba6895b2271034dd2905a649cdc0b672343123490e4aaa8 SHA512 6cd20edafead19072b27641971671eaf874a103b3cff19960ac87de9170753823f4b5fd6f15fdd25a275a9f3ff3a7eaea7c9797e8378ce45c3c5b438555fc090 WHIRLPOOL 2e3fccec3d89156c915798e09cd481aeffb5f39d1640397b8e6d71b14d997f1bea67004fcdb8a0ecfd7154ea6830a07745efd4de08b405e64d52f491dc8500e8
 AUX autofs-5.0.6-revert-ldap.patch 512 SHA256 67e4f23d0c1ef771f861ec295a2780d9c09b37d26718c21e3f20d3b4936738e9 SHA512 e929bbe145c19ac5180094205a9095387e90126e8360ede99ab972cca864c40c1caf779503454784804e925e0efc0b4c459accb734f63482c758989bb17d7313 WHIRLPOOL 70c541931415e7d35955196c683bef2bf08c16b920f7398a679eaa8abeda5364cd3f0afec674e02e126447ca5c29d8c2934eb33d3f09aeb48fa0ae7a798cc56f
+AUX autofs-5.0.7-mount-sloppy.patch 600 SHA256 244642785032d7b5c5114e714de0251584b67b24f5e9641f66d7c62183ebfcd2 SHA512 98ca3efe58cbc4247f9cf2e00edba19a2a227898f118511ca009ad6d7c67b06b2e4526e84cf94e8135031f72015df2e540a910dd259a0e28b49cc77e56c39f50 WHIRLPOOL 151d032f0d0a404faa1059e30ee4fc00b43dfc7e778faae6d00e4c379eb869f14cfb08aa2afd0d3befbadde67f7f285ff10289ec968061216674e833eccdc461
 AUX autofs.rc12 7807 SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c SHA512 1f5c747df09f4bbc38a31a803f817a14dd0721cf9e90517aa49cb4a0f5456d87e1d15d1a8b41ca3ac521b376bf4ce10c5105740c95f34f8b8d40c93abe605e3c WHIRLPOOL 0a840162d53c0eab3074fb1160450852d4e58e816e56d06c4293278f022fafb9627ca08efd3cc25172fe303505aeef3438d8d731570c341bf9411cdcf19ac2b1
 AUX autofs.rc13 7876 SHA256 d477a63305db5d0cc78e9f538cea745f733ae46305f71986c8a5abce1d2f0c56 SHA512 5130415323a93dc962d2360090dbe537b79e1276978f9f7005271aef888f39fe62cb85ae289477707b03b3734c98d3e5ab84c3652c02e96b57c93c58d9a15a96 WHIRLPOOL c490c308216dc094e24f3348e0720cfd35e97cfa80e93b69f31a1b202e8ef53baf68490dc93b9ea01c80c51780051ccd0535b43cca203bb3fce4041f5a70499c
 AUX autofs5-auto.master 756 SHA256 8651b42b338ffdb8be24ed88893ca90f95d0221f2684274957de154fd89df5cb SHA512 3c6e6dab6beb595f4bfa3af7be3c1f5343a80ea81bc9fb26e073e96ea1b75bf2fd304c4e54dad9ec1c233e01c62310bbdbc7f97a2370e82bc31138855819d3b2 WHIRLPOOL 2c5a885f76d6e2adfc6c3b5a739c7bf820ba48adfca28cd7a2a50b81ec150011b93f283b8bb5058a427bfd5c701b1da8cbd31fc9a15b121d310d3048dacfba72
@@ -93,14 +94,24 @@ EBUILD autofs-5.0.4-r5.ebuild 4931 SHA256 95e8c8f9c4ca3a08dae7b84317ed67082f65ee
 EBUILD autofs-5.0.6-r3.ebuild 3823 SHA256 2ff9fc2d64056626d13334b2c89e9c0fcc5d29d5d367ddd77638d5e624b5dad4 SHA512 03a6dca82c98237ca592134280c9f77fe7c52f0dc9679cd9bcd515c892cc7cacecda9b9674157ec9233794f37e48ce6fe10861012d32c6dc51748b220c1501e7 WHIRLPOOL 54d07695b0ddc8a8c7cfafd8f7b441e5433d6a42d4a0f204cedee55c964b456727a52474598ffb27e7f37671790012a78e3dec97a8f968c20cf67c962ba353fe
 EBUILD autofs-5.0.6-r4.ebuild 3894 SHA256 e28b1ac232cf470e339906ac879aee000fa1d1b138754f1e612f7ffd53b4e909 SHA512 8ac0c01b33c2627c43a6e659ceea517eba1ec8c4f2d53b3441a847dc320d78c21213ea34eff02b1a1655904a1e215c9ed7c097a4d9823d76cb20508a59038970 WHIRLPOOL 55592ed5e51fd91c6ff53e6600d32e7d729d895eb70a0571ece7311a5fa9b1a04022bd4a2d26c7b89b5c7fe1b8d807e073288828ce27947bfdd891a89445db23
 EBUILD autofs-5.0.6-r5.ebuild 3621 SHA256 674564d087a7bd0199adf8eae6403a3f64df04a2b0540aab476ffde83f5d980c SHA512 2a45b83372916c2a27cce6a93a6914b5cf1d60f414ab368bb6c552b8fdecb7079274ac5e5caae7e5445bd162e373344761cfe2e548e525aa31e8793eacee9463 WHIRLPOOL 9071ebc6617754c2bca2bc4207efabf02b411a39dda86df45c819420d1fcfce2c12cace8097d0cd8bcc872dc87759ca79dc78d044bebbff70029854abb903ae8
-EBUILD autofs-5.0.7-r1.ebuild 3514 SHA256 ac1b58793b77be669eb225393dcde8edf87851b150d3616600bf31eabb84e033 SHA512 56bea68e86706a504174cb0b09f320d23e4f27e94d992c925163adbf0cb2c327fffd890ff4a3ac9a9b88d2139592a2997ada0a4ee2417b435d69365b69c4e24b WHIRLPOOL 24672c9f4df1142729197254c6abd3f4ed15f3c447feabcea5ca9a42b32542a5bbcff0c3a3804b82bbf43552a00dbb5ff86b38f47448d88170e73e7f2fe354fe
+EBUILD autofs-5.0.7-r1.ebuild 3386 SHA256 2ca43451dc64d2d84cc098f409b03efeec82ae07d49e94f7d470a92cf0f25454 SHA512 740ced9e3408e6130e3e58b213102285749d0157e53baeb6cd0aecef192927c5c958ebc598eb795d3cf0963c5da5f08e52814c7d732bf0107c6d203676f04c75 WHIRLPOOL b887efb93a332bc4853c0a6101a25ea0b7d3e283f92c0d03dd430fafb15e9ad3b68650a4b1da7e6a22abd662a432dedb05acec271145beadb01fe564b57db071
 EBUILD autofs-5.0.7.ebuild 3709 SHA256 5c1988d743b9ac6805a3af576d4799940b326a80869033b70946b77e732917b9 SHA512 971376c69990158d8e4c7c9e258f54f60a931cc76e380dd4ef9fd868ec49f6843b1be32ef483fbd24cc6175a8af47f3d38be08feb8f0169d6ddb554bf221a32c WHIRLPOOL 153a9746f65ccdb9437122be405e79b4ef863eca483e928d73bfaf4434ebfb813f07211ad7ac0d4dcf0832129d1bb41344248ddbfe56b1da0d085bdb408c8319
-MISC ChangeLog 24883 SHA256 077d58beaa85ccf86ada99ad2ddb3b61a0ecf37af07222b229686da0d8a4c0c4 SHA512 ee784f115e225a84854c2b4a52902cce15825a6872b6bf0c95663f6b82c35a28170a554db8c374238e9f30768517227c5e991d31c7a77f2d9e6ce72d9e2a825e WHIRLPOOL 6acc4e5a9ed8202a76ec78f9f50a60423ead85abd329e496e5f841d11984be0790eb86295f57b3a6a4daac8a0c4a4d8fba39268485c62bcf88b33814d2240f8a
+MISC ChangeLog 25094 SHA256 abac4a8b43af2bf0b6f90120a51c1a6c41e870c721ab3c215c7fd017e5b8ccef SHA512 40d7a8a361a88cf9e1e0bb1773b742f80c4ca6b6451f694f1cea6acae6f92262a9c255c96556c4eb656463631e34521e14961dadce7710a9549d9ba186446e4e WHIRLPOOL da10bf93c5a9e343b66b52dbd3476b2cc0e9cd46f27493e561ba6c3c6295e2977599f51984aa9ee05709030881c44e45c30a83fd6205c3bbad59719f0950bb81
 MISC metadata.xml 783 SHA256 0ea5679b6617174e2df7b1aec0730ba6c5e10192fd602392a6df39513446f7af SHA512 5925723a9b22555250bff0da2a12579d2456eecab052ef8de21217ca19b90ee66639ad7abce12fa0a39c96c038ee229d5ba113901da3d92ae2a6c98af6077a1c WHIRLPOOL 9d746c73fb29e86df7a18560adc3b4d039604225ae12f5f3d8ba47cd90f84bb2b602504f0272f404cba6eac9870df93caef131e9e1500d43e289bcc007bf0aa0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlGEDJUACgkQgAnW8HDreRZeeQCeIsKJXBpApfNCW30Cf4Ny9ju8
-LGAAn0BG1tyCc21VhTz2+Ro+1SK2gniz
-=mA9v
+iQIcBAEBCAAGBQJRhULyAAoJELEHsLL7fEFWZMoP/iFhucHlERfXxGILagM7hv8+
+NO5WuPVHO8fL2ln9bNd2dvFP6R2bbcB8X2LIfndzcgQObp3xwIGV2ihacvE6Pz84
+r5Z9CcpevHT91ClPyCsyrzbklhqWRW8Pscm4l6wCj1oaebRkVvoBGqs/W6p0lRwA
+mbDkpWwXLo+dB8FRIjNUxpgaVXuohih4nAzOWoC7bOqmp1NP1dSJI7vt5DhcyJRD
+RBopdgIZOrvuD/EjhXMPNQnAWweXBAEWhxHxTGEWUJzmRRxHiYOnFyDBpnVauHc9
+NFgU6QozMcIZFdTyK+HO6XIUZgZK8Oh060W6LPH+2HX0vRVb8iViWPRTUTfM1Rpw
+mECFS+eORvrPH8Y5TI4YfE8JTCpmOVzBQriuKTBnj2FCWBKfmASlDHRjZYhW6J0i
+oICA/IlptEGwGnOHEp8lTH5OnwNl14gnFLZMP+u1wS+C4vD8IocIeZjyGzP1fSO+
+l9/JXbs45YsLtTwCL7ChMQboNXsXqH1KH0MCNT91KonC0VLGM7w0CgS8T5aHfD1J
+YLUaCcgOy1cHhlpHRdh/1Stw9yzZ6maUYY4bBzjORbIKbXoILspTgt7rdlu3gprb
+oWq5+M0nkhMAgWwjEYCBgBD7bdhJ5DyJ6gICVX9z0mRIhiYaJJVL3rydClZr6Dhg
+F50McQgVy6gSyEJjCnRk
+=oYEy
 -----END PGP SIGNATURE-----
diff --git a/net-fs/autofs/autofs-5.0.7-r1.ebuild b/net-fs/autofs/autofs-5.0.7-r1.ebuild
index 1762d244e227..c611f6d6a778 100644
--- a/net-fs/autofs/autofs-5.0.7-r1.ebuild
+++ b/net-fs/autofs/autofs-5.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r1.ebuild,v 1.1 2013/05/03 19:14:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r1.ebuild,v 1.2 2013/05/04 17:18:38 vapier Exp $
 
 EAPI=5
 
@@ -28,13 +28,15 @@ IUSE="hesiod ldap mount-locking sasl"
 REQUIRED_USE="sasl? ( ldap )"
 
 # currently, sasl code assumes the presence of kerberosV
-RDEPEND="
+RDEPEND=">=sys-apps/util-linux-2.20
 	hesiod? ( net-dns/hesiod )
 	ldap? ( >=net-nds/openldap-2.0
 		sasl? (
 			dev-libs/cyrus-sasl
 			dev-libs/libxml2
-			virtual/krb5 ) )"
+			virtual/krb5
+		)
+	)"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc"
@@ -53,11 +55,9 @@ PATCHES=(
 	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
 	"${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
 
-	# https://bugs.gentoo.org/show_bug.cgi?id=361899
-	"${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=381315
-	"${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch
+	"${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch #361899
+	"${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch #381315
+	"${FILESDIR}"/${PN}-5.0.7-mount-sloppy.patch #453778
 	)
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -72,10 +72,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
 	# --with-confdir is for bug #361481
 	# --with-mapdir is for bug #385113
 	# for systemd support (not enabled yet):
diff --git a/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch b/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch
new file mode 100644
index 000000000000..670d9bc7c547
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/453778
+
+we've had a stable util-linux that supports -s for a long time (and the ebuild
+forces a recent version), so disable this test which implicitly tries to modify
+files like /etc/mtab and piss off the sandbox.
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -65,7 +65,7 @@
+ AC_DEFUN(AF_SLOPPY_MOUNT,
+ [if test -n "$MOUNT" ; then
+   AC_MSG_CHECKING([if mount accepts the -s option])
+-  if "$MOUNT" -s > /dev/null 2>&1 ; then
++  if true > /dev/null 2>&1 ; then
+     AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])
+     AC_MSG_RESULT(yes)
+   else