Bumping stable for a security fix. 2.0.53_rc3 changed to use a distfile rather than patch.

(Portage version: 1.524.2.76-cvs)

7 files changed, 60 insertions, 84 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 489ac4e86f90..6dd002908993 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,11 @@
-MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
-MD5 12fab18de41960812bed2702a50cc145 portage-2.0.53_rc3.ebuild 3775
-MD5 a4921b091c6057013549c33f933bfd40 portage-2.0.51.22-r2.ebuild 5708
 MD5 bee328fe9e36c1f64e2052f82a84caa3 ChangeLog 1231
-MD5 c7250b47d02fe3891edabf2a687dc0ce portage-2.1.0_alpha20050718.ebuild 2573
-MD5 b295a36d15f82fa34eeb24929920b0ab files/digest-portage-2.0.53_rc3 71
-MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80
-MD5 1842c95301d35f46a1458b967d3c8fd4 files/2.0.53_rc2-to-rc3.patch 2017
-MD5 f29e1e5ab80c7078b004e60002173ccb files/2.0.51.22-fixes.patch 9339
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
+MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
-MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r2 70
+MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70
+MD5 fad39ce2ce5c1c89e9f50e7a6e7df330 files/digest-portage-2.0.53_rc3 71
+MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80
+MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
+MD5 a4921b091c6057013549c33f933bfd40 portage-2.0.51.22-r3.ebuild 5708
+MD5 3973315b6ccec4f1350aa9a2d6b6bfbe portage-2.0.53_rc3.ebuild 3617
+MD5 c7250b47d02fe3891edabf2a687dc0ce portage-2.1.0_alpha20050718.ebuild 2573
diff --git a/sys-apps/portage/files/2.0.51.22-fixes.patch b/sys-apps/portage/files/2.0.51.22-fixes.patch
index 5d88d3e4fe20..ea0975847043 100644
--- a/sys-apps/portage/files/2.0.51.22-fixes.patch
+++ b/sys-apps/portage/files/2.0.51.22-fixes.patch
@@ -1,7 +1,7 @@
-diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r2/ChangeLog
---- portage-2.0.51.22/ChangeLog	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r2/ChangeLog	2005-07-19 19:37:44.159904000 +0900
-@@ -1,12 +1,43 @@
+diff -uNr portage-2.0.51.22-orig/ChangeLog portage-2.0.51.22/ChangeLog
+--- portage-2.0.51.22-orig/ChangeLog	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/ChangeLog	2005-10-06 01:08:51.000000000 +0900
+@@ -1,12 +1,46 @@
  # ChangeLog for Portage; the Gentoo Linux ports system 
  # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
 -# $Id: ChangeLog,v 1.796.2.125 2005/05/15 09:37:49 jstubbs Exp $
@@ -12,6 +12,9 @@ diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r2/ChangeLog
      2. /var/cache/edb/world is now /var/lib/portage/world.
      3. /etc/portage/profile/virtuals is _USER_ configs only.
  
++  06 Oct 2005; Jason Stubbs <jstubbs@gentoo.org> bin/dispatch-conf: Ensure that
++  dispatch-conf's log file is 0600 permissions when enabled. Patch by TGL.
++
 +  19 Jul 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild.sh: Skip protecting
 +  ownership of symlinks. Patch by truedfx #94199
 +
@@ -46,9 +49,28 @@ diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r2/ChangeLog
    15 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Made --newuse
    take priority over --usepkg.
  
