From 7c73a8f6c71e34010e4fcccaa5386ff7aa86e29e Mon Sep 17 00:00:00 2001 From: Magnus Granberg Date: Wed, 16 Jun 2010 01:43:37 +0000 Subject: [PATCH] bug #293721 support for >=gcc 4.2 SSP support Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-libs/glibc/ChangeLog | 5 ++++- sys-libs/glibc/Manifest | 4 ++-- sys-libs/glibc/files/eblits/common.eblit | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index c8dd1c64ec3c..acb8c9560dcb 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.687 2010/06/12 05:06:40 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.688 2010/06/16 01:43:37 zorry Exp $ + + 16 Jun 2010; Magnus Granberg files/eblits/common.eblit: + bug #293721 to support >=gcc 4.2 SSP support 12 Jun 2010; Joshua Kinard glibc-2.11-r1.ebuild: ~mipsify glibc-2.11-r1. Runs OK on O2 so far... diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d686216ef192..109f87f1d4fc 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -11,7 +11,7 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 -AUX eblits/common.eblit 8642 RMD160 41ce2abf35f79db5a8cd4742d1f98e30287eb8dd SHA1 e261b11759b9b6a96be162c821960823d69350b5 SHA256 034c104805d22ba865ae454288813f63c25d47fd695c1e58c1fdaa972ba8e167 +AUX eblits/common.eblit 8703 RMD160 d067a42bf6cdea0ac60169dfa78794cd8b0782b5 SHA1 36f807ff8790ae97e94ef834146aaa66b7692815 SHA256 47f3c97f00d9f9b945528b09699c23ab02aea208aa51034a658846019d63cf27 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810 AUX eblits/pkg_preinst.eblit 3363 RMD160 5c5d0c1c8e0a1a5918ae54006c201f1c81e70589 SHA1 5515220d1cc8453c5ae9cec02f6e6b8c3f575d91 SHA256 5e9291a6096fcaed6102a3248e8804a726dcf80d68eedc4d4be70b25394de2e3 AUX eblits/pkg_setup.eblit 2814 RMD160 8352c4b9cc460b7193e17be8bca227db5b6df5ba SHA1 8de7ea78e364521b55574b16036d57e7d35a596f SHA256 b803723f75571649e10e0707a6dbe8b459eabdc149ef155558792db736faa201 @@ -72,5 +72,5 @@ EBUILD glibc-2.7-r2.ebuild 12945 RMD160 8099396dc1820a98341f410e31d7d20c77daa928 EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30 EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c -MISC ChangeLog 125758 RMD160 3416afe40e5499bcde509c8a33526ee6c102a964 SHA1 b33bde70b80521ea4c8a82ad7a3b9f16604b3903 SHA256 298c9c5488370c45b46058afcad546a99f28c5211a709c739d10b0e47075afba +MISC ChangeLog 125883 RMD160 dd8017a7f07fc19f7d8fbebfd39a7cbb0fceb616 SHA1 1d6d2396330f1a1234d7bb6c2c384082653fdca8 SHA256 5b54ffb26af43e0123134daccc05a9761ed9b9ebbfbc9f666f7627ff116860e1 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31 diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index cfdfd039c6d5..985457e71313 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.10 2009/12/01 04:57:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.11 2010/06/16 01:43:37 zorry Exp $ # We need to be able to set alternative headers for # compiling for non-native platform @@ -169,8 +169,8 @@ 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 - filter-flags -fstack-protector + # to the glibc build process. See bug #94325 #293721 + use hardened && gcc-specs-ssp && append-cflags $(test-flags-CC -fno-stack-protector) if use hardened && gcc-specs-pie ; then # Force PIC macro definition for all compilations since they're all -- 2.26.2