Update firefox, firefox-bin and firefox-gtk1 to 2.0.0.5.

Security fixes in this version:

MFSA 2007-25 XPCNativeWrapper pollution
MFSA 2007-24 Unauthorized access to wyciwyg:// documents
MFSA 2007-23 Remote code execution by launching Firefox from Internet Explorer
MFSA 2007-22 File type confusion due to %00 in name
MFSA 2007-21 Privilege escalation using an event handler attached to an element not in the document
MFSA 2007-20 Frame spoofing while window is loading
MFSA 2007-19 XSS using addEventListener and setTimeout
MFSA 2007-18 Crashes with evidence of memory corruption

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

5 files changed, 16 insertions, 12 deletions

diff --git a/www/firefox-gtk1/PLIST b/www/firefox-gtk1/PLIST
index b6a50780744..e35c7cb5955 100644
--- a/www/firefox-gtk1/PLIST
+++ b/www/firefox-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/05/31 07:25:10 ghen Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/07/26 08:43:50 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -1982,6 +1982,7 @@ include/${MOZILLA}/string/string-template-undef.h
 include/${MOZILLA}/toolkitcomps/nsICommandLine.h
 include/${MOZILLA}/toolkitcomps/nsICommandLineHandler.h
 include/${MOZILLA}/toolkitcomps/nsICommandLineRunner.h
+include/${MOZILLA}/toolkitcomps/nsICommandLineValidator.h
 include/${MOZILLA}/toolkitcomps/nsIRemoteService.h
 include/${MOZILLA}/toolkitcomps/nsToolkitCompsCID.h
 include/${MOZILLA}/transformiix/nsIXFormsUtilityService.h
@@ -2259,6 +2260,7 @@ include/${MOZILLA}/xpcom/nsIEnumerator.h
 include/${MOZILLA}/xpcom/nsIEnvironment.h
 include/${MOZILLA}/xpcom/nsIErrorService.h
 include/${MOZILLA}/xpcom/nsIEventQueue.h
+include/${MOZILLA}/xpcom/nsIEventQueueListener.h
 include/${MOZILLA}/xpcom/nsIEventQueueService.h
 include/${MOZILLA}/xpcom/nsIEventTarget.h
 include/${MOZILLA}/xpcom/nsIException.h
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 084acd7c7da..6fdce4d1f0a 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.45 2007/06/16 01:14:48 dmcmahill Exp $
+# $NetBSD: Makefile-firefox.common,v 1.46 2007/07/26 08:43:49 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		2.0.0.4
+MOZ_VER=		2.0.0.5
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 355dfb6c78e..172eba4a3dd 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2007/05/31 07:25:08 ghen Exp $
+@comment $NetBSD: PLIST,v 1.28 2007/07/26 08:43:50 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -1999,6 +1999,7 @@ include/${MOZILLA}/system-pref/nsSystemPrefService.h
 include/${MOZILLA}/toolkitcomps/nsICommandLine.h
 include/${MOZILLA}/toolkitcomps/nsICommandLineHandler.h
 include/${MOZILLA}/toolkitcomps/nsICommandLineRunner.h
+include/${MOZILLA}/toolkitcomps/nsICommandLineValidator.h
 include/${MOZILLA}/toolkitcomps/nsIRemoteService.h
 include/${MOZILLA}/toolkitcomps/nsToolkitCompsCID.h
 include/${MOZILLA}/transformiix/nsIXFormsUtilityService.h
@@ -2275,6 +2276,7 @@ include/${MOZILLA}/xpcom/nsIEnumerator.h
 include/${MOZILLA}/xpcom/nsIEnvironment.h
 include/${MOZILLA}/xpcom/nsIErrorService.h
 include/${MOZILLA}/xpcom/nsIEventQueue.h
+include/${MOZILLA}/xpcom/nsIEventQueueListener.h
 include/${MOZILLA}/xpcom/nsIEventQueueService.h
 include/${MOZILLA}/xpcom/nsIEventTarget.h
 include/${MOZILLA}/xpcom/nsIException.h
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 43139f6ffd7..9fa024a74fa 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.66 2007/05/31 07:25:08 ghen Exp $
+$NetBSD: distinfo,v 1.67 2007/07/26 08:43:50 ghen Exp $
 
-SHA1 (firefox-2.0.0.4-source.tar.bz2) = 655ce5d1e6addee8fdb8f5f07aee7cbf3e86dd1b
-RMD160 (firefox-2.0.0.4-source.tar.bz2) = ee6d5bcfb68984bd062457f56f0652f4870697bc
-Size (firefox-2.0.0.4-source.tar.bz2) = 37321839 bytes
+SHA1 (firefox-2.0.0.5-source.tar.bz2) = 7f288562cc69b29567a0bd8d8f4700b3a78bfbd8
+RMD160 (firefox-2.0.0.5-source.tar.bz2) = a8525db5ef06f7cf7e6f972b2f562d11b1697dcd
+Size (firefox-2.0.0.5-source.tar.bz2) = 37392615 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = 19069a4e572744eccb04e9906e16dad28d2dac01
 SHA1 (patch-ac) = 3f28e27c100655aca4daaca02a77a76064359e94
@@ -43,7 +43,7 @@ SHA1 (patch-cj) = 3ae48c9a906f47cf32706a1d2b3b6b44918e99f4
 SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
 SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
 SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
-SHA1 (patch-cn) = d1e476da65e7cdd824df5ac4f9aa026163e4b114
+SHA1 (patch-cn) = dbee403dbe19cb48eff2079f92c8e6a7a94534c4
 SHA1 (patch-da) = 356e37429832ffd296fa79b9aa7ef20c05d851e0
 SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
 SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
diff --git a/www/firefox/patches/patch-cn b/www/firefox/patches/patch-cn
index 1005f0d1303..5024e2a164e 100644
--- a/www/firefox/patches/patch-cn
+++ b/www/firefox/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.4 2007/05/31 07:25:09 ghen Exp $
+$NetBSD: patch-cn,v 1.5 2007/07/26 08:43:50 ghen Exp $
 
---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2007-04-27 03:08:49.000000000 +0200
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2007-06-24 02:00:32.000000000 +0200
 +++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
 @@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          res = (res/i);
@@ -26,7 +26,7 @@ $NetBSD: patch-cn,v 1.4 2007/05/31 07:25:09 ghen Exp $
        PRInt32 index = 0;
 -      double res = Double::NaN;
 +      double res = Double::NaN();
-       rv = xformsService->GetRepeatIndexById(mResolverNode, indexId, &index);
+       rv = xformsService->GetRepeatIndexById(mNode, indexId, &index);
        NS_ENSURE_SUCCESS(rv, rv);
  
 @@ -344,7 +344,7 @@ XFormsFunctionCall::evaluate(txIEvalCont