Update Firefox to 1.5.0.3, which is identical to our 1.5.0.2nb2 (except for the

advertized version), so there's no reason to upgrade. :-)

Fixes a denial of service vulnerability (MFSA 2006-30).

6 files changed, 8 insertions, 104 deletions

diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile
index 899187da7d7..333300ac4a1 100644
--- a/www/firefox-gtk1/Makefile
+++ b/www/firefox-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/05/02 10:10:43 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2006/05/04 05:16:13 ghen Exp $
 
 MOZILLA=	firefox-gtk1
-PKGREVISION=	2
 COMMENT=	Lightweight gecko-based web browser built with GTK+-1.x
 
 .include "../../www/firefox/Makefile-firefox.common"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 3a9c38a292e..c15b5a1c37e 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2006/04/28 16:11:31 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2006/05/04 05:16:13 ghen Exp $
 
 MOZILLA=		firefox
-PKGREVISION=		2
 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 10c8cb75aa9..c6e7ea3ef88 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.29 2006/04/15 14:20:31 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.30 2006/05/04 05:16:13 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		1.5.0.2
+MOZ_VER=		1.5.0.3
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index be497e6790a..bef94c3e4cc 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2006/04/28 16:11:31 drochner Exp $
+$NetBSD: distinfo,v 1.49 2006/05/04 05:16:13 ghen Exp $
 
-SHA1 (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = 21f5497a4cdd4b142bdcb9c3fbdfea43cae1455f
-RMD160 (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = a3128798930d069a175d278b5522cdc8e43dc352
-Size (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = 35234245 bytes
+SHA1 (firefox-1.5.0.3/firefox-1.5.0.3-source.tar.bz2) = f3305ea944b0e77e0279234190331ffcb0ae7eea
+RMD160 (firefox-1.5.0.3/firefox-1.5.0.3-source.tar.bz2) = 0c278d242bb763343690a51f5e3b4750cb10a937
+Size (firefox-1.5.0.3/firefox-1.5.0.3-source.tar.bz2) = 35239885 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
 SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
@@ -59,5 +59,3 @@ SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
 SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
 SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
-SHA1 (patch-fa) = 64f09a71d4d3c36a42e8ccf28b2d3e43dbf8f202
-SHA1 (patch-fb) = fb32614d012565c4cb97e489ef05f3f76d75c841
diff --git a/www/firefox/patches/patch-fa b/www/firefox/patches/patch-fa
deleted file mode 100644
index 4f8d8b4de45..00000000000
--- a/www/firefox/patches/patch-fa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-fa,v 1.1 2006/04/28 16:11:31 drochner Exp $
-
---- embedding/components/commandhandler/src/nsBaseCommandController.h.orig	2006-04-28 12:43:57.000000000 +0200
-+++ embedding/components/commandhandler/src/nsBaseCommandController.h
-@@ -49,6 +49,8 @@
- #include "nsIControllerContext.h"
- #include "nsIControllerCommandTable.h"
- #include "nsIInterfaceRequestor.h"
-+#include "nsIWeakReference.h"
-+#include "nsIWeakReferenceUtils.h"
- 
- // The base editor controller is used for both text widgets, 
- //   and all other text and html editing
-@@ -79,7 +81,7 @@ public:
-   
- private:
- 
--   nsISupports *mCommandContext;
-+   nsWeakPtr mCommandContext;
-    
-    // Our reference to the command manager
-    nsCOMPtr<nsIControllerCommandTable> mCommandTable;     
diff --git a/www/firefox/patches/patch-fb b/www/firefox/patches/patch-fb
deleted file mode 100644
index f08344952d1..00000000000
--- a/www/firefox/patches/patch-fb
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-fb,v 1.1 2006/04/28 16:11:31 drochner Exp $
-
---- embedding/components/commandhandler/src/nsBaseCommandController.cpp.orig	2006-04-28 12:43:57.000000000 +0200
-+++ embedding/components/commandhandler/src/nsBaseCommandController.cpp
-@@ -55,7 +55,6 @@ NS_INTERFACE_MAP_BEGIN(nsBaseCommandCont
- NS_INTERFACE_MAP_END
- 
- nsBaseCommandController::nsBaseCommandController()
--: mCommandContext(nsnull)
- {
- }
- 
-@@ -79,7 +78,7 @@ nsBaseCommandController::Init(nsIControl
- NS_IMETHODIMP
- nsBaseCommandController::SetCommandContext(nsISupports *aCommandContext)
- {
--  mCommandContext = aCommandContext;     // no addref  
-+  mCommandContext = do_GetWeakReference(aCommandContext);
-   return NS_OK;
- }
- 
-@@ -113,7 +112,8 @@ nsBaseCommandController::IsCommandEnable
- {
-   NS_ENSURE_ARG_POINTER(aCommand);
-   NS_ENSURE_ARG_POINTER(aResult);
--  return mCommandTable->IsCommandEnabled(aCommand, mCommandContext, aResult);
-+  nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
-+  return mCommandTable->IsCommandEnabled(aCommand, context, aResult);
- }
- 
- NS_IMETHODIMP
-@@ -121,14 +121,16 @@ nsBaseCommandController::SupportsCommand
- {
-   NS_ENSURE_ARG_POINTER(aCommand);
-   NS_ENSURE_ARG_POINTER(aResult);
--  return mCommandTable->SupportsCommand(aCommand, mCommandContext, aResult);
-+  nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
-+  return mCommandTable->SupportsCommand(aCommand, context, aResult);
- }
- 
- NS_IMETHODIMP
- nsBaseCommandController::DoCommand(const char *aCommand)
- {
-   NS_ENSURE_ARG_POINTER(aCommand);
--  return mCommandTable->DoCommand(aCommand, mCommandContext);
-+  nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
-+  return mCommandTable->DoCommand(aCommand, context);
- }
- 
- NS_IMETHODIMP
-@@ -136,7 +138,8 @@ nsBaseCommandController::DoCommandWithPa
-                                              nsICommandParams *aParams)
- {
-   NS_ENSURE_ARG_POINTER(aCommand);
--  return mCommandTable->DoCommandParams(aCommand, aParams, mCommandContext);
-+  nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
-+  return mCommandTable->DoCommandParams(aCommand, aParams, context);
- }
- 
- NS_IMETHODIMP
-@@ -144,7 +147,8 @@ nsBaseCommandController::GetCommandState
-                                                    nsICommandParams *aParams)
- {
-   NS_ENSURE_ARG_POINTER(aCommand);
--  return mCommandTable->GetCommandState(aCommand, aParams, mCommandContext);
-+  nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
-+  return mCommandTable->GetCommandState(aCommand, aParams, context);
- }
- 
- NS_IMETHODIMP