From dba0bb32c9a5df9110f11891bed4fb6f4d0cb1c4 Mon Sep 17 00:00:00 2001 From: ghen Date: Sat, 3 Oct 2009 13:18:23 +0000 Subject: Update thunderbird and thunderbird-gtk1 to 2.0.0.23. Security fixes in this version: MFSA 2009-43 Heap overflow in certificate regexp parsing MFSA 2009-42 Compromise of SSL-protected communication For more info, see http://www.mozilla.com/en-US/thunderbird/2.0.0.23/releasenotes/ --- mail/thunderbird/patches/patch-ba | 17 ++++++++--------- mail/thunderbird/patches/patch-br | 20 ++++++++++---------- mail/thunderbird/patches/patch-dk | 13 ++++++------- mail/thunderbird/patches/patch-dy | 13 ------------- mail/thunderbird/patches/patch-dz | 13 ------------- mail/thunderbird/patches/patch-eb | 20 ++++++++++++++++++++ 6 files changed, 44 insertions(+), 52 deletions(-) delete mode 100644 mail/thunderbird/patches/patch-dy delete mode 100644 mail/thunderbird/patches/patch-dz create mode 100644 mail/thunderbird/patches/patch-eb (limited to 'mail/thunderbird/patches') diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba index 631e3cdcf8c..e90ef6f3b59 100644 --- a/mail/thunderbird/patches/patch-ba +++ b/mail/thunderbird/patches/patch-ba @@ -1,11 +1,10 @@ -$NetBSD: patch-ba,v 1.5 2008/05/19 10:43:02 tnn Exp $ +$NetBSD: patch-ba,v 1.6 2009/10/03 13:18:23 ghen Exp $ -diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900 -@@ -48,7 +48,8 @@ - - #define PR_AF_INET6 24 /* same as AF_INET6 */ +--- nsprpub/pr/include/md/_netbsd.cfg.orig 2007-11-26 19:17:17.000000000 +0100 ++++ nsprpub/pr/include/md/_netbsd.cfg +@@ -52,7 +52,8 @@ + #define HAVE_LONG_LONG + #endif -#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) +#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \ @@ -13,7 +12,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN -@@ -94,7 +95,53 @@ +@@ -97,7 +98,53 @@ #define PR_ALIGN_OF_DOUBLE 4 #define PR_ALIGN_OF_POINTER 4 @@ -68,7 +67,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 -@@ -187,6 +234,55 @@ +@@ -188,6 +235,55 @@ #define PR_BYTES_PER_WORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3 diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br index 59d70d84739..53c19de492d 100644 --- a/mail/thunderbird/patches/patch-br +++ b/mail/thunderbird/patches/patch-br @@ -1,9 +1,9 @@ -$NetBSD: patch-br,v 1.7 2009/04/07 08:01:01 hasso Exp $ +$NetBSD: patch-br,v 1.8 2009/10/03 13:18:23 ghen Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2006-11-14 19:41:59 +0200 -+++ nsprpub/pr/src/misc/prnetdb.c 2009-04-04 18:10:55 +0300 -@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL; - #define _PR_HAVE_5_ARG_GETPROTO_R +--- nsprpub/pr/src/misc/prnetdb.c.orig 2008-01-13 02:27:15.000000000 +0100 ++++ nsprpub/pr/src/misc/prnetdb.c +@@ -93,6 +93,11 @@ PRLock *_pr_dnsLock = NULL; + #define _PR_HAVE_GETPROTO_R_POINTER #endif +#if __DragonFly_version >= 200202 @@ -11,10 +11,10 @@ $NetBSD: patch-br,v 1.7 2009/04/07 08:01:01 hasso Exp $ +#define _PR_HAVE_5_ARG_GETPROTO_R +#endif + - #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R -@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void) + #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ + || (defined(LINUX) && defined(_REENTRANT) \ + && !(defined(__GLIBC__) && __GLIBC__ >= 2)) +@@ -331,7 +336,7 @@ _pr_QueryNetIfs(void) } #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ @@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.7 2009/04/07 08:01:01 hasso Exp $ /* * Use the BSD getifaddrs function. -@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2039,7 +2044,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; diff --git a/mail/thunderbird/patches/patch-dk b/mail/thunderbird/patches/patch-dk index bed031c0e1a..5b2dcf172f7 100644 --- a/mail/thunderbird/patches/patch-dk +++ b/mail/thunderbird/patches/patch-dk @@ -1,14 +1,13 @@ -$NetBSD: patch-dk,v 1.1 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-dk,v 1.2 2009/10/03 13:18:23 ghen Exp $ -diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk ---- ../Orig/mozilla/security/coreconf/config.mk 2004-04-26 00:02:17.000000000 +0900 -+++ ./security/coreconf/config.mk 2005-12-04 19:44:47.000000000 +0900 -@@ -63,7 +63,7 @@ +--- security/coreconf/config.mk.orig 2009-02-13 18:14:05.000000000 +0100 ++++ security/coreconf/config.mk +@@ -63,7 +63,7 @@ endif ####################################################################### TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ -- OpenVMS AIX -+ OpenVMS AIX DragonFly +- OpenVMS AIX RISCOS WINNT WIN95 WINCE ++ OpenVMS AIX RISCOS WINNT WIN95 WINCE DragonFly ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk diff --git a/mail/thunderbird/patches/patch-dy b/mail/thunderbird/patches/patch-dy deleted file mode 100644 index d1fd324dc9c..00000000000 --- a/mail/thunderbird/patches/patch-dy +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dy,v 1.1 2008/09/18 13:01:45 joerg Exp $ - ---- security/nss-fips/cmd/platlibs.mk.orig 2008-09-17 20:55:11 +0300 -+++ security/nss-fips/cmd/platlibs.mk 2008-09-17 20:55:31 +0300 -@@ -213,7 +213,7 @@ endif - # If GNU ld is used, we must use the -rpath-link option to tell - # the linker where to find libsoftokn3.so, an implicit dependency - # of libnss3.so. --ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH))) -+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_ARCH))) - EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib - endif - diff --git a/mail/thunderbird/patches/patch-dz b/mail/thunderbird/patches/patch-dz deleted file mode 100644 index 79ca6a3c886..00000000000 --- a/mail/thunderbird/patches/patch-dz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dz,v 1.1 2008/09/18 13:01:45 joerg Exp $ - ---- security/nss-fips/lib/freebl/Makefile.orig 2008-09-17 20:50:24 +0300 -+++ security/nss-fips/lib/freebl/Makefile 2008-09-17 20:50:53 +0300 -@@ -192,7 +192,7 @@ endif - # to bind the blapi function references in FREEBLVector vector - # (ldvector.c) to the blapi functions defined in the freebl - # shared libraries. --ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET))) -+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET))) - MKSHLIB += -Wl,-Bsymbolic - endif - diff --git a/mail/thunderbird/patches/patch-eb b/mail/thunderbird/patches/patch-eb new file mode 100644 index 00000000000..bbb270c20d7 --- /dev/null +++ b/mail/thunderbird/patches/patch-eb @@ -0,0 +1,20 @@ +$NetBSD: patch-eb,v 1.1 2009/10/03 13:18:23 ghen Exp $ + +--- security/nss/tests/libpkix/libpkix.sh.orig 2008-11-11 10:06:52.000000000 +0100 ++++ security/nss/tests/libpkix/libpkix.sh +@@ -85,12 +85,12 @@ libpkix_cleanup() + ParseArgs () + { + while [ $# -gt 0 ]; do +- if [ $1 == "-checkmem" ]; then ++ if [ $1 = "-checkmem" ]; then + checkMemArg=$1 + memText=" (Memory Checking Enabled)" +- elif [ $1 == "-quiet" ]; then ++ elif [ $1 = "-quiet" ]; then + quietArg=$1 +- elif [ $1 == "-arenas" ]; then ++ elif [ $1 = "-arenas" ]; then + arenasArg=$1 + fi + shift -- cgit v1.2.3