cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mozilla-firefox 3.6.6. Fixes a bunch of MFSA, see

Browse Source 
http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
The new plugin sandboxing code is disabled because :
- it only supports binary blobs plugins we don't have
- it is an horrible maze of #ifdef linux-apple-win32 coming straight
  from an old version of chromium. Future versions should have better BSD
support..
tested by several on ports@, thanks!
This commit is contained in:
landry 2010-06-28 21:24:22 +00:00
parent 3d794a8ec3
commit 4d98df5567
12 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/mozilla-firefox/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.139 2010/06/16 19:05:40 landry Exp $
# $OpenBSD: Makefile,v 1.140 2010/06/28 21:24:22 landry Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
COMMENT= redesign of Mozilla's browser component
VER= 3.6.3
VER= 3.6.6
DISTNAME= mozilla-1.9.2
PKGNAME= mozilla-firefox-${VER}p4
SO_VERSION= 21.1
PKGNAME= mozilla-firefox-${VER}
SO_VERSION= 22.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
.for _lib in browsercomps browserdirprovider imgicon mozjs \
@ -80,6 +80,7 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
--disable-gnomeui \
--disable-gnomevfs \
--disable-dbus \
--disable-ipc \
--enable-xinerama \
--enable-svg \
--enable-svg-renderer=cairo \

10
www/mozilla-firefox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (firefox-3.6.3.source.tar.bz2) = XkVBqyMIS3sUuiKCkc4miA==
RMD160 (firefox-3.6.3.source.tar.bz2) = 3lVuhga7xhy30g/m8wjwxei53Xc=
SHA1 (firefox-3.6.3.source.tar.bz2) = 87zYCDVtFr2ya/zxpkolFIjE/QI=
SHA256 (firefox-3.6.3.source.tar.bz2) = NaCzXXm6pQK2xXge0+nEtetiO9rxlARg3PRlGShIotA=
SIZE (firefox-3.6.3.source.tar.bz2) = 48633061
MD5 (firefox-3.6.6.source.tar.bz2) = yaBxsxu5DQXt+5MRfQp1Nw==
RMD160 (firefox-3.6.6.source.tar.bz2) = wc9bcq5C6c6YuN7P6InDMueIUMg=
SHA1 (firefox-3.6.6.source.tar.bz2) = kHu/NXvWUok6WPu2QffnsrTcH1c=
SHA256 (firefox-3.6.6.source.tar.bz2) = WbhycflAaE9Rzda+y8/a+ZpaWICUi6B879B0dMmrBrM=
SIZE (firefox-3.6.6.source.tar.bz2) = 51076968

12
www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.3 2010/05/10 12:36:09 espie Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Wed Mar 17 19:32:26 2010
+++ accessible/src/atk/nsAppRootAccessible.cpp Mon May 10 09:47:01 2010
@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.4 2010/06/28 21:24:22 landry Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Fri Jun 11 22:40:50 2010
+++ accessible/src/atk/nsAppRootAccessible.cpp Thu Jun 24 10:08:30 2010
@@ -56,7 +56,7 @@ typedef GType (* AtkGetTypeType) (void);
GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
static PRBool sATKChecked = PR_FALSE;
static PRLibrary *sATKLib = nsnull;
@ -10,7 +10,7 @@ $OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.3 2010/05/10 12:3
static const char sATKHyperlinkImplGetTypeSymbol[] =
"atk_hyperlink_impl_get_type";
static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
@@ -117,8 +117,8 @@ static GHashTable *key_listener_list = NULL;
@@ -118,8 +118,8 @@ static GHashTable *key_listener_list = NULL;
static guint key_snooper_id = 0;
G_BEGIN_DECLS
@ -21,7 +21,7 @@ $OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.3 2010/05/10 12:3
G_END_DECLS
struct MaiUtil
@@ -757,9 +757,11 @@ LoadGtkModule(GnomeAccessibilityModule& aModule)
@@ -762,9 +762,11 @@ LoadGtkModule(GnomeAccessibilityModule& aModule)
}
//we have loaded the library, try to get the function ptrs

