Pullup ticket #3301 - requested by tnn

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

Revisions pulled up:
- devel/xulrunner/Makefile			1.43,1.45
- devel/xulrunner/PLIST				1.25-1.26
- devel/xulrunner/dist.mk			1.17
- devel/xulrunner/distinfo			1.39
- devel/xulrunner/mozilla-common.mk		1.17-1.18
- devel/xulrunner/patches/patch-pe		delete
- www/firefox/Makefile				1.78,1.80
---
Module Name:	pkgsrc
Committed By:	joerg
Date:		Wed Nov  3 01:22:36 UTC 2010

Modified Files:
	pkgsrc/devel/xulrunner: mozilla-common.mk

Log Message:
Requires sqlite3 3.7.1 now. Reported by cegger.
---
Module Name:	pkgsrc
Committed By:	tnn
Date:		Sat Nov 13 11:54:44 UTC 2010

Modified Files:
	pkgsrc/devel/xulrunner: Makefile PLIST mozilla-common.mk
	pkgsrc/mail/thunderbird: Makefile
	pkgsrc/www/firefox: Makefile
	pkgsrc/www/seamonkey: Makefile

Log Message:
Reluctantly switch over to bundled cairo and pixman for mozilla
packages, like other distros have recently done. Bump package revisions.

Background:
The cairo-1.10 update caused multiple regressions in firefox, such as
flickering gif animations and crashes.
Mozilla doesn't seem interested in fixing it on the stable branches:
  https://bugzilla.mozilla.org/show_bug.cgi?id=610107
Other references:
  https://bugzilla.redhat.com/show_bug.cgi?id=628331
  http://bugs.gentoo.org/show_bug.cgi?id=337813
  https://bugzilla.mozilla.org/show_bug.cgi?id=597174

This workaround is guaranteed to cause other problems in the long run;
so we should attempt to switch back when we move to the mozilla-2.0
branch.
---
odule Name:	pkgsrc
Committed By:	tnn
Date:		Sat Dec 11 14:46:29 UTC 2010

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

Log Message:
Update to firefox-3.6.13.

MFSA 2010-84 XSS hazard in multiple character encodings
MFSA 2010-83 Location bar SSL spoofing using network error page
MFSA 2010-82 Incomplete fix for CVE-2010-0179
MFSA 2010-81 Integer overflow vulnerability in NewIdArray
MFSA 2010-80 Use-after-free error with nsDOMAttribute MutationObserver
MFSA 2010-79 Java security bypass from LiveConnect loaded via data: URL
             meta refresh
MFSA 2010-78 Add support for OTS font sanitizer
MFSA 2010-77 Crash and remote code execution using HTML tags inside a XUL tree
MFSA 2010-76 Chrome privilege escalation with window.open and <isindex> element
MFSA 2010-75 Buffer overflow while line breaking after document.write with
             long string
MFSA 2010-74 Miscellaneous memory safety hazards (rv:1.9.2.13/ 1.9.1.16)

5 files changed, 27 insertions, 22 deletions

diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index 7c2b07806dd..723b31dc325 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2010/09/09 09:41:21 tnn Exp $
+@comment $NetBSD: PLIST,v 1.24.2.1 2010/12/14 10:44:04 tron Exp $
 bin/xulrunner
 ${PLIST.jit}include/xulrunner/Allocator.h
 ${PLIST.jit}include/xulrunner/Assembler.h
@@ -17,6 +17,17 @@ include/xulrunner/XPCIDispatch.h
 ${PLIST.jit}include/xulrunner/avmplus.h
 include/xulrunner/base64.h
 include/xulrunner/blapit.h
+include/xulrunner/cairo/cairo-deprecated.h
+include/xulrunner/cairo/cairo-features.h
+include/xulrunner/cairo/cairo-ft.h
+include/xulrunner/cairo/cairo-pdf.h
+include/xulrunner/cairo/cairo-platform.h
+include/xulrunner/cairo/cairo-ps.h
+include/xulrunner/cairo/cairo-rename.h
+include/xulrunner/cairo/cairo-version.h
+include/xulrunner/cairo/cairo-xlib-xrender.h
+include/xulrunner/cairo/cairo-xlib.h
+include/xulrunner/cairo/cairo.h
 include/xulrunner/cert.h
 include/xulrunner/certdb.h
 include/xulrunner/certt.h
@@ -229,6 +240,7 @@ include/xulrunner/mozilla/CondVar.h
 include/xulrunner/mozilla/DeadlockDetector.h
 include/xulrunner/mozilla/Monitor.h
 include/xulrunner/mozilla/Mutex.h
