Compare commits

...

No commits in common. 'i8' and 'c9' have entirely different histories.
i8 ... c9

@ -1,77 +0,0 @@
From cdd5830a51a592098af841da33e3ff74d3d80b47 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Thu, 19 Sep 2024 10:34:02 +0300
Subject: [PATCH] Overt telemetry disabling
---
modules/libpref/init/all.js | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 2cbb736212..721e81128d 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -576,15 +576,30 @@ pref("toolkit.sqlitejsm.loglevel", "Error");
pref("toolkit.tabbox.switchByScrolling", false);
// Telemetry settings.
+// MSVSphere disable telemetry and geolocation by default
+pref("toolkit.telemetry.updatePing.enabled", false);
+pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
+pref("browser.newtabpage.activity-stream.telemetry", false);
+pref("browser.ping-centre.telemetry", false);
+pref("toolkit.telemetry.bhrPing.enabled", false);
+pref("toolkit.telemetry.enabled", false);
+pref("toolkit.telemetry.firstShutdownPing.enabled", false);
+pref("toolkit.telemetry.hybridContent.enabled", false);
+pref("toolkit.telemetry.newProfilePing.enabled", false);
+pref("toolkit.telemetry.reportingpolicy.firstRun", false);
+pref("toolkit.telemetry.shutdownPingSender.enabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
+pref("devtools.onboarding.telemetry.logged", false);
+
// Server to submit telemetry pings to.
-pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org");
+pref("toolkit.telemetry.server", "");
// Telemetry server owner. Please change if you set toolkit.telemetry.server to a different server
-pref("toolkit.telemetry.server_owner", "Mozilla");
+pref("toolkit.telemetry.server_owner", "MSVSphere");
// Determines whether full SQL strings are returned when they might contain sensitive info
// i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
pref("toolkit.telemetry.debugSlowSql", false);
// Whether to use the unified telemetry behavior, requires a restart.
-pref("toolkit.telemetry.unified", true);
+pref("toolkit.telemetry.unified", false);
// DAP related preferences
pref("toolkit.telemetry.dap_enabled", false);
@@ -3226,6 +3241,8 @@ pref("network.psl.onUpdate_notify", false);
// All the Geolocation preferences are here.
//
+// MSVSphere Geo location sends location data
+pref("geo.enabled", false);
pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
// Timeout to wait before sending the location request.
@@ -3857,7 +3874,7 @@ pref("toolkit.aboutProcesses.profileDuration", 5);
pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
#ifdef MOZ_DATA_REPORTING
- pref("datareporting.policy.dataSubmissionEnabled", true);
+ pref("datareporting.policy.dataSubmissionEnabled", false);
pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0");
pref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 0);
pref("datareporting.policy.dataSubmissionPolicyBypassNotification", false);
@@ -3872,7 +3889,7 @@ pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report");
// Health Report is enabled by default on all channels.
- pref("datareporting.healthreport.uploadEnabled", true);
+ pref("datareporting.healthreport.uploadEnabled", false);
#endif
#endif
--
2.46.0

@ -1,9 +1,9 @@
[Global]
id=MSVSphere
id=redhat
version=1.0
about=Mozilla Firefox for MSVSphere
about=Mozilla Firefox for Red Hat Enterprise Linux
[Preferences]
app.distributor=msvsphere
app.distributor.channel=msvsphere
app.partner.fedora=msvsphere
app.distributor=redhat
app.distributor.channel=redhat
app.partner.redhat=redhat

@ -29,5 +29,3 @@ mk_add_options MOZ_SERVICES_HEALTHREPORT=
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
# Disable telemetry
unset MOZ_TELEMETRY_REPORTING

@ -14,10 +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", "https://msvsphere-os.ru");
pref("startup.homepage_welcome_url", "https://msvsphere-os.ru");
pref("browser.bookmarks.file", "/usr/share/bookmarks/default-bookmarks.html");
pref("browser.places.importBookmarksHTML", true);
pref("startup.homepage_override_url", "%HOMEPAGE%");
pref("startup.homepage_welcome_url", "%HOMEPAGE%");
pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html");
pref("media.gmp-gmpopenh264.autoupdate",true);
pref("media.gmp-gmpopenh264.enabled",false);

