From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 12 Mar 2006 17:57:11 +0000 (+0000)
Subject: force ssp compat symbols on everyone for now
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f47c38d03cf8379e6c305b15d1a32f551a8bb1e;p=gentoo.git

force ssp compat symbols on everyone for now
Package-Manager: portage-2.1_pre6
---

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index bb029845add4..1e53b86e63e8 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -421,16 +421,16 @@ SHA256 f41912c160b24e166391e32106846e9ad0509215034101c521cf559bbe7e38dd glibc-2.
 MD5 de12b8950c10db441f5c5229a7809e76 glibc-2.3.6.ebuild 40698
 RMD160 335e0e0dd2e2891a761eaf2014aaeb4f2615f276 glibc-2.3.6.ebuild 40698
 SHA256 4ff27f682df4b31ef7b2aebe576e1b781ec1df566a0e0bfc899a603dd5cba723 glibc-2.3.6.ebuild 40698
-MD5 9c589540e2f8a01807e6d9fbe5299804 glibc-2.4.ebuild 42683
-RMD160 6fb56affee09760d7c0db701718da8552305aac1 glibc-2.4.ebuild 42683
-SHA256 311b0f5676c81f2e729d8520b8462d66f4eaa852f9865440d8234d200647849e glibc-2.4.ebuild 42683
+MD5 0e2a0316cd54c907805250d7dbc80e9b glibc-2.4.ebuild 42753
+RMD160 75b6c1a4f30617982beb1ead13c214d42c183d2f glibc-2.4.ebuild 42753
+SHA256 e848bf1a29125a29cb41b27ddf2be973aaea32dac7209c9427d40b3f8f5e2538 glibc-2.4.ebuild 42753
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEFATz2+ySkm8kpY0RAhM8AJ9wJtzh6ySfgzz9ULqLAps4aeEVEACePIdS
-rLtjKaOGkdnkZJak2U+Pl6E=
-=5Gy2
+iD8DBQFEFGFs2+ySkm8kpY0RAuspAJ4kcrWI/7R9de1qs7IN1kwb3L107wCfUtnP
+GItVDeq4zHaATV5Rv8B0izQ=
+=aO7+
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.4.ebuild b/sys-libs/glibc/glibc-2.4.ebuild
index 775860d4c9cb..55fcd4c83184 100644
--- a/sys-libs/glibc/glibc-2.4.ebuild
+++ b/sys-libs/glibc/glibc-2.4.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-libs/glibc/glibc-2.4.ebuild,v 1.6 2006/03/12 11:22:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4.ebuild,v 1.7 2006/03/12 17:57:11 vapier Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -1168,22 +1168,23 @@ src_unpack() {
 
 	# Backwards SSP support
 	cd "${S}"
-	if ! type -p scanelf > /dev/null ; then
-		einfon "Scanning system for __guard to see if we need SSP compat ... "
-		if [[ -n $(scanelf -qyls__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then
-			echo "yes" > "${T}"/.ssp.compat
-		else
-			# ok, a quick scan didnt find it, so lets do a deep scan ...
-			if [[ -n $(scanelf -qyRlps__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then
-				echo "yes" > "${T}"/.ssp.compat
-			else
-				echo "no" > "${T}"/.ssp.compat
-			fi
-		fi
-		cat "${T}"/.ssp.compat
-	else
+# For now, we force everyone to have the extra symbols
+#	if ! type -p scanelf > /dev/null ; then
+#		einfon "Scanning system for __guard to see if we need SSP compat ... "
+#		if [[ -n $(scanelf -qyls__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then
+#			echo "yes" > "${T}"/.ssp.compat
+#		else
+#			# ok, a quick scan didnt find it, so lets do a deep scan ...
+#			if [[ -n $(scanelf -qyRlps__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then
+#				echo "yes" > "${T}"/.ssp.compat
+#			else
+#				echo "no" > "${T}"/.ssp.compat
+#			fi
+#		fi
+#		cat "${T}"/.ssp.compat
+#	else
 		echo "yes" > "${T}"/.ssp.compat
-	fi
+#	fi
 
 	case $(tc-arch) in
 		#alpha)