Update to thunderbird-3.1.1.

(Since pkgsrc-2010Q2 has the 3.0 branch of thunderbird I will send a
separate diff to releng for the 3.0.6 security update.)

MFSA 2010-47 Cross-origin data leakage from script filename in error messages
MFSA 2010-46 Cross-domain data theft using CSS
MFSA 2010-44 Characters mapped to U+FFFD in 8 bit encodings cause subsequent
             character to vanish
MFSA 2010-43 Same-origin bypass using canvas context
MFSA 2010-42 Cross-origin data disclosure via Web Workers and importScripts
MFSA 2010-41 Remote code execution using malformed PNG image
MFSA 2010-40 nsTreeSelection dangling pointer remote code execution
MFSA 2010-39 nsCSSValue::Array index integer overflow
MFSA 2010-38 Arbitrary code execution using SJOW and fast native function
MFSA 2010-34 Miscellaneous memory safety hazards (rv:1.9.2.7/ 1.9.1.11)

4 files changed, 12 insertions, 36 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d65ab4f1745..19e85b82a29 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2010/07/12 16:49:21 tnn Exp $
+# $NetBSD: Makefile,v 1.57 2010/07/21 19:53:54 tnn Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		3.1
+TB_VER=		3.1.1
 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 672b08f1fde..6e05700ed6a 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.71 2010/07/21 11:48:05 tnn Exp $
+$NetBSD: distinfo,v 1.72 2010/07/21 19:53:54 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.source.tar.bz2) = 89e9d8099a5437ce401577fc4d526eb0dd9e51da
-RMD160 (thunderbird-3.1.source.tar.bz2) = bc55cf89dfe1f2c946fff8f5ec21b0377229afe7
-Size (thunderbird-3.1.source.tar.bz2) = 65633518 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 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
 SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094
 SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd
@@ -35,7 +32,6 @@ SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
 SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
 SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
 SHA1 (patch-bb) = 7cb648a5f20b3b61a24494e502bd49b535bb8055
-SHA1 (patch-bc) = ca4122954a38770449372bd67da5b64190d97d16
 SHA1 (patch-be) = 654ca74f4ec23bfef147c6f0f852ae6de046bc9e
 SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3
 SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c
@@ -57,7 +53,7 @@ SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b
 SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68
 SHA1 (patch-mm) = 04d9105ab0fb520690b58230e90bf6217b439df7
 SHA1 (patch-mn) = beb92ccc59f909f0d4f5f5bb62ad834b55fc94ce
-SHA1 (patch-mp) = 3da5e645d4e0c704ad8147c33f66bb13ec7c1bc6
+SHA1 (patch-mp) = 24bac4975548f0a058c2770865706fedb27aa0e6
 SHA1 (patch-nd) = 007b8d1310990253e86dab579397b02ced42cb71
 SHA1 (patch-pa) = 6201d005501d1912bbac16c2856dc8d22b50f017
 SHA1 (patch-pb) = 8f38b72fc44a6fcf5b211592f8265dee0cb6303a
diff --git a/mail/thunderbird/patches/patch-bc b/mail/thunderbird/patches/patch-bc
deleted file mode 100644
index 51fb373c8c3..00000000000
--- a/mail/thunderbird/patches/patch-bc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2010/07/12 16:49:22 tnn Exp $
-
-# ensure at least pointer compatible alignement of memory arena for
-# RuleProcessorData::operator new
-# Reported upstream as https://bugzilla.mozilla.org/show_bug.cgi?id=550842
-
---- mozilla/content/base/src/nsGenericElement.cpp.orig	2010-02-27 02:32:31.000000000 +0000
-+++ mozilla/content/base/src/nsGenericElement.cpp
-@@ -5132,9 +5132,9 @@ TryMatchingElementsInSubtree(nsINode* aR
-    * cheaper than heap-allocating all the datas and keeping track of them all,
-    * and helps a good bit in the common cases.  We also keep track of the whole
-    * parent data chain, since we have those Around anyway */
--  char databuf[2 * sizeof(RuleProcessorData)];
-+  union { char c[2 * sizeof(RuleProcessorData)]; void *p; } databuf;
-   RuleProcessorData* prevSibling = nsnull;
--  RuleProcessorData* data = reinterpret_cast<RuleProcessorData*>(databuf);
-+  RuleProcessorData* data = reinterpret_cast<RuleProcessorData*>(&databuf);
- 
-   PRBool continueIteration = PR_TRUE;
-   for (nsINode::ChildIterator iter(aRoot); !iter.IsDone(); iter.Next()) {
diff --git a/mail/thunderbird/patches/patch-mp b/mail/thunderbird/patches/patch-mp
index 78193c22f8f..b6e6c843608 100644
--- a/mail/thunderbird/patches/patch-mp
+++ b/mail/thunderbird/patches/patch-mp
@@ -1,9 +1,9 @@
-$NetBSD: patch-mp,v 1.2 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-mp,v 1.3 2010/07/21 19:53:54 tnn Exp $
 
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-12-02 05:28:49.000000000 +0100
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2010-07-13 19:10:28.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/Makefile.in
-@@ -77,6 +77,24 @@ CSRCS		= \
- 		$(NULL)
+@@ -83,6 +83,24 @@ CSRCS         = \
+               $(NULL)
  endif
  
 +ifeq ($(OS_ARCH),DragonFly)
@@ -23,7 +23,7 @@ $NetBSD: patch-mp,v 1.2 2010/07/12 16:49:22 tnn Exp $
 +		sydney_audio_oss.c \
 +		$(NULL)
 +endif
-+		
++
  ifeq ($(OS_ARCH),WINNT)
  OS_LIBS += winmm.lib
  endif