2.1_pre6-r5 regression fix revbump to fix sandbox feature (broken in 2.1_pre6-r4 only)

(Portage version: 2.1_pre6-r5)

5 files changed, 46 insertions, 22 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index df0e0382216a..2bb967e36499 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.93 2006/03/19 07:52:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.94 2006/03/20 09:22:52 zmedico Exp $
+
+*portage-2.1_pre6-r5 (20 Mar 2006)
+
+  20 Mar 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_pre6-r5.ebuild,
+  +files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch:
+  Regression fix to restore sandbox functionality which was disabled by the
+  patch for bug #126711.
 
 *portage-2.1_pre6-r4 (19 Mar 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b45e54c5a0b9..16342e9ccbb7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 810bc14b20f5a060afd35753aa30f491 ChangeLog 8994
-RMD160 32ea0bac21ac75f5172055abdfd19b0433fea025 ChangeLog 8994
-SHA256 5f58d549554da5cd7ed2cdace7776478ad3491b31e272a26de751b68162532b0 ChangeLog 8994
+MD5 1d520b14e6a4d59d108d84ac1d02c19b ChangeLog 9263
+RMD160 1e19053826994dd7f49cb696c25db19ec1bea975 ChangeLog 9263
+SHA256 112f73acb1cc4c53f562720a7550fe4bed3fb9f83c03478224909ed342f5aed7 ChangeLog 9263
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -76,6 +73,9 @@ SHA256 4c0408d50baa5f2d1626bbf2f6ba8e2f43142b9f395743b967359ad91e7c501c files/2.
 MD5 5e1d4905fb8abf98958fc5f4f3f8bb3c files/2.1_pre6/1130_r2942_inst_uid_gid_defaults.patch 1877
 RMD160 02b9fd30da57729a7cf4465ba6e75526258153bb files/2.1_pre6/1130_r2942_inst_uid_gid_defaults.patch 1877
 SHA256 611095c6496b7d7c85b290946713c5f09e986b30aea0ee72c543bea61a397d17 files/2.1_pre6/1130_r2942_inst_uid_gid_defaults.patch 1877
+MD5 c5dc6c52c74178a2b32fc773bb60f85d files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch 683
+RMD160 ea7ecf8662d49b4368717b62b98af699ac4f3f7c files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch 683
+SHA256 458170db1bf28cc788b5b1ace204148a7fe51867d10a4f92aa8a2aef0ddb530d files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch 683
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -94,9 +94,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di
 MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r4 253
 RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r4 253
 SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r4 253
-MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r4 253
-RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r4 253
-SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r4 253
+MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r5 253
+RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r5 253
+SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r5 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -118,13 +118,6 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-
 MD5 f1758097241d74ff2fbfecea1e831732 portage-2.1_pre5-r4.ebuild 5072
 RMD160 381f37b7fc7c2fd218fff4375f9f7672e4c69d10 portage-2.1_pre5-r4.ebuild 5072
 SHA256 f21564ed3d7f7ac1822464e8bc21d1f69cefe418582fba1ba6f146841899e99c portage-2.1_pre5-r4.ebuild 5072
-MD5 0abd221cc26a92fca2e8d398176de879 portage-2.1_pre6-r4.ebuild 5629
-RMD160 41673caa69d0aea10455de64e4d0b6a546f05fe1 portage-2.1_pre6-r4.ebuild 5629
-SHA256 85ef15af0275af548ee132cfae9c34d3b6411869a6836da993165685e95afe65 portage-2.1_pre6-r4.ebuild 5629
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHQ3X/ejvha5XGaMRAqX4AJ0XavuGb0Uo1f7+LYFU5W4SxlD0hQCfbK3T
-YDWAWI8rCKJSpseaJwEjZ18=
-=rnnX
------END PGP SIGNATURE-----
+MD5 32dc71477173c6621a10c5b0e3e190d1 portage-2.1_pre6-r5.ebuild 5667
+RMD160 b8c06b685cd111b0527aa5cd9d52b5018e6e8ef6 portage-2.1_pre6-r5.ebuild 5667
+SHA256 16ba7ae3430c827b5b646ff9538bea60a2ac25880488caa568fae77ee05c0ac0 portage-2.1_pre6-r5.ebuild 5667
diff --git a/sys-apps/portage/files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch b/sys-apps/portage/files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch
new file mode 100644
index 000000000000..72bc07c44d08
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1140_r2963_bug_126711_sandbox.patch
@@ -0,0 +1,23 @@
+Index: pym/portage.py
+===================================================================
+--- pym/portage.py	(revision 2961)
++++ pym/portage.py	(working copy)
+@@ -1641,15 +1641,17 @@
+ 
+ 	if free:
+ 		keywords["opt_name"] += " bash"
++		spawn_func = portage_exec.spawn_bash
+ 	else:
+ 		keywords["opt_name"] += " sandbox"
++		spawn_func = portage_exec.spawn_sandbox
+ 
+ 	if sesandbox:
+ 		con = selinux.getcontext()
+ 		con = string.replace(con, mysettings["PORTAGE_T"], mysettings["PORTAGE_SANDBOX_T"])
+ 		selinux.setexec(con)
+ 
+-	retval = portage_exec.spawn_bash(mystring, env=env, **keywords)
++	retval = spawn_func(mystring, env=env, **keywords)
+ 
+ 	if sesandbox:
+ 		selinux.setexec(None)
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre6-r4 b/sys-apps/portage/files/digest-portage-2.1_pre6-r5
index b5fd1fd89f2d..b5fd1fd89f2d 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre6-r4
+++ b/sys-apps/portage/files/digest-portage-2.1_pre6-r5
diff --git a/sys-apps/portage/portage-2.1_pre6-r4.ebuild b/sys-apps/portage/portage-2.1_pre6-r5.ebuild
index 180634cf9e42..0c0515dddd64 100644
--- a/sys-apps/portage/portage-2.1_pre6-r4.ebuild
+++ b/sys-apps/portage/portage-2.1_pre6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r4.ebuild,v 1.1 2006/03/19 07:52:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r5.ebuild,v 1.1 2006/03/20 09:22:53 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -44,7 +44,8 @@ src_unpack() {
 		1100_r2890_bug_126120_applied_useflags.patch
 		1110_r2947_bug_126711_selinux_context.patch
 		1120_r2952_bug_126756_nocolor_ebuild.patch
-		1130_r2942_inst_uid_gid_defaults.patch"
+		1130_r2942_inst_uid_gid_defaults.patch
+		1140_r2963_bug_126711_sandbox.patch"
 	for patch_name in ${my_patches}; do
 		einfo "Applying ${patch_name} ..."
 		patch -p0 --no-backup-if-mismatch < "${FILESDIR}"/${PV}/${patch_name} >/dev/null || die "Failed to apply patch"