Reverting to just filtering -pie and adding -nopie.

svn path=/; revision=310

5 files changed, 20 insertions, 24 deletions

diff --git a/hardened/dev-lang/ocaml/Manifest b/hardened/dev-lang/ocaml/Manifest
index 0655bfc..dc9d635 100644
--- a/hardened/dev-lang/ocaml/Manifest
+++ b/hardened/dev-lang/ocaml/Manifest
@@ -10,22 +10,22 @@ DIST ocaml-3.08.3.tar.bz2 2026597 RMD160 83fcab89371f228c35d826eb204c80e3380ddf2
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
 DIST ocaml-3.09.2.tar.bz2 2036341 RMD160 45edae84e5787775a5beed29a1ad2881f4df8505 SHA1 578c66707532882782735352a3628b78193da5e7 SHA256 2115d6a4e420b5517ed7313c64bd6bd93f610ec208250b7d025595376180b0b1
 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
-EBUILD ocaml-3.08.3.ebuild 2463 RMD160 6e7237019e6b61c5d2eb6f50a39b8fd8ac4387e0 SHA1 e58bee335938358f81516c834d125c698ce3fd8c SHA256 1937bf1770b5ef018d2f15036e126f8cc9867f30a1c363245b6784a50c6d44aa
-MD5 c78b8e68d00d73048102aa2c7530cd52 ocaml-3.08.3.ebuild 2463
-RMD160 6e7237019e6b61c5d2eb6f50a39b8fd8ac4387e0 ocaml-3.08.3.ebuild 2463
-SHA256 1937bf1770b5ef018d2f15036e126f8cc9867f30a1c363245b6784a50c6d44aa ocaml-3.08.3.ebuild 2463
-EBUILD ocaml-3.08.4.ebuild 2672 RMD160 43c90584800a456b20584a384cccbdf6acd1e152 SHA1 5a1576f7016dedda1a3cfd6e67dad899449e88d5 SHA256 0724a530fefc6e7fa18858c1fddd1dca9e1d88d645675a23d78f00a71070690d
-MD5 782c66b5d12424b1675fb52ab48156e5 ocaml-3.08.4.ebuild 2672
-RMD160 43c90584800a456b20584a384cccbdf6acd1e152 ocaml-3.08.4.ebuild 2672
-SHA256 0724a530fefc6e7fa18858c1fddd1dca9e1d88d645675a23d78f00a71070690d ocaml-3.08.4.ebuild 2672
-EBUILD ocaml-3.09.2.ebuild 2523 RMD160 ad4b2b713dba77592bddecfd0a4bea4cff2d9da3 SHA1 7c18b91f41206e8cd75b4751fa5afcbce70db744 SHA256 ae7dad92ced3817f77f2400a8726928a0c0dca8b97c5ede6aab4e7faec97d7a5
-MD5 ef1351860f650f79d909a86a68276466 ocaml-3.09.2.ebuild 2523
-RMD160 ad4b2b713dba77592bddecfd0a4bea4cff2d9da3 ocaml-3.09.2.ebuild 2523
-SHA256 ae7dad92ced3817f77f2400a8726928a0c0dca8b97c5ede6aab4e7faec97d7a5 ocaml-3.09.2.ebuild 2523
-EBUILD ocaml-3.09.3.ebuild 2655 RMD160 8d610a1efe7c4d276fcdf056790601e75c50d63f SHA1 bae240a185ad5abc1f44e82b52ac079a0d6aa98b SHA256 dfe939c5bb9f3e8f65cfc8a48be32395a273924eb9e68267c72d2557f4ec86fc
-MD5 6bdea5d2151dc13e7f4f269e702b02ec ocaml-3.09.3.ebuild 2655
-RMD160 8d610a1efe7c4d276fcdf056790601e75c50d63f ocaml-3.09.3.ebuild 2655
-SHA256 dfe939c5bb9f3e8f65cfc8a48be32395a273924eb9e68267c72d2557f4ec86fc ocaml-3.09.3.ebuild 2655
+EBUILD ocaml-3.08.3.ebuild 2393 RMD160 465bdc1745b3a5b37592b061c67efdb853417c69 SHA1 2e36186fdee021bcd63b343466f6a0641e0979aa SHA256 d069d773499ef4528accd48a4747c358941b67a684dd88b105e3fe4c69a273dc
+MD5 0dc2eca64a466ec82e9f0873ab5843f8 ocaml-3.08.3.ebuild 2393
+RMD160 465bdc1745b3a5b37592b061c67efdb853417c69 ocaml-3.08.3.ebuild 2393
+SHA256 d069d773499ef4528accd48a4747c358941b67a684dd88b105e3fe4c69a273dc ocaml-3.08.3.ebuild 2393
+EBUILD ocaml-3.08.4.ebuild 2600 RMD160 769e4b4c2a956962e8a5dec434abb1fd26e0f1d4 SHA1 0a433efe9aa72d3784df73b16d415dfba91ab09c SHA256 ccc7ba9397be4e9f31e2927dc9f094ad3f8cff19f2534f6e7164264e4b21c151
+MD5 535ce8ca3d1f1ad22c5e9c7cabcc0662 ocaml-3.08.4.ebuild 2600
+RMD160 769e4b4c2a956962e8a5dec434abb1fd26e0f1d4 ocaml-3.08.4.ebuild 2600
+SHA256 ccc7ba9397be4e9f31e2927dc9f094ad3f8cff19f2534f6e7164264e4b21c151 ocaml-3.08.4.ebuild 2600
+EBUILD ocaml-3.09.2.ebuild 2453 RMD160 eb53e443373f9f8fd1e741228fafe8e31c9a3f7f SHA1 6f7b60df6274b992278f2db164bcfbbb4c172b59 SHA256 0101b8c80d5bef13a092ab70997d9c46ab73de06fd4173d8760953428aec759e
+MD5 d304e34bb5c0dbb007de07734e12dcb4 ocaml-3.09.2.ebuild 2453
+RMD160 eb53e443373f9f8fd1e741228fafe8e31c9a3f7f ocaml-3.09.2.ebuild 2453
+SHA256 0101b8c80d5bef13a092ab70997d9c46ab73de06fd4173d8760953428aec759e ocaml-3.09.2.ebuild 2453
+EBUILD ocaml-3.09.3.ebuild 2585 RMD160 3bd89d36d2b7d9664c639cca3d61bfdb99228275 SHA1 5b3e774197f07f19f14041f91190754dbdb4d88f SHA256 8a5efdd070784db888d620e5085f7daeb98f94f19223630d7a6f5483de07c004
+MD5 732cd9f85509f16b80767cc44d245ffc ocaml-3.09.3.ebuild 2585
+RMD160 3bd89d36d2b7d9664c639cca3d61bfdb99228275 ocaml-3.09.3.ebuild 2585
+SHA256 8a5efdd070784db888d620e5085f7daeb98f94f19223630d7a6f5483de07c004 ocaml-3.09.3.ebuild 2585
 MD5 32e668c99988d463934c5ead1a603d29 files/digest-ocaml-3.08.3 244
 RMD160 0068922a3d2f5c6172d9dd866a1e1e1e85db8abe files/digest-ocaml-3.08.3 244
 SHA256 dab059cc4714a36ee9d9b3dd15b35dec829ec0fcfc952aed6936a2bd7b9e279b files/digest-ocaml-3.08.3 244
