added new hardened switches for nonPIE and nonSSP building

8 files changed, 32 insertions, 37 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 366cb9f5501f..d1b7327b5e1f 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.32 2004/04/01 22:44:22 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.33 2004/05/12 11:07:44 pappy Exp $
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org>
+  -files/ghc-6.2.hardened-gcc.patch.bz2, +files/ghc-6.2.hardened.patch.bz2,
+  ghc-6.0.1.ebuild, ghc-6.2-r1.ebuild, ghc-6.2.ebuild:
+  added new hardened switches for nonPIE and nonSSP building
 
   02 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> ghc-6.2.1.ebuild:
   Add support for ppc on ghc-6.2.1.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 1cebad585c92..6578178d70cf 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,17 +1,17 @@
-MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2-r1 65
+MD5 f7474a68de38156f7519d27278f00943 ChangeLog 7249
+MD5 c6174c846ff8e4a661d37f2e83439259 ghc-6.0.1.ebuild 4748
+MD5 19d1d6422bd1d71de0eecc9038fba1db ghc-6.0.ebuild 4279
+MD5 50f9830da95e914dfc0f6df78c2dcfc0 ghc-6.2-r1.ebuild 5222
+MD5 c64ba761417065cce6f62a6be39619d2 ghc-6.2.1.ebuild 5274
+MD5 aabf26ff74487ed423225142b7e20d25 ghc-6.2.ebuild 5040
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 1b6997afc8940a5df3f780897d78ee0a files/digest-ghc-6.0 65
 MD5 d417c9e24a826959ad6d921247e43328 files/digest-ghc-6.0.1 67
 MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2 65
+MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2-r1 65
+MD5 0cc23d312b60d64e20735768503db1c6 files/digest-ghc-6.2.1 67
 MD5 d4a4184d5dcf525047332f9c68e522f7 files/ghc-5.04.3-r1.patch 2717
 MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
 MD5 9c184505ec441675c94d47a3110fa754 files/ghc-6.2.documentation.patch 721
 MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050
-MD5 f210562a7af8d7d2aad2c1f7100c2a40 files/ghc-6.2.hardened-gcc.patch.bz2 471
-MD5 0cc23d312b60d64e20735768503db1c6 files/digest-ghc-6.2.1 67
-MD5 7ed1de84282b874afeed22b517dfc4d4 ChangeLog 7006
-MD5 eb902d291c43516728dc3b4e00834029 ghc-6.0.1.ebuild 4878
-MD5 e6cb655b6e491861cde72bf8695c53eb ghc-6.0.ebuild 4282
-MD5 c75e966424122b72a1d842eb82d112f9 ghc-6.2.ebuild 5168
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 589afa3b6c4e9b4533031e41bec4449d ghc-6.2-r1.ebuild 5234
-MD5 c64ba761417065cce6f62a6be39619d2 ghc-6.2.1.ebuild 5274
+MD5 c2e63b1796b9c089a23a07b0eb6e76a7 files/ghc-6.2.hardened.patch.bz2 362
diff --git a/dev-lang/ghc/files/ghc-6.2.hardened-gcc.patch.bz2 b/dev-lang/ghc/files/ghc-6.2.hardened-gcc.patch.bz2
deleted file mode 100644
index 8e6bd56ef72e..000000000000
--- a/dev-lang/ghc/files/ghc-6.2.hardened-gcc.patch.bz2
+++ /dev/null
diff --git a/dev-lang/ghc/files/ghc-6.2.hardened.patch.bz2 b/dev-lang/ghc/files/ghc-6.2.hardened.patch.bz2
new file mode 100644
index 000000000000..f541e5262e0a
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.2.hardened.patch.bz2
diff --git a/dev-lang/ghc/ghc-6.0.1.ebuild b/dev-lang/ghc/ghc-6.0.1.ebuild
index 56136ee98697..bcd433a0bda6 100644
--- a/dev-lang/ghc/ghc-6.0.1.ebuild
+++ b/dev-lang/ghc/ghc-6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.0.1.ebuild,v 1.4 2003/12/17 17:58:09 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.0.1.ebuild,v 1.5 2004/05/12 11:07:44 pappy Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -89,13 +89,9 @@ src_compile() {
 
 	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
 	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
-	if has_version "sys-devel/hardened-gcc"
-	then
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> mk/build.mk
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> mk/build.mk
-	fi
+	# new logic for hardened gcc specs file by pappy
+	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
+	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
 
 	# unset SGML_CATALOG_FILES because documentation installation
 	# breaks otherwise ...
diff --git a/dev-lang/ghc/ghc-6.0.ebuild b/dev-lang/ghc/ghc-6.0.ebuild
index 6eb102a0e114..5499942151dc 100644
--- a/dev-lang/ghc/ghc-6.0.ebuild
+++ b/dev-lang/ghc/ghc-6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.0.ebuild,v 1.3 2003/10/22 12:34:49 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.0.ebuild,v 1.4 2004/05/12 11:07:44 pappy Exp $
 
 #Some explanation of bootstrap logic:
 #
diff --git a/dev-lang/ghc/ghc-6.2-r1.ebuild b/dev-lang/ghc/ghc-6.2-r1.ebuild
index 44e43e11bba7..b5f323e93dcd 100644
--- a/dev-lang/ghc/ghc-6.2-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2-r1.ebuild,v 1.2 2004/03/31 09:38:36 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2-r1.ebuild,v 1.3 2004/05/12 11:07:44 pappy Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -75,7 +75,7 @@ src_unpack() {
 	patch -p0 < ${FILESDIR}/ghc-6.2.documentation.patch
 	# hardened-gcc needs to be disabled, because the
 	# mangler doesn't accept its output
-	bzcat ${FILESDIR}/ghc-6.2.hardened-gcc.patch.bz2 | patch -p0
+	bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p0
 }
 
 src_compile() {
@@ -89,11 +89,9 @@ src_compile() {
 	# (this is still necessary, even though we have the patch, because
 	# we might be bootstrapping from a version that didn't have the
 	# patch included)
-	if has_version "sys-devel/hardened-gcc"
-	then
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> mk/build.mk
-	fi
+	# new hardened gcc switches by pappy
+	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
+	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
 
 	# force the config variable ArSupportsInput to be unset;
 	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
diff --git a/dev-lang/ghc/ghc-6.2.ebuild b/dev-lang/ghc/ghc-6.2.ebuild
index be6a2420f16c..7e1598d7153c 100644
--- a/dev-lang/ghc/ghc-6.2.ebuild
+++ b/dev-lang/ghc/ghc-6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.ebuild,v 1.5 2004/03/23 01:03:20 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.ebuild,v 1.6 2004/05/12 11:07:44 pappy Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -83,13 +83,9 @@ src_compile() {
 
 	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
 	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
-	if has_version "sys-devel/hardened-gcc"
-	then
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> mk/build.mk
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> mk/build.mk
-	fi
+	# new logic for hardened gcc specs file by pappy
+	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
+	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
 
 	# force the config variable ArSupportsInput to be unset;
 	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified