configure changes reverted and gcc-4.1 hardened support thanks to Bill Skellenger in bug 150298

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 37 insertions, 19 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index d98569a0501d..ac5ca00bae5d 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.195 2006/10/15 16:34:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.196 2006/10/16 21:15:16 genstef Exp $
+
+  16 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  mozilla-firefox-2.0_rc2.ebuild:
+  configure changes reverted and gcc-4.1 hardened support thanks to Bill
+  Skellenger in bug 150298
 
   15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   mozilla-firefox-2.0_rc2.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 6162df282c69..e0b09c4bb180 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -162,14 +162,14 @@ EBUILD mozilla-firefox-1.5.0.7.ebuild 9530 RMD160 682a824c87c1fa3885795e29de7e6c
 MD5 009921ccc2d07dc7b680334d52b5a547 mozilla-firefox-1.5.0.7.ebuild 9530
 RMD160 682a824c87c1fa3885795e29de7e6cd4f125d3b1 mozilla-firefox-1.5.0.7.ebuild 9530
 SHA256 c3d98ad2848ad054155b8261d839336cdc21771886f04c09decbad6832b8e019 mozilla-firefox-1.5.0.7.ebuild 9530
-EBUILD mozilla-firefox-2.0_rc2.ebuild 7937 RMD160 ff562a6a72de09b3b9107dfbbddcd1a97d032f0c SHA1 a0c15b9200388abc2253f9317d28defcb89b5888 SHA256 3bde303118505df3e2057945bc97cce5ffcc19a42bf5878629a130b7451e4b32
-MD5 8e0f22f8d518b217ab1a1e95431609d1 mozilla-firefox-2.0_rc2.ebuild 7937
-RMD160 ff562a6a72de09b3b9107dfbbddcd1a97d032f0c mozilla-firefox-2.0_rc2.ebuild 7937
-SHA256 3bde303118505df3e2057945bc97cce5ffcc19a42bf5878629a130b7451e4b32 mozilla-firefox-2.0_rc2.ebuild 7937
-MISC ChangeLog 51877 RMD160 048385d629e7d78eb7202aea08421b93ebb1eb98 SHA1 d0b2bfdeebfdd121a9254302bfb68ebf530bf92a SHA256 37eab3c920656d38a2e708c9eb67e128b00d6867b3a91e7f8fa67b7db1b0616e
-MD5 8e8c65467286e7d468dee18c1661f734 ChangeLog 51877
-RMD160 048385d629e7d78eb7202aea08421b93ebb1eb98 ChangeLog 51877
-SHA256 37eab3c920656d38a2e708c9eb67e128b00d6867b3a91e7f8fa67b7db1b0616e ChangeLog 51877
+EBUILD mozilla-firefox-2.0_rc2.ebuild 8368 RMD160 d50c989546e3e8ccbc2659b7ef3d626b9bfa148f SHA1 9952d350416d3a9d1694f2f8154620ad18360515 SHA256 df7b4515fa10f9a88a0e412eaa1fbe2ffad01678b06a043c836987f649d56cfc
+MD5 da6d0b2efbdb9daf16e063875618c13e mozilla-firefox-2.0_rc2.ebuild 8368
+RMD160 d50c989546e3e8ccbc2659b7ef3d626b9bfa148f mozilla-firefox-2.0_rc2.ebuild 8368
+SHA256 df7b4515fa10f9a88a0e412eaa1fbe2ffad01678b06a043c836987f649d56cfc mozilla-firefox-2.0_rc2.ebuild 8368
+MISC ChangeLog 52066 RMD160 ec0c2a05e21cf405d09fc83711db0a7d07bb4e39 SHA1 61be5cc312c8dcb9a10ce264f695e35dc70270f1 SHA256 bf0f9602d93f3cf6e61b2883bd3b998e4eafba432454d17652557ccc6756569b
+MD5 6f3f4eea97352b040438bbe661143872 ChangeLog 52066
+RMD160 ec0c2a05e21cf405d09fc83711db0a7d07bb4e39 ChangeLog 52066
+SHA256 bf0f9602d93f3cf6e61b2883bd3b998e4eafba432454d17652557ccc6756569b ChangeLog 52066
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
index a40c51bcf513..8c588e8c4408 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.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/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.7 2006/10/15 16:34:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.8 2006/10/16 21:15:16 genstef Exp $
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
@@ -142,17 +142,30 @@ src_compile() {
 	mozconfig_final
 
 	# -fstack-protector breaks us
-	gcc-specs-ssp && append-flags -fno-stack-protector-all
-	filter-flags -fstack-protector -fstack-protector-all
-
-	#  Configure and build
-
-	CPPFLAGS="${CPPFLAGS} -DGENTOO_NSPLUGINS_DIR=\\\"/usr/$(get_libdir)/nsplugins\\\""
-	CPPFLAGS="${CPPFLAGS} -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/$(get_libdir)/nsbrowser/plugins\\\""
-	export CPPFLAGS
-	tc-export CC CXX LD
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+		filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+ 	#  Configure and build
+	#
+	####################################
+ 
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	econf || die
 
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
 	# requirements while compiling
 	edit_makefiles