Strip -fstack-protector*. These flags are now enabled by default so we can

consider them supported. And even on systems where gcc-specs-ssp is true,
having -fstack-protector in CFLAGS causes a failure because flags added
here end up getting /pre/pended to user flags.

Signed-off-by: Ryan Hill <rhill@gentoo.org>
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

3 files changed, 24 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 90eea870829e..dfee6e900505 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.992 2014/04/05 16:05:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.993 2014/06/14 08:07:10 rhill Exp $
+
+  14 Jun 2014; Ryan Hill <rhill@gentoo.org> files/eblits/common.eblit:
+  Strip -fstack-protector*. These flags are now enabled by default so we can
+  consider them supported. And even on systems where gcc-specs-ssp is true,
+  having -fstack-protector in CFLAGS causes a failure because flags added
+  here end up getting /pre/pended to user flags.
 
   05 Apr 2014; Mike Frysinger <vapier@gentoo.org> glibc-2.17.ebuild,
   glibc-2.18-r1.ebuild, glibc-2.19.ebuild, glibc-9999.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9ada41015acd..8a25694de192 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -21,7 +21,7 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 ff9cde8857c5da89faa4039e2a81748
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2 WHIRLPOOL 9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
-AUX eblits/common.eblit 9918 SHA256 b0dc932bbf508654068082009c87aa383829185836b7a61454c5f06618fcb68b SHA512 31d81971c7e8a9727e48da57c7b268559ac80328665d9468d123ef204e86636bcfda3d9a8365c4a550a0978ac9b6d7502ea222b9d951bc693ae1a412d6d4356d WHIRLPOOL 2f85308e7e2560a78bc00018a4689d04c802f5987debc93ac44c715356c005588455bf54f0e71153024822f84becb982c1b08b6c27eb94c1b24dfa8cd3ef6aa8
+AUX eblits/common.eblit 10199 SHA256 6fa93dde0f9d3ee04d40aa0770d5da0983c446a147d4fa5caf4ae9257fe9e5e7 SHA512 79791d9c0208a4e0aba53071b9d6218d5e2c2704720f2ecc9d21c0aa53f7d0f5b493153b350dffb05c679c339d4027af7c8f1d84d1ab64128b30062e5665a3c8 WHIRLPOOL ea96087cd4719d52eeef2eb886d2661accec242d56d14d87a25f485b47f82bcf2ab6883a52494d942bb0d4d80dd1ac9cb9c3dc0c0ae114abeca77458f64ac5b1
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2288 SHA256 2c9a0580bf9924d30efb6683174849a9789cf428ceabf340ab8d592ac7c3d14d SHA512 0b946492981adc4d4d4ce8a40cec1f05537653ba5a6423fef3b1d058cfa4f21594635b13c509ee186e9202d54d502e9f61258706e37b55c0ee53a00772bcdb59 WHIRLPOOL 46866a1255eca622dc37c02eb32f4992b3eb90502599226a2ee5e2fc1ddcec4673162d6fe1f53a720e2d3b350a36b8b0d5bfef161bd815e0b335dc0b6fadfe27
 AUX eblits/pkg_setup.eblit 3898 SHA256 86b2ab461571912b948791558c37bccabfea6c5b7a08d1fdfe646b51d403b4ef SHA512 c1f8fe6e691c989aab11b2787b42398df0b372d267a10513772cd874c99ee07f3889bbeec86d7d944316b8804d94ebcd29831e29712ec14a062581aae3d58573 WHIRLPOOL 809b89b27400732715048a5fc3c17a4a14a6dbac2b2c256dab3680588dcdfd506c088a3992439fc71a0c40754803aaf62223ba81f6981b4b9b2fd20302e0af4c
@@ -92,23 +92,17 @@ EBUILD glibc-2.18-r1.ebuild 7021 SHA256 308a57802e31f6ec4a2ab6be491bcf679707a6a7
 EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca28fd4d7d8776a6217a00f SHA512 70c9b91f224c276783b96ae60f57ac48886861fda71be6e6e292840b4c8cc0fea798005c26c6c33f198c63fb2c38bf78e994821dfa010086ba7ece443257b851 WHIRLPOOL 98be39cc52c7d8431e46f24f9552db63980f4a38c8e12aaffd4b08c7c66f8931a16fd7deb99e43a5bb330a42e6c1e722a9a8f74d1fe97523d7b4bfe75c9accf5
 EBUILD glibc-2.9_p20081201-r3.ebuild 6787 SHA256 3d9ff2b86df088b8e8cc082c5ddef164b48cffcccfa2ea001306e79a6d52a52c SHA512 7070020105a777bbf6d846fab291b238d7861472c737031e8c52b6d5c2a0524e228b724751325448ce94a42ee39112088b91d0597cd2cdbcc68c51248d2d5a11 WHIRLPOOL aa0e2d11377c3a30478afbef0fa3daa12aa9711d68dc92ab08fca999e599c613648644da2e6f81c38dc98192ed26934c4a35418a97d3146650cd4c82e39a7fed
 EBUILD glibc-9999.ebuild 6914 SHA256 4971f17230296be26af64606f485ecc96b39443299fefed061bd5d75bb92d3b1 SHA512 f3b13235306910ac2ab642de66dc128977fd5bfb33d89d676b464f39e81a7f095283fd5b761d06bfddde111da8763109b06d2223c54d9ae29aa1cd12638c8233 WHIRLPOOL 12c1f8c129da0722346b239e56a1d9f3a7a84739d2e60e986a3946d61297f630f51ec9e03fb0c05958a6c39a01d4ef5d999466632acd27b0125ca0b91170db7f
-MISC ChangeLog 66094 SHA256 5671258df36d8589cd14e05cf6afb93f441ea654fe9ce9b98e9f6230e8c4d171 SHA512 d8385c0fe5dc2ffc1ba0c40739b8638bcab6d637eaa493d9b06d9a106fb94f8474b010ed64bcc083960eb05253b2e8cbba99111a1e8b7aebf9d77a23e862f7cc WHIRLPOOL dbc8f6618ebd9e48e6603a4044af1b3d7d304f7d9006f101f88a456c8ba7d0823a1c7e1a36f58820c5e174831492f1069dc4fdf133f2d9e604389aba8e1348c7
+MISC ChangeLog 66441 SHA256 100a7a69c52fb25e3d461a9c617de7fcd7868e1758ee71b886de0241ac957018 SHA512 fa265293b0cd9c6b8899a528ee3c37f58907ae21b6d387b049194fca900b0e827e7a7b7e7d5260799d204237519934cc50af54d3e4fe16f86aa3239c676281bf WHIRLPOOL 02db795f792ad65a23408f8dd2c7ecdcb569c5dc925f557ac6c80d63ebba55750412816eb5e4e59a11a6309721e7833c996fc3d4b9fb6366e0485199de31d347
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTQCm4AAoJEPGu1DbS6WIA2lAP/ixL7f+wy+rW+QmJtJWg0CeD
-p2+k3LqJ093zv0cxc5cYQFzSoFd/hnCZsPyQ8FEXlObZn0gBbeg6wu38pLRbbceD
-f9/9IYR+eaRlD5E8SZb3ErooWjizt6Kg8tcx8Zr+0g4TJ8QrjAfkFBbOme41WkXn
-nPQdouJSOdYttOJgHQLJUJmw6rHq4Tjll1k0N2k2kiyftqDi1BzHAgbe1P4KgNp1
-pomCnm1WGm/esMw+60eSGMgwj5bWj59NvytV7qkT/VhtDU+Xg6DenFOOO+v0PjUj
-gmQoE/dPYQbjbfhRHw75uBFpW5PNbOGeS5lb7Hot/TOFcqw+qMgeoSkWmHjxVNrr
-WVpjHnp/tLP0qmYxCrnKyaUjYKMuOd6c4SUw6roeYTn2gy/QkerlolLSE3uxPLt3
-7wdryBf+cj9VYxbKxMScWzMb3Wg0GvwvtwRjUNUYie6orUDWeEGQdYBe9UE9Jb9j
-o2p/ESvux3MZewS+OoB0tohX6b/nOO6bpxEjYxY3DHV1KZb89U7a1hDkssKul0Mu
-z3qmt9T3wHoc2DQrsVgAqiNu2UY6oUqMJdKnFhCH3WY9Eg18kJ4TnMWput9SKkxK
-YF0y0wGB1zcffK0i5Exp/sxHWNgKv9OosM0YFkPbnCUJeO8m8HsoDud2bTZUOe8Y
-n38X9l8yNyRqfuMPkcML
-=oDYc
+iQEcBAEBCAAGBQJTnAKwAAoJEO04vUmVeoRjQ74H/iypUlvxjXbI0zsYNhxRB7XO
+ZW44tZiD++6ynv4GV2+1IX7smUTH4AKPzP7Vs3203p/TewXuwwVXIR6B98JkDAaf
+lc4ttq5mWnfhbAgEAmmBELKapwpY3DgZOEj8pG4Ip1FSk+ke8vGe6R8tIXDBKFR3
+ea22RAny6e7zsiEg0v3ahP3beU++CUIn+STRUwqg1vDERdceVISIm0eMTybovNpM
+zvqBbfKav0AjIRdwhuRRJ965kyr9kgov0Ip8Ut7ny0HPniSCbttjUs7e7uJfHou1
+wXjk2IHEMgxJbWnyVanUQydpUF6nn4EkM58OYnYicDAQDcVYXkAyRK6ZwrAsK8o=
+=oXFo
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 91df3f24546f..c2ce4aafb81c 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -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-libs/glibc/files/eblits/common.eblit,v 1.34 2014/01/16 17:38:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.35 2014/06/14 08:07:10 rhill Exp $
 
 alt_prefix() {
 	is_crosscompile && echo /usr/${CTARGET}
@@ -183,7 +183,12 @@ setup_flags() {
 	# building glibc with SSP is fraught with difficulty, especially
 	# due to __stack_chk_fail_local which would mean significant changes
 	# to the glibc build process. See bug #94325 #293721
-	gcc-specs-ssp && append-cflags $(test-flags-CC -fno-stack-protector)
+	# Note we have to handle both user-given CFLAGS and gcc defaults via
+	# spec rules here.  We can't simply add -fno-stack-protector as it gets
+	# added before user flags, and we can't just filter-flags because
+	# _filter_hardened doesn't support globs.
+	filter-flags -fstack-protector*
+	gcc-specs-ssp && append-flags $(test-flags -fno-stack-protector)
 
 	if use hardened && gcc-specs-pie ; then
 		# Force PIC macro definition for all compilations since they're all