summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2007-06-13 21:32:43 +0000
committersalo <salo@pkgsrc.org>2007-06-13 21:32:43 +0000
commit16061a75c09a1fab62b4f266aead7de02f166da9 (patch)
tree8c138b078458824738fe01ddb3ad0693f80085b7
parenta93be177cc0c869b235a6ed64b9f6e2e5c40e74e (diff)
downloadpkgsrc-16061a75c09a1fab62b4f266aead7de02f166da9.tar.gz
Pullup ticket 2106 - requested by ghen
security updates for firefox Updated via patch provided by the submitter, packages in HEAD were renamed. Module Name: pkgsrc Committed By: ghen Date: Thu May 31 07:26:46 UTC 2007 Modified Files: pkgsrc/www/firefox15: DESCR Makefile-firefox.common distinfo pkgsrc/www/firefox15-bin: DESCR Makefile distinfo pkgsrc/www/firefox15-gtk1: DESCR pkgsrc/www/firefox15/patches: patch-cn Log Message: 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. --- Module Name: pkgsrc Committed By: ghen Date: Thu May 31 07:25:10 UTC 2007 Modified Files: pkgsrc/www/firefox: Makefile Makefile-firefox.common PLIST distinfo pkgsrc/www/firefox-bin: Makefile distinfo pkgsrc/www/firefox-gtk1: Makefile PLIST pkgsrc/www/firefox/patches: patch-cn Log Message: 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/
Diffstat
-rw-r--r--www/firefox-bin/DESCR4
-rw-r--r--www/firefox-bin/Makefile4
-rw-r--r--www/firefox-bin/distinfo8
-rw-r--r--www/firefox-gtk1/DESCR4
-rw-r--r--www/firefox/DESCR4
-rw-r--r--www/firefox/Makefile-firefox.common4
-rw-r--r--www/firefox/distinfo10
-rw-r--r--www/firefox/patches/patch-cn22
-rw-r--r--www/firefox2-bin/Makefile4
-rw-r--r--www/firefox2-bin/distinfo8
-rw-r--r--www/firefox2-gtk1/Makefile3
-rw-r--r--www/firefox2-gtk1/PLIST3
-rw-r--r--www/firefox2/Makefile3
-rw-r--r--www/firefox2/Makefile-firefox.common4
-rw-r--r--www/firefox2/PLIST3
-rw-r--r--www/firefox2/distinfo10
-rw-r--r--www/firefox2/patches/patch-cn22
17 files changed, 62 insertions, 58 deletions
diff --git a/www/firefox-bin/DESCR b/www/firefox-bin/DESCR
index 2f9713be943..c3b41ab3dca 100644
--- a/www/firefox-bin/DESCR
+++ b/www/firefox-bin/DESCR
@@ -7,3 +7,7 @@ windows.
Firefox also offers excellent bookmark and history management, and it
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 June 2007. All users are encouraged to upgrade to
+Firefox 2 (will be the default in pkgsrc-2007Q2).
diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 4b171d2ede6..5bcafbf0ddc 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/03/21 13:33:05 ghen Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2007/06/13 21:32:50 salo 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/firefox-bin/distinfo b/www/firefox-bin/distinfo
index c7f3bd782a7..cd9295952e5 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.24 2007/03/21 13:33:05 ghen Exp $
+$NetBSD: distinfo,v 1.24.2.1 2007/06/13 21:32:51 salo 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/firefox-gtk1/DESCR b/www/firefox-gtk1/DESCR
index cba6624f213..3b8638ddfeb 100644
--- a/www/firefox-gtk1/DESCR
+++ b/www/firefox-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 April 24, 2007. All users are encouraged to upgrade to
-Firefox 2 (pkgsrc/www/firefox2 and firefox2-gtk1).
+updates until June 2007. All users are encouraged to upgrade to
+Firefox 2 (will be the default in pkgsrc-2007Q2).
firefox-gtk1 uses GTK+-1.x widgets.
diff --git a/www/firefox/DESCR b/www/firefox/DESCR
index fe99f48a261..e525773b106 100644
--- a/www/firefox/DESCR
+++ b/www/firefox/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 April 24, 2007. All users are encouraged to upgrade to
-Firefox 2 (pkgsrc/www/firefox2 and firefox2-gtk1).
+updates until June 2007. All users are strongly encouraged to upgrade
+to Firefox 2 (will be the default in pkgsrc-2007Q2).
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 611c5ecd972..d7e37b1cceb 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.42 2007/03/21 13:33:04 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.42.2.1 2007/06/13 21:32:46 salo 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/firefox/distinfo b/www/firefox/distinfo
index 552634097ee..5750c30f460 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.64 2007/03/21 13:33:04 ghen Exp $
+$NetBSD: distinfo,v 1.64.2.1 2007/06/13 21:32:47 salo 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/firefox/patches/patch-cn b/www/firefox/patches/patch-cn
index f3bd385b188..b1d492c97c8 100644
--- a/www/firefox/patches/patch-cn
+++ b/www/firefox/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
+$NetBSD: patch-cn,v 1.2.6.1 2007/06/13 21:32:49 salo 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.2 2006/07/28 17:40:50 uebayasi 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.2 2006/07/28 17:40:50 uebayasi 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.2 2006/07/28 17:40:50 uebayasi 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.2 2006/07/28 17:40:50 uebayasi 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.2 2006/07/28 17:40:50 uebayasi 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.2 2006/07/28 17:40:50 uebayasi 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.2 2006/07/28 17:40:50 uebayasi 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;
}
diff --git a/www/firefox2-bin/Makefile b/www/firefox2-bin/Makefile
index 39f75640b64..eb15570e3a2 100644
--- a/www/firefox2-bin/Makefile
+++ b/www/firefox2-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2007/03/21 13:45:21 ghen Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2007/06/13 21:32:55 salo 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/2.0/releasenotes/
diff --git a/www/firefox2-bin/distinfo b/www/firefox2-bin/distinfo
index 23747feeef5..6e78fbe468b 100644
--- a/www/firefox2-bin/distinfo
+++ b/www/firefox2-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/03/21 13:45:21 ghen Exp $
+$NetBSD: distinfo,v 1.4.2.1 2007/06/13 21:32:55 salo 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/firefox2-gtk1/Makefile b/www/firefox2-gtk1/Makefile
index ecf03e1af03..5c49c586b69 100644
--- a/www/firefox2-gtk1/Makefile
+++ b/www/firefox2-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2007/03/31 22:51:24 ghen Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2007/06/13 21:32:55 salo Exp $
MOZILLA= firefox-gtk1
-PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox2/Makefile-firefox.common"
diff --git a/www/firefox2-gtk1/PLIST b/www/firefox2-gtk1/PLIST
index fb171141530..f57377c9344 100644
--- a/www/firefox2-gtk1/PLIST
+++ b/www/firefox2-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/03/07 21:32:55 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2007/06/13 21:32:56 salo 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/firefox2/Makefile b/www/firefox2/Makefile
index 966416220e9..54dfc432de7 100644
--- a/www/firefox2/Makefile
+++ b/www/firefox2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2007/03/31 22:51:24 ghen Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2007/06/13 21:32:52 salo Exp $
MOZILLA= firefox
-PKGREVISION= 1
EXTRACT_SUFX= .tar.bz2
COMMENT= Lightweight gecko-based web browser
diff --git a/www/firefox2/Makefile-firefox.common b/www/firefox2/Makefile-firefox.common
index ebefba3a27a..ab919e7beda 100644
--- a/www/firefox2/Makefile-firefox.common
+++ b/www/firefox2/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.6 2007/03/21 13:45:20 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.6.2.1 2007/06/13 21:32:52 salo 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/firefox2/PLIST b/www/firefox2/PLIST
index bb54728f2c3..f3fb2a4e120 100644
--- a/www/firefox2/PLIST
+++ b/www/firefox2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/03/07 21:32:55 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2007/06/13 21:32:53 salo 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/firefox2/distinfo b/www/firefox2/distinfo
index 47146e2f7dd..0cc8812dd6c 100644
--- a/www/firefox2/distinfo
+++ b/www/firefox2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/03/21 13:45:20 ghen Exp $
+$NetBSD: distinfo,v 1.9.2.1 2007/06/13 21:32:53 salo 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) = d3b6d3994a030c89b0bd580c01e1f15e08dab4c8
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/firefox2/patches/patch-cn b/www/firefox2/patches/patch-cn
index 5e704ab6708..e799a49d2bb 100644
--- a/www/firefox2/patches/patch-cn
+++ b/www/firefox2/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $
+$NetBSD: patch-cn,v 1.1.1.1.4.1 2007/06/13 21:32:54 salo 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.1.1.1 2006/10/24 22:20:12 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.1.1.1 2006/10/24 22:20:12 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.1.1.1 2006/10/24 22:20:12 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.1.1.1 2006/10/24 22:20:12 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.1.1.1 2006/10/24 22:20:12 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.1.1.1 2006/10/24 22:20:12 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.1.1.1 2006/10/24 22:20:12 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;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 23:45:15 +0000