From bff2c19c3e8aeb5a3f14a8738ad42b5d6dac2b54 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 6 Mar 2011 19:04:09 +0000 Subject: Pullup ticket #3379 - requested by tnn mail/thunderbird: security update Revisions pulled up: - mail/thunderbird/Makefile 1.66 via patch - mail/thunderbird/distinfo 1.78 - mail/thunderbird/patches/patch-directory_c-sdk_configure.in 1.2 - mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h 1.3 - mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in 1.2 - mail/thunderbird/patches/patch-mm 1.4 --- Module Name: pkgsrc Committed By: tnn Date: Sat Mar 5 13:09:36 UTC 2011 Modified Files: pkgsrc/mail/thunderbird: Makefile distinfo pkgsrc/mail/thunderbird/patches: patch-directory_c-sdk_configure.in patch-directory_c-sdk_ldap_include_portable.h patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in patch-mm Log Message: Stability and security update of thunderbird to 3.1.8. MFSA 2011-09 Crash caused by corrupted JPEG image MFSA 2011-08 ParanoidFragmentSink allows javascript: URLs in chrome documents MFSA 2011-01 Miscellaneous memory safety hazards (rv:1.9.2.14/ 1.9.1.17) --- mail/thunderbird/Makefile | 12 ++++++------ mail/thunderbird/distinfo | 16 ++++++++-------- .../patches/patch-directory_c-sdk_configure.in | 6 +++--- .../patch-directory_c-sdk_ldap_include_portable.h | 6 +++--- ...ch-directory_c-sdk_ldap_libraries_libldap_Makefile.in | 6 +++--- mail/thunderbird/patches/patch-mm | 9 ++++----- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 1b425402d2f..6feb0f5c317 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.64 2010/12/11 14:34:40 tnn Exp $ +# $NetBSD: Makefile,v 1.64.2.1 2011/03/06 19:04:09 tron Exp $ # DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird-${TB_VER} -TB_VER= 3.1.7 +TB_VER= 3.1.8 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} EXTRACT_SUFX= .tar.bz2 @@ -17,8 +17,8 @@ WRKSRC= ${WRKDIR}/comm-1.9.2 MOZILLA_DIR= mozilla/ PLIST_SRC+= PLIST -CONFIG_GUESS_OVERRIDE+= directory/c-sdk/config/autoconf/config.guess -CONFIG_SUB_OVERRIDE+= directory/c-sdk/config/autoconf/config.sub +CONFIG_GUESS_OVERRIDE+= directory/sdks/c-sdk/config/autoconf/config.guess +CONFIG_SUB_OVERRIDE+= directory/sdks/c-sdk/config/autoconf/config.sub CONFIGURE_ARGS+= --enable-application=mail CONFIGURE_ARGS+= --enable-static @@ -26,12 +26,12 @@ CONFIGURE_ARGS+= --enable-static ALL_ENV+= MOZILLA_PKG_NAME=thunderbird pre-configure: - cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf + cd ${WRKSRC}/directory/sdks/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${CONFIGURE_ENV} autoconf - cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf + cd ${WRKSRC}/directory/sdks/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf do-build: # XXX for some reason it doesn't work unless -j is explicitly specified diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 03cf84545d4..16d43f009a6 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.77 2010/12/11 14:34:40 tnn Exp $ +$NetBSD: distinfo,v 1.77.2.1 2011/03/06 19:04:09 tron Exp $ SHA1 (enigmail-1.1.2.tar.gz) = d29fce2b20a36d210b12c28fcbbee965007c95aa RMD160 (enigmail-1.1.2.tar.gz) = 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 Size (enigmail-1.1.2.tar.gz) = 1280923 bytes -SHA1 (thunderbird-3.1.7.source.tar.bz2) = c2d6cdedfe399c1ab41c00045e4fce835cc0b36f -RMD160 (thunderbird-3.1.7.source.tar.bz2) = c5e25004565decf1467a9b452139c0aedec4299e -Size (thunderbird-3.1.7.source.tar.bz2) = 65948060 bytes +SHA1 (thunderbird-3.1.8.source.tar.bz2) = 58230d0bfbc69f45d754d8eb7ad012f1debfe203 +RMD160 (thunderbird-3.1.8.source.tar.bz2) = ffa7a0c7b9ca4f1dac25c7bbf8111ab4a9096601 +Size (thunderbird-3.1.8.source.tar.bz2) = 68613204 bytes SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214 SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094 SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd @@ -38,9 +38,9 @@ SHA1 (patch-bb) = 7cb648a5f20b3b61a24494e502bd49b535bb8055 SHA1 (patch-be) = 2aa2489137e357e05f3f3a9689895b3759e3e52d SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3 SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c -SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36 -SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 0e1c188af241289ce0a9fc252a063a69f3d504a4 -SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781 +SHA1 (patch-directory_c-sdk_configure.in) = cbcede9868193a2ebba09da5599bedf9fb15f39f +SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 5951d5ee6f979d5ca31fb3fcf0f7c9ed4ebe4a9a +SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 5f30abc4d0f0d2f3d5038cd8e98626774988da46 SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986 SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31 SHA1 (patch-mb) = c27a2a8891bd5215fef9b920baa87499424d278f @@ -53,7 +53,7 @@ SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68 -SHA1 (patch-mm) = 1ef13fbf0872484778cb8edfff769214ea9a39a4 +SHA1 (patch-mm) = 1230e48b3c2bd2735d4065fabd48a3afe548e125 SHA1 (patch-mn) = 3a1c25a3f5a1532331424fc1e720f35cd0ed5d5b SHA1 (patch-mp) = 24bac4975548f0a058c2770865706fedb27aa0e6 SHA1 (patch-nd) = 007b8d1310990253e86dab579397b02ced42cb71 diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_configure.in b/mail/thunderbird/patches/patch-directory_c-sdk_configure.in index 8e7645c3f5d..94a1e1f049f 100644 --- a/mail/thunderbird/patches/patch-directory_c-sdk_configure.in +++ b/mail/thunderbird/patches/patch-directory_c-sdk_configure.in @@ -1,10 +1,10 @@ -$NetBSD: patch-directory_c-sdk_configure.in,v 1.1 2010/07/12 16:49:22 tnn Exp $ +$NetBSD: patch-directory_c-sdk_configure.in,v 1.1.6.1 2011/03/06 19:04:10 tron Exp $ Add DragonFly support. https://bugzilla.mozilla.org/show_bug.cgi?id=577298 ---- directory/c-sdk/configure.in.orig 2009-10-06 21:43:08.000000000 +0000 -+++ directory/c-sdk/configure.in +--- directory/sdks/c-sdk/configure.in.orig 2009-10-06 21:43:08.000000000 +0000 ++++ directory/sdks/c-sdk/configure.in @@ -1233,6 +1233,16 @@ tools are selected during the Xcode/Deve _DEBUG_FLAGS= ;; diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h index dd30de8542a..1064d24da80 100644 --- a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h +++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h @@ -1,10 +1,10 @@ -$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.2 2010/07/21 11:48:05 tnn Exp $ +$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.2.6.1 2011/03/06 19:04:10 tron Exp $ Add DragonFly support. https://bugzilla.mozilla.org/show_bug.cgi?id=577298 ---- directory/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000 -+++ directory/c-sdk/ldap/include/portable.h +--- directory/sdks/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000 ++++ directory/sdks/c-sdk/ldap/include/portable.h @@ -122,8 +122,11 @@ * some systems don't have the BSD re_comp and re_exec routines */ diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in index a8291cbad1b..f4d5a8c8fec 100644 --- a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in +++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in,v 1.1 2010/07/12 16:49:22 tnn Exp $ +$NetBSD: patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in,v 1.1.6.1 2011/03/06 19:04:10 tron Exp $ Add DragonFly support. https://bugzilla.mozilla.org/show_bug.cgi?id=577298 ---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2008-12-24 09:39:55.000000000 +0000 -+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in +--- directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2008-12-24 09:39:55.000000000 +0000 ++++ directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in @@ -262,6 +262,10 @@ ifeq ($(OS_ARCH), OpenBSD) EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread endif diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm index ebd6fb77a84..0a1fe750103 100644 --- a/mail/thunderbird/patches/patch-mm +++ b/mail/thunderbird/patches/patch-mm @@ -1,11 +1,11 @@ -$NetBSD: patch-mm,v 1.3 2010/09/09 10:58:51 tnn Exp $ +$NetBSD: patch-mm,v 1.3.4.1 2011/03/06 19:04:10 tron Exp $ Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman. part of PR pkg/39085 ---- mozilla/toolkit/library/Makefile.in.orig 2010-08-24 21:32:11.000000000 +0000 +--- mozilla/toolkit/library/Makefile.in.orig 2011-02-21 11:47:17.000000000 +0000 +++ mozilla/toolkit/library/Makefile.in -@@ -253,7 +253,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker +@@ -253,13 +253,20 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker endif ifeq ($(OS_ARCH),SunOS) @@ -17,8 +17,7 @@ part of PR pkg/39085 endif ifeq ($(OS_ARCH),AIX) -@@ -262,6 +265,10 @@ EXTRA_DSO_LDOPTS += -bbigtoc - endif + EXTRA_DSO_LDOPTS += -bbigtoc endif +ifeq ($(OS_ARCH),NetBSD) -- cgit v1.2.3