Update firefox, firefox-bin and firefox-gtk1 to 1.5.0.10. Fixed in this version:

Fixed in Firefox 1.5.0.10
MFSA 2007-07 Embedded nulls in location.hostname confuse same-domain checks
MFSA 2007-06 Mozilla Network Security Services (NSS) SSLv2 buffer overflow
MFSA 2007-05 XSS and local file access by opening blocked popups
MFSA 2007-04 Spoofing using custom cursor and CSS3 hotspot
MFSA 2007-03 Information disclosure through cache collisions
MFSA 2007-02 Improvements to help protect against Cross-Site Scripting attacks
MFSA 2007-01 Crashes with evidence of memory corruption (rv:1.8.0.10/1.8.1.2)

For more info, see http://www.mozilla.com/en-US/firefox/releases/1.5.0.10.html

7 files changed, 22 insertions, 57 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 6cbb314f404..e918d0874ca 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2007/02/04 00:15:49 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/25 00:43:23 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 084fd028be5..d865ad1b7cf 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.40 2007/02/22 19:30:06 wiz Exp $
+# $NetBSD: Makefile-firefox.common,v 1.41 2007/02/25 00:43:23 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		1.5.0.9
+MOZ_VER=		1.5.0.10
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 2ea857e9d84..f5f0b9d78ee 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/02/04 00:15:49 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.24 2007/02/25 00:43:23 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -70,6 +70,7 @@ lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
 lib/${MOZILLA}/extensions/inspector@mozilla.org/components/libinspector.${SO_SUFFIX}
+lib/${MOZILLA}/libfreebl3.${SO_SUFFIX}
 lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -298,6 +299,7 @@ lib/${MOZILLA}/icons/mozicon128.png
 lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
 lib/${MOZILLA}/init.d/README
+lib/${MOZILLA}/libfreebl3.chk
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.chk
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.chk
 lib/${MOZILLA}/libsoftokn3.chk
@@ -2449,8 +2451,6 @@ include/${MOZILLA}/nss/ssl.h
 include/${MOZILLA}/nss/sslerr.h
 include/${MOZILLA}/nss/sslproto.h
 include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/swfort.h
-include/${MOZILLA}/nss/swfortt.h
 include/${MOZILLA}/nss/watcomfx.h
 @comment end INCLUDE-PUBLIC
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 2e8bc16b7ba..b40320f4c21 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.61 2007/01/25 15:45:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.62 2007/02/25 00:43:23 ghen Exp $
 
-SHA1 (firefox-1.5.0.9-source.tar.bz2) = 55147ecf4882baf618d1e5eb5f5a438086706425
-RMD160 (firefox-1.5.0.9-source.tar.bz2) = b83bca8f317a6bc00dd40fd0d868cbe82536f45e
-Size (firefox-1.5.0.9-source.tar.bz2) = 35600822 bytes
+SHA1 (firefox-1.5.0.10-source.tar.bz2) = c341958ca46d04a4dad6266cb8c11b534f5f758e
+RMD160 (firefox-1.5.0.10-source.tar.bz2) = 6d190be0fa5c38cdbf637af49a351731d4a68d06
+Size (firefox-1.5.0.10-source.tar.bz2) = 35539364 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
 SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
@@ -17,11 +17,11 @@ SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff
 SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e
 SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff
 SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602
-SHA1 (patch-ap) = 0380e884b579bf8bb596e88c1adc20fd764242e3
+SHA1 (patch-ap) = 039baf9d4934eee1d672fd31808b9a75cd6f2766
 SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf
 SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
 SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a
-SHA1 (patch-ax) = 90bb18ed68a7e266e153b537bf85e082296ade47
+SHA1 (patch-ax) = d325173534e8a589f16fbf0a9cbfc492c62cb9ac
 SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
 SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037
 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
@@ -61,4 +61,3 @@ SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
 SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
 SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
 SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
-SHA1 (patch-ed) = d5256827efa3f2d49c20794a288842429b780eda
diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap
index 04418743970..70ef7233ae7 100644
--- a/www/firefox/patches/patch-ap
+++ b/www/firefox/patches/patch-ap
@@ -1,12 +1,11 @@
-$NetBSD: patch-ap,v 1.6 2007/01/16 23:35:16 dmcmahill Exp $
+$NetBSD: patch-ap,v 1.7 2007/02/25 00:43:23 ghen Exp $
 
-diff -ruN ../Orig/mozilla/security/coreconf/command.mk ./security/coreconf/command.mk
---- ../Orig/mozilla/security/coreconf/command.mk	2004-04-26 00:02:17.000000000 +0900
-+++ ./security/coreconf/command.mk	2005-12-04 19:07:51.000000000 +0900
-@@ -46,7 +46,7 @@
+--- ./security/coreconf/command.mk.orig	2005-10-11 01:46:12.000000000 +0200
++++ ./security/coreconf/command.mk
+@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
+ CCF           = $(CC) $(CFLAGS)
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
- NFSPWD        = $(NSINSTALL_DIR)/nfspwd
 -CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 +CFLAGS        = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
  		$(XCFLAGS)
diff --git a/www/firefox/patches/patch-ax b/www/firefox/patches/patch-ax
index 0efd5869071..6e865f5e4b3 100644
--- a/www/firefox/patches/patch-ax
+++ b/www/firefox/patches/patch-ax
@@ -1,11 +1,10 @@
-$NetBSD: patch-ax,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ax,v 1.5 2007/02/25 00:43:23 ghen Exp $
 
-diff -ruN ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk
---- ../Orig/mozilla/security/coreconf/SunOS5.mk	2004-10-11 11:15:42.000000000 +0900
-+++ ./security/coreconf/SunOS5.mk	2005-12-04 19:09:09.000000000 +0900
-@@ -182,6 +182,10 @@
- 	DSO_LDOPTS += -G -h $(notdir $@)
+--- ./security/coreconf/SunOS5.mk.orig	2006-04-25 03:32:16.000000000 +0200
++++ ./security/coreconf/SunOS5.mk
+@@ -176,6 +176,10 @@ endif
  endif
+ DSO_LDOPTS += -z combreloc -z defs -z ignore
  
 +ifdef LIBRUNPATH
 +DSO_LDOPTS += -R$(LIBRUNPATH)
diff --git a/www/firefox/patches/patch-ed b/www/firefox/patches/patch-ed
deleted file mode 100644
index 2d6b7a8ad11..00000000000
--- a/www/firefox/patches/patch-ed
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ed,v 1.1 2007/01/25 15:45:19 dmcmahill Exp $
-
-GNU make-3.81 changed the way \newlines are handled inside of single
-quotes.  This fixes the command.  Should still work on older GNU make's
-too.
-
-See https://bugzilla.mozilla.org/show_bug.cgi?id=325148
-
---- security/coreconf/rules.mk.orig	2005-04-14 20:36:28.000000000 -0400
-+++ security/coreconf/rules.mk
-@@ -885,8 +885,7 @@ endif
- 
- ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET)))
- # Can't use sed because of its 4000-char line length limit, so resort to perl
--.DEFAULT:
--	@perl -e '                                                            \
-+PERL_DEPENDENCIES_PROGRAM= '                                                  \
- 	    open(MD, "< $(DEPENDENCIES)");                                    \
- 	    while (<MD>) {                                                    \
- 		if (m@ \.*/*$< @) {                                           \
-@@ -914,6 +913,10 @@ ifneq (,$(filter-out OpenVMS OS2 WIN%,$(
- 		print "$(MAKE): *** No rule to make target $<.  Stop.\n";     \
- 		exit(1);                                                      \
- 	    }'
-+
-+.DEFAULT:
-+	@perl -e ${PERL_DEPENDENCIES_PROGRAM}
-+
- endif
- 
- #############################################################################