Pullup ticket 157 - requested by Havard Eidnes

security fix for thunderbird and thunderbird-gtk2

Module Name:    pkgsrc
Committed By:   kristerw
Date:           Thu Nov  4 20:06:34 UTC 2004

Modified Files:
        pkgsrc/mail/thunderbird: distinfo
        pkgsrc/mail/thunderbird/patches: patch-bt

Log Message:
Use __va_copy instead of va_copy for NetBSD.  This is needed on gcc 3.4=

since the build use -ansi that in turn makes gcc 3.4 modify its pre-
defined symbols in such a way that va_copy is not defined.
---
Module Name:    pkgsrc
Committed By:   taya
Date:           Sun Nov 14 23:38:20 UTC 2004

Modified Files:
        pkgsrc/mail/thunderbird: Makefile-thunderbird.common PLIST dist=
info
        pkgsrc/mail/thunderbird-gtk2: PLIST

Log Message:
Update thunderbird & thunderbird-gtk2 to 0.9

Here are the highlights for this Thunderbird release:

* Saved Search Folders
- Saved Search Folders display messages based on previously set search
criteria. For example, instead of filtering messages into a new
folder, you could create a Saved Search Folder that lists all the
messages received from a certain person over the past 30 days, even if
those messages are stored in different folders and subfolders.

* Message Grouping
- You can now group messages in a folder by attributes such as date,
sender, priority or a custom label. For instance, a folder grouped by
date will group messages from today, yesterday, last week, etc. into
self-contained groups in the message list pane. (View > Sort By >
Grouped By Sort)

* Other New Features
- Messages with attachments now get marked as such in the message list
pane immediately and not when the message is displayed.

- Improvements to Thunderbird's Global Inbox support for POP3 users.

- The new quick search bar introduced in 0.8 now features a clear
button when search text is present inside the quick search box.

- Fixed a regression introduced in 0.8 where a user could not change
the local folder path in the Account Manager.

- Improved offline support including fixes for common offline-related
problems.

- Improved privacy controls block remote content in e-mail messages
from senders not in your address book.

- Long file attachment names are no longer truncated in the message
pane.

- Bug fixes too numerous to mention!

6 files changed, 31 insertions, 22 deletions

diff --git a/mail/thunderbird-gtk2/PLIST b/mail/thunderbird-gtk2/PLIST
index 46c6ede598e..9d59e932a30 100644
--- a/mail/thunderbird-gtk2/PLIST
+++ b/mail/thunderbird-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/20 12:55:43 taya Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2004/12/01 01:49:25 snj Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -98,15 +98,11 @@ lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 lib/${MOZILLA}/LICENSE.txt
 lib/${MOZILLA}/README.txt
 lib/${MOZILLA}/bloaturls.txt
-lib/${MOZILLA}/chrome/US.jar
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
 lib/${MOZILLA}/chrome/comm.jar
 lib/${MOZILLA}/chrome/embed-sample.jar
 lib/${MOZILLA}/chrome/en-US.jar
-lib/${MOZILLA}/chrome/en-mac.jar
-lib/${MOZILLA}/chrome/en-unix.jar
-lib/${MOZILLA}/chrome/en-win.jar
 lib/${MOZILLA}/chrome/help.jar
 lib/${MOZILLA}/chrome/icons/default/abcardWindow.xpm
 lib/${MOZILLA}/chrome/icons/default/abcardWindow16.xpm
@@ -604,7 +600,9 @@ include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
 include/${MOZILLA}/browser/nsIBrowserInstance.h
 include/${MOZILLA}/browser/nsIXULBrowserWindow.h
 include/${MOZILLA}/caps/nsIPrincipal.h
+include/${MOZILLA}/caps/nsIPrincipalObsolete.h
 include/${MOZILLA}/caps/nsIScriptSecurityManager.h
+include/${MOZILLA}/caps/nsIScriptSecurityManagerObsolete.h
 include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
 include/${MOZILLA}/caps/nsISignatureVerifier.h
 include/${MOZILLA}/caps/nsJSPrincipals.h
@@ -804,6 +802,7 @@ include/${MOZILLA}/dom/nsDOMCID.h
 include/${MOZILLA}/dom/nsDOMError.h
 include/${MOZILLA}/dom/nsDOMString.h
 include/${MOZILLA}/dom/nsIBaseDOMException.h
+include/${MOZILLA}/dom/nsIBrowserDOMWindow.h
 include/${MOZILLA}/dom/nsIDOM3Document.h
 include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
 include/${MOZILLA}/dom/nsIDOM3EventTarget.h
