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

Update to firefox 11.0.

Browse Source 
- Fixes MFSA 2012-12->19
- see http://www.mozilla.org/en-US/firefox/11.0/releasenotes/
- complete patchset for #691898, still fixes build on ppc (and hopefully
  commited in firefox 14...)
- add patchset from #706955, workarounds #669050 (xpcshell hangs during
  make install and chokes on CSPUtils.csm, threads related..)
- remove obsolete/commited patches
This commit is contained in:
landry 2012-03-16 21:31:24 +00:00
parent 36dbd7720a
commit 3d95990410
32 changed files with 483 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.197 2012/03/08 12:13:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.198 2012/03/16 21:31:24 landry Exp $
COMMENT = Mozilla web browser
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@ -6,14 +6,12 @@ BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
# Don't forget to bump www/firefox-i18n after updates.
# Don't forget to update devel/xulrunner/2.0 if patches changes.
MOZILLA_VERSION = 10.0.2
MOZILLA_VERSION = 11.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
REVISION = 0
SO_VERSION = 29.0
SO_VERSION = 30.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = browsercomps mozalloc \

10
www/mozilla-firefox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mozilla/firefox-10.0.2.source.tar.bz2) = XOA41ZGWT3LFNPozt1pi9Q==
RMD160 (mozilla/firefox-10.0.2.source.tar.bz2) = UMRc8tVhKQ7P3+6j/vriLLrpzoU=
SHA1 (mozilla/firefox-10.0.2.source.tar.bz2) = 2bRZ2RXUY4pIs+JJ/Lr3yvwn6DQ=
SHA256 (mozilla/firefox-10.0.2.source.tar.bz2) = bsX+ulbxgKb79DemjPDHcUat4ouTblGHVz49lfE6BEk=
SIZE (mozilla/firefox-10.0.2.source.tar.bz2) = 75540089
MD5 (mozilla/firefox-11.0.source.tar.bz2) = Swes9HhXr/cndtgFQJzdGw==
RMD160 (mozilla/firefox-11.0.source.tar.bz2) = E7fHMnBjYlkE0AtYptbxXASRjpI=
SHA1 (mozilla/firefox-11.0.source.tar.bz2) = CwX5G4GAMBBQLPifVMPQGH+2PX4=
SHA256 (mozilla/firefox-11.0.source.tar.bz2) = L9prz+RVwkSaimm8Fr8T9upgBrrbBlfa5jEH5S8FFwE=
SIZE (mozilla/firefox-11.0.source.tar.bz2) = 78548401

14
www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.11 2012/02/20 20:15:04 landry Exp $
--- browser/app/profile/firefox.js.orig Wed Jan 11 18:14:33 2012
+++ browser/app/profile/firefox.js Sat Jan 14 20:21:44 2012
@@ -151,7 +151,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.12 2012/03/16 21:31:24 landry Exp $
--- browser/app/profile/firefox.js.orig Thu Feb 16 07:38:14 2012
+++ browser/app/profile/firefox.js Mon Feb 20 22:25:18 2012
@@ -152,7 +152,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.11 2012/02/20 20:15:04 landry
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
@@ -583,7 +583,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
@@ -584,7 +584,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
@ -19,7 +19,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.11 2012/02/20 20:15:04 landry
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -707,10 +707,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -708,10 +708,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -32,7 +32,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.11 2012/02/20 20:15:04 landry
// Non-enhanced mode (local url lists) URL list to check for updates
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
@@ -764,10 +764,8 @@ pref("browser.EULA.version", 3);
@@ -765,10 +765,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

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

@ -1,8 +1,8 @@
$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.3 2011/06/19 21:14:02 landry Exp $
$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.4 2012/03/16 21:31:24 landry Exp $
Click the 'get certificate' checkbox ?
--- browser/components/certerror/content/aboutCertError.xhtml.orig Tue Aug 31 15:49:28 2010
+++ browser/components/certerror/content/aboutCertError.xhtml Thu Sep 9 10:28:59 2010
@@ -135,6 +135,9 @@
--- browser/components/certerror/content/aboutCertError.xhtml.orig Thu Feb 2 00:38:53 2012
+++ browser/components/certerror/content/aboutCertError.xhtml Tue Feb 14 18:42:02 2012
@@ -136,6 +136,9 @@
tech.textContent = getDescription();
addDomainErrorLink();

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

@ -1,7 +1,7 @@
$OpenBSD: patch-config_autoconf_mk_in,v 1.16 2012/02/20 20:15:04 landry Exp $
--- config/autoconf.mk.in.orig Wed Jan 11 18:14:35 2012
+++ config/autoconf.mk.in Sat Jan 14 20:21:44 2012
@@ -300,7 +300,7 @@ OS_LDFLAGS = @LDFLAGS@
$OpenBSD: patch-config_autoconf_mk_in,v 1.17 2012/03/16 21:31:24 landry Exp $
--- config/autoconf.mk.in.orig Thu Feb 16 07:38:15 2012
+++ config/autoconf.mk.in Mon Feb 20 22:25:18 2012
@@ -310,7 +310,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@

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

