Filter -fstack-protector and -fstack-protector-all flags, bug 285778.

Package-Manager: portage-2.1.9.21/cvs/Linux x86_64

4 files changed, 22 insertions, 13 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 9b444c4b1549..2f160dd030d7 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.32 2010/10/21 20:41:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.33 2010/10/25 21:31:09 ulm Exp $
+
+  25 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+  emacs-vcs-24.0.9999.ebuild:
+  Filter -fstack-protector and -fstack-protector-all flags that cause
+  segmentation faults in hardened profiles. Bug 285778.
 
   21 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
   New USE flags: gnutls and selinux.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 9f5a05f11ad1..bdce0111a0f0 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD emacs-vcs-23.2.9999.ebuild 9857 RMD160 82cea54cf3b32a29cd3bba3e1b55229062162cd6 SHA1 0f86ac781f334a100107045d2a4c597f097d9fa3 SHA256 77acf1c34c91eba10378d1226aec180a1c3d4b8bd888994f482936554e7ec321
-EBUILD emacs-vcs-24.0.9999.ebuild 10477 RMD160 551d0b249c71a6dc3f4d65d27c71da572902a05e SHA1 7dacebcfb5406ad4852ece7c17821170aa284165 SHA256 dbf20ce1d233fd8504511dbc81eb6a30b36dc40482ce580da3e72f49d3bcf06e
-MISC ChangeLog 54414 RMD160 ea03c1f91f97af9da3dddd016a6352373e469870 SHA1 6c05badaabc6d510030244e441457a518a9a3de0 SHA256 4aad1a255d704c2659bddcfee5827b931eafde6f8924ff87ff022414962d7732
+EBUILD emacs-vcs-23.2.9999.ebuild 9908 RMD160 46917a2cc12f230818e2ed3a11c05014939beb55 SHA1 162cb708cd64ac763c3b41a05856e2495a1fb4f1 SHA256 8f07d63b88920cdab189aaae1822a32719b5c7efbaaf505cc5f0958eb1f557c7
+EBUILD emacs-vcs-24.0.9999.ebuild 10528 RMD160 fc6132c8d5a6dfd2ce1348f203543c8b9aa1e704 SHA1 d4b1292e98da6b4938cb4f5a3f7afab7de79d043 SHA256 a9281a1b4e178b846781797125a6eb24b42ab8bcf46cbfd8c80582792cdb7378
+MISC ChangeLog 54646 RMD160 53c2dbf271e92864c2a9ec35fe3b9e2825755d02 SHA1 efa4de632dfaf47fc03c75a478b056cafe705d33 SHA256 be9d2b33696e478726c2fe30396aa36018dc552ff07a1e462338f04b44df4946
 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzAphYACgkQOeoy/oIi7uydNQCgxWmdHUpyrN2Lj5NfB31B3D1W
-NGEAoJubwB1fMFruPGsZLkzrvDiRnE5J
-=QoM3
+iEYEARECAAYFAkzF98QACgkQOeoy/oIi7uwbmQCgndpoOIZarWtidIjODISiX0R7
+tisAmwQzcC0IcEHNmPTyD6XCq2J6bXY7
+=hJUt
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
index 8c8806077369..78b085b2820d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.8 2010/10/13 21:36:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.9 2010/10/25 21:31:09 ulm Exp $
 
 EAPI=2
 
@@ -91,7 +91,8 @@ src_prepare() {
 	#	EPATCH_SUFFIX=patch epatch
 	fi
 
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+	sed -i \
+		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
 
@@ -115,7 +116,8 @@ src_prepare() {
 src_configure() {
 	ALLOWED_FLAGS=""
 	strip-flags
-	#unset LDFLAGS
+	filter-flags -fstack-protector -fstack-protector-all	#285778
+
 	if use sh; then
 		replace-flags -O[1-9] -O0		#262359
 	elif use ia64; then
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
index ec74bfd55294..3a1e60329a6d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.18 2010/10/21 20:41:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.19 2010/10/25 21:31:09 ulm Exp $
 
 EAPI=2
 
@@ -104,7 +104,8 @@ src_prepare() {
 	#	EPATCH_SUFFIX=patch epatch
 	fi
 
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+	sed -i \
+		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
 
@@ -128,7 +129,8 @@ src_prepare() {
 src_configure() {
 	ALLOWED_FLAGS=""
 	strip-flags
-	#unset LDFLAGS
+	filter-flags -fstack-protector -fstack-protector-all	#285778
+
 	if use sh; then
 		replace-flags -O[1-9] -O0		#262359
 	elif use ia64; then