Refactor sanity checks a bit and include gcc in the search path #453760 by William Throwe.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 55 insertions, 41 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 580f2d5b8e55..70a32aa9e903 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.919 2013/01/23 05:27:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.920 2013/01/25 03:12:18 vapier Exp $
+
+  25 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/pkg_preinst.eblit:
+  Refactor sanity checks a bit and include gcc in the search path #453760 by
+  William Throwe.
 
   23 Jan 2013; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild,
   glibc-2.17.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2ae26a685f3c..eba68f8b7180 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -19,7 +19,7 @@ AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
 AUX eblits/common.eblit 9663 SHA256 98b7a24a09634dc1b6474b7c7abf5546bb498ede6e7c8432b7b87f56b162bf99 SHA512 d6853857b38d81945a17d725d4b1fe5d230d9ded5c6f091e1c7c5489ea963ec57428aa6d44fe630dd4661d87e9374ebb13078bb992adf60c74ad9a7dffe40c3c WHIRLPOOL ac6ff60e4a47ec3629472c64ec3bdbfbf892e0961b7e1c69f63df78c6967286915030fffd2eaaf6231c42c52c264324054493b9ecdee263d60f328c79679d2df
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
-AUX eblits/pkg_preinst.eblit 1712 SHA256 42b68f59b7a89824845fdf52bccdf5c4a1c694c4685350fd03d76c7585a47c2b SHA512 6dbbe485f77635571688a7e7745d426f762273f29fe4df64e4c516c2413bbfd8cd8c0352c4268797615c79f2a7f81119d3004530ce1eeb204e95111c6ed5a625 WHIRLPOOL cf4d2452a91deb124a50941271a41dba8aad8e54ee8454b1d41ca587a926eaafce95b11808d20fd1244d3a57f5c072626d9062ea20f42b69e08558b6f2fd0d89
+AUX eblits/pkg_preinst.eblit 1877 SHA256 e5e58f0c592c430b7e7f0cd7f367528a2766f6d598d3e2462ba5a100dbf18842 SHA512 f35029d0e71b37f4cc64e188e590ffc89ee12c6aa2d262e9af2111c81fc0ef876050ef156a9cdad24bf9aec10ad9c803d243fcb0413c5ab63f854c1345cb9661 WHIRLPOOL 8772b09245fb9242288144f26f6fc60ea80fdbace72274a05dfa00e4bb19059e5e763baf02798ac54aee6e01346fbfe87096c279d245c7aad82c8cbf4a30d231
 AUX eblits/pkg_setup.eblit 3886 SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71 SHA512 6123cb9a2226c899d8e268141399686f2c2d082c81fb0c3e30f8b06ddd41e5aefe95c345a7fddf2d60c9d751cc1784350285542cd1bc0198e203c9fd74fe7a0d WHIRLPOOL 30dec2dcf28966fec5a0acef5605eaf40e5a45a74d8256ab9645f2bd090ef6bfbd1f02b753d83aa875d7b37edb6f419e22f633adb41d766593e5c4da53097dc5
 AUX eblits/src_compile.eblit 6556 SHA256 4f77e98143c4dcc62d4e6443eeba8698787913544c4284986f58b10d55173657 SHA512 8d0ee6f77dda8ffe445d29efb1d654d2f45130a769b3b0fdd7f96f7eac2d34a3685241b6db8e26c5d084ed15dc915cc904190ac206008ff656cdc79ce2ee1974 WHIRLPOOL 28250b4de98df28700ea0b19936be765dd8b490cee2a1b1b8544c6177c1de872ce85d960072139eca30bde1c35a5c7567cc7c77f3927fd366a539aa825e2a62a
 AUX eblits/src_install.eblit 8127 SHA256 d7d5550bbd298cc4241565523688e4b76469c8b886f8767081a6a6116800ba53 SHA512 dedce11cc275d35f31136312c2fbb120383ccff4c490ebd781c35b22aa6ec36d7a12117896ed6fabf79cf84b5b2de6af75350ad06c7fbc1607b788cc8698043d WHIRLPOOL 45ee011b5cb9b1e6b7eaca9bcb3096062a0781ec107ade9fba4517096999b9b3a405ecd3fe368a65098516f135684f6219a533623770137770e9e346b4410935
