2.1_pre7-r4 bug fix revbump

Package-Manager: portage-2.1_pre7-r4

6 files changed, 172 insertions, 15 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 1ad8d6d2911a..7f705a2acbd0 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.103 2006/03/31 18:40:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.104 2006/04/03 06:49:53 zmedico Exp $
+
+*portage-2.1_pre7-r4 (03 Apr 2006)
+
+  03 Apr 2006; <zmedico@gentoo.org> +portage-2.1_pre7-r4.ebuild,
+  +files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch,
+  +files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch:
+  Bug fixes for #128284 and #128506.
 
   31 Mar 2006; Zac Medico <zmedico@gentoo.org> portage-2.1_pre7-r3.ebuild:
   Make sandbox dependency conditional on elibc_glibc or elibc_uclibc as
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b3142a3877f8..8361ee575bc8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3edc3beb918e030c1e4f415649f4f22a ChangeLog 11491
-RMD160 4306eef1a89423c3ca2a81da89d590b64c29b9ff ChangeLog 11491
-SHA256 27b586eb6c6d24366bc9647480002c5bad20f6fffe21ba02304233d99c933973 ChangeLog 11491
+MD5 92bd15113f67b9db84bce9787f746bff ChangeLog 11751
+RMD160 60c9d7607184fb83cac1bb8f54d251b423c1190b ChangeLog 11751
+SHA256 70a8c6eb0753bf7828cd005dcddaacc96c36b503c51ec8becd86e4dd5888ba83 ChangeLog 11751
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -91,6 +91,12 @@ SHA256 f063bab2c9cecc497a54e030686ae74fec05ad0422b3c0f9ed707ac886520b1a files/2.
 MD5 e5c64d09695d972ae1ae9fe88a8cc625 files/2.1_pre7/1080_ensure_dirs.patch 6363
 RMD160 cd138486af48f05b38a7298dcdf264abfffba4ce files/2.1_pre7/1080_ensure_dirs.patch 6363
 SHA256 655522b977bd521d662d6650f0bfbe5f53dff44581c71bb57e6fc60fe15de0a8 files/2.1_pre7/1080_ensure_dirs.patch 6363
