- Honor moznomail for enigmail, ipc and gnupg in SRC_URI. - Fix bug 45671 (mozilla 1.6-r1 compiled with -fstack-protector crashes on keyboard input) with filter-flags in both 1.6-r1 and 1.7_rc1 - Remove entire installed instance from /usr/lib/mozilla in pkg_preinst prior to merging new version. Hopefully this will solve many problems that people have had, and hopefully it won't break anything. Fixes bug 27719

6 files changed, 72 insertions, 46 deletions

diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index 5ca06d5c3163..911f05caa4eb 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,8 +1,8 @@
 MD5 65040a1928b2cbd4d6cdd1d7712d0a20 mozilla-firefox-0.8-r2.ebuild 7661
 MD5 6577d9ffb39c6cc66a8a8fb41307e1c6 mozilla-firefox-0.8.ebuild 7672
 MD5 7eec2b27a51c55f06d60487bb24e33be mozilla-firefox-0.8-r1.ebuild 7594
-MD5 a4e117f6bd36705810c722b5b04c5f86 mozilla-firefox-0.8-r3.ebuild 7807
-MD5 7003f1342f0e3e937df9ad2496cf2bbd ChangeLog 4568
+MD5 0956d6641f1591439c8bfb891c09d156 mozilla-firefox-0.8-r3.ebuild 7855
+MD5 ef107620d59fcab79efe6328af2e44f8 ChangeLog 4696
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73
 MD5 0d736b3e74f9a70202a80b22d6bdf8fc files/firefox 4227
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 6f3c8c7d8031..d3ab5a13906b 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.160 2004/03/30 05:18:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.161 2004/04/26 04:38:59 agriffis Exp $
+
+*mozilla-1.7_rc1 (26 Apr 2004)
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.6-r1.ebuild,
+  mozilla-1.7_beta-r1.ebuild, mozilla-1.7_rc1.ebuild:
+  - Honor moznomail for enigmail, ipc and gnupg in SRC_URI.
+  - Fix bug 45671 (mozilla 1.6-r1 compiled with -fstack-protector
+    crashes on keyboard input) with filter-flags in both 1.6-r1 and
+    1.7_rc1
+  - Remove entire installed instance from /usr/lib/mozilla in pkg_preinst
+    prior to merging new version. Hopefully this will solve many
+    problems that people have had, and hopefully it won't break
+    anything. Fixes bug 27719
 
   30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; mozilla-1.6-r1.ebuild,
   mozilla-1.7_alpha.ebuild, mozilla-1.7_beta-r1.ebuild,
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 87cdb374be2b..ac58b6c528d4 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,39 +1,39 @@
-MD5 905dfba9c4a904f4a88b5612093f7bde ChangeLog 27339
+MD5 48991b546477f497f3d8117ce23e2a0f mozilla-1.7_beta-r1.ebuild 15931
+MD5 ed0fb93caa5a4bac97376951d3152155 mozilla-1.6-r1.ebuild 17087
+MD5 35d05101c92aecf31afc11d6f7e30123 mozilla-1.7_rc1.ebuild 16125
+MD5 08fd8d092fa4466808685a797729fa3f ChangeLog 27937
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 eff720b42149187a0a663e0592b0c47c mozilla-1.6-r1.ebuild 17040
-MD5 86a2efd9164c974ff253653635baf1ed mozilla-1.7_beta-r1.ebuild 15864
-MD5 6db952233598f2cdccf3e389b6adf08a mozilla-1.7_rc1.ebuild 15882
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
-MD5 ce10376ba06082440ad0e4ecc3218dc5 files/digest-mozilla-1.7_beta-r1 209
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 ce10376ba06082440ad0e4ecc3218dc5 files/digest-mozilla-1.7_beta-r1 209
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1 204
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
 MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1 204
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
 MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
 MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
-MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
+MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 ba7b561abda8274253ec38859a8797fc files/icon/mozilla.desktop 121
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
+MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild
index 9d8742576dad..e617033d3aca 100644
--- a/net-www/mozilla/mozilla-1.6-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.6-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/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.8 2004/03/30 05:18:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.9 2004/04/26 04:38:59 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -13,6 +13,7 @@ inherit flag-o-matic gcc eutils nsplugins
 strip-flags
 
 # Strip flags which create more documented instability
+filter-flags -fstack-protector		# see bug 45671
 filter-flags "-fomit-frame-pointer"
 filter-flags -ffast-math
 append-flags -s -fforce-addr
diff --git a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild b/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
index a86234d0158f..3a24bdafb5cb 100644
--- a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.7_beta-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/net-www/mozilla/mozilla-1.7_beta-r1.ebuild,v 1.5 2004/03/30 05:18:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta-r1.ebuild,v 1.6 2004/04/26 04:38:59 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -59,11 +59,14 @@ PATCH_VER="1.0"
 # handle _rc versions
 MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
+MY_PV=${MY_PV/_rc/rc}	# handle rc
 S="${WORKDIR}/mozilla"
 DESCRIPTION="The Mozilla Web Browser"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}-source.tar.bz2
-	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
-			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+	!moznomail? ( crypt? (
+		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz 
+	) )"
 #	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 HOMEPAGE="http://www.mozilla.org"
 
@@ -91,7 +94,7 @@ RDEPEND="virtual/x11
 		=dev-libs/glib-1.2*
 		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )
 	net-www/mozilla-launcher"
 
diff --git a/net-www/mozilla/mozilla-1.7_rc1.ebuild b/net-www/mozilla/mozilla-1.7_rc1.ebuild
index f86eb86694b0..e548af05a06a 100644
--- a/net-www/mozilla/mozilla-1.7_rc1.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc1.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/net-www/mozilla/mozilla-1.7_rc1.ebuild,v 1.1 2004/04/23 15:22:57 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1.ebuild,v 1.2 2004/04/26 04:38:59 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -13,7 +13,8 @@ inherit flag-o-matic gcc eutils nsplugins
 strip-flags
 
 # Strip flags which create more documented instability
-filter-flags "-fomit-frame-pointer"
+filter-flags -fstack-protector		# see bug 45671
+filter-flags -fomit-frame-pointer
 filter-flags -ffast-math
 append-flags -s -fforce-addr
 
@@ -63,8 +64,10 @@ MY_PV=${MY_PV/_rc/rc}	# handle rc
 S="${WORKDIR}/mozilla"
 DESCRIPTION="The Mozilla Web Browser"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
-	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
-			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+	crypt? ( !moznomail? (
+		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz 
+	) )"
 #	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 HOMEPAGE="http://www.mozilla.org"
 
@@ -92,7 +95,7 @@ RDEPEND="virtual/x11
 		=dev-libs/glib-1.2*
 		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	crypt? ( !moznomail ( >=app-crypt/gnupg-1.2.1 ) )
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )
 	net-www/mozilla-launcher"
 
@@ -497,19 +500,25 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Stale components and chrome files break when unmerging old
-	rm -rf ${ROOT}/usr/lib/mozilla/components
-	rm -rf ${ROOT}/usr/lib/mozilla/chrome
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
 
-	# Remove stale component registry.
-	rm -f ${ROOT}/usr/lib/mozilla/component.reg
-	rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+	if true; then
+		# Remove entire installed instance to solve various problems,
+		# for example see bug 27719
+		rm -rf ${ROOT}/usr/lib/mozilla
+	else
+		# Stale components and chrome files break when unmerging old
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
 
-	# Make sure these are removed.
-	rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+		# Remove stale component registry.
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
 
-	# Move old plugins dir
-	pkg_mv_plugins /usr/lib/mozilla/plugins
+		# Make sure these are removed.
+		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+	fi
 }
 
 pkg_postinst() {