@ -4,9 +4,7 @@
<id>firefox.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Firefox</name>
<name xml:lang="ru">Веб-браузер Firefox</name>
<summary>Web Browser</summary>
<summary xml:lang="ru">Веб-браузер</summary>
<summary xml:lang="ca">Navegador web</summary>
<summary xml:lang="cs">Webový prohlížeč</summary>
<summary xml:lang="es">Navegador web</summary>
@ -34,13 +32,6 @@
function will include possible matches from your browsing history, bookmarked
sites and open tabs.
</p>
<p xml:lang="ru">
Объединяя все виды потрясающих возможностей, мы делаем просмотр более удобным для вас.
Быстро переходите на свои любимые сайты даже если вы не помните URL-адреса.
Введите термин в адресную строку (также известную как Awesome Bar), и функция
автозаполнения будет включать возможные совпадения из вашей истории просмотров,
сайтов из закладок и открытых вкладок.
</p>
</description>
<url type="homepage">https://www.mozilla.org</url>
<update_contact>stransky@redhat.com</update_contact>

@ -1,7 +1,6 @@
[Desktop Entry]
Version=1.0
Name=Firefox
Name[ru]=Веб-браузер Firefox
GenericName=Web Browser
GenericName[ca]=Navegador web
GenericName[cs]=Webový prohlížeč
@ -21,7 +20,6 @@ GenericName[pl]=Przeglądarka WWW
GenericName[pt]=Navegador Web
GenericName[pt_BR]=Navegador Web
GenericName[sk]=Internetový prehliadač
GenericName[ru]=Веб браузер
GenericName[sv]=Webbläsare
Comment=Browse the Web
Comment[ca]=Navegueu per el web
@ -43,7 +41,6 @@ Comment[pl]=Przeglądanie stron WWW
Comment[pt]=Navegue na Internet
Comment[pt_BR]=Navegue na Internet
Comment[sk]=Prehliadanie internetu
Comment[ru]=Просматривайте веб-страницы
Comment[sv]=Surfa på webben
Exec=firefox %u
Icon=firefox
@ -275,5 +272,4 @@ Exec=firefox --private-window %u
Name=Open the Profile Manager
Name[cs]=Správa profilů
Name[de]=Profilverwaltung öffnen
Name[ru]=Откройте диспетчер профилей
Exec=firefox --ProfileManager

@ -1,9 +0,0 @@
{
"policies": {
"Certificates": {
"ImportEnterpriseRoots": true,
"Install": ["rootca_ssl_rsa2022.cer",
"/usr/lib64/firefox/defaults/rootca_ssl_rsa2022.cer"]
}
}
}

@ -1,33 +0,0 @@
-----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-----

@ -1,44 +0,0 @@
import json
import sys
import datetime
YANDEX_SECTION = json.loads('''
{
"appliesTo": [
{
"default": "yes",
"included": {
"everywhere": true
}
}
],
"id": "a0e7f96a-14e0-4d56-9f54-e0c7e49fd306",
"last_modified": 1679065511545,
"schema": 1639069022290,
"webExtension": {
"id": "yandex@search.mozilla.org"
}
}
''')
search_config = None
with open(sys.argv[1]) as f:
search_config = json.load(f)
inserted = False
for engine in search_config["data"]:
if engine["webExtension"]["id"] == "yandex@search.mozilla.org":
inserted = True
engine = YANDEX_SECTION
else:
for applies in engine["appliesTo"]:
if "default" in applies and applies["default"] == "yes":
applies["default"] = "no"
if not inserted:
search_config["data"] = [YANDEX_SECTION] + search_config["data"]
search_config["timestamp"] = int( datetime.datetime.now().timestamp() ) * 1000
with open(sys.argv[1], 'w') as f:
json.dump(search_config, f, indent=2)

