From 0554b6263876c14ba4ac98d99ff9838decca62d9 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sun, 10 Dec 2023 22:13:35 +0300 Subject: [PATCH 01/10] import firefox-102.10.0-1.el8_7 --- .firefox.metadata | 6 +++--- .gitignore | 6 +++--- SPECS/firefox.spec | 21 ++++++++++++--------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index 8e58263..7b5ad8a 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,7 +1,7 @@ 52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz -8139b2326f15be4b7dec0adfd5f27a1531495f87 SOURCES/firefox-102.9.0esr.b2.processed-source.tar.xz -558516929c10f87a61b5f07be57cdfef6213bf50 SOURCES/firefox-langpacks-102.9.0esr-20230310.tar.xz +4eb11930a11e5eee89647354e41ab5b91c132d0d SOURCES/firefox-102.10.0esr.processed-source.tar.xz +95f2f0cd510f0970cd1d1067a20f7396135e2506 SOURCES/firefox-langpacks-102.10.0esr-20230404.tar.xz 2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm -fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm +a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index 8832ffc..37bf058 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-102.9.0esr.b2.processed-source.tar.xz -SOURCES/firefox-langpacks-102.9.0esr-20230310.tar.xz +SOURCES/firefox-102.10.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-102.10.0esr-20230404.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-6.el8_1.src.rpm +SOURCES/nss-3.79.0-11.el8_1.src.rpm diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 28774e4..281681a 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 7 + return 9 end return -1 end} @@ -200,8 +200,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.9.0 -Release: 3%{?dist} +Version: 102.10.0 +Release: 1%{?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}-20230310.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230404.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-6.el8_1.src.rpm +Source403: nss-3.79.0-11.el8_1.src.rpm Source401: nss-setup-flags-env.inc Source402: nspr-4.34.0-3.el8_1.src.rpm @@ -609,7 +609,7 @@ This package contains results of tests executed during build. %if 0%{?rhel} >= 9 %package x11 Summary: Firefox X11 launcher. -Requires: %{name} +Requires: %{name} = %{version}-%{release} %description x11 The firefox-x11 package contains launcher and desktop file to run Firefox explicitly on X11. @@ -1451,10 +1451,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Jul 25 2023 MSVSphere Packaging Team - 102.9.0-3 +* Tue Jul 25 2023 MSVSphere Packaging Team - 102.10.0-1 - Rebuilt for MSVSphere 8.8 -* Fri Mar 10 2023 Eike Rathke - 102.9.0-3 +* Tue Apr 04 2023 Eike Rathke - 102.10.0-1 +- Update to 102.10.0 build1 + +* Fri Mar 10 2023 Eike Rathke - 102.9.0-4 - Update to 102.9.0 build2 * Thu Mar 09 2023 Jan Horak - 102.9.0-2 From 21814500d18d01404dea91eb9423615157ea2ff0 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 11 Dec 2023 00:23:01 +0300 Subject: [PATCH 02/10] import firefox-102.11.0-2.el8_7 --- .firefox.metadata | 4 ++-- .gitignore | 4 ++-- SOURCES/firefox-redhat-default-prefs.js | 5 ++--- SOURCES/firefox.sh.in | 4 ++-- SPECS/firefox.spec | 16 +++++++++++----- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index 7b5ad8a..42045ba 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 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 +6aa448bcbabf2b9410b916e8290b0f58ee725186 SOURCES/firefox-102.11.0esr.b2.processed-source.tar.xz +a26fce6c1a21e026f550ee9e4431200ddd041e36 SOURCES/firefox-langpacks-102.11.0esr-20230504.tar.xz 2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index 37bf058..a521f31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ 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.11.0esr.b2.processed-source.tar.xz +SOURCES/firefox-langpacks-102.11.0esr-20230504.tar.xz SOURCES/firefox-symbolic.svg SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.34.0-3.el8_1.src.rpm diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js index 7bf5098..9f6c0f1 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -17,8 +17,7 @@ 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("media.gmp-gmpopenh264.provider.enabled",false); -pref("media.gmp-gmpopenh264.autoupdate",false); +pref("media.gmp-gmpopenh264.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); pref("media.gmp.decoder.enabled", true); pref("plugins.notifyMissingFlash", false); @@ -36,4 +35,4 @@ pref("browser.gnome-search-provider.enabled",true); /* Enable ffvpx playback for WebRTC */ pref("media.navigator.mediadatadecoder_vpx_enabled", true); /* 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/SOURCES/firefox.sh.in b/SOURCES/firefox.sh.in index dee5394..6a3f6e4 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_FILE` != "Disabled" ] && [ -d ~/.mozilla/firefox ]; then + (/usr/sbin/restorecon -vr ~/.mozilla/firefox &) fi fi diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 281681a..5be3353 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -200,8 +200,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.10.0 -Release: 1%{?dist} +Version: 102.11.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}-20230504.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1451,9 +1451,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Jul 25 2023 MSVSphere Packaging Team - 102.10.0-1 +* Tue Jul 25 2023 MSVSphere Packaging Team - 102.11.0-2 - Rebuilt for MSVSphere 8.8 +* Thu May 04 2023 Eike Rathke - 102.11.0-2 +- Update to 102.11.0 build2 + +* Tue May 02 2023 Eike Rathke - 102.11.0-1 +- Update to 102.11.0 build1 + * Tue Apr 04 2023 Eike Rathke - 102.10.0-1 - Update to 102.10.0 build1 From d7dbaf2945bec6420510b1b55e80d8493f23040c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 11 Dec 2023 14:01:14 +0300 Subject: [PATCH 03/10] import firefox-102.12.0-1.el8_8 --- .firefox.metadata | 6 +- .gitignore | 6 +- SOURCES/firefox-redhat-default-prefs.js | 3 + SOURCES/firefox-symbolic.svg | 3 + SOURCES/mochitest-python.tar.gz | 0 SOURCES/mozilla-1833330.patch | 632 ++++++++++++++++++++++++ SPECS/firefox.spec | 20 +- 7 files changed, 657 insertions(+), 13 deletions(-) create mode 100644 SOURCES/firefox-symbolic.svg create mode 100644 SOURCES/mochitest-python.tar.gz create mode 100644 SOURCES/mozilla-1833330.patch diff --git a/.firefox.metadata b/.firefox.metadata index 42045ba..73701e6 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,7 +1,5 @@ 52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz -6aa448bcbabf2b9410b916e8290b0f58ee725186 SOURCES/firefox-102.11.0esr.b2.processed-source.tar.xz -a26fce6c1a21e026f550ee9e4431200ddd041e36 SOURCES/firefox-langpacks-102.11.0esr-20230504.tar.xz -2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg -da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz +ad6fa8c1048c81bedd369efcb30642a8bea003d9 SOURCES/firefox-102.12.0esr.processed-source.tar.xz +422709954a376fb2cb4d5f89310372e664cb2cf3 SOURCES/firefox-langpacks-102.12.0esr-20230531.tar.xz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index a521f31..b84053a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-102.11.0esr.b2.processed-source.tar.xz -SOURCES/firefox-langpacks-102.11.0esr-20230504.tar.xz -SOURCES/firefox-symbolic.svg -SOURCES/mochitest-python.tar.gz +SOURCES/firefox-102.12.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-102.12.0esr-20230531.tar.xz SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nss-3.79.0-11.el8_1.src.rpm diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js index 9f6c0f1..e1013e5 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -36,3 +36,6 @@ pref("browser.gnome-search-provider.enabled",true); pref("media.navigator.mediadatadecoder_vpx_enabled", true); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ pref("storage.nfs_filesystem", true); +pref("datareporting.healthreport.uploadEnabled", false); +pref("datareporting.policy.dataSubmissionEnabled", false); +pref("toolkit.telemetry.archive.enabled", false); diff --git a/SOURCES/firefox-symbolic.svg b/SOURCES/firefox-symbolic.svg new file mode 100644 index 0000000..8ecd135 --- /dev/null +++ b/SOURCES/firefox-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/SOURCES/mochitest-python.tar.gz b/SOURCES/mochitest-python.tar.gz new file mode 100644 index 0000000..e69de29 diff --git a/SOURCES/mozilla-1833330.patch b/SOURCES/mozilla-1833330.patch new file mode 100644 index 0000000..2c1af64 --- /dev/null +++ b/SOURCES/mozilla-1833330.patch @@ -0,0 +1,632 @@ +diff --git a/security/manager/locales/en-US/security/certificates/certManager.ftl b/security/manager/locales/en-US/security/certificates/certManager.ftl +--- a/security/manager/locales/en-US/security/certificates/certManager.ftl ++++ b/security/manager/locales/en-US/security/certificates/certManager.ftl +@@ -51,9 +51,6 @@ certmgr-cert-name = + certmgr-cert-server = + .label = Server + +-certmgr-override-lifetime = +- .label = Lifetime +- + certmgr-token-name = + .label = Security Device + +@@ -69,6 +66,9 @@ certmgr-email = + certmgr-serial = + .label = Serial Number + ++certmgr-fingerprint-sha-256 = ++ .label = SHA-256 Fingerprint ++ + certmgr-view = + .label = View… + .accesskey = V +diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js +--- a/security/manager/pki/resources/content/certManager.js ++++ b/security/manager/pki/resources/content/certManager.js +@@ -64,22 +64,16 @@ var serverRichList = { + + buildRichList() { + let overrides = overrideService.getOverrides().map(item => { +- let cert = null; +- if (item.dbKey !== "") { +- cert = certdb.findCertByDBKey(item.dbKey); +- } + return { + hostPort: item.hostPort, +- dbKey: item.dbKey, + asciiHost: item.asciiHost, + port: item.port, + originAttributes: item.originAttributes, +- isTemporary: item.isTemporary, +- displayName: cert !== null ? cert.displayName : "", ++ fingerprint: item.fingerprint, + }; + }); + overrides.sort((a, b) => { +- let criteria = ["hostPort", "displayName"]; ++ let criteria = ["hostPort", "fingerprint"]; + for (let c of criteria) { + let res = a[c].localeCompare(b[c]); + if (res !== 0) { +@@ -106,10 +100,10 @@ var serverRichList = { + _richBoxAddItem(item) { + let richlistitem = document.createXULElement("richlistitem"); + +- richlistitem.setAttribute("dbKey", item.dbKey); + richlistitem.setAttribute("host", item.asciiHost); + richlistitem.setAttribute("port", item.port); + richlistitem.setAttribute("hostPort", item.hostPort); ++ richlistitem.setAttribute("fingerprint", item.fingerprint); + richlistitem.setAttribute( + "originAttributes", + JSON.stringify(item.originAttributes) +@@ -120,18 +114,7 @@ var serverRichList = { + hbox.setAttribute("equalsize", "always"); + + hbox.appendChild(createRichlistItem({ raw: item.hostPort })); +- hbox.appendChild( +- createRichlistItem( +- item.displayName !== "" +- ? { raw: item.displayName } +- : { l10nid: "no-cert-stored-for-override" } +- ) +- ); +- hbox.appendChild( +- createRichlistItem({ +- l10nid: item.isTemporary ? "temporary-override" : "permanent-override", +- }) +- ); ++ hbox.appendChild(createRichlistItem({ raw: item.fingerprint })); + + richlistitem.appendChild(hbox); + +@@ -170,32 +153,6 @@ var serverRichList = { + } + }, + +- viewSelectedRichListItem() { +- let selectedItem = this.richlist.selectedItem; +- if (!selectedItem) { +- return; +- } +- +- let dbKey = selectedItem.getAttribute("dbKey"); +- if (dbKey) { +- let cert = certdb.findCertByDBKey(dbKey); +- viewCertHelper(window, cert); +- } +- }, +- +- exportSelectedRichListItem() { +- let selectedItem = this.richlist.selectedItem; +- if (!selectedItem) { +- return; +- } +- +- let dbKey = selectedItem.getAttribute("dbKey"); +- if (dbKey) { +- let cert = certdb.findCertByDBKey(dbKey); +- exportToFile(window, cert); +- } +- }, +- + addException() { + let retval = { + exceptionAdded: false, +@@ -212,16 +169,8 @@ var serverRichList = { + }, + + _setButtonState() { +- let websiteViewButton = document.getElementById("websites_viewButton"); +- let websiteExportButton = document.getElementById("websites_exportButton"); + let websiteDeleteButton = document.getElementById("websites_deleteButton"); +- +- let certKey = this.richlist.selectedItem?.getAttribute("dbKey"); +- let cert = certKey && certdb.findCertByDBKey(certKey); +- + websiteDeleteButton.disabled = this.richlist.selectedIndex < 0; +- websiteExportButton.disabled = !cert; +- websiteViewButton.disabled = websiteExportButton.disabled; + }, + }; + /** +diff --git a/security/manager/pki/resources/content/certManager.xhtml b/security/manager/pki/resources/content/certManager.xhtml +--- a/security/manager/pki/resources/content/certManager.xhtml ++++ b/security/manager/pki/resources/content/certManager.xhtml +@@ -157,18 +157,13 @@ + + + +- +- ++ + + + + + + +-