Skip fprint-unwritable.exp test when run as root #180412 by Steffen Bergner.

Package-Manager: portage-2.1.2.9

4 files changed, 43 insertions, 18 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 7bd280f30265..66aedbe2405c 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.117 2007/06/10 04:41:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.118 2007/06/11 05:35:31 vapier Exp $
+
+  11 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/findutils-4.3.6-fprint-unwritable.patch, findutils-4.3.6-r1.ebuild:
+  Skip fprint-unwritable.exp test when run as root #180412 by Steffen Bergner.
 
   10 Jun 2007; Chris PeBenito <pebenito@gentoo.org>
   +files/findutils-4.3.6-selinux.diff, findutils-4.3.6-r1.ebuild:
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 5befab65e686..509a1cfbb793 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -21,6 +21,10 @@ AUX findutils-4.3.4-selinux.diff 15890 RMD160 e2c978d09582379443eed82c2e9ea29772
 MD5 480f401c6801b26daab78931f7643862 files/findutils-4.3.4-selinux.diff 15890
 RMD160 e2c978d09582379443eed82c2e9ea29772e66e9b files/findutils-4.3.4-selinux.diff 15890
 SHA256 4aa982fd9891f1204537e8f10c20a26dca1b8104b02eef7edc2f74cd4ee3c3bf files/findutils-4.3.4-selinux.diff 15890
+AUX findutils-4.3.6-fprint-unwritable.patch 703 RMD160 7c10a4b17633c429f383e80e719863febb7d08fa SHA1 8e49d0bac7441428812d0e2dc2a64d9e766ffa78 SHA256 151032c79d07298c7ca6c444a2ae878d2a7157b7be0ff0907b6badf2687ccf90
+MD5 fcac62817927d4416045396a54dcf3ea files/findutils-4.3.6-fprint-unwritable.patch 703
+RMD160 7c10a4b17633c429f383e80e719863febb7d08fa files/findutils-4.3.6-fprint-unwritable.patch 703
+SHA256 151032c79d07298c7ca6c444a2ae878d2a7157b7be0ff0907b6badf2687ccf90 files/findutils-4.3.6-fprint-unwritable.patch 703
 AUX findutils-4.3.6-selinux.diff 15700 RMD160 bb4a7fcc3b0fc3a55cd21eaf33f50101f9ca277e SHA1 4415cd5a66ac2ea8da9dbff270b4b081e39c2b4d SHA256 eb2589a2fb21cf2783849ca32b783bf5ea33e7dbb23530d911036eb9465952b7
 MD5 185d5a08c9a54c70e02b6e9ff4ee6e11 files/findutils-4.3.6-selinux.diff 15700
 RMD160 bb4a7fcc3b0fc3a55cd21eaf33f50101f9ca277e files/findutils-4.3.6-selinux.diff 15700
@@ -64,14 +68,14 @@ EBUILD findutils-4.3.4.ebuild 1720 RMD160 128f5c1507e69cd199425b4e2ebedac1f8cc56
 MD5 65c4c2a860c200e69abd3743ee18abe3 findutils-4.3.4.ebuild 1720
 RMD160 128f5c1507e69cd199425b4e2ebedac1f8cc568f findutils-4.3.4.ebuild 1720
 SHA256 e4ed69e2d57715d6ed02ea0ab3a632e71448220ae30d9197b5573f4858dd6c40 findutils-4.3.4.ebuild 1720
