Update firefox2 and firefox2-gtk1 to 2.0.0.1. Fixed in this version:

MFSA 2006-76 XSS using outer window's Function object
MFSA 2006-75 RSS Feed-preview referrer leak
MFSA 2006-73 Mozilla SVG Processing Remote Code Execution
MFSA 2006-72 XSS by setting img.src to javascript: URI
MFSA 2006-71 LiveConnect crash finalizing JS objects
MFSA 2006-70 Privilege escallation using watch point
MFSA 2006-68 Crashes with evidence of memory corruption (rv:1.8.0.9/1.8.1.1)

For more info, see http://www.mozilla.com/en-US/firefox/2.0.0.1/releasenotes/

6 files changed, 11 insertions, 25 deletions

diff --git a/www/firefox2-gtk1/Makefile b/www/firefox2-gtk1/Makefile
index c39161acdc2..fbcdae03871 100644
--- a/www/firefox2-gtk1/Makefile
+++ b/www/firefox2-gtk1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/12/06 20:38:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/21 08:13:17 ghen Exp $
 
 MOZILLA=	firefox-gtk1
 COMMENT=	Lightweight gecko-based web browser built with GTK+-1.x
-PKGREVISION=	1
 
 .include "../../www/firefox2/Makefile-firefox.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox2-gtk1/PLIST b/www/firefox2-gtk1/PLIST
index ee4897abb93..65c142ec8b3 100644
--- a/www/firefox2-gtk1/PLIST
+++ b/www/firefox2-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/24 22:20:36 ghen Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/12/21 08:13:17 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -291,8 +291,10 @@ lib/${MOZILLA}/components/xultmpl.xpt
 lib/${MOZILLA}/defaults/autoconfig/platform.js
 lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
 lib/${MOZILLA}/defaults/pref/channel-prefs.js
+lib/${MOZILLA}/defaults/pref/firefox-branding.js
 lib/${MOZILLA}/defaults/pref/firefox-l10n.js
 lib/${MOZILLA}/defaults/pref/firefox.js
+lib/${MOZILLA}/defaults/pref/reporter.js
 lib/${MOZILLA}/defaults/profile/bookmarks.html
 lib/${MOZILLA}/defaults/profile/chrome/userChrome-example.css
 lib/${MOZILLA}/defaults/profile/chrome/userContent-example.css
diff --git a/www/firefox2/Makefile b/www/firefox2/Makefile
index 9443b1745ae..e41710826ae 100644
--- a/www/firefox2/Makefile
+++ b/www/firefox2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/12/06 20:38:38 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/21 08:13:17 ghen Exp $
 
 MOZILLA=		firefox
 EXTRACT_SUFX=		.tar.bz2
 COMMENT=		Lightweight gecko-based web browser
-PKGREVISION=		1
 
 MOZILLA_USE_GTK2=	# yes
 MOZILLA_USE_XFT=	YES
diff --git a/www/firefox2/Makefile-firefox.common b/www/firefox2/Makefile-firefox.common
index 2fb2b44b80e..994f17ced5f 100644
--- a/www/firefox2/Makefile-firefox.common
+++ b/www/firefox2/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.3 2006/12/06 20:37:00 joerg Exp $
+# $NetBSD: Makefile-firefox.common,v 1.4 2006/12/21 08:13:17 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		2.0
+MOZ_VER=		2.0.0.1
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox2/distinfo b/www/firefox2/distinfo
index 84987a14e97..a5c13f1bf76 100644
--- a/www/firefox2/distinfo
+++ b/www/firefox2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/12/06 20:37:00 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/12/21 08:13:17 ghen Exp $
 
-SHA1 (firefox-2.0-source.tar.bz2) = 2bbc6b80cf184bf27101ec4315a19023547c85d4
-RMD160 (firefox-2.0-source.tar.bz2) = 88b284b236f29fa5e483a32cd75ceaadebd2f6c3
-Size (firefox-2.0-source.tar.bz2) = 36922776 bytes
+SHA1 (firefox-2.0.0.1-source.tar.bz2) = 52728b8f1fba8ab7d51962f6d021b31f02585e3f
+RMD160 (firefox-2.0.0.1-source.tar.bz2) = ce86c30f1e2038d2af05c7119fdab5609c21d12d
+Size (firefox-2.0.0.1-source.tar.bz2) = 37056207 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = d3b6d3994a030c89b0bd580c01e1f15e08dab4c8
 SHA1 (patch-ac) = 3f28e27c100655aca4daaca02a77a76064359e94
@@ -66,4 +66,3 @@ SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
 SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
 SHA1 (patch-ec) = 8235af6634306b2a5725754cd5a32285b311b714
 SHA1 (patch-ed) = ae922f591b871a1f427c4c32d76a2c25701382d4
-SHA1 (patch-ee) = 0067b8df90c5547bab34f0e20a7db8fe517db5e5
diff --git a/www/firefox2/patches/patch-ee b/www/firefox2/patches/patch-ee
deleted file mode 100644
index 02a8baba59e..00000000000
--- a/www/firefox2/patches/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ee,v 1.1 2006/11/17 13:37:36 martin Exp $
-
---- js/src/jsemit.c.orig	2006-10-10 20:01:02.000000000 +0200
-+++ js/src/jsemit.c	2006-11-17 13:00:12.000000000 +0100
-@@ -3867,7 +3867,7 @@ js_EmitTree(JSContext *cx, JSCodeGenerat
-     JSAtom *atom;
-     JSAtomListElement *ale;
-     jsatomid atomIndex;
--    intN noteIndex;
-+    ptrdiff_t noteIndex;
-     JSSrcNoteType noteType;
-     jsbytecode *pc;
-     JSOp op;