diff --git a/.firefox.metadata b/.firefox.metadata
index 7b5ad8a..29fb912 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,7 +1,7 @@
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
-4eb11930a11e5eee89647354e41ab5b91c132d0d SOURCES/firefox-102.10.0esr.processed-source.tar.xz
-95f2f0cd510f0970cd1d1067a20f7396135e2506 SOURCES/firefox-langpacks-102.10.0esr-20230404.tar.xz
+ce1edd4069705fafcf232716c62e58e5cd2928d9 SOURCES/firefox-102.8.0esr.b2.processed-source.tar.xz
+ede840118e4d2795a9dce2267b1dedbbc4015c7a SOURCES/firefox-langpacks-102.8.0esr-20230214.tar.xz
2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg
da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
+fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm
diff --git a/.gitignore b/.gitignore
index 37bf058..cc1991e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-102.10.0esr.processed-source.tar.xz
-SOURCES/firefox-langpacks-102.10.0esr-20230404.tar.xz
+SOURCES/firefox-102.8.0esr.b2.processed-source.tar.xz
+SOURCES/firefox-langpacks-102.8.0esr-20230214.tar.xz
SOURCES/firefox-symbolic.svg
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-SOURCES/nss-3.79.0-11.el8_1.src.rpm
+SOURCES/nss-3.79.0-6.el8_1.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/disable-openh264-download.patch b/SOURCES/disable-openh264-download.patch
new file mode 100644
index 0000000..028b730
--- /dev/null
+++ b/SOURCES/disable-openh264-download.patch
@@ -0,0 +1,39 @@
+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/SOURCES/firefox.sh.in b/SOURCES/firefox.sh.in
index dee5394..42eb1a7 100644
--- a/SOURCES/firefox.sh.in
+++ b/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_FILE` != "Disabled" ]; then
- (/usr/sbin/restorecon -vr ~/.mozilla/firefox/* &)
+ if [ -x $GETENFORCE_FILE ] && [ `getenforce` != "Disabled" ]; then
+ (restorecon -vr ~/.mozilla/firefox/* &)
fi
fi
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 2f1beda..cc1596b 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -26,7 +26,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el8")
if match then
- return 9
+ return 7
end
return -1
end}
@@ -200,8 +200,8 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 102.10.0
-Release: 1%{?dist}
+Version: 102.8.0
+Release: 2%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -209,7 +209,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
# firefox-102.8.0esr.b2.processed-source.tar.xz
# When unset use processed source file name as is.
-#%%global buildnum .b2
+%global buildnum .b2
%if 0%{?rhel} == 9
ExcludeArch: %{ix86}
@@ -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}-20230404.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20230214.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@@ -259,7 +259,7 @@ Source42: psummary
Source43: print_failures
Source44: print-error-reftest
Source45: run-wayland-compositor
-Source403: nss-3.79.0-11.el8_1.src.rpm
+Source403: nss-3.79.0-6.el8_1.src.rpm
Source401: nss-setup-flags-env.inc
Source402: nspr-4.34.0-3.el8_1.src.rpm
@@ -295,6 +295,7 @@ 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
@@ -609,7 +610,7 @@ This package contains results of tests executed during build.
%if 0%{?rhel} >= 9
%package x11
Summary: Firefox X11 launcher.
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}
%description x11
The firefox-x11 package contains launcher and desktop file
to run Firefox explicitly on X11.
@@ -672,6 +673,7 @@ 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
@@ -1451,21 +1453,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Thu May 04 2023 CentOS Sources <bugs@centos.org> - 102.10.0-1.el9.centos
-- Apply debranding changes
-
-* Tue Apr 04 2023 Eike Rathke <erack@redhat.com> - 102.10.0-1
-- Update to 102.10.0 build1
-
-* Fri Mar 10 2023 Eike Rathke <erack@redhat.com> - 102.9.0-4
-- 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