diff --git a/.firefox.metadata b/.firefox.metadata
index d7f6e56..800f00a 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,7 +1,7 @@
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
e86c38c48960b95353503b78e1de9ddca1ed34d7 SOURCES/cbindgen-vendor.tar.xz
-27a2728ac1fff2134f2aae2e411f2266c19db1c2 SOURCES/firefox-68.7.0esr.source.tar.xz
-c60c4e160c29ab2e2514d85f3c45278b1241c972 SOURCES/firefox-langpacks-68.7.0esr-20200407.tar.xz
+8e2f1689172b7fed3c56989eace3d3c7d1a40e1d SOURCES/firefox-68.8.0esr.source.tar.xz
+15293f0ab01c38542dd908dc3cbd7e6c974757c4 SOURCES/firefox-langpacks-68.8.0esr-20200429.tar.xz
6724218efbb1f3fa14541cb2f255970b98446a45 SOURCES/firefox-symbolic.svg
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
diff --git a/.gitignore b/.gitignore
index ade37fb..d6522ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
SOURCES/Python-2.7.13.tar.xz
SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-68.7.0esr.source.tar.xz
-SOURCES/firefox-langpacks-68.7.0esr-20200407.tar.xz
+SOURCES/firefox-68.8.0esr.source.tar.xz
+SOURCES/firefox-langpacks-68.8.0esr-20200429.tar.xz
SOURCES/firefox-symbolic.svg
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
deleted file mode 100644
index 6dfe2ad..0000000
--- a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200
-@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
- void* aContext) {
- asm volatile("nop; nop; nop; nop" : : : "memory");
-
-- asm volatile("b %0" : : "X"(H) : "memory");
-+ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
- }
-
- # define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
deleted file mode 100644
index 3f84f95..0000000
--- a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 1 Jun 2019 09:06:01 +0900
-Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
- user_vfp_exc.
-
----
- js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f8478..383c380f04c 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
- #endif
-
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--# include <sys/user.h>
-+struct user_vfp {
-+ unsigned long long fpregs[32];
-+ unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+ unsigned long fpexc;
-+ unsigned long fpinst;
-+ unsigned long fpinst2;
-+};
- #endif
-
- #if defined(ANDROID)
---
-2.20.1
-
diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini
index 0a0429e..8bf461e 100644
--- a/SOURCES/distribution.ini
+++ b/SOURCES/distribution.ini
@@ -1,7 +1,7 @@
[Global]
id=redhat
version=1.0
-about=Mozilla Firefox for CentOS Linux
+about=Mozilla Firefox for Red Hat Enterprise Linux
[Preferences]
app.distributor=redhat
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index ea10021..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,35 +0,0 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("general.smoothScroll", true);
-pref("intl.locale.matchOS", true);
-pref("toolkit.storage.synchronous", 0);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-pref("browser.backspace_action", 2);
-pref("browser.display.use_system_colors", true);
-pref("browser.download.folderList", 1);
-pref("browser.link.open_external", 3);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("network.manage-offline-status", true);
-pref("extensions.shownSelectionUI", true);
-pref("ui.SpellCheckerUnderlineStyle", 1);
-pref("startup.homepage_override_url", "http://www.centos.org");
-pref("startup.homepage_welcome_url", "http://www.centos.org");
-pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-pref("media.gmp-gmpopenh264.provider.enabled",false);
-pref("media.gmp-gmpopenh264.autoupdate",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("plugins.notifyMissingFlash", false);
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
-pref("browser.display.use_system_colors", false);
-pref("layers.use-image-offscreen-surfaces", false);
-/* Allow sending credetials to all https:// sites */
-pref("network.negotiate-auth.trusted-uris", "https://");
-pref("security.use_sqldb", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */
-pref("storage.nfs_filesystem", true);
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
new file mode 100644
index 0000000..607a132
--- /dev/null
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -0,0 +1,35 @@
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("general.smoothScroll", true);
+pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+pref("browser.backspace_action", 2);
+pref("browser.display.use_system_colors", true);
+pref("browser.download.folderList", 1);
+pref("browser.link.open_external", 3);
+pref("browser.shell.checkDefaultBrowser", false);
+pref("network.manage-offline-status", true);
+pref("extensions.shownSelectionUI", true);
+pref("ui.SpellCheckerUnderlineStyle", 1);
+pref("startup.homepage_override_url", "http://www.redhat.com");
+pref("startup.homepage_welcome_url", "http://www.redhat.com");
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+pref("media.gmp-gmpopenh264.provider.enabled",false);
+pref("media.gmp-gmpopenh264.autoupdate",false);
+pref("media.gmp-gmpopenh264.enabled",false);
+pref("media.gmp-gmpopenh264.enabled",false);
+pref("plugins.notifyMissingFlash", false);
+/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
+pref("browser.display.use_system_colors", false);
+pref("layers.use-image-offscreen-surfaces", false);
+/* Allow sending credetials to all https:// sites */
+pref("network.negotiate-auth.trusted-uris", "https://");
+pref("security.use_sqldb", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */
+pref("storage.nfs_filesystem", true);
\ No newline at end of file
diff --git a/SOURCES/rhbz-1821418.patch b/SOURCES/rhbz-1821418.patch
new file mode 100644
index 0000000..588084c
--- /dev/null
+++ b/SOURCES/rhbz-1821418.patch
@@ -0,0 +1,37 @@
+diff -up firefox-68.7.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 firefox-68.7.0/xpcom/base/AvailableMemoryTracker.cpp
+--- firefox-68.7.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 2020-04-03 21:30:08.000000000 +0200
++++ firefox-68.7.0/xpcom/base/AvailableMemoryTracker.cpp 2020-04-23 21:15:56.015491502 +0200
+@@ -147,8 +147,12 @@ bool nsAvailableMemoryWatcher::IsVirtual
+
+ /* static */
+ bool nsAvailableMemoryWatcher::IsCommitSpaceLow(const MEMORYSTATUSEX& aStat) {
+- if ((kLowCommitSpaceThreshold != 0) &&
+- (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
++ const char* threshold = getenv("MOZ_GC_THRESHOLD");
++ if (threshold) {
++ kLowCommitSpaceThreshold = atoi(threshold);
++ }
++
++ if ((kLowCommitSpaceThreshold == 0) || (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
+ sNumLowCommitSpaceEvents++;
+ CrashReporter::AnnotateCrashReport(
+ CrashReporter::Annotation::LowCommitSpaceEvents,
+@@ -206,13 +210,16 @@ void nsAvailableMemoryWatcher::AdjustPol
+ // polling interval accordingly.
+ NS_IMETHODIMP
+ nsAvailableMemoryWatcher::Notify(nsITimer* aTimer) {
++ const char* threshold = getenv("MOZ_GC_THRESHOLD");
++ bool forceLowMem = (threshold && atoi(threshold) == 0);
++
+ MEMORYSTATUSEX stat;
+ stat.dwLength = sizeof(stat);
+ bool success = GlobalMemoryStatusEx(&stat);
+
+- if (success) {
++ if (success || forceLowMem) {
+ bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat) ||
+- IsPhysicalMemoryLow(stat);
++ IsPhysicalMemoryLow(stat) || forceLowMem;
+
+ if (lowMemory) {
+ SendMemoryPressureEvent();
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 60c732f..3bab72b 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -1,12 +1,6 @@
# Set for local builds only
%global disable_toolsets 0
-%ifarch %{arm}
-%if 0%{?rhel} == 8
-%undefine _debugsource_packages
-%endif
-%endif
-
# Use system nspr/nss? FIXME
%if 0%{?rhel} == 8
%global system_nss 1
@@ -171,8 +165,8 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 68.7.0
-Release: 2%{?dist}
+Version: 68.8.0
+Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
%if 0%{?rhel} == 7
@@ -184,11 +178,15 @@ ExclusiveArch: i686 x86_64 ppc64 s390x
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20200407.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20200429.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source10: firefox-mozconfig
+%if 0%{?centos}
Source12: firefox-centos-default-prefs.js
+%else
+Source12: firefox-redhat-default-prefs.js
+%endif
Source20: firefox.desktop
Source21: firefox.sh.in
Source23: firefox.1
@@ -242,6 +240,7 @@ Patch224: mozilla-1170092.patch
Patch231: firefox-pipewire.patch
Patch232: firefox-rhel6-hugepage.patch
Patch233: firefox-rhel6-nss-tls1.3.patch
+Patch234: rhbz-1821418.patch
# Upstream patches
Patch402: mozilla-1196777.patch
@@ -249,10 +248,12 @@ Patch402: mozilla-1196777.patch
#Patch500: debug.patch
Patch501: python-encode.patch
Patch502: mozilla-1603112-accept-lang.patch
-Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch10001: Bug-1526653---fix_user_vfp_armv7.patch
-# Debian patches
+# CentOS patches
+%if 0%{?centos}
+Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch10001: Bug-1526653---fix_user_vfp_armv7.patch
+%endif
%if %{?system_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
@@ -309,6 +310,7 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel
BuildRequires: scl-utils
+
%if 0%{?rhel} == 8
BuildRequires: cargo
BuildRequires: rust >= %{rust_version}
@@ -515,6 +517,7 @@ https://extensions.gnome.org.
%patch232 -p1 -b .hugepage
%patch233 -p1 -b .rhel6-nss-tls1.3
%endif
+%patch234 -p1 -b .rhbz-1821418
#ARM run-time patch
@@ -534,11 +537,11 @@ https://extensions.gnome.org.
%patch502 -p1 -b .1603112-accept-lang
%patch1001 -p1 -b .ppc64le-inline
-
-%ifarch %{arm}
+# CentOS patches
+%if 0%{?centos}
%patch10000 -p1 -b .mozilla-1238661
%patch10001 -p1 -b .mozilla-1526653
-%endif
+%endif
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -596,12 +599,8 @@ echo "ac_add_options --disable-optimize" >> .mozconfig
%endif
%ifarch armv7hl
# ARMv7 need that (rhbz#1426850)
-%if 0%{?rhel} == 8
-%global optimize_flags "-g0 -O2 -fno-schedule-insns -fno-lto"
-%else
%global optimize_flags "-g -O2 -fno-schedule-insns"
%endif
-%endif
%ifarch ppc64le aarch64
%global optimize_flags "-g -O2"
%endif
@@ -916,21 +915,11 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
# (OOM when linking, rhbz#1238225)
export MOZ_DEBUG_FLAGS=" "
%endif
-%ifarch %{arm}
-%if 0%{?rhel} == 8
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
-export MOZ_DEBUG_FLAGS=" "
-%endif
-%endif
%ifarch s390 %{arm} ppc aarch64 i686
MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif
%ifarch %{arm}
export RUSTFLAGS="-Cdebuginfo=0"
-%if 0%{?rhel} == 8
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
-echo "ac_add_options --enable-linker=gold" >> .mozconfig
-%endif
%endif
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
@@ -1217,6 +1206,10 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz
%{__mkdir_p} %{buildroot}%{mozappdir}/distribution
%{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution
+%if 0%{?centos}
+sed -i -e 's|Red Hat Enterprise|CentOS|' %{buildroot}%{mozappdir}/distribution/distribution.ini
+%endif
+
# Remove copied libraries to speed up build
rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so
rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozalloc.so
@@ -1349,6 +1342,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Apr 29 2020 Jan Horak <jhorak@redhat.com>
+- Update to 68.8.0 build1
+
+* Thu Apr 23 2020 Martin Stransky <stransky@redhat.com> - 68.7.0-3
+- Added fix for rhbz#1821418
+
* Tue Apr 07 2020 Jan Horak <jhorak@redhat.com> - 68.7.0-2
- Update to 68.7.0 build3