Pullup #3381, requested by tnn

firefox-3.6.15 update and prerequisite commits.

pkgsrc/www/firefox/Makefile		1.82, 1.83
pkgsrc/devel/xulrunner/Makefile		1.46, 1.47, 1.48
pkgsrc/devel/xulrunner/dist.mk		1.18
pkgsrc/devel/xulrunner/distinfo		1.40
pkgsrc/devel/xulrunner/patches/patch-mm	1.4

   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Jan 13 13:40:12 UTC 2011

   Modified Files:
	   pkgsrc/www/firefox: Makefile

   Log Message:
   png shlib name changed for png>=1.5.0, so bump PKGREVISIONs.

   ---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Jan 13 13:53:34 UTC 2011

   Modified Files:
	   pkgsrc/devel/xulrunner: Makefile

   Log Message:
   png shlib name changed for png>=1.5.0, so bump PKGREVISIONs.

   ---
   Module Name:	pkgsrc
   Committed By:	markd
   Date:		Sun Jan 23 11:18:27 UTC 2011

   Modified Files:
	   pkgsrc/devel/xulrunner: Makefile

   Log Message:
   set FREEBL_NO_DEPEND=0 in MAKE_ENV otherwise Linux2.6 defaults to
   FREEBL_NO_DEPEND=1 and files not in PLIST are installed.
   OKed by tnn.

   ---
   Module Name:	pkgsrc
   Committed By:	tnn
   Date:		Sat Mar  5 11:57:17 UTC 2011

   Modified Files:
	   pkgsrc/devel/xulrunner: Makefile dist.mk distinfo
	   pkgsrc/devel/xulrunner/patches: patch-mm
	   pkgsrc/www/firefox: Makefile

   Log Message:
   Stability & security update of firefox to 3.6.15.

   MFSA 2011-10 CSRF risk with plugins and 307 redirects
   MFSA 2011-09 Crash caused by corrupted JPEG image
   MFSA 2011-08 ParanoidFragmentSink allows javascript: URLs in chrome documents
   MFSA 2011-07 Memory corruption during text run construction (Windows)
   MFSA 2011-06 Use-after-free error using Web Workers
   MFSA 2011-05 Buffer overflow in JavaScript atom map
   MFSA 2011-04 Buffer overflow in JavaScript upvarMap
   MFSA 2011-03 Use-after-free error in JSON.stringify
   MFSA 2011-02 Recursive eval call causes confirm dialogs to evaluate to true
   MFSA 2011-01 Miscellaneous memory safety hazards (rv:1.9.2.14/ 1.9.1.17)

6 files changed, 18 insertions, 14 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 122f56d6fa5..632fae4fcea 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2010/12/11 14:46:29 tnn Exp $
+# $NetBSD: Makefile,v 1.45.2.1 2011/03/06 16:39:38 schnoebe Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
@@ -25,6 +25,8 @@ CONFIGURE_ARGS+=	--enable-libxul
 
 ALL_ENV+=		MOZILLA_PKG_NAME=xulrunner
 
+MAKE_ENV+=		FREEBL_NO_DEPEND=0
+
 .include "mozilla-common.mk"
 .include "options.mk"
 
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index 5b235d73d90..d26a4183072 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.17 2010/12/11 14:46:29 tnn Exp $
+# $NetBSD: dist.mk,v 1.17.2.1 2011/03/06 16:39:38 schnoebe Exp $
 #
 # used by devel/nspr/Makefile
 # used by devel/nss/Makefile
@@ -8,7 +8,7 @@
 DISTNAME=	firefox-${FIREFOX_VER}.source
 FIREFOX_VER=	3.6${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	1.9.2
-MOZ_BRANCH_MINOR=	.13
+MOZ_BRANCH_MINOR=	.15
 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 55bd127d304..fa283226217 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2010/12/11 14:46:29 tnn Exp $
+$NetBSD: distinfo,v 1.39.2.1 2011/03/06 16:39:38 schnoebe Exp $
 
-SHA1 (firefox-3.6.13.source.tar.bz2) = 1d1bc70d651bce4006687f5762638563c0494267
-RMD160 (firefox-3.6.13.source.tar.bz2) = 658409db60a8f412ac74ff15a8c1d8c4ed85b71e
-Size (firefox-3.6.13.source.tar.bz2) = 51478675 bytes
+SHA1 (firefox-3.6.15.source.tar.bz2) = bfb69ae49b2def7482543d4d982fa58993a458e9
+RMD160 (firefox-3.6.15.source.tar.bz2) = faa15978cc8e492833130910c243a585ff78ee3f
+Size (firefox-3.6.15.source.tar.bz2) = 51552828 bytes
 SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
@@ -45,7 +45,7 @@ SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
 SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
 SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
-SHA1 (patch-mm) = 8e70a87f8c609f504f6d2fa9bfbc91dfbcd289a8
+SHA1 (patch-mm) = 8db6fbb1197147978bce1de5c9b8017ed940efd1
 SHA1 (patch-mn) = e7e5e615ca26f7cee0fb27b796fd3d423d693f6b
 SHA1 (patch-mp) = 34bf95224cdecedd93566f9405f725b0c9b5ee0f
 SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index 20e25c64444..c57b71e7a41 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,11 +1,11 @@
-$NetBSD: patch-mm,v 1.3 2010/09/09 09:41:22 tnn Exp $
+$NetBSD: patch-mm,v 1.3.4.1 2011/03/06 16:39:38 schnoebe Exp $
 
 Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman.
 part of PR pkg/39085
 
---- toolkit/library/Makefile.in.orig	2010-08-24 21:32:11.000000000 +0000
+--- toolkit/library/Makefile.in.orig	2011-02-18 18:33:39.000000000 +0000
 +++ toolkit/library/Makefile.in
-@@ -253,7 +253,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
+@@ -253,13 +253,20 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
  endif
  
  ifeq ($(OS_ARCH),SunOS)
@@ -17,8 +17,7 @@ part of PR pkg/39085
  endif
  
  ifeq ($(OS_ARCH),AIX)
-@@ -262,6 +265,10 @@ EXTRA_DSO_LDOPTS += -bbigtoc 
- endif
+ EXTRA_DSO_LDOPTS += -bbigtoc 
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
diff --git a/doc/CHANGES-pkgsrc-2010Q4 b/doc/CHANGES-pkgsrc-2010Q4
index 7367be294e6..01b3123f02c 100644
--- a/doc/CHANGES-pkgsrc-2010Q4
+++ b/doc/CHANGES-pkgsrc-2010Q4
@@ -225,3 +225,6 @@ Pullup ticket #3382 - requested by tnn
 www/seamonkey: security fixes.
 Pullup ticket #3380 - requested by gls
 chat/cgiirc: security update
+Pullup ticket #3381 -- requested by tnn
+www/firefox: dependency update
+devel/xulrunner: security fixes
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 65d23dd8f24..3d1dd69a7c3 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2010/12/29 22:38:49 tnn Exp $
+# $NetBSD: Makefile,v 1.81.2.1 2011/03/06 16:39:38 schnoebe Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	firefox-${FIREFOX_VER}