Merge branch 'c9' into a9

.firefox.metadata

@@ -1,6 +1,6 @@
 52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
-ce1edd4069705fafcf232716c62e58e5cd2928d9 SOURCES/firefox-102.8.0esr.b2.processed-source.tar.xz
+8139b2326f15be4b7dec0adfd5f27a1531495f87 SOURCES/firefox-102.9.0esr.b2.processed-source.tar.xz
-ede840118e4d2795a9dce2267b1dedbbc4015c7a SOURCES/firefox-langpacks-102.8.0esr-20230214.tar.xz
+558516929c10f87a61b5f07be57cdfef6213bf50 SOURCES/firefox-langpacks-102.9.0esr-20230310.tar.xz
 2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg
 da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
 af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm

.gitignore

@@ -1,6 +1,6 @@
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-102.8.0esr.b2.processed-source.tar.xz
+SOURCES/firefox-102.9.0esr.b2.processed-source.tar.xz
-SOURCES/firefox-langpacks-102.8.0esr-20230214.tar.xz
+SOURCES/firefox-langpacks-102.9.0esr-20230310.tar.xz
 SOURCES/firefox-symbolic.svg
 SOURCES/mochitest-python.tar.gz
 SOURCES/nspr-4.34.0-3.el8_1.src.rpm

SOURCES/disable-openh264-download.patch

@@ -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");
-

SOURCES/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
+  if [ -x $GETENFORCE_FILE ] && [ `$GETENFORCE_FILE` != "Disabled" ]; then
-    (restorecon -vr ~/.mozilla/firefox/* &)
+    (/usr/sbin/restorecon -vr ~/.mozilla/firefox/* &)
   fi
 fi
 

SPECS/firefox.spec

@@ -200,8 +200,8 @@ end}
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        102.8.0
+Version:        102.9.0
-Release:        2%{?dist}.alma
+Release:        3%{?dist}.alma
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -231,7 +231,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
@@ -295,7 +295,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
@@ -673,7 +672,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
@@ -1453,9 +1451,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Feb 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.8.0-2.alma
+* Mon Mar 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.9.0-3.alma
 - Debrand for AlmaLinux
 
+* Fri Mar 10 2023 Eike Rathke <erack@redhat.com> - 102.9.0-3
+- Update to 102.9.0 build2
+* Thu Mar 09 2023 Jan Horak <jhorak@redhat.com> - 102.9.0-2
+- removed disable-openh264-download
+
+* Tue Mar 07 2023 Eike Rathke <erack@redhat.com> - 102.9.0-1
+- Update to 102.9.0 build1
+
 * Tue Feb 14 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2
 - Update to 102.8.0 build2
 * Tue Feb 07 2023 Eike Rathke <erack@redhat.com> - 102.8.0-1