fix compilation on hardened systems by filtering SSP, see bug #154338. Thanks to pappy-_ on IRC who provided advice and test hardware.

Package-Manager: portage-2.1.1-r1

3 files changed, 21 insertions, 13 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 3f66deff7413..e3f555fe1435 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.35 2006/11/02 20:56:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.36 2006/11/08 06:51:55 opfer Exp $
+
+  08 Nov 2006; Christian Faulhammer <opfer@gentoo.org> erlang-11.2.1.ebuild:
+  fix compilation on hardened systems by filtering SSP, see bug #154338.
+  Thanks to pappy-_ on IRC who provided advice and test hardware.
 
   02 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   -files/10.2.7-manpage-emacs-gentoo.patch, -files/erlang-9c.patch,
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 3720af341456..c849439737ab 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -62,10 +62,10 @@ EBUILD erlang-11.2.0.ebuild 3233 RMD160 0566cc374c43a0b87068a1dd22986f0beab69fc1
 MD5 649d6e78740af82dc6e4a8f6df6e4ad7 erlang-11.2.0.ebuild 3233
 RMD160 0566cc374c43a0b87068a1dd22986f0beab69fc1 erlang-11.2.0.ebuild 3233
 SHA256 bb41234d677001599b738f56b15b3ae56e15360b5cd019358ee688afd7eda79e erlang-11.2.0.ebuild 3233
-EBUILD erlang-11.2.1.ebuild 3233 RMD160 16d742739d1ff6bfee84e3c2bddc3e40ec061ac3 SHA1 a0849f79ebbd428699059933b56d0aacec43a680 SHA256 29ebfa51f50b2ef1e0fa8db84df8832e7052e17ee35929c5d268a6ce098ebbe3
-MD5 158a7e3e2ead38f17e28039b4e0ec52f erlang-11.2.1.ebuild 3233
-RMD160 16d742739d1ff6bfee84e3c2bddc3e40ec061ac3 erlang-11.2.1.ebuild 3233
-SHA256 29ebfa51f50b2ef1e0fa8db84df8832e7052e17ee35929c5d268a6ce098ebbe3 erlang-11.2.1.ebuild 3233
+EBUILD erlang-11.2.1.ebuild 3363 RMD160 b6e417d7555a9bd6adeaf9e94ccf4ffb314abb34 SHA1 8486334fa747f59b39d508b96d40978d415a263f SHA256 567b6cbcb7f1a154683a532c562020ecbe74ababba93636780ba80d63952d789
+MD5 16ae321f52c2a3a9a6d3c03c9f73a439 erlang-11.2.1.ebuild 3363
+RMD160 b6e417d7555a9bd6adeaf9e94ccf4ffb314abb34 erlang-11.2.1.ebuild 3363
+SHA256 567b6cbcb7f1a154683a532c562020ecbe74ababba93636780ba80d63952d789 erlang-11.2.1.ebuild 3363
 EBUILD erlang-8b.ebuild 1156 RMD160 855ecd0626e2ff23974ea805c1142c7e2ef692aa SHA1 e8e54f8e2a1e94e08114d4a28a628c03b24197b6 SHA256 04b5d937a3a8d543c36d41c43353c3c75e707350e4a4446de2c8a3c99a712195
 MD5 683010b6283d166c1ffcf64bab32e6d2 erlang-8b.ebuild 1156
 RMD160 855ecd0626e2ff23974ea805c1142c7e2ef692aa erlang-8b.ebuild 1156
@@ -82,10 +82,10 @@ EBUILD erlang-9c.ebuild 1483 RMD160 2bbe9f2b29faf2a47774ccc57c09aa556e730ab0 SHA
 MD5 b782da2a4fc77372e754ee4f55ebd2c5 erlang-9c.ebuild 1483
 RMD160 2bbe9f2b29faf2a47774ccc57c09aa556e730ab0 erlang-9c.ebuild 1483
 SHA256 765a1170c983ef37cf1e2199fcc9a28c2d544f20bcb27f0eb29294c584975895 erlang-9c.ebuild 1483
-MISC ChangeLog 6672 RMD160 651e460b76660bf9ae673a3bdf2fcd2f54111aaa SHA1 2db180eefd3a1592c35804dc45c615809363d550 SHA256 8275f8958ddbebbab130d4bfbd800f80a67a87d8a3ffd5346a1495270fbb3733
-MD5 b43df0450f902e7be5eb0ee5dc2f9371 ChangeLog 6672
-RMD160 651e460b76660bf9ae673a3bdf2fcd2f54111aaa ChangeLog 6672
-SHA256 8275f8958ddbebbab130d4bfbd800f80a67a87d8a3ffd5346a1495270fbb3733 ChangeLog 6672
+MISC ChangeLog 6889 RMD160 374aa9fb467c9f03d195a2cf1f794e6aa96d6c53 SHA1 13a35bd2da6ad8a187b2f1cd2495b21a6439e65d SHA256 7248ec6ca79c0e598afb0afba6923a33e13d583df393311a48390c474b9724be
+MD5 4387e53a5240f6d7c1096cca74af3536 ChangeLog 6889
+RMD160 374aa9fb467c9f03d195a2cf1f794e6aa96d6c53 ChangeLog 6889
+SHA256 7248ec6ca79c0e598afb0afba6923a33e13d583df393311a48390c474b9724be ChangeLog 6889
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
@@ -123,7 +123,7 @@ SHA256 1e4ffb97ef49da9eecdb6affebda54e8e22b9c2707a099edeff382531b3b95c1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFSlutNQqtfCuFneMRAopQAKCeMbacc/4l5U5Q6qGFHeWCKJSwnwCfYmr/
-p7hxcbp8bg7nvPJeHjC7vYA=
-=kZOg
+iD8DBQFFUX7INQqtfCuFneMRAkL5AJ9mV5f1Ck/ebcGeKtcuOMYPujouFQCeLvef
+mL2UttD1+5rBODTXfAY9XTE=
+=gLMu
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.1.ebuild b/dev-lang/erlang/erlang-11.2.1.ebuild
index ec3e38d6df7a..50f69e6ae702 100644
--- a/dev-lang/erlang/erlang-11.2.1.ebuild
+++ b/dev-lang/erlang/erlang-11.2.1.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/dev-lang/erlang/erlang-11.2.1.ebuild,v 1.2 2006/11/02 20:56:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.1.ebuild,v 1.3 2006/11/08 06:51:55 opfer Exp $
 
 inherit eutils multilib flag-o-matic elisp-common versionator
 
@@ -36,6 +36,10 @@ S=${WORKDIR}/${MY_P}
 SITEFILE=50erlang-gentoo.el
 
 src_unpack() {
+	## fix compilation on hardened systems, see bug #154338
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"