From cde7fea7901ac706ebc1c6a00a5dd5390500c1d2 Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Wed, 29 Mar 2023 11:29:08 +0300 Subject: [PATCH] MSVSphere changes --- SOURCES/distribution.ini | 10 ++++---- SOURCES/firefox-redhat-default-prefs.js | 4 +-- SOURCES/policies.json | 9 +++++++ SOURCES/rootca_ssl_rsa2022.cer | 33 +++++++++++++++++++++++++ SPECS/firefox.spec | 18 +++++++++++--- 5 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 SOURCES/policies.json create mode 100644 SOURCES/rootca_ssl_rsa2022.cer diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 11f1f96..cd0c0ba 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,9 +1,9 @@ [Global] -id=fedora +id=MSVSphere version=1.0 -about=Mozilla Firefox for Fedora +about=Mozilla Firefox for MSVSphere [Preferences] -app.distributor=fedora -app.distributor.channel=fedora -app.partner.fedora=fedora +app.distributor=msvsphere +app.distributor.channel=msvsphere +app.partner.fedora=msvsphere diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js index 2c7c599..7d597bc 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -14,8 +14,8 @@ 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("startup.homepage_override_url", "https://msvsphere.ru"); +pref("startup.homepage_welcome_url", "https://msvsphere.ru"); 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); diff --git a/SOURCES/policies.json b/SOURCES/policies.json new file mode 100644 index 0000000..a601772 --- /dev/null +++ b/SOURCES/policies.json @@ -0,0 +1,9 @@ +{ + "policies": { + "Certificates": { + "ImportEnterpriseRoots": true, + "Install": ["rootca_ssl_rsa2022.cer", + "/usr/lib64/firefox/defaults/rootca_ssl_rsa2022.cer"] + } + } +} diff --git a/SOURCES/rootca_ssl_rsa2022.cer b/SOURCES/rootca_ssl_rsa2022.cer new file mode 100644 index 0000000..253d971 --- /dev/null +++ b/SOURCES/rootca_ssl_rsa2022.cer @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx +PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu +ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg +Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS +VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg +YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v +dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n +qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q +XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U +zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX +YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y +Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD +U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD +4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9 +G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH +BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX +ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa +OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf +BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS +BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF +AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH +tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq +W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+ +/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS +AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj +C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV +4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d +WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ +D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC +EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq +391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4= +-----END CERTIFICATE----- diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index e99b47b..49708f3 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -201,7 +201,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 102.3.0 -Release: 6%{?dist} +Release: 6%{?dist}.inferit URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -255,6 +255,10 @@ 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 +# MSVSphere added Russian Trusted Root CA +Source500: rootca_ssl_rsa2022.cer +Source501: policies.json + # Build patches Patch3: mozilla-build-arm.patch Patch25: rhbz-1219542-s390-build.patch @@ -1231,6 +1235,11 @@ sed -i -e 's|%PREFIX%|%{_prefix}|' %{buildroot}%{mozappdir}/defaults/preferences # System config dir %{__mkdir_p} %{buildroot}/%{_sysconfdir}/%{name}/pref +# MSVSphere added Russian Trusted Root CA +%{__mkdir_p} %{buildroot}/%{_sysconfdir}/%{name}/policies +%{__cp} %{SOURCE500} %{buildroot}%{mozappdir}/defaults +%{__cp} %{SOURCE501} %{buildroot}/%{_sysconfdir}/%{name}/policies + # System extensions %{__mkdir_p} %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_app_id} %{__mkdir_p} %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_app_id} @@ -1329,6 +1338,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc %{_mandir}/man1/* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/* +%{_sysconfdir}/%{name}/policies %dir %{_datadir}/mozilla/extensions/* %dir %{_libdir}/mozilla/extensions/* %{_datadir}/applications/%{name}.desktop @@ -1337,6 +1347,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{mozappdir} %license %{mozappdir}/LICENSE %{mozappdir}/browser/chrome +%{mozappdir}/defaults/*.cer %{mozappdir}/defaults/preferences/* %{mozappdir}/browser/defaults/preferences %{mozappdir}/browser/features/*.xpi @@ -1401,8 +1412,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 102.3.0-6 -- Rebuilt for MSVSphere 9.1. +* Wed Mar 29 2023 Sergey Cherevko - 102.3.0-6.inferit +- Added Russian Trusted Root CA +- Debrand and rebuild for MSVSphere 9.1 * Tue Sep 13 2022 Jan Horak - 102.3.0-6 - Update to 102.3.0 build1