stable on amd64 + added a fix for building with hardened gcc

3 files changed, 32 insertions, 23 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 229f7ea63c21..9204eb1c3218 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mozilla-firefox
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.69 2004/10/02 06:50:40 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.70 2004/10/02 10:29:22 lv Exp $
+
+  02 Oct 2004; Travis Tilley <lv@gentoo.org>
+  mozilla-firefox-1.0_pre-r2.ebuild:
+  stable on amd64, added hardened gcc 'fix'
 
 *mozilla-firefox-1.0_pre-r2 (02 Oct 2004)
 
diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index e658c62e1566..e1e38e77b911 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,34 +1,34 @@
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 bf485edb7743e05d9da488cb79fda598 mozilla-firefox-0.8-r1.ebuild 7573
 MD5 c34f0afeb7aa8bc5bcb24ab079f95c37 mozilla-firefox-0.8-r2.ebuild 7666
+MD5 685aaef2ee7d53f1d524597b564c6952 mozilla-firefox-0.8-r3.ebuild 8504
 MD5 c1d874eee9769e073b715ffc0a4bb312 mozilla-firefox-0.8.ebuild 7599
-MD5 ebc5c2f952fe4b6b66b5fbd3cccb3c38 mozilla-firefox-0.9.3-r1.ebuild 5132
 MD5 036f220a45ed58418f2c168cf00ad4b1 mozilla-firefox-0.9-r1.ebuild 8318
 MD5 5d91117e033e7e415a5ff88a95a73995 mozilla-firefox-0.9.1.ebuild 8428
-MD5 643c0d1796256e1d663b20a2045a4ddc mozilla-firefox-1.0_pre-r2.ebuild 4879
+MD5 ebc5c2f952fe4b6b66b5fbd3cccb3c38 mozilla-firefox-0.9.3-r1.ebuild 5132
 MD5 8c750111072f43bceea00348916cba92 mozilla-firefox-0.9.3.ebuild 8427
-MD5 bf485edb7743e05d9da488cb79fda598 mozilla-firefox-0.8-r1.ebuild 7573
-MD5 685aaef2ee7d53f1d524597b564c6952 mozilla-firefox-0.8-r3.ebuild 8504
-MD5 11abccdcd7f425a2461e69bc5a5817d0 mozilla-firefox-1.0_pre-r1.ebuild 4864
-MD5 d413a6dce75244e1c99d1453fecf2f55 ChangeLog 11363
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 9dcae9fc6b19da1094e2a86791697546 mozilla-firefox-1.0_pre.ebuild 4856
-MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
-MD5 91fb197b04b4e0d536270123dbd5ae04 files/digest-mozilla-firefox-0.9.1 75
-MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
-MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
-MD5 bd50631b47d20becbb5af21b605dfb5d files/firefox 4218
-MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
-MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 11abccdcd7f425a2461e69bc5a5817d0 mozilla-firefox-1.0_pre-r1.ebuild 4864
+MD5 79a84ca89a847a56ae38e0c736f30f08 mozilla-firefox-1.0_pre-r2.ebuild 5070
+MD5 cd6ee3602c2e72f43abd9342d0b7dc21 ChangeLog 11488
 MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
-MD5 8ddd969c216f76b511b39679a8014eb9 files/digest-mozilla-firefox-1.0_pre-r1 75
-MD5 bef773177860190ef5d6cce7ec70c613 files/digest-mozilla-firefox-1.0_pre-r2 77
+MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r1 73
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r2 73
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r3 73
 MD5 1616bcd357c0cbe601722dd6279bd21f files/digest-mozilla-firefox-0.9-r1 73
-MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
-MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
+MD5 91fb197b04b4e0d536270123dbd5ae04 files/digest-mozilla-firefox-0.9.1 75
+MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
 MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3-r1 75
 MD5 8ddd969c216f76b511b39679a8014eb9 files/digest-mozilla-firefox-1.0_pre 75
-MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
+MD5 bd50631b47d20becbb5af21b605dfb5d files/firefox 4218
+MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
+MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
+MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
+MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
+MD5 8ddd969c216f76b511b39679a8014eb9 files/digest-mozilla-firefox-1.0_pre-r1 75
+MD5 bef773177860190ef5d6cce7ec70c613 files/digest-mozilla-firefox-1.0_pre-r2 77
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
+MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
index 1cba632f6fb5..691824ee899d 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild,v 1.3 2004/10/02 07:12:51 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild,v 1.4 2004/10/02 10:29:22 lv Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
 
@@ -12,7 +12,7 @@ MY_PV=${PV/_pre/PR.1}
 SRC_URI="mirror://gentoo/firefox-${MY_PV}-source.tar.bz2 \
 	http://dev.gentoo.org/~brad/firefox-${MY_PV}-source.tar.bz2"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
@@ -69,6 +69,11 @@ src_compile() {
 		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
 		--enable-single-profile"
 
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# firefox.
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
 	####################################
 	#
 	#  Configure and build Firefox