Update to firefox3-3.0.12.

Security and bugfix release, patches the following advisories:
MFSA 2009-40 Multiple cross origin wrapper bypasses
MFSA 2009-39 setTimeout loses XPCNativeWrappers
MFSA 2009-37 Crash and remote code execution using watch and __defineSetter__
             on SVG element
MFSA 2009-36 Heap/integer overflows in font glyph rendering libraries
MFSA 2009-35 Crash and remote code execution during Flash player unloading
MFSA 2009-34 Crashes with evidence of memory corruption (rv:1.9.1/1.9.0.12)

5 files changed, 29 insertions, 104 deletions

diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile
index 20f810af253..94a66db8c0f 100644
--- a/www/firefox3/Makefile
+++ b/www/firefox3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/06/12 10:08:28 tron Exp $
+# $NetBSD: Makefile,v 1.34 2009/07/27 12:56:00 tnn Exp $
 
 MOZILLA=		firefox3	# allow coexisting with firefox2
 COMMENT=		Web browser with support for extensions
@@ -18,7 +18,7 @@ BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.6.4
 .include "../../www/firefox/Makefile-firefox.common"
 
 MAINTAINER=		tnn@NetBSD.org
-MOZ_VER=		3.0.11
+MOZ_VER=		3.0.12
 
 XPTCFILES:=		${XPTCFILES:C,^,../../firefox3/files/,}
 DESCR_SRC=		${.CURDIR}/../../www/firefox/DESCR
diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo
index fba9dba5574..de5393989ce 100644
--- a/www/firefox3/distinfo
+++ b/www/firefox3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2009/06/12 10:08:28 tron Exp $
+$NetBSD: distinfo,v 1.26 2009/07/27 12:56:00 tnn Exp $
 
-SHA1 (firefox-3.0.11-source.tar.bz2) = ca792dcdb67af40c91a4fcece25d6adfb6fef2c3
-RMD160 (firefox-3.0.11-source.tar.bz2) = d07a97e0a309bb7a872ba256bc270ee47b2c938b
-Size (firefox-3.0.11-source.tar.bz2) = 37214869 bytes
+SHA1 (firefox-3.0.12-source.tar.bz2) = 0feeebe3ce71dccbf9973509cdb51dd08124f14c
+RMD160 (firefox-3.0.12-source.tar.bz2) = 06ec980e680359067fcedbab363b96d087606d88
+Size (firefox-3.0.12-source.tar.bz2) = 37238703 bytes
 SHA1 (patch-aa) = f995b5e53fa11ecb659ab2dd10551db1c71cc5f3
 SHA1 (patch-ab) = 4a1704e96b74c76adca615fdf2c9069ca17e9d70
 SHA1 (patch-ac) = af80f061bdd918a61197c9c499e7d1f5b7d10ebd
@@ -10,10 +10,10 @@ SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
 SHA1 (patch-ap) = 552694ac2d6ca713aec98ec394f1215c048c2392
 SHA1 (patch-ax) = cbfe7a6392d5d2fefff123679ba1c056b1cc0aa9
-SHA1 (patch-ba) = 3bd713cf2edcc61f489cea8269ca60e27c26f1d9
-SHA1 (patch-bb) = c7286542a9fe97ac9819a00c345272efb7e90e9c
+SHA1 (patch-ba) = ea087c405bb8cda70f3320e9b3948528f7a82b0c
+SHA1 (patch-bb) = c0e244974f79179520ad2a9ad85f6b08be0c45e9
 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
-SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
+SHA1 (patch-bo) = 546149e3d80a9e2b0d1bddf32e7ea12fb76d613f
 SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
 SHA1 (patch-br) = 66940666497e82bfb39dcc9381ecd85942ab222c
 SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
diff --git a/www/firefox3/patches/patch-ba b/www/firefox3/patches/patch-ba
index c706f8a9c54..403b6a2e320 100644
--- a/www/firefox3/patches/patch-ba
+++ b/www/firefox3/patches/patch-ba
@@ -1,73 +1,8 @@
-$NetBSD: patch-ba,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
+$NetBSD: patch-ba,v 1.2 2009/07/27 12:56:01 tnn Exp $
 
