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

Security fixes in this version:

MFSA 2007-17 XUL Popup Spoofing
MFSA 2007-16 XSS using addEventListener
MFSA 2007-14 Path Abuse in Cookies
MFSA 2007-13 Persistent Autocomplete Denial of Service
MFSA 2007-12 Crashes with evidence of memory corruption

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

9 files changed, 30 insertions, 30 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 8acdf5fe9e5..ce32a1ffbf3 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/05/12 13:53:12 ghen Exp $
+# $NetBSD: Makefile,v 1.29 2007/05/31 07:25:09 ghen Exp $
 
 MOZILLA=		firefox
-MOZ_VER=		2.0.0.3
+MOZ_VER=		2.0.0.4
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.com/en-US/firefox/
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 80095bdf403..59709c0c5c0 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.25 2007/05/12 13:53:12 ghen Exp $
+$NetBSD: distinfo,v 1.26 2007/05/31 07:25:09 ghen Exp $
 
-SHA1 (firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz) = 4b56f4e77c276a963e48de387741ab74dd2ffbd9
-RMD160 (firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz) = 13f262bc77f5eb21d36e2cc4a2e7c89098ae746c
-Size (firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz) = 9651693 bytes
+SHA1 (firefox/releases/2.0.0.4/linux-i686/en-US/firefox-2.0.0.4.tar.gz) = d77aca927ea915f287677e8a29488a1e9c48f9a8
+RMD160 (firefox/releases/2.0.0.4/linux-i686/en-US/firefox-2.0.0.4.tar.gz) = b8f1a5d78cdbff38f499a94ccc97498b0dc40abd
+Size (firefox/releases/2.0.0.4/linux-i686/en-US/firefox-2.0.0.4.tar.gz) = 9655661 bytes
diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile
index 5c00719185e..8be2492596f 100644
--- a/www/firefox-gtk1/Makefile
+++ b/www/firefox-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2007/05/12 13:53:11 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2007/05/31 07:25:09 ghen Exp $
 
 MOZILLA=	firefox-gtk1
-PKGREVISION=	1
 COMMENT=	Lightweight gecko-based web browser built with GTK+-1.x
 
 .include "../../www/firefox/Makefile-firefox.common"
diff --git a/www/firefox-gtk1/PLIST b/www/firefox-gtk1/PLIST
index 707a1007771..b6a50780744 100644
--- a/www/firefox-gtk1/PLIST
+++ b/www/firefox-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/05/12 13:53:11 ghen Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/05/31 07:25:10 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2050,6 +2050,7 @@ include/${MOZILLA}/uriloader/nsURILoader.h
 include/${MOZILLA}/url-classifier/nsIUrlClassifierDBService.h
 include/${MOZILLA}/url-classifier/nsIUrlClassifierStreamUpdater.h
 include/${MOZILLA}/url-classifier/nsIUrlClassifierTable.h
+include/${MOZILLA}/url-classifier/nsIUrlClassifierUtils.h
 include/${MOZILLA}/url-classifier/nsIUrlListManager.h
 include/${MOZILLA}/urlformatter/nsIURLFormatter.h
 include/${MOZILLA}/util/nsTimer.h
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e0d162abfaa..690d722973d 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2007/05/12 13:53:07 ghen Exp $
+# $NetBSD: Makefile,v 1.45 2007/05/31 07:25:07 ghen Exp $
 
 MOZILLA=		firefox
-PKGREVISION=		1
 COMMENT=		Lightweight gecko-based web browser
 
 MOZILLA_USE_GTK2=	# yes
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 34d19af0971..9d8235543a0 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.43 2007/05/12 13:53:07 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.44 2007/05/31 07:25:07 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		2.0.0.3
+MOZ_VER=		2.0.0.4
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 362843d97e9..355dfb6c78e 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2007/05/12 13:53:07 ghen Exp $
+@comment $NetBSD: PLIST,v 1.27 2007/05/31 07:25:08 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2067,6 +2067,7 @@ include/${MOZILLA}/uriloader/nsURILoader.h
 include/${MOZILLA}/url-classifier/nsIUrlClassifierDBService.h
 include/${MOZILLA}/url-classifier/nsIUrlClassifierStreamUpdater.h
 include/${MOZILLA}/url-classifier/nsIUrlClassifierTable.h
+include/${MOZILLA}/url-classifier/nsIUrlClassifierUtils.h
 include/${MOZILLA}/url-classifier/nsIUrlListManager.h
 include/${MOZILLA}/urlformatter/nsIURLFormatter.h
 include/${MOZILLA}/util/nsTimer.h
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 539326eb399..43139f6ffd7 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.65 2007/05/12 13:53:07 ghen Exp $
+$NetBSD: distinfo,v 1.66 2007/05/31 07:25:08 ghen Exp $
 
-SHA1 (firefox-2.0.0.3-source.tar.bz2) = 58cb7251e5fdea7d82cbbc0c2fd92aa0be81f53d
-RMD160 (firefox-2.0.0.3-source.tar.bz2) = 23d3d0ae89ac257304647aabe236ef8caec4d05f
-Size (firefox-2.0.0.3-source.tar.bz2) = 37135441 bytes
+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 (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) = 54d21a622dee6b7edf3ca9fb44bd4f5e02ada974
+SHA1 (patch-cn) = d1e476da65e7cdd824df5ac4f9aa026163e4b114
 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 9c19667900a..1005f0d1303 100644
--- a/www/firefox/patches/patch-cn
+++ b/www/firefox/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
+$NetBSD: patch-cn,v 1.4 2007/05/31 07:25:09 ghen Exp $
 
---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2006-06-20 20:54:45.000000000 +0200
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2007-04-27 03:08:49.000000000 +0200
 +++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
 @@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          res = (res/i);
@@ -20,16 +20,16 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
        nsresult rv = xformsService->GetDaysFromDateTime(date, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -222,7 +222,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -211,7 +211,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 index = 0;
 -      double res = Double::NaN;
 +      double res = Double::NaN();
-       rv = xformsService->GetRepeatIndex(repeatEle, &index);
+       rv = xformsService->GetRepeatIndexById(mResolverNode, indexId, &index);
        NS_ENSURE_SUCCESS(rv, rv);
  
-@@ -355,7 +355,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -344,7 +344,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -38,7 +38,7 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -363,7 +363,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -352,7 +352,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
          test = Double::toDouble(resultStr);
          if (Double::isNaN(test)) {
@@ -47,7 +47,7 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
            break;
          }
          if (test > res || i == 0) {
-@@ -383,7 +383,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -372,7 +372,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -56,7 +56,7 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -391,7 +391,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -380,7 +380,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
          test = Double::toDouble(resultStr);
          if (Double::isNaN(test)) {
@@ -65,7 +65,7 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
            break;
          }
          if ((test < res) || (i==0)) {
-@@ -414,7 +414,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -403,7 +403,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 result = 0;
@@ -74,7 +74,7 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
        nsresult rv = xformsService->GetMonths(duration, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -490,7 +490,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -479,7 +479,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }
@@ -83,7 +83,7 @@ $NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
        }
  
        return aContext->recycler()->getNumberResult(res, aResult);
-@@ -515,7 +515,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -504,7 +504,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }