Pullup ticket #3302 - requested by tnn

mail/thunderbird: security update

Revisions pulled up:
- mail/thunderbird/Makefile			1.61-1.62,1.64 via patch
- mail/thunderbird/distinfo			1.76-1.77
- mail/thunderbird/patches/patch-pe		delete
---
Module Name:	pkgsrc
Committed By:	tnn
Date:		Sat Nov 13 11:05:05 UTC 2010

Modified Files:
	pkgsrc/mail/thunderbird: Makefile distinfo

Log Message:
Update to thunderbird-3.1.6.
Fixes MFSA 2010-73 Heap buffer overflow mixing document.write and DOM insertion
---
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.
---
Module Name:	pkgsrc
Committed By:	tnn
Date:		Sat Dec 11 14:34:41 UTC 2010

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

Log Message:
Update to thunderbird-3.1.7.

- Several fixes to improve performance, stability and security
- Several fixes to improve handling of large folder files stored
locally.
- Several fixes to improve corruption in local copy of IMAP mailboxes.

- MFSA 2010-78 Add support for OTS font sanitizer
- 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)

3 files changed, 6 insertions, 18 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 6fa0618874d..1b933efdfec 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.59.2.1 2010/10/25 15:34:49 tron Exp $
+# $NetBSD: Makefile,v 1.59.2.2 2010/12/12 19:12:21 tron Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		3.1.5
+TB_VER=		3.1.7
 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 03e9bc0f94c..b2bd9c7c37c 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.74.2.1 2010/10/25 15:34:49 tron Exp $
+$NetBSD: distinfo,v 1.74.2.2 2010/12/12 19:12:21 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.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 (thunderbird-3.1.7.source.tar.bz2) = c2d6cdedfe399c1ab41c00045e4fce835cc0b36f
+RMD160 (thunderbird-3.1.7.source.tar.bz2) = c5e25004565decf1467a9b452139c0aedec4299e
+Size (thunderbird-3.1.7.source.tar.bz2) = 65948060 bytes
 SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
 SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094
 SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd
@@ -61,7 +61,6 @@ SHA1 (patch-pa) = 6201d005501d1912bbac16c2856dc8d22b50f017
 SHA1 (patch-pb) = 8f38b72fc44a6fcf5b211592f8265dee0cb6303a
 SHA1 (patch-pc) = 154972a9a44a80380829a3dc3ecfdd2e1238d406
 SHA1 (patch-pd) = 1f12080244c75f42e4edbe623a15fd2ac6abd6d4
-SHA1 (patch-pe) = d9a5f9730e2498597449d47da134202fd6b91150
 SHA1 (patch-pg) = e022af26945893d2a61ec4ca3a414ccb6150a235
 SHA1 (patch-ra) = 4b26efb538e7c9f6fea0799cf31daaf3c69c2080
 SHA1 (patch-rc) = 959d6046a97a6ba9061da4019edc7b1a34b47cf6
diff --git a/mail/thunderbird/patches/patch-pe b/mail/thunderbird/patches/patch-pe
deleted file mode 100644
index 8942de81a3a..00000000000
--- a/mail/thunderbird/patches/patch-pe
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-pe,v 1.2 2010/07/12 16:49:22 tnn Exp $
-
---- mozilla/xulrunner/installer/mozilla-plugin.pc.in.orig	2009-12-04 21:19:58.000000000 +0000
-+++ mozilla/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%
-