2.1_pre7-r1 regression fix revbump

(Portage version: 2.1_pre7-r1)

7 files changed, 223 insertions, 15 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index db0f0ca4c5f1..5f84e0fda76e 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # 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.98 2006/03/25 16:39:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.99 2006/03/26 07:59:10 zmedico Exp $
+
+*portage-2.1_pre7-r1 (26 Mar 2006)
+
+  26 Mar 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_pre7-r1.ebuild,
+  +files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch,
+  +files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch,
+  +files/2.1_pre7/1040_r3015_user_fetch.patch:
+  Regression fixes for bug #127563, bug #127573, and fetch permission for
+  users in the portage group (reported by truedfx).
 
 *portage-2.1_pre7 (25 Mar 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a52a3a8a12da..2307e4d03940 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f7d9c7bc5fd0112ffe20bedf99584bcd ChangeLog 10191
-RMD160 38367ba8a61342b562ddb202bcfeeb612021c004 ChangeLog 10191
-SHA256 66bbfb141dd15cad772add1d373d31351e7dc7738e9077f0db7c74c8c8a30728 ChangeLog 10191
+MD5 3583ed59ef5e0d3bf6ad46fc055f7058 ChangeLog 10592
+RMD160 0d98594e3b04f5e8bd19c5f1369e006a7d820817 ChangeLog 10592
+SHA256 4595f23ac0c7192b1167ace96b6d15d4408450282e5029439a4a0d2d19f238d7 ChangeLog 10592
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -70,6 +70,15 @@ SHA256 ce4eb3023d4d2a1a2ca52778b843f90d85a147030e190e2bd2bd4473ea2561d2 files/2.
 MD5 c2b78a47a57679befb0b05a2983ff321 files/2.1_pre7/1010_r3004_lazy_virtuals.patch 7519
 RMD160 1e1cf9086c235ea9b89a661d6f1e0bdd8dbad72a files/2.1_pre7/1010_r3004_lazy_virtuals.patch 7519
 SHA256 b25090b81b82afeea8492ae2080db1f15130fc1bb9845d0272da36055233050e files/2.1_pre7/1010_r3004_lazy_virtuals.patch 7519
+MD5 8d4e3a72650d231b182368b0a06d2c36 files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch 385
+RMD160 a85c3c523a2f40b5f4220a1d7372dec2da86f496 files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch 385
+SHA256 a7c23f45f97c1c645ac03cdb731f6c992faa772200734e98b176d1d6c7884d91 files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch 385
+MD5 e954c9807bb789151bb72dbc82806fff files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch 5126
+RMD160 9de354cb09921aeb5a89f0ee3671bf42dc608605 files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch 5126
+SHA256 383ccf7caec1d78afdfbc3534d5b17771db5dac0b79f5411390afabcdc50d4b7 files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch 5126
+MD5 5411976690e9b0e6504bae7ce912e1c1 files/2.1_pre7/1040_r3015_user_fetch.patch 1078
+RMD160 d992189579ee7ce98ee555a1cbbc9b3c2db144e0 files/2.1_pre7/1040_r3015_user_fetch.patch 1078
+SHA256 b1302a847c2d6ac746ec19cd09efb2cf9a38b0aa9b38f2997c958651715de1a5 files/2.1_pre7/1040_r3015_user_fetch.patch 1078
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -88,9 +97,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di
 MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r7 253
 RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r7 253
 SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r7 253
-MD5 6aebb952d3a284aa4f52d7e5dc7791de files/digest-portage-2.1_pre7 253
-RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7 253
-SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7 253
+MD5 6aebb952d3a284aa4f52d7e5dc7791de files/digest-portage-2.1_pre7-r1 253
+RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7-r1 253
+SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7-r1 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -112,13 +121,13 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-
 MD5 da44da773a57bcbbe8f0c52573812d2e portage-2.1_pre6-r7.ebuild 5819
 RMD160 1ad330182592ffd5637aabed39f3ba52dc29285d portage-2.1_pre6-r7.ebuild 5819
 SHA256 634bed09fc46df9611027f97c3e658c6a11ab237ddc2c774bf10aadeda7f7451 portage-2.1_pre6-r7.ebuild 5819
-MD5 a9ce266c809db4dbb13819c046f74e23 portage-2.1_pre7.ebuild 5355
-RMD160 9124f59e152e5c5e34ffd0216c1292194642336b portage-2.1_pre7.ebuild 5355
-SHA256 b64a1d66de594a73cb17ed24232669a310fe0b89b0d2835a398edccca5ca3fb8 portage-2.1_pre7.ebuild 5355
+MD5 12aefe39f849c45ce71553ba4dd50e83 portage-2.1_pre7-r1.ebuild 5466
+RMD160 920fb6a3be0a36fc38389548f2fc7d89ba1fda02 portage-2.1_pre7-r1.ebuild 5466
+SHA256 594f97d87887dc720ef9f0cb278c487015514ad43d6d55cee425f3cad67639ef portage-2.1_pre7-r1.ebuild 5466
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEJXI3/ejvha5XGaMRAiVgAJ9WkNRPMPppVvPJKV6vd0Cl9IUNMQCfSoVm
-aR0qeeh+3xmPgGcLdi312UM=
-=pJHJ
+iD8DBQFEJkkj/ejvha5XGaMRArOZAKC2xwF04+aQU36ikw5F0BDT1yiV1gCfa2vf
+eoPxqDf8GfSl492jML4aBUs=
+=3Jn9
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch b/sys-apps/portage/files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch
new file mode 100644
index 000000000000..6c715a13af97
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch
@@ -0,0 +1,13 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -214,7 +214,7 @@
+ 		if stat.S_ISDIR(pathstat[stat.ST_MODE]):
+ 			mtime = pathstat[stat.ST_MTIME]
+ 		else:
+-			raise portage_exception.PortageException
++			raise portage_exception.DirectoryNotFound(mypath)
+ 	except (IOError,OSError,portage_exception.PortageException):
+ 		if EmptyOnError:
+ 			return [], []
+
diff --git a/sys-apps/portage/files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch b/sys-apps/portage/files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch
new file mode 100644
index 000000000000..727fca9c9b15
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch
@@ -0,0 +1,141 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -2564,70 +2564,72 @@
+ 			writemsg("File Not Found: '%s'\n" % str(e))
+ 			return 1
+ 
+-	if "ccache" in features:
+-		ccache_enabled = True
+-		if "CCACHE_DIR" not in mysettings or "" == mysettings["CCACHE_DIR"]:
+-			mysettings["CCACHE_DIR"] = os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache")
+-
+-		ccache_enabled = makedirs(mysettings["CCACHE_DIR"])
+-
+-		if ccache_enabled:
+-			ccache_enabled = apply_recursive_permissions(
+-				mysettings["CCACHE_DIR"], gid=portage_gid,
+-				dirmode=02070, dirmask=02,
+-				filemode=060, filemask=02)
+-
+-		if not ccache_enabled:
+-			writemsg("!!! Failed resetting perms on CCACHE_DIR='%s'\n" % mysettings["CCACHE_DIR"])
+-			features.remove("ccache")
+-			mysettings["FEATURES"] = " ".join(features)
+-
+-		del ccache_enabled
+-
+-	if "confcache" in features:
+-		confcache_enabled = True
+-		if "CONFCACHE_DIR" not in mysettings:
+-			mysettings["CONFCACHE_DIR"] = os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache")
+-
+-		confcache_enabled = makedirs(mysettings["CONFCACHE_DIR"])
+-
+-		if confcache_enabled:
+-			confcache_enabled = apply_recursive_permissions(
+-				mysettings["CONFCACHE_DIR"], gid=portage_gid,
+-				dirmode=02070, dirmask=02,
+-				filemode=060, filemask=02)
+-
+-		if not confcache_enabled:
+-			writemsg("!!! Failed resetting perms on confcachedir %s\n" % mysettings["CONFCACHE_DIR"])
+-			features.remove("confcache")
+-			mysettings["FEATURES"] = " ".join(features)
+-
+-		del confcache_enabled
+-
+-	if "distcc" in features:
+-		
+-		distcc_enabled = True
+-
+-		if "DISTCC_DIR" not in mysettings or "" == mysettings["DISTCC_DIR"]:
+-			mysettings["DISTCC_DIR"] = os.path.join(mysettings["BUILD_PREFIX"], ".distcc")
+-		for x in ("", "lock", "state"):
+-			mydir = os.path.join(mysettings["DISTCC_DIR"], x)
+-			if not makedirs(mydir):
+-				distcc_enabled = False
+-				break
+-
+-		if distcc_enabled:
+-			distcc_enabled = apply_recursive_permissions(
+-			mysettings["DISTCC_DIR"], gid=portage_gid,
+-			dirmode=02070, dirmask=02, filemode=060, filemask=02)
+-
+-		if not distcc_enabled:
+-			writemsg("\n!!! File system problem when setting DISTCC_DIR directory permissions.\n")
+-			writemsg(  "!!! DISTCC_DIR="+str(mysettings["DISTCC_DIR"]+"\n"))
+-			time.sleep(5)
+-			features.remove("distcc")
+-			mysettings["FEATURES"] = " ".join(features)
+-			mysettings["DISTCC_DIR"]=""
++	features_dirs = {
++		"ccache":{
++			"basedir_var":"CCACHE_DIR",
++			"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"),
++			"always_recurse":False},
++		"confcache":{
++			"basedir_var":"CONFCACHE_DIR",
++			"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache"),
++			"always_recurse":True},
++		"distcc":{
++			"basedir_var":"DISTCC_DIR",
++			"default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"),
++			"subdirs":("lock", "state"),
++			"always_recurse":True}
++	}
++	dirmode  = 02070
++	filemode =   060
++	modemask =    02
++	for myfeature, kwargs in features_dirs.iteritems():
++		if myfeature in features:
++			basedir = mysettings[kwargs["basedir_var"]]
++			if basedir == "":
++				basedir = kwargs["default_dir"]
++				mysettings[kwargs["basedir_var"]] = basedir
++			try:
++				mydirs = [mysettings[kwargs["basedir_var"]]]
++				if "subdirs" in kwargs:
++					for subdir in kwargs["subdirs"]:
++						mydirs.append(os.path.join(basedir, subdir))
++				for mydir in mydirs:
++					if not makedirs(mydir):
++						raise portage_exception.DirectoryNotFound(
++							"Failed to create directory.")
++					try:
++						initial_stat = os.stat(mydir)
++						apply_secpass_permissions(mydir,
++							gid=portage_gid, mode=dirmode, mask=modemask, stat_cached=initial_stat)
++						result_stat = os.stat(mydir)
++					except OSError, oe:
++						if errno.EPERM == oe.errno:
++							writemsg("!!! %s\n" % oe)
++							raise portage_exception.OperationNotPermitted("stat('%s')" % mydir)
++						raise
++					# To avoid excessive recursive stat calls, we trigger
++					# recursion when the top level directory does not initially
++					# match our permission requirements.
++					if kwargs["always_recurse"] or \
++					result_stat.st_gid != initial_stat.st_gid or \
++					result_stat.st_mode & 07777 != initial_stat.st_mode & 07777:
++						if not kwargs["always_recurse"]:
++							writemsg("Adjusting permissions recursively: '%s'" % mydir)
++						def onerror(e):
++							raise	# The feature is disabled if a single error
++									# occurs during permissions adjustment.
++						if not apply_recursive_permissions(mydir,
++						gid=portage_gid, dirmode=dirmode, dirmask=modemask,
++						filemode=filemode, filemask=modemask, onerror=onerror):
++							raise portage_exception.OperationNotPermitted(
++								"Failed to apply recursive permissions for the portage group.")
++			except portage_exception.PortageException, e:
++				features.remove(myfeature)
++				mysettings["FEATURES"] = " ".join(features)
++				writemsg("!!! %s\n" % str(e))
++				writemsg("!!! Failed resetting perms on %s='%s'\n" % (kwargs["basedir_var"], basedir))
++				writemsg("!!! Disabled FEATURES='%s'\n" % myfeature)
++				time.sleep(5)
+ 
+ 	workdir_mode = 0700
+ 	try:
+
diff --git a/sys-apps/portage/files/2.1_pre7/1040_r3015_user_fetch.patch b/sys-apps/portage/files/2.1_pre7/1040_r3015_user_fetch.patch
new file mode 100644
index 000000000000..803d8dd3cee1
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1040_r3015_user_fetch.patch
@@ -0,0 +1,33 @@
+=== modified file 'bin/emerge'
+--- bin/emerge	
++++ bin/emerge	
+@@ -611,16 +611,23 @@
+ 	print "emerge: wheel group use is being deprecated. Please update group and passwd to"
+ 	print "        include the portage user as noted above, and then use group portage."
+ 
++if "--debug" in myopts:
++	print "myaction", myaction
++	print "myopts", myopts
++
+ # check if root user is the current user for the actions where emerge needs this
+ if portage.secpass < 2:
+ 	# We've already allowed "--version" and "--help" above.
+ 	if "--pretend" not in myopts and \
+ 	myaction not in ("search","info"):
+-		if "--debug" in myopts:
+-			print "myaction",myaction
+-			print "myopts",myopts
+-		print "emerge: root access required."
+-		sys.exit(1)
++		if portage.secpass >= 1:
++			if "--fetchonly" not in myopts and \
++			"--fetch-all-uri" not in myopts:
++				print "emerge: root access required."
++				sys.exit(1)
++		else:
++			print "emerge: root access required."
++			sys.exit(1)
+ 
+ if not "--pretend" in myopts:
+ 	emergelog("Started emerge on: "+time.strftime("%b %d, %Y %H:%M:%S", time.localtime()))
+
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre7 b/sys-apps/portage/files/digest-portage-2.1_pre7-r1
index 2892d68c8269..2892d68c8269 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre7
+++ b/sys-apps/portage/files/digest-portage-2.1_pre7-r1
diff --git a/sys-apps/portage/portage-2.1_pre7.ebuild b/sys-apps/portage/portage-2.1_pre7-r1.ebuild
index 2248e2c76364..d439b6013fec 100644
--- a/sys-apps/portage/portage-2.1_pre7.ebuild
+++ b/sys-apps/portage/portage-2.1_pre7-r1.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_pre7.ebuild,v 1.1 2006/03/25 16:39:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre7-r1.ebuild,v 1.1 2006/03/26 07:59:10 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -32,7 +32,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	local my_patches="1000_r2994_workdir_mode.patch
-		1010_r3004_lazy_virtuals.patch"
+		1010_r3004_lazy_virtuals.patch
+		1020_r3006_bug_127573_cachedir.patch
+		1030_r3009_bug_127563_ccache_stat.patch
+		1040_r3015_user_fetch.patch"
 	for patch_name in ${my_patches}; do
 		einfo "Applying ${patch_name} ..."
 		patch -p0 --no-backup-if-mismatch < \