Pullup ticket 2227 - requested by tron

security update for thunderbird

- pkgsrc/mail/thunderbird/Makefile			1.30 via patch
- pkgsrc/mail/thunderbird/Makefile-thunderbird.common	1.31
- pkgsrc/mail/thunderbird/distinfo			1.42
- pkgsrc/mail/thunderbird/patches/patch-ac		1.8

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Nov 15 15:05:23 UTC 2007

   Modified Files:
	   pkgsrc/mail/thunderbird: Makefile Makefile-thunderbird.common distinfo
	   pkgsrc/mail/thunderbird/patches: patch-ac

   Log Message:
   Update "thunderbird" package to version 2.0.0.9. It fixes the following
   security problems:
   - MFSA 2007-36 URIs with invalid %-encoding mishandled by Windows
   - MFSA 2007-29 Crashes with evidence of memory corruption (rv:1.8.1.8)

4 files changed, 18 insertions, 19 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index f5643c2d2bc..6eb2bb44b19 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2007/10/08 10:13:02 ghen Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2007/11/15 18:33:14 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 3beec6a43b7..a9ff41a2c25 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.29 2007/10/08 10:13:03 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.29.2.1 2007/11/15 18:33:15 ghen Exp $
 
 MOZILLA_BIN=		thunderbird-bin
-MOZ_VER=		2.0.0.6
+MOZ_VER=		2.0.0.9
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		thunderbird-${MOZ_VER}-source
 CATEGORIES=		mail
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index df546626b78..3e983d593e3 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.41 2007/08/02 08:48:30 ghen Exp $
+$NetBSD: distinfo,v 1.41.2.1 2007/11/15 18:33:15 ghen Exp $
 
-SHA1 (thunderbird-2.0.0.6-source.tar.bz2) = c38b17ad0fc51aed96bacafe3ffe7ed0edd0738c
-RMD160 (thunderbird-2.0.0.6-source.tar.bz2) = 5280feb5c09895e8ba37d84bef0e1aa215ae0028
-Size (thunderbird-2.0.0.6-source.tar.bz2) = 37461752 bytes
+SHA1 (thunderbird-2.0.0.9-source.tar.bz2) = fede9db98f25adb978b84129a6d15a4dbe6bbb3e
+RMD160 (thunderbird-2.0.0.9-source.tar.bz2) = 0a7e3aeb76b4ef6c84634b2935e84f56dc859051
+Size (thunderbird-2.0.0.9-source.tar.bz2) = 37562994 bytes
 SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
 SHA1 (patch-ab) = 1dda9cc5822761da53133e987e30c133894baad7
-SHA1 (patch-ac) = 02804b8276b4b9552ea4587e6c020b87ddb59cf0
+SHA1 (patch-ac) = 24da4ecce48d22a3752276cae132845b4b474c2a
 SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
 SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
 SHA1 (patch-af) = 1306065f359a4acc2c2c4a0865d8401baacb7a15
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 0540c13b3f1..5d172d07815 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2006/06/10 12:50:04 ghen Exp $
+$NetBSD: patch-ac,v 1.7.12.1 2007/11/15 18:33:15 ghen Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2006-02-02 13:20:12.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -61,10 +61,13 @@ include $(topsrcdir)/config/config.mk
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2007-10-03 13:54:53.000000000 +0100
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2007-11-15 12:59:59.000000000 +0000
+@@ -62,10 +62,13 @@
  #
  # Lots of Unixish x86 flavors
  #
@@ -12,12 +12,12 @@ $NetBSD: patch-ac,v 1.7 2006/06/10 12:50:04 ghen Exp $
  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  endif
 +ifeq (amd64,$(OS_TEST))
-+CPPSRCS                := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
 +endif
  endif
  #
- # New code for Linux, et. al., with gcc
-@@ -157,7 +160,7 @@ endif
+ # OpenBSD/amd64
+@@ -170,7 +173,7 @@
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.7 2006/06/10 12:50:04 ghen Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -191,7 +194,7 @@ endif
+@@ -214,7 +217,7 @@
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.7 2006/06/10 12:50:04 ghen Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -274,6 +277,7 @@ endif
+@@ -297,6 +300,7 @@
  ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
  CPPSRCS		:= xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
@@ -43,7 +43,7 @@ $NetBSD: patch-ac,v 1.7 2006/06/10 12:50:04 ghen Exp $
  endif
  
  #
-@@ -322,6 +326,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
+@@ -353,6 +357,13 @@
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif