diff options
| -rw-r--r-- | sys-apps/portage/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 30 | ||||
| -rw-r--r-- | sys-apps/portage/files/2.1_pre5-r1.patch | 46 | ||||
| -rw-r--r-- | sys-apps/portage/files/2.1_pre5-r2.patch | 103 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.1_pre5-r2 (renamed from sys-apps/portage/files/digest-portage-2.1_pre5-r1) | 0 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1_pre5-r2.ebuild (renamed from sys-apps/portage/portage-2.1_pre5-r1.ebuild) | 6 |
6 files changed, 130 insertions, 65 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 41a0e22397c5..bc6291724276 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,14 @@ # 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.84 2006/02/27 23:03:45 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.85 2006/03/02 04:07:12 zmedico Exp $ + +*portage-2.1_pre5-r2 (01 Mar 2006) + + 01 Mar 2006; Zac Medico <zmedico@gentoo.org> + +portage-2.1_pre5-r2.ebuild: + Regression fix for bug #124568 problem with wheel group in dobin and dosbin + for *bsd and darwin. A fix is also included for bug #124203 clean phase + misbehavior on upgrade from portage-2.0.x. 27 Feb 2006; Zac Medico <zmedico@gentoo.org> portage-2.0.53.ebuild, portage-2.0.54.ebuild: diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 0a8db2c84d12..f423bb84acc0 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 61c340d63d100fb391f2158513751181 ChangeLog 5752 -RMD160 3ba62f5f50cfcda65acdff5c59e0007c7cda5be7 ChangeLog 5752 -SHA256 ddaa2806fe5eb4129c7515b4eeada23cbcbcb83f07e7b87a460d463ebaebf052 ChangeLog 5752 +MD5 8273181bee7197fa912d9a1c2773f137 ChangeLog 6065 +RMD160 c4a156ab7001f334ee675c52698322cbc8b1ac70 ChangeLog 6065 +SHA256 137e84c033471523c292555eac468a8a80c963083c8e2ee9f33b6cd9f531e220 ChangeLog 6065 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579 SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.0.51.22-fixes.patch 10579 -MD5 6f68609fe0af56c2fa9a37fb579b31b5 files/2.1_pre5-r1.patch 1992 -RMD160 d9e9686390e75f162f734bdd2a6938ef5f93754f files/2.1_pre5-r1.patch 1992 -SHA256 7a6dcb2d18ac8c42bfc76887341e667e6b106642689cd0bdee0b3cc7b4099563 files/2.1_pre5-r1.patch 1992 +MD5 99823179804f9d874464cde1c78c9a0d files/2.1_pre5-r2.patch 3748 +RMD160 e13459007e2714fb9c7cde9ef7f37f56484bd2b8 files/2.1_pre5-r2.patch 3748 +SHA256 d51a36947b87997c6993a2b977d70246cb56719cc44c73822d1e7995eee8e210 files/2.1_pre5-r2.patch 3748 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137 @@ -28,9 +28,9 @@ SHA256 d12b5844039163fd2cb532560d0e82ef7c4b860ea3ef02e0616b34264be13299 files/di MD5 2e597ebca5c4c3f101022a5a35d091c7 files/digest-portage-2.1_pre3-r1 253 RMD160 c0cf87ab1669aea8b35951f9ded0a477377f0265 files/digest-portage-2.1_pre3-r1 253 SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/digest-portage-2.1_pre3-r1 253 -MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r1 253 -RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r1 253 -SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r1 253 +MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r2 253 +RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r2 253 +SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r2 253 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115 @@ -49,13 +49,13 @@ SHA256 ab44272f63c7bfbcd06a6a943bb9765a0391d131195c32af4fe4f842d2bb36d4 portage- MD5 908c5af92ff8ea543ed011aefd0832ea portage-2.1_pre3-r1.ebuild 4715 RMD160 e73644193a07d9957562ea6442b4e7759d8c35a8 portage-2.1_pre3-r1.ebuild 4715 SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-2.1_pre3-r1.ebuild 4715 -MD5 6ab066ae354f81d5b70d80500ed9eef2 portage-2.1_pre5-r1.ebuild 4766 -RMD160 92a8b4b2663dc4a4ebe160651aca21e3c57c81a3 portage-2.1_pre5-r1.ebuild 4766 -SHA256 47f633949a8074e019a3ce8441d693a5a44970b997199b4e8f359bb3c603b026 portage-2.1_pre5-r1.ebuild 4766 +MD5 572688a5e6c32ee0070c72cd44e78e56 portage-2.1_pre5-r2.ebuild 4766 +RMD160 2b406bd1a7c916174c50f3c1a98154a74222c632 portage-2.1_pre5-r2.ebuild 4766 +SHA256 37572cd69ed8b01438445c45dd1c310e1030829bfc678a62b02c5fdb1fa5c35c portage-2.1_pre5-r2.ebuild 4766 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFEA4VX/ejvha5XGaMRAkSMAJ98mg13G10MC6K/QYK26S0skYDVAACeIwW5 -urrdAZkT3pXRaCqTUGaW3n8= -=pRC9 +iD8DBQFEBm95/ejvha5XGaMRAje9AKDe80kdSP7XA1sQMxLuzQCkJSaw/wCfblMq +bshYLXloytaIFs/gwDl7c0o= +=JKZo -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/2.1_pre5-r1.patch b/sys-apps/portage/files/2.1_pre5-r1.patch deleted file mode 100644 index 126de28588e7..000000000000 --- a/sys-apps/portage/files/2.1_pre5-r1.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur portage-2.1_pre5/bin/emerge portage-2.1_pre5-r1/bin/emerge ---- portage-2.1_pre5/bin/emerge 2006-02-20 16:58:13.000000000 -0800 -+++ portage-2.1_pre5-r1/bin/emerge 2006-02-26 03:39:28.000000000 -0800 -@@ -1934,7 +1934,7 @@ - y=portage.portdb.findname(x[pkgindex]) - if not "--pretend" in myopts: - print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1] -- emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1]) -+ emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1]) - - self.pkgsettings["EMERGE_FROM"] = x[0][:] - self.pkgsettings.backup_changes("EMERGE_FROM") -diff -Nur portage-2.1_pre5/pym/portage_locks.py portage-2.1_pre5-r1/pym/portage_locks.py ---- portage-2.1_pre5/pym/portage_locks.py 2006-02-15 10:36:48.000000000 -0800 -+++ portage-2.1_pre5-r1/pym/portage_locks.py 2006-02-26 03:39:05.000000000 -0800 -@@ -122,7 +122,8 @@ - raise - - -- if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1: -+ if type(lockfilename) == types.StringType and \ -+ myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1: - # The file was deleted on us... Keep trying to make one... - os.close(myfd) - portage_util.writemsg("lockfile recurse\n",1) -diff -Nur portage-2.1_pre5/pym/portage.py portage-2.1_pre5-r1/pym/portage.py ---- portage-2.1_pre5/pym/portage.py 2006-02-21 02:01:08.000000000 -0800 -+++ portage-2.1_pre5-r1/pym/portage.py 2006-02-26 12:46:20.000000000 -0800 -@@ -4,7 +4,7 @@ - # $Id: 2.1_pre5-r1.patch,v 1.2 2006/02/26 20:54:43 zmedico Exp $ - - --VERSION="2.1_pre5" -+VERSION="2.1_pre5-r1" - - # =========================================================================== - # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT -@@ -5334,6 +5334,8 @@ - return 1 - - def update_ents(self, update_iter): -+ if len(update_iter) == 0: -+ return - if not self.populated: - self.populate() - diff --git a/sys-apps/portage/files/2.1_pre5-r2.patch b/sys-apps/portage/files/2.1_pre5-r2.patch new file mode 100644 index 000000000000..ced3d636f481 --- /dev/null +++ b/sys-apps/portage/files/2.1_pre5-r2.patch @@ -0,0 +1,103 @@ +diff -Nur portage-2.1_pre5/bin/dobin portage-2.1_pre5-r2/bin/dobin +--- portage-2.1_pre5/bin/dobin 2006-02-03 22:56:26.000000000 -0800 ++++ portage-2.1_pre5-r2/bin/dobin 2006-03-01 16:12:52.000000000 -0800 +@@ -12,16 +12,11 @@ + install -d "${D}${DESTTREE}/bin" || exit 2 + fi + +-case ${CHOST} in +- *-freebsd*) group=wheel ;; +- *) group=root ;; +-esac +- + ret=0 + + for x in "$@" ; do + if [[ -e ${x} ]] ; then +- install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/bin" ++ install -m0755 -o 0 -g 0 "${x}" "${D}${DESTTREE}/bin" + else + echo "!!! ${0##*/}: ${x} does not exist" 1>&2 + false +diff -Nur portage-2.1_pre5/bin/dosbin portage-2.1_pre5-r2/bin/dosbin +--- portage-2.1_pre5/bin/dosbin 2006-02-03 22:56:26.000000000 -0800 ++++ portage-2.1_pre5-r2/bin/dosbin 2006-03-01 16:12:47.000000000 -0800 +@@ -12,16 +12,11 @@ + install -d "${D}${DESTTREE}/sbin" || exit 2 + fi + +-case ${CHOST} in +- *-freebsd*) group=wheel ;; +- *) group=root ;; +-esac +- + ret=0 + + for x in "$@" ; do + if [[ -e ${x} ]] ; then +- install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/sbin" ++ install -m0755 -o 0 -g 0 "${x}" "${D}${DESTTREE}/sbin" + else + echo "!!! ${0##*/}: ${x} does not exist" 1>&2 + false +diff -Nur portage-2.1_pre5/bin/ebuild.sh portage-2.1_pre5-r2/bin/ebuild.sh +--- portage-2.1_pre5/bin/ebuild.sh 2006-02-20 17:20:37.000000000 -0800 ++++ portage-2.1_pre5-r2/bin/ebuild.sh 2006-03-01 19:26:00.000000000 -0800 +@@ -727,6 +727,11 @@ + } + + dyn_clean() { ++ if [ -z "${PORTAGE_BUILDDIR}" ]; then ++ echo "Aborting clean phase because PORTAGE_BUILDDIR is unset!" ++ return 1 ++ fi ++ + if [ "$USERLAND" == "BSD" ] && type -p chflags &>/dev/null; then + chflags -R noschg,nouchg,nosappnd,nouappnd,nosunlnk,nouunlnk \ + "${PORTAGE_BUILDDIR}" +diff -Nur portage-2.1_pre5/bin/emerge portage-2.1_pre5-r2/bin/emerge +--- portage-2.1_pre5/bin/emerge 2006-02-20 16:58:13.000000000 -0800 ++++ portage-2.1_pre5-r2/bin/emerge 2006-02-26 03:39:28.000000000 -0800 +@@ -1934,7 +1934,7 @@ + y=portage.portdb.findname(x[pkgindex]) + if not "--pretend" in myopts: + print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1] +- emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1]) ++ emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1]) + + self.pkgsettings["EMERGE_FROM"] = x[0][:] + self.pkgsettings.backup_changes("EMERGE_FROM") +diff -Nur portage-2.1_pre5/pym/portage_locks.py portage-2.1_pre5-r2/pym/portage_locks.py +--- portage-2.1_pre5/pym/portage_locks.py 2006-02-15 10:36:48.000000000 -0800 ++++ portage-2.1_pre5-r2/pym/portage_locks.py 2006-02-26 03:39:05.000000000 -0800 +@@ -122,7 +122,8 @@ + raise + + +- if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1: ++ if type(lockfilename) == types.StringType and \ ++ myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1: + # The file was deleted on us... Keep trying to make one... + os.close(myfd) + portage_util.writemsg("lockfile recurse\n",1) +diff -Nur portage-2.1_pre5/pym/portage.py portage-2.1_pre5-r2/pym/portage.py +--- portage-2.1_pre5/pym/portage.py 2006-02-21 02:01:08.000000000 -0800 ++++ portage-2.1_pre5-r2/pym/portage.py 2006-03-01 19:30:24.000000000 -0800 +@@ -4,7 +4,7 @@ + # $Id: 2.1_pre5-r2.patch,v 1.1 2006/03/02 04:07:12 zmedico Exp $ + + +-VERSION="2.1_pre5" ++VERSION="2.1_pre5-r2" + + # =========================================================================== + # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT +@@ -5334,6 +5334,8 @@ + return 1 + + def update_ents(self, update_iter): ++ if len(update_iter) == 0: ++ return + if not self.populated: + self.populate() + diff --git a/sys-apps/portage/files/digest-portage-2.1_pre5-r1 b/sys-apps/portage/files/digest-portage-2.1_pre5-r2 index c818d7ae4b7c..c818d7ae4b7c 100644 --- a/sys-apps/portage/files/digest-portage-2.1_pre5-r1 +++ b/sys-apps/portage/files/digest-portage-2.1_pre5-r2 diff --git a/sys-apps/portage/portage-2.1_pre5-r1.ebuild b/sys-apps/portage/portage-2.1_pre5-r2.ebuild index 9a19df514824..7939d2491b80 100644 --- a/sys-apps/portage/portage-2.1_pre5-r1.ebuild +++ b/sys-apps/portage/portage-2.1_pre5-r2.ebuild @@ -1,12 +1,12 @@ # 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_pre5-r1.ebuild,v 1.1 2006/02/26 20:33:41 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre5-r2.ebuild,v 1.1 2006/03/02 04:07:12 zmedico 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/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~zmedico/releases/${PN}-${PV}.tar.bz2" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86" @@ -32,7 +32,7 @@ S=${WORKDIR}/${PN}-${PV} src_unpack() { unpack ${A} cd "${S}" - patch -p1 < "${FILESDIR}"/2.1_pre5-r1.patch || die "Failed to apply patch" + patch -p1 < "${FILESDIR}"/2.1_pre5-r2.patch || die "Failed to apply patch" } src_compile() { |