@ -1,9 +1,9 @@
$OpenBSD: patch-config_rules_mk,v 1.15 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-config_rules_mk,v 1.16 2012/03/16 21:31:24 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
--- config/rules.mk.orig Wed Jan 11 18:14:35 2012
+++ config/rules.mk Sat Jan 14 20:21:44 2012
@@ -580,6 +580,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--- config/rules.mk.orig Thu Feb 2 00:38:54 2012
+++ config/rules.mk Tue Feb 14 18:42:02 2012
@@ -593,6 +593,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif

26
www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
View File

@ -1,23 +1,23 @@
$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.4 2011/10/03 21:06:09 landry Exp $
$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.5 2012/03/16 21:31:24 landry Exp $
alignment issue on some arch ? been there since ffx3
--- content/xslt/src/base/txDouble.cpp.orig Thu Aug 25 02:36:41 2011
+++ content/xslt/src/base/txDouble.cpp Mon Aug 29 15:58:06 2011
--- content/xslt/src/base/txDouble.cpp.orig Thu Feb 2 00:38:56 2012
+++ content/xslt/src/base/txDouble.cpp Tue Feb 14 18:44:42 2012
@@ -50,13 +50,13 @@
*/
//-- Initialize Double related constants
-const dpun Double::NaN = DOUBLE_NaN;
+const dpun Double::NaN __attribute__ ((aligned (8))) = DOUBLE_NaN;
-const dpun txDouble::NaN = DOUBLE_NaN;
+const dpun txDouble::NaN __attribute__ ((aligned (8))) = DOUBLE_NaN;
#ifdef IS_BIG_ENDIAN
-const dpun Double::POSITIVE_INFINITY = {{DOUBLE_HI32_EXPMASK, 0}};
-const dpun Double::NEGATIVE_INFINITY = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
+const dpun Double::POSITIVE_INFINITY __attribute__ ((aligned (8))) = {{DOUBLE_HI32_EXPMASK, 0}};
+const dpun Double::NEGATIVE_INFINITY __attribute__ ((aligned (8))) = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
-const dpun txDouble::POSITIVE_INFINITY = {{DOUBLE_HI32_EXPMASK, 0}};
-const dpun txDouble::NEGATIVE_INFINITY = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
+const dpun txDouble::POSITIVE_INFINITY __attribute__ ((aligned (8))) = {{DOUBLE_HI32_EXPMASK, 0}};
+const dpun txDouble::NEGATIVE_INFINITY __attribute__ ((aligned (8))) = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
#else
-const dpun Double::POSITIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK}};
-const dpun Double::NEGATIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
+const dpun Double::POSITIVE_INFINITY __attribute__ ((aligned (8))) = {{0, DOUBLE_HI32_EXPMASK}};
+const dpun Double::NEGATIVE_INFINITY __attribute__ ((aligned (8))) = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
-const dpun txDouble::POSITIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK}};
-const dpun txDouble::NEGATIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
+const dpun txDouble::POSITIVE_INFINITY __attribute__ ((aligned (8))) = {{0, DOUBLE_HI32_EXPMASK}};
+const dpun txDouble::NEGATIVE_INFINITY __attribute__ ((aligned (8))) = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
#endif
/*

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

@ -1,6 +1,6 @@
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.7 2012/02/20 20:15:04 landry Exp $
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Wed Jan 11 18:14:40 2012
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Sat Jan 14 20:21:44 2012
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.8 2012/03/16 21:31:24 landry Exp $
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Thu Feb 2 00:39:01 2012
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Tue Feb 14 18:42:02 2012
@@ -64,6 +64,7 @@
#include "nsISimpleEnumerator.h"
#include "nsIDirectoryEnumerator.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.7 2012/02
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "mozISpellI18NManager.h"
@@ -405,6 +406,16 @@ mozHunspell::LoadDictionaryList()
@@ -410,6 +411,16 @@ mozHunspell::LoadDictionaryList()
appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
LoadDictionariesFromDir(appDir);
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.6 2012/02/20 20:15:04 landry Exp $
--- gfx/thebes/Makefile.in.orig Wed Jan 11 18:14:42 2012
+++ gfx/thebes/Makefile.in Sat Jan 14 20:21:44 2012
@@ -384,6 +384,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.7 2012/03/16 21:31:24 landry Exp $
--- gfx/thebes/Makefile.in.orig Thu Feb 2 00:39:03 2012
+++ gfx/thebes/Makefile.in Tue Feb 14 18:42:02 2012
@@ -403,6 +403,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

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

@ -1,9 +1,9 @@
$OpenBSD: patch-js_src_Makefile_in,v 1.7 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_Makefile_in,v 1.8 2012/03/16 21:31:24 landry Exp $
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
use yarr interpreter on ppc
--- js/src/Makefile.in.orig Mon Jan 16 17:05:37 2012
+++ js/src/Makefile.in Mon Jan 16 17:07:47 2012
@@ -416,15 +416,20 @@ CPPSRCS += checks.cc \
--- js/src/Makefile.in.orig Thu Feb 2 00:39:07 2012
+++ js/src/Makefile.in Tue Feb 14 18:45:46 2012
@@ -361,15 +361,20 @@ CPPSRCS += checks.cc \
ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
@ -30,14 +30,14 @@ use yarr interpreter on ppc
$(NULL)
else
@@ -1015,10 +1020,10 @@ endif
@@ -921,10 +926,10 @@ endif
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1
ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_METHODJIT))
-CXXFLAGS += -DENABLE_JIT=1
+CXXFLAGS += -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1
endif

26
www/mozilla-firefox/patches/patch-js_src_configure_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-js_src_configure_in,v 1.10 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_configure_in,v 1.11 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
https://bugzilla.mozilla.org/show_bug.cgi?id=589754
chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
--- js/src/configure.in.orig Sun Jan 29 11:24:33 2012
+++ js/src/configure.in Tue Jan 31 08:22:16 2012
@@ -2457,7 +2457,12 @@ ia64*-hpux*)
--- js/src/configure.in.orig Thu Feb 2 00:39:07 2012
+++ js/src/configure.in Tue Feb 14 18:47:32 2012
@@ -2559,7 +2559,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -18,18 +18,18 @@ chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2731,7 +2736,7 @@ arm*-*)
@@ -2830,7 +2835,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
-sparc*-*)
+sparc-*)
NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
ENABLE_MONOIC=1
@@ -2805,6 +2810,10 @@ arm*-*)
sparc-*)
AC_DEFINE(AVMPLUS_SPARC)
ENABLE_POLYIC=1
@@ -2838,6 +2843,10 @@ sparc*-*)
AC_DEFINE(JS_CPU_SPARC)
AC_DEFINE(JS_NUNBOX32)
;;
+sparc64-*)
+ AC_DEFINE(AVMPLUS_SPARC)
@ -37,9 +37,9 @@ chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
+ ;;
esac
case "$target" in
@@ -2932,6 +2941,20 @@ MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 1
AC_CHECK_HEADERS(endian.h)
MOZ_ARG_DISABLE_BOOL(methodjit,
@@ -2947,6 +2956,20 @@ MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 1
MOZ_CHECK_HEADERS(endian.h)
if test "$ac_cv_header_endian_h" = yes; then
AC_DEFINE(JS_HAVE_ENDIAN_H)
+fi
@ -58,4 +58,4 @@ chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
+ AC_MSG_RESULT(no)
fi
AC_CHECK_HEADERS(sys/isa_defs.h)
MOZ_CHECK_HEADERS(sys/isa_defs.h)

8
www/mozilla-firefox/patches/patch-js_src_js-config_h_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-js_src_js-config_h_in,v 1.1 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_js-config_h_in,v 1.2 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=714312
https://hg.mozilla.org/mozilla-central/rev/9cfdb612a026
--- js/src/js-config.h.in.orig Wed Jan 11 18:14:47 2012
+++ js/src/js-config.h.in Sat Jan 14 20:54:06 2012
@@ -63,6 +63,10 @@
--- js/src/js-config.h.in.orig Thu Feb 2 00:39:08 2012
+++ js/src/js-config.h.in Tue Feb 14 18:42:03 2012
@@ -59,6 +59,10 @@
useable. See jscpucfg.h. */
#undef JS_HAVE_ENDIAN_H