-EBUILD findutils-4.3.6-r1.ebuild 1791 RMD160 a3e829896c355482cd0a998c5db18a89b7d7091a SHA1 1d1a21dff4793d948faf4a549d1860c8e82590e2 SHA256 58a30ac5d850038af38f53ee4e03d5c870a78bb7345de0b441bb31dce9dd2ab9
-MD5 bbfdb7abd8a636d5fce1b26be07fcaf0 findutils-4.3.6-r1.ebuild 1791
-RMD160 a3e829896c355482cd0a998c5db18a89b7d7091a findutils-4.3.6-r1.ebuild 1791
-SHA256 58a30ac5d850038af38f53ee4e03d5c870a78bb7345de0b441bb31dce9dd2ab9 findutils-4.3.6-r1.ebuild 1791
-MISC ChangeLog 17288 RMD160 b9fc626c25edfc3a02c44b7a748d57159dc02a80 SHA1 8cc0430f670f182126b284865a281b04e206a0e8 SHA256 4dbc4afd9a1a1ce192129d4f41ccb3c9c8725fb873f223cb63927ab1e8a02577
-MD5 d99b651822054f6120beb8f223a84c45 ChangeLog 17288
-RMD160 b9fc626c25edfc3a02c44b7a748d57159dc02a80 ChangeLog 17288
-SHA256 4dbc4afd9a1a1ce192129d4f41ccb3c9c8725fb873f223cb63927ab1e8a02577 ChangeLog 17288
+EBUILD findutils-4.3.6-r1.ebuild 1705 RMD160 6c92a74edf2d687b3337bf99ce739fa089e993d7 SHA1 292bde349f22cacc66c7f78191c12169e0874847 SHA256 a48b36ba55241543ede6483741e8b34b9c05f961a1e939fcf0cc33f88f92ee5f
+MD5 3403f9c799ba93e34e7fe9fc59389e8b findutils-4.3.6-r1.ebuild 1705
+RMD160 6c92a74edf2d687b3337bf99ce739fa089e993d7 findutils-4.3.6-r1.ebuild 1705
+SHA256 a48b36ba55241543ede6483741e8b34b9c05f961a1e939fcf0cc33f88f92ee5f findutils-4.3.6-r1.ebuild 1705
+MISC ChangeLog 17493 RMD160 3bc47971161084ae86818f3eb3548f54b56ae432 SHA1 80b4eb876e2935f43a86e956fad6ebf253245e78 SHA256 4f151c590cb4ef7340ea6303b6a001ffd4e8a7a69e36c92dddff607552c47370
+MD5 8c91ee47e7552347f368b23a1ff1ac84 ChangeLog 17493
+RMD160 3bc47971161084ae86818f3eb3548f54b56ae432 ChangeLog 17493
+SHA256 4f151c590cb4ef7340ea6303b6a001ffd4e8a7a69e36c92dddff607552c47370 ChangeLog 17493
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -100,7 +104,7 @@ SHA256 c103a7b4436890f6e83e17da483a40d1e98c2d1aa34ed8226ae1ea312bcb7db6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbNyl8bi6rjpTunYRAt9PAKDB0cx0WeBOWm5TPWe0Shs6HbqjIQCeLXgv
-Auc5dHSlJPHe1rl9t8hBR0Q=
-=p9rf
+iD8DBQFGbN8p8bi6rjpTunYRAoVzAJ4mmfiiZwjNfCcP4aCNttmabXwXJACeJSnl
+EOK1UU5apArDVW5+U2tWvDI=
+=+FR3
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.3.6-fprint-unwritable.patch b/sys-apps/findutils/files/findutils-4.3.6-fprint-unwritable.patch
new file mode 100644
index 000000000000..29edb0f566d3
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.6-fprint-unwritable.patch
@@ -0,0 +1,21 @@
+this will always fail as root
+
+http://bugs.gentoo.org/180412
+
+--- find/testsuite/find.gnu/fprint-unwritable.exp
++++ find/testsuite/find.gnu/fprint-unwritable.exp
+@@ -3,5 +3,12 @@
+ file mkdir tmp
+ exec touch tmp/unwritable
+ exec chmod 444 tmp/unwritable
+-find_start f { tmp -fprint tmp/unwritable }
+-exec rm -rf tmp
++if [ file readable tmp/unwritable ] {
++    # On Cygwin, a user with admin rights can read all files, and 
++    # access(foo,R_OK) correctly returns 1 for all files.
++    warning "You have superuser privileges, skipping this test."
++    untested {skipping this test because you have superuser privileges}
++} else {
++    find_start f { tmp -fprint tmp/unwritable }
++    exec rm -rf tmp
++}
diff --git a/sys-apps/findutils/findutils-4.3.6-r1.ebuild b/sys-apps/findutils/findutils-4.3.6-r1.ebuild
index 9e54c687a518..16b6e3ba7909 100644
--- a/sys-apps/findutils/findutils-4.3.6-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.6-r1.ebuild,v 1.2 2007/06/10 04:41:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.6-r1.ebuild,v 1.3 2007/06/11 05:35:31 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-sv-bug-20005.patch #180334
+	epatch "${FILESDIR}"/${P}-fprint-unwritable.patch #180412
 
 	# Don't build or install locate because it conflicts with slocate,
 	# which is a secure version of locate.  See bug 18729
@@ -32,11 +33,6 @@ src_unpack() {
 
 	# Patches for selinux
 	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-
-	if ! has userpriv ${FEATURES} ; then
-		sed -i '/access.exp/d' find/testsuite/Makefile.in
-		rm -f find/testsuite/find.gnu/access.{exp,xo}
-	fi
 }
 
 src_compile() {