2.1_pre6-r7 regression fix release

Package-Manager: portage-2.1_pre6-r7

5 files changed, 56 insertions, 15 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 3b24980f0d2a..694190043bd4 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # 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.96 2006/03/23 10:04:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.97 2006/03/25 04:08:37 zmedico Exp $
+
+*portage-2.1_pre6-r7 (25 Mar 2006)
+
+  25 Mar 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_pre6-r7.ebuild,
+  +files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch:
+  Regression fix for bug #127374 and improved package phase efficiency.
 
 *portage-2.1_pre6-r6 (23 Mar 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fc3b4a5c7f33..f65db664c10c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 093529385a41a364fcae0ca931c736df ChangeLog 9711
-RMD160 4c604c9621de1f98e3f8af0a8f942f473cf57341 ChangeLog 9711
-SHA256 bb2e2979519371d3a578de45ef9275e57cb0ca0efdf3130b2615b9f49a598067 ChangeLog 9711
+MD5 2a92c70d42aee6633d1ef9086f8c36db ChangeLog 9958
+RMD160 a03be363b224f488114498739efd411a0d75e287 ChangeLog 9958
+SHA256 e833c63bb83bf185d3ee42ef89d4a100397ab23351f0ca6b71cef2d0145b8072 ChangeLog 9958
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -61,6 +61,9 @@ SHA256 4308ff4d223c9802581fd2fd254291d6a05a2608584258b2cfc86a21bba1fdb4 files/2.
 MD5 f59860a7e10805f95e4b89bd08900ad9 files/2.1_pre6/1160_r2979_python_trace.patch 4224
 RMD160 cb0b7065e7f0ef0628d0aa9ede4a110e40488b56 files/2.1_pre6/1160_r2979_python_trace.patch 4224
 SHA256 07b58bd7326ae3a6d8c03aeb877656b4712e60d4b22ab83fe84728976f6cb9c6 files/2.1_pre6/1160_r2979_python_trace.patch 4224
+MD5 71c574fba30ecdc66e30c944da6a5f40 files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch 1254
+RMD160 271eece2c2a1ab785808b985ee0d3f5b742b8139 files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch 1254
+SHA256 0337694c3ee59b341580bb11ea335a000479639ba125329dbb3a634abcc37749 files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch 1254
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -76,9 +79,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 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r6 253
-RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r6 253
-SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r6 253
+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 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -97,13 +100,13 @@ SHA256 12bd64c40cfb73bbf504a314688437b2b94f18b37a3d8944f28e315291ce191c 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 5296b2ec9f9abee2364631d8346bfb6e portage-2.1_pre6-r6.ebuild 5774
-RMD160 0d59861f5af0e3d87a9b14b443cebe179a630457 portage-2.1_pre6-r6.ebuild 5774
-SHA256 35fa1b8057eb5d6a52a0db89e287e8a7549b2615cd6552887a1b695f68dd173d portage-2.1_pre6-r6.ebuild 5774
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEIx3s/ejvha5XGaMRAlHbAJ9+b6ASOAIzhhgS+FksO8i8Fii6owCfbtdS
-R0dF7VmBIJa4gW9NW+fmkIE=
-=bZXw
+iD8DBQFEJMJH/ejvha5XGaMRAv4wAJ96Lof6yqEq42CGULwwNxzJfu1OsACgim8B
+or+ztMMm5q+q9xkvNSZ7vmg=
+=eiLh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch b/sys-apps/portage/files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch
new file mode 100644
index 000000000000..6ccce16bc1fa
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1170_r2986_bug_127374_selinux_labels.patch
@@ -0,0 +1,31 @@
+=== modified file 'bin/misc-functions.sh'
+--- bin/misc-functions.sh	
++++ bin/misc-functions.sh	
+@@ -406,16 +406,17 @@
+ dyn_package() {
+ 	cd "${PORTAGE_BUILDDIR}/image"
+ 	install_mask "${PORTAGE_BUILDDIR}/image" ${PKG_INSTALL_MASK}
+-	tar cpvf - ./ | bzip2 -f > ../bin.tar.bz2 || die "Failed to create tarball"
++	local pkg_dest="${PKGDIR}/All/${PF}.tbz2"
++	local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$"
++	addwrite "${PKGDIR}"
++	tar cpvf - ./ | bzip2 -f > "${pkg_tmp}" || die "Failed to create tarball"
+ 	cd ..
+-	xpak build-info inf.xpak
+-	tbz2tool join bin.tar.bz2 inf.xpak "${PF}.tbz2"
+-	addwrite "${PKGDIR}"
+-	mv "${PF}.tbz2" "${PKGDIR}/All" || die "Failed to move tbz2 to ${PKGDIR}/All"
+-	rm -f inf.xpak bin.tar.bz2
+-	if [ ! -d "${PKGDIR}/${CATEGORY}" ]; then
+-		install -d "${PKGDIR}/${CATEGORY}"
+-	fi
++	python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
++	if [ $? -ne 0 ]; then
++		rm -f "${pkg_tmp}"
++		die "Failed to append metadata to the tbz2 file"
++	fi
++	mv -f "${pkg_tmp}" "${pkg_dest}" || die "Failed to move tbz2 to ${pkg_dest}"
+ 	ln -sf "../All/${PF}.tbz2" "${PKGDIR}/${CATEGORY}/${PF}.tbz2" || die "Failed to create symlink in ${PKGDIR}/${CATEGORY}"
+ 	echo ">>> Done."
+ 	cd "${PORTAGE_BUILDDIR}"
+
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre6-r6 b/sys-apps/portage/files/digest-portage-2.1_pre6-r7
index b5fd1fd89f2d..b5fd1fd89f2d 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre6-r6
+++ b/sys-apps/portage/files/digest-portage-2.1_pre6-r7
diff --git a/sys-apps/portage/portage-2.1_pre6-r6.ebuild b/sys-apps/portage/portage-2.1_pre6-r7.ebuild
index b7ad9fadcd17..5e3f3c29a019 100644
--- a/sys-apps/portage/portage-2.1_pre6-r6.ebuild
+++ b/sys-apps/portage/portage-2.1_pre6-r7.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-r6.ebuild,v 1.1 2006/03/23 10:04:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r7.ebuild,v 1.1 2006/03/25 04:08:38 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -47,7 +47,8 @@ src_unpack() {
 		1130_r2942_inst_uid_gid_defaults.patch
 		1140_r2963_bug_126711_sandbox.patch
 		1150_r2974_bug_126442.patch
-		1160_r2979_python_trace.patch"
+		1160_r2979_python_trace.patch
+		1170_r2986_bug_127374_selinux_labels.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"