-diff -uNr portage-2.0.51.22/bin/ebuild.sh portage-2.0.51.22-r2/bin/ebuild.sh
---- portage-2.0.51.22/bin/ebuild.sh	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r2/bin/ebuild.sh	2005-07-19 19:38:32.949904000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/dispatch-conf portage-2.0.51.22/bin/dispatch-conf
+--- portage-2.0.51.22-orig/bin/dispatch-conf	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/dispatch-conf	2005-10-06 01:02:51.000000000 +0900
+@@ -64,9 +64,12 @@
+         self.options = dispatch_conf.read_config(MANDATORY_OPTS)
+ 
+         if self.options.has_key("log-file"):
+-            if os.path.exists(self.options["log-file"]):
+-                shutil.copyfile(self.options["log-file"], self.options["log-file"] + '.old')
+-                os.remove(self.options["log-file"])
++            if os.path.isfile(self.options["log-file"]):
++                shutil.copy(self.options["log-file"], self.options["log-file"] + '.old')
++            if os.path.isfile(self.options["log-file"]) \
++               or not os.path.exists(self.options["log-file"]):
++                open(self.options["log-file"], 'w').close()  # Truncate it
++                os.chmod(self.options["log-file"], 0600)
+         else:
+             self.options["log-file"] = "/dev/null"
+ 
+diff -uNr portage-2.0.51.22-orig/bin/ebuild.sh portage-2.0.51.22/bin/ebuild.sh
+--- portage-2.0.51.22-orig/bin/ebuild.sh	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/ebuild.sh	2005-10-06 01:02:11.000000000 +0900
 @@ -1075,9 +1075,9 @@
  	local count=0
  	find "${D}/" -user  portage | while read file; do
@@ -77,9 +99,9 @@ diff -uNr portage-2.0.51.22/bin/ebuild.sh portage-2.0.51.22-r2/bin/ebuild.sh
  	done
  	if (( $count > 0 )); then
  		ewarn "$count files were installed with group portage!"
-diff -uNr portage-2.0.51.22/bin/emake portage-2.0.51.22-r2/bin/emake
---- portage-2.0.51.22/bin/emake	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r2/bin/emake	2005-07-19 19:35:16.789904000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/emake portage-2.0.51.22/bin/emake
+--- portage-2.0.51.22-orig/bin/emake	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/emake	2005-10-06 01:02:11.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/bin/bash
  # Copyright 1999-2004 Gentoo Foundation
