diff --git a/.gitattributes b/.gitattributes index 91f530a27862313fb8ba3e86e77526fdcaffe22b..adbcda3211da9bb05a6e32562470fddc9b46135b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -firefox-91.5.0esr.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text +firefox-91.6.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 deleted file mode 100644 index 6dfe2ada2bcab17ecf2caf305034f76b6e4b6a96..0000000000000000000000000000000000000000 --- a/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) diff --git a/Bug-1526653---fix_user_vfp_armv7.patch b/Bug-1526653---fix_user_vfp_armv7.patch deleted file mode 100644 index 3f84f9522a28d2e40b3f23266d90f4f495347c02..0000000000000000000000000000000000000000 --- a/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 -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.5.0esr.processed-source.tar.xz b/firefox-91.6.0esr.processed-source.tar.xz similarity index 32% rename from firefox-91.5.0esr.processed-source.tar.xz rename to firefox-91.6.0esr.processed-source.tar.xz index 582bfcd10055580fa6a3da5b1f3c895c1e7c2a94..d769a9835209894a42b5d92c93790b42b1b409c4 100644 --- a/firefox-91.5.0esr.processed-source.tar.xz +++ b/firefox-91.6.0esr.processed-source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0044d33f372fffce54a35aeec2a9220408cc4075f50fde3223771c3fe3f58010 -size 387299488 +oid sha256:f98d334f1eb9fa167f1d4b6c5d6de5901fde75394625db2754e0a5ad3a338bf4 +size 386923628 diff --git a/firefox-langpacks-91.5.0esr-20220106.tar.xz b/firefox-langpacks-91.6.0esr-20220202.tar.xz similarity index 77% rename from firefox-langpacks-91.5.0esr-20220106.tar.xz rename to firefox-langpacks-91.6.0esr-20220202.tar.xz index 1475e74ddfc271a0c52b0137574a647927cb963c..26242ee3465cda52cbc8bbecabf10db77dcd31d1 100644 Binary files a/firefox-langpacks-91.5.0esr-20220106.tar.xz and b/firefox-langpacks-91.6.0esr-20220202.tar.xz differ diff --git a/firefox-mozconfig b/firefox-mozconfig index 9e8a32fff11fe0c6fae149d67dc91a6b263d969b..6c7afd7d44a87026d1ba27bb997222c5d080eb1a 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -12,7 +12,6 @@ ac_add_options --enable-chrome-format=omni ac_add_options --enable-pulseaudio ac_add_options --without-system-icu ac_add_options --enable-release -ac_add_options --update-channel=release ac_add_options --allow-addon-sideload ac_add_options --with-system-jpeg ac_add_options --enable-js-shell diff --git a/firefox-nss-addon-hack.patch b/firefox-nss-addon-hack.patch new file mode 100644 index 0000000000000000000000000000000000000000..0322707726f9037f08c8c867e229252fd77efb13 --- /dev/null +++ b/firefox-nss-addon-hack.patch @@ -0,0 +1,19 @@ +diff -up firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp +--- firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack 2021-01-11 12:12:02.585514543 +0100 ++++ firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp 2021-01-11 12:47:50.345984582 +0100 +@@ -1619,6 +1619,15 @@ SECStatus InitializeNSS(const nsACString + return srv; + } + ++ /* Sets the NSS_USE_ALG_IN_ANY_SIGNATURE bit. ++ * does not change NSS_USE_ALG_IN_CERT_SIGNATURE, ++ * so policy will still disable use of sha1 in ++ * certificate related signature processing. */ ++ srv = NSS_SetAlgorithmPolicy(SEC_OID_SHA1, NSS_USE_ALG_IN_ANY_SIGNATURE, 0); ++ if (srv != SECSuccess) { ++ NS_WARNING("Unable to use SHA1 for Add-ons, expect broken/disabled Add-ons. See https://bugzilla.redhat.com/show_bug.cgi?id=1908018 for details."); ++ } ++ + if (nssDbConfig == NSSDBConfig::ReadWrite) { + UniquePK11SlotInfo slot(PK11_GetInternalKeySlot()); + if (!slot) { diff --git a/firefox.spec b/firefox.spec index 4c07ee99612b5fb0a14658d503ed8482fad8f1e3..cb6ad80fcf3619799a278e2c511623ac4dcfe349 100644 --- a/firefox.spec +++ b/firefox.spec @@ -129,7 +129,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.5.0 +Version: 91.6.0 Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -154,7 +154,7 @@ 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}-20220106.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220202.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -185,6 +185,7 @@ Patch6: build-nss-version.patch Patch215: firefox-enable-addons.patch Patch219: rhbz-1173156.patch Patch224: mozilla-1170092.patch +Patch225: firefox-nss-addon-hack.patch # Upstream patches @@ -203,12 +204,6 @@ 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} @@ -432,6 +427,11 @@ echo "use_rustts %{?use_rustts}" %patch219 -p1 -b .rhbz-1173156 %patch224 -p1 -b .1170092 +# the nss changed in 8.6 and later, so addons are working in older releases +%if 0%{?rhel_minor_version} >= 6 +%patch225 -p1 -b .firefox-nss-addon-hack +%endif + # Patch for big endian platforms only %if 0%{?big_endian} %endif @@ -461,13 +461,6 @@ 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} @@ -1261,13 +1254,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Jan 24 2022 maqi -91.5.0-1.0.1 +* Wed Feb 16 2022 Liwei Ge -91.6.0-1.0.1 - Rebrand for Anolis - Remove bookmarks +* Wed Feb 02 2022 Eike Rathke - 91.6.0-1 +- Update to 91.6.0 build1 + +* Wed Feb 02 2022 Jan Horak - 91.5.0-2 +- Use default update channel to fix non working enterprise policies: + rhbz#2044667 + * Thu Jan 06 2022 Eike Rathke - 91.5.0-1 - Update to 91.5.0 build1 +* Mon Dec 13 2021 Jan Horak - 91.4.0-2 +- Added fix for failing addons signatures. + * Wed Dec 01 2021 Eike Rathke - 91.4.0-1 - Update to 91.4.0 build1