53
www/mozilla-firefox/patches/patch-js_src_jscntxt_cpp Normal file
View File

@ -0,0 +1,53 @@
$OpenBSD: patch-js_src_jscntxt_cpp,v 1.1 2012/03/16 21:31:24 landry Exp $
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
use yarr interpreter on ppc
--- js/src/jscntxt.cpp.orig Sun Mar 11 20:39:26 2012
+++ js/src/jscntxt.cpp Sun Mar 11 20:41:36 2012
@@ -106,7 +106,9 @@ ThreadData::ThreadData(JSRuntime *rt)
#endif
waiveGCQuota(false),
tempLifoAlloc(TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
+#if ENABLE_ASSEMBLER
execAlloc(NULL),
+#endif
bumpAlloc(NULL),
repCache(NULL),
dtoaState(NULL),
@@ -123,7 +125,9 @@ ThreadData::~ThreadData()
{
JS_ASSERT(!repCache);
+#if ENABLE_ASSEMBLER
rt->delete_<JSC::ExecutableAllocator>(execAlloc);
+#endif
rt->delete_<WTF::BumpPointerAllocator>(bumpAlloc);
if (dtoaState)
@@ -157,9 +161,11 @@ ThreadData::sizeOfExcludingThis(JSMallocSizeOfFun mall
*temporary = tempLifoAlloc.sizeOfExcludingThis(mallocSizeOf);
size_t method = 0, regexp = 0, unused = 0;
+#if ENABLE_ASSEMBLER
if (execAlloc)
execAlloc->sizeOfCode(&method, &regexp, &unused);
JS_ASSERT(method == 0); /* this execAlloc is only used for regexp code */
+#endif
*regexpCode = regexp + unused;
*stackCommitted = stackSpace.sizeOfCommitted();
@@ -188,6 +194,7 @@ ThreadData::triggerOperationCallback(JSRuntime *rt)
#endif
}
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *
ThreadData::createExecutableAllocator(JSContext *cx)
{
@@ -199,6 +206,7 @@ ThreadData::createExecutableAllocator(JSContext *cx)
js_ReportOutOfMemory(cx);
return execAlloc;
}
+#endif
WTF::BumpPointerAllocator *
ThreadData::createBumpPointerAllocator(JSContext *cx)

33
www/mozilla-firefox/patches/patch-js_src_jscntxt_h Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-js_src_jscntxt_h,v 1.1 2012/03/16 21:31:24 landry Exp $
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
use yarr interpreter on ppc
--- js/src/jscntxt.h.orig Sun Mar 11 20:41:42 2012
+++ js/src/jscntxt.h Sun Mar 11 20:42:47 2012
@@ -153,21 +153,27 @@ struct ThreadData {
* Both of these allocators are used for regular expression code which is shared at the
* thread-data level.
*/
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *execAlloc;
+#endif
WTF::BumpPointerAllocator *bumpAlloc;
js::RegExpPrivateCache *repCache;
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *createExecutableAllocator(JSContext *cx);
+#endif
WTF::BumpPointerAllocator *createBumpPointerAllocator(JSContext *cx);
js::RegExpPrivateCache *createRegExpPrivateCache(JSContext *cx);
public:
+#if ENABLE_ASSEMBLER
JSC::ExecutableAllocator *getOrCreateExecutableAllocator(JSContext *cx) {
if (execAlloc)
return execAlloc;
return createExecutableAllocator(cx);
}
+#endif
WTF::BumpPointerAllocator *getOrCreateBumpPointerAllocator(JSContext *cx) {
if (bumpAlloc)

11
www/mozilla-firefox/patches/patch-js_src_jscompartment_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-js_src_jscompartment_cpp,v 1.2 2012/02/20 20:15:04 landry Exp $
--- js/src/jscompartment.cpp.orig Wed Jan 11 18:14:47 2012
+++ js/src/jscompartment.cpp Sat Jan 14 20:21:44 2012
@@ -50,7 +50,6 @@
#include "jswatchpoint.h"
#include "jswrapper.h"
#include "assembler/wtf/Platform.h"
-#include "assembler/jit/ExecutableAllocator.h"
#include "yarr/BumpPointerAllocator.h"
#include "methodjit/MethodJIT.h"
#include "methodjit/PolyIC.h"

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

@ -1,11 +1,11 @@
$OpenBSD: patch-js_src_jscpucfg_h,v 1.1 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_jscpucfg_h,v 1.2 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=714312
https://hg.mozilla.org/mozilla-central/rev/9cfdb612a026
--- js/src/jscpucfg.h.orig Wed Jan 11 18:14:47 2012
+++ js/src/jscpucfg.h Sat Jan 14 20:54:47 2012
--- js/src/jscpucfg.h.orig Thu Feb 2 00:39:08 2012
+++ js/src/jscpucfg.h Tue Feb 14 18:42:12 2012
@@ -92,6 +92,23 @@
#error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
#endif
# error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
# endif
+/* BSDs */
+#elif defined(JS_HAVE_MACHINE_ENDIAN_H)
@ -25,5 +25,5 @@ https://hg.mozilla.org/mozilla-central/rev/9cfdb612a026
+# endif
+
#elif defined(JS_HAVE_SYS_ISA_DEFS_H)
#include <sys/isa_defs.h>
# include <sys/isa_defs.h>

34
www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject-inl_h
View File

@ -1,47 +1,47 @@
$OpenBSD: patch-js_src_vm_RegExpObject-inl_h,v 1.1 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_vm_RegExpObject-inl_h,v 1.2 2012/03/16 21:31:24 landry Exp $
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
use yarr interpreter on ppc
--- js/src/vm/RegExpObject-inl.h.orig Wed Jan 11 18:14:49 2012
+++ js/src/vm/RegExpObject-inl.h Mon Jan 16 17:07:47 2012
@@ -327,6 +327,7 @@ RegExpPrivate::create(JSContext *cx, JSString *source,
return RetType(self);
--- js/src/vm/RegExpObject-inl.h.orig Thu Feb 2 00:39:11 2012
+++ js/src/vm/RegExpObject-inl.h Tue Feb 14 18:49:53 2012
@@ -367,6 +367,7 @@ detail::RegExpPrivate::create(JSContext *cx, JSLinearS
return RetType(priv);
}
+#if ENABLE_YARR_JIT
/* This function should be deleted once bad Android platforms phase out. See bug 604774. */
inline bool
RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
@@ -337,12 +338,12 @@ RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
@@ -377,12 +378,12 @@ detail::RegExpPrivateCode::isJITRuntimeEnabled(JSConte
return true;
#endif
}
+#endif
inline bool
RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
uintN *parenCount, RegExpFlag flags)
{
-#if ENABLE_YARR_JIT
/* Parse the pattern. */
ErrorCode yarrError;
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
@@ -359,7 +360,7 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearStri
@@ -399,7 +400,7 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
* case we have to bytecode compile it.
*/
-#ifdef JS_METHODJIT
+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
if (!cx->compartment->ensureJaegerCompartmentExists(cx))
JSC::ExecutableAllocator *execAlloc = cx->threadData()->getOrCreateExecutableAllocator(cx);
if (!execAlloc) {
@@ -420,21 +421,11 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
return false;
@@ -371,21 +372,11 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearStri
}
#endif
+#if ENABLE_YARR_JIT
codeBlock.setFallBack(true);
+#endif
byteCode = byteCompile(yarrPattern, cx->compartment->regExpAllocator).get();
byteCode = byteCompile(yarrPattern, bumpAlloc).get();
return true;
-#else /* !defined(ENABLE_YARR_JIT) */
- int error = 0;
@ -58,7 +58,7 @@ use yarr interpreter on ppc
}
inline bool
@@ -431,18 +422,11 @@ RegExpPrivateCode::execute(JSContext *cx, const jschar
@@ -476,18 +467,11 @@ detail::RegExpPrivateCode::execute(JSContext *cx, cons
else
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
#else
@ -67,14 +67,14 @@ use yarr interpreter on ppc
#endif
if (result == -1)
return Success_NotFound;
return RegExpRunStatus_Success_NotFound;
-
-#if !ENABLE_YARR_JIT
- if (result < 0) {
- reportPCREError(cx, result);
- return Error;
- return RegExpRunStatus_Error;
- }
-#endif
JS_ASSERT(result >= 0);
return Success;
return RegExpRunStatus_Success;

13
www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_cpp
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.1 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.2 2012/03/16 21:31:24 landry Exp $
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
use yarr interpreter on ppc
--- js/src/vm/RegExpObject.cpp.orig Wed Jan 11 18:14:49 2012
+++ js/src/vm/RegExpObject.cpp Mon Jan 16 17:07:47 2012
@@ -251,7 +251,6 @@ Class js::RegExpClass = {
NULL /* trace */
--- js/src/vm/RegExpObject.cpp.orig Thu Feb 2 00:39:11 2012
+++ js/src/vm/RegExpObject.cpp Tue Feb 14 18:50:40 2012
@@ -392,7 +392,6 @@ Class js::RegExpClass = {
regexp_trace
};
-#if ENABLE_YARR_JIT
void
RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
{
@@ -282,41 +281,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, Toke
@@ -423,42 +422,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, Toke
JS_NOT_REACHED("Unknown Yarr error code");
}
}
@ -49,6 +49,7 @@ use yarr interpreter on ppc
- }
-#undef REPORT
-}
-
-#endif /* ENABLE_YARR_JIT */
bool

35
www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_h
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.1 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.2 2012/03/16 21:31:24 landry Exp $
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
use yarr interpreter on ppc
--- js/src/vm/RegExpObject.h.orig Wed Jan 11 18:14:49 2012
+++ js/src/vm/RegExpObject.h Mon Jan 16 17:07:48 2012
@@ -49,8 +49,6 @@
#include "yarr/Yarr.h"
--- js/src/vm/RegExpObject.h.orig Thu Feb 2 00:39:11 2012
+++ js/src/vm/RegExpObject.h Tue Feb 14 18:53:18 2012
@@ -50,8 +50,6 @@
#if ENABLE_YARR_JIT
#include "yarr/YarrJIT.h"
#include "yarr/YarrSyntaxChecker.h"
-#else
-#include "yarr/pcre/pcre.h"
#endif
namespace js {
@@ -153,48 +151,39 @@ ResetRegExpObject(JSContext *cx, AlreadyIncRefed<RegEx
@@ -240,40 +238,33 @@ static const jschar GreedyStarChars[] = {'.', '*'};
/* Abstracts away the gross |RegExpPrivate| backend details. */
class RegExpPrivateCode
{
@ -57,18 +57,23 @@ use yarr interpreter on ppc
-#endif
}
static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
@@ -285,23 +276,17 @@ class RegExpPrivateCode
reportYarrError(cx, tokenStream, error);
return false;
#else
-# error "Syntax checking not implemented for !ENABLE_YARR_JIT"
+ return true; /* XXX !*/
#endif
}
#if ENABLE_YARR_JIT
static inline bool isJITRuntimeEnabled(JSContext *cx);
- void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
- static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
-#else
- void reportPCREError(JSContext *cx, int error);
- static void reportPCREError(JSContext *cx, int error);
#endif
+ void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,
RegExpFlag flags);
@@ -205,11 +194,7 @@ class RegExpPrivateCode
int *output, size_t outputCount);
+ static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
static size_t getOutputSize(size_t pairCount) {
-#if ENABLE_YARR_JIT
@ -77,5 +82,5 @@ use yarr interpreter on ppc
- return pairCount * 3; /* Should be x2, but PCRE has... needs. */
-#endif
}
};
inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,

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

@ -1,8 +1,8 @@
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.4 2011/04/09 11:05:06 landry Exp $
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.5 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- media/libsydneyaudio/src/Makefile.in.orig Wed Jul 21 02:52:30 2010
+++ media/libsydneyaudio/src/Makefile.in Sun Aug 1 12:58:33 2010
@@ -93,6 +93,12 @@ CSRCS = \
--- media/libsydneyaudio/src/Makefile.in.orig Thu Feb 2 00:39:20 2012
+++ media/libsydneyaudio/src/Makefile.in Tue Feb 14 18:42:12 2012
@@ -100,6 +100,12 @@ CSRCS = \
$(NULL)
endif

38
www/mozilla-firefox/patches/patch-netwerk_base_src_nsSocketTransportService2_cpp Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-netwerk_base_src_nsSocketTransportService2_cpp,v 1.1 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
xpcshell hang during fake
--- netwerk/base/src/nsSocketTransportService2.cpp.orig Mon Mar 12 19:28:27 2012
+++ netwerk/base/src/nsSocketTransportService2.cpp Mon Mar 12 19:29:13 2012
@@ -54,14 +54,6 @@
#include "mozilla/FunctionTimer.h"
-// XXX: There is no good header file to put these in. :(
-namespace mozilla { namespace psm {
-
-void InitializeSSLServerCertVerificationThreads();
-void StopSSLServerCertVerificationThreads();
-
-} } // namespace mozilla::psm
-
using namespace mozilla;
#if defined(PR_LOGGING)
@@ -617,8 +609,6 @@ nsSocketTransportService::Run()
{
SOCKET_LOG(("STS thread init\n"));
- psm::InitializeSSLServerCertVerificationThreads();
-
gSocketThread = PR_GetCurrentThread();
// add thread event to poll list (mThreadEvent may be NULL)
@@ -674,8 +664,6 @@ nsSocketTransportService::Run()
NS_ProcessPendingEvents(thread);
gSocketThread = nsnull;
-
- psm::StopSSLServerCertVerificationThreads();
SOCKET_LOG(("STS thread exit\n"));
return NS_OK;

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

@ -1,10 +1,10 @@
$OpenBSD: patch-parser_html_Makefile_in,v 1.6 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-parser_html_Makefile_in,v 1.7 2012/03/16 21:31:24 landry Exp $
gcc runs out of memory with optimization.
--- parser/html/Makefile.in.orig Wed Jan 11 18:14:59 2012
+++ parser/html/Makefile.in Sat Jan 14 20:24:15 2012
@@ -118,4 +118,7 @@ INCLUDES += \
--- parser/html/Makefile.in.orig Thu Feb 2 00:39:23 2012
+++ parser/html/Makefile.in Tue Feb 14 18:42:12 2012
@@ -120,4 +120,7 @@ INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)

16
www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.8 2012/02/20 20:15:04 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig Wed Jan 11 18:15:01 2012
+++ security/manager/ssl/src/Makefile.in Sat Jan 14 20:24:15 2012
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.9 2012/03/16 21:31:24 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig Thu Feb 2 00:39:26 2012
+++ security/manager/ssl/src/Makefile.in Tue Feb 14 18:54:37 2012
@@ -115,7 +115,10 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)
+NSS_LIBDIR = $(shell $(NSS_CONFIG) --libdir)
+
DEFINES += -DNSS_ENABLE_ECC
+DEFINES += -DNSS_LIBDIR=\"$(NSS_LIBDIR)\"
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
DEFINES += \
+ -DNSS_LIBDIR=\"$(NSS_LIBDIR)\" \
-DNSS_ENABLE_ECC \
-DDLL_PREFIX=\"$(DLL_PREFIX)\" \
-DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \

61
www/mozilla-firefox/patches/patch-security_manager_ssl_src_SSLServerCertVerification_cpp Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-security_manager_ssl_src_SSLServerCertVerification_cpp,v 1.1 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
xpcshell hang during fake
--- security/manager/ssl/src/SSLServerCertVerification.cpp.orig Mon Mar 12 19:29:40 2012
+++ security/manager/ssl/src/SSLServerCertVerification.cpp Mon Mar 12 19:32:39 2012
@@ -145,23 +145,25 @@ extern PRLogModuleInfo* gPIPNSSLog;
namespace mozilla { namespace psm {
namespace {
+PRCallOnceType gCreateMutexCallOnce;
// do not use a nsCOMPtr to avoid static initializer/destructor
+Mutex * gMutex = nsnull;
nsIThreadPool * gCertVerificationThreadPool = nsnull;
+
+PRStatus createMutex()
+{
+ gMutex = new Mutex("SSLServerCertVerification mutex");
+ return PR_SUCCESS;
+}
+
} // unnamed namespace
-// Called when the socket transport thread starts, to initialize the SSL cert
-// verification thread pool. By tying the thread pool startup/shutdown directly
-// to the STS thread's lifetime, we ensure that they are *always* available for
-// SSL connections and that there are no races during startup and especially
-// shutdown. (Previously, we have had multiple problems with races in PSM
-// background threads, and the race-prevention/shutdown logic used there is
-// brittle. Since this service is critical to things like downloading updates,
-// we take no chances.) Also, by doing things this way, we avoid the need for
-// locks, since gCertVerificationThreadPool is only ever accessed on the socket
-// transport thread.
void
InitializeSSLServerCertVerificationThreads()
{
+ (void) PR_CallOnce(&gCreateMutexCallOnce, createMutex);
+ MutexAutoLock lock(*gMutex);
+
// TODO: tuning, make parameters preferences
// XXX: instantiate nsThreadPool directly, to make this more bulletproof.
// Currently, the nsThreadPool.h header isn't exported for us to do so.
@@ -189,10 +191,19 @@ InitializeSSLServerCertVerificationThreads()
// nsNSSShutdownPreventionLock where needed (not here) to prevent that.
void StopSSLServerCertVerificationThreads()
{
+ (void) PR_CallOnce(&gCreateMutexCallOnce, createMutex);
+ MutexAutoLock lock(*gMutex);
+
if (gCertVerificationThreadPool) {
gCertVerificationThreadPool->Shutdown();
NS_RELEASE(gCertVerificationThreadPool);
}
+}
+
+void ShutdownSSLServerCertVerification()
+{
+ delete gMutex;
+ gMutex = nsnull;
}
namespace {

16
www/mozilla-firefox/patches/patch-security_manager_ssl_src_SSLServerCertVerification_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-security_manager_ssl_src_SSLServerCertVerification_h,v 1.1 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
xpcshell hang during fake
--- security/manager/ssl/src/SSLServerCertVerification.h.orig Mon Mar 12 19:32:51 2012
+++ security/manager/ssl/src/SSLServerCertVerification.h Mon Mar 12 19:33:31 2012
@@ -55,6 +55,10 @@ namespace mozilla { namespace psm {
SECStatus AuthCertificateHook(void *arg, PRFileDesc *fd,
PRBool checkSig, PRBool isServer);
+void InitializeSSLServerCertVerificationThreads();
+void StopSSLServerCertVerificationThreads();
+void ShutdownSSLServerCertVerification();
+
SECStatus HandleBadCertificate(PRErrorCode defaultErrorCodeToReport,
nsNSSSocketInfo * socketInfo,
CERTCertificate & cert,

132
www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,22 +1,58 @@
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.13 2012/02/20 20:15:04 landry Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Jan 11 18:15:01 2012
+++ security/manager/ssl/src/nsNSSComponent.cpp Sat Jan 14 20:24:15 2012
@@ -845,11 +845,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.14 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
xpcshell hang during fake
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Fri Mar 9 22:19:19 2012
+++ security/manager/ssl/src/nsNSSComponent.cpp Mon Mar 12 19:35:44 2012
@@ -112,6 +112,7 @@
#include "secerr.h"
#include "sslerr.h"
#include "cert.h"
+#include "SSLServerCertVerification.h"
const char *possible_ckbi_locations[] = {
- NS_XPCOM_CURRENT_PROCESS_DIR,
+ 0, // This special value means:
+ // search for ckbi in NSS_LIBDIR
NS_GRE_DIR,
- 0 // This special value means:
- // search for ckbi in the directories on the shared
- // library/DLL search path
+ NS_XPCOM_CURRENT_PROCESS_DIR
};
#include "nsXULAppAPI.h"
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -858,7 +857,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -125,6 +126,7 @@ extern "C" {
}
using namespace mozilla;
+using namespace mozilla::psm;
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -396,6 +398,8 @@ nsNSSComponent::deleteBackgroundThreads()
delete mCertVerificationThread;
mCertVerificationThread = nsnull;
}
+
+ StopSSLServerCertVerificationThreads();
}
void
@@ -403,21 +407,20 @@ nsNSSComponent::createBackgroundThreads()
{
NS_ASSERTION(mCertVerificationThread == nsnull,
"Cert verification thread already created.");
-
mCertVerificationThread = new nsCertVerificationThread;
nsresult rv = mCertVerificationThread->startThread();
if (NS_FAILED(rv)) {
delete mCertVerificationThread;
mCertVerificationThread = nsnull;
}
+
+ InitializeSSLServerCertVerificationThreads();
}
nsNSSComponent::~nsNSSComponent()
{
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor\n"));
- deleteBackgroundThreads();
-
if (mUpdateTimerInitialized) {
{
MutexAutoLock lock(mCrlTimerLock);
@@ -845,7 +848,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{
@ -25,3 +61,65 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.13 2012/02/20 20
}
else
{
@@ -1863,6 +1866,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
LaunchSmartCardThreads();
+ createBackgroundThreads();
+
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
}
}
@@ -2006,16 +2011,6 @@ nsNSSComponent::Init()
if (mClientAuthRememberService)
mClientAuthRememberService->Init();
- createBackgroundThreads();
- if (!mCertVerificationThread)
- {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS init, could not create threads\n"));
-
- DeregisterObservers();
- mPIPNSSBundle = nsnull;
- return NS_ERROR_OUT_OF_MEMORY;
- }
-
InitializeCRLUpdateTimer();
RegisterPSMContentListener();
@@ -2230,6 +2225,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
DoProfileChangeTeardown(aSubject);
}
else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
+ createBackgroundThreads();
mShutdownObjectList->allowUI();
}
else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
@@ -2277,6 +2273,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
InitializeCRLUpdateTimer();
}
else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
+ ShutdownSSLServerCertVerification();
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
@@ -2565,6 +2562,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
void
nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
{
+ /* XXX this doesn't work well, since nothing expects null pointers */
+ deleteBackgroundThreads();
+
bool callVeto = false;
if (!mShutdownObjectList->ifPossibleDisallowUI()) {
@@ -2618,9 +2618,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
void
nsNSSComponent::DoProfileChangeNetRestore()
{
- /* XXX this doesn't work well, since nothing expects null pointers */
- deleteBackgroundThreads();
- createBackgroundThreads();
mIsNetworkDown = false;
}

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

@ -1,9 +1,9 @@
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.9 2012/01/11 02:42:48 nigel Exp $
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.10 2012/03/16 21:31:24 landry Exp $
set secure_delete PRAGMA on by default, instead of using internal sqlite copy
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- storage/src/mozStorageConnection.cpp.orig Wed Dec 7 06:28:02 2011
+++ storage/src/mozStorageConnection.cpp Sat Dec 10 16:53:04 2011
@@ -593,6 +593,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
--- storage/src/mozStorageConnection.cpp.orig Thu Feb 2 00:39:27 2012
+++ storage/src/mozStorageConnection.cpp Tue Feb 14 18:42:12 2012
@@ -642,6 +642,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

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

@ -1,9 +1,9 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.13 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.14 2012/03/16 21:31:24 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
https://bugzilla.mozilla.org/show_bug.cgi?id=648730
--- toolkit/library/Makefile.in.orig Wed Jan 11 18:15:04 2012
+++ toolkit/library/Makefile.in Sat Jan 14 20:24:16 2012
@@ -144,6 +144,12 @@ OS_LIBS += \
--- toolkit/library/Makefile.in.orig Thu Feb 2 00:39:29 2012
+++ toolkit/library/Makefile.in Tue Feb 14 18:56:47 2012
@@ -489,6 +489,12 @@ OS_LIBS += \
$(NULL)
endif
@ -15,8 +15,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
+
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
EXTRA_DSO_LDOPTS += \
@@ -155,12 +161,6 @@ EXTRA_DSO_LDOPTS += \
OS_LIBS += \
@@ -500,12 +506,6 @@ OS_LIBS += \
-framework Foundation \
-framework AppKit \
$(NULL)

25
www/mozilla-firefox/patches/patch-toolkit_library_libxul-config_mk
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.6 2012/01/11 02:42:48 nigel Exp $
Ensure systemwide nss is taken
Ensure local libjs is taken (build failure when spidermonkey is installed,
its libjs_static.a is found first in lib search path)
https://bugzilla.mozilla.org/show_bug.cgi?id=646375
--- toolkit/library/libxul-config.mk.orig Wed Dec 7 06:28:06 2011
+++ toolkit/library/libxul-config.mk Sat Dec 10 16:53:04 2011
@@ -321,14 +321,15 @@ EXTRA_DSO_LDOPTS += \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(QCMS_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NSS_LIBS) \
+ ../../dist/lib/libjs_static.a \
$(MOZ_CAIRO_LIBS) \
$(MOZ_HARFBUZZ_LIBS) \
$(MOZ_OTS_LIBS) \
$(MOZ_APP_EXTRA_LIBS) \
$(SQLITE_LIBS) \
$(NULL)
+
+OS_LIBS += $(NSS_LIBS)
ifdef MOZ_NATIVE_ZLIB
EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)

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

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.8 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.9 2012/03/16 21:31:24 landry Exp $
install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig Wed Jan 11 18:15:07 2012
+++ toolkit/mozapps/installer/packager.mk Sat Jan 14 20:24:16 2012
@@ -788,7 +788,7 @@ endif
--- toolkit/mozapps/installer/packager.mk.orig Thu Feb 2 00:39:29 2012
+++ toolkit/mozapps/installer/packager.mk Tue Feb 14 18:42:23 2012
@@ -835,7 +835,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

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

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.10 2012/02/20 20:15:04 landry Exp $
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.11 2012/03/16 21:31:24 landry Exp $
Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig Wed Jan 11 18:15:08 2012
+++ toolkit/xre/nsXREDirProvider.cpp Sat Jan 14 20:24:24 2012
@@ -1128,11 +1128,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
--- toolkit/xre/nsXREDirProvider.cpp.orig Thu Feb 2 00:39:43 2012
+++ toolkit/xre/nsXREDirProvider.cpp Tue Feb 14 18:42:23 2012
@@ -1131,11 +1131,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

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

@ -1,8 +1,8 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.16 2012/01/11 02:42:48 nigel Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.17 2012/03/16 21:31:24 landry Exp $
chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Wed Dec 7 06:28:08 2011
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sat Dec 10 16:53:04 2011
@@ -199,7 +199,7 @@ endif
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Feb 2 00:39:44 2012
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue Feb 14 18:42:23 2012
@@ -197,7 +197,7 @@ endif
#
# OpenBSD/ARM
#