@@ -95,9 +117,9 @@ diff -uNr portage-2.0.51.22/bin/emake portage-2.0.51.22-r2/bin/emake
  
 -make ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
 +${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
-diff -uNr portage-2.0.51.22/bin/emerge portage-2.0.51.22-r2/bin/emerge
---- portage-2.0.51.22/bin/emerge	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r2/bin/emerge	2005-07-19 19:35:16.789904000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/emerge portage-2.0.51.22/bin/emerge
+--- portage-2.0.51.22-orig/bin/emerge	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/emerge	2005-10-06 01:02:11.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/usr/bin/python -O
  # Copyright 1999-2004 Gentoo Foundation
@@ -116,9 +138,9 @@ diff -uNr portage-2.0.51.22/bin/emerge portage-2.0.51.22-r2/bin/emerge
  				iuses=string.split(portage.portdb.aux_get(mykey, ["IUSE"])[0])
  				old_use=string.split(vardbapi.aux_get(mykey, ["USE"])[0])
  				now_use=string.split(self.pkgsettings["USE"])
-diff -uNr portage-2.0.51.22/bin/repoman portage-2.0.51.22-r2/bin/repoman
---- portage-2.0.51.22/bin/repoman	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r2/bin/repoman	2005-07-19 19:35:16.789904000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/repoman portage-2.0.51.22/bin/repoman
+--- portage-2.0.51.22-orig/bin/repoman	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/repoman	2005-10-06 01:02:11.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/usr/bin/python -O
  # Copyright 1999-2005 Gentoo Foundation
@@ -154,9 +176,9 @@ diff -uNr portage-2.0.51.22/bin/repoman portage-2.0.51.22-r2/bin/repoman
  				del myfiles[x]
  		mydone=[]
  		if repolevel==3:   # In a package dir
-diff -uNr portage-2.0.51.22/pym/portage.py portage-2.0.51.22-r2/pym/portage.py
---- portage-2.0.51.22/pym/portage.py	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r2/pym/portage.py	2005-07-19 19:35:16.789904000 +0900
+diff -uNr portage-2.0.51.22-orig/pym/portage.py portage-2.0.51.22/pym/portage.py
+--- portage-2.0.51.22-orig/pym/portage.py	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/pym/portage.py	2005-10-06 01:03:48.000000000 +0900
 @@ -1,10 +1,10 @@
  # portage.py -- core Portage functionality
  # Copyright 1998-2004 Gentoo Foundation
@@ -167,7 +189,7 @@ diff -uNr portage-2.0.51.22/pym/portage.py portage-2.0.51.22-r2/pym/portage.py
 +cvs_id_string="$Id: portage.py,v 1.524.2.75 2005/05/18 15:33:49 jstubbs Exp $"[5:-2]
  
 -VERSION="2.0.51.22"
-+VERSION="2.0.51.22-r2"
++VERSION="2.0.51.22-r3"
  
  # ===========================================================================
  # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
diff --git a/sys-apps/portage/files/2.0.53_rc2-to-rc3.patch b/sys-apps/portage/files/2.0.53_rc2-to-rc3.patch
deleted file mode 100644
index 98786e749912..000000000000
--- a/sys-apps/portage/files/2.0.53_rc2-to-rc3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -uNr portage-2.0.53_rc2/bin/emerge portage-2.0.53_rc3/bin/emerge
---- portage-2.0.53_rc2/bin/emerge	2005-10-02 13:21:56.000000000 +0900
-+++ portage-2.0.53_rc3/bin/emerge	2005-10-02 23:50:57.000000000 +0900
-@@ -1489,7 +1489,7 @@
- 			else:
- 				if (x[0]!="binary") and ("fetch" in string.split(portage.portdb.aux_get(x[2],["RESTRICT"])[0])):
- 					fetch = red("F")
--					if portage.portdb.fetch_check(x[2], portage.settings):
-+					if portage.portdb.fetch_check(x[2], self.applied_useflags[x[2]]):
- 						fetch = green("f")
- 
- 				#we need to use "--emptrytree" testing here rather than "empty" param testing because "empty"
-diff -uNr portage-2.0.53_rc2/pym/portage.py portage-2.0.53_rc3/pym/portage.py
---- portage-2.0.53_rc2/pym/portage.py	2005-10-02 13:32:43.000000000 +0900
-+++ portage-2.0.53_rc3/pym/portage.py	2005-10-02 23:52:46.000000000 +0900
-@@ -4,7 +4,7 @@
- # $Id: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.76 2005/05/29 12:40:08 jstubbs Exp $
- 
- 
--VERSION="2.0.53_rc2"
-+VERSION="2.0.53_rc3"
- 
- # ===========================================================================
- # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
-@@ -2759,7 +2759,7 @@
- 			print "!!! mydo=qmerge, but install phase hasn't been ran"
- 			sys.exit(1)
- 		#qmerge is specifically not supposed to do a runtime dep check
--		return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["BUILDDIR"]+"/build-info",myroot,mysettings)
-+		return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["BUILDDIR"]+"/build-info",myroot,mysettings,myebuild=mysettings["EBUILD"])
- 	elif mydo=="merge":
- 		retval=spawnebuild("install",actionmap,mysettings,debug,alwaysdep=1,logfile=logfile)
- 		if retval:
-@@ -5367,7 +5367,7 @@
- 
- 			if metadata["EAPI"] != portage_const.EAPI:
- 				# intentionally wipe keys.
--				map(lambda x: metadata.setdefault("x", ''), auxdbkeys)
-+				map(lambda x: metadata.setdefault(x, ''), auxdbkeys)
- 				metadata["EAPI"] == -1
- 
- 			else:
diff --git a/sys-apps/portage/files/digest-portage-2.0.51.22-r2 b/sys-apps/portage/files/digest-portage-2.0.51.22-r3
index 95d1b3eb5133..95d1b3eb5133 100644
--- a/sys-apps/portage/files/digest-portage-2.0.51.22-r2
+++ b/sys-apps/portage/files/digest-portage-2.0.51.22-r3
diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc3 b/sys-apps/portage/files/digest-portage-2.0.53_rc3
index ac48d55e01bf..5247dfab5ac7 100644
--- a/sys-apps/portage/files/digest-portage-2.0.53_rc3
+++ b/sys-apps/portage/files/digest-portage-2.0.53_rc3
@@ -1 +1 @@
-MD5 9338825bb76a3db100107d5bfd9bd523 portage-2.0.53_rc2.tar.bz2 235762
+MD5 241ec6778976180bf406c451205ba4e1 portage-2.0.53_rc3.tar.bz2 235590
diff --git a/sys-apps/portage/portage-2.0.51.22-r2.ebuild b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
index 50e083b5c213..d65316edbb56 100644
--- a/sys-apps/portage/portage-2.0.51.22-r2.ebuild
+++ b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r2.ebuild,v 1.2 2005/07/22 11:05:53 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.1 2005/10/05 16:13:48 jstubbs Exp $
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/portage/portage-2.0.53_rc3.ebuild b/sys-apps/portage/portage-2.0.53_rc3.ebuild
index b50a10c84f5c..b50b1b6eceb4 100644
--- a/sys-apps/portage/portage-2.0.53_rc3.ebuild
+++ b/sys-apps/portage/portage-2.0.53_rc3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc3.ebuild,v 1.1 2005/10/02 15:15:54 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc3.ebuild,v 1.2 2005/10/05 16:13:48 jstubbs Exp $
 
 inherit toolchain-funcs
 
 DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
 HOMEPAGE="http://www.gentoo.org/"
