diff --git a/disable-openh264-download.patch b/disable-openh264-download.patch deleted file mode 100644 index 028b7302a4ff0e4d23260dd9de4dbeccbca9ff7c..0000000000000000000000000000000000000000 --- a/disable-openh264-download.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old firefox-81.0/toolkit/modules/GMPInstallManager.jsm ---- firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old 2020-09-25 10:39:04.769458703 +0200 -+++ firefox-81.0/toolkit/modules/GMPInstallManager.jsm 2020-09-25 10:39:22.038504747 +0200 -@@ -54,10 +54,6 @@ function getScopedLogger(prefix) { - - const LOCAL_GMP_SOURCES = [ - { -- id: "gmp-gmpopenh264", -- src: "chrome://global/content/gmp-sources/openh264.json", -- }, -- { - id: "gmp-widevinecdm", - src: "chrome://global/content/gmp-sources/widevinecdm.json", - }, -diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -108,7 +108,6 @@ toolkit.jar: - #ifdef XP_MACOSX - content/global/macWindowMenu.js - #endif -- content/global/gmp-sources/openh264.json (gmp-sources/openh264.json) - content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json) - - # Third party files -diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm ---- a/toolkit/modules/GMPInstallManager.jsm -+++ b/toolkit/modules/GMPInstallManager.jsm -@@ -238,6 +234,9 @@ GMPInstallManager.prototype = { - * downloaderr, verifyerr or previouserrorencountered - */ - installAddon(gmpAddon) { -+ if (gmpAddon.isOpenH264) { -+ return Promise.reject({ type: "disabled" }); -+ } - if (this._deferred) { - let log = getScopedLogger("GMPInstallManager.installAddon"); - log.error("previous error encountered"); - diff --git a/download b/download index f010f459736c87efcef91e35441013741272fe30..2760888dfba2cd6ac678482f7abb2b8b7978d0e2 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ d60fdae0a720baa240534de94d88c8e2 cbindgen-vendor.tar.xz -d1951406d0044ef0329941d2a2be283d firefox-102.8.0esr.b2.processed-source.tar.xz -0e7e843d7d2a00b974be9cd9a6a6f879 firefox-langpacks-102.8.0esr-20230214.tar.xz +875b5d8a41a39b799fb1dd450f98d047 firefox-102.9.0esr.b2.processed-source.tar.xz +68d4bf26fc30e3ef393fa8e12f83284f firefox-langpacks-102.9.0esr-20230310.tar.xz d41d8cd98f00b204e9800998ecf8427e mochitest-python.tar.gz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm 04f69b8baa7bd8ddc49d786b04307df8 nss-3.79.0-6.el8_1.src.rpm diff --git a/firefox.sh.in b/firefox.sh.in index 42eb1a796aecb0a400a9951a0e4a78a5b3a2d6e0..dee53946b9c2fc073b92513c491619e161a58dce 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -195,8 +195,8 @@ fi # When Firefox is not running, restore SELinux labels for profile files # (rhbz#1731371) if [ $MOZILLA_DOWN -ne 0 ]; then - if [ -x $GETENFORCE_FILE ] && [ `getenforce` != "Disabled" ]; then - (restorecon -vr ~/.mozilla/firefox/* &) + if [ -x $GETENFORCE_FILE ] && [ `$GETENFORCE_FILE` != "Disabled" ]; then + (/usr/sbin/restorecon -vr ~/.mozilla/firefox/* &) fi fi diff --git a/firefox.spec b/firefox.spec index ff134ba5fe20a4980c09227ade9769335b4e64b2..a0a9e34f3f007e6c1c7d95ec547f048febd02aab 100644 --- a/firefox.spec +++ b/firefox.spec @@ -201,8 +201,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.8.0 -Release: 2%{anolis_release}%{?dist} +Version: 102.9.0 +Release: 3%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -232,7 +232,7 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20230214.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230310.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -296,7 +296,6 @@ Patch219: rhbz-1173156.patch Patch224: mozilla-1170092.patch #ARM run-time patch Patch226: rhbz-1354671.patch -Patch228: disable-openh264-download.patch Patch229: firefox-nss-addon-hack.patch Patch230: D110204-fscreen.diff Patch231: webrtc-nss-fix.patch @@ -674,7 +673,6 @@ echo "use_rustts %{?use_rustts}" %ifarch aarch64 %patch226 -p1 -b .1354671 %endif -%patch228 -p1 -b .disable-openh264-download %patch229 -p1 -b .firefox-nss-addon-hack %patch230 -p1 -b .D110204-fscreen.diff %patch231 -p1 -b .webrtc-nss-fix @@ -1454,10 +1452,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Feb 21 2023 Liwei Ge - 102.8.0-2.0.1 +* Tue Mar 21 2023 Liwei Ge - 102.9.0-3.0.1 - Add firefox-anolis-default-prefs.js - Remove bookmarks +* Fri Mar 10 2023 Eike Rathke - 102.9.0-3 +- Update to 102.9.0 build2 + +* Thu Mar 09 2023 Jan Horak - 102.9.0-2 +- removed disable-openh264-download + +* Tue Mar 07 2023 Eike Rathke - 102.9.0-1 +- Update to 102.9.0 build1 + * Tue Feb 14 2023 Eike Rathke - 102.8.0-2 - Update to 102.8.0 build2