+include/xulrunner/mozilla/PaintTracker.h
 include/xulrunner/mozilla/PluginLibrary.h
 include/xulrunner/mozilla/PluginPRLibrary.h
 include/xulrunner/mozilla/TimeStamp.h
@@ -1228,6 +1240,7 @@ include/xulrunner/nsIMultiplexInputStream.h
 include/xulrunner/nsIMutable.h
 include/xulrunner/nsIMutableArray.h
 include/xulrunner/nsIMutationObserver.h
+include/xulrunner/nsIMutationObserver2.h
 include/xulrunner/nsINIParser.h
 include/xulrunner/nsINSSCertCache.h
 include/xulrunner/nsINSSErrorsService.h
@@ -2043,9 +2056,13 @@ include/xulrunner/oggz/oggz_seek.h
 include/xulrunner/oggz/oggz_stream.h
 include/xulrunner/oggz/oggz_table.h
 include/xulrunner/oggz/oggz_write.h
+include/xulrunner/opentype-sanitiser.h
+include/xulrunner/ots-memory-stream.h
 include/xulrunner/p12.h
 include/xulrunner/p12plcy.h
 include/xulrunner/p12t.h
+include/xulrunner/pixman-version.h
+include/xulrunner/pixman.h
 include/xulrunner/pk11func.h
 include/xulrunner/pk11pqg.h
 include/xulrunner/pk11priv.h
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index c83028070d5..ef8f77d8495 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.14.2.2 2010/10/29 20:23:37 spz Exp $
+# $NetBSD: dist.mk,v 1.14.2.3 2010/12/14 10:44:04 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=	.12
+MOZ_BRANCH_MINOR=	.13
 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 6ceca0a4a7e..f68098a3ed8 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36.2.2 2010/10/29 20:23:37 spz Exp $
+$NetBSD: distinfo,v 1.36.2.3 2010/12/14 10:44:04 tron Exp $
 
-SHA1 (firefox-3.6.12.source.tar.bz2) = 1cc3885687dd5ad21167d9d45f76eb1458f46bdd
-RMD160 (firefox-3.6.12.source.tar.bz2) = 196e32a4cd9c6725e115aabcf320d7d8df5bca6e
-Size (firefox-3.6.12.source.tar.bz2) = 51423668 bytes
+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 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
@@ -53,7 +53,6 @@ SHA1 (patch-pa) = 7dffaba78ee254a545c3f7669a3eb2a92196becc
 SHA1 (patch-pb) = 9450fe31653c225d529a6ec4d551d0cda464965d
 SHA1 (patch-pc) = 45a680a5a9f0794f9dd0f6f4dcd7ce704780e939
 SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0
-SHA1 (patch-pe) = a1af6070fca2e22bd4ec4a1f5ac06ef60adc26cf
 SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea
 SHA1 (patch-ra) = 7dc1ead2756ac8eb9e900dab60f785468df013be
 SHA1 (patch-rc) = 9f2e63689123ecbc1767e58e6f5608046dceab1a
diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk
index 7a617a2a1c5..fc5475112cc 100644
--- a/devel/xulrunner/mozilla-common.mk
+++ b/devel/xulrunner/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.16 2010/09/09 09:41:21 tnn Exp $
+# $NetBSD: mozilla-common.mk,v 1.16.2.1 2010/12/14 10:44:04 tron Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 1.9.1.
 # 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--enable-optimize=-O2 --with-pthreads
 CONFIGURE_ARGS+=	--disable-javaxpcom
 CONFIGURE_ARGS+=	--enable-default-toolkit=cairo-gtk2
 CONFIGURE_ARGS+=	--enable-svg --enable-mathml
-CONFIGURE_ARGS+=	--enable-system-cairo
+CONFIGURE_ARGS+=	--disable-system-cairo
 CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-zlib --with-system-bz2
 CONFIGURE_ARGS+=	--enable-system-sqlite
@@ -84,7 +84,7 @@ PREFER.bzip2?=	pkgsrc
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.6.22
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.1
 CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/xulrunner/patches/patch-pe b/devel/xulrunner/patches/patch-pe
deleted file mode 100644
index aea9e75e1e3..00000000000
--- a/devel/xulrunner/patches/patch-pe
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-pe,v 1.2 2010/03/16 15:57:02 tnn Exp $
-
---- xulrunner/installer/mozilla-plugin.pc.in.orig	2009-12-04 21:19:58.000000000 +0000
-+++ xulrunner/installer/mozilla-plugin.pc.in
-@@ -5,5 +5,5 @@ includedir=%includedir%
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
- Version: %MOZILLA_VERSION%
--Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
-+Cflags: -I${includedir} -DXP_UNIX %ojidef%
-