Update firefox15, firefox15-bin and firefox15-gtk1 to 1.5.0.12.

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/releases/1.5.0.12.html

Note: Firefox 1.5.0.x will be maintained with security and stability updates
until June 2007. All users are strongly encouraged to upgrade to Firefox 2.

8 files changed, 30 insertions, 30 deletions

diff --git a/www/firefox15-bin/DESCR b/www/firefox15-bin/DESCR
index d6ff6904f95..0e7c2afbd87 100644
--- a/www/firefox15-bin/DESCR
+++ b/www/firefox15-bin/DESCR
@@ -9,5 +9,5 @@ can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
 
 Note: Firefox 1.5.0.x will be maintained with security and stability
-updates until mid-May, 2007. All users are strongly encouraged to
-upgrade to Firefox 2.
+updates until June 2007. All users are strongly encouraged to upgrade
+to Firefox 2.
diff --git a/www/firefox15-bin/Makefile b/www/firefox15-bin/Makefile
index d09e2581ea0..17114f8b776 100644
--- a/www/firefox15-bin/Makefile
+++ b/www/firefox15-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2007/05/31 07:26:46 ghen Exp $
 
 MOZILLA=		firefox
-MOZ_VER=		1.5.0.11
+MOZ_VER=		1.5.0.12
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.com/firefox/
diff --git a/www/firefox15-bin/distinfo b/www/firefox15-bin/distinfo
index 4366b2bda43..8d483ce3f96 100644
--- a/www/firefox15-bin/distinfo
+++ b/www/firefox15-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:56:51 ghen Exp $
+$NetBSD: distinfo,v 1.2 2007/05/31 07:26:46 ghen Exp $
 
-SHA1 (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = 180eb33fe66a9bdd4fb2b6f4ee6a07ed7e2b1046
-RMD160 (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = b50b1ffd4edf6d22f18fd882c4f8e6035d5d1919
-Size (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = 8531625 bytes
+SHA1 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 0de90446b22a1e175595ebd1d03a81bfedc0f235
+RMD160 (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = e90e7795d686ba5cdabde4143c0ca2e217806f65
+Size (firefox/releases/1.5.0.12/linux-i686/en-US/firefox-1.5.0.12.tar.gz) = 8536567 bytes
diff --git a/www/firefox15-gtk1/DESCR b/www/firefox15-gtk1/DESCR
index 1f3824fd995..e502862b63b 100644
--- a/www/firefox15-gtk1/DESCR
+++ b/www/firefox15-gtk1/DESCR
@@ -9,7 +9,7 @@ can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
 
 Note: Firefox 1.5.0.x will be maintained with security and stability
-updates until mid-May, 2007. All users are strongly encouraged to
-upgrade to Firefox 2.
+updates until June 2007. All users are strongly encouraged to upgrade
+to Firefox 2.
 
 firefox-gtk1 uses GTK+-1.x widgets.
diff --git a/www/firefox15/DESCR b/www/firefox15/DESCR
index d6ff6904f95..0e7c2afbd87 100644
--- a/www/firefox15/DESCR
+++ b/www/firefox15/DESCR
@@ -9,5 +9,5 @@ can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
 
 Note: Firefox 1.5.0.x will be maintained with security and stability
-updates until mid-May, 2007. All users are strongly encouraged to
-upgrade to Firefox 2.
+updates until June 2007. All users are strongly encouraged to upgrade
+to Firefox 2.
diff --git a/www/firefox15/Makefile-firefox.common b/www/firefox15/Makefile-firefox.common
index 9b3ea6bc982..053b93a2333 100644
--- a/www/firefox15/Makefile-firefox.common
+++ b/www/firefox15/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.1.1.1 2007/05/12 13:55:52 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.2 2007/05/31 07:26:45 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		1.5.0.11
+MOZ_VER=		1.5.0.12
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox15/distinfo b/www/firefox15/distinfo
index 5d63024587f..c2d84bd433b 100644
--- a/www/firefox15/distinfo
+++ b/www/firefox15/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:55:52 ghen Exp $
+$NetBSD: distinfo,v 1.2 2007/05/31 07:26:45 ghen Exp $
 
-SHA1 (firefox-1.5.0.11-source.tar.bz2) = a094ceca09306138828ffa1bce346953ff757ecc
-RMD160 (firefox-1.5.0.11-source.tar.bz2) = 060a6ad81b8312a444568a2609888d2ef1c58bfc
-Size (firefox-1.5.0.11-source.tar.bz2) = 35534921 bytes
+SHA1 (firefox-1.5.0.12-source.tar.bz2) = a75529415052d21af23865616dcf03da0058b602
+RMD160 (firefox-1.5.0.12-source.tar.bz2) = 9e6d0795751cb6d0da743d36659644e6ed6c6344
+Size (firefox-1.5.0.12-source.tar.bz2) = 35642743 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
 SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
@@ -42,7 +42,7 @@ SHA1 (patch-cj) = 3ae48c9a906f47cf32706a1d2b3b6b44918e99f4
 SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
 SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
 SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
-SHA1 (patch-cn) = 77a0bbd42f8383b3167494e919e6338218c660e0
+SHA1 (patch-cn) = 5c0273dfed20c0c15d875828579906170e8c97f5
 SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
 SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
 SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
diff --git a/www/firefox15/patches/patch-cn b/www/firefox15/patches/patch-cn
index da3501c4b79..044ba0ba30e 100644
--- a/www/firefox15/patches/patch-cn
+++ b/www/firefox15/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.1.1.1 2007/05/12 13:56:10 ghen Exp $
+$NetBSD: patch-cn,v 1.2 2007/05/31 07:26:45 ghen Exp $
 
---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2006-06-14 05:58:31.000000000 +0900
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2007-04-27 03:17:24.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.1.1.1 2007/05/12 13:56: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);
  
-@@ -354,7 +354,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -343,7 +343,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -38,7 +38,7 @@ $NetBSD: patch-cn,v 1.1.1.1 2007/05/12 13:56:10 ghen Exp $
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -362,7 +362,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -351,7 +351,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.1.1.1 2007/05/12 13:56:10 ghen Exp $
            break;
          }
          if (test > res || i == 0) {
-@@ -382,7 +382,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -371,7 +371,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -56,7 +56,7 @@ $NetBSD: patch-cn,v 1.1.1.1 2007/05/12 13:56:10 ghen Exp $
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -390,7 +390,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -379,7 +379,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.1.1.1 2007/05/12 13:56:10 ghen Exp $
            break;
          }
          if ((test < res) || (i==0)) {
-@@ -413,7 +413,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -402,7 +402,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 result = 0;
@@ -74,7 +74,7 @@ $NetBSD: patch-cn,v 1.1.1.1 2007/05/12 13:56:10 ghen Exp $
        nsresult rv = xformsService->GetMonths(duration, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -489,7 +489,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -478,7 +478,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }
@@ -83,7 +83,7 @@ $NetBSD: patch-cn,v 1.1.1.1 2007/05/12 13:56:10 ghen Exp $
        }
  
        return aContext->recycler()->getNumberResult(res, aResult);
-@@ -514,7 +514,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -503,7 +503,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }