From 97a1aba12ff94768d06cac76bf7d3097d45167db Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Fri, 31 Mar 2023 11:47:09 +0800 Subject: [PATCH] Update to 102.9.0 --- .gitattributes | 4 ++-- ...r.xz => firefox-102.9.0esr.b2.processed-source.tar.xz | 4 ++-- ...ar.xz => firefox-langpacks-102.9.0esr-20230310.tar.xz | 4 ++-- firefox.sh.in | 4 ++-- firefox.spec | 9 +++++---- 5 files changed, 13 insertions(+), 12 deletions(-) rename firefox-102.8.0esr.b2.processed-source.tar.xz => firefox-102.9.0esr.b2.processed-source.tar.xz (32%) rename firefox-langpacks-102.8.0esr-20230214.tar.xz => firefox-langpacks-102.9.0esr-20230310.tar.xz (32%) diff --git a/.gitattributes b/.gitattributes index 371194c..d02b002 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -firefox-langpacks-102.8.0esr-20230214.tar.xz filter=lfs diff=lfs merge=lfs -text -firefox-102.8.0esr.b2.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text +firefox-102.9.0esr.b2.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text +firefox-langpacks-102.9.0esr-20230310.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/firefox-102.8.0esr.b2.processed-source.tar.xz b/firefox-102.9.0esr.b2.processed-source.tar.xz similarity index 32% rename from firefox-102.8.0esr.b2.processed-source.tar.xz rename to firefox-102.9.0esr.b2.processed-source.tar.xz index c706e63..7263911 100644 --- a/firefox-102.8.0esr.b2.processed-source.tar.xz +++ b/firefox-102.9.0esr.b2.processed-source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d86efb1ebc211623acf3b6dde92501b76dd953eeb5188af3aaeda28db07f1652 -size 486552868 +oid sha256:ab2ee90fbd7390b4bedf7ebb6b5cd8f283a1c4aec4ebdaa0d298b8a7014a0423 +size 486656020 diff --git a/firefox-langpacks-102.8.0esr-20230214.tar.xz b/firefox-langpacks-102.9.0esr-20230310.tar.xz similarity index 32% rename from firefox-langpacks-102.8.0esr-20230214.tar.xz rename to firefox-langpacks-102.9.0esr-20230310.tar.xz index 162ec41..052dd2f 100644 --- a/firefox-langpacks-102.8.0esr-20230214.tar.xz +++ b/firefox-langpacks-102.9.0esr-20230310.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64a9e52006911abf90d919b0e715fd64fde275bd0ecff75b5571eb76fa09f706 -size 44675456 +oid sha256:3157cf08fa12cd57dd4fca01e356133fdddf7001a44d4f463c874a22fb21bf4b +size 44678300 diff --git a/firefox.sh.in b/firefox.sh.in index f2a602b..f437ab1 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -191,8 +191,8 @@ fi # When Firefox is not running, restore SELinux labels for profile files 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 cb45449..712cfef 100644 --- a/firefox.spec +++ b/firefox.spec @@ -147,7 +147,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.8.0 +Version: 102.9.0 Release: 1 URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -164,7 +164,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # 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 @@ -222,7 +222,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.patch Patch231: webrtc-nss-fix.patch @@ -518,7 +517,6 @@ to run Firefox explicitly on X11. %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 @@ -1129,6 +1127,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Mar 31 2023 wangkai - 102.9.0-1 +- Update to 102.9.0 + * Fri Mar 03 2023 wangkai - 102.8.0-1 - Update to 102.8.0 -- Gitee