Update to thunderbird-3.1.3.

* Several fixes to improve stability.
* Several fixes to the user interface.
* Several security fixes:
MFSA 2010-63 Information leak via XMLHttpRequest statusText
MFSA 2010-62 Copy-and-paste or drag-and-drop into designMode document allows XSS
MFSA 2010-61 UTF-7 XSS by overriding document charset using <object> type
             attribute
MFSA 2010-59 SJOW creates scope chains ending in outer object
MFSA 2010-58 Crash on Mac using fuzzed font in data: URL
MFSA 2010-57 Crash and remote code execution in normalizeDocument
MFSA 2010-56 Dangling pointer vulnerability in nsTreeContentView
MFSA 2010-55 XUL tree removal crash and remote code execution
MFSA 2010-54 Dangling pointer vulnerability in nsTreeSelection
MFSA 2010-53 Heap buffer overflow in nsTextFrameUtils::TransformText
MFSA 2010-52 Windows XP DLL loading vulnerability
MFSA 2010-51 Dangling pointer vulnerability using DOM plugin array
MFSA 2010-50 Frameset integer overflow vulnerability
MFSA 2010-49 Miscellaneous memory safety hazards (rv:1.9.2.9/ 1.9.1.12)

9 files changed, 62 insertions, 66 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 19e85b82a29..1d79751bcfe 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2010/07/21 19:53:54 tnn Exp $
+# $NetBSD: Makefile,v 1.58 2010/09/09 10:58:50 tnn Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		3.1.1
+TB_VER=		3.1.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index b62bb9ace45..20d465365af 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.73 2010/07/23 06:04:33 tnn Exp $
+$NetBSD: distinfo,v 1.74 2010/09/09 10:58:50 tnn Exp $
 
 SHA1 (enigmail-1.1.2.tar.gz) = d29fce2b20a36d210b12c28fcbbee965007c95aa
 RMD160 (enigmail-1.1.2.tar.gz) = 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7
 Size (enigmail-1.1.2.tar.gz) = 1280923 bytes
-SHA1 (thunderbird-3.1.1.source.tar.bz2) = 8e25fd786fbe094c3f4d9bc4e18285701bd42279
-RMD160 (thunderbird-3.1.1.source.tar.bz2) = f7c635610eace54a29601a796f8f5e34bc7d198e
-Size (thunderbird-3.1.1.source.tar.bz2) = 65820406 bytes
+SHA1 (thunderbird-3.1.3.source.tar.bz2) = 7db61ceb804ba766b33babf92738b4e56ff6342a
+RMD160 (thunderbird-3.1.3.source.tar.bz2) = 293f897303b0764650f41d6dcecd3620d2262a0b
+Size (thunderbird-3.1.3.source.tar.bz2) = 65759283 bytes
 SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
 SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094
 SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd
@@ -13,16 +13,16 @@ SHA1 (patch-ac) = e181323e153ee061b7f3644b599294a4c4a3e3e8
 SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
 SHA1 (patch-ae) = cf4cb737fc29ef7ac6ffe1b3bc504743441e4828
 SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7
-SHA1 (patch-ag) = 7f8c3ac1bec475dd2b6fd6e10e5304ab9c112a67
+SHA1 (patch-ag) = 22cca24b67c85fbf9bafb35441dfcb460ecde6bf
 SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235
 SHA1 (patch-ai) = 4d701ece9a2aaa0b640c189745fa7e731617fb7c
 SHA1 (patch-aj) = ff95a4c7ff92d15b40489240286dfff371b226e0
 SHA1 (patch-ak) = af8ee30ac512bfa99e53e64b08d475d10d4d2447
-SHA1 (patch-al) = 893eb0c096f61b52a6299eff1e5ab520014fbda4
+SHA1 (patch-al) = cab965f3bc11cacd83c1d0f56195f7f6d4580e80
 SHA1 (patch-am) = 81bcda476a7b54050ed1ae87bd47cf9de8f19919
 SHA1 (patch-an) = e30362e1a07c6c8e96dc81d134517685c3f19ca9
 SHA1 (patch-ao) = 42c268711a8bb24c3bde3c5bf74bb5a9f73ff21a
-SHA1 (patch-ap) = 78d9944ba37b3d90d0ab9e91fc831949e54ef2ad
+SHA1 (patch-ap) = 3397db3184919afa73767c8c68c6c75c4a0ba33a
 SHA1 (patch-aq) = ac5cd0e83f0c166fae6b033ad960d7820bb7add6
 SHA1 (patch-ar) = dab688f86340bccb80db5531f4e36cb8f50254e4
 SHA1 (patch-as) = 7e283a79231909ab5fb60740b5e36c8c0744e025