@@ -79,23 +79,23 @@ EBUILD glibc-2.16.0.ebuild 7800 SHA256 f084b2b348d7684ea3efcdca9ba68977f2986e9ee
 EBUILD glibc-2.17.ebuild 6617 SHA256 be4d9ade36a370703f0ba7c02b64f66c1fce58668c9eaf0059dcad4f2a42c335 SHA512 d01b4a87073c488c84b65da02e257d04f29ceaffd25a0927fb63ca9b4ff2536413ddfe559cc60d6a03c229dda3f53725494cee458990f8c0de9fb6d170ec01d5 WHIRLPOOL e7daa79a2733522d17e5255923131fc2afda2837af66b3f209494875dc7a857ab3d6452097ca7dc4e9ce97d8a9310f30590b608a2a7a9dc09c822e479f070ad6
 EBUILD glibc-2.9_p20081201-r3.ebuild 7076 SHA256 8243fdbf649aca74053c4995bed7af550fde05c5fe961d9b65ec75bfd62ab80e SHA512 effa5e6380b061675072a0a07dc00c62d6acc8314b4cbe166e530171fcb3a016a1d931926aba3484b97605b3cda3f2efa73506050b7b7036a048de06795c2f1a WHIRLPOOL 9cc5fb771f49ca83d52cbba740026522926b735a756a132b800032a61d3d3cc965ed7a6c46e45593d10a3de79a3ac6c1a5a66b208f29d366980f8a9887b82e9f
 EBUILD glibc-9999.ebuild 6618 SHA256 3bb0708ae706cd4955ca1de4987849c52180e3e015afce069c43059606805842 SHA512 d20e21595bdf7497dee38a7bd1b0e9e2327ae91eb6adca4f957b9202db851fd3c1ef362de5aefec18857838ad1d02339e1a44b8e20ef89fd35e488bca191a4df WHIRLPOOL d9194049c9f56bc88b1d27971ea69d73c1b92d9b77166431676bd5a089808caa2193db6df4eb8668aa69980b2bd60ab3a3e98299abd6c77248f44f9ccd95a01f
-MISC ChangeLog 54705 SHA256 1ba214caf53c99b156df54f19bad76a34098b8a86f31dd7cfb0d3e0871a92eae SHA512 8d5e34d73b0c78ba35e609da4c08b104ccaee0096b00ba381f462c9e765c71692c58b81e88d7b4c6cc6e5560ec9d0e6caf80153afc3f4aaa4518f21c76aa0e3a WHIRLPOOL e6c84c24c7efef19da706bf81805fba85fe3936c20520933fcbfcdbdf569b8a6e1b8dfdebc925a6a5e859e7a19ea8074d779cd8b61d7c8f49451d21fda385d16
+MISC ChangeLog 54885 SHA256 9d57ffb8024693dfc7da7649458a331686f05613d4540f21c9d5c4c0fa4bf7b2 SHA512 3973cff5f7867cc43725569c47f43581e9207c20ede0b5231e4c7dd01b1c5dad03b69282be902abfe15864e22e885629a214832a9197debf88e625d305890035 WHIRLPOOL 8164d1d281946bade0291b8c815b47db4ba0161c08049c280c8ae0db8c9bec7b846f71e2a9dca020a0d80be88d366ad424bd78cbfd78173951d48072a3d9d29c
 MISC ChangeLog-2007 108587 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17 SHA512 405c93cd08d102ad1a9e40975563e645e982b5baa238280c38118b46b7c828ca924c73766c254cf24eaff255b16b3f4c8133d2e174cf3e47b704ff49d754640e WHIRLPOOL 4ab79bcd243bd4281898e93987b49a2dc44fb7ef2df9073708dd12223bd01f595dab8f08f342bd5dd8d0fc955ee031b11ce70e1cdc118f7dcc5b63f90d785e9b
 MISC metadata.xml 493 SHA256 b3350fcf68191bf0b594aeae74488f458659c97bbe1ed522f8965e20f62bae26 SHA512 3926e7befc33cbe344f991d606c4999d5904cd3ad26410283e666003d04d8156ad8746a9765f34a4b2d51b89778123f903443ae6d3f6504e5e6e55bcc36abe20 WHIRLPOOL 8699da3a72006c1004bf2ca4c18ca5cc9defe4b3201ab2005b5e03dfade01bfc0c0988a2b2e23b70a381d1f661e4a3f16e622ad7b93fd8ed712802c40a537fba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/3XcAAoJELEHsLL7fEFWxcYP/0adRIO2eDF7XGlZfkLRYTFr
