Update to firefox36 3.6.23. Fixes MFSA 2011-36->40.

This commit is contained in:
landry 2011-10-03 21:09:43 +00:00
parent ce2a465c37
commit 078a479d7c
11 changed files with 12 additions and 136 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:06 espie Exp $
# $OpenBSD: Makefile,v 1.15 2011/10/03 21:09:43 landry Exp $
COMMENT = Mozilla web browser
# Don't forget to update devel/xulrunner/1.9 if patches changes.
MOZILLA_VERSION = 3.6.22
MOZILLA_VERSION = 3.6.23
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = firefox36
MOZILLA_DIST = firefox
MOZILLA_CODENAME = browser
REVISION= 0
SO_VERSION = 22.2
# NOTE: Must bump minor version if any shlib's are removed from the

View File

@ -1,5 +1,5 @@
MD5 (mozilla/firefox-3.6.22.source.tar.bz2) = su0sQBgIv8KAOLIBr7ID8w==
RMD160 (mozilla/firefox-3.6.22.source.tar.bz2) = e1zWu5JkuXsAWbslTDg9kjeYLkw=
SHA1 (mozilla/firefox-3.6.22.source.tar.bz2) = 23lTsgVoEmo//nxaiasM7KxLClM=
SHA256 (mozilla/firefox-3.6.22.source.tar.bz2) = eI5aZPi9sHGDQFxWj9pw2Mt3WdOo11xATzWJ/ooDkik=
SIZE (mozilla/firefox-3.6.22.source.tar.bz2) = 51675082
MD5 (mozilla/firefox-3.6.23.source.tar.bz2) = WJ8AzUjrHiXsMmNUp4s8Zg==
RMD160 (mozilla/firefox-3.6.23.source.tar.bz2) = pM84D42PYrMtUabIyhPLh/ot5yQ=
SHA1 (mozilla/firefox-3.6.23.source.tar.bz2) = 4ZmnpdTdnFGRBZtFWHwJAHm075o=
SHA256 (mozilla/firefox-3.6.23.source.tar.bz2) = RGx/XUmIvKF5imtfnRR/kRUwVH/hrIayM9QAtttxy/A=
SIZE (mozilla/firefox-3.6.23.source.tar.bz2) = 51683720

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- gfx/src/psshared/nsCUPSShim.cpp.orig Wed Mar 2 10:32:33 2011
+++ gfx/src/psshared/nsCUPSShim.cpp Wed Mar 2 10:32:58 2011
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
PRBool
nsCUPSShim::Init()
{
- mCupsLib = PR_LoadLibrary("libcups.so.2");
+ mCupsLib = PR_LoadLibrary("libcups.so");
if (!mCupsLib)
return PR_FALSE;

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig Wed Jan 6 05:35:27 2010
+++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp Sun Jan 10 17:47:27 2010
@@ -202,7 +202,7 @@ ensure_libgnomeui()
// Attempt to get the libgnomeui symbol references. We do it this way so that stock icons from Init()
// don't get held back by InitWithGnome()'s libgnomeui dependency.
if (!gTriedToLoadGnomeLibs) {
- gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so.0");
+ gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so");
if (!gLibGnomeUI)
return NS_ERROR_NOT_AVAILABLE;
@@ -228,7 +228,7 @@ static nsresult
ensure_libgnome()
{
if (!gTriedToLoadGnomeLibs) {
- gLibGnome = PR_LoadLibrary("libgnome-2.so.0");
+ gLibGnome = PR_LoadLibrary("libgnome-2.so");
if (!gLibGnome)
return NS_ERROR_NOT_AVAILABLE;
@@ -250,7 +250,7 @@ static nsresult
ensure_libgnomevfs()
{
if (!gTriedToLoadGnomeLibs) {
- gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so.0");
+ gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so");
if (!gLibGnomeVFS)
return NS_ERROR_NOT_AVAILABLE;

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.3 2011/03/26 10:58:36 landry Exp $
--- toolkit/library/Makefile.in.orig Fri Feb 18 19:33:39 2011
+++ toolkit/library/Makefile.in Wed Mar 2 10:31:04 2011
@@ -286,6 +286,12 @@ ifdef MOZ_ENABLE_QT
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.4 2011/10/03 21:09:43 landry Exp $
--- toolkit/library/Makefile.in.orig Tue Sep 20 16:23:11 2011
+++ toolkit/library/Makefile.in Tue Sep 27 21:46:45 2011
@@ -291,6 +291,12 @@ ifeq ($(OS_ARCH),OpenBSD)
OS_LIBS += -lkrb5 -lcrypto
endif
+# GTK2 widget and Sydney audio sndio backends.

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.3 2011/03/26 10:58:36 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
- PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so.0");
+ PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so");
if (!gnomeuiLib)
return NS_OK;
- PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so.0");
+ PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so");
if (!gnomeLib) {
PR_UnloadLibrary(gnomeuiLib);
return NS_OK;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- widget/src/gtk2/nsBidiKeyboard.cpp.orig Thu Mar 5 23:32:52 2009
+++ widget/src/gtk2/nsBidiKeyboard.cpp Fri Mar 13 17:26:18 2009
@@ -55,10 +55,10 @@ nsBidiKeyboard::nsBidiKeyboard()
{
#if defined(MOZ_X11)
if (!gtklib)
- gtklib = PR_LoadLibrary("libgtk-x11-2.0.so.0");
+ gtklib = PR_LoadLibrary("libgtk-x11-2.0.so");
#elif defined(MOZ_DFB)
if (!gtklib)
- gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so.0");
+ gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so");
#else
return;
#endif

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- widget/src/gtk2/nsIdleServiceGTK.cpp.orig Wed Jan 6 05:35:35 2010
+++ widget/src/gtk2/nsIdleServiceGTK.cpp Sun Jan 10 17:47:30 2010
@@ -68,7 +68,7 @@ NS_IMPL_ISUPPORTS1(nsIdleServiceGTK, nsIIdleService)
static void Initialize()
{
// This will leak - See comments in ~nsIdleServiceGTK().
- PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
+ PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
if (!xsslib) // ouch.
{
#ifdef PR_LOGGING

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- widget/src/gtk2/nsScreenManagerGtk.cpp.orig Wed Jun 17 07:22:21 2009
+++ widget/src/gtk2/nsScreenManagerGtk.cpp Sat Jun 20 22:09:11 2009
@@ -174,7 +174,7 @@ nsScreenManagerGtk :: Init()
int numScreens;
if (!mXineramalib) {
- mXineramalib = PR_LoadLibrary("libXinerama.so.1");
+ mXineramalib = PR_LoadLibrary("libXinerama.so");
if (!mXineramalib) {
mXineramalib = SCREEN_MANAGER_LIBRARY_LOAD_FAILED;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-widget_src_qt_nsIdleServiceQt_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- widget/src/qt/nsIdleServiceQt.cpp.orig Thu Mar 5 23:32:52 2009
+++ widget/src/qt/nsIdleServiceQt.cpp Fri Mar 13 17:47:56 2009
@@ -72,7 +72,7 @@ static void Initialize()
sInitialized = PR_TRUE;
// This will leak - See comments in ~nsIdleServiceQt().
- PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
+ PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
if (!xsslib) {
return;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-widget_src_qt_nsSound_cpp,v 1.3 2011/03/26 10:58:36 landry Exp $
--- widget/src/qt/nsSound.cpp.orig Wed Jul 15 18:36:06 2009
+++ widget/src/qt/nsSound.cpp Tue Jul 21 21:18:28 2009
@@ -123,7 +123,7 @@ nsSound::Init()
EsdOpenSoundType EsdOpenSound;
- elib = PR_LoadLibrary("libesd.so.0");
+ elib = PR_LoadLibrary("libesd.so");
if (!elib) return NS_ERROR_FAILURE;
EsdOpenSound = (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound");