From 0f165eda60c449e5ef17e00548e0cea27ac3790e Mon Sep 17 00:00:00 2001 From: martynas Date: Wed, 28 Nov 2007 20:22:25 +0000 Subject: [PATCH] - security update to mozilla-firefox-2.0.0.10: http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.10 - fix canvas.drawImage regression. ok kurt@, kili@ --- www/mozilla-firefox/Makefile | 4 ++-- www/mozilla-firefox/distinfo | 10 +++++----- .../patches/patch-browser_app_mozilla_in | 8 ++++---- www/mozilla-firefox/patches/patch-configure_in | 12 ++++++------ ...ent_canvas_src_nsCanvasRenderingContext2D_cpp | 12 ++++++++++++ www/mozilla-firefox/patches/patch-js_src_jsnum_h | 16 ++++++++-------- .../patch-modules_libpref_src_init_all_js | 10 +++++----- 7 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 www/mozilla-firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index 755c0c19377..59224ffcf9e 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.85 2007/11/08 16:07:42 martynas Exp $ +# $OpenBSD: Makefile,v 1.86 2007/11/28 20:22:25 martynas Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 COMMENT-main= redesign of Mozilla's browser component COMMENT-devel= devel files for Gecko -VER= 2.0.0.9 +VER= 2.0.0.10 DISTNAME= mozilla PKGNAME= mozilla-firefox-${VER} PKGNAME-main= mozilla-firefox-${VER} diff --git a/www/mozilla-firefox/distinfo b/www/mozilla-firefox/distinfo index aec00c9490e..db078b7b9d2 100644 --- a/www/mozilla-firefox/distinfo +++ b/www/mozilla-firefox/distinfo @@ -1,5 +1,5 @@ -MD5 (firefox-2.0.0.9-source.tar.bz2) = apd0Vtx9opNKEro5fEBPuQ== -RMD160 (firefox-2.0.0.9-source.tar.bz2) = DJwTxo2LSZ8qFg/EGVV8sKXYgJU= -SHA1 (firefox-2.0.0.9-source.tar.bz2) = OznUEoU00Y9+LE12oUVhwYVW7/A= -SHA256 (firefox-2.0.0.9-source.tar.bz2) = VjFEbkdjZ3YmQjylSQLAhyqobdFciGpEbtwx5UHdtJQ= -SIZE (firefox-2.0.0.9-source.tar.bz2) = 37451933 +MD5 (firefox-2.0.0.10-source.tar.bz2) = XC8T1qJ/Ri7GuGLa/KIuew== +RMD160 (firefox-2.0.0.10-source.tar.bz2) = U1az03lJaAdESC0djAabXyM0/sU= +SHA1 (firefox-2.0.0.10-source.tar.bz2) = cUbzH+n0zm2+pezZj5k6i2AVR3A= +SHA256 (firefox-2.0.0.10-source.tar.bz2) = xocolDhjt8f3NjyURuweCHGY9niXzKWKM3PnYaL1lco= +SIZE (firefox-2.0.0.10-source.tar.bz2) = 37474489 diff --git a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in index 8d2b9faf4c3..1a4fa599904 100644 --- a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in +++ b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-browser_app_mozilla_in,v 1.7 2007/06/12 16:45:37 martynas Exp $ ---- browser/app/mozilla.in.orig Wed Sep 21 00:13:03 2005 -+++ browser/app/mozilla.in Tue Jun 12 18:24:57 2007 +$OpenBSD: patch-browser_app_mozilla_in,v 1.8 2007/11/28 20:22:25 martynas Exp $ +--- browser/app/mozilla.in.orig Thu Nov 8 10:53:19 2007 ++++ browser/app/mozilla.in Tue Nov 27 11:43:00 2007 @@ -92,7 +92,13 @@ moz_pis_startstop_scripts() #uncomment for debugging #set -x @@ -15,7 +15,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.7 2007/06/12 16:45:37 martynas Exp $ MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists -@@ -171,7 +177,11 @@ do +@@ -172,7 +178,11 @@ do esac done diff --git a/www/mozilla-firefox/patches/patch-configure_in b/www/mozilla-firefox/patches/patch-configure_in index 174506d2e54..9436088ee80 100644 --- a/www/mozilla-firefox/patches/patch-configure_in +++ b/www/mozilla-firefox/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.11 2007/10/23 20:13:26 martynas Exp $ ---- configure.in.orig Thu Sep 13 06:48:33 2007 -+++ configure.in Fri Oct 19 14:29:21 2007 -@@ -1979,7 +1979,7 @@ case "$target" in +$OpenBSD: patch-configure_in,v 1.12 2007/11/28 20:22:25 martynas Exp $ +--- configure.in.orig Thu Nov 8 21:13:08 2007 ++++ configure.in Tue Nov 27 11:43:26 2007 +@@ -1994,7 +1994,7 @@ case "$target" in ;; *-openbsd*) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.11 2007/10/23 20:13:26 martynas Exp $ DSO_CFLAGS='' DSO_PIC_CFLAGS='-fPIC' DSO_LDOPTS='-shared -fPIC' -@@ -3877,7 +3877,7 @@ _SAVE_LIBS=$LIBS +@@ -3892,7 +3892,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.11 2007/10/23 20:13:26 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 +@@ -3922,7 +3922,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then diff --git a/www/mozilla-firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp b/www/mozilla-firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp new file mode 100644 index 00000000000..fbf97044dc1 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-content_canvas_src_nsCanvasRenderingContext2D_cpp,v 1.1 2007/11/28 20:22:26 martynas Exp $ +--- content/canvas/src/nsCanvasRenderingContext2D.cpp.orig Wed Nov 14 13:34:35 2007 ++++ content/canvas/src/nsCanvasRenderingContext2D.cpp Tue Nov 27 20:33:10 2007 +@@ -2143,7 +2143,7 @@ nsCanvasRenderingContext2D::CairoSurfaceFromElement(ns + + PRUint32 status; + imgRequest->GetImageStatus(&status); +- if (status != imgIRequest::STATUS_LOAD_COMPLETE) ++ if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0) + return NS_ERROR_NOT_AVAILABLE; + + nsCOMPtr uri; diff --git a/www/mozilla-firefox/patches/patch-js_src_jsnum_h b/www/mozilla-firefox/patches/patch-js_src_jsnum_h index a3d5a579834..420714fb8ae 100644 --- a/www/mozilla-firefox/patches/patch-js_src_jsnum_h +++ b/www/mozilla-firefox/patches/patch-js_src_jsnum_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-js_src_jsnum_h,v 1.1 2007/02/26 14:21:26 robert Exp $ ---- js/src/jsnum.h.orig Sat Feb 24 15:05:49 2007 -+++ js/src/jsnum.h Sat Feb 24 15:06:35 2007 -@@ -60,7 +60,7 @@ JS_BEGIN_EXTERN_C - * are stored in big endian`s way. +$OpenBSD: patch-js_src_jsnum_h,v 1.2 2007/11/28 20:22:26 martynas Exp $ +--- js/src/jsnum.h.orig Thu Nov 1 22:52:24 2007 ++++ js/src/jsnum.h Fri Nov 9 15:33:55 2007 +@@ -61,7 +61,7 @@ JS_BEGIN_EXTERN_C */ --#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) -+#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) && !defined(__OpenBSD__) /* Armel ABI */ + #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) +-#ifndef __QNXNTO__ ++#if !defined(__QNXNTO__) && !defined(__OpenBSD__) /* Armel ABI */ #define CPU_IS_ARM #endif - + #endif diff --git a/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js b/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js index b3943a8d15d..4909c561d28 100644 --- a/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js +++ b/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.9 2007/10/23 20:13:26 martynas Exp $ ---- modules/libpref/src/init/all.js.orig Thu Sep 13 22:06:23 2007 -+++ modules/libpref/src/init/all.js Fri Oct 19 14:28:51 2007 -@@ -1933,33 +1933,33 @@ pref("font.name.monospace.ko", "monospace"); +$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.10 2007/11/28 20:22:26 martynas Exp $ +--- modules/libpref/src/init/all.js.orig Thu Nov 15 02:17:31 2007 ++++ modules/libpref/src/init/all.js Tue Nov 27 11:43:01 2007 +@@ -1938,33 +1938,33 @@ pref("font.name.monospace.ko", "monospace"); // th @@ -50,7 +50,7 @@ $OpenBSD: patch-modules_libpref_src_init_all_js,v 1.9 2007/10/23 20:13:26 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); +@@ -2104,7 +2104,7 @@ pref("font.scale.outline.min", 6); // TrueType pref("font.FreeType2.enable", false);