+MD5 242854cffd82d6fbc3d1fb4fb40a757d files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch 794
+RMD160 511103b68cd4479ada8542cfd5897b85d3254f42 files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch 794
+SHA256 4abf846ba1bd8c3f5da3fc7d7febc2b8b3da8cdccad7a518925d44bc4a8bd696 files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch 794
+MD5 120a029d48d352782e62d6e6522e8243 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
+RMD160 2db6a407371c931b3bb9f3e216d3f4f3810a06d7 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
+SHA256 e63fd61e5e52662d96a387d322a0b95f33f144c731beafbb0b9d9cae7b3e9357 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -109,9 +115,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-r3 253
-RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7-r3 253
-SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7-r3 253
+MD5 6aebb952d3a284aa4f52d7e5dc7791de files/digest-portage-2.1_pre7-r4 253
+RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7-r4 253
+SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7-r4 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -133,13 +139,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 96fcd990a0fb67803695a4665de44e44 portage-2.1_pre7-r3.ebuild 5684
-RMD160 8b4df0268ce5376b741427a2e2564276d815eee3 portage-2.1_pre7-r3.ebuild 5684
-SHA256 a6251cdef48246b6e0836d95e88db41f008051aa796b2ac6adc3d9a01e127388 portage-2.1_pre7-r3.ebuild 5684
+MD5 27307f949c41b5571ddc63e15b94b928 portage-2.1_pre7-r4.ebuild 5771
+RMD160 43046fa6d1c9054da123e57b6aa2f710a9c212ba portage-2.1_pre7-r4.ebuild 5771
+SHA256 3600b853e5d1ac4b69b07092ccfb7a632d8622be4fc65d7f31b249209b9bc6e6 portage-2.1_pre7-r4.ebuild 5771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELXeJ/ejvha5XGaMRArlQAJ9yGpEUg5OX+dfQkos+HyGbX/OEfgCgzoED
-NRAlWmD9HG3tcgYo21Q4ouE=
-=UXi6
+iD8DBQFEMMWW/ejvha5XGaMRAog4AKDwmTDyq2TtBRcbkr35jknXN6+C/wCgs/aJ
+y2+Xrr3Dzmds3/2mG0FxbRw=
+=Krhi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch b/sys-apps/portage/files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch
new file mode 100644
index 000000000000..32336218f038
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch
@@ -0,0 +1,27 @@
+=== modified file 'pym/portage_exec.py'
+--- pym/portage_exec.py	
++++ pym/portage_exec.py	
+@@ -16,6 +16,13 @@
+ 	max_fd_limit = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
+ except ImportError:
+ 	max_fd_limit = 256
++
++if os.path.isdir("/proc/%i/fd" % os.getpid()):
++	def get_open_fds():
++		return map(int, [fd for fd in os.listdir("/proc/%i/fd" % os.getpid()) if fd.isdigit()])
++else:
++	def get_open_fds():
++		return xrange(max_fd_limit)
+ 
+ sandbox_capable = (os.path.isfile(SANDBOX_BINARY) and
+                    os.access(SANDBOX_BINARY, os.X_OK))
+@@ -222,7 +229,7 @@
+ 		os.dup2(my_fds[fd], fd)
+ 	# Then close _all_ fds that haven't been explictly
+ 	# requested to be kept open.
+-	for fd in range(max_fd_limit):
++	for fd in get_open_fds():
+ 		if fd not in my_fds:
+ 			try:
+ 				os.close(fd)
+
diff --git a/sys-apps/portage/files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch b/sys-apps/portage/files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch
new file mode 100644
index 000000000000..1a621224dfc3
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch
@@ -0,0 +1,115 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -1832,6 +1832,33 @@
+ 	del missingSourceHost
+ 
+ 	can_fetch=True
++
++	if not listonly:
++		dirmode  = 02070
++		filemode =   060
++		modemask =    02
++		distdir_dirs = ["", "cvs-src"]
++		if "distlocks" in features:
++			distdir_dirs.append(".locks")
++		try:
++			
++			for x in distdir_dirs:
++				mydir = os.path.join(mysettings["DISTDIR"], x)
++				if portage_util.ensure_dirs(mydir, gid=portage_gid, mode=dirmode, mask=modemask):
++					writemsg("Adjusting permissions recursively: '%s'\n" % mydir)
++					def onerror(e):
++						raise # bail out on the first error that occurs during recursion
++					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:
++			if not os.path.isdir(mysettings["DISTDIR"]):
++				writemsg("!!! %s\n" % str(e))
++				writemsg("!!! Directory Not Found: DISTDIR='%s'\n" % mysettings["DISTDIR"])
++				writemsg("!!! Fetching will fail!\n")
++
+ 	if not os.access(mysettings["DISTDIR"]+"/",os.W_OK):
+ 		if not fetch_to_ro:
+ 			print "!!! No write access to %s" % mysettings["DISTDIR"]+"/"
+@@ -2772,31 +2799,6 @@
+ 	else:
+ 		fetchme=newuris[:]
+ 		checkme=alist[:]
+-
+-	if not listonly:
+-		dirmode  = 02070
+-		filemode =   060
+-		modemask =    02
+-		distdir_dirs = ["", "cvs-src"]
+-		if "distlocks" in features:
+-			distdir_dirs.append(".locks")
+-		try:
+-			
+-			for x in distdir_dirs:
+-				mydir = os.path.join(mysettings["DISTDIR"], x)
+-				if portage_util.ensure_dirs(mydir, gid=portage_gid, mode=dirmode, mask=modemask):
+-					writemsg("Adjusting permissions recursively: '%s'\n" % mydir)
+-					def onerror(e):
+-						raise # bail out on the first error that occurs during recursion
+-					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:
+-			writemsg("!!! %s\n" % str(e))
+-			writemsg("!!! Problem adjusting permissions on DISTDIR='%s'\n" % mysettings["DISTDIR"])
+-			writemsg("!!! Fetching may fail!\n")
+ 
+ 	# Only try and fetch the files if we are going to need them ... otherwise,
+ 	# if user has FEATURES=noauto and they run `ebuild clean unpack compile install`,
+
+=== modified file 'pym/portage_exception.py'
+--- pym/portage_exception.py	
++++ pym/portage_exception.py	
+@@ -49,6 +49,9 @@
+ class OperationNotPermitted(PortageException):
+ 	"""An operation was not permitted operating system"""
+ 
++class ReadOnlyFileSystem(PortageException):
++	"""Read-only file system"""
++
+ class CommandNotFound(PortageException):
+ 	"""A required binary was not available or executable"""
+ 
+
+=== modified file 'pym/portage_util.py'
+--- pym/portage_util.py	
++++ pym/portage_util.py	
+@@ -2,7 +2,7 @@
+ # Distributed under the terms of the GNU General Public License v2
+ # $Id: /var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.11.2.6 2005/04/23 07:26:04 jstubbs Exp $
+ 
+-from portage_exception import PortageException, FileNotFound, OperationNotPermitted
++from portage_exception import PortageException, FileNotFound, OperationNotPermitted, ReadOnlyFileSystem
+ 
+ import sys,string,shlex,os,errno
+ try:
+@@ -512,12 +512,14 @@
+ 			os.chmod(filename, new_mode)
+ 			modified = True
+ 		except OSError, oe:
++			func_call = "chmod('%s', %s)" % (filename, oct(new_mode))
+ 			if oe.errno == errno.EPERM:
+-				raise OperationNotPermitted("chmod('%s', %s)" % (filename, oct(new_mode)))
++				raise OperationNotPermitted(func_call)
++			elif oe.errno == errno.EROFS:
++				raise ReadOnlyFileSystem(func_call)
+ 			elif oe.errno == errno.ENOENT:
+ 				raise FileNotFound(filename)
+-			else:
+-				raise
++			raise
+ 	return modified
+ 
+ def apply_stat_permissions(filename, newstat, **kwargs):
+
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre7-r3 b/sys-apps/portage/files/digest-portage-2.1_pre7-r4
index 2892d68c8269..2892d68c8269 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre7-r3
+++ b/sys-apps/portage/files/digest-portage-2.1_pre7-r4
diff --git a/sys-apps/portage/portage-2.1_pre7-r3.ebuild b/sys-apps/portage/portage-2.1_pre7-r4.ebuild
index 4595227c42f6..9c1cf5671d8c 100644
--- a/sys-apps/portage/portage-2.1_pre7-r3.ebuild
+++ b/sys-apps/portage/portage-2.1_pre7-r4.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-r3.ebuild,v 1.3 2006/03/31 18:40:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre7-r4.ebuild,v 1.1 2006/04/03 06:49:54 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -41,7 +41,9 @@ src_unpack() {
 		1050_forum_3210399_empty_digest.patch
 		1060_r3034_bug_127897_realpath.patch
 		1070_r3036_bug_127930_unpack_timestamp.patch
-		1080_ensure_dirs.patch"
+		1080_ensure_dirs.patch
+		1090_r3055_bug_128284_get_open_fds.patch
+		1100_r3063_bug_128506_distdir_error.patch"
 	for patch_name in ${my_patches}; do
 		einfo "Applying ${patch_name} ..."
 		patch -p0 --no-backup-if-mismatch < \