@@ -35,7 +35,7 @@ SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
 SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
 SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
 SHA1 (patch-bb) = 7cb648a5f20b3b61a24494e502bd49b535bb8055
-SHA1 (patch-be) = 654ca74f4ec23bfef147c6f0f852ae6de046bc9e
+SHA1 (patch-be) = 2aa2489137e357e05f3f3a9689895b3759e3e52d
 SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3
 SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c
 SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36
@@ -44,7 +44,7 @@ SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575f
 SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986
 SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31
 SHA1 (patch-mb) = c27a2a8891bd5215fef9b920baa87499424d278f
-SHA1 (patch-mc) = 3050ce0f99c6a1cbb45dfa3a2b110ced8fb1edab
+SHA1 (patch-mc) = b16bd1a88bafe14c7d9ff00e9623b6a346eb043a
 SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
 SHA1 (patch-me) = 775262c00ac16ea78a11ede5678e3d08f97c9640
 SHA1 (patch-mf) = 9aa245b2704df3b2009a8dee0e8217cbd20df9d0
@@ -54,8 +54,8 @@ SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
 SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b
 SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b
 SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68
-SHA1 (patch-mm) = 04d9105ab0fb520690b58230e90bf6217b439df7
-SHA1 (patch-mn) = beb92ccc59f909f0d4f5f5bb62ad834b55fc94ce
+SHA1 (patch-mm) = 1ef13fbf0872484778cb8edfff769214ea9a39a4
+SHA1 (patch-mn) = 3a1c25a3f5a1532331424fc1e720f35cd0ed5d5b
 SHA1 (patch-mp) = 24bac4975548f0a058c2770865706fedb27aa0e6
 SHA1 (patch-nd) = 007b8d1310990253e86dab579397b02ced42cb71
 SHA1 (patch-pa) = 6201d005501d1912bbac16c2856dc8d22b50f017
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index ebf812798b7..871e5da4075 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.7 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-ag,v 1.8 2010/09/09 10:58:51 tnn Exp $
 
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2009-06-29 18:15:06.000000000 +0200
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2010-08-24 21:32:07.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_freebsd.h
 @@ -79,7 +79,7 @@
- #define _PR_NO_LARGE_FILES
+ #define _PR_HAVE_LARGE_OFF_T
  
  #if defined(_PR_PTHREADS)
 -#if __FreeBSD_version >= 400008
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
index bf0143e23e5..d7622931985 100644
--- a/mail/thunderbird/patches/patch-al
+++ b/mail/thunderbird/patches/patch-al
@@ -1,27 +1,16 @@
-$NetBSD: patch-al,v 1.6 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-al,v 1.7 2010/09/09 10:58:51 tnn Exp $
 
-# Reported upstream as https://bugzilla.mozilla.org/show_bug.cgi?id=471179
-
---- mozilla/nsprpub/pr/src/misc/prsystem.c.orig	2009-06-29 18:15:07.000000000 +0200
-+++ mozilla/nsprpub/pr/src/misc/prsystem.c
-@@ -284,6 +284,20 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMem
-     long pageCount = sysconf(_SC_PHYS_PAGES);
-     bytes = (PRUint64) pageSize * pageCount;
+--- mozilla/storage/src/mozStorageConnection.cpp.orig	2010-08-24 21:32:09.000000000 +0000
++++ mozilla/storage/src/mozStorageConnection.cpp
+@@ -405,6 +405,11 @@ Connection::initialize(nsIFile *aDatabas
+       break;
+   }
  
-+#elif defined(NETBSD)
-+
-+    int mib[2];
-+    int rc;
-+    uint64_t memSize;
-+    size_t len = sizeof(memSize);
-+
-+    mib[0] = CTL_HW;
-+    mib[1] = HW_PHYSMEM64;
-+    rc = sysctl( mib, 2, &memSize, &len, NULL, 0 );
-+    if ( -1 != rc )  {
-+        bytes = memSize;
-+    }
++  // XXX tnn: the configure script demands that sqlite3 is compiled with
++  // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that,
++  // so instead we enable secure_delete manually here.
++  (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;"));
 +
- #elif defined(HPUX)
+   return NS_OK;
+ }
  
-     struct pst_static info;
diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap
index e65df785b61..53c024236a0 100644
--- a/mail/thunderbird/patches/patch-ap
+++ b/mail/thunderbird/patches/patch-ap
@@ -1,13 +1,13 @@
-$NetBSD: patch-ap,v 1.8 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-ap,v 1.9 2010/09/09 10:58:51 tnn Exp $
 
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-08-24 17:52:50.000000000 +0200
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2010-08-24 21:32:05.000000000 +0000
 +++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h
 @@ -59,7 +59,7 @@
  
  #include <sys/types.h>
  
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) ||  defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
  typedef off_t oggz_off_t;
  #else
  typedef loff_t oggz_off_t;
