Update thunderbird and thunderbird-gtk1 to 1.5.0.10. Fixed in this version:

MFSA 2007-06  Mozilla Network Security Services (NSS) SSLv2 buffer overflow
MFSA 2007-01 Crashes with evidence of memory corruption (rv:1.8.0.10/1.8.1.2)

For more info, see http://www.mozilla.com/en-US/thunderbird/releases/1.5.0.10.html

7 files changed, 20 insertions, 53 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 8c4ede19dd0..c000ab5dbfa 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2007/02/04 00:15:48 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.24 2007/03/02 14:12:24 ghen Exp $
 
 MOZILLA=		thunderbird
-PKGREVISION=		1
 COMMENT=		Mozilla mail client
 
 MOZILLA_USE_GTK2=	# yes
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
index d1f4ecaad61..1eea9b89c7b 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.22 2007/02/04 00:15:48 dmcmahill Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.23 2007/03/02 14:12:24 ghen Exp $
 
 MOZILLA_BIN=		thunderbird-bin
-MOZ_VER=		1.5.0.9
+MOZ_VER=		1.5.0.10
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		thunderbird-${MOZ_VER}-source
 CATEGORIES=		mail
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 7649b1d8db5..059f8e20096 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/02/04 00:15:49 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/03/02 14:12:24 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -70,6 +70,7 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
+lib/${MOZILLA}/libfreebl3.${SO_SUFFIX}
 lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -318,6 +319,7 @@ lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
 lib/${MOZILLA}/init.d/README
+lib/${MOZILLA}/libfreebl3.chk
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.chk
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.chk
 lib/${MOZILLA}/libsoftokn3.chk
@@ -2736,8 +2738,6 @@ include/${MOZILLA}/nss/ssl.h
 include/${MOZILLA}/nss/sslerr.h
 include/${MOZILLA}/nss/sslproto.h
 include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/swfort.h
-include/${MOZILLA}/nss/swfortt.h
 include/${MOZILLA}/nss/watcomfx.h
 @comment end INCLUDE-PUBLIC
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index f6253ba4bb4..02bcaa3ca7a 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2007/01/26 22:36:45 dmcmahill Exp $
+$NetBSD: distinfo,v 1.35 2007/03/02 14:12:24 ghen Exp $
 
-SHA1 (thunderbird-1.5.0.9-source.tar.bz2) = ff1b900861422b5c657a5302d9b1deb0601a42e2
-RMD160 (thunderbird-1.5.0.9-source.tar.bz2) = d1efc6bd0585ce2222d0bc3065a4f748a2f0f635
-Size (thunderbird-1.5.0.9-source.tar.bz2) = 35970591 bytes
+SHA1 (thunderbird-1.5.0.10-source.tar.bz2) = a6467c946f9e668bcf7b3a06dcaeceb601b98fce
+RMD160 (thunderbird-1.5.0.10-source.tar.bz2) = 926484cd1880e7921bf10ba0774064e43acc9283
+Size (thunderbird-1.5.0.10-source.tar.bz2) = 36159990 bytes
 SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
 SHA1 (patch-ab) = 824a3ce1f608e8fff16e2366c7962f23a4321b10
 SHA1 (patch-ac) = 02804b8276b4b9552ea4587e6c020b87ddb59cf0
@@ -17,13 +17,13 @@ SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
 SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86
 SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
 SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
-SHA1 (patch-ap) = f62b79e049d43d11d99345aa68833be372988c5a
+SHA1 (patch-ap) = 791b30d5b2468a94b356205b22f1dcef0e51fc68
 SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff
 SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81
 SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1
 SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
 SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7
-SHA1 (patch-ax) = 00d60664a6be38db0d5b2464064230c62b153ca6
+SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb
 SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
 SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed
 SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
@@ -52,4 +52,3 @@ SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4
 SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
 SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
-SHA1 (patch-du) = d5256827efa3f2d49c20794a288842429b780eda
diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap
index d522114c5fc..7c8de789b12 100644
--- a/mail/thunderbird/patches/patch-ap
+++ b/mail/thunderbird/patches/patch-ap
@@ -1,11 +1,11 @@
-$NetBSD: patch-ap,v 1.3 2007/01/17 14:18:40 dmcmahill Exp $
+$NetBSD: patch-ap,v 1.4 2007/03/02 14:12:25 ghen Exp $
 
---- security/coreconf/command.mk.orig	2006-02-02 13:19:58.000000000 +0100
+--- security/coreconf/command.mk.orig	2005-10-11 01:46:12.000000000 +0200
 +++ security/coreconf/command.mk
-@@ -46,7 +46,7 @@ CCF           = $(CC) $(CFLAGS)
+@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
+ CCF           = $(CC) $(CFLAGS)
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
- NFSPWD        = $(NSINSTALL_DIR)/nfspwd
 -CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 +CFLAGS        = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
  		$(XCFLAGS)
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
index ca3cd394e13..4cac14e05ea 100644
--- a/mail/thunderbird/patches/patch-ax
+++ b/mail/thunderbird/patches/patch-ax
@@ -1,10 +1,10 @@
-$NetBSD: patch-ax,v 1.3 2006/02/05 14:49:05 ghen Exp $
+$NetBSD: patch-ax,v 1.4 2007/03/02 14:12:25 ghen Exp $
 
---- security/coreconf/SunOS5.mk.orig	2006-02-02 13:19:58.000000000 +0100
+--- security/coreconf/SunOS5.mk.orig	2006-04-25 03:32:16.000000000 +0200
 +++ security/coreconf/SunOS5.mk
-@@ -182,6 +182,10 @@ endif
- 	DSO_LDOPTS += -G -h $(notdir $@)
+@@ -176,6 +176,10 @@ endif
  endif
+ DSO_LDOPTS += -z combreloc -z defs -z ignore
  
 +ifdef LIBRUNPATH
 +DSO_LDOPTS += -R$(LIBRUNPATH)
diff --git a/mail/thunderbird/patches/patch-du b/mail/thunderbird/patches/patch-du
deleted file mode 100644
index 8c00d5eb72e..00000000000
--- a/mail/thunderbird/patches/patch-du
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-du,v 1.1 2007/01/26 22:36:45 dmcmahill Exp $
-
-GNU make-3.81 changed the way \newlines are handled inside of single
-quotes.  This fixes the command.  Should still work on older GNU make's
-too.
-
-See https://bugzilla.mozilla.org/show_bug.cgi?id=325148
-
---- security/coreconf/rules.mk.orig	2005-04-14 20:36:28.000000000 -0400
-+++ security/coreconf/rules.mk
-@@ -885,8 +885,7 @@ endif
- 
- ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET)))
- # Can't use sed because of its 4000-char line length limit, so resort to perl
--.DEFAULT:
--	@perl -e '                                                            \
-+PERL_DEPENDENCIES_PROGRAM= '                                                  \
- 	    open(MD, "< $(DEPENDENCIES)");                                    \
- 	    while (<MD>) {                                                    \
- 		if (m@ \.*/*$< @) {                                           \
-@@ -914,6 +913,10 @@ ifneq (,$(filter-out OpenVMS OS2 WIN%,$(
- 		print "$(MAKE): *** No rule to make target $<.  Stop.\n";     \
- 		exit(1);                                                      \
- 	    }'
-+
-+.DEFAULT:
-+	@perl -e ${PERL_DEPENDENCIES_PROGRAM}
-+
- endif
- 
- #############################################################################