Pullup ticket 1442 - requested by ghen

security update for thunderbird

Revisions pulled up:
- pkgsrc/mail/thunderbird/Makefile			1.18
- pkgsrc/mail/thunderbird/Makefile-thunderbird.common	1.12
- pkgsrc/mail/thunderbird/distinfo			1.22
- pkgsrc/mail/thunderbird/patches/patch-ab		1.9
- pkgsrc/mail/thunderbird-gtk1/Makefile			1.9

   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Sun Apr 23 14:14:07 UTC 2006

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

   Log Message:
   Update to Thunderbird 1.5.0.2 (1.5.0.1 was skipped to stay in sync with
   Firefox).

   Thunderbird 1.5.0.2 offers improved stability, and several security fixes:
   MFSA 2006-28  Security check of js_ValueToFunctionObject() can be
                 circumvented
   MFSA 2006-27 Table Rebuilding Code Execution Vulnerability
   MFSA 2006-26 Mail Multiple Information Disclosure
   MFSA 2006-25 Privilege escalation through Print Preview
   MFSA 2006-24 Privilege escalation using crypto.generateCRMFRequest
   MFSA 2006-22 CSS Letter-Spacing Heap Overflow Vulnerability
   MFSA 2006-21 JavaScript execution in mail when forwarding in-line
   MFSA 2006-20 Crashes with evidence of memory corruption (rv:1.8.0.2)
   MFSA 2006-08 "AnyName" entrainment and access control hazard
   MFSA 2006-07 Read beyond buffer while parsing XML
   MFSA 2006-06 Integer overflows in E4X, SVG and Canvas
   MFSA 2006-05 Localstore.rdf XML injection through XULDocument.persist()
   MFSA 2006-04 Memory corruption via QueryInterface on Location, Navigator
                objects
   MFSA 2006-02 Changing postion:relative to static corrupts memory
   MFSA 2006-01 JavaScript garbage-collection hazards

   For a detailed ChangeLog, see:
   http://weblogs.mozillazine.org/rumblingedge/archives/2006/02/1-5-0-2.html

5 files changed, 26 insertions, 28 deletions

diff --git a/mail/thunderbird-gtk1/Makefile b/mail/thunderbird-gtk1/Makefile
index 3ad2b829613..b07e6695c8b 100644
--- a/mail/thunderbird-gtk1/Makefile
+++ b/mail/thunderbird-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/03/23 15:43:16 joerg Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2006/04/23 23:11:55 salo Exp $
 
 MOZILLA=	thunderbird-gtk1
-PKGREVISION=	2
 
 COMMENT=	Mozilla mail client using the older GTK1 toolkit
 
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index dd4f157af28..a448de7ede8 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/03/23 15:43:17 joerg Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2006/04/23 23:11:55 salo Exp $
 
 MOZILLA=		thunderbird
-PKGREVISION=		2
 
 COMMENT=		Mozilla mail client
 
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
index febdb028aff..9173851843e 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.11 2006/03/29 07:47:13 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.11.2.1 2006/04/23 23:11:55 salo Exp $
 
 MOZILLA_BIN=		thunderbird-bin
-MOZ_VER=		1.5
+MOZ_VER=		1.5.0.2
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		thunderbird-${MOZ_VER}-source
 CATEGORIES=		mail
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index a4803ef0e2b..e15d040fdd7 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2006/03/23 15:43:17 joerg Exp $
+$NetBSD: distinfo,v 1.21.2.1 2006/04/23 23:11:55 salo Exp $
 
-SHA1 (thunderbird-1.5-source.tar.bz2) = b0ac4efc42b9faab6c95d9aadad03d8b61ee686a
-RMD160 (thunderbird-1.5-source.tar.bz2) = 5c3a8c42c1239144c8498a81a791a534345cda3c
-Size (thunderbird-1.5-source.tar.bz2) = 35028308 bytes
+SHA1 (thunderbird-1.5.0.2-source.tar.bz2) = 6805470f93871916909e4fb4fea9c1354a76ec25
+RMD160 (thunderbird-1.5.0.2-source.tar.bz2) = 8aaf02c205b131a38fa0384fe6126eec325c3e9e
+Size (thunderbird-1.5.0.2-source.tar.bz2) = 35880369 bytes
 SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
-SHA1 (patch-ab) = d46bc4dea78b61a054b51283001592ebe09bffb8
+SHA1 (patch-ab) = 824a3ce1f608e8fff16e2366c7962f23a4321b10
 SHA1 (patch-ac) = 5561b6fedb5417534fefdf3404a93b1915d00be3
 SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
 SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index 33b841c6204..914525b23d2 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.8 2006/03/23 15:43:17 joerg Exp $
+$NetBSD: patch-ab,v 1.8.2.1 2006/04/23 23:11:55 salo Exp $
 
---- configure.in.orig	2006-02-02 13:20:06.000000000 +0100
+--- configure.in.orig	2006-04-19 18:33:30.000000000 +0200
 +++ configure.in
-@@ -1346,7 +1346,6 @@ case "$target" in
-     powerpc*)
-         _PLATFORM_DEFAULT_TOOLKIT='mac'
-         DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
--        MOZ_ENABLE_POSTSCRIPT=
-         # set MACOSX to generate lib/mac/MoreFiles/Makefile
-         MACOSX=1
-         ;;
-@@ -1360,7 +1359,7 @@ case "$target" in
-     esac
+@@ -1399,7 +1399,6 @@ case "$target" in
+     DSO_LDOPTS=''
+     STRIP="$STRIP -x -S"
+     _PLATFORM_DEFAULT_TOOLKIT='mac'
+-    MOZ_ENABLE_POSTSCRIPT=
+     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+     # set MACOSX to generate lib/mac/MoreFiles/Makefile
+     MACOSX=1
+@@ -1418,7 +1417,7 @@ case "$target" in
+     LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
 -*-freebsd*)
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.8 2006/03/23 15:43:17 joerg Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1374,6 +1373,9 @@ case "$target" in
+@@ -1432,6 +1431,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.8 2006/03/23 15:43:17 joerg Exp $
      ;; 
  
  *-hpux*)
-@@ -1768,6 +1770,13 @@ case "$target" in
+@@ -1826,6 +1828,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.8 2006/03/23 15:43:17 joerg Exp $
      ;;
  
  *-nto*) 
-@@ -1993,7 +2002,7 @@ dnl the qsort routine under solaris is f
+@@ -2051,7 +2060,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.8 2006/03/23 15:43:17 joerg Exp $
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -2650,7 +2659,7 @@ then
+@@ -2711,7 +2720,7 @@ then
      fi
  
  	case "$target" in
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.8 2006/03/23 15:43:17 joerg Exp $
  			AC_DEFINE(_REENTRANT)
  			AC_DEFINE(_THREAD_SAFE)
  			dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -5205,7 +5214,7 @@ dnl ====================================
+@@ -5279,7 +5288,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then