From db75b293bac6e4eb21c778fcd4943099d60bdd8f Mon Sep 17 00:00:00 2001 From: salo Date: Mon, 5 Mar 2007 19:16:30 +0000 Subject: Pullup ticket 2039 - requested by ghen security update for thunderbird Revisions pulled up: - pkgsrc/mail/thunderbird/Makefile-thunderbird.common 1.23 - pkgsrc/mail/thunderbird/PLIST patch - pkgsrc/mail/thunderbird/distinfo patch - pkgsrc/mail/thunderbird/patches/patch-ap patch - pkgsrc/mail/thunderbird/patches/patch-ax patch - pkgsrc/mail/thunderbird-gtk1/PLIST 1.9 Module Name: pkgsrc Committed By: ghen Date: Fri Mar 2 14:12:25 UTC 2007 Modified Files: pkgsrc/mail/thunderbird: Makefile-thunderbird.common PLIST distinfo pkgsrc/mail/thunderbird-gtk1: PLIST pkgsrc/mail/thunderbird/patches: patch-ap patch-ax Log Message: Update thunderbird and thunderbird-gtk1 to 1.5.0.10. Fixed in this version: MFSA 2007-06 Mozilla Network Security Services (NSS) SSLv2 buffer overflow MFSA 2007-01 Crashes with evidence of memory corruption (rv:1.8.0.10/1.8.1.2) For more info, see http://www.mozilla.com/en-US/thunderbird/releases/1.5.0.10.html --- mail/thunderbird-gtk1/PLIST | 6 +++--- mail/thunderbird/Makefile-thunderbird.common | 4 ++-- mail/thunderbird/PLIST | 6 +++--- mail/thunderbird/distinfo | 12 ++++++------ mail/thunderbird/patches/patch-ap | 8 ++++---- mail/thunderbird/patches/patch-ax | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mail/thunderbird-gtk1/PLIST b/mail/thunderbird-gtk1/PLIST index faacc6064a5..9c7b3c54a5f 100644 --- a/mail/thunderbird-gtk1/PLIST +++ b/mail/thunderbird-gtk1/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2006/11/08 13:15:40 ghen Exp $ +@comment $NetBSD: PLIST,v 1.8.2.1 2007/03/05 19:16:36 salo Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -70,6 +70,7 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX} lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX} lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX} lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX} +lib/${MOZILLA}/libfreebl3.${SO_SUFFIX} lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX} lib/${MOZILLA}/libgkgfx.${SO_SUFFIX} lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX} @@ -315,6 +316,7 @@ lib/${MOZILLA}/greprefs/xpinstall.js lib/${MOZILLA}/icons/mozicon16.xpm lib/${MOZILLA}/icons/mozicon50.xpm lib/${MOZILLA}/init.d/README +lib/${MOZILLA}/libfreebl3.chk lib/${MOZILLA}/libsoftokn3.chk lib/${MOZILLA}/res/EditorOverride.css lib/${MOZILLA}/res/arrow.gif @@ -2725,8 +2727,6 @@ include/${MOZILLA}/nss/ssl.h include/${MOZILLA}/nss/sslerr.h include/${MOZILLA}/nss/sslproto.h include/${MOZILLA}/nss/sslt.h -include/${MOZILLA}/nss/swfort.h -include/${MOZILLA}/nss/swfortt.h include/${MOZILLA}/nss/watcomfx.h @comment end INCLUDE-PUBLIC @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common index fb7a936b343..a48f4026875 100644 --- a/mail/thunderbird/Makefile-thunderbird.common +++ b/mail/thunderbird/Makefile-thunderbird.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile-thunderbird.common,v 1.21 2006/12/20 12:53:32 ghen Exp $ +# $NetBSD: Makefile-thunderbird.common,v 1.21.2.1 2007/03/05 19:16:30 salo Exp $ MOZILLA_BIN= thunderbird-bin -MOZ_VER= 1.5.0.9 +MOZ_VER= 1.5.0.10 EXTRACT_SUFX= .tar.bz2 DISTNAME= thunderbird-${MOZ_VER}-source CATEGORIES= mail diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST index b76a839cb3e..2c398a05afd 100644 --- a/mail/thunderbird/PLIST +++ b/mail/thunderbird/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2006/11/08 13:15:40 ghen Exp $ +@comment $NetBSD: PLIST,v 1.17.2.1 2007/03/05 19:16:31 salo Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -70,6 +70,7 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX} lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX} lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX} lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX} +lib/${MOZILLA}/libfreebl3.${SO_SUFFIX} lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX} lib/${MOZILLA}/libgkgfx.${SO_SUFFIX} lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX} @@ -316,6 +317,7 @@ lib/${MOZILLA}/greprefs/xpinstall.js lib/${MOZILLA}/icons/mozicon16.xpm lib/${MOZILLA}/icons/mozicon50.xpm lib/${MOZILLA}/init.d/README +lib/${MOZILLA}/libfreebl3.chk lib/${MOZILLA}/libsoftokn3.chk lib/${MOZILLA}/res/EditorOverride.css lib/${MOZILLA}/res/arrow.gif @@ -2732,8 +2734,6 @@ include/${MOZILLA}/nss/ssl.h include/${MOZILLA}/nss/sslerr.h include/${MOZILLA}/nss/sslproto.h include/${MOZILLA}/nss/sslt.h -include/${MOZILLA}/nss/swfort.h -include/${MOZILLA}/nss/swfortt.h include/${MOZILLA}/nss/watcomfx.h @comment end INCLUDE-PUBLIC @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index b3103254cfe..a8f4a4bff00 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.32 2006/12/20 12:53:32 ghen Exp $ +$NetBSD: distinfo,v 1.32.2.1 2007/03/05 19:16:33 salo Exp $ -SHA1 (thunderbird-1.5.0.9-source.tar.bz2) = ff1b900861422b5c657a5302d9b1deb0601a42e2 -RMD160 (thunderbird-1.5.0.9-source.tar.bz2) = d1efc6bd0585ce2222d0bc3065a4f748a2f0f635 -Size (thunderbird-1.5.0.9-source.tar.bz2) = 35970591 bytes +SHA1 (thunderbird-1.5.0.10-source.tar.bz2) = a6467c946f9e668bcf7b3a06dcaeceb601b98fce +RMD160 (thunderbird-1.5.0.10-source.tar.bz2) = 926484cd1880e7921bf10ba0774064e43acc9283 +Size (thunderbird-1.5.0.10-source.tar.bz2) = 36159990 bytes SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466 SHA1 (patch-ab) = 824a3ce1f608e8fff16e2366c7962f23a4321b10 SHA1 (patch-ac) = 02804b8276b4b9552ea4587e6c020b87ddb59cf0 @@ -17,13 +17,13 @@ SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86 SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641 SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d -SHA1 (patch-ap) = b2f630863e7b1bc3c0e7139d2b4aca3b80da04de +SHA1 (patch-ap) = 605e3055052ec8542939cfdfeb3a63c011d851b5 SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81 SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1 SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7 -SHA1 (patch-ax) = 00d60664a6be38db0d5b2464064230c62b153ca6 +SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071 SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991 diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap index 1754e0d6510..054f5a3491a 100644 --- a/mail/thunderbird/patches/patch-ap +++ b/mail/thunderbird/patches/patch-ap @@ -1,11 +1,11 @@ -$NetBSD: patch-ap,v 1.2 2006/02/05 14:49:05 ghen Exp $ +$NetBSD: patch-ap,v 1.2.8.1 2007/03/05 19:16:33 salo Exp $ ---- security/coreconf/command.mk.orig 2006-02-02 13:19:58.000000000 +0100 +--- security/coreconf/command.mk.orig 2005-10-11 01:46:12.000000000 +0200 +++ security/coreconf/command.mk -@@ -46,7 +46,7 @@ CCF = $(CC) $(CFLAGS) +@@ -45,7 +45,7 @@ ASFLAGS += $(CFLAGS) + CCF = $(CC) $(CFLAGS) LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) - NFSPWD = $(NSINSTALL_DIR)/nfspwd -CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ +CFLAGS += $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ $(XCFLAGS) diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax index ca3cd394e13..aa2d7dabf62 100644 --- a/mail/thunderbird/patches/patch-ax +++ b/mail/thunderbird/patches/patch-ax @@ -1,10 +1,10 @@ -$NetBSD: patch-ax,v 1.3 2006/02/05 14:49:05 ghen Exp $ +$NetBSD: patch-ax,v 1.3.8.1 2007/03/05 19:16:35 salo Exp $ ---- security/coreconf/SunOS5.mk.orig 2006-02-02 13:19:58.000000000 +0100 +--- security/coreconf/SunOS5.mk.orig 2006-04-25 03:32:16.000000000 +0200 +++ security/coreconf/SunOS5.mk -@@ -182,6 +182,10 @@ endif - DSO_LDOPTS += -G -h $(notdir $@) +@@ -176,6 +176,10 @@ endif endif + DSO_LDOPTS += -z combreloc -z defs -z ignore +ifdef LIBRUNPATH +DSO_LDOPTS += -R$(LIBRUNPATH) -- cgit v1.2.3