diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..e7f6186a96a216f70d73fd41392162cdacf5dcc0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +firefox-91.4.0esr.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch new file mode 100644 index 0000000000000000000000000000000000000000..6dfe2ada2bcab17ecf2caf305034f76b6e4b6a96 --- /dev/null +++ b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch @@ -0,0 +1,12 @@ +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) diff --git a/Bug-1526653---fix_user_vfp_armv7.patch b/Bug-1526653---fix_user_vfp_armv7.patch new file mode 100644 index 0000000000000000000000000000000000000000..3f84f9522a28d2e40b3f23266d90f4f495347c02 --- /dev/null +++ b/Bug-1526653---fix_user_vfp_armv7.patch @@ -0,0 +1,35 @@ +From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 +From: Mike Hommey +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 ++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/firefox-91.3.0esr.processed-source.tar.xz b/firefox-91.3.0esr.processed-source.tar.xz deleted file mode 100644 index fd706e582b2faa6f3fb3a4408092e78420f89cea..0000000000000000000000000000000000000000 Binary files a/firefox-91.3.0esr.processed-source.tar.xz and /dev/null differ diff --git a/firefox-91.4.0esr.processed-source.tar.xz b/firefox-91.4.0esr.processed-source.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3c588ee0cf920c32a8920fd1e0b3e3d7ff5448b0 --- /dev/null +++ b/firefox-91.4.0esr.processed-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb90f65449dd00903292093f95f3bcd51b5b767cd4816605f66c4c090fd9b5ec +size 388025128 diff --git a/firefox-anolis-default-prefs.js b/firefox-centos-default-prefs.js similarity index 92% rename from firefox-anolis-default-prefs.js rename to firefox-centos-default-prefs.js index 0cc561fce5cfc81073ed4f4386f8de5d70abd0c6..039e27f3bc94836873ade6193fcaf28f8fef85f5 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-centos-default-prefs.js @@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://openanolis.cn/"); -pref("startup.homepage_welcome_url", "https://openanolis.cn/"); +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:///%PREFIX%/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); diff --git a/firefox-langpacks-91.3.0esr-20211101.tar.xz b/firefox-langpacks-91.4.0esr-20211201.tar.xz similarity index 76% rename from firefox-langpacks-91.3.0esr-20211101.tar.xz rename to firefox-langpacks-91.4.0esr-20211201.tar.xz index 1d9fd65b5d1777548cc78cdf3ac90bf612db7796..2a5b2d35bf23b888c48311faa79ebbc3a0e4f28d 100644 Binary files a/firefox-langpacks-91.3.0esr-20211101.tar.xz and b/firefox-langpacks-91.4.0esr-20211201.tar.xz differ diff --git a/firefox.spec b/firefox.spec index bd6702f8bcc2e67319f0e4b4434ab1d058bf9ad0..a7ed5bb2ddfd6f2b885c98619e0d9d854ad03491 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -129,8 +128,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.3.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.4.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -150,12 +149,16 @@ ExcludeArch: s390 ppc # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20211101.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20211201.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +%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 @@ -165,7 +168,7 @@ Source26: distribution.ini Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source403: nss-3.67.0-6.el8_1.src.rpm +Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc Source402: nspr-4.32.0-1.el8_1.src.rpm @@ -199,6 +202,12 @@ Patch515: mozilla-bmo1626236.patch Patch518: D110204-fscreen.diff # Flatpak 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} %if !0%{?bundle_nss} @@ -315,7 +324,7 @@ Requires: nss >= %{nss_build_version} BuildRequires: desktop-file-utils BuildRequires: system-bookmarks -Requires: anolis-indexhtml +Requires: redhat-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -451,6 +460,13 @@ echo "use_rustts %{?use_rustts}" %endif %endif +%if 0%{?centos} +%ifarch %{arm} +%patch 10000 -p1 -b .centos.armhfp +%patch 10001 -p1 -b .centos.armhfp2 +%endif +%endif + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding} @@ -964,7 +980,7 @@ function install_rpms_to_current_dir() { %endif # set up our default bookmarks -#%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1244,9 +1260,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Dec 29 2021 yangxianzhao - 91.3.0-1.0.1 -- Rebrand for Anolis -- Remove bookmarks +* Wed Dec 01 2021 Eike Rathke - 91.4.0-1 +- Update to 91.4.0 build1 * Mon Nov 01 2021 Eike Rathke - 91.3.0-1 - Update to 91.3.0 build1 diff --git a/nss-3.67.0-6.el8_1.src.rpm b/nss-3.67.0-7.el8_1.src.rpm similarity index 94% rename from nss-3.67.0-6.el8_1.src.rpm rename to nss-3.67.0-7.el8_1.src.rpm index 403efc28f87e7e6bd1729fe30b990a3651e1d588..1fcafc06c7876b1813718f72eb5e6e3f153d9203 100644 Binary files a/nss-3.67.0-6.el8_1.src.rpm and b/nss-3.67.0-7.el8_1.src.rpm differ