-kCCpKkyJkCUtPFyfaoK23ti8TZLmhxLJXc84hFswqDnCfnLAi44BJ4cDWb0/2xh1
-PfLpFiSf5MKWp7pTcOSi+dPfe2RXy51SCqqfTRUBR6+dXNPuOT5eH9GNSCJcMWS6
-x5j/KBDGEBs868I2z0gO8WWkcRfKg2oUGisNPSWMa4RzqicYPWoaBS+JTDlXqdqR
-4+H0MPaC1oWu55ZAUuyxmpWFy+KpPJevhsCtHfDagJ5u1BUyZMuhLhV4wxsh3h+W
-OCUP1dc/MVsMXK6WMNsRY4W+wpYbm2xxZrh6zR+cGgC1vNeF0mughfGXoo24oGZu
-+3U44hJbg1ACs+VwUF5gQ1O0x3CGs8oHqWNlGH468pv+ZH0ksfVll/KPfWsvWdmd
-5dkqk2FAPYa2T4nj1aLyqQlRQWgVAsSPd/yWESe78z5lxeG/5J2BTkn/bmxIXlLk
-OXFDdlxxl4c+EGe5gAi5GtsNVzRHSAUeRSpSrZ9BulrfTHk1Dyo154w5MfZGEZuy
-YS0EJmS+2J5NPaqC7y1Y2K7pLGaeE7mvicB9OBcIrIFnJf//+h/gbnCO3+9V8clg
-qPeACcD/czO9Crm3D+kUVnvLN3AXl1QgTg0yUaCeNyioHZyvYCEOqde5UbWeD/E2
-UR8gp9x5y0uKU+JyJBFu
-=PGmi
+iQIcBAEBCAAGBQJRAfgWAAoJELEHsLL7fEFWsO8P/08rfbUL0l+LsBFvX/GphBaT
+APtDTopoFDqyfn22rHieQhKGT/WaEzT26RKqRj8chJa+ZPEjJg5edXEGCnq8hYfj
+CygkQDJgxb+d7H0eTitziGWMU0wFqDg80ZTNWO2TLahYBaSi18xxFHqP0xSMPNga
+xBEsCOu3zX7a4kO7xIryBka4UZOxTzzuRapPEgnxKk9zV9tLCiW5zr4ZdevyG2rb
+DRXT9tEq2Wn492OlosuU7rWSWyVFym3WF1CuoT4iuDqPUkEK130s8DCNerOX2CM6
+tIvTdfiHMnZV7QT2O1BCm7yash8KxjRrIdTlIsZXIXbC6/cHj8G91BEbzzZJnS25
+OQPDkneJS4tVTZGhmt1sHe4xGnCEOUDRt7itjJCCGILa9yoiWoETxSCGgR5BP8/b
+VCLKf3mrBbomWEyKoWZs0VxNU+OiLzvt1GonsotjDFjvb6LJG5i3IgRX7/5u5Wso
+jJZQH9rMIWduR2om2h2tRh8KU5L2bt7rlrXoszW0BuPzEJSQPbybs1BFWZsQVaXu
+63FOza256uVJimVl5X5ens8sGSu5kOH9fNWR4X8576JpBv5kUL1+S6m9bFW7ohoV
+mcYlK981KByBjD4u5pJlTXp1p/1HLm70uf3bzxM/r2zHLzpw1UKHcWlHthEmJGNC
+42RCKRFI92IHg7XUN9VR
+=ozOm
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index bb1032ddcb03..3475415ea325 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,6 +1,37 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.6 2012/10/02 07:12:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.7 2013/01/25 03:12:18 vapier Exp $
+
+# Simple test to make sure our new glibc isnt completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We also might have to search the gcc dir for things like libgcc_s.so #453760
+	local gccdir=$(ls -1rd /usr/lib/gcc/${CHOST}/*/ | head -1)
+
+	# We enter ${D} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${D}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in date env ls true uname ; do
+		x=$(type -p ${x})
+		[[ -z ${x} ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		[[ ${striptest} == *"statically linked"* ]] && continue
+		./ld-*.so --library-path ".:${gccdir}" ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
 
 eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
@@ -15,29 +46,7 @@ eblit-glibc-pkg_preinst() {
 		elog "Defaulting /etc/host.conf:multi to on"
 	fi
 
-	# simple test to make sure our new glibc isnt completely broken.
-	# make sure we don't test with statically built binaries since
-	# they will fail.  also, skip if this glibc is a cross compiler.
 	[[ ${ROOT} != "/" ]] && return 0
 	[[ -d ${D}/$(get_libdir) ]] || return 0
-	cd / #228809
-	local x striptest
-	for x in date env ls true uname ; do
-		x=$(type -p ${x})
-		[[ -z ${x} ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)
-		[[ -z ${striptest} ]] && continue
-		[[ ${striptest} == *"statically linked"* ]] && continue
-		# we enter ${D} so to avoid trouble if the path contains
-		# special characters; for instance if the path contains the
-		# colon character (:), then the linker will try to split it
-		# and look for the libraries in an unexpected place. This can
-		# lead to unsafe code execution if the generated prefix is
-		# within a world-writable directory
-		# (e.g. /var/tmp/portage:${HOSTNAME})
-		pushd "${D}"/$(get_libdir) 2>/dev/null
-		./ld-*.so --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-		popd 2>/dev/null
-	done
+	glibc_sanity_check
 }