Security/Reliability update to firefox 3.6.7, fixes MFSA-2010-34 -> 47
http://www.mozilla.org/security/known-vulnerabilities/firefox36.html ok naddy@
This commit is contained in:
landry
parent
18cb78a3b8
commit
6ac6c16143
@ -1,14 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.143 2010/07/19 13:46:27 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.144 2010/07/22 21:42:13 landry Exp $
|
||||
|
||||
COMMENT = Mozilla web browser
|
||||
|
||||
# Don't forget to bump www/firefox-i18n after updates.
|
||||
MOZILLA_VERSION = 3.6.6
|
||||
MOZILLA_VERSION = 3.6.7
|
||||
MOZILLA_BRANCH = 1.9.2
|
||||
MOZILLA_PROJECT = mozilla-firefox
|
||||
MOZILLA_CODENAME = browser
|
||||
|
||||
REVISION = 1
|
||||
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.
|
||||
@ -49,6 +48,10 @@ MOZILLA_DATADIRS = chrome components defaults dictionaries extensions \
|
||||
MOZILLA_AUTOCONF_DIRS += js/src
|
||||
MOZILLA_SUBST_FILES += config/autoconf.mk.in
|
||||
|
||||
# remove file that confuses make update-patches
|
||||
pre-patch:
|
||||
rm ${WRKSRC}/toolkit/mozapps/extensions/test/unit/*.orig
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA} ${FILESDIR}/browserconfig.properties ${MOB}/LICENSE ${MOB}/blocklist.xml ${MOZ}
|
||||
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mozilla-firefox.1 \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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
|
||||
MD5 (firefox-3.6.7.source.tar.bz2) = 4kBUGJh2bkSkB+VDxw1JSQ==
|
||||
RMD160 (firefox-3.6.7.source.tar.bz2) = bW7KV6JGQXJdzlcd6lvjdQ0Lt+E=
|
||||
SHA1 (firefox-3.6.7.source.tar.bz2) = EsWEpj6m3buSUwlK1QC8awRpA6Y=
|
||||
SHA256 (firefox-3.6.7.source.tar.bz2) = DnUcchjJfo4tYACzrAiJbI2usu5XiXWhXpCzjKWUm00=
|
||||
SIZE (firefox-3.6.7.source.tar.bz2) = 51233147
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.3 2010/04/28 06:56:38 landry Exp $
|
||||
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Fri Oct 5 22:13:18 2007
|
||||
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Thu Sep 25 01:30:45 2008
|
||||
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.4 2010/07/22 21:42:13 landry Exp $
|
||||
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Tue Jul 13 21:10:13 2010
|
||||
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Wed Jul 21 09:54:44 2010
|
||||
@@ -63,6 +63,7 @@
|
||||
#include "nsISimpleEnumerator.h"
|
||||
#include "nsIDirectoryEnumerator.h"
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.3 2010/04
|
||||
#include "nsDirectoryServiceUtils.h"
|
||||
#include "nsDirectoryServiceDefs.h"
|
||||
#include "mozISpellI18NManager.h"
|
||||
@@ -331,6 +332,16 @@ mozHunspell::LoadDictionaryList()
|
||||
@@ -342,6 +343,16 @@ mozHunspell::LoadDictionaryList()
|
||||
appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
|
||||
LoadDictionariesFromDir(appDir);
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
|
||||
--- media/libsydneyaudio/src/Makefile.in.orig Mon Aug 24 18:52:50 2009
|
||||
+++ media/libsydneyaudio/src/Makefile.in Thu Sep 10 23:35:11 2009
|
||||
@@ -77,6 +77,12 @@ CSRCS = \
|
||||
$(NULL)
|
||||
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.2 2010/07/22 21:42:13 landry Exp $
|
||||
--- media/libsydneyaudio/src/Makefile.in.orig Tue Jul 13 21:10:28 2010
|
||||
+++ media/libsydneyaudio/src/Makefile.in Wed Jul 21 09:54:46 2010
|
||||
@@ -83,6 +83,12 @@ CSRCS = \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
+ifeq ($(OS_ARCH),OpenBSD)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
|
||||
--- toolkit/components/downloads/src/nsDownloadManager.cpp.orig Wed Jan 6 05:35:32 2010
|
||||
+++ toolkit/components/downloads/src/nsDownloadManager.cpp Sun Jan 10 17:52:45 2010
|
||||
@@ -1156,7 +1156,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
|
||||
$OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.3 2010/07/22 21:42:13 landry Exp $
|
||||
--- toolkit/components/downloads/src/nsDownloadManager.cpp.orig Tue Jul 13 21:10:35 2010
|
||||
+++ toolkit/components/downloads/src/nsDownloadManager.cpp Wed Jul 21 09:54:47 2010
|
||||
@@ -1160,7 +1160,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
|
||||
rv = downloadDir->Exists(&exists);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
if (!exists) {
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.2 201
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
}
|
||||
@@ -1252,7 +1252,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
|
||||
@@ -1256,7 +1256,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
|
||||
(void)customDirectory->Exists(&exists);
|
||||
|
||||
if (!exists) {
|
||||
|
||||
@ -1,18 +1,9 @@
|
||||
$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
|
||||
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.3 2010/07/22 21:42:13 landry Exp $
|
||||
--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig Tue Jul 13 21:10:35 2010
|
||||
+++ toolkit/crashreporter/client/crashreporter_linux.cpp Wed Jul 21 09:54:47 2010
|
||||
@@ -362,11 +362,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
|
||||
|
||||
- static void* gconfLib = dlopen("libgconf-2.so.4", RTLD_LAZY);
|
||||
+ static void* gconfLib = dlopen("libgconf-2.so", RTLD_LAZY);
|
||||
if (!gconfLib)
|
||||
return;
|
||||
|
||||
@@ -599,11 +599,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
|
||||
|
||||
static void TryInitGnome()
|
||||
void TryInitGnome()
|
||||
{
|
||||
- gnomeLib = dlopen("libgnome-2.so.0", RTLD_LAZY);
|
||||
+ gnomeLib = dlopen("libgnome-2.so", RTLD_LAZY);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user