Pullup ticket #3255 - requested by tnn

devel/xulrunner: security update
www/firefox: security update

Revisions pulled up:
- devel/xulrunner/Makefile			1.42
- devel/xulrunner/dist.mk			1.15
- devel/xulrunner/distinfo			1.37
- devel/xulrunner/patches/patch-be		1.2
- devel/xulrunner/patches/patch-mc		delete
- www/firefox/Makefile				1.77
---
Module Name:	pkgsrc
Committed By:	tnn
Date:		Thu Oct 21 10:27:21 UTC 2010

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

Log Message:
Security & stability update to firefox-3.6.11 (xulrunner-1.9.2.11)

MFSA 2010-72 Insecure Diffie-Hellman key exchange
MFSA 2010-71 Unsafe library loading vulnerabilities
MFSA 2010-70 SSL wildcard certificate matching IP addresses
MFSA 2010-69 Cross-site information disclosure via modal calls
MFSA 2010-68 XSS in gopher parser when parsing hrefs
MFSA 2010-67 Dangling pointer vulnerability in LookupGetterOrSetter
MFSA 2010-66 Use-after-free error in nsBarProp
MFSA 2010-65 Buffer overflow and memory corruption using document.write
MFSA 2010-64 Miscellaneous memory safety hazards (rv:1.9.2.11/ 1.9.1.14)

6 files changed, 13 insertions, 31 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 455087f8acc..6f6db09155d 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2010/09/14 11:13:10 wiz Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2010/10/25 08:23:42 tron Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index bf0ca603746..823eb3f248f 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.14 2010/09/09 09:41:21 tnn Exp $
+# $NetBSD: dist.mk,v 1.14.2.1 2010/10/25 08:23:42 tron 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=	.9
+MOZ_BRANCH_MINOR=	.11
 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 084fe115572..44875703fef 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2010/09/09 09:41:21 tnn Exp $
+$NetBSD: distinfo,v 1.36.2.1 2010/10/25 08:23:42 tron Exp $
 
-SHA1 (firefox-3.6.9.source.tar.bz2) = 2429154c8d50bb5eeef80233b56fb26dcf727ea3
-RMD160 (firefox-3.6.9.source.tar.bz2) = 530b1d64cc02ba0433c3a39d1c97c569dad090ef
-Size (firefox-3.6.9.source.tar.bz2) = 51240588 bytes
+SHA1 (firefox-3.6.11.source.tar.bz2) = d5443a07243a771fb4c69c08cd6a0f5320a888c4
+RMD160 (firefox-3.6.11.source.tar.bz2) = 25f327d3cc32fa14792325b4f120cf308a37e659
+Size (firefox-3.6.11.source.tar.bz2) = 51423291 bytes
 SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
@@ -31,12 +31,11 @@ SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34
 SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
 SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
 SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527
-SHA1 (patch-be) = cad5bc4ac3e83b6e098edfbf0aadc845d97a6032
+SHA1 (patch-be) = 30d3285a10f62c7302b2c2809b1ab06bce0d3316
 SHA1 (patch-bf) = 6295d27762eb91162c00362306acbd47eeda61ac
 SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90
 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
 SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905
-SHA1 (patch-mc) = 8e1a0dd83563f467028a51deb898141fb79d3ffe
 SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
 SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
 SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
diff --git a/devel/xulrunner/patches/patch-be b/devel/xulrunner/patches/patch-be
index 0d269127efd..1bf2854842b 100644
--- a/devel/xulrunner/patches/patch-be
+++ b/devel/xulrunner/patches/patch-be
@@ -1,11 +1,11 @@
-$NetBSD: patch-be,v 1.1 2010/03/23 12:43:38 tnn Exp $
+$NetBSD: patch-be,v 1.1.6.1 2010/10/25 08:23:42 tron Exp $
 
 Disable all sound support for now since it causes
 crashes and doesn't work correctly anyway ...
 
---- widget/src/gtk2/nsSound.cpp.orig	2010-03-15 14:56:04.000000000 +0000
+--- widget/src/gtk2/nsSound.cpp.orig	2010-10-12 17:46:08.000000000 +0000
 +++ widget/src/gtk2/nsSound.cpp
-@@ -149,6 +149,8 @@ nsSound::Init()
+@@ -138,6 +138,8 @@ nsSound::Init()
  
      mInited = PR_TRUE;
  
@@ -13,4 +13,4 @@ crashes and doesn't work correctly anyway ...
 +
      if (!elib) {
          elib = PR_LoadLibrary("libesd.so.0");
-         if (elib) {
+     }
diff --git a/devel/xulrunner/patches/patch-mc b/devel/xulrunner/patches/patch-mc
deleted file mode 100644
index 42fffcef52b..00000000000
--- a/devel/xulrunner/patches/patch-mc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mc,v 1.2 2010/09/09 09:41:22 tnn Exp $
-
-Avoid extra file appearing in PLIST on Linux.
-
---- security/nss/lib/freebl/config.mk.orig	2010-08-24 21:32:09.000000000 +0000
-+++ security/nss/lib/freebl/config.mk
-@@ -68,7 +68,7 @@ else
- 
- ifeq ($(FREEBL_NO_DEPEND),1)
- LOWHASH_SRCS = stubs.c nsslowhash.c
--LOWHASH_EXPORTS = nsslowhash.h
-+#LOWHASH_EXPORTS = nsslowhash.h
- MAPFILE_SOURCE = freebl_hash.def
- else
- MAPFILE_SOURCE = freebl.def
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 733692ef2a8..9b18da1e9d6 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2010/09/14 11:02:55 wiz Exp $
+# $NetBSD: Makefile,v 1.76.2.1 2010/10/25 08:23:42 tron Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	firefox-${FIREFOX_VER}
-PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	tnn@NetBSD.org