---- nsprpub/pr/include/md/_netbsd.cfg.orig	2007-11-26 19:17:17.000000000 +0100
+--- nsprpub/pr/include/md/_netbsd.cfg.orig	2008-12-20 07:26:34.000000000 +0100
 +++ nsprpub/pr/include/md/_netbsd.cfg
-@@ -52,7 +52,8 @@
- #define HAVE_LONG_LONG
- #endif
- 
--#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) || \
-+	defined(__ARMEL__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -97,7 +98,53 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define  IS_BIG_ENDIAN 1
-+#define HAVE_LONG_LONG
-+#define  HAVE_ALIGNED_DOUBLES
-+#define  HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8 
-+#define PR_ALIGN_OF_FLOAT   4 
-+#define PR_ALIGN_OF_DOUBLE  8 
-+#define PR_ALIGN_OF_POINTER 8 
-+
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
- 
- #undef IS_LITTLE_ENDIAN
- #define  IS_BIG_ENDIAN 1
-@@ -188,6 +235,55 @@
+@@ -282,6 +282,55 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
diff --git a/www/firefox3/patches/patch-bb b/www/firefox3/patches/patch-bb
index e89f1da51d2..73635f831d4 100644
--- a/www/firefox3/patches/patch-bb
+++ b/www/firefox3/patches/patch-bb
@@ -1,18 +1,9 @@
-$NetBSD: patch-bb,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
+$NetBSD: patch-bb,v 1.2 2009/07/27 12:56:01 tnn Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig	2006-03-31 10:35:02.000000000 +0200
+--- nsprpub/pr/include/md/_netbsd.h.orig	2008-12-20 07:15:23.000000000 +0100
 +++ nsprpub/pr/include/md/_netbsd.h
-@@ -47,6 +47,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__) 
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -98,6 +100,12 @@
- #define _PR_HAVE_GETPROTO_R_INT
+@@ -94,6 +94,12 @@
+ #define _PR_INET6_PROBE
  #endif
  
 +#if __NetBSD_Version__ >= 106370000
@@ -24,7 +15,7 @@ $NetBSD: patch-bb,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
  #define USE_SETJMP
  
  #ifndef _PR_PTHREADS
-@@ -111,6 +119,8 @@
+@@ -107,6 +113,8 @@
  #define JB_SP_INDEX 2
  #elif defined(__mips__)
  #define JB_SP_INDEX 4
diff --git a/www/firefox3/patches/patch-bo b/www/firefox3/patches/patch-bo
index 8cb1e54f1a9..6dba4be7606 100644
--- a/www/firefox3/patches/patch-bo
+++ b/www/firefox3/patches/patch-bo
@@ -1,9 +1,8 @@
-$NetBSD: patch-bo,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
+$NetBSD: patch-bo,v 1.2 2009/07/27 12:56:01 tnn Exp $
 
-diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in	2005-09-16 07:37:52.000000000 +0900
-+++ ./nsprpub/configure.in	2005-12-04 19:17:56.000000000 +0900
-@@ -57,7 +57,7 @@
+--- nsprpub/configure.in.orig	2009-04-07 03:16:58.000000000 +0200
++++ nsprpub/configure.in
+@@ -62,7 +62,7 @@ USE_CPLUS=
  USE_IPV6=
  USE_MDUPDATE=
  _MACOSX_DEPLOYMENT_TARGET=
@@ -12,7 +11,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
-@@ -1045,6 +1045,34 @@
+@@ -1180,6 +1180,34 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -47,15 +46,15 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
      ;;
  
  *-hpux*)
-@@ -1544,6 +1572,7 @@
+@@ -1729,6 +1757,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
 +    AC_DEFINE(HAVE_SOCKLEN_T)
-     USE_NSPR_THREADS=1
-     MDCPUCFG_H=_netbsd.cfg
-     PR_MD_CSRCS=netbsd.c
-@@ -2307,7 +2336,7 @@
+     if test -z "$USE_NSPR_THREADS"; then
+         USE_PTHREADS=1
+     fi
+@@ -2456,7 +2485,7 @@ if test -n "$USE_PTHREADS"; then
  	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  	    ac_cv_have_dash_pthread=yes
  		case "$target_os" in
@@ -64,7 +63,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
  	    *)
-@@ -2345,7 +2374,7 @@
+@@ -2494,7 +2523,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
@@ -73,7 +72,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2426,7 +2455,7 @@
+@@ -2575,7 +2604,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;