Add missing get_ownership and new_config_protect functions for bug #533010.

Package-Manager: portage-2.2.15_p128/cvs/Linux x86_64
Manifest-Sign-Key: 0xAE5719A3

4 files changed, 73 insertions, 11 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 7aef0ac00c8b..3081572de081 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1422 2014/12/15 00:09:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1423 2014/12/20 15:17:14 zmedico Exp $
+
+  20 Dec 2014; Zac Medico <zmedico@gentoo.org> portage-2.2.14.ebuild,
+  portage-2.2.15.ebuild:
+  Add missing get_ownership and new_config_protect functions for bug #533010.
 
   15 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> portage-2.2.14.ebuild:
   x86 stable wrt bug #531594
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 49551b4167f3..a82d0519f3f1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,19 +5,17 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd1
 DIST portage-2.2.14.tar.bz2 896674 SHA256 8dd65971e0f1c31dca922b0f7be06e622aabbed8d012d056ff25a169fc9946d8 SHA512 c8724b42d9932adf6065ff9f9c3bb3d22ec3258dcdb23e041ce704f2c7b634d459a36764f3ec5aa4613843733c70725025af10439816c538ec12837db50dc1ab WHIRLPOOL 82bb660fcc1f0bb4639b53829cf8207fc40ee01a0cb9935ad46fb5039f0558fbbbb3af3d12d208289e9701e0874d77a7990911fd50fe04806948c6c6955625fc
 DIST portage-2.2.15.tar.bz2 907786 SHA256 be62ee5e104272f9e6472a60db7e05136e6acf212003159b500fa3132a9a68d7 SHA512 4e0ca51ddbe94ce0595e56f549c8cdff68d3d2f7d0d7fdece78adc10a9657ed848f084672840f2533bc7c87c6aaa06e02861c7f9d92bdcc1647c9b40b7a3a5a1 WHIRLPOOL 689e62a261b8fa404c8aedfcc825135ba3005ab920db6cb2ce1040ec252f24f67a5d5c01a84db908598390fc97f6df9d9ba78a106ee16aa748a049bf425bf28d
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
-EBUILD portage-2.2.14.ebuild 10844 SHA256 a999217c9b2d855e6eb11362481a40e729774a8b39cf604c523219b8cb9023c3 SHA512 2e6ff9966e79a8bd7020fd630724f2f3aa124021770979aebfec7d92b6bf5f736efcf7956273feee0f443f0756bf291952e168d4f4e0b459f408d395634b5f5c WHIRLPOOL ef3ec30194f9ffc429a9de959b0a7f303678592747b9d3feb3c41abd32beb5055b3e142e47237c2dfbe10984adc16bc9df88b5ac14017fb440d9f2702b40ab59
-EBUILD portage-2.2.15.ebuild 10846 SHA256 2cf2e045340128f298c85aea544ac6f139e3ce5f4d9b9484fa222bfc9694236f SHA512 24ea6142b0834a6987c816c8c17e8e0568040ae12455ffd30d9b4eab890ba4986f790cc0361fe1c8921ee867e69f718a49a627c3312d12527778e07a4ccb74c2 WHIRLPOOL ba52622ce8957d6a06fa4b64085c6902cad767c01ac98d2e8b14901e95919919bfbcd6539f756002d5fab04f6d7a220dc3d1577a5f759311cb234489aa78c144
+EBUILD portage-2.2.14.ebuild 11369 SHA256 ca20dab7550e321ad3f96e4d14071a3da7095a9ac2aee02e5e25cd5fb12f6011 SHA512 be192751d08ea8fde5227c812af8e0391ee0b1b088368f8691a43d696f732d909823807ffab47fc0e8a944cbbd7ffae63790f4e35272e19590e24747bdf02fb8 WHIRLPOOL 1d09b3a95ae8af72d9937f3d4f253b8d35863c491350b31fa01fa5bb3056f1d507d76a36c6e38873da9bb89c723a2370a9f890b51b19b5b1e0e7cf01feae7758
+EBUILD portage-2.2.15.ebuild 11372 SHA256 6b09b3e7610b820408c5a4839967eb51e132f61ded94fd992200143e4d1e3ea8 SHA512 5064afe7fba30219485ea027ac772cc0f390144e486b7ebc6d97e6009b484dbe7ebb5775f9ec2e3e39eeb1a78d2dfdb9d799a34ce6321e505eee28b882407439 WHIRLPOOL e4d501fb9d211b4f1be83e77b1e1da9239bd7a05afb473d1a8a8b359dc622013e08ed086a2fb5a496561a4559dda27d29033529db021afe0fb9bea5800c981fb
 EBUILD portage-2.2.8-r2.ebuild 19246 SHA256 e5117305e6132b0460e73b6f05de6f0c408a7ecb7d3303f3ea19c65d37e485cf SHA512 64bb817cb9467335117c96b69aa533b7e34edb0f0c3d50b87278f2c35c49d7074d3b702447cd18a646c66fc512a163b584bb1d5ec023a8077123ffde171785c7 WHIRLPOOL 99fcf94232e0de66fa33e0f0150a56b085cf67bf1a2c1434f8cc773561e5390cdbe33ca4a8d3d940c80f5209a94b9803d27503d4152420b8e1f3127a590a8666
 EBUILD portage-9999.ebuild 8372 SHA256 7724f26e0ba1f4e2e2dcfaec3506894e545161a7301af31214a66af5e3397644 SHA512 b7bb087502e1fa28e4c04ab3ccafe2d79750c2865b67fb22ccf2475e9c3ab01b6d3e5b9b242dc6fb31e37676edcdca6818ea8866053f6e03ff939bb39dec9038 WHIRLPOOL 8118a8e1f78cbcfd17530366390ba9987807ec2826f1d151a6f8b9ff73c8879ae29dfc25536684be24a8a3be5cfa1e3b4b35d17c1f31f3a1d9cd4326fea37e79
-MISC ChangeLog 61401 SHA256 f90b14f38eb52d06d86a2fd71649e9d20ab74894bbf10de92b4fa3f00165dfde SHA512 b1feb095aafeb34f7a91bf58daa410f153a5c161ff99a756f61a17c44e6e65a8df2a8a934322277cb31c857502613d4c54575609f20dfcc9ebe5342f0920b5b8 WHIRLPOOL 5dd7db2e04675f4575bc86f8c30b133e2bbabc19490f5bdbdd95a14071ead5668eff2da29bff6b7d868753d66c1241d53d5d14cb5349b92b686d6f784b51f0d8
+MISC ChangeLog 61575 SHA256 b3747e4e8a70e11c4b26b48c6d13c831babcc007b81ee3116e4fce3d1fdec991 SHA512 eaa7bef4eb0a88d82e7c0e0f3bb990cc1af58a5fd53daf3afbc136e4c4561e44aa5d23c4d4e09cc04685a1cec803512c97f78a33b9ea219f872028d72ad84ee0 WHIRLPOOL b300f6044c34d26824cd6fbbe71cd1826e84c8dce70d42b203669a09497057cf740a5cb519ec8dabfea5df121a53cf10186420561f2b56571080b64bd451e60a
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 1028 SHA256 c3c8eaafc55327db46f7851b816118637c3f81ba908fb7c536036122a807a874 SHA512 287af0b907a1890ad8ab53cf33001ad1cb6f2c2c8efc022ffa27647afa0e0fc75060e7268d2b7f0932258e12204ac23f927f49d99130714d025e5610e2526e83 WHIRLPOOL a332c3d7208a4bf6bb5caa155331956f6123e73d999200c09e3a477136f9090de492f6455e2b19e49d7d6782a2bfe1aafd147df382db7927bbb12ae553a2d3bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlSOJlgACgkQG9wOWsQutdYuOQP/YL3/ZNtcMv/DQH+8+J0LgQLC
-pvNE2xKxA6iE3MULbEdvKVpeqq6LEvROhLREQr6rwmiSA4HL+DvO2f17zvFOVomQ
-3FcBRU1qrgznGW5eGURw18A9nSF6iwQnTRt7prNHmidqOlTCLibMsSYg2uKqxw4c
-wjCH3Q1wf4hUBXBrfNc=
-=HqAR
+iEYEAREIAAYFAlSVkv4ACgkQ/ejvha5XGaO/mwCg0fVfTAokvR/Jz9wrIA6EbvBf
+BoAAnj3fE+Y66rrGl2EzgqVLBku1POai
+=DNAH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.14.ebuild b/sys-apps/portage/portage-2.2.14.ebuild
index 13be625a962e..2a51fa7d5f9c 100644
--- a/sys-apps/portage/portage-2.2.14.ebuild
+++ b/sys-apps/portage/portage-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.14.ebuild,v 1.5 2014/12/15 00:09:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.14.ebuild,v 1.6 2014/12/20 15:17:14 zmedico Exp $
 
 EAPI=5
 
@@ -232,6 +232,36 @@ pkg_preinst() {
 	fi
 }
 
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
 pkg_postinst() {
 
 	if ${REPOS_CONF_UPGRADE} ; then
diff --git a/sys-apps/portage/portage-2.2.15.ebuild b/sys-apps/portage/portage-2.2.15.ebuild
index c8d7b57bda93..689803b983a8 100644
--- a/sys-apps/portage/portage-2.2.15.ebuild
+++ b/sys-apps/portage/portage-2.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.15.ebuild,v 1.2 2014/12/06 20:13:44 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.15.ebuild,v 1.3 2014/12/20 15:17:14 zmedico Exp $
 
 EAPI=5
 
@@ -232,6 +232,36 @@ pkg_preinst() {
 	fi
 }
 
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
 pkg_postinst() {
 
 	if ${REPOS_CONF_UPGRADE} ; then