Security and stability update of firefox to 4.0.1.

MFSA 2011-18 XSLT generate-id() function heap address leak
MFSA 2011-17 WebGLES vulnerabilities
MFSA 2011-12 Miscellaneous memory safety hazards

4 files changed, 13 insertions, 13 deletions

diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index 0a2c7ec306d..9932036fe87 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2011/04/26 14:16:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.28 2011/05/02 20:37:37 tnn Exp $
 bin/xulrunner
 ${PLIST.jit}include/xulrunner/Allocator.h
 ${PLIST.jit}include/xulrunner/Assembler.h
@@ -2514,7 +2514,7 @@ lib/xulrunner/defaults/profile/localstore.rdf
 lib/xulrunner/dependentlibs.list
 lib/xulrunner/dictionaries/en-US.aff
 lib/xulrunner/dictionaries/en-US.dic
-lib/xulrunner/gre.d/2.0.system.conf
+lib/xulrunner/gre.d/${PKGVERSION}.system.conf
 lib/xulrunner/greprefs.js
 lib/xulrunner/icons/document.png
 lib/xulrunner/icons/updater.png
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index 681861096e8..57ed68c303b 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.20 2011/04/26 14:16:36 tnn Exp $
+# $NetBSD: dist.mk,v 1.21 2011/05/02 20:37:37 tnn Exp $
 #
 # used by devel/nspr/Makefile
 # used by devel/nss/Makefile
@@ -8,7 +8,7 @@
 DISTNAME=	firefox-${FIREFOX_VER}.source
 FIREFOX_VER=	4.0${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	2.0
-MOZ_BRANCH_MINOR=	# empty
+MOZ_BRANCH_MINOR=	.1
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index ad4ee669724..cacd76b47c5 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.43 2011/04/26 14:43:31 tnn Exp $
+$NetBSD: distinfo,v 1.44 2011/05/02 20:37:37 tnn Exp $
 
-SHA1 (firefox-4.0.source.tar.bz2) = 403da9dd65662e5c4dd34299214e04cb6f80575e
-RMD160 (firefox-4.0.source.tar.bz2) = 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d
-Size (firefox-4.0.source.tar.bz2) = 66024327 bytes
+SHA1 (firefox-4.0.1.source.tar.bz2) = c89bc5106266aa0097a7be15be84555bd2649f03
+RMD160 (firefox-4.0.1.source.tar.bz2) = 63faaae78b56db407a34454986361212382c838e
+Size (firefox-4.0.1.source.tar.bz2) = 65980273 bytes
 SHA1 (patch-aa) = cbf636b05f5bb2165fa335dab83d25e78053cdb2
 SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
 SHA1 (patch-ac) = 3d031c52056a4792119104e3c6a6f2377d00d04a
@@ -54,7 +54,7 @@ SHA1 (patch-pb) = 9662aa24ed81760e9cdaffec17592cfe9bbbab22
 SHA1 (patch-pc) = a0fbd378e0209259c97c8e24c8eccc02b543e08f
 SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0
 SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea
-SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67
+SHA1 (patch-rc) = 3dcccdff2d15145f91f1abae26f28e598942cd5c
 SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
 SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
 SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
diff --git a/devel/xulrunner/patches/patch-rc b/devel/xulrunner/patches/patch-rc
index f78e1b35590..f74e08013af 100644
--- a/devel/xulrunner/patches/patch-rc
+++ b/devel/xulrunner/patches/patch-rc
@@ -1,10 +1,10 @@
-$NetBSD: patch-rc,v 1.3 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-rc,v 1.4 2011/05/02 20:37:37 tnn Exp $
 
---- browser/branding/unofficial/locales/en-US/brand.dtd.orig	2011-01-22 00:24:21.000000000 +0000
+--- browser/branding/unofficial/locales/en-US/brand.dtd.orig	2011-04-14 05:28:21.000000000 +0000
 +++ browser/branding/unofficial/locales/en-US/brand.dtd
 @@ -1,4 +1,4 @@
--<!ENTITY  brandShortName        "Mozilla Developer Preview">
--<!ENTITY  brandFullName         "Mozilla Developer Preview">
+-<!ENTITY  brandShortName        "Tumucumaque">
+-<!ENTITY  brandFullName         "Tumucumaque">
 +<!ENTITY  brandShortName        "Browser">
 +<!ENTITY  brandFullName         "Browser">
  <!ENTITY  vendorShortName       "mozilla.org">