diff --git a/mail/thunderbird/patches/patch-be b/mail/thunderbird/patches/patch-be
index 2a066e56557..a57adc46fcc 100644
--- a/mail/thunderbird/patches/patch-be
+++ b/mail/thunderbird/patches/patch-be
@@ -1,11 +1,11 @@
-$NetBSD: patch-be,v 1.1 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-be,v 1.2 2010/09/09 10:58:51 tnn Exp $
 
 Disable all sound support for now since it causes
 crashes and doesn't work correctly anyway ...
 
---- mozilla/widget/src/gtk2/nsSound.cpp.orig	2010-03-15 14:56:04.000000000 +0000
+--- mozilla/widget/src/gtk2/nsSound.cpp.orig	2010-08-25 14:28:44.000000000 +0000
 +++ mozilla/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/mail/thunderbird/patches/patch-mc b/mail/thunderbird/patches/patch-mc
index f614f37ce51..fcdebbed0da 100644
--- a/mail/thunderbird/patches/patch-mc
+++ b/mail/thunderbird/patches/patch-mc
@@ -1,12 +1,12 @@
-$NetBSD: patch-mc,v 1.1 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-mc,v 1.2 2010/09/09 10:58:51 tnn Exp $
 
 Avoid extra file appearing in PLIST on Linux.
 
---- mozilla/security/nss/lib/freebl/manifest.mn.orig	2010-04-13 22:22:54.000000000 +0000
-+++ mozilla/security/nss/lib/freebl/manifest.mn
-@@ -72,7 +72,7 @@ endif
+--- mozilla/security/nss/lib/freebl/config.mk.orig	2010-08-24 21:32:09.000000000 +0000
++++ mozilla/security/nss/lib/freebl/config.mk
+@@ -68,7 +68,7 @@ else
  
- ifdef FREEBL_NO_DEPEND
+ ifeq ($(FREEBL_NO_DEPEND),1)
  LOWHASH_SRCS = stubs.c nsslowhash.c
 -LOWHASH_EXPORTS = nsslowhash.h
 +#LOWHASH_EXPORTS = nsslowhash.h
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index f13254d83d3..ebd6fb77a84 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,11 +1,11 @@
-$NetBSD: patch-mm,v 1.2 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-mm,v 1.3 2010/09/09 10:58:51 tnn Exp $
 
 Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman.
 part of PR pkg/39085
 
---- mozilla/toolkit/library/Makefile.in.orig	2009-12-02 05:28:58.000000000 +0100
+--- mozilla/toolkit/library/Makefile.in.orig	2010-08-24 21:32:11.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -252,7 +252,14 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
+@@ -253,7 +253,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
  endif
  
  ifeq ($(OS_ARCH),SunOS)
@@ -14,10 +14,17 @@ part of PR pkg/39085
 +ifndef GNU_CC
 +EXTRA_DSO_LDOPTS += -lCstd
 +endif
-+endif
-+
-+ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -lossaudio
  endif
  
+ ifeq ($(OS_ARCH),AIX)
+@@ -262,6 +265,10 @@ EXTRA_DSO_LDOPTS += -bbigtoc 
+ endif
+ endif
+ 
++ifeq ($(OS_ARCH),NetBSD)
++EXTRA_DSO_LDOPTS += -lossaudio
++endif
++
  ifeq ($(OS_ARCH),WINNT)
+ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32)
+ ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
diff --git a/mail/thunderbird/patches/patch-mn b/mail/thunderbird/patches/patch-mn
index d14b610d4ab..0235a0c0920 100644
--- a/mail/thunderbird/patches/patch-mn
+++ b/mail/thunderbird/patches/patch-mn
@@ -1,15 +1,15 @@
-$NetBSD: patch-mn,v 1.2 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-mn,v 1.3 2010/09/09 10:58:51 tnn Exp $
 
 Make sure we link correctly with sqlite3 from pkgsrc.
 
---- mozilla/security/nss/lib/softoken/config.mk.orig	2009-10-16 17:14:19.000000000 +0200
+--- mozilla/security/nss/lib/softoken/config.mk.orig	2010-08-24 21:32:09.000000000 +0000
 +++ mozilla/security/nss/lib/softoken/config.mk
-@@ -83,7 +83,7 @@ EXTRA_SHARED_LIBS += \
+@@ -80,7 +80,7 @@ else
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
+-	-l$(SQLITE_LIB_NAME) \
++	`pkg-config --libs sqlite3` \
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
--	-lsqlite3 \
-+	`pkg-config --libs sqlite3` \
  	-L$(NSPR_LIB_DIR) \
- 	-lplc4 \
- 	-lplds4 \