From a704f855c6d2e7c888ae4c1a8a442e1cde22d861 Mon Sep 17 00:00:00 2001 From: ghen Date: Sun, 5 Feb 2006 14:46:31 +0000 Subject: Update to Firefox 1.5.0.1, a bug fix release for Firefox 1.5. What's new: * Improved stability. * Improved support for Mac OS X. * International Domain Name support for Iceland (.is) is now enabled. * Fixes for several memory leaks. * Several security enhancements. For a more detailed list changes, see http://www.squarefree.com/burningedge/releases/1.5.0.1.html Ok with wiz. --- www/firefox-gtk1/Makefile | 3 +- www/firefox-gtk1/PLIST | 4 +- www/firefox/Makefile | 3 +- www/firefox/Makefile-firefox.common | 4 +- www/firefox/PLIST | 3 +- www/firefox/distinfo | 11 +-- www/firefox/patches/patch-bugzilla-319004 | 128 ------------------------------ www/firefox/patches/patch-dw | 14 ++++ www/firefox/patches/patch-dx | 14 ++++ 9 files changed, 42 insertions(+), 142 deletions(-) delete mode 100644 www/firefox/patches/patch-bugzilla-319004 create mode 100644 www/firefox/patches/patch-dw create mode 100644 www/firefox/patches/patch-dx diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile index f8f9a279259..6b473c7cbe3 100644 --- a/www/firefox-gtk1/Makefile +++ b/www/firefox-gtk1/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:48 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/02/05 14:46:31 ghen Exp $ -PKGREVISION= 2 MOZILLA= firefox-gtk1 COMMENT= Lightweight gecko-based web browser built with GTK+-1.x diff --git a/www/firefox-gtk1/PLIST b/www/firefox-gtk1/PLIST index 52decd75ed3..bd299e316b5 100644 --- a/www/firefox-gtk1/PLIST +++ b/www/firefox-gtk1/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2005/12/10 13:47:22 taya Exp $ +@comment $NetBSD: PLIST,v 1.9 2006/02/05 14:46:31 ghen Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -738,6 +738,7 @@ include/${MOZILLA}/dom/nsIDOMChromeWindow.h include/${MOZILLA}/dom/nsIDOMClassInfo.h include/${MOZILLA}/dom/nsIDOMComment.h include/${MOZILLA}/dom/nsIDOMCompositionListener.h +include/${MOZILLA}/dom/nsIDOMConstructor.h include/${MOZILLA}/dom/nsIDOMContextMenuListener.h include/${MOZILLA}/dom/nsIDOMCounter.h include/${MOZILLA}/dom/nsIDOMCrypto.h @@ -2432,7 +2433,6 @@ include/${MOZILLA}/nss/swfortt.h include/${MOZILLA}/nss/watcomfx.h @comment end INCLUDE-PUBLIC @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom -@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat @comment begin DIRS diff --git a/www/firefox/Makefile b/www/firefox/Makefile index a1404cc407b..4c767b47bfe 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.27 2006/01/24 07:32:47 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2006/02/05 14:46:31 ghen Exp $ -PKGREVISION= 3 MOZILLA= firefox EXTRACT_SUFX= .tar.bz2 COMMENT= Lightweight gecko-based web browser diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index 607234cf069..9f45fd759a2 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile-firefox.common,v 1.25 2005/12/23 00:29:57 joerg Exp $ +# $NetBSD: Makefile-firefox.common,v 1.26 2006/02/05 14:46:31 ghen Exp $ MOZILLA_BIN= firefox-bin -MOZ_VER= 1.5 +MOZ_VER= 1.5.0.1 EXTRACT_SUFX= .tar.bz2 DISTNAME= firefox-${MOZ_VER}-source diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 8ef28bf0c3d..3f3a50be577 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2005/12/28 18:11:56 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.21 2006/02/05 14:46:31 ghen Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -756,6 +756,7 @@ include/${MOZILLA}/dom/nsIDOMChromeWindow.h include/${MOZILLA}/dom/nsIDOMClassInfo.h include/${MOZILLA}/dom/nsIDOMComment.h include/${MOZILLA}/dom/nsIDOMCompositionListener.h +include/${MOZILLA}/dom/nsIDOMConstructor.h include/${MOZILLA}/dom/nsIDOMContextMenuListener.h include/${MOZILLA}/dom/nsIDOMCounter.h include/${MOZILLA}/dom/nsIDOMCrypto.h diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 3455c4fe56d..fa81d849ae4 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.43 2006/01/27 22:35:13 wiz Exp $ +$NetBSD: distinfo,v 1.44 2006/02/05 14:46:31 ghen Exp $ -SHA1 (firefox-1.5/firefox-1.5-source.tar.bz2) = 7437c6a351787ec8762e598ae1852e22bcca3220 -RMD160 (firefox-1.5/firefox-1.5-source.tar.bz2) = 5e7475846e9c92e36167a384e1e8a3d699b0b62f -Size (firefox-1.5/firefox-1.5-source.tar.bz2) = 34491496 bytes +SHA1 (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 719a0c5218ead7a4e426612277e1c92c33800d38 +RMD160 (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 6e332fb1a7e80ab56d3d6e3de3d203c8c58217bf +Size (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 34705286 bytes SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3 SHA1 (patch-ab) = bcc480ab0f7d1760bf4f26b6464db6b69fa3b4d6 SHA1 (patch-ac) = d35b8da8ee1a6b42068ece31a1f4659e153b29cd @@ -29,7 +29,6 @@ SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77 SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6 SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9 -SHA1 (patch-bugzilla-319004) = d13f4c20cd74bfd6f8caae4a135f7f82361ce986 SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49 SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0 SHA1 (patch-by) = a6eeccfee4e7e3620be41b315c357575c8bd0635 @@ -60,3 +59,5 @@ SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266 +SHA1 (patch-dw) = 14e31d17c2493e468cd01f99abfc996853a11032 +SHA1 (patch-dx) = dc9232b10075d17f7ed742e7be8ea036db2f0241 diff --git a/www/firefox/patches/patch-bugzilla-319004 b/www/firefox/patches/patch-bugzilla-319004 deleted file mode 100644 index 2bac02d9a52..00000000000 --- a/www/firefox/patches/patch-bugzilla-319004 +++ /dev/null @@ -1,128 +0,0 @@ -$NetBSD: patch-bugzilla-319004,v 1.1 2005/12/10 13:47:22 taya Exp $ - -Index: toolkit/components/history/src/nsGlobalHistory.cpp -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v -retrieving revision 1.63 -diff -u -8 -r1.63 nsGlobalHistory.cpp ---- toolkit/components/history/src/nsGlobalHistory.cpp 17 Nov 2005 00:23:09 -0000 1.63 -+++ toolkit/components/history/src/nsGlobalHistory.cpp 9 Dec 2005 08:30:42 -0000 -@@ -108,16 +108,20 @@ - - #define PREF_BRANCH_BASE "browser." - #define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days" - #define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped" - #define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled" - - #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method=" - -+// see bug #319004 -- clamp title and URL to generously-large but not too large -+// length -+#define HISTORY_STRING_LENGTH_MAX 65536 -+ - // sync history every 10 seconds - #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC) - //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only! - - // the value of mLastNow expires every 3 seconds - #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC) - - #define MSECS_PER_DAY (PR_MSEC_PER_SEC * 60 * 60 * 24) -@@ -1105,30 +1109,33 @@ - } - - NS_IMETHODIMP - nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle) - { - nsresult rv; - NS_ENSURE_ARG_POINTER(aURI); - -- const nsAFlatString& titleString = PromiseFlatString(aTitle); -+ nsAutoString titleString(Substring(aTitle, 0, HISTORY_STRING_LENGTH_MAX)); - - // skip about: URIs to avoid reading in the db (about:blank, especially) - PRBool isAbout; - rv = aURI->SchemeIs("about", &isAbout); - NS_ENSURE_SUCCESS(rv, rv); - if (isAbout) return NS_OK; - - NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE); - - nsCAutoString URISpec; - rv = aURI->GetSpec(URISpec); - NS_ENSURE_SUCCESS(rv, rv); - -+ if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX) -+ URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX); -+ - nsCOMPtr row; - rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); - - // if the row doesn't exist, we silently succeed - if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK; - NS_ENSURE_SUCCESS(rv, rv); - - // Get the old title so we can notify observers -Index: xpfe/components/history/src/nsGlobalHistory.cpp -=================================================================== -RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v -retrieving revision 1.213 -diff -u -8 -p -r1.213 nsGlobalHistory.cpp ---- xpfe/components/history/src/nsGlobalHistory.cpp 26 Oct 2005 16:50:47 -0000 1.213 -+++ xpfe/components/history/src/nsGlobalHistory.cpp 9 Dec 2005 08:47:37 -0000 -@@ -106,16 +106,20 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra - - #define PREF_BRANCH_BASE "browser." - #define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days" - #define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped" - #define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled" - - #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method=" - -+// see bug #319004 -- clamp title and URL to generously-large but not too large -+// length -+#define HISTORY_STRING_LENGTH_MAX 65536 -+ - // sync history every 10 seconds - #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC) - //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only! - - // the value of mLastNow expires every 3 seconds - #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC) - - static const PRInt64 MSECS_PER_DAY = LL_INIT(20, 500654080); // (1000000LL * 60 * 60 * 24) -@@ -1028,30 +1032,33 @@ nsGlobalHistory::GetCount(PRUint32* aCou - } - - NS_IMETHODIMP - nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle) - { - nsresult rv; - NS_ENSURE_ARG_POINTER(aURI); - -- const nsAFlatString& titleString = PromiseFlatString(aTitle); -+ nsAutoString titleString(Substring(aTitle, 0, HISTORY_STRING_LENGTH_MAX)); - - // skip about: URIs to avoid reading in the db (about:blank, especially) - PRBool isAbout; - rv = aURI->SchemeIs("about", &isAbout); - NS_ENSURE_SUCCESS(rv, rv); - if (isAbout) return NS_OK; - - NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE); - - nsCAutoString URISpec; - rv = aURI->GetSpec(URISpec); - NS_ENSURE_SUCCESS(rv, rv); - -+ if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX) -+ URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX); -+ - nsCOMPtr row; - rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); - - // if the row doesn't exist, we silently succeed - if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK; - NS_ENSURE_SUCCESS(rv, rv); - - // Get the old title so we can notify observers diff --git a/www/firefox/patches/patch-dw b/www/firefox/patches/patch-dw new file mode 100644 index 00000000000..328de13b4fd --- /dev/null +++ b/www/firefox/patches/patch-dw @@ -0,0 +1,14 @@ +$NetBSD: patch-dw,v 1.1 2006/02/05 14:46:31 ghen Exp $ + +--- toolkit/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100 ++++ toolkit/components/history/src/nsGlobalHistory.cpp +@@ -1132,6 +1132,9 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU + rv = aURI->GetSpec(URISpec); + NS_ENSURE_SUCCESS(rv, rv); + ++ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX) ++ URISpec.Left(URISpec, HISTORY_URI_LENGTH_MAX); ++ + nsCOMPtr row; + rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); + diff --git a/www/firefox/patches/patch-dx b/www/firefox/patches/patch-dx new file mode 100644 index 00000000000..edc3ad055ea --- /dev/null +++ b/www/firefox/patches/patch-dx @@ -0,0 +1,14 @@ +$NetBSD: patch-dx,v 1.1 2006/02/05 14:46:31 ghen Exp $ + +--- xpfe/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100 ++++ xpfe/components/history/src/nsGlobalHistory.cpp +@@ -1055,6 +1055,9 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU + rv = aURI->GetSpec(URISpec); + NS_ENSURE_SUCCESS(rv, rv); + ++ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX) ++ URISpec.Left(URISpec, HISTORY_URI_LENGTH_MAX); ++ + nsCOMPtr row; + rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); + -- cgit v1.2.3