Allow mtab to be writable when running tests with mount #265725 by Nick Fortino.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 57 insertions, 6 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index d2fd309e9bcf..152cc23023b6 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.246 2009/04/11 16:35:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.247 2009/04/12 07:25:24 vapier Exp $
+
+  12 Apr 2009; Mike Frysinger <vapier@gentoo.org> coreutils-7.1.ebuild,
+  coreutils-7.2.ebuild:
+  Allow mtab to be writable when running tests with mount #265725 by Nick
+  Fortino.
 
   11 Apr 2009; nixnut <nixnut@gentoo.org> coreutils-7.1.ebuild:
   ppc stable #265614
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index f842d1df61a9..44db0f998ee8 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX coreutils-6.10-selinux-opt.patch 1327 RMD160 b9db461ed7602e7098f91e6d2f80243fdf737338 SHA1 bd51347adbf88a764b863e1fdb61340e7fb69901 SHA256 47e233b4214a527131c84eaad7f1e998aa270087dda03cdc57ad88ea2f0b3b6f
 AUX gnulib-futimens-rename.patch 1323 RMD160 79f1bcd78441aa4bef1975ee68011cd5d68b7bf1 SHA1 f030ebc2f34f8b2ef59112e2f28f8eabeeb9f4fc SHA256 12d3ccbe88aef4f7218799d961e1fc4f56609c59bd739cfc6e3965838e6893a1
 AUX gnulib-utimens-update.patch 3023 RMD160 92ec648720090636366c3e03ba3f173e4b48c1c9 SHA1 963617be45ab53df762a61ee09608771bf6d67c0 SHA256 e2653050dff4bf86e533205b30001575e113e9e32dacb5169b17e6729c0079e2
@@ -21,7 +24,14 @@ EBUILD coreutils-6.11.ebuild 4517 RMD160 77fd1660c6021e8ae78cd29c4b480c2b276ac41
 EBUILD coreutils-6.12-r1.ebuild 4659 RMD160 22ddabf52d0e9a7d6b96f0fb13025abfa6a9824d SHA1 7a4b80ac853334f2f8b74527943a6506c3c6fdfb SHA256 4d4773f9a6568bf39e74c088886882eebd896ae3cce401326d8b10eb025f7048
 EBUILD coreutils-6.12-r2.ebuild 4805 RMD160 08ad9a76dd999f1154d2488df339e8c44eb662cf SHA1 9472ca68afdfa6b6be7bde3c41de7e81d596a350 SHA256 b814464fd3d9aa3d218269178a229e0fd928d5d23bf506b691442a5c0011a3cd
 EBUILD coreutils-6.9-r1.ebuild 4903 RMD160 084abf9060b3d24c8ff93ce6b6f06003e9fe7c80 SHA1 ec66d32b4e58e24f2fc7fcdc6f39953ef32f5376 SHA256 963b2ca3044382e97f68f1f1c5c0dea875c7c68a0fcafef6aceae6e4e26cbf75
-EBUILD coreutils-7.1.ebuild 3639 RMD160 93c0b9b4867ee4e9f729d7189fe819b66d5478eb SHA1 cade42e5b9bc03c17379574e9f6d231e15e6b730 SHA256 a65e37c8eb28046182a3137450fa2717c486afd9060170fd1bf563b1a94f97b8
-EBUILD coreutils-7.2.ebuild 3640 RMD160 cebba31a6839eb940e285fd84fdf95c446e75c76 SHA1 698bd16103c289ea79011e699ce67cec8e109689 SHA256 8bc5b858000f7e79ad6d9eaa7c240d2b71d6016bf81e28b09bb5aeca440f5b8d
-MISC ChangeLog 37041 RMD160 4a288a04d63883df20dd4835d11e0f73f0234ebf SHA1 ec044e08b39a34f75b970ae74258659b8f2f1b2f SHA256 75e23c56270b2b6b4295ab7c8cb0118874ce3a8134971085dd7aaa12919ef548
+EBUILD coreutils-7.1.ebuild 4078 RMD160 f40a1a4d9d95b867c79bae31d4f43dae5ea8675b SHA1 11ff845ac426d68416c5ecbdbff83aa13465c4da SHA256 aed2ee22fafc4bd1dd1a8d71baaf3b44c078403080d96e62cdfe4f880b9ea773
+EBUILD coreutils-7.2.ebuild 4078 RMD160 d886acd9a64b2814a814a29b20e4047adb433215 SHA1 02764865744e94b003bff993c22cd91e30c2d1ab SHA256 6588f51b4ce7c037f7f49955be34731f010a687c34706d1884f509d19073c089
+MISC ChangeLog 37223 RMD160 ff365cf1bad9bdac766dd40c513145f854f691eb SHA1 3ae8ce4f1875c3fe178b5e8f60568365380ec34d SHA256 244a04f6486b2379c54e08a801e79b1eb5df71b18ec5f0bbb442714392a8bcdf
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknhl2wACgkQn/5bYzqsSmGGYgCgib9h7FcRdIL7IutpHzrdzDYd
+6DEAnilUjeWl92o3VQsHtMP38GlvxPKf
+=gPbJ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-7.1.ebuild b/sys-apps/coreutils/coreutils-7.1.ebuild
index 1b9c7a0e0248..2786262c3957 100644
--- a/sys-apps/coreutils/coreutils-7.1.ebuild
+++ b/sys-apps/coreutils/coreutils-7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.1.ebuild,v 1.9 2009/04/11 16:35:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.1.ebuild,v 1.10 2009/04/12 07:25:25 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -76,9 +76,27 @@ src_test() {
 	# accessible to non-root users
 	chmod -R go-w "${WORKDIR}"
 	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	mkdir -p "${T}"/mount-wrappers
+	mkwrap() {
+		local w ww
+		for w in "$@" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab" $(type -P $w) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
 	addwrite /dev/full
 	#export RUN_EXPENSIVE_TESTS="yes"
 	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
 	emake -j1 -k check || die "make check failed"
 }
 
diff --git a/sys-apps/coreutils/coreutils-7.2.ebuild b/sys-apps/coreutils/coreutils-7.2.ebuild
index 018f33e3571a..017fdebee38d 100644
--- a/sys-apps/coreutils/coreutils-7.2.ebuild
+++ b/sys-apps/coreutils/coreutils-7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.2.ebuild,v 1.2 2009/04/02 01:28:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.2.ebuild,v 1.3 2009/04/12 07:25:25 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -76,9 +76,27 @@ src_test() {
 	# accessible to non-root users
 	chmod -R go-w "${WORKDIR}"
 	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	mkdir -p "${T}"/mount-wrappers
+	mkwrap() {
+		local w ww
+		for w in "$@" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab" $(type -P $w) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
 	addwrite /dev/full
 	#export RUN_EXPENSIVE_TESTS="yes"
 	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
 	emake -j1 -k check || die "make check failed"
 }