From bd32534789b80c413687e4d5bb61261072acd4de Mon Sep 17 00:00:00 2001 From: martynas Date: Wed, 8 Aug 2007 17:34:41 +0000 Subject: [PATCH] security update to minimo-20070804 which fixes recent gecko vulnerabilities (and has some minimo-2.0 interface fixes); ok naddy@ tested by kili@ on zaurus, thank you. --- www/minimo/Makefile | 9 ++++----- www/minimo/distinfo | 10 +++++----- www/minimo/patches/patch-configure_in | 10 +++++----- .../patch-minimo_chrome_content_minimo_js | 10 +++++----- .../patches/patch-minimo_customization_all_js | 8 ++++---- ...patch-modules_plugin_base_public_nptypes_h | 15 -------------- ...l_src_md_unix_xptc_platforms_unixish_x86_h | 20 ------------------- 7 files changed, 23 insertions(+), 59 deletions(-) delete mode 100644 www/minimo/patches/patch-modules_plugin_base_public_nptypes_h delete mode 100644 www/minimo/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h diff --git a/www/minimo/Makefile b/www/minimo/Makefile index b90f6de49da..2026223f4b2 100644 --- a/www/minimo/Makefile +++ b/www/minimo/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2007/06/09 17:59:52 martynas Exp $ +# $OpenBSD: Makefile,v 1.39 2007/08/08 17:34:41 martynas Exp $ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64 SHARED_ONLY= Yes COMMENT= "small, simple, and powerful web browser for mobile devices" -DISTNAME= minimo-20070320 -PKGNAME= ${DISTNAME}p0 +DISTNAME= minimo-20070804 CATEGORIES= www MASTER_SITES= http://mirrors.protection.cx/~martynas/mozilla/minimo/ \ @@ -29,8 +28,8 @@ LIB_DEPENDS= jpeg.>=62::graphics/jpeg \ gdk-x11-2.0.>=600.0,gdk_pixbuf-2.0.>=600.0,gtk-x11-2.0.>=600.0::x11/gtk+2 \ nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \ nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss -WANTLIB= X11 Xft Xrender Xt Xau Xdmcp expat \ - c fontconfig freetype m pthread z \ +WANTLIB= X11 Xcursor Xext Xfixes Xft Xi Xinerama Xrandr Xrender \ + Xt Xau Xdmcp expat c fontconfig freetype m pthread z \ atk-1.0.>=1011.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \ gobject-2.0.>=600.0 pango-1.0.>=800.0 pangocairo-1.0 \ pangoft2-1.0 cairo glitz stdc++ diff --git a/www/minimo/distinfo b/www/minimo/distinfo index 3a9de7f645c..83bf33bf050 100644 --- a/www/minimo/distinfo +++ b/www/minimo/distinfo @@ -1,5 +1,5 @@ -MD5 (minimo-20070320.tar.gz) = +kPrlcEawj5AzYHS05ck9g== -RMD160 (minimo-20070320.tar.gz) = wzVb8gffosQGFlxzvQHK/J09fJk= -SHA1 (minimo-20070320.tar.gz) = BUEmLeCwIgH1MIro5cAuPwVVX/M= -SHA256 (minimo-20070320.tar.gz) = qwc36Vy8wdoUF6Q1q7FZBtRcsyRsLONIkCNzriJ45T0= -SIZE (minimo-20070320.tar.gz) = 44860854 +MD5 (minimo-20070804.tar.gz) = UIlNJlvxbAjaVW2w0AtP7w== +RMD160 (minimo-20070804.tar.gz) = ldJWfjKtUUyiB5xi6zdfkms8vzg= +SHA1 (minimo-20070804.tar.gz) = 8Wy3lMrN0c2/2pR+nltAGz/NzpM= +SHA256 (minimo-20070804.tar.gz) = Fe/yr6ZZX24u+n/4leonTyMKpVa/eymq9YrONLopr2w= +SIZE (minimo-20070804.tar.gz) = 45007312 diff --git a/www/minimo/patches/patch-configure_in b/www/minimo/patches/patch-configure_in index 1bcf25b0cd1..7c455f06901 100644 --- a/www/minimo/patches/patch-configure_in +++ b/www/minimo/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.6 2007/04/01 13:19:58 martynas Exp $ ---- configure.in.orig Sat Oct 28 06:29:25 2006 -+++ configure.in Sat Nov 18 21:52:21 2006 -@@ -3804,7 +3804,7 @@ _SAVE_LIBS=$LIBS +$OpenBSD: patch-configure_in,v 1.7 2007/08/08 17:34:41 martynas Exp $ +--- configure.in.orig Wed Jul 25 21:27:50 2007 ++++ configure.in Sun Aug 5 15:56:35 2007 +@@ -3872,7 +3872,7 @@ _SAVE_LIBS=$LIBS CFLAGS="$ZLIB_CFLAGS $CFLAGS" LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS" if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.6 2007/04/01 13:19:58 martynas Exp $ LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS" fi if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then -@@ -3834,7 +3834,7 @@ LDFLAGS=$_SAVE_LDFLAGS +@@ -3902,7 +3902,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then diff --git a/www/minimo/patches/patch-minimo_chrome_content_minimo_js b/www/minimo/patches/patch-minimo_chrome_content_minimo_js index 88057061510..8270463018b 100644 --- a/www/minimo/patches/patch-minimo_chrome_content_minimo_js +++ b/www/minimo/patches/patch-minimo_chrome_content_minimo_js @@ -1,6 +1,6 @@ -$OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.5 2007/04/01 13:19:58 martynas Exp $ ---- minimo/chrome/content/minimo.js.orig Fri Feb 16 02:27:09 2007 -+++ minimo/chrome/content/minimo.js Sun Apr 1 13:48:18 2007 +$OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.6 2007/08/08 17:34:41 martynas Exp $ +--- minimo/chrome/content/minimo.js.orig Fri May 25 00:23:25 2007 ++++ minimo/chrome/content/minimo.js Sun Aug 5 15:56:18 2007 @@ -400,10 +400,6 @@ function MiniNavStartup() gPref = Components.classes["@mozilla.org/preferences-service;1"] .getService(nsIPrefBranch); @@ -21,7 +21,7 @@ $OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.5 2007/04/01 13:19:58 martyn if ( page.split("|").length > 1 ) { homepages = page.split("|"); } else { -@@ -1629,7 +1623,8 @@ function FullScreenToggle() +@@ -1685,7 +1679,8 @@ function FullScreenToggle() function DoFullScreen(fullscreen) { @@ -31,7 +31,7 @@ $OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.5 2007/04/01 13:19:58 martyn // Show a Quit in the context menu document.getElementById("context_menu_quit").hidden = !fullscreen; -@@ -2275,7 +2270,7 @@ function BrowserFileOpen() { +@@ -2331,7 +2326,7 @@ function BrowserFileOpen() { fp.init(window, null, nsIFilePicker.modeOpenMultiple); var fileCustomDirFile= refLocalFile.QueryInterface(nsILocalFile); diff --git a/www/minimo/patches/patch-minimo_customization_all_js b/www/minimo/patches/patch-minimo_customization_all_js index 4945d848eda..dc2a190da2e 100644 --- a/www/minimo/patches/patch-minimo_customization_all_js +++ b/www/minimo/patches/patch-minimo_customization_all_js @@ -1,7 +1,7 @@ -$OpenBSD: patch-minimo_customization_all_js,v 1.2 2007/04/01 09:36:15 martynas Exp $ ---- minimo/customization/all.js.orig Fri Feb 16 01:42:42 2007 -+++ minimo/customization/all.js Wed Mar 28 12:08:10 2007 -@@ -623,8 +623,6 @@ pref("network.autodial-helper.enabled", true); +$OpenBSD: patch-minimo_customization_all_js,v 1.3 2007/08/08 17:34:41 martynas Exp $ +--- minimo/customization/all.js.orig Fri May 25 10:28:14 2007 ++++ minimo/customization/all.js Sun Aug 5 15:56:18 2007 +@@ -621,8 +621,6 @@ pref("network.autodial-helper.enabled", true); pref("config.wince.overrideHWKeys", false); diff --git a/www/minimo/patches/patch-modules_plugin_base_public_nptypes_h b/www/minimo/patches/patch-modules_plugin_base_public_nptypes_h deleted file mode 100644 index b28c7173936..00000000000 --- a/www/minimo/patches/patch-modules_plugin_base_public_nptypes_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.2 2007/04/01 13:19:58 martynas Exp $ ---- modules/plugin/base/public/nptypes.h.orig Fri May 20 00:49:42 2005 -+++ modules/plugin/base/public/nptypes.h Mon Oct 30 18:18:44 2006 -@@ -67,10 +67,8 @@ - - /* - * BSD/OS ships no header that defines uint32_t, nor bool (for C) -- * OpenBSD ships no header that defines uint32_t and using its bool macro is -- * unsafe. - */ -- #if defined(bsdi) || defined(OPENBSD) -+ #if defined(bsdi) - typedef u_int32_t uint32_t; - - #if !defined(__cplusplus) diff --git a/www/minimo/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h b/www/minimo/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h deleted file mode 100644 index 255b95ba15e..00000000000 --- a/www/minimo/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.2 2006/12/04 09:47:54 jolan Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig Thu Feb 23 21:37:11 2006 -+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Mon Oct 30 18:18:44 2006 -@@ -107,12 +107,16 @@ - #define THUNK_BASED_THIS_ADJUST - - #elif defined(__OpenBSD__) -+#if __GNUC__ >= 3 -+#define THUNK_BASED_THIS_ADJUST -+#else - /* OpenBSD instroduces GCC 2.95.x in late May 1999 */ - #include - #if OpenBSD <= 199905 - #define THUNK_BASED_THIS_ADJUST - #else - #define CFRONT_STYLE_THIS_ADJUST -+#endif - #endif - - #elif defined(__bsdi__)