Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2015-08-14 14:47:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xulrunner" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2015-07-05 18:03:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2015-08-14 14:47:19.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Aug 10 16:40:17 UTC 2015 - [email protected] + +- update to xulrunner 38.2.0esr (bnc#940806) + * MFSA 2015-79/CVE-2015-4473 + Miscellaneous memory safety hazards + * MFSA 2015-80/CVE-2015-4475 (bmo#1175396) + Out-of-bounds read with malformed MP3 file + * MFSA 2015-82/CVE-2015-4478 (bmo#1105914) + Redefinition of non-configurable JavaScript object properties + * MFSA 2015-83/CVE-2015-4479/CVE-2015-4480/CVE-2015-4493 + Overflow issues in libstagefright + * MFSA 2015-84/CVE-2015-4481 (bmo1171518) + Arbitrary file overwriting through Mozilla Maintenance Service + with hard links (only affected Windows) + * MFSA 2015-85/CVE-2015-4482 (bmo#1184500) + Out-of-bounds write with Updater and malicious MAR file + (does not affect openSUSE RPM packages which do not ship the + updater) + * MFSA 2015-87/CVE-2015-4484 (bmo#1171540) + Crash when using shared memory in JavaScript + * MFSA 2015-88/CVE-2015-4491 (bmo#1184009) + Heap overflow in gdk-pixbuf when scaling bitmap images + * MFSA 2015-89/CVE-2015-4485/CVE-2015-4486 (bmo#1177948, bmo#1178148) + Buffer overflows on Libvpx when decoding WebM video + * MFSA 2015-90/CVE-2015-4487/CVE-2015-4488/CVE-2015-4489 + Vulnerabilities found through code inspection + * MFSA 2015-92/CVE-2015-4492 (bmo#1185820) + Use-after-free in XMLHttpRequest with shared workers +- rebased all patches +- dropped obsolete patches: + * mozilla-sle11.patch + * mozilla-ppc.patch + * mozilla-nullptr-gcc45.patch + * mozilla-libproxy-compat.patch + * mozilla-fix-compilation-gcc5-bmo-1021171.patch + * mozilla-fix-compilation-gcc5-bmo-1153109.patch + * mozilla-aarch64-bmo-810631.patch +- added platform specific patches from Firefox package: + * mozilla-skia-be-le.patch + * mozilla-bmo1005535.patch + * mozilla-add-glibcxx_use_cxx11_abi.patch + * mozilla-arm64-libjpeg-turbo.patch + * mozilla-shared-nss-db.patch + +------------------------------------------------------------------- @@ -27 +72 @@ -------------------------------------------------------------------- +-------------------------------------------------------------------- Old: ---- l10n-31.8.0.tar.xz mozilla-aarch64-bmo-810631.patch mozilla-fix-compilation-gcc5-bmo-1021171.patch mozilla-fix-compilation-gcc5-bmo-1153109.patch mozilla-libproxy-compat.patch mozilla-nullptr-gcc45.patch mozilla-ppc.patch mozilla-sle11.patch xulrunner-31.8.0-source.tar.xz New: ---- l10n-38.2.0.tar.xz mozilla-add-glibcxx_use_cxx11_abi.patch mozilla-arm64-libjpeg-turbo.patch mozilla-bmo1005535.patch mozilla-shared-nss-db.patch mozilla-skia-be-le.patch xulrunner-38.2.0-source.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -17,10 +17,10 @@ # -%define version_internal 31.8.0 -%define apiversion 31 -%define uaweight 3180000 -%define releasedate 2015062600 +%define version_internal 38.2.0 +%define apiversion 38 +%define uaweight 3820000 +%define releasedate 2015080900 %define shared_js 0 %define has_system_nspr 1 %define has_system_nss 1 @@ -67,7 +67,7 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.10.6 +BuildRequires: mozilla-nspr-devel >= 4.10.8 BuildRequires: mozilla-nss-devel >= 3.19.2 BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -105,25 +105,21 @@ Source8: source-stamp.txt Source9: compare-locales.tar.xz Patch1: toolkit-download-folder.patch -Patch2: mozilla-nongnome-proxies.patch -Patch3: mozilla-prefer_plugin_pref.patch -Patch4: mozilla-pkgconfig.patch +Patch2: mozilla-pkgconfig.patch +Patch3: mozilla-nongnome-proxies.patch +Patch4: mozilla-prefer_plugin_pref.patch +Patch5: mozilla-shared-nss-db.patch Patch6: mozilla-preferences.patch Patch7: mozilla-language.patch Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch -Patch10: mozilla-sle11.patch -Patch11: mozilla-icu-strncat.patch -Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-ppc.patch -Patch14: mozilla-libproxy-compat.patch -Patch15: mozilla-nullptr-gcc45.patch -Patch16: mozilla-idldir.patch -Patch17: mozilla-fix-compilation-gcc5-bmo-1153109.patch -Patch18: mozilla-fix-compilation-gcc5-bmo-1021171.patch -# Gecko/Toolkit AArch64 Porting -Patch30: mozilla-aarch64-bmo-810631.patch - +Patch10: mozilla-icu-strncat.patch +Patch11: mozilla-arm-disable-edsp.patch +Patch12: mozilla-idldir.patch +Patch13: mozilla-skia-be-le.patch +Patch14: mozilla-bmo1005535.patch +Patch15: mozilla-add-glibcxx_use_cxx11_abi.patch +Patch16: mozilla-arm64-libjpeg-turbo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?shared_js} == 1 Requires: mozilla-js = %{version} @@ -222,22 +218,18 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if %suse_version < 1120 %patch10 -p1 -%endif %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch30 -p1 %build # no need to add build time to binaries @@ -435,6 +427,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/dictionaries/en-US* rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/nspr-config rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mozilla-plugin.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/gmp-fake/ +rm -rf $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/gmp-fakeopenh264/ # fdupes %fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/ %fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/ @@ -487,12 +481,12 @@ %{_libdir}/xulrunner-%{version_internal}/chrome/icons/ %{_libdir}/xulrunner-%{version_internal}/components/ %{_libdir}/xulrunner-%{version_internal}/*.so +%{_libdir}/xulrunner-%{version_internal}/gmp-clearkey/ %if 0%{?shared_js} == 1 %exclude %{_libdir}/xulrunner-%{version_internal}/libmozjs.so %endif %{_libdir}/xulrunner-%{version_internal}/chrome.manifest %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list -%{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client %{_libdir}/xulrunner-%{version_internal}/plugin-container %{_libdir}/xulrunner-%{version_internal}/xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner-stub ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="esr31" +CHANNEL="esr38" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_31_8_0esr_RELEASE" -VERSION="31.8.0" +RELEASE_TAG="FIREFOX_38_2_0esr_RELEASE" +VERSION="38.2.0" # mozilla if [ -d mozilla ]; then ++++++ l10n-31.8.0.tar.xz -> l10n-38.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-31.8.0.tar.xz /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-38.2.0.tar.xz differ: char 25, line 1 ++++++ mozilla-add-glibcxx_use_cxx11_abi.patch ++++++ >From 32b9943e0d2c7c28d9d113c0e83d121c356fe5d5 Mon Sep 17 00:00:00 2001 From: Mike Hommey <[email protected]> Date: Fri, 10 Apr 2015 16:53:05 +0900 Subject: [PATCH] Bug 1153109 - Add -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS when building with --enable-stdcxx-compat patch grab from https://bugzilla.mozilla.org/show_bug.cgi?id=1153109 --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index 95d2a70..6c858b3 100644 --- a/configure.in +++ b/configure.in @@ -7375,16 +7375,18 @@ STDCXX_COMPAT= MOZ_ARG_ENABLE_BOOL(stdcxx-compat, [ --enable-stdcxx-compat Enable compatibility with older libstdc++], STDCXX_COMPAT=1) if test -n "$STDCXX_COMPAT"; then eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx) AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION) AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION) + CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" + HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" fi dnl ======================================================== dnl = dnl = Profiling and Instrumenting dnl = dnl ======================================================== MOZ_ARG_HEADER(Profiling and Instrumenting) ++++++ mozilla-arm64-libjpeg-turbo.patch ++++++ Index: mozilla/configure.in =================================================================== --- mozilla.orig/configure.in +++ mozilla/configure.in @@ -6241,7 +6241,7 @@ fi dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. -if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then +if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then echo "Using $AS as the assembler for ARM code." LIBJPEG_TURBO_AS=$AS fi @@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t AC_DEFINE(LIBJPEG_TURBO_X64_ASM) elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) +elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then + AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM) elif test -n "$MOZ_LIBJPEG_TURBO"; then dnl Warn if we're not building the optimized routines, even though the user dnl didn't specify --disable-libjpeg-turbo. ++++++ mozilla-aarch64-bmo-810631.patch -> mozilla-bmo1005535.patch ++++++ ++++ 100505 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/xulrunner/mozilla-aarch64-bmo-810631.patch ++++ and /work/SRC/openSUSE:Factory/.xulrunner.new/mozilla-bmo1005535.patch ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c +# Parent 5a29924228527f8882c83cf62d470963ea1ce62e Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE -diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp ---- a/intl/locale/src/nsLocaleService.cpp -+++ b/intl/locale/src/nsLocaleService.cpp +diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp +--- a/intl/locale/nsLocaleService.cpp ++++ b/intl/locale/nsLocaleService.cpp @@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE_VOID(resultLocale); ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -14,7 +14,7 @@ # Add pkg-config files to the install:: target +# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-31 ++apilibdir = $(dir $(installdir))xulrunner-18 + pkg_config_files = \ libxul.pc \ @@ -88,4 +88,4 @@ Requires: %NSPR_NAME% >= %NSPR_VERSION% -Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK% - Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE + Cflags: -I${includedir} -DXP_UNIX ++++++ mozilla-preferences.patch ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -5,16 +5,16 @@ package unconditionally. # HG changeset patch -# Parent 5c086bb8e0fa4f1600aced485e6156b0cdcd1755 +# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c -diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js ---- a/modules/libpref/src/init/all.js -+++ b/modules/libpref/src/init/all.js -@@ -1428,17 +1428,17 @@ pref("intl.charsetmenu.mailedit", - pref("intl.charsetmenu.browser.cache", ""); - pref("intl.charsetmenu.mailview.cache", ""); - pref("intl.charsetmenu.composer.cache", ""); - pref("intl.charsetmenu.browser.cache.size", 5); +diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js +--- a/modules/libpref/init/all.js ++++ b/modules/libpref/init/all.js +@@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy + + pref("intl.accept_languages", "chrome://global/locale/intl.properties"); + pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); + pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties"); pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.fallback.override", ""); pref("intl.charset.fallback.tld", true); ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -1,16 +1,17 @@ # HG changeset patch -# Parent 9b45fd4b00c45014b17358158cdb51805c8ca327 +# Parent 80b6464bd883864fce57e8748010869af1be69e9 +# Parent 09047118c6e38c5be50e391348eef3e993b266b5 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -138,23 +138,23 @@ else +@@ -142,24 +142,24 @@ else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif ifndef INCLUDED_RCS_MK USE_RCS_MK := 1 - include $(topsrcdir)/config/makefiles/makeutils.mk + include $(MOZILLA_DIR)/config/makefiles/makeutils.mk endif -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) @@ -20,35 +21,14 @@ # bug: 746277 - preserve existing functionality. # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists ########################################################################### + ifdef MOZ_INCLUDE_SOURCE_INFO -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) + endif MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json + MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json + MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json # JavaScript Shell - PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip - - endif # PACKAGE_NAME_MK_INCLUDED -diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in ---- a/toolkit/xre/Makefile.in -+++ b/toolkit/xre/Makefile.in -@@ -39,17 +39,17 @@ TOOLKIT_EM_VERSION=$(shell $(PERL) $(top - # Valid if null: {warn,error}IfEmpty - DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"' - - MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)) - ifdef MOZ_SOURCE_STAMP - - INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) - -- source_repo := $(call getSourceRepo) -+ source_repo ?= $(call getSourceRepo) - - # extra sanity check for old versions of hg, no showconfig support - ifneq (,$(filter http%,$(source_repo))) - INIARGS += --sourcerepo=$(source_repo) - endif - - endif # MOZ_SOURCE_STAMP - ++++++ mozilla-shared-nss-db.patch ++++++ From: Hans Petter Jansson <[email protected]> Wolfgang Rosenauer <[email protected]> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) fi fi AC_SUBST(MOZ_ENABLE_SKIA) dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + +if test "$MOZ_ENABLE_NSSHELPER"; then + AC_DEFINE(MOZ_ENABLE_NSSHELPER) +fi +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST_LIST(NSSHELPER_CFLAGS) +AC_SUBST_LIST(NSSHELPER_LIBS) + +dnl ======================================================== dnl disable xul dnl ======================================================== MOZ_ARG_DISABLE_BOOL(xul, [ --disable-xul Disable XUL], MOZ_XUL= ) if test "$MOZ_XUL"; then AC_DEFINE(MOZ_XUL) else diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -77,16 +77,19 @@ SOURCES += [ 'nsNSSVersion.cpp', 'PSMContentListener.cpp', ] LOCAL_INCLUDES += [ '/security/manager/boot/src', ] +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) + if not CONFIG['MOZ_NO_SMART_CARDS']: UNIFIED_SOURCES += [ 'nsSmartCardMonitor.cpp', ] if CONFIG['MOZ_XUL']: UNIFIED_SOURCES += [ 'nsCertTree.cpp', diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -1,14 +1,21 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif + #include "nsNSSComponent.h" #include "ExtendedValidation.h" #include "NSSCertDBTrustDomain.h" #include "mozilla/Telemetry.h" #include "nsAppDirectoryServiceDefs.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" @@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; } SECStatus init_rv = SECFailure; if (!profileStr.IsEmpty()) { // First try to initialize the NSS DB in read/write mode. - SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); + } else { + uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; + init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); + } + } +#else + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); +#endif // If that fails, attempt read-only mode. if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get())); init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); } if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); } diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']: 'stagefright_omx', ] if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': OS_LIBS += [ 'rt', ] +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] if CONFIG['MOZ_NATIVE_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] if CONFIG['MOZ_NATIVE_PNG']: OS_LIBS += CONFIG['MOZ_PNG_LIBS'] ++++++ mozilla-skia-be-le.patch ++++++ # HG changeset patch # Parent c5d7373760d7abbd34f89cb60d4a45cba2c05379 Part 2 of Bug 1136958 - gfx/layers/basic/BasicCompositor.cpp:20:56: fatal error: skia/SkCanvas.h: No such file or directory when skia is disabled diff --git a/gfx/skia/trunk/include/core/SkPreConfig.h b/gfx/skia/trunk/include/core/SkPreConfig.h --- a/gfx/skia/trunk/include/core/SkPreConfig.h +++ b/gfx/skia/trunk/include/core/SkPreConfig.h @@ -87,16 +87,24 @@ #if !defined(SK_WARN_UNUSED_RESULT) #define SK_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #endif ////////////////////////////////////////////////////////////////////// #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN) + #if defined(__BIG_ENDIAN__) + #define SK_CPU_BENDIAN + #elif defined(__LITTLE_ENDIAN__) + #define SK_CPU_LENDIAN + #endif +#endif + +#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN) #if defined(__sparc) || defined(__sparc__) || \ defined(_POWER) || defined(__powerpc__) || \ defined(__ppc__) || defined(__hppa) || \ defined(__PPC__) || defined(__PPC64__) || \ defined(_MIPSEB) || defined(__ARMEB__) || \ defined(__s390__) || \ (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ (defined(__ia64) && defined(__BIG_ENDIAN__)) diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp --- a/js/src/jsdtoa.cpp +++ b/js/src/jsdtoa.cpp @@ -47,16 +47,17 @@ using namespace js; static inline void* dtoa_malloc(size_t size) { return js_malloc(size); } static inline void dtoa_free(void* p) { return js_free(p); } #define NO_GLOBAL_STATE #define NO_ERRNO #define MALLOC dtoa_malloc #define FREE dtoa_free #include "dtoa.c" +#undef CONST /* Mapping of JSDToStrMode -> js_dtoa mode */ static const uint8_t dtoaModes[] = { 0, /* DTOSTR_STANDARD */ 0, /* DTOSTR_STANDARD_EXPONENTIAL, */ 3, /* DTOSTR_FIXED, */ 2, /* DTOSTR_EXPONENTIAL, */ 2}; /* DTOSTR_PRECISION */ ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -1,2 +1,2 @@ -REV=c81c5e3eca8c -REPO=http://hg.mozilla.org/releases/mozilla-esr31 +REV=31bad6553933 +REPO=http://hg.mozilla.org/releases/mozilla-esr38 ++++++ toolkit-download-folder.patch ++++++ --- /var/tmp/diff_new_pack.D3zqEa/_old 2015-08-14 14:47:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D3zqEa/_new 2015-08-14 14:47:26.000000000 +0200 @@ -6,7 +6,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -290,17 +290,17 @@ var gMainPane = { +@@ -408,17 +408,17 @@ var gMainPane = { // and was available as an option in the 1.5 drop down. On XP this // was in My Documents, on OSX it was in User Docs. In 2.0, we did // away with the drop down option, although the special label was @@ -17,18 +17,18 @@ // folder. See nsDownloadManager for details. - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); + downloadFolder.label = "Downloads"; - iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); + iconUrlSpec = fph.getURLSpecFromFile(yield this._indexToFolder(1)); } else { // 'Desktop' downloadFolder.label = bundlePreferences.getString("desktopFolderName"); - iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop")); + iconUrlSpec = fph.getURLSpecFromFile(yield this._getDownloadsFolder("Desktop")); } downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; - + }), diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi +@@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi // Vista: // Downloads // XP/2K: ++++++ xulrunner-31.8.0-source.tar.xz -> xulrunner-38.2.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-31.8.0-source.tar.xz /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-38.2.0-source.tar.xz differ: char 26, line 1