12
www/mozilla-firefox/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.17 2010/04/26 19:55:58 landry Exp $
--- configure.in.orig Tue Mar 16 10:53:59 2010
+++ configure.in Sat Mar 27 16:32:01 2010
@@ -1063,7 +1063,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
$OpenBSD: patch-configure_in,v 1.18 2010/06/28 21:24:22 landry Exp $
--- configure.in.orig Fri Jun 11 22:41:30 2010
+++ configure.in Thu Jun 24 10:08:43 2010
@@ -1059,7 +1059,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.17 2010/04/26 19:55:58 landry Exp $
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -2404,7 +2404,7 @@ case "$target" in
@@ -2403,7 +2403,7 @@ case "$target" in
;;
*-openbsd*)
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.17 2010/04/26 19:55:58 landry Exp $
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -4133,9 +4133,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
@@ -4132,9 +4132,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
ac_cv_thread_keyword=yes,
ac_cv_thread_keyword=no)])
LDFLAGS=$_SAVE_LDFLAGS

8
www/mozilla-firefox/patches/patch-content_events_src_nsContentEventHandler_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
--- content/events/src/nsContentEventHandler.cpp.orig Thu Jan 21 05:29:58 2010
+++ content/events/src/nsContentEventHandler.cpp Thu Jan 21 13:51:51 2010
@@ -925,7 +925,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.2 2010/06/28 21:24:22 landry Exp $
--- content/events/src/nsContentEventHandler.cpp.orig Fri Jun 11 22:40:52 2010
+++ content/events/src/nsContentEventHandler.cpp Thu Jun 24 10:08:30 2010
@@ -928,7 +928,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
selPrivate->EndBatchChanges();
NS_ENSURE_SUCCESS(rv, rv);

8
www/mozilla-firefox/patches/patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
--- modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp.orig Thu Jan 21 05:30:55 2010
+++ modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp Thu Jan 21 13:56:10 2010
@@ -355,7 +355,7 @@ nsresult nsPluginNativeWindowGtk2::CreateXCompositedWi
$OpenBSD: patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp,v 1.2 2010/06/28 21:24:22 landry Exp $
--- modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp.orig Fri Jun 11 22:41:17 2010
+++ modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp Thu Jun 24 10:08:32 2010
@@ -359,7 +359,7 @@ nsresult nsPluginNativeWindowGtk2::CreateXCompositedWi
* ensures that those functions stay around even after flash is gone. */
static void *libplayback_handle;
if (!libplayback_handle) {

10
www/mozilla-firefox/patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig Thu Jan 21 05:31:15 2010
+++ toolkit/crashreporter/client/crashreporter_linux.cpp Thu Jan 21 14:00:53 2010
@@ -205,7 +205,7 @@ static void LoadProxyinfo()
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.2 2010/06/28 21:24:22 landry Exp $
--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig Fri Jun 11 22:41:31 2010
+++ toolkit/crashreporter/client/crashreporter_linux.cpp Thu Jun 24 10:08:33 2010
@@ -215,7 +215,7 @@ static void LoadProxyinfo()
if (getenv ("http_proxy"))
return; // libcurl can use the value from the environment
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.1 2010/
if (!gconfLib)
return;
@@ -585,11 +585,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
@@ -599,11 +599,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
static void TryInitGnome()
{

8
www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
--- toolkit/xre/nsNativeAppSupportUnix.cpp.orig Wed Jan 6 05:35:34 2010
+++ toolkit/xre/nsNativeAppSupportUnix.cpp Sun Jan 10 17:47:30 2010
@@ -404,11 +404,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.3 2010/06/28 21:24:22 landry Exp $
--- toolkit/xre/nsNativeAppSupportUnix.cpp.orig Fri Jun 11 22:41:23 2010
+++ toolkit/xre/nsNativeAppSupportUnix.cpp Thu Jun 24 10:08:33 2010
@@ -552,11 +552,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
#ifdef MOZ_X11

8
www/mozilla-firefox/patches/patch-widget_src_gtk2_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-widget_src_gtk2_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
--- widget/src/gtk2/Makefile.in.orig Wed Jan 6 05:35:35 2010
+++ widget/src/gtk2/Makefile.in Sun Jan 10 17:47:30 2010
@@ -183,6 +183,8 @@ DEFINES += -DUSE_POSTSCRIPT
$OpenBSD: patch-widget_src_gtk2_Makefile_in,v 1.2 2010/06/28 21:24:22 landry Exp $
--- widget/src/gtk2/Makefile.in.orig Fri Jun 11 22:41:24 2010
+++ widget/src/gtk2/Makefile.in Thu Jun 24 10:08:45 2010
@@ -184,6 +184,8 @@ DEFINES += -DUSE_POSTSCRIPT
EXTRA_DSO_LDOPTS += -lgfxpsshar
endif

10
www/mozilla-firefox/patches/patch-widget_src_gtk2_nsWindow_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-widget_src_gtk2_nsWindow_cpp,v 1.2 2010/04/26 22:14:37 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsWindow_cpp,v 1.3 2010/06/28 21:24:22 landry Exp $
Don't try to use png icons when setting app icon for window manager
Firefox uses itss building libpng for APNG support, and gdk_pixbuf_new_from_file
bails out later on when trying to load png files.
--- widget/src/gtk2/nsWindow.cpp.orig Fri Apr 2 18:03:20 2010
+++ widget/src/gtk2/nsWindow.cpp Mon Apr 26 22:21:56 2010
--- widget/src/gtk2/nsWindow.cpp.orig Fri Jun 11 22:41:24 2010
+++ widget/src/gtk2/nsWindow.cpp Thu Jun 24 10:08:33 2010
@@ -38,6 +38,8 @@
*
* ***** END LICENSE BLOCK ***** */
@ -11,9 +11,9 @@ bails out later on when trying to load png files.
+#include <stdint.h>
+
#ifdef MOZ_PLATFORM_MAEMO
// needed to include hildon parts in gtk.h
#define MAEMO_CHANGES
#endif
@@ -1910,8 +1912,7 @@ nsWindow::SetIcon(const nsAString& aIconSpec)
@@ -2141,8 +2143,7 @@ nsWindow::SetIcon(const nsAString& aIconSpec)
// The last two entries (for the old XPM format) will be ignored unless
// no icons are found using the other suffixes. XPM icons are depricated.

8
www/mozilla-firefox/patches/patch-xulrunner_app_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.1 2010/06/12 15:00:12 landry Exp $
--- xulrunner/app/Makefile.in.orig Thu Apr 22 08:57:25 2010
+++ xulrunner/app/Makefile.in Thu Apr 22 08:57:56 2010
@@ -114,6 +114,7 @@ endif
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.2 2010/06/28 21:24:22 landry Exp $
--- xulrunner/app/Makefile.in.orig Fri Jun 11 22:41:27 2010
+++ xulrunner/app/Makefile.in Thu Jun 24 10:08:44 2010
@@ -118,6 +118,7 @@ endif
LIBS += \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \

3
www/mozilla-firefox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.27 2010/06/12 15:00:12 landry Exp $
@comment $OpenBSD: PLIST,v 1.28 2010/06/28 21:24:22 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@pkgpath www/firefox3
@ -152,6 +152,7 @@ mozilla-firefox/components/nsFilePicker.js
mozilla-firefox/components/nsFormAutoComplete.js
mozilla-firefox/components/nsHandlerService.js
mozilla-firefox/components/nsHelperAppDlg.js
mozilla-firefox/components/nsINIProcessor.js
mozilla-firefox/components/nsLivemarkService.js
mozilla-firefox/components/nsLoginInfo.js
mozilla-firefox/components/nsLoginManager.js