-#SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2"
-SRC_URI="mirror://gentoo/portage-2.0.53_rc2.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/portage-2.0.53_rc2.tar.bz2"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2"
 LICENSE="GPL-2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -15,15 +14,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s39
 SLOT="0"
 IUSE="build selinux"
 DEPEND=">=dev-lang/python-2.2.1"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) !x86-fbsd? ( !ppc-macos? ( sys-apps/sandbox ) ) selinux? ( >=dev-python/python-selinux-2.15 )"
+RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 userland_GNU? ( sys-apps/debianutils ) >=app-shells/bash-2.05a ) !userland_Darwin? ( sys-apps/sandbox ) selinux? ( >=dev-python/python-selinux-2.15 )"
 
-S=${WORKDIR}/portage-2.0.53_rc2
+S=${WORKDIR}/${PN}-${PV}
 
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	patch -p1 -s < ${FILESDIR}/2.0.53_rc2-to-rc3.patch
 }
 
 src_compile() {
@@ -32,13 +29,13 @@ src_compile() {
 	cd "${S}"/src
 	$(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c
 
-	if ! use ppc-macos; then
+	if ! use userland_Darwin; then
 		cd "${S}"/src/python-missingos
 		chmod +x setup.py
 		./setup.py build || die "Failed to build missingos module"
 	fi
 
-	if use x86-fbsd; then
+	if use elibc_FreeBSD; then
 		cd "${S}"/src/bsd-flags
 		chmod +x setup.py
 		./setup.py build || die "Failed to install bsd-chflags module"
@@ -59,12 +56,12 @@ src_install() {
 		newins make.conf make.conf.example
 	fi
 
-	if ! use ppc-macos; then
+	if ! use userland_Darwin; then
 		cd "${S}"/src/python-missingos
 		./setup.py install --root ${D} || die "Failed to install missingos module"
 	fi
 
-	if use x86-fbsd; then
+	if use elibc_FreeBSD; then
 		cd "${S}"/src/bsd-flags
 		./setup.py install --root ${D} || die "Failed to install bsd-chflags module"
 	fi