@ -138,7 +138,7 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 128.2.0
Release: 1%{?dist}.inferit
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -210,13 +210,6 @@ Patch09: rhbz-2131158-webrtc-nss-fix.patch
Patch10: build-ffvpx.patch
Patch11: build-disable-gamepad.patch
# MSVSphere added Russian Trusted Root CA
Source500: rootca_ssl_rsa2022.cer
Source501: policies.json
# apply script from ROSA to set Yandex provides
# as default search provider for Firefox
# https://abf.rosalinux.ru/import/firefox/raw/rosa2023.1/use_yandex_search_as_default.py
Source502: use_yandex_search_as_default.py
# -- Upstreamed patches --
Patch51: mozilla-bmo1170092.patch
@ -250,9 +243,6 @@ Patch155: rhbz-1354671.patch
# ---- Security patches ----
# MSVSphere
Patch10000: 0001-Overt-telemetry-disabling.patch
# BUILD REQURES/REQUIRES
%if %{?system_nss} && !0%{?bundle_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
@ -1182,11 +1172,6 @@ echo "--------------------------------------------"
# ---- Security patches ----
# set Yandex search provider by default
python3 %{SOURCE502} services/settings/dumps/main/search-config.json
%patch10000 -p1 -b .0001-Overt-telemetry-disabling
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
%{__cp} %{SOURCE24} mozilla-api-key
@ -1579,11 +1564,10 @@ EOF
%endif
# set up our default bookmarks
# INF-613 Bookmarks import from default-bookmarks.html from system-bookmarks
#%%if !0%{?flatpak}
#%%global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html
#%%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html
#%%endif
%if !0%{?flatpak}
%global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html
%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html
%endif
# Make sure locale works for langpacks
%{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF
@ -1713,11 +1697,6 @@ sed -i -e 's|%HOMEPAGE%|%{homepage}|' %{buildroot}%{mozappdir}/defaults/preferen
# 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
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%{__mkdir_p} %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_app_id}
@ -1737,17 +1716,16 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries
%{__cp} failures-* %{buildroot}/%{version}-%{release}/ || true
%endif
# Drop distribution info from About dialog (INF-733)
## Add distribution.ini
##%%{__mkdir_p} %{buildroot}%{mozappdir}/distribution
##%%{__cp} %%{SOURCE26} %{buildroot}%{mozappdir}/distribution
# Add distribution.ini
%{__mkdir_p} %{buildroot}%{mozappdir}/distribution
%{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution
## CentOS
#%if 0%{?centos}
#%{__sed} -ie 's/redhat/centos/g' %{buildroot}%{mozappdir}/distribution
#(source /etc/os-release; %{__sed} -ie 's/Red Hat Enterprise Linux/$NAME/' %{buildroot}%{mozappdir}/distribution)
#cat %{buildroot}%{mozappdir}/distribution
#%endif
# CentOS
%if 0%{?centos}
%{__sed} -ie 's/redhat/centos/g' %{buildroot}%{mozappdir}/distribution
(source /etc/os-release; %{__sed} -ie 's/Red Hat Enterprise Linux/$NAME/' %{buildroot}%{mozappdir}/distribution)
cat %{buildroot}%{mozappdir}/distribution
%endif
# Install appdata file
mkdir -p %{buildroot}%{_datadir}/metainfo
@ -1818,7 +1796,6 @@ 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
@ -1827,11 +1804,10 @@ 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
##%{mozappdir}/distribution/distribution.ini
%{mozappdir}/distribution/distribution.ini
# That's Windows only
%ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi
%if %{with langpacks}
@ -1887,31 +1863,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Aug 27 2024 Jan Horak <jhorak@redhat.com> - 128.2.0-1
- Update to 128.2.0
* Thu Aug 01 2024 Eike Rathke <erack@redhat.com> - 115.14.0-2
- Update to 115.14.0 build2
* Tue Jul 30 2024 Eike Rathke <erack@redhat.com> - 115.14.0-1
- Update to 115.14.0 build1
* Mon Jul 08 2024 Tomas Popela <tpopela@redhat.com> - 115.13.0-3
- Update to 115.13.0 build3
* Tue Jul 02 2024 Eike Rathke <erack@redhat.com> - 115.13.0-2
- Update to 115.13.0 build2
* Mon Jul 01 2024 Eike Rathke <erack@redhat.com> - 115.13.0-1
- Update to 115.13.0 build1
* Tue Jun 18 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 115.12.0-1.inferit
- Update to 115.12.0-1
- Rebuilt for MSVSphere 8.10
* Tue Jun 04 2024 Eike Rathke <erack@redhat.com> - 115.12.0-1
- Update to 115.12.0 build1
* Tue May 07 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
- Update to 115.11.0 build1
* Tue Apr 09 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
- Update to 115.10.0 build1
@ -1928,22 +1879,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Update to 115.9.0 build1
- Fix expat CVE-2023-52425
* Mon Mar 11 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 115.8.0-1.inferit
- Update to 115.8.0-1
* Tue Feb 13 2024 Eike Rathke <erack@redhat.com> - 115.8.0-1
- Update to 115.8.0 build1
* Tue Jan 16 2024 Eike Rathke <erack@redhat.com> - 115.7.0-1
- Update to 115.7.0 build1
* Thu Dec 14 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 115.5.0-1.inferit
- Update to 115.5.0-1
* Thu Dec 14 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 102.9.0-3.inferit.3
- Drop distribution info from About dialog (INF-733) (Arkady L. Shane <tigro@msvsphere-os.ru>)
- fixup! Disable telemetry and geolocation by default
* Tue Dec 12 2023 Eike Rathke <erack@redhat.com> - 115.6.0-1
- Update to 115.6.0 build1
@ -1967,9 +1908,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Wed Aug 2 2023 Jan Horak <jhorak@redhat.com> - 115.1.0-1
- Update to 115.1.0 ESR
* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 115.0.2-1
- Rebuilt for MSVSphere 8.8
* Mon Jul 17 2023 Jan Horak <jhorak@redhat.com> - 115.0.2-1
- Update to 115.0.2 ESR

Loading…
Cancel
Save