diff --git a/hardened/dev-lang/ocaml/ocaml-3.08.3.ebuild b/hardened/dev-lang/ocaml/ocaml-3.08.3.ebuild
index f212771..3963f9b 100644
--- a/hardened/dev-lang/ocaml/ocaml-3.08.3.ebuild
+++ b/hardened/dev-lang/ocaml/ocaml-3.08.3.ebuild
@@ -34,8 +34,7 @@ src_unpack() {
 
 src_compile() {
 	gcc-specs-pie && append-flags -nopie
-	gcc-specs-ssp && append-flags -fno-stack-protector
-	filter-flags -fstack-protector -pie
+	filter-flags -pie
 	replace-flags "-O?" -O2
 
 	local myconf
diff --git a/hardened/dev-lang/ocaml/ocaml-3.08.4.ebuild b/hardened/dev-lang/ocaml/ocaml-3.08.4.ebuild
index 515bc11..fbbdbce 100644
--- a/hardened/dev-lang/ocaml/ocaml-3.08.4.ebuild
+++ b/hardened/dev-lang/ocaml/ocaml-3.08.4.ebuild
@@ -27,8 +27,7 @@ pkg_setup() {
 
 src_compile() {
 	gcc-specs-pie && append-flags -nopie
-	gcc-specs-ssp && append-flags -fno-stack-protector
-	filter-flags "-fstack-protector -pie"
+	filter-flags -pie
 	replace-flags "-O?" -O2
 
 	local myconf
diff --git a/hardened/dev-lang/ocaml/ocaml-3.09.2.ebuild b/hardened/dev-lang/ocaml/ocaml-3.09.2.ebuild
index 23a6f61..442cf13 100644
--- a/hardened/dev-lang/ocaml/ocaml-3.09.2.ebuild
+++ b/hardened/dev-lang/ocaml/ocaml-3.09.2.ebuild
@@ -27,8 +27,7 @@ pkg_setup() {
 
 src_compile() {
 	gcc-specs-pie && append-flags -nopie
-	gcc-specs-ssp && append-flags -fno-stack-protector
-	filter-flags -fstack-protector -pie
+	filter-flags -pie
 	replace-flags "-O?" -O2
 
 	local myconf
diff --git a/hardened/dev-lang/ocaml/ocaml-3.09.3.ebuild b/hardened/dev-lang/ocaml/ocaml-3.09.3.ebuild
index cb65d2c..c809985 100644
--- a/hardened/dev-lang/ocaml/ocaml-3.09.3.ebuild
+++ b/hardened/dev-lang/ocaml/ocaml-3.09.3.ebuild
@@ -27,8 +27,7 @@ pkg_setup() {
 
 src_compile() {
 	gcc-specs-pie && append-flags -nopie
-	gcc-specs-ssp && append-flags -fno-stack-protector
-	filter-flags -fstack-protector -pie
+	filter-flags -pie
 	replace-flags "-O?" -O2
 
 	local myconf