- Update to 2.0.0.23

Security:	http://www.mozilla.org/security/announce/2009/mfsa2009-42.html
With hat:	gecko

4 files changed, 32 insertions, 22 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 1ac984315484..3fe690ad7ebd 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	2.0.0.22
-PORTREVISION=	1
+DISTVERSION=	2.0.0.23
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 3b21f24a68af..08056d6de217 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (thunderbird-2.0.0.22-source.tar.bz2) = 080c26dcb0ed563519a6061139a0bf92
-SHA256 (thunderbird-2.0.0.22-source.tar.bz2) = e364e5e1a96521b98b8391c5028207408d3d285ab40e091fa503b87a19d24d04
-SIZE (thunderbird-2.0.0.22-source.tar.bz2) = 40489725
+MD5 (thunderbird-2.0.0.23-source.tar.bz2) = 2e118fcf752ee60ce994f1471f9632d1
+SHA256 (thunderbird-2.0.0.23-source.tar.bz2) = 2c5007dfa1d094d8f089d42208e77d673e811a49980b7df77b04ed1606d30d21
+SIZE (thunderbird-2.0.0.23-source.tar.bz2) = 38860245
diff --git a/mail/thunderbird/files/patch-db-sqlite3-src-Makefile.in b/mail/thunderbird/files/patch-db-sqlite3-src-Makefile.in
new file mode 100644
index 000000000000..40562345842c
--- /dev/null
+++ b/mail/thunderbird/files/patch-db-sqlite3-src-Makefile.in
@@ -0,0 +1,13 @@
+--- db/sqlite3/src/Makefile.in.orig	2009-08-22 00:49:32.000000000 +0200
++++ db/sqlite3/src/Makefile.in	2009-08-22 00:51:29.000000000 +0200
+@@ -113,6 +113,10 @@
+ ##SIMPLE_PROGRAMS = sqlite-shell
+ endif
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_LIBS	+= -lpthread
++endif
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ sqlite-shell.$(OBJ_SUFFIX): shell.c
diff --git a/mail/thunderbird/files/patch-sysnss b/mail/thunderbird/files/patch-sysnss
index 3f8bf3538128..cd1e26811ad1 100644
--- a/mail/thunderbird/files/patch-sysnss
+++ b/mail/thunderbird/files/patch-sysnss
@@ -31,12 +31,12 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	2008-05-23 19:45:26.000000000 -0400
-+++ security/manager/Makefile.in	2008-07-17 14:59:30.000000000 -0400
-@@ -54,22 +54,13 @@ PACKAGE_VARS += \
- 	SSL3_LIB \
+--- security/manager/Makefile.in.orig	2009-08-07 22:37:51.000000000 +0200
++++ security/manager/Makefile.in	2009-08-21 10:41:53.000000000 +0200
+@@ -56,24 +56,13 @@
  	SOFTOKEN3_LIB \
  	SOFTOKEN3_CHK \
+ 	NSSDBM3_LIB \
 -	LOADABLE_ROOT_MODULE \
  	HAVE_FREEBL_LIBS \
  	HAVE_FREEBL_LIBS_32 \
@@ -48,15 +48,17 @@
  endif
  
 -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
 -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
 -SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
 -
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -218,11 +209,6 @@ export:: .nss.cleaned
+@@ -222,11 +211,6 @@
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
  	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
@@ -68,19 +70,11 @@
  	touch $@
  endif
  
-@@ -249,55 +235,6 @@ else
+@@ -253,49 +237,6 @@
  	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
  endif
  ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
@@ -91,6 +85,8 @@
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
 -ifdef HAVE_FREEBL_LIBS
@@ -124,7 +120,7 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -308,42 +245,6 @@ endif
+@@ -306,44 +247,6 @@
  
  install::
  ifndef MOZ_NATIVE_NSS
@@ -134,6 +130,8 @@
 -endif
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
 -ifdef HAVE_FREEBL_LIBS
@@ -167,7 +165,7 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -360,12 +261,6 @@ ifdef MOZ_XUL
+@@ -360,12 +263,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS