From 270eb2d3939b893d49c99dc9d574b4eb2d12c02a Mon Sep 17 00:00:00 2001 From: bernd Date: Fri, 29 Feb 2008 21:49:48 +0000 Subject: [PATCH] Security update to mozilla-thunderbird-2.0.0.12 to fix multiple vulnerabilities. More information: http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunderbird$ Tested by many. Thank you! ok ian@, martynas@, kurt@, pvalchev@ --- mail/mozilla-thunderbird/Makefile | 6 +++--- mail/mozilla-thunderbird/distinfo | 10 +++++----- .../patches/patch-configure_in | 12 ++++++------ .../patches/patch-js_src_jsnum_h | 15 +++++++-------- .../patches/patch-mail_app_mozilla_in | 8 ++++---- .../patches/patch-modules_libpref_src_init_all_js | 10 +++++----- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile index 72b9fe28a5c..2d9e4ffb595 100644 --- a/mail/mozilla-thunderbird/Makefile +++ b/mail/mozilla-thunderbird/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.67 2008/02/12 23:19:37 sthen Exp $ +# $OpenBSD: Makefile,v 1.68 2008/02/29 21:49:48 bernd Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 COMMENT= redesign of Mozilla's mail component -VER= 2.0.0.9 +VER= 2.0.0.12 DISTNAME= mozilla -PKGNAME= mozilla-thunderbird-${VER}p2 +PKGNAME= mozilla-thunderbird-${VER} SO_VERSION= 13.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. Whenever PKGNAME gets diff --git a/mail/mozilla-thunderbird/distinfo b/mail/mozilla-thunderbird/distinfo index 9bb42e4b346..3585c4a7630 100644 --- a/mail/mozilla-thunderbird/distinfo +++ b/mail/mozilla-thunderbird/distinfo @@ -1,5 +1,5 @@ -MD5 (thunderbird-2.0.0.9-source.tar.bz2) = pt10+H2vx1FueXDs7+4Eaw== -RMD160 (thunderbird-2.0.0.9-source.tar.bz2) = Cn4663a072yEY0spNehPVtyFkFE= -SHA1 (thunderbird-2.0.0.9-source.tar.bz2) = /t6duY8lrbl4uEEpptFaTb5ruz4= -SHA256 (thunderbird-2.0.0.9-source.tar.bz2) = v/QHg3mr2GFoEeBvhIqq69LPObeucMFDQ3fCqqpv7IA= -SIZE (thunderbird-2.0.0.9-source.tar.bz2) = 37562994 +MD5 (thunderbird-2.0.0.12-source.tar.bz2) = wj9Xao/Qzu5RNYKciuUWiw== +RMD160 (thunderbird-2.0.0.12-source.tar.bz2) = gNb9tLjghagiNIJc+/xs0F0BX28= +SHA1 (thunderbird-2.0.0.12-source.tar.bz2) = NupkNT0yqfE472WCUM/c+PnoYvI= +SHA256 (thunderbird-2.0.0.12-source.tar.bz2) = p+05vKxjV2h/l1jwsSgunwVF4SJ3tPxExwUGZZwlp7Y= +SIZE (thunderbird-2.0.0.12-source.tar.bz2) = 37485204 diff --git a/mail/mozilla-thunderbird/patches/patch-configure_in b/mail/mozilla-thunderbird/patches/patch-configure_in index a5a1b81aac5..a2353914483 100644 --- a/mail/mozilla-thunderbird/patches/patch-configure_in +++ b/mail/mozilla-thunderbird/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.13 2007/11/16 21:32:11 martynas Exp $ ---- configure.in.orig Thu Sep 13 06:48:33 2007 -+++ configure.in Tue Nov 13 20:37:13 2007 -@@ -1979,7 +1979,7 @@ case "$target" in +$OpenBSD: patch-configure_in,v 1.14 2008/02/29 21:49:48 bernd Exp $ +--- configure.in.orig Tue Dec 18 22:34:10 2007 ++++ configure.in Wed Feb 27 12:37:49 2008 +@@ -2028,7 +2028,7 @@ case "$target" in ;; *-openbsd*) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.13 2007/11/16 21:32:11 martynas Exp $ DSO_CFLAGS='' DSO_PIC_CFLAGS='-fPIC' DSO_LDOPTS='-shared -fPIC' -@@ -3877,7 +3877,7 @@ _SAVE_LIBS=$LIBS +@@ -3878,7 +3878,7 @@ _SAVE_LIBS=$LIBS CFLAGS="$ZLIB_CFLAGS $CFLAGS" LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS" if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.13 2007/11/16 21:32:11 martynas Exp $ LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS" fi if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then -@@ -3907,7 +3907,7 @@ LDFLAGS=$_SAVE_LDFLAGS +@@ -3908,7 +3908,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then diff --git a/mail/mozilla-thunderbird/patches/patch-js_src_jsnum_h b/mail/mozilla-thunderbird/patches/patch-js_src_jsnum_h index 0ed5ee56949..a11879b1dbe 100644 --- a/mail/mozilla-thunderbird/patches/patch-js_src_jsnum_h +++ b/mail/mozilla-thunderbird/patches/patch-js_src_jsnum_h @@ -1,13 +1,12 @@ -$OpenBSD: patch-js_src_jsnum_h,v 1.1 2008/02/12 23:19:37 sthen Exp $ ---- js/src/jsnum.h.orig Sun Feb 10 22:56:20 2008 -+++ js/src/jsnum.h Sun Feb 10 22:54:34 2008 -@@ -61,7 +61,9 @@ JS_BEGIN_EXTERN_C +$OpenBSD: patch-js_src_jsnum_h,v 1.2 2008/02/29 21:49:48 bernd Exp $ +--- js/src/jsnum.h.orig Thu Nov 1 21:52:24 2007 ++++ js/src/jsnum.h Wed Feb 27 12:39:54 2008 +@@ -61,7 +61,7 @@ JS_BEGIN_EXTERN_C */ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) -+#if !defined(__QNXNTO__) && !defined(__OpenBSD__) /* Armel ABI */ +-#ifndef __QNXNTO__ ++#if !defined(__QNXNTO__) && !defined(__OpenBSD__) #define CPU_IS_ARM -+#endif #endif - - typedef union jsdpun { + #endif diff --git a/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in b/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in index fa62893f091..261a4f26e9c 100644 --- a/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in +++ b/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-mail_app_mozilla_in,v 1.8 2007/06/13 12:06:59 martynas Exp $ ---- mail/app/mozilla.in.orig Wed Sep 21 00:13:05 2005 -+++ mail/app/mozilla.in Wed Jun 13 00:29:03 2007 +$OpenBSD: patch-mail_app_mozilla_in,v 1.9 2008/02/29 21:49:48 bernd Exp $ +--- mail/app/mozilla.in.orig Fri Jan 11 04:20:02 2008 ++++ mail/app/mozilla.in Wed Feb 27 12:37:51 2008 @@ -92,7 +92,13 @@ moz_pis_startstop_scripts() #uncomment for debugging #set -x @@ -15,7 +15,7 @@ $OpenBSD: patch-mail_app_mozilla_in,v 1.8 2007/06/13 12:06:59 martynas Exp $ MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists -@@ -170,7 +176,11 @@ do +@@ -171,7 +177,11 @@ do esac done diff --git a/mail/mozilla-thunderbird/patches/patch-modules_libpref_src_init_all_js b/mail/mozilla-thunderbird/patches/patch-modules_libpref_src_init_all_js index d43d8e77d55..6d11fd052d9 100644 --- a/mail/mozilla-thunderbird/patches/patch-modules_libpref_src_init_all_js +++ b/mail/mozilla-thunderbird/patches/patch-modules_libpref_src_init_all_js @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.6 2007/11/16 21:32:11 martynas Exp $ ---- modules/libpref/src/init/all.js.orig Thu Sep 13 22:06:23 2007 -+++ modules/libpref/src/init/all.js Tue Nov 13 20:36:32 2007 -@@ -1933,33 +1933,33 @@ pref("font.name.monospace.ko", "monospace"); +$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.7 2008/02/29 21:49:48 bernd Exp $ +--- modules/libpref/src/init/all.js.orig Thu Jan 24 23:05:10 2008 ++++ modules/libpref/src/init/all.js Wed Feb 27 12:37:51 2008 +@@ -1940,33 +1940,33 @@ pref("font.name.monospace.ko", "monospace"); // th @@ -50,7 +50,7 @@ $OpenBSD: patch-modules_libpref_src_init_all_js,v 1.6 2007/11/16 21:32:11 martyn pref("font.name.serif.zh-CN", "serif"); pref("font.name.sans-serif.zh-CN", "sans-serif"); -@@ -2099,7 +2099,7 @@ pref("font.scale.outline.min", 6); +@@ -2106,7 +2106,7 @@ pref("font.scale.outline.min", 6); // TrueType pref("font.FreeType2.enable", false);