Pullup ticket #3257 - requested by tnn

Revisions pulled up:
- mail/thunderbird/Makefile			1.60
- mail/thunderbird/PLIST			1.32
- mail/thunderbird/distinfo			1.75
- mail/thunderbird/patches/patch-mc		delete
---
odule Name:	pkgsrc
Committed By:	tnn
Date:		Thu Oct 21 16:02:37 UTC 2010

Modified Files:
	pkgsrc/mail/thunderbird: Makefile PLIST distinfo
Removed Files:
	pkgsrc/mail/thunderbird/patches: patch-mc

Log Message:
Update to thunderbird-3.1.5.
* Several fixes to improve stability and security
* Several fixes to the user interface.

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-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)

4 files changed, 8 insertions, 24 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 1b60330c40e..6fa0618874d 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2010/09/14 11:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2010/10/25 15:34:49 tron Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		3.1.3
-PKGREVISION=	1
+TB_VER=		3.1.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 5d2f566709c..9456febc74d 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.31 2010/07/12 16:49:21 tnn Exp $
+@comment $NetBSD: PLIST,v 1.31.2.1 2010/10/25 15:34:49 tron Exp $
 bin/thunderbird
 lib/thunderbird/README.txt
 lib/thunderbird/application.ini
+lib/thunderbird/blocklist.xml
 lib/thunderbird/chrome/classic.jar
 lib/thunderbird/chrome/classic.manifest
 lib/thunderbird/chrome/comm.jar
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 20d465365af..03e9bc0f94c 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.74 2010/09/09 10:58:50 tnn Exp $
+$NetBSD: distinfo,v 1.74.2.1 2010/10/25 15:34:49 tron 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.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 (thunderbird-3.1.5.source.tar.bz2) = fe419b1df04a53275f19f7097d1a9b3d2ee71b53
+RMD160 (thunderbird-3.1.5.source.tar.bz2) = b4aa0856cf4f2f83a5ad5753a84744a33b5f5634
+Size (thunderbird-3.1.5.source.tar.bz2) = 65846402 bytes
 SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
 SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094
 SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd
@@ -44,7 +44,6 @@ 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) = b16bd1a88bafe14c7d9ff00e9623b6a346eb043a
 SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
 SHA1 (patch-me) = 775262c00ac16ea78a11ede5678e3d08f97c9640
 SHA1 (patch-mf) = 9aa245b2704df3b2009a8dee0e8217cbd20df9d0
diff --git a/mail/thunderbird/patches/patch-mc b/mail/thunderbird/patches/patch-mc
deleted file mode 100644
index fcdebbed0da..00000000000
--- a/mail/thunderbird/patches/patch-mc
+++ /dev/null
@@ -1,15 +0,0 @@
-$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/config.mk.orig	2010-08-24 21:32:09.000000000 +0000
-+++ mozilla/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