@@ -1002,6 +1001,7 @@ include/${MOZILLA}/dom/nsIDOMWindow.h
 include/${MOZILLA}/dom/nsIDOMWindow2.h
 include/${MOZILLA}/dom/nsIDOMWindowCollection.h
 include/${MOZILLA}/dom/nsIDOMWindowInternal.h
+include/${MOZILLA}/dom/nsIDOMWindowUtils.h
 include/${MOZILLA}/dom/nsIDOMXMLDocument.h
 include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h
 include/${MOZILLA}/dom/nsIDOMXPathException.h
@@ -1143,6 +1143,7 @@ include/${MOZILLA}/htmlparser/nsIParserNode.h
 include/${MOZILLA}/htmlparser/nsIParserService.h
 include/${MOZILLA}/htmlparser/nsITokenizer.h
 include/${MOZILLA}/htmlparser/nsParserCIID.h
+include/${MOZILLA}/htmlparser/nsParserDataListener.h
 include/${MOZILLA}/htmlparser/nsParserError.h
 include/${MOZILLA}/htmlparser/nsScannerString.h
 include/${MOZILLA}/htmlparser/nsToken.h
@@ -1846,6 +1847,7 @@ include/${MOZILLA}/necko/nsIURI.h
 include/${MOZILLA}/necko/nsIURIChecker.h
 include/${MOZILLA}/necko/nsIURL.h
 include/${MOZILLA}/necko/nsIURLParser.h
+include/${MOZILLA}/necko/nsIUnicharStreamListener.h
 include/${MOZILLA}/necko/nsIUnicharStreamLoader.h
 include/${MOZILLA}/necko/nsIUploadChannel.h
 include/${MOZILLA}/necko/nsNetCID.h
diff --git a/mail/thunderbird/MESSAGE b/mail/thunderbird/MESSAGE
index 0be21c7bcfd..b0bb32bea47 100644
--- a/mail/thunderbird/MESSAGE
+++ b/mail/thunderbird/MESSAGE
@@ -1,4 +1,9 @@
-If you have ever run another version of thunderbird or thunderbird-gtk2, you
-must remove compreg.dat under your thunderbird profile before you run thunderbird.
-e.g.
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.2.1 2004/12/01 01:49:24 snj Exp $
+
+If you have ever run another version of thunderbird or thunderbird-gtk2,
+you must remove compreg.dat under your thunderbird profile before
+you run thunderbird, e.g.
 	rm ~/.thunderbird/*/compreg.dat
+
+===========================================================================
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
index 1ff59b57218..cc9dbdbae62 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.2 2004/09/20 12:55:43 taya Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.2.2.1 2004/12/01 01:49:24 snj Exp $
 
 MOZILLA_BIN=	thunderbird-bin
-MOZ_VER=	0.8
+MOZ_VER=	0.9
 EXTRACT_SUFX=	.tar.bz2
-DISTNAME=	thunderbird-source-${MOZ_VER}
+DISTNAME=	thunderbird-${MOZ_VER}-source
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/ \
 		ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/
 
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 3cef60decba..1b5a8aac37f 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/20 12:55:43 taya Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2004/12/01 01:49:24 snj Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -99,15 +99,11 @@ lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 lib/${MOZILLA}/LICENSE.txt
 lib/${MOZILLA}/README.txt
 lib/${MOZILLA}/bloaturls.txt
-lib/${MOZILLA}/chrome/US.jar
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
 lib/${MOZILLA}/chrome/comm.jar
 lib/${MOZILLA}/chrome/embed-sample.jar
 lib/${MOZILLA}/chrome/en-US.jar
-lib/${MOZILLA}/chrome/en-mac.jar
-lib/${MOZILLA}/chrome/en-unix.jar
-lib/${MOZILLA}/chrome/en-win.jar
 lib/${MOZILLA}/chrome/help.jar
 lib/${MOZILLA}/chrome/icons/default/abcardWindow.xpm
 lib/${MOZILLA}/chrome/icons/default/abcardWindow16.xpm
@@ -593,7 +589,9 @@ include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
 include/${MOZILLA}/browser/nsIBrowserInstance.h
 include/${MOZILLA}/browser/nsIXULBrowserWindow.h
 include/${MOZILLA}/caps/nsIPrincipal.h
+include/${MOZILLA}/caps/nsIPrincipalObsolete.h
 include/${MOZILLA}/caps/nsIScriptSecurityManager.h
+include/${MOZILLA}/caps/nsIScriptSecurityManagerObsolete.h
 include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
 include/${MOZILLA}/caps/nsISignatureVerifier.h
 include/${MOZILLA}/caps/nsJSPrincipals.h
@@ -793,6 +791,7 @@ include/${MOZILLA}/dom/nsDOMCID.h
 include/${MOZILLA}/dom/nsDOMError.h
 include/${MOZILLA}/dom/nsDOMString.h
 include/${MOZILLA}/dom/nsIBaseDOMException.h
+include/${MOZILLA}/dom/nsIBrowserDOMWindow.h
 include/${MOZILLA}/dom/nsIDOM3Document.h
 include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
 include/${MOZILLA}/dom/nsIDOM3EventTarget.h
@@ -991,6 +990,7 @@ include/${MOZILLA}/dom/nsIDOMWindow.h
 include/${MOZILLA}/dom/nsIDOMWindow2.h
 include/${MOZILLA}/dom/nsIDOMWindowCollection.h
 include/${MOZILLA}/dom/nsIDOMWindowInternal.h
+include/${MOZILLA}/dom/nsIDOMWindowUtils.h
 include/${MOZILLA}/dom/nsIDOMXMLDocument.h
 include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h
 include/${MOZILLA}/dom/nsIDOMXPathException.h
@@ -1132,6 +1132,7 @@ include/${MOZILLA}/htmlparser/nsIParserNode.h
 include/${MOZILLA}/htmlparser/nsIParserService.h
 include/${MOZILLA}/htmlparser/nsITokenizer.h
 include/${MOZILLA}/htmlparser/nsParserCIID.h
+include/${MOZILLA}/htmlparser/nsParserDataListener.h
 include/${MOZILLA}/htmlparser/nsParserError.h
 include/${MOZILLA}/htmlparser/nsScannerString.h
 include/${MOZILLA}/htmlparser/nsToken.h
@@ -1833,6 +1834,7 @@ include/${MOZILLA}/necko/nsIURI.h
 include/${MOZILLA}/necko/nsIURIChecker.h
 include/${MOZILLA}/necko/nsIURL.h
 include/${MOZILLA}/necko/nsIURLParser.h
+include/${MOZILLA}/necko/nsIUnicharStreamListener.h
 include/${MOZILLA}/necko/nsIUnicharStreamLoader.h
 include/${MOZILLA}/necko/nsIUploadChannel.h
 include/${MOZILLA}/necko/nsNetCID.h
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 4836b206ca2..f35fc355b2b 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2004/09/20 12:55:43 taya Exp $
+$NetBSD: distinfo,v 1.7.2.1 2004/12/01 01:49:24 snj Exp $
 
-SHA1 (thunderbird-source-0.8.tar.bz2) = 8ee7f535d2c512529b735e86936c8d2ca347570e
-Size (thunderbird-source-0.8.tar.bz2) = 32880592 bytes
+SHA1 (thunderbird-0.9-source.tar.bz2) = a818a1f471935379da1e364c5da3457446c1d53a
+Size (thunderbird-0.9-source.tar.bz2) = 33197138 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
 SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
 SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084
@@ -26,7 +26,7 @@ SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f
 SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
 SHA1 (patch-br) = aa48e974306fdbfc1e71b5fd9c1f5d18771143f5
 SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
-SHA1 (patch-bt) = 8ee09dd2acbbc0c002283b15eafbafb4f324948a
+SHA1 (patch-bt) = 6e3ceb31866dfb0dba81c93446db2b21e1df9baa
 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
diff --git a/mail/thunderbird/patches/patch-bt b/mail/thunderbird/patches/patch-bt
index 8f9f3342b5f..45ee584146c 100644
--- a/mail/thunderbird/patches/patch-bt
+++ b/mail/thunderbird/patches/patch-bt
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.1 2004/06/24 23:09:56 taya Exp $
+$NetBSD: patch-bt,v 1.1.2.1 2004/12/01 01:49:24 snj Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c
 --- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c	2004-03-09 12:18:19.000000000 +0900
@@ -11,7 +11,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c
 +	(defined(__amd64__) || \
 +	(defined(__powerpc__) && __NetBSD_Version__ >= 105000000)))
 +#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
  #elif (defined(LINUX) && defined(__powerpc__)) || \
      (defined(LINUX) && defined(__s390__)) || \
      (defined(LINUX) && defined(__s390x__)) || \