Reduce the scope of the __guard checking, and filter out more files w/ROOT #394453#3 by Andrea Zuccherelli.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 17 insertions, 9 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a1a2e06dd5f9..002195beb8f8 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.806 2011/12/12 17:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.807 2011/12/12 23:22:33 vapier Exp $
+
+  12 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit:
+  Reduce the scope of the __guard checking, and filter out more files w/ROOT
+  #394453#3 by Andrea Zuccherelli.
 
   12 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit,
   files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 85efd079f9bb..a5af8f2dfa76 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -18,7 +18,7 @@ AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f631
 AUX eblits/common.eblit 9323 RMD160 aa42c1ca5b73b68bb6d022355dfa7e149091f23c SHA1 1849da38c293bcfddc0b6446d4e1862d28f0fbe5 SHA256 d3841f2d4d9065754e57b5d9143c54eb278daabde81cf0d27179e281ddd0875a
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
-AUX eblits/pkg_setup.eblit 3748 RMD160 69f64d51784fa1a5d6e14e2d10cb7f5a427ce855 SHA1 218831db1330397f353fc6ff5e1e7f708a6b077e SHA256 7d0f68256169a0526f6db3a5173339c6792f154120f05363fdda11a6288eb9bb
+AUX eblits/pkg_setup.eblit 3875 RMD160 27394468ab1c2f81edb3f81bfdb68a3c629e09de SHA1 362dd72274bdeae4f1cbcd3cbc0b8cd27ef5b85a SHA256 e1a3dd5dea45e2772c6cdaa71d0783390acd45c5501615c18abb45032faba6e0
 AUX eblits/src_compile.eblit 5777 RMD160 589394dbad302c02ba2ca75730938a9d58986980 SHA1 1b827f4f649924558a7c115614ffb20f841ffef7 SHA256 4fec8eb713125dd89c5d2e19b2499dfcca8796943fb437e419e417929c6d92af
 AUX eblits/src_install.eblit 7530 RMD160 40226c9ef9975b7f055326b660338d6cf288082c SHA1 a4ff814e0d6ca59e6ffbff7626c1230958f70370 SHA256 4b1899e2669657ace7fe225b9f737891ae57b455ea5b88d7d844a7858110eeea
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
@@ -62,12 +62,12 @@ EBUILD glibc-2.14.1.ebuild 8790 RMD160 f1e9c7f95d2486e79303e7d94a259c224344c171
 EBUILD glibc-2.14.ebuild 8789 RMD160 2526d5682ba5214e88ac1daa1afa46607f53093a SHA1 3cb67afb2d3606f78047ce96c014fd4a7286018a SHA256 1df3c918ad3a947b54bbd8e6b6e6eb441705d4cb9c561228096820dadc045503
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 8d14a32be1c680e21128552fff3e7299710b0255 SHA1 92f5182dce11c5a77e91ebd9129c2c6ff6938974 SHA256 b90aa298fd49569090f711b2bd9368a66c73cb6c37e85525d1d929ef70e09a5b
 EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9
-MISC ChangeLog 143867 RMD160 f2bfd068c6e18797717c1e1d5c654ea6b42e3dda SHA1 7da31371bd41cd44b7b404166117a9c34c132b37 SHA256 f5cfab0947f9e8a483a65c93d6afe0dc8124dcb6f423521a680bfc4aa2a94a43
+MISC ChangeLog 144060 RMD160 607620a5209c97fa89bd8a40274b769472a0e8a9 SHA1 974c585988d7b0e51b48e23177d44415966591a7 SHA256 75f28d1d60d84ec0a6e2576c6aa5b22afc9213730f9cafda2363f6d8a03e1fd5
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7mPjgACgkQaC/OocHi7Ja2BAD/U/mJjKXgfSySkhAV9UZZEe7x
-2Pi9AFbfLNvipuUt124A/RMiJgf5wlj5agZZUuTgkIqs+uHYMlEUn9zqlT1+oSYw
-=/y2N
+iF4EAREIAAYFAk7mjMMACgkQaC/OocHi7JbujgEAkEb2gLumop6Vf9wOFsW/TVWR
+g/77MTKwqV53ZS0xA0IA/09DFe2xPPxIdVTkhjShFefqFdTq5UBxs5O9e10oo2bL
+=Ni4K
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit
index 31a38f437716..8b712537b77b 100644
--- a/sys-libs/glibc/files/eblits/pkg_setup.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_setup.eblit
@@ -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-libs/glibc/files/eblits/pkg_setup.eblit,v 1.8 2011/12/12 17:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.9 2011/12/12 23:22:33 vapier Exp $
 
 glibc_compile_test() {
 	local ret save_cflags=${CFLAGS}
@@ -97,7 +97,9 @@ eblit-glibc-pkg_setup() {
 		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
 
 	# Make sure host system is up to date #394453
-	if has_version '<sys-libs/glibc-2.15' ; then
+	if has_version '<sys-libs/glibc-2.13' && \
+	   [[ -n $(scanelf -qys__guard -F'#s%F' "${ROOT}"/lib*/l*-*.so) ]]
+	then
 		ebegin "Scanning system for __guard to see if you need to rebuild first ..."
 		local files=$(
 			scanelf -qys__guard -F'#s%F' \
@@ -105,7 +107,9 @@ eblit-glibc-pkg_setup() {
 				"${ROOT}"/lib* \
 				"${ROOT}"/usr/*bin/ \
 				"${ROOT}"/usr/lib* | \
-				grep -v '^/lib.*/libc-2.*.so$'
+				grep -v \
+					-e "^${ROOT}/lib.*/libc-2.*.so$" \
+					-e "^${ROOT}/lib.*/ld-2.*.so$"
 		)
 		[[ -z ${files} ]]
 		if ! eend $? ; then