rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f26

Browse Source
This commit is contained in:
Martin Stransky 2017-09-25 10:50:08 +02:00
commit 4b13d203f8
10 changed files with 81 additions and 1725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -246,3 +246,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-55.0.2-20170818.tar.xz /firefox-langpacks-55.0.2-20170818.tar.xz
/firefox-55.0.3.source.tar.xz /firefox-55.0.3.source.tar.xz
/firefox-langpacks-55.0.3-20170901.tar.xz /firefox-langpacks-55.0.3-20170901.tar.xz
/firefox-56.0.source.tar.xz
/firefox-langpacks-56.0-20170925.tar.xz

13
build-1360521-missing-cheddar.patch
View File

@ -1,13 +0,0 @@
diff --git a/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml
index aee7ee9471..d7e3f55119 100644
--- a/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+++ b/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml
@@ -18,6 +18,8 @@ exclude = [
"*.mp4",
]
+build = false
+
[dependencies]
byteorder = "1.0.0"
"mp4parse" = {version = "0.6.0", path = "../mp4parse"}

31
firefox.spec
View File

@ -1,6 +1,3 @@
# Draw shadows/hide titlebar?
%define csd_emulation 0
# Use ALSA backend? # Use ALSA backend?
%define alsa_backend 0 %define alsa_backend 0
@ -101,14 +98,14 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 55.0.3 Version: 56.0
Release: 4%{?pre_tag}%{?dist} Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20170901.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20170925.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -125,13 +122,10 @@ Patch0: firefox-install-dir.patch
Patch3: mozilla-build-arm.patch Patch3: mozilla-build-arm.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-24.0-jemalloc-ppc.patch Patch18: xulrunner-24.0-jemalloc-ppc.patch
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
Patch19: xulrunner-24.0-s390-inlines.patch
Patch20: firefox-build-prbool.patch Patch20: firefox-build-prbool.patch
Patch25: rhbz-1219542-s390-build.patch Patch25: rhbz-1219542-s390-build.patch
Patch26: build-icu-big-endian.patch Patch26: build-icu-big-endian.patch
Patch27: mozilla-1335250.patch Patch27: mozilla-1335250.patch
Patch28: build-1360521-missing-cheddar.patch
# Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268 # Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268
Patch29: build-big-endian.patch Patch29: build-big-endian.patch
Patch30: fedora-build.patch Patch30: fedora-build.patch
@ -148,8 +142,6 @@ Patch37: build-jit-atomic-always-lucky.patch
Patch38: build-cacheFlush-missing.patch Patch38: build-cacheFlush-missing.patch
# Fedora specific patches # Fedora specific patches
# Unable to install addons from https pages
Patch204: rhbz-966424.patch
Patch215: firefox-enable-addons.patch Patch215: firefox-enable-addons.patch
Patch219: rhbz-1173156.patch Patch219: rhbz-1173156.patch
Patch221: firefox-fedora-ua.patch Patch221: firefox-fedora-ua.patch
@ -167,7 +159,6 @@ Patch410: mozilla-1321521.patch
Patch411: mozilla-1321521-2.patch Patch411: mozilla-1321521-2.patch
Patch412: mozilla-1337988.patch Patch412: mozilla-1337988.patch
Patch413: mozilla-1353817.patch Patch413: mozilla-1353817.patch
Patch414: mozilla-1399611.patch
# Debian patches # Debian patches
Patch500: mozilla-440908.patch Patch500: mozilla-440908.patch
@ -311,30 +302,26 @@ This package contains results of tests executed during build.
%patch18 -p1 -b .jemalloc-ppc %patch18 -p1 -b .jemalloc-ppc
#%patch19 -p2 -b .s390-inlines
%patch20 -p1 -b .prbool %patch20 -p1 -b .prbool
%ifarch s390 %ifarch s390
%patch25 -p1 -b .rhbz-1219542-s390 %patch25 -p1 -b .rhbz-1219542-s390
%endif %endif
#%patch28 -p2 -b .1360521-missing-cheddar # don't need that? %patch29 -p1 -b .big-endian
%patch29 -p1 -b .big-endian
%patch30 -p1 -b .fedora-build %patch30 -p1 -b .fedora-build
%patch31 -p1 -b .ppc64-s390x-curl %patch31 -p1 -b .ppc64-s390x-curl
%patch32 -p1 -b .rust-ppc64le %patch32 -p1 -b .rust-ppc64le
%patch33 -p1 -b .ppc-s390-dom # don't need that %patch33 -p1 -b .ppc-s390-dom
%patch34 -p1 -b .cubeb-pulse-arm # don't need that %patch34 -p1 -b .cubeb-pulse-arm
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%patch35 -p1 -b .ppc-jit %patch35 -p1 -b .ppc-jit
%endif %endif
%patch37 -p1 -b .jit-atomic-lucky %patch37 -p1 -b .jit-atomic-lucky
%patch38 -p1 -b .cacheFlush-missing
%patch3 -p1 -b .arm %patch3 -p1 -b .arm
# For branding specific patches. # For branding specific patches.
# Fedora patches # Fedora patches
#%patch204 -p2 -b .966424
%patch215 -p1 -b .addons %patch215 -p1 -b .addons
%patch219 -p2 -b .rhbz-1173156 %patch219 -p2 -b .rhbz-1173156
%patch221 -p2 -b .fedora-ua %patch221 -p2 -b .fedora-ua
@ -354,9 +341,6 @@ This package contains results of tests executed during build.
%endif %endif
%endif %endif
%patch413 -p1 -b .1353817 %patch413 -p1 -b .1353817
%if %{?csd_emulation}
%patch414 -p1 -b .1399611
%endif
# Debian extension patch # Debian extension patch
%patch500 -p1 -b .440908 %patch500 -p1 -b .440908
@ -879,6 +863,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Sep 24 2017 Martin Stransky <stransky@redhat.com> - 56.0-1
- Update to 56.0 (B4)
* Fri Sep 15 2017 Martin Stransky <stransky@redhat.com> - 55.0.3-4 * Fri Sep 15 2017 Martin Stransky <stransky@redhat.com> - 55.0.3-4
- Added switch to build mozbz#1399611 and disable it now - Added switch to build mozbz#1399611 and disable it now
for various regressions. for various regressions.

42
mozilla-1170092.patch
View File

@ -1,11 +1,11 @@
diff -up firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp diff -up firefox-56.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-56.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
--- firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2016-03-15 23:37:54.000000000 +0100 --- firefox-56.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2017-09-25 10:28:35.413675532 +0200
+++ firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp 2016-03-21 16:10:42.540417899 +0100 +++ firefox-56.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2017-09-25 10:31:06.394196960 +0200
@@ -245,8 +245,20 @@ nsresult nsReadConfig::openAndEvaluateJS @@ -243,9 +243,20 @@ nsresult nsReadConfig::openAndEvaluateJS
return rv; return rv;
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile); rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
- if (NS_FAILED(rv)) - if (NS_FAILED(rv))
- return rv; - return rv;
+ if (NS_FAILED(rv)) { + if (NS_FAILED(rv)) {
+ // Look for cfg file in /etc/<application>/pref + // Look for cfg file in /etc/<application>/pref
@ -17,17 +17,17 @@ diff -up firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092
+ NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv);
+ rv = jsFile->AppendNative(nsDependentCString(aFileName)); + rv = jsFile->AppendNative(nsDependentCString(aFileName));
+ NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv);
+
+ rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile); + rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
+ NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv);
+ } + }
} else { } else {
nsAutoCString location("resource://gre/defaults/autoconfig/"); nsAutoCString location("resource://gre/defaults/autoconfig/");
diff -up firefox-45.0.1/modules/libpref/Preferences.cpp.1170092 firefox-45.0.1/modules/libpref/Preferences.cpp location += aFileName;
--- firefox-45.0.1/modules/libpref/Preferences.cpp.1170092 2016-03-21 16:10:42.540417899 +0100 diff -up firefox-56.0/modules/libpref/Preferences.cpp.1170092 firefox-56.0/modules/libpref/Preferences.cpp
+++ firefox-45.0.1/modules/libpref/Preferences.cpp 2016-03-21 16:13:29.145888710 +0100 --- firefox-56.0/modules/libpref/Preferences.cpp.1170092 2017-09-14 22:15:52.000000000 +0200
@@ -1214,6 +1214,8 @@ static nsresult pref_InitInitialObjects( +++ firefox-56.0/modules/libpref/Preferences.cpp 2017-09-25 10:28:35.413675532 +0200
@@ -1514,6 +1514,8 @@ pref_InitInitialObjects()
// - jar:$gre/omni.jar!/defaults/preferences/*.js // - jar:$gre/omni.jar!/defaults/preferences/*.js
// Thus, in omni.jar case, we always load app-specific default preferences // Thus, in omni.jar case, we always load app-specific default preferences
// from omni.jar, whether or not $app == $gre. // from omni.jar, whether or not $app == $gre.
@ -36,10 +36,10 @@ diff -up firefox-45.0.1/modules/libpref/Preferences.cpp.1170092 firefox-45.0.1/m
nsZipFind *findPtr; nsZipFind *findPtr;
nsAutoPtr<nsZipFind> find; nsAutoPtr<nsZipFind> find;
diff -up firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp diff -up firefox-56.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-56.0/toolkit/xre/nsXREDirProvider.cpp
--- firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 2016-03-15 23:37:46.000000000 +0100 --- firefox-56.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2017-09-14 22:16:02.000000000 +0200
+++ firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp 2016-03-21 16:12:06.498655156 +0100 +++ firefox-56.0/toolkit/xre/nsXREDirProvider.cpp 2017-09-25 10:28:35.414675529 +0200
@@ -51,6 +51,7 @@ @@ -58,6 +58,7 @@
#endif #endif
#ifdef XP_UNIX #ifdef XP_UNIX
#include <ctype.h> #include <ctype.h>
@ -47,7 +47,7 @@ diff -up firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-45.0.1/
#endif #endif
#ifdef XP_IOS #ifdef XP_IOS
#include "UIKitDirProvider.h" #include "UIKitDirProvider.h"
@@ -457,6 +458,20 @@ nsXREDirProvider::GetFile(const char* aP @@ -570,6 +571,20 @@ nsXREDirProvider::GetFile(const char* aP
} }
} }
} }
@ -68,7 +68,7 @@ diff -up firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-45.0.1/
if (NS_FAILED(rv) || !file) if (NS_FAILED(rv) || !file)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@@ -753,6 +768,14 @@ nsXREDirProvider::GetFilesInternal(const @@ -935,6 +950,14 @@ nsXREDirProvider::GetFilesInternal(const
LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories); LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
LoadDirsIntoArray(mAppBundleDirectories, LoadDirsIntoArray(mAppBundleDirectories,
kAppendPrefDir, directories); kAppendPrefDir, directories);
@ -83,10 +83,10 @@ diff -up firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-45.0.1/
rv = NS_NewArrayEnumerator(aResult, directories); rv = NS_NewArrayEnumerator(aResult, directories);
} }
diff -up firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h diff -up firefox-56.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-56.0/xpcom/io/nsAppDirectoryServiceDefs.h
--- firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2016-03-15 23:37:47.000000000 +0100 --- firefox-56.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2017-09-14 22:16:02.000000000 +0200
+++ firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h 2016-03-21 16:10:42.541417902 +0100 +++ firefox-56.0/xpcom/io/nsAppDirectoryServiceDefs.h 2017-09-25 10:28:35.414675529 +0200
@@ -67,6 +67,7 @@ @@ -62,6 +62,7 @@
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL" #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
#define NS_EXT_PREFS_DEFAULTS_DIR_LIST "ExtPrefDL" #define NS_EXT_PREFS_DEFAULTS_DIR_LIST "ExtPrefDL"
#define NS_APP_PREFS_OVERRIDE_DIR "PrefDOverride" // Directory for per-profile defaults #define NS_APP_PREFS_OVERRIDE_DIR "PrefDOverride" // Directory for per-profile defaults

182
mozilla-1337988.patch
View File

@ -1,7 +1,7 @@
diff -up firefox-55.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 firefox-55.0/dom/plugins/base/nsJSNPRuntime.cpp diff -up firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp
--- firefox-55.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 2017-07-31 18:20:53.000000000 +0200 --- firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 2017-09-14 22:15:56.000000000 +0200
+++ firefox-55.0/dom/plugins/base/nsJSNPRuntime.cpp 2017-08-02 14:33:41.736715482 +0200 +++ firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp 2017-09-25 10:34:11.205611698 +0200
@@ -1766,7 +1766,7 @@ NPObjWrapper_ObjectMoved(JSObject *obj, @@ -1719,7 +1719,7 @@ NPObjWrapper_ObjectMoved(JSObject *obj,
auto entry = auto entry =
static_cast<NPObjWrapperHashEntry*>(sNPObjWrappers->Search(npobj)); static_cast<NPObjWrapperHashEntry*>(sNPObjWrappers->Search(npobj));
MOZ_ASSERT(entry && entry->mJSObj); MOZ_ASSERT(entry && entry->mJSObj);
@ -10,9 +10,9 @@ diff -up firefox-55.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 firefox-55.0/do
entry->mJSObj = obj; entry->mJSObj = obj;
} }
diff -up firefox-55.0/js/ipc/JavaScriptShared.cpp.1337988 firefox-55.0/js/ipc/JavaScriptShared.cpp diff -up firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988 firefox-56.0/js/ipc/JavaScriptShared.cpp
--- firefox-55.0/js/ipc/JavaScriptShared.cpp.1337988 2017-07-31 18:20:47.000000000 +0200 --- firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988 2017-07-31 18:20:47.000000000 +0200
+++ firefox-55.0/js/ipc/JavaScriptShared.cpp 2017-08-02 14:33:41.736715482 +0200 +++ firefox-56.0/js/ipc/JavaScriptShared.cpp 2017-09-25 10:34:11.205611698 +0200
@@ -101,7 +101,7 @@ IdToObjectMap::has(const ObjectId& id, c @@ -101,7 +101,7 @@ IdToObjectMap::has(const ObjectId& id, c
auto p = table_.lookup(id); auto p = table_.lookup(id);
if (!p) if (!p)
@ -22,9 +22,9 @@ diff -up firefox-55.0/js/ipc/JavaScriptShared.cpp.1337988 firefox-55.0/js/ipc/Ja
} }
#endif #endif
diff -up firefox-55.0/js/public/RootingAPI.h.1337988 firefox-55.0/js/public/RootingAPI.h diff -up firefox-56.0/js/public/RootingAPI.h.1337988 firefox-56.0/js/public/RootingAPI.h
--- firefox-55.0/js/public/RootingAPI.h.1337988 2017-07-31 18:20:47.000000000 +0200 --- firefox-56.0/js/public/RootingAPI.h.1337988 2017-07-31 18:20:47.000000000 +0200
+++ firefox-55.0/js/public/RootingAPI.h 2017-08-02 15:20:44.873663128 +0200 +++ firefox-56.0/js/public/RootingAPI.h 2017-09-25 10:34:11.206611695 +0200
@@ -148,6 +148,10 @@ template<typename T> @@ -148,6 +148,10 @@ template<typename T>
struct PersistentRootedMarker; struct PersistentRootedMarker;
} /* namespace gc */ } /* namespace gc */
@ -344,9 +344,9 @@ diff -up firefox-55.0/js/public/RootingAPI.h.1337988 firefox-55.0/js/public/Root
#undef DELETE_ASSIGNMENT_OPS #undef DELETE_ASSIGNMENT_OPS
#endif /* js_RootingAPI_h */ #endif /* js_RootingAPI_h */
diff -up firefox-55.0/js/src/gc/Barrier.h.1337988 firefox-55.0/js/src/gc/Barrier.h diff -up firefox-56.0/js/src/gc/Barrier.h.1337988 firefox-56.0/js/src/gc/Barrier.h
--- firefox-55.0/js/src/gc/Barrier.h.1337988 2017-07-31 18:20:47.000000000 +0200 --- firefox-56.0/js/src/gc/Barrier.h.1337988 2017-09-14 22:16:01.000000000 +0200
+++ firefox-55.0/js/src/gc/Barrier.h 2017-08-02 14:33:41.737715470 +0200 +++ firefox-56.0/js/src/gc/Barrier.h 2017-09-25 10:34:11.206611695 +0200
@@ -353,8 +353,8 @@ class WriteBarrieredBase : public Barrie @@ -353,8 +353,8 @@ class WriteBarrieredBase : public Barrie
explicit WriteBarrieredBase(const T& v) : BarrieredBase<T>(v) {} explicit WriteBarrieredBase(const T& v) : BarrieredBase<T>(v) {}
@ -357,7 +357,7 @@ diff -up firefox-55.0/js/src/gc/Barrier.h.1337988 firefox-55.0/js/src/gc/Barrier
DECLARE_POINTER_CONSTREF_OPS(T); DECLARE_POINTER_CONSTREF_OPS(T);
// Use this if the automatic coercion to T isn't working. // Use this if the automatic coercion to T isn't working.
@@ -605,13 +605,14 @@ class ReadBarriered : public ReadBarrier @@ -612,13 +612,14 @@ class ReadBarriered : public ReadBarrier
return *this; return *this;
} }
@ -376,7 +376,7 @@ diff -up firefox-55.0/js/src/gc/Barrier.h.1337988 firefox-55.0/js/src/gc/Barrier
return this->value; return this->value;
} }
@@ -619,9 +620,9 @@ class ReadBarriered : public ReadBarrier @@ -626,9 +627,9 @@ class ReadBarriered : public ReadBarrier
return bool(this->value); return bool(this->value);
} }
@ -388,7 +388,7 @@ diff -up firefox-55.0/js/src/gc/Barrier.h.1337988 firefox-55.0/js/src/gc/Barrier
T* unsafeGet() { return &this->value; } T* unsafeGet() { return &this->value; }
T const* unsafeGet() const { return &this->value; } T const* unsafeGet() const { return &this->value; }
@@ -948,35 +949,6 @@ typedef ReadBarriered<WasmTableObject*> @@ -955,35 +956,6 @@ typedef ReadBarriered<WasmTableObject*>
typedef ReadBarriered<Value> ReadBarrieredValue; typedef ReadBarriered<Value> ReadBarrieredValue;
@ -424,9 +424,9 @@ diff -up firefox-55.0/js/src/gc/Barrier.h.1337988 firefox-55.0/js/src/gc/Barrier
} /* namespace js */ } /* namespace js */
#endif /* gc_Barrier_h */ #endif /* gc_Barrier_h */
diff -up firefox-55.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 firefox-55.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp diff -up firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp
--- firefox-55.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 2017-07-31 18:20:48.000000000 +0200 --- firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 2017-09-14 22:16:02.000000000 +0200
+++ firefox-55.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp 2017-08-02 15:23:03.544362400 +0200 +++ firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp 2017-09-25 10:34:11.206611695 +0200
@@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -435,127 +435,9 @@ diff -up firefox-55.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 fire
#include "mozilla/UniquePtr.h" #include "mozilla/UniquePtr.h"
#include "js/RootingAPI.h" #include "js/RootingAPI.h"
@@ -178,117 +177,3 @@ TestHeapPostBarrierInitFailure() diff -up firefox-56.0/js/src/vm/SharedMem.h.1337988 firefox-56.0/js/src/vm/SharedMem.h
--- firefox-56.0/js/src/vm/SharedMem.h.1337988 2017-06-15 22:52:29.000000000 +0200
return true; +++ firefox-56.0/js/src/vm/SharedMem.h 2017-09-25 10:34:11.206611695 +0200
}
-
-END_TEST(testGCHeapPostBarriers)
-
-BEGIN_TEST(testUnbarrieredEquality)
-{
-#ifdef JS_GC_ZEAL
- AutoLeaveZeal nozeal(cx);
-#endif /* JS_GC_ZEAL */
-
- // Use ArrayBuffers because they have finalizers, which allows using them
- // in ObjectPtr without awkward conversations about nursery allocatability.
- JS::RootedObject robj(cx, JS_NewArrayBuffer(cx, 20));
- JS::RootedObject robj2(cx, JS_NewArrayBuffer(cx, 30));
- cx->runtime()->gc.evictNursery(); // Need tenured objects
-
- // Need some bare pointers to compare against.
- JSObject* obj = robj;
- JSObject* obj2 = robj2;
- const JSObject* constobj = robj;
- const JSObject* constobj2 = robj2;
-
- // Make them gray. We will make sure they stay gray. (For most reads, the
- // barrier will unmark gray.)
- using namespace js::gc;
- TenuredCell* cell = &obj->asTenured();
- TenuredCell* cell2 = &obj2->asTenured();
- cell->markIfUnmarked(GRAY);
- cell2->markIfUnmarked(GRAY);
- MOZ_ASSERT(cell->isMarked(GRAY));
- MOZ_ASSERT(cell2->isMarked(GRAY));
-
- {
- JS::Heap<JSObject*> heap(obj);
- JS::Heap<JSObject*> heap2(obj2);
- CHECK(TestWrapper(obj, obj2, heap, heap2));
- CHECK(TestWrapper(constobj, constobj2, heap, heap2));
- }
-
- {
- JS::TenuredHeap<JSObject*> heap(obj);
- JS::TenuredHeap<JSObject*> heap2(obj2);
- CHECK(TestWrapper(obj, obj2, heap, heap2));
- CHECK(TestWrapper(constobj, constobj2, heap, heap2));
- }
-
- {
- JS::ObjectPtr objptr(obj);
- JS::ObjectPtr objptr2(obj2);
- CHECK(TestWrapper(obj, obj2, objptr, objptr2));
- CHECK(TestWrapper(constobj, constobj2, objptr, objptr2));
- objptr.finalize(cx);
- objptr2.finalize(cx);
- }
-
- // Sanity check that the barriers normally mark things black.
- {
- JS::Heap<JSObject*> heap(obj);
- JS::Heap<JSObject*> heap2(obj2);
- heap.get();
- heap2.get();
- CHECK(cell->isMarked(BLACK));
- CHECK(cell2->isMarked(BLACK));
- }
-
- return true;
-}
-
-template <typename ObjectT, typename WrapperT>
-bool
-TestWrapper(ObjectT obj, ObjectT obj2, WrapperT& wrapper, WrapperT& wrapper2)
-{
- using namespace js::gc;
-
- const TenuredCell& cell = obj->asTenured();
- const TenuredCell& cell2 = obj2->asTenured();
-
- int x = 0;
-
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += obj == obj2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += obj == wrapper2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += wrapper == obj2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += wrapper == wrapper2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
-
- CHECK(x == 0);
-
- x += obj != obj2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += obj != wrapper2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += wrapper != obj2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
- x += wrapper != wrapper2;
- CHECK(cell.isMarked(GRAY));
- CHECK(cell2.isMarked(GRAY));
-
- CHECK(x == 4);
-
- return true;
-}
-
-END_TEST(testUnbarrieredEquality)
diff -up firefox-55.0/js/src/vm/SharedMem.h.1337988 firefox-55.0/js/src/vm/SharedMem.h
--- firefox-55.0/js/src/vm/SharedMem.h.1337988 2017-06-15 22:52:29.000000000 +0200
+++ firefox-55.0/js/src/vm/SharedMem.h 2017-08-02 14:33:41.737715470 +0200
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
template<typename T> template<typename T>
class SharedMem class SharedMem
@ -567,10 +449,10 @@ diff -up firefox-55.0/js/src/vm/SharedMem.h.1337988 firefox-55.0/js/src/vm/Share
enum Sharedness { enum Sharedness {
IsUnshared, IsUnshared,
diff -up firefox-55.0/js/xpconnect/src/XPCInlines.h.1337988 firefox-55.0/js/xpconnect/src/XPCInlines.h diff -up firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988 firefox-56.0/js/xpconnect/src/XPCInlines.h
--- firefox-55.0/js/xpconnect/src/XPCInlines.h.1337988 2017-07-31 18:20:46.000000000 +0200 --- firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988 2017-09-14 22:16:03.000000000 +0200
+++ firefox-55.0/js/xpconnect/src/XPCInlines.h 2017-08-02 14:33:41.738715458 +0200 +++ firefox-56.0/js/xpconnect/src/XPCInlines.h 2017-09-25 10:34:11.206611695 +0200
@@ -471,7 +471,7 @@ inline @@ -465,7 +465,7 @@ inline
void XPCWrappedNativeTearOff::JSObjectMoved(JSObject* obj, const JSObject* old) void XPCWrappedNativeTearOff::JSObjectMoved(JSObject* obj, const JSObject* old)
{ {
MOZ_ASSERT(!IsMarked()); MOZ_ASSERT(!IsMarked());
@ -579,9 +461,9 @@ diff -up firefox-55.0/js/xpconnect/src/XPCInlines.h.1337988 firefox-55.0/js/xpco
mJSObject = obj; mJSObject = obj;
} }
diff -up firefox-55.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 firefox-55.0/js/xpconnect/src/XPCWrappedNative.cpp diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp
--- firefox-55.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 2017-08-02 14:33:41.738715458 +0200 --- firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 2017-09-14 22:16:03.000000000 +0200
+++ firefox-55.0/js/xpconnect/src/XPCWrappedNative.cpp 2017-08-02 15:25:43.749014973 +0200 +++ firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp 2017-09-25 10:34:11.207611692 +0200
@@ -874,7 +874,7 @@ void @@ -874,7 +874,7 @@ void
XPCWrappedNative::FlatJSObjectMoved(JSObject* obj, const JSObject* old) XPCWrappedNative::FlatJSObjectMoved(JSObject* obj, const JSObject* old)
{ {
@ -591,9 +473,9 @@ diff -up firefox-55.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 firefox-55.0
nsWrapperCache* cache = nullptr; nsWrapperCache* cache = nullptr;
CallQueryInterface(mIdentity, &cache); CallQueryInterface(mIdentity, &cache);
diff -up firefox-55.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 firefox-55.0/js/xpconnect/src/XPCWrappedNativeProto.cpp diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp
--- firefox-55.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 2017-07-31 18:20:47.000000000 +0200 --- firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 2017-07-31 18:20:47.000000000 +0200
+++ firefox-55.0/js/xpconnect/src/XPCWrappedNativeProto.cpp 2017-08-02 15:24:15.153207106 +0200 +++ firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp 2017-09-25 10:34:11.207611692 +0200
@@ -101,7 +101,7 @@ XPCWrappedNativeProto::CallPostCreatePro @@ -101,7 +101,7 @@ XPCWrappedNativeProto::CallPostCreatePro
void void
XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj) XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj)

1467
mozilla-1399611.patch
View File

File diff suppressed because it is too large Load Diff

39
mozilla-440908.patch
View File

@ -1,7 +1,7 @@
diff -up firefox-50.0/modules/libpref/prefapi.cpp.440908 firefox-50.0/modules/libpref/prefapi.cpp diff -up firefox-56.0/modules/libpref/prefapi.cpp.440908 firefox-56.0/modules/libpref/prefapi.cpp
--- firefox-50.0/modules/libpref/prefapi.cpp.440908 2016-10-31 21:15:26.000000000 +0100 --- firefox-56.0/modules/libpref/prefapi.cpp.440908 2017-09-14 22:15:52.000000000 +0200
+++ firefox-50.0/modules/libpref/prefapi.cpp 2016-11-10 10:32:48.796115692 +0100 +++ firefox-56.0/modules/libpref/prefapi.cpp 2017-09-25 10:39:39.266572792 +0200
@@ -997,8 +997,8 @@ void PREF_ReaderCallback(void *clo @@ -1036,8 +1036,8 @@ void PREF_ReaderCallback(void *clo
PrefValue value, PrefValue value,
PrefType type, PrefType type,
bool isDefault, bool isDefault,
@ -12,17 +12,17 @@ diff -up firefox-50.0/modules/libpref/prefapi.cpp.440908 firefox-50.0/modules/li
{ {
uint32_t flags = 0; uint32_t flags = 0;
if (isDefault) { if (isDefault) {
@@ -1010,4 +1010,6 @@ void PREF_ReaderCallback(void *clo @@ -1049,4 +1049,6 @@ void PREF_ReaderCallback(void *clo
flags |= kPrefForceSet; flags |= kPrefForceSet;
} }
pref_HashPref(pref, value, type, flags); pref_HashPref(pref, value, type, flags);
+ if (isLocked) + if (isLocked)
+ PREF_LockPref(pref, true); + PREF_LockPref(pref, true);
} }
diff -up firefox-50.0/modules/libpref/prefapi.h.440908 firefox-50.0/modules/libpref/prefapi.h diff -up firefox-56.0/modules/libpref/prefapi.h.440908 firefox-56.0/modules/libpref/prefapi.h
--- firefox-50.0/modules/libpref/prefapi.h.440908 2016-11-10 10:32:48.796115692 +0100 --- firefox-56.0/modules/libpref/prefapi.h.440908 2017-07-31 18:20:51.000000000 +0200
+++ firefox-50.0/modules/libpref/prefapi.h 2016-11-10 10:34:58.013159112 +0100 +++ firefox-56.0/modules/libpref/prefapi.h 2017-09-25 10:39:39.267572789 +0200
@@ -243,8 +243,8 @@ void PREF_ReaderCallback( void *closure, @@ -246,8 +246,8 @@ void PREF_ReaderCallback( void *closure,
PrefValue value, PrefValue value,
PrefType type, PrefType type,
bool isDefault, bool isDefault,
@ -33,9 +33,9 @@ diff -up firefox-50.0/modules/libpref/prefapi.h.440908 firefox-50.0/modules/libp
/* /*
* Callback whenever we change a preference * Callback whenever we change a preference
diff -up firefox-50.0/modules/libpref/prefread.cpp.440908 firefox-50.0/modules/libpref/prefread.cpp diff -up firefox-56.0/modules/libpref/prefread.cpp.440908 firefox-56.0/modules/libpref/prefread.cpp
--- firefox-50.0/modules/libpref/prefread.cpp.440908 2016-09-05 22:12:58.000000000 +0200 --- firefox-56.0/modules/libpref/prefread.cpp.440908 2017-09-14 22:15:52.000000000 +0200
+++ firefox-50.0/modules/libpref/prefread.cpp 2016-11-10 10:32:48.796115692 +0100 +++ firefox-56.0/modules/libpref/prefread.cpp 2017-09-25 10:39:39.267572789 +0200
@@ -43,6 +43,7 @@ enum { @@ -43,6 +43,7 @@ enum {
#define BITS_PER_HEX_DIGIT 4 #define BITS_PER_HEX_DIGIT 4
@ -88,9 +88,9 @@ diff -up firefox-50.0/modules/libpref/prefread.cpp.440908 firefox-50.0/modules/l
ps->quotechar = c; ps->quotechar = c;
ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */ ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */
state = PREF_PARSE_QUOTED_STRING; state = PREF_PARSE_QUOTED_STRING;
diff -up firefox-50.0/modules/libpref/prefread.h.440908 firefox-50.0/modules/libpref/prefread.h diff -up firefox-56.0/modules/libpref/prefread.h.440908 firefox-56.0/modules/libpref/prefread.h
--- firefox-50.0/modules/libpref/prefread.h.440908 2016-09-05 22:12:58.000000000 +0200 --- firefox-56.0/modules/libpref/prefread.h.440908 2017-09-14 22:15:52.000000000 +0200
+++ firefox-50.0/modules/libpref/prefread.h 2016-11-10 10:32:48.796115692 +0100 +++ firefox-56.0/modules/libpref/prefread.h 2017-09-25 10:39:39.267572789 +0200
@@ -34,7 +34,8 @@ typedef void (*PrefReader)(void *c @@ -34,7 +34,8 @@ typedef void (*PrefReader)(void *c
PrefValue val, PrefValue val,
PrefType type, PrefType type,
@ -108,13 +108,4 @@ diff -up firefox-50.0/modules/libpref/prefread.h.440908 firefox-50.0/modules/lib
+ bool flock; /* true if pref to be locked */ + bool flock; /* true if pref to be locked */
} PrefParseState; } PrefParseState;
/**
@@ -90,7 +92,7 @@ void PREF_InitParseState(PrefParseState
*
* @param ps
* PrefParseState instance.
- */
+ */
void PREF_FinalizeParseState(PrefParseState *ps);
/** /**

14
rhbz-966424.patch
View File

@ -1,14 +0,0 @@
diff -up firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm
--- firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 2014-10-14 08:12:14.358697255 +0200
+++ firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-14 08:17:59.962181908 +0200
@@ -174,7 +174,9 @@ this.checkCert =
}
function isBuiltinToken(tokenName) {
- return tokenName == "Builtin Object Token";
+ return tokenName == "Builtin Object Token" ||
+ tokenName == "Default Trust" ||
+ tokenName == "System Trust";
}
/**

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (firefox-55.0.3.source.tar.xz) = 3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416 SHA512 (firefox-56.0.source.tar.xz) = f187f1c2efa8b6405715780726928812bc330590041cb86cdf62b7aa54dc9a513cb68098aa3f0c0bcd21c006225a68a0a8bb34a4de7ee526059f87e2126ae37d
SHA512 (firefox-langpacks-55.0.3-20170901.tar.xz) = 582f104e20be5831bc9a3862910a321f8868c26331c3ed01405e484da7909f3e8ff1f491702c48aafd9bc1d2a2fc6cbb15eb6fa94d083076896b8342b14a3466 SHA512 (firefox-langpacks-56.0-20170925.tar.xz) = 3696b8ac7857fe378dd5f5c77953fa1ebff1e6be1888f4265b2a149d33283572a522f6f57da78837a90818fa121c5eb9c3e314a841652e9c26bc372c526fedad

12
xulrunner-24.0-s390-inlines.patch
View File

@ -1,12 +0,0 @@
diff -up xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp
--- xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines 2013-10-23 16:04:01.773093979 +0200
+++ xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp 2013-10-23 16:04:44.551134551 +0200
@@ -4,6 +4,8 @@
* 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/. */
+#include "jscntxtinlines.h"
+
#include "vm/SPSProfiler.h"
#include "mozilla/DebugOnly.h"