From 017d2c87081a564b7f3eed545978d67109cf30df Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 5 May 2022 02:41:56 +0800 Subject: [PATCH 1/3] import firefox-91.9.0-1.el8_5.src.rpm --- D110204-fscreen.diff | 0 build-debuginfo-fix.patch | 0 build-mozconfig-fix.patch | 0 build-nss-version.patch | 0 build-ppc64le-inline.patch | 0 build-rhel7-nasm-dwarf.patch | 0 distribution.ini | 0 download | 8 ++--- expat-CVE-2022-25235.patch | 0 expat-CVE-2022-25236.patch | 0 expat-CVE-2022-25315.patch | 0 firefox-enable-addons.patch | 0 firefox-mozconfig | 0 firefox-nss-addon-hack.patch | 0 ...refs.js => firefox-redhat-default-prefs.js | 8 ++--- firefox-symbolic.svg | 0 firefox.1 | 0 firefox.desktop | 0 firefox.sh.in | 0 firefox.spec | 33 ++++++++++--------- google-api-key | 0 mozilla-1170092.patch | 0 mozilla-api-key | 0 mozilla-bmo1005535.patch | 0 mozilla-bmo1504834-part1.patch | 0 mozilla-bmo1504834-part2.patch | 0 mozilla-bmo1504834-part3.patch | 0 mozilla-bmo1504834-part4.patch | 0 mozilla-bmo1554971.patch | 0 mozilla-bmo1602730.patch | 0 mozilla-bmo1626236.patch | 0 mozilla-bmo849632.patch | 0 mozilla-bmo998749.patch | 0 mozilla-s390-context.patch | 0 mozilla-s390x-skia-gradient.patch | 0 nss-setup-flags-env.inc | 0 rhbz-1173156.patch | 0 37 files changed, 26 insertions(+), 23 deletions(-) mode change 100644 => 100755 D110204-fscreen.diff mode change 100644 => 100755 build-debuginfo-fix.patch mode change 100644 => 100755 build-mozconfig-fix.patch mode change 100644 => 100755 build-nss-version.patch mode change 100644 => 100755 build-ppc64le-inline.patch mode change 100644 => 100755 build-rhel7-nasm-dwarf.patch mode change 100644 => 100755 distribution.ini mode change 100644 => 100755 expat-CVE-2022-25235.patch mode change 100644 => 100755 expat-CVE-2022-25236.patch mode change 100644 => 100755 expat-CVE-2022-25315.patch mode change 100644 => 100755 firefox-enable-addons.patch mode change 100644 => 100755 firefox-mozconfig mode change 100644 => 100755 firefox-nss-addon-hack.patch rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (87%) mode change 100644 => 100755 mode change 100644 => 100755 firefox-symbolic.svg mode change 100644 => 100755 firefox.1 mode change 100644 => 100755 firefox.desktop mode change 100644 => 100755 firefox.sh.in mode change 100644 => 100755 firefox.spec mode change 100644 => 100755 google-api-key mode change 100644 => 100755 mozilla-1170092.patch mode change 100644 => 100755 mozilla-api-key mode change 100644 => 100755 mozilla-bmo1005535.patch mode change 100644 => 100755 mozilla-bmo1504834-part1.patch mode change 100644 => 100755 mozilla-bmo1504834-part2.patch mode change 100644 => 100755 mozilla-bmo1504834-part3.patch mode change 100644 => 100755 mozilla-bmo1504834-part4.patch mode change 100644 => 100755 mozilla-bmo1554971.patch mode change 100644 => 100755 mozilla-bmo1602730.patch mode change 100644 => 100755 mozilla-bmo1626236.patch mode change 100644 => 100755 mozilla-bmo849632.patch mode change 100644 => 100755 mozilla-bmo998749.patch mode change 100644 => 100755 mozilla-s390-context.patch mode change 100644 => 100755 mozilla-s390x-skia-gradient.patch mode change 100644 => 100755 nss-setup-flags-env.inc mode change 100644 => 100755 rhbz-1173156.patch diff --git a/D110204-fscreen.diff b/D110204-fscreen.diff old mode 100644 new mode 100755 diff --git a/build-debuginfo-fix.patch b/build-debuginfo-fix.patch old mode 100644 new mode 100755 diff --git a/build-mozconfig-fix.patch b/build-mozconfig-fix.patch old mode 100644 new mode 100755 diff --git a/build-nss-version.patch b/build-nss-version.patch old mode 100644 new mode 100755 diff --git a/build-ppc64le-inline.patch b/build-ppc64le-inline.patch old mode 100644 new mode 100755 diff --git a/build-rhel7-nasm-dwarf.patch b/build-rhel7-nasm-dwarf.patch old mode 100644 new mode 100755 diff --git a/distribution.ini b/distribution.ini old mode 100644 new mode 100755 diff --git a/download b/download index bdd18f1..80ccaed 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ -9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -c9f2564d7ee920f269434494b24ea440 firefox-91.8.0esr.processed-source.tar.xz -2755fb9e4dd8e596b3aa02f7460b94d5 firefox-langpacks-91.8.0esr-20220405.tar.xz -5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm 770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm +5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm +9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz +2883bbb515d59401bbec06d3e3182fb8 firefox-langpacks-91.9.0esr-20220426.tar.xz +38e4a8d4dc51e0250cb2afef8caf0aea firefox-91.9.0esr.processed-source.tar.xz diff --git a/expat-CVE-2022-25235.patch b/expat-CVE-2022-25235.patch old mode 100644 new mode 100755 diff --git a/expat-CVE-2022-25236.patch b/expat-CVE-2022-25236.patch old mode 100644 new mode 100755 diff --git a/expat-CVE-2022-25315.patch b/expat-CVE-2022-25315.patch old mode 100644 new mode 100755 diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch old mode 100644 new mode 100755 diff --git a/firefox-mozconfig b/firefox-mozconfig old mode 100644 new mode 100755 diff --git a/firefox-nss-addon-hack.patch b/firefox-nss-addon-hack.patch old mode 100644 new mode 100755 diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js old mode 100644 new mode 100755 similarity index 87% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index a02fa2a..9ead3a2 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -14,9 +14,9 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://openanolis.cn/"); -pref("startup.homepage_welcome_url", "https://openanolis.cn/"); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); pref("media.gmp-gmpopenh264.autoupdate",false); @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/firefox-symbolic.svg b/firefox-symbolic.svg old mode 100644 new mode 100755 diff --git a/firefox.1 b/firefox.1 old mode 100644 new mode 100755 diff --git a/firefox.desktop b/firefox.desktop old mode 100644 new mode 100755 diff --git a/firefox.sh.in b/firefox.sh.in old mode 100644 new mode 100755 diff --git a/firefox.spec b/firefox.spec old mode 100644 new mode 100755 index 71670af..45c216b --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -9,17 +8,17 @@ %{lua: function dist_to_rhel_minor(str, start) - match = string.match(str, ".module%+an8.%d+") + match = string.match(str, ".module%+el8.%d+") if match then return string.sub(match, 13) end - match = string.match(str, ".an8_%d+") + match = string.match(str, ".el8_%d+") if match then return string.sub(match, 6) end - match = string.match(str, ".an8") + match = string.match(str, ".el8") if match then - return 6 + return 7 end return -1 end} @@ -129,8 +128,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.8.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.9.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -154,13 +153,17 @@ ExcludeArch: aarch64 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}-20220405.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220426.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +%if 0%{?centos} +Source12: firefox-centos-default-prefs.js +%else +Source12: firefox-redhat-default-prefs.js +%endif Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -323,7 +326,8 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -Requires: anolis-indexhtml +BuildRequires: system-bookmarks +Requires: redhat-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -431,7 +435,7 @@ echo "use_rustts %{?use_rustts}" %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 +%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 6) || 0%{?rhel} >= 9 %patch225 -p1 -b .firefox-nss-addon-hack %endif @@ -980,7 +984,7 @@ function install_rpms_to_current_dir() { %endif # set up our default bookmarks -# %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1260,9 +1264,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Sat Apr 09 2022 Liwei Ge - 91.8.0-1.0.1 -- Add firefox-anolis-default-prefs.js -- Remove bookmarks +* Tue Apr 26 2022 Eike Rathke - 91.9.0-1 +- Update to 91.9.0 * Tue Apr 05 2022 Eike Rathke - 91.8.0-1 - Update to 91.8.0 diff --git a/google-api-key b/google-api-key old mode 100644 new mode 100755 diff --git a/mozilla-1170092.patch b/mozilla-1170092.patch old mode 100644 new mode 100755 diff --git a/mozilla-api-key b/mozilla-api-key old mode 100644 new mode 100755 diff --git a/mozilla-bmo1005535.patch b/mozilla-bmo1005535.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1504834-part1.patch b/mozilla-bmo1504834-part1.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1504834-part2.patch b/mozilla-bmo1504834-part2.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1504834-part3.patch b/mozilla-bmo1504834-part3.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1504834-part4.patch b/mozilla-bmo1504834-part4.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1554971.patch b/mozilla-bmo1554971.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1602730.patch b/mozilla-bmo1602730.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo1626236.patch b/mozilla-bmo1626236.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo849632.patch b/mozilla-bmo849632.patch old mode 100644 new mode 100755 diff --git a/mozilla-bmo998749.patch b/mozilla-bmo998749.patch old mode 100644 new mode 100755 diff --git a/mozilla-s390-context.patch b/mozilla-s390-context.patch old mode 100644 new mode 100755 diff --git a/mozilla-s390x-skia-gradient.patch b/mozilla-s390x-skia-gradient.patch old mode 100644 new mode 100755 diff --git a/nss-setup-flags-env.inc b/nss-setup-flags-env.inc old mode 100644 new mode 100755 diff --git a/rhbz-1173156.patch b/rhbz-1173156.patch old mode 100644 new mode 100755 -- Gitee From cb9313b910df350ee4dbb11e5d96a4f7519b0f65 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 16 Dec 2021 06:12:47 +0000 Subject: [PATCH 2/3] rebrand: add firefox-anolis-default-prefs.js --- ...prefs.js => firefox-anolis-default-prefs.js | 8 ++++---- firefox.spec | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (87%) diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 87% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index 9ead3a2..a02fa2a 100755 --- a/firefox-redhat-default-prefs.js +++ b/firefox-anolis-default-prefs.js @@ -14,9 +14,9 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); +pref("startup.homepage_override_url", "https://openanolis.cn/"); +pref("startup.homepage_welcome_url", "https://openanolis.cn/"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); pref("media.gmp-gmpopenh264.autoupdate",false); @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); \ No newline at end of file +pref("storage.nfs_filesystem", true); diff --git a/firefox.spec b/firefox.spec index 45c216b..2f90447 100755 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -129,7 +130,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 91.9.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -159,11 +160,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20220426.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -%if 0%{?centos} -Source12: firefox-centos-default-prefs.js -%else -Source12: firefox-redhat-default-prefs.js -%endif +Source12: firefox-anolis-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -326,8 +323,7 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -BuildRequires: system-bookmarks -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -984,7 +980,7 @@ function install_rpms_to_current_dir() { %endif # set up our default bookmarks -%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +# %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1264,6 +1260,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu May 05 2022 Liwei Ge - 91.9.0-1.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks + * Tue Apr 26 2022 Eike Rathke - 91.9.0-1 - Update to 91.9.0 -- Gitee From 63c917bb95cc8997d862f4aac70cc6e18b2a6003 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Tue, 15 Feb 2022 22:04:20 +0800 Subject: [PATCH 3/3] spec: update dist to get correct minor Signed-off-by: Liwei Ge --- firefox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firefox.spec b/firefox.spec index 2f90447..89c87c7 100755 --- a/firefox.spec +++ b/firefox.spec @@ -9,15 +9,15 @@ %{lua: function dist_to_rhel_minor(str, start) - match = string.match(str, ".module%+el8.%d+") + match = string.match(str, ".module%+an8.%d+") if match then return string.sub(match, 13) end - match = string.match(str, ".el8_%d+") + match = string.match(str, ".an8_%d+") if match then return string.sub(match, 6) end - match = string.match(str, ".el8") + match = string.match(str, ".an8") if match then return 7 end -- Gitee