Initialize /var/log/portage permissions for bug #378451 and bug #377177.

Package-Manager: portage-2.2.0_alpha51_p28/cvs/Linux i686

3 files changed, 21 insertions, 7 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 304881d15e09..54f17279017f 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.864 2011/08/27 11:29:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.865 2011/08/27 17:42:55 zmedico Exp $
+
+  27 Aug 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.10.11.ebuild:
+  Initialize /var/log/portage permissions for bug #378451 and bug #377177.
 
   27 Aug 2011; Raúl Porcel <armin76@gentoo.org> portage-2.1.10.11.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc/x86 stable wrt #380677
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 913815eb4160..9a4ff59a8382 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,19 +10,19 @@ DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c6
 DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba
 DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
-EBUILD portage-2.1.10.11.ebuild 11168 RMD160 e7b1a77dc61bf6d65282602293e5b390c78fa581 SHA1 3ded8306e36cafc3b87d789e9f58300fc5a4226d SHA256 94fe25dc6214dfe440a8a502802b85f830975a722e02dee071cd848e4fa11d16
+EBUILD portage-2.1.10.11.ebuild 11664 RMD160 4ee668cfbea804d9ca23c208719749b290b8cc4f SHA1 5c3e30a3d7b016a92b8db4d7fce6c15078b6a755 SHA256 025fb8bb974f54d20dcbf654558e14c0dace0035f072cc460f8dfb979824d7ad
 EBUILD portage-2.1.10.3.ebuild 10221 RMD160 97396fdbcb6aff7705c2636f0fc829a83c1aa074 SHA1 eca88bafd3733c621473f03426558cf5a09ec176 SHA256 0a258d57a64921dbf2c9e21965a45212738d1758adf670b23670416d41f55888
 EBUILD portage-2.1.6.13.ebuild 10038 RMD160 a40e576c31f07f89387bda834607e62708b47e79 SHA1 ecbd0bae4ca5f340627f1dca792d137870be4d5e SHA256 c507d206aa08c39b387f464f1fe973d15b1b39baadd2a8feafc4867f8856e1a9
 EBUILD portage-2.1.6.7.ebuild 8689 RMD160 a04a6f87a6ded5b3c20413c79cc5d854f4083574 SHA1 1782ad24f77a56d2c8cbd88828d50451a1254f7e SHA256 a3f0e6639db74003108c933fcd4557bd4dccbfd913fc6fde7546dbec3987797a
 EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e
 EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292
 EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7
-MISC ChangeLog 44110 RMD160 680c6754e2a988b7188a990c75d18c1b679618dd SHA1 0ce713ef05f10deab546e51cebaf5cac81ca5383 SHA256 76798f53be406e2aa932aefd11dc871a575be6e66b335e4eb9e5a8ac2cf76f1f
+MISC ChangeLog 44259 RMD160 dd9e8becba764aa278ccfc495819ddf877b754d4 SHA1 e117af3364798d38659648457711e2f714911a5b SHA256 eaca05f9dea90e2b763172a5131dc3d84f9cbe405c46bd1437619e4ff14d2a4d
 MISC metadata.xml 806 RMD160 511095d817e35ffce10ea738cc401176c9346caa SHA1 d25de76c2eaaab4a4b84191e7f33893bee81370d SHA256 cc5f451325114cd24263899ca84010c02700de03e21fe413661178a9431962d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5Y1T0ACgkQuQc30/atMkBRIQCdEwwPP8bPsQO+H7WKRFi0eVcX
-IYEAn32wI5+nBjVnQX7V+VuoCViVRErv
-=8ri4
+iEYEARECAAYFAk5ZLKUACgkQ/ejvha5XGaPbPACfeuspq4M/3PZOZgi4hh/XImWj
+aZ0AnRQL7uZYrm3nYvlFt8z2pcrRTwNM
+=qGNA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.10.11.ebuild b/sys-apps/portage/portage-2.1.10.11.ebuild
index 93151c0aca7b..c908dabb13e0 100644
--- a/sys-apps/portage/portage-2.1.10.11.ebuild
+++ b/sys-apps/portage/portage-2.1.10.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.11.ebuild,v 1.3 2011/08/27 11:29:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.11.ebuild,v 1.4 2011/08/27 17:42:55 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -319,6 +319,17 @@ pkg_preinst() {
 		rm "${ROOT}/etc/make.globals"
 	fi
 
+	if [[ -d ${ROOT}var/log/portage && \
+		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
+		has_version '<sys-apps/portage-2.1.10.11' ; then
+		# Initialize permissions for bug #378451 and bug #377177, since older
+		# portage does not create /var/log/portage with the desired default
+		# permissions.
+		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
+		chown portage:portage "${ROOT}var/log/portage"
+		chmod g+ws "${ROOT}var/log/portage"
+	fi
+
 	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
 	REPO_LAYOUT_CONF_WARN=$?
 }