From e6954b01f4d9962d7f6427fbb09c9bcfbb3bef3d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sep 20 2024 17:00:18 +0000 Subject: [PATCH 1/2] libre/iceweasel 1:129.0-1 * Sync with the changes from the upstreams * Create missing document_pdf.svg, build fails without it. --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 51eb332..98ae356 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -1,4 +1,4 @@ -From d6a7df70708517c6bd28cee781fa48f8616426a9 Mon Sep 17 00:00:00 2001 +From c1a4cb25ff553541fd831e5980c27e47ff4cb186 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -69,12 +69,12 @@ index bb5c17d9ae..ae310b6939 100644 console.log(`Fetching records from ${chalk.underline.yellow(RECORDS_URL)}`); diff --git a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -index 32d1614307..9ba1e278a6 100644 +index 2775ff14ad..e408afd3fd 100644 --- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -@@ -884,7 +884,7 @@ export class ASRouterAdminInner extends React.PureComponent { +@@ -815,7 +815,7 @@ export class ASRouterAdminInner extends React.PureComponent { nimbus-desktop-experiments diff --git a/browser/components/asrouter/content/asrouter-admin.bundle.js b/browser/components/asrouter/content/asrouter-admin.bundle.js -index 0ac94260d8..c96a6bd83d 100644 +index a76ab1ec85..694a42a14e 100644 --- a/browser/components/asrouter/content/asrouter-admin.bundle.js +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js -@@ -1650,7 +1650,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P +@@ -1149,7 +1149,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", { - className: "providerUrl", + className: "small-text", target: "_blank", - href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", + href: "resource://app/defaults/settings/main/nimbus-desktop-experiments.json", @@ -147,10 +147,10 @@ index f4f852eeb1..b877808e79 100644 The purpose of this Google Summer of Code project, which is called Fretboard, was to develop an A/B testing framework written in Kotlin based on the existing code from Fennec, but making it independent of both the server used and the local storage mechanism, allowing it to be used on other apps, such as Firefox Focus, which started to need to do some A/B tests. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt -index 65778d2795..3db7c27b5f 100644 +index ef41b0eef3..47edd1d4ec 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt -@@ -628,7 +628,7 @@ class Core( +@@ -633,7 +633,7 @@ class Core( // collection name to fetch from server for SERP telemetry const val COLLECTION_NAME = "search-telemetry-v2" @@ -207,10 +207,10 @@ index 9cf3e4dc30..282ff1b40e 100644 #. Add the filename to the relevant ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build`` diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -index 4ab38dd799..e21f0d4f44 100755 +index 77fe5c583a..2302412498 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -@@ -293,7 +293,7 @@ function compare_suffix_lists { +@@ -292,7 +292,7 @@ function compare_suffix_lists { } function compare_remote_settings_files { @@ -220,15 +220,15 @@ index 4ab38dd799..e21f0d4f44 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json -index 0d6b1110ea..e25dd14bb5 100644 +index 8d1fb68e12..e09d627a59 100644 --- a/third_party/rust/remote_settings/.cargo-checksum.json +++ b/third_party/rust/remote_settings/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"1029f571c66d33c4dfc5e9fc55287a780329ce183f5d2b672de79737155c4227","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"666ef6536a81b107cdd6047b56ffb53a052c0a615b1fa827e630892c0e528a5d","src/config.rs":"52a209256acd8b1fada2b91e9d9f669df0ee6e9609baad7ec34a2111ed2a6541","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} +-{"files":{"Cargo.toml":"b7ce43b44cab449291d711602e00307ef113e85d220990123756fdf46d345bbf","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"289bd72c901d99eebbf9d6f559456ca05a4f23b1570ccba2d206284a9dec7d65","src/config.rs":"52a209256acd8b1fada2b91e9d9f669df0ee6e9609baad7ec34a2111ed2a6541","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"1029f571c66d33c4dfc5e9fc55287a780329ce183f5d2b672de79737155c4227","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"79e711ab5439d3e8dc7f36b66e9504bffedf7aab0b08919f643f9b0c55f18e6b","src/config.rs":"f5af5bd8fafe6644459bb6eaa6913bb03bf8cadadd31c7a37be9c42bea23004b","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} ++{"files":{"Cargo.toml":"b7ce43b44cab449291d711602e00307ef113e85d220990123756fdf46d345bbf","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"6ab83e441eef69b0f0a96dc727880e18903d5176e985abe10fdeea3c6ef175fb","src/config.rs":"f5af5bd8fafe6644459bb6eaa6913bb03bf8cadadd31c7a37be9c42bea23004b","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs -index 601b5c451a..ff416cf480 100644 +index d152ee6ec0..fd8ba14bca 100644 --- a/third_party/rust/remote_settings/src/client.rs +++ b/third_party/rust/remote_settings/src/client.rs @@ -532,7 +532,7 @@ mod test { @@ -370,10 +370,10 @@ index 467883519b..77c941e273 100644 REMOTE_SETTINGS_VERIFY_SIGNATURE: -- -2.45.2 +2.46.0 -From 54e96dbaf230c52de060a842a2e219e42b92c744 Mon Sep 17 00:00:00 2001 +From dbc7b88dd50b8051f6dbff5af7aeb374e68ba501 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -442,10 +442,10 @@ index ac4d76614d..747306b4a5 100644 }, }; -- -2.45.2 +2.46.0 -From 8346cf8d0e9c83620f67b32cf8dddda13b07acbf Mon Sep 17 00:00:00 2001 +From 69d353b846078ca72eee7751ae0c57ac5da11899 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -486,10 +486,10 @@ index 3bfed26ea4..807eb220ec 100644 -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155 -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 -- -2.45.2 +2.46.0 -From 84b1dcb292f81404478b1bfdbf41603ab0794563 Mon Sep 17 00:00:00 2001 +From 2bb7e9ad5509664c150f34a6f0dcd884a4259538 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -586,10 +586,10 @@ index a3e9e9b3f2..b32a8d8691 100644 ] -- -2.45.2 +2.46.0 -From 170634ce09efd1241e4fc966bc5a9efb9ea6596a Mon Sep 17 00:00:00 2001 +From c3f7d5f66a2b369bce80430975e342457d629b9b Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -622,10 +622,10 @@ index e4d4247253..296001536c 100644 }, -- -2.45.2 +2.46.0 -From b6bc1c09e6253861c0faaac72817fe365e9d2bbc Mon Sep 17 00:00:00 2001 +From d68021448f95515d251249e97a7b32156f44d1e6 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -676,10 +676,10 @@ index 1eeaf0bed9..d998a2d3b1 100644 /** -- -2.45.2 +2.46.0 -From 35e1d4320c7746faa5b4479a3b577739b220553e Mon Sep 17 00:00:00 2001 +From a4443c8cb7cd8c69f58974bd3dc75387ce856b2d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -822,10 +822,10 @@ index 2153520adb..6d6884a782 100644 remoteRecords, }; -- -2.45.2 +2.46.0 -From 495dc2978b43a237db58d17a600ad3e877cc64f6 Mon Sep 17 00:00:00 2001 +From ef8b8eed950d5d8df7327e327bd24a65b11c8103 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -927,10 +927,10 @@ index 6d6884a782..eaec124e67 100644 * Synchronize the local database with the remote server. * -- -2.45.2 +2.46.0 -From bd49e9e887ad12e9d2a93d63c59b970d47a4b3e3 Mon Sep 17 00:00:00 2001 +From 6a2517e88429a01bdbc321ff2c55c870a8d7d3f0 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -976,10 +976,10 @@ index eaec124e67..9d662ceaef 100644 } } else { -- -2.45.2 +2.46.0 -From bfce55e97dcb673fafbeacd7d407ca44f3c38cd0 Mon Sep 17 00:00:00 2001 +From 075e5ea13c2088ebd8d1f74ac1268cae6f5aacad Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -1041,10 +1041,10 @@ index 9d662ceaef..95f6b3efe6 100644 * Fetch information from changeset endpoint. * -- -2.45.2 +2.46.0 -From 95568b0b53196fe2d3bf440304acdad2ee2280c7 Mon Sep 17 00:00:00 2001 +From cca892a2ca1ac1b353639f814c9eead5223a6e50 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -1078,10 +1078,10 @@ index 95f6b3efe6..3340b33852 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.45.2 +2.46.0 -From 9518b1740d5b39ad330a5c10dc69453edc4228bb Mon Sep 17 00:00:00 2001 +From d04fa9375e7373f07b49e0edb5cc5b7a025c296e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached @@ -1171,10 +1171,10 @@ index 7724afd5b8..98d82f8fb7 100644 /** -- -2.45.2 +2.46.0 -From d2c0a49a132afa8ad1b967f86b9de12460ed87f1 Mon Sep 17 00:00:00 2001 +From 354f2eaac9988f7a030649968d6874b134bf5897 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -1199,10 +1199,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 824bc50ed8..7551e96e24 100644 +index 884a475e21..87e1256997 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -15004,7 +15004,7 @@ +@@ -15227,7 +15227,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -1210,12 +1210,12 @@ index 824bc50ed8..7551e96e24 100644 + value: 0 mirror: always - - name: security.tls.version.min + # The CRLite filter channel to which the user is subscribed. diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 5f3792fd52..f5b655c2f0 100644 +index 5891ae628f..f18094cda8 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1176,6 +1176,7 @@ void nsNSSComponent::setValidationOptions( +@@ -1172,6 +1172,7 @@ void nsNSSComponent::setValidationOptions( CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled; CRLiteMode crliteMode = static_cast(StaticPrefs::security_pki_crlite_mode()); @@ -1224,5 +1224,5 @@ index 5f3792fd52..f5b655c2f0 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.45.2 +2.46.0 diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index 48c8a3e..c1a3fe0 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -1,4 +1,4 @@ -From 92831217b971daad1a92d28a35c04a7bddea46cb Mon Sep 17 00:00:00 2001 +From cfcf6350be0e9a411cc9ad1f5d0b1aee61e4e132 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/6] geolocation: Disable API and remove Google API URLs @@ -23,10 +23,10 @@ default for now. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 7551e96e24..6c11e3275f 100644 +index 87e1256997..4f9814cc2a 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -5607,7 +5607,7 @@ +@@ -5639,7 +5639,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool @@ -36,10 +36,10 @@ index 7551e96e24..6c11e3275f 100644 # Time, in milliseconds, to wait for the location provider to spin up. diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index e089619c38..3383eb7d00 100644 +index 55955e8174..3e66e787eb 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3225,7 +3225,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3204,7 +3204,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // @@ -49,10 +49,10 @@ index e089619c38..3383eb7d00 100644 // Timeout to wait before sending the location request. pref("geo.provider.network.timeToWaitBeforeSending", 5000); -- -2.45.2 +2.46.0 -From fa01d5bc324ad34dc457e3dfa2da0d40ae2c53b8 Mon Sep 17 00:00:00 2001 +From ee85f768343fa54b22d3a2eb4f56a323ec272fcc Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/6] Disable banners and remove URLs for mobile apps on @@ -63,10 +63,10 @@ Subject: [PATCH 2/6] Disable banners and remove URLs for mobile apps on 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index b8aa71126c..fe1cbaff15 100644 +index b05b474d13..52bd748d2c 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2176,7 +2176,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); +@@ -2214,7 +2214,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); pref("browser.contentblocking.report.proxy.enabled", false); // Disable the mobile promotion by default. @@ -75,7 +75,7 @@ index b8aa71126c..fe1cbaff15 100644 // Locales in which Send to Device emails are supported // The most recent list of supported locales can be found at https://github.com/mozilla/bedrock/blob/6a08c876f65924651554decc57b849c00874b4e7/bedrock/settings/base.py#L963 -@@ -2206,7 +2206,7 @@ pref("browser.promo.pin.enabled", true); +@@ -2244,7 +2244,7 @@ pref("browser.promo.pin.enabled", true); // Set to true for Fx113 (see bug 1808611) pref("browser.promo.cookiebanners.enabled", false); @@ -84,7 +84,7 @@ index b8aa71126c..fe1cbaff15 100644 pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA"); pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections"); -@@ -2217,12 +2217,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi +@@ -2255,12 +2255,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients"); pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true"); pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections"); @@ -104,10 +104,10 @@ index b8aa71126c..fe1cbaff15 100644 // Protection Report's SUMO urls pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report"); -- -2.45.2 +2.46.0 -From 2599479335e7a5a4c27281ceb364bf8c13c5428c Mon Sep 17 00:00:00 2001 +From bfdb53b5c15aa3bf057e36b38ae0a7c1f19afe20 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 3/6] FSDG: Remove some references to AMO @@ -145,7 +145,7 @@ Subject: [PATCH 3/6] FSDG: Remove some references to AMO 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index fe1cbaff15..0bd921f58b 100644 +index 52bd748d2c..11f5353e7a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -22,7 +22,7 @@ @@ -318,7 +318,7 @@ index 8f8f7cafd5..8140e15fc2 100644 conservative = true, ), diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js -index ece1bbf69b..a141aadc2d 100644 +index e8433346ee..00c3e1caac 100644 --- a/mobile/android/app/geckoview-prefs.js +++ b/mobile/android/app/geckoview-prefs.js @@ -220,11 +220,11 @@ pref("extensions.experiments.enabled", false); @@ -338,10 +338,10 @@ index ece1bbf69b..a141aadc2d 100644 // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile pref("extensions.installDistroAddons", false); diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle -index fec76b60ec..8abf49c5fb 100644 +index 990a88db30..20f63be756 100644 --- a/mobile/android/fenix/app/build.gradle +++ b/mobile/android/fenix/app/build.gradle -@@ -69,7 +69,7 @@ android { +@@ -87,7 +87,7 @@ android { "\"adnauseam@rednoise.org\"" + "}" // This should be the base URL used to call the AMO API. @@ -351,10 +351,10 @@ index fec76b60ec..8abf49c5fb 100644 def deepLinkSchemeValue = "fenix-dev" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 3383eb7d00..992937b610 100644 +index 3e66e787eb..25360e8492 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -1865,8 +1865,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% +@@ -1845,8 +1845,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% pref("extensions.abuseReport.enabled", false); // Whether Firefox integrated abuse reporting feature should be opening the new abuse report form hosted on AMO. @@ -365,7 +365,7 @@ index 3383eb7d00..992937b610 100644 // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -3292,7 +3292,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); +@@ -3271,7 +3271,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); // Whether to allow the inline options browser in HTML about:addons page. pref("extensions.htmlaboutaddons.inline-options.enabled", true); // Show recommendations on the extension and theme list views. @@ -375,10 +375,10 @@ index 3383eb7d00..992937b610 100644 // The URL for the privacy policy related to recommended add-ons. pref("extensions.recommendations.privacyPolicyUrl", ""); -- -2.45.2 +2.46.0 -From 4ea4b6ad53643c897d2fb95eede4da26740dcae4 Mon Sep 17 00:00:00 2001 +From 70dd56ccc24637535e735471d3a86ac53deaf240 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Jun 2023 13:16:40 +0200 Subject: [PATCH 4/6] FSDG: Disable Contile and autoupdate of system addons @@ -398,7 +398,7 @@ only free software, remove them from the source code. 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 0bd921f58b..151f0775d9 100644 +index 11f5353e7a..0dd7807072 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -51,8 +51,8 @@ pref("extensions.recommendations.themeRecommendationUrl", "https://color.firefox @@ -412,7 +412,7 @@ index 0bd921f58b..151f0775d9 100644 // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.sys.mjs for values to use here. -@@ -1698,8 +1698,8 @@ pref("browser.topsites.component.enabled", false); +@@ -1695,8 +1695,8 @@ pref("browser.topsites.component.enabled", false); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) @@ -424,10 +424,10 @@ index 0bd921f58b..151f0775d9 100644 // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile. pref("browser.topsites.contile.sov.enabled", true); -- -2.45.2 +2.46.0 -From 3f36ca3417c7e971657c5f0468f92608f1632e23 Mon Sep 17 00:00:00 2001 +From 011bec2bfeb09e61b9f020f1c276f18d2c7049e5 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 26 Sep 2023 21:27:34 +0200 Subject: [PATCH 5/6] FSDG: Disable Firefox Translations for now @@ -477,10 +477,10 @@ probably has the same issues with the toolchain for the models. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 151f0775d9..42eb741bd1 100644 +index 0dd7807072..7267199afb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2039,7 +2039,7 @@ pref("browser.translation.neverForLanguages", ""); +@@ -2070,7 +2070,7 @@ pref("browser.translation.neverForLanguages", ""); // Enable Firefox translations powered by the Bergamot translations // engine https://browser.mt/. @@ -490,10 +490,10 @@ index 151f0775d9..42eb741bd1 100644 // Enable the new Firefox Translations Settings UI Design pref("browser.translations.newSettingsUI.enable", false); -- -2.45.2 +2.46.0 -From 5d529f0f12be2d2c99621eca1e7bab72c870f77c Mon Sep 17 00:00:00 2001 +From c5c1ea6e6414b0ec10eeafe2272a1fd6eda628e4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 12 Jun 2024 00:17:17 +0200 Subject: [PATCH 6/6] FSDG: Remove some references to Pocket and disable @@ -538,11 +538,11 @@ this nonfunctional by default. 27 files changed, 63 insertions(+), 126 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 42eb741bd1..05dbb3b588 100644 +index 7267199afb..a1a2a308fe 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1852,7 +1852,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.onboardingExperience.di - pref("browser.newtabpage.activity-stream.discoverystream.onboardingExperience.enabled", false); +@@ -1874,7 +1874,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.enabled", + pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.searchTopsitesCompact", false); // User pref to show stories on newtab (feeds.system.topstories has to be set to true as well) -pref("browser.newtabpage.activity-stream.feeds.section.topstories", true); @@ -550,7 +550,7 @@ index 42eb741bd1..05dbb3b588 100644 // The pref controls if search hand-off is enabled for Activity Stream. pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", true); -@@ -2388,13 +2388,14 @@ pref("browser.migrate.interactions.passwords", false); +@@ -2426,13 +2426,14 @@ pref("browser.migrate.interactions.passwords", false); pref("browser.migrate.preferences-entrypoint.enabled", true); @@ -584,10 +584,10 @@ index 8b5826dd82..9084ef1b03 100644 const DUMMY_CSS_SELECTOR = "DUMMY#CSS.SELECTOR"; diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -index 2a9497d1b4..c4ad9ab1d7 100644 +index d6b1723245..3f004f10e8 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -@@ -223,9 +223,6 @@ export function RecentSavesContainer({ +@@ -224,9 +224,6 @@ export function RecentSavesContainer({ function renderCard(rec, index) { const url = new URL(rec.url); const urlSearchParams = new URLSearchParams(queryParams); @@ -597,7 +597,7 @@ index 2a9497d1b4..c4ad9ab1d7 100644 for (let [key, val] of urlSearchParams.entries()) { url.searchParams.set(key, val); -@@ -297,7 +294,7 @@ export function RecentSavesContainer({ +@@ -298,7 +295,7 @@ export function RecentSavesContainer({ Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH] FSDG: Remove URI handlers that serve nonfree software @@ -216,5 +216,5 @@ index e95d627c07..81f9218da9 100644 ], }, -- -2.45.2 +2.46.0 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index be19a16..0e2ddc2 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1,4 +1,4 @@ -From 37c5502943e75b856670299f54447d4f7e3a1ff7 Mon Sep 17 00:00:00 2001 +From a0485f5ed0c419223ae750873ec2dfa4c3a58cda Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 12 Mar 2022 17:14:25 +0100 Subject: [PATCH 1/6] FSDG: Replace upstream default bookmarks @@ -90,10 +90,10 @@ index c42e81ac23..e2e643bcf2 100644 -- -2.45.2 +2.46.0 -From 1df43674bf542ea40e258947a6ea31fd8aeb8592 Mon Sep 17 00:00:00 2001 +From 4bdaad3823992fc1a6591b8751189534ed908074 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH 2/6] Remove 'More from Mozilla' section in Preferences @@ -115,7 +115,7 @@ reasons as desktop Firefox. delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 05dbb3b588..b270db5885 100644 +index a1a2a308fe..f625803930 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1235,7 +1235,7 @@ pref("browser.preferences.experimental", true); @@ -128,10 +128,10 @@ index 05dbb3b588..b270db5885 100644 pref("browser.preferences.defaultPerformanceSettings.enabled", true); diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index ede2a14e9a..414b9c434c 100644 +index c8aaef36f4..df3911dca9 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -144,15 +144,6 @@ var allowlist = [ +@@ -148,15 +148,6 @@ var allowlist = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, @@ -289,10 +289,10 @@ index 3affb19d1a..100538f5a1 100644 -- -2.45.2 +2.46.0 -From bf7998d8790f130b933e4c0556cc150e12abff47 Mon Sep 17 00:00:00 2001 +From d01e5136c19ee7d1183a3b430d1631b91faf79e1 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:51:06 +0200 Subject: [PATCH 3/6] Remove promos of Firefox Focus and Klar from Private @@ -312,10 +312,10 @@ for the same reasons as the original Firefox. delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index b270db5885..fe45d2e027 100644 +index f625803930..4cc2f97965 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2197,7 +2197,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u +@@ -2235,7 +2235,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u pref("browser.promo.focus.disallowed_regions", "cn"); // Default to enabling focus promos to be shown where allowed. @@ -325,7 +325,7 @@ index b270db5885..fe45d2e027 100644 // Default to enabling pin promos to be shown where allowed. pref("browser.promo.pin.enabled", true); diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index 414b9c434c..0d10165a31 100644 +index df3911dca9..dd32916808 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js @@ -35,8 +35,6 @@ var gExceptionPaths = [ @@ -338,7 +338,7 @@ index 414b9c434c..0d10165a31 100644 // toolkit/components/pdfjs/content/build/pdf.js "resource://pdf.js/web/images/", diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs -index 32b7ed08fd..6cc27bf369 100644 +index d88d2244f2..4539d205fc 100644 --- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs +++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs @@ -494,315 +494,6 @@ const BASE_MESSAGES = () => [ @@ -658,7 +658,7 @@ index 32b7ed08fd..6cc27bf369 100644 id: "PB_NEWTAB_PIN_PROMO", template: "pb_newtab", diff --git a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs -index 8dbb718bfd..0a06ab6a6a 100644 +index 0e8383960e..2f414efca5 100644 --- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs +++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs @@ -236,85 +236,6 @@ const MESSAGES = () => [ @@ -988,10 +988,10 @@ index 2217ca055c..0000000000 - - -- -2.45.2 +2.46.0 -From cd34546dd37351465f642d744b987c3734fe02dd Mon Sep 17 00:00:00 2001 +From 4fa8aade1267f5e34e123639a25a29c674bbbb80 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 4/6] FSDG: Remove 'Extensions for developers' menu item @@ -1008,7 +1008,7 @@ Main menu -> 'More tools' -> 'Extensions for developers' opens 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/components/asrouter/modules/CFRPageActions.sys.mjs b/browser/components/asrouter/modules/CFRPageActions.sys.mjs -index 392173f754..f1f532acb3 100644 +index a360ef994c..52ebca9423 100644 --- a/browser/components/asrouter/modules/CFRPageActions.sys.mjs +++ b/browser/components/asrouter/modules/CFRPageActions.sys.mjs @@ -41,7 +41,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref( @@ -1049,10 +1049,10 @@ index e75115c220..0abeb4d830 100644 }, }, -- -2.45.2 +2.46.0 -From 308e7538072c6a706d80f8e5d6f36a5dee7c3f1e Mon Sep 17 00:00:00 2001 +From 2902017b64a68ef297192639c427a0928b004b0a Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 12 Mar 2023 21:57:14 +0100 Subject: [PATCH 5/6] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL @@ -1081,11 +1081,11 @@ Private search engine that doesn't track its users, huh? [1] https://www.gnu.org/ [2] https://duckduckgo.com/l/?uddg=https%3A%2F%2Fwww.gnu.org%2F&rut=b1ab1ab1a... --- - .../components/search/extensions/ddg/manifest.json | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) + browser/components/search/extensions/ddg/manifest.json | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json -index 1e1bffed47..14b6cf9f5a 100644 +index 104eee6457..9a3279c622 100644 --- a/browser/components/search/extensions/ddg/manifest.json +++ b/browser/components/search/extensions/ddg/manifest.json @@ -1,6 +1,6 @@ @@ -1095,15 +1095,14 @@ index 1e1bffed47..14b6cf9f5a 100644 + "name": "DuckDuckGo HTML", + "description": "Search DuckDuckGo HTML", "manifest_version": 2, - "version": "1.4", + "version": "1.5", "browser_specific_settings": { -@@ -16,10 +16,9 @@ +@@ -12,9 +12,9 @@ "chrome_settings_overrides": { "search_provider": { "keyword": ["@duckduckgo", "@ddg"], - "name": "DuckDuckGo", - "search_url": "https://duckduckgo.com/", -- "search_form": "https://duckduckgo.com/", - "search_url_get_params": "t=ffab&q={searchTerms}", + "name": "DuckDuckGo HTML", + "search_url": "https://html.duckduckgo.com/html/", @@ -1112,10 +1111,10 @@ index 1e1bffed47..14b6cf9f5a 100644 "suggest_url_get_params": "q={searchTerms}&type=list" } -- -2.45.2 +2.46.0 -From 4639ad8fa487622f6de966804a366e9df45376a2 Mon Sep 17 00:00:00 2001 +From 0c7f18221b09cceb576d5e8c42ffad28fad4c9dd Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH 6/6] FSDG: Various patches @@ -1239,10 +1238,10 @@ index dd2039db2e..e70583628b 100644 const vpnBanner = this.doc.querySelector(".vpn-banner"); const exitIcon = vpnBanner.querySelector(".exit-icon"); diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl -index ac13d4fdcd..63951dc2fb 100644 +index dfbf89fc21..0410f60294 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl -@@ -847,16 +847,6 @@ sync-signedout-account-signin3 = +@@ -845,16 +845,6 @@ sync-signedout-account-signin3 = .label = Sign in to sync… .accesskey = i @@ -1346,5 +1345,5 @@ index cc95fbc3b8..ae6859bc95 100644 --firefoxview-brand-name = Firefox View +-firefoxview-brand-name = Iceweasel View -- -2.45.2 +2.46.0 diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 964ece6..c113334 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,9 +70,9 @@ pkgname=iceweasel epoch=1 -pkgver=128.0 +pkgver=129.0 pkgrel=1 -_brandingver=126.0 +_brandingver=129.0 _brandingrel=1 pkgdesc="Fast, Private & Safe Web Browser" url=https://wiki.parabola.nu/Iceweasel @@ -185,7 +185,7 @@ validpgpkeys+=( BFA8008A8265677063B11BF47171986E4B745536 # Andreas Grapentin (branding source-ball) 3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40 # bill-auger (libre source-ball) ) -sha256sums=('65271ffefb235ea1e162a081f2074a0f06fce27b2f613f573c126ba8eef95172' +sha256sums=('4b9ff955de7099f09aa1f00985e34695fa1a911e56c2d46cb4d60c3bff3d9174' 'SKIP' # $pkgname-symbolic.svg '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58' # $pkgname.desktop @@ -196,7 +196,7 @@ sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('a50c7ded69d86c9d45475e701f83295ab6ccfc4eb59d9c91379504bc35dd0e7e1fb59e8c7737684709fe62969b9762e2960fa90607c83f9e8d637b78e60f56b3' +b2sums=('abd8b0008dfd0948234baf7c307c42051e2f58a9c7ebd07b3b0dec9bdb6d8d78e4e1ae25d552aba8685e8b307dbdeb1360d873fef98ac108671dbbbc53c2a3af' 'SKIP' # $pkgname-symbolic.svg 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635' # $pkgname.desktop @@ -235,19 +235,19 @@ mksource+=( https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}- 9003-FSDG-urihandlers.patch 9004-FSDG-misc.patch process-json-files.py ) -mksha256sums+=( 'ed928297fa87bf292bc477f58a2d07d5a0e9d27418138624af8aee1e38494ced' # *.branding.tar.xz +mksha256sums+=( '2b5ad32521042ebef71a5f650ed066b50be45c8b0252132e5fd1df49e9122098' # *.branding.tar.xz 'SKIP' - '78d694aec2573f5d90390dafca776e559a4d900a70947585650ae57edd82b1e7' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - 'ce340d578a4a689d305666d85a0bfdacc2e2dd00d8eb16f84c8f0614a194401f' # 9002-FSDG-preference-defaults.patch - 'e7f394b4337f46bdb1e97dd9176f40ddd0af4ba455961fcefe899b52493e7414' # 9003-FSDG-urihandlers.patch - '9f7c08fe04b6ab223988a30a9c0961cdc7820ffcd72c07d6fb23e4d7f22a91ae' # 9004-FSDG-misc.patch + '6c636d417d32e9836b8ca3e172fb13552e759885d2a29dffb0fbd945ab00878e' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '3dcf58c7e339338c7aee5507da6e9b4b887a7e7fd52aeb27af58f2e167317166' # 9002-FSDG-preference-defaults.patch + '2de7f85cc16e0a08ce6c360e29f334e483ba96dccd6ea2ff13771ba41f552fa8' # 9003-FSDG-urihandlers.patch + 'b01d7801629145f578078a63f8a944fc8467f632875715a0632b2c1989d69c10' # 9004-FSDG-misc.patch '74d8a6172f3013ecae99974cd046481ebb347d38f04e264b285ff6183db0baee' ) # process-json-files.py -mkb2sums+=( 'c6833d2edc84ca2b4cc4e10d8d5a5b37d9764c2ab6bf1ecd7658b270ab93fabda42742c81cd13e8892ad66a1569547564ba5312d561b13ac24daff151ebc4485' # *.branding.tar.xz +mkb2sums+=( '9cf176b7613c5665a5218ec69445479ae471614ca57f920e8affb0906f5ec39132af4f3bd109100211ae496cca46fa550e170c86e4d5c04680b35e093081936b' # *.branding.tar.xz 'SKIP' - 'a9c5e9ef983fe4e355bf7744264d6bff1155cf98ae0f28c84416760bdba556127e9732be78e87772ee61ec27b1f8938866089eecccdc4393a7d2576cd7ddcf8b' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '9d48f2b9b02d9633784f931a2d7bba9f3cce1633a3afa8fdafc4387662ed92018e5a0e0322e1dfbb01e45080278987f4b014c506348193b20a766d1e8e109a94' # 9002-FSDG-preference-defaults.patch - 'f99c9bad0e63dc10b420e0c1ca6badd88771869cf940ca04f7ea5a775d1193c77f074334701107c674a5332ba1e01a6378f8997702982f04103cd647475fdec1' # 9003-FSDG-urihandlers.patch - '7a31ca0a353b50f000ba3ec5ef6178fe3375b01e681bbae3e668f9a4fc03423117f7cfb03425bd73db306372f9660265e8f9599ff7abe630b1bccd5c818c629e' # 9004-FSDG-misc.patch + 'aba0445714a47afeba9e0eeca175c46d52ed6219b270b84cf6e435713fadf9b55f04e2a4bb05a2e0cfd0463ebdb499baa210b4bfd85f725c5f7fbd9c4be7fc53' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '81c64e74ed60355bf6a65a3887a6a037222e3190796ff790576d90a8577ce368a2d9fc477c892e3513d4892efd84204a067982d9dab762e0f07ca6c219fcb1cc' # 9002-FSDG-preference-defaults.patch + 'cd88198b705393a2a44d6c7046eb84ad9c0117bcecdfd966a56af687018ce266307d0abb094c45b55121026ec6382b91509e88059db5dcf51f41ed57cb4604c1' # 9003-FSDG-urihandlers.patch + '6931d79e0860202cf5fcc6ee784ee1b4fb3973158f1760ac07cbf5e4439ef30efe11aace16ef6b32ff4eab0bbf1fef7496cd9585b31f5e6ec2d39cc8c1164ad0' # 9004-FSDG-misc.patch 'e887b22ca3837f2be0aa1e6d86ea74b56b198b596ea14154a20ce3c16b71310e907503ae47863f84214797a68d451c06100d12bda2fd963a8ad1b380dd441fbe' ) # process-json-files.py source=( https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.zst{,.sig} ${source[*]:${_N_MKSOURCES}} ) @@ -755,16 +755,17 @@ END for size in 16 22 24 32 48 64 128 256 do rsvg-convert -w ${size} -h ${size} iceweasel_icon.svg -o default${size}.png done - cp iceweasel_logo.svg content/aboutlogins.svg - cp iceweasel_logo.svg content/about-logo.svg -# cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content - rsvg-convert -a -w 192 iceweasel_logo.svg -o content/about-logo.png - rsvg-convert -a -w 384 iceweasel_logo.svg -o content/about-logo@2x.png - cp content/about-logo.png content/about-logo-private.png - cp content/about-logo@2x.png content/about-logo-private@2x.png - echo "${blank_svg}" > content/${pkgname}-symbolic.svg # TODO: branding package - cp content/${pkgname}-symbolic.svg "${srcdir}"/${pkgname}-symbolic.svg # minimize diff (in package()) - cp ../unofficial/document.ico document.ico + cp iceweasel_logo.svg content/aboutlogins.svg + cp iceweasel_logo.svg content/about-logo.svg +# cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content + rsvg-convert -a -w 192 iceweasel_logo.svg -o content/about-logo.png + rsvg-convert -a -w 384 iceweasel_logo.svg -o content/about-logo@2x.png + cp content/about-logo.png content/about-logo-private.png + cp content/about-logo@2x.png content/about-logo-private@2x.png + echo "${blank_svg}" > content/${pkgname}-symbolic.svg # TODO: branding package + cp content/${pkgname}-symbolic.svg "${srcdir}"/${pkgname}-symbolic.svg # minimize diff (in package()) + cp ../unofficial/document.ico document.ico + cp ../unofficial/content/document_pdf.svg content/document_pdf.svg popd > /dev/null From 5c2b8fec0359ce50b859e09a58072492abc0565c Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sep 20 2024 17:01:20 +0000 Subject: [PATCH 2/2] libre/iceweasel 130.0.1-1 * Update according to the changes from the upstreams. * Disable experimental Machine Learning support. * Wipe Merino hostname, disable Weather & Yelp. * Remove references to nonfree Generative AI chats. * Adjust JSON patching script for legacy search-config removed upstream, empty a couple more JSON dumps. * Remove redundant FSDG label from commit summaries in the patches, since names of those patches already make their purpose clear. --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 98ae356..b22b04c 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -1,4 +1,4 @@ -From c1a4cb25ff553541fd831e5980c27e47ff4cb186 Mon Sep 17 00:00:00 2001 +From 9f9b738ff821a09f5cd7e0ce1d8bb1ace6c5aae1 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -47,7 +47,7 @@ If necessary, missing files can be added later. 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/browser/components/asrouter/bin/import-rollouts.js b/browser/components/asrouter/bin/import-rollouts.js -index bb5c17d9ae..ae310b6939 100644 +index e9c21dcdf8..03430100c7 100644 --- a/browser/components/asrouter/bin/import-rollouts.js +++ b/browser/components/asrouter/bin/import-rollouts.js @@ -36,7 +36,7 @@ const jsonschema = require("../../../../third_party/js/cfworker/json-schema.js") @@ -59,7 +59,7 @@ index bb5c17d9ae..ae310b6939 100644 const EXPERIMENTER_URL = "https://experimenter.services.mozilla.com/nimbus/"; const OUTPUT_PATH = "./tests/NimbusRolloutMessageProvider.sys.mjs"; const LICENSE_STRING = `/* This Source Code Form is subject to the terms of the Mozilla Public -@@ -229,7 +229,7 @@ async function main() { +@@ -233,7 +233,7 @@ async function main() { } ); @@ -147,10 +147,10 @@ index f4f852eeb1..b877808e79 100644 The purpose of this Google Summer of Code project, which is called Fretboard, was to develop an A/B testing framework written in Kotlin based on the existing code from Fennec, but making it independent of both the server used and the local storage mechanism, allowing it to be used on other apps, such as Firefox Focus, which started to need to do some A/B tests. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt -index ef41b0eef3..47edd1d4ec 100644 +index 944304d441..2e8c7e040b 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt -@@ -633,7 +633,7 @@ class Core( +@@ -652,7 +652,7 @@ class Core( // collection name to fetch from server for SERP telemetry const val COLLECTION_NAME = "search-telemetry-v2" @@ -189,10 +189,10 @@ index 73c83e526b..653cabe7e1 100644 /** * Logger instance. diff --git a/services/settings/docs/index.rst b/services/settings/docs/index.rst -index 9cf3e4dc30..282ff1b40e 100644 +index a834bb74a0..17c7f7b9cc 100644 --- a/services/settings/docs/index.rst +++ b/services/settings/docs/index.rst -@@ -177,11 +177,11 @@ It is possible to package a dump of the server records that will be loaded into +@@ -190,11 +190,11 @@ It is possible to package a dump of the server records that will be loaded into The JSON dump will serve as the default dataset for ``.get()``, instead of doing a round-trip to pull the latest data. It will also reduce the amount of data to be downloaded on the first synchronization. @@ -220,7 +220,7 @@ index 77fe5c583a..2302412498 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json -index 8d1fb68e12..e09d627a59 100644 +index 8d1fb68e12..7178c07142 100644 --- a/third_party/rust/remote_settings/.cargo-checksum.json +++ b/third_party/rust/remote_settings/.cargo-checksum.json @@ -1 +1 @@ @@ -295,10 +295,10 @@ index aafe4a6dcf..cfdefe2ef8 100644 // Default profile targeting snapshot. let defaultProfileTargetingSnapshot = {}; diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs -index 5b301edd79..836ad2ec2b 100644 +index 666267f9a5..dfea4fd788 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -206,13 +206,13 @@ export var SearchUtils = { +@@ -162,13 +162,13 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -354,10 +354,10 @@ index a6aba91a42..0700ab0b69 100644 +.. _viewed live: resource://app/defaults/settings/main/search-config.json .. _Normandy: /toolkit/components/normandy/normandy/services.html diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs -index 467883519b..77c941e273 100644 +index a20e45c613..6c200784fe 100644 --- a/toolkit/modules/AppConstants.sys.mjs +++ b/toolkit/modules/AppConstants.sys.mjs -@@ -419,9 +419,9 @@ export var AppConstants = Object.freeze({ +@@ -390,9 +390,9 @@ export var AppConstants = Object.freeze({ REMOTE_SETTINGS_SERVER_URL: #ifdef MOZ_THUNDERBIRD @@ -373,7 +373,7 @@ index 467883519b..77c941e273 100644 2.46.0 -From dbc7b88dd50b8051f6dbff5af7aeb374e68ba501 Mon Sep 17 00:00:00 2001 +From c828d2376e07e01468a9e80062693d79e0a30687 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -445,7 +445,7 @@ index ac4d76614d..747306b4a5 100644 2.46.0 -From 69d353b846078ca72eee7751ae0c57ac5da11899 Mon Sep 17 00:00:00 2001 +From ab3baaec9731cc65dd0c8908d9790d3c41c0c72f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -489,7 +489,7 @@ index 3bfed26ea4..807eb220ec 100644 2.46.0 -From 2bb7e9ad5509664c150f34a6f0dcd884a4259538 Mon Sep 17 00:00:00 2001 +From 06ab87112b854e386e25dc35b2e7ea34d9368959 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -589,7 +589,7 @@ index a3e9e9b3f2..b32a8d8691 100644 2.46.0 -From c3f7d5f66a2b369bce80430975e342457d629b9b Mon Sep 17 00:00:00 2001 +From 00e88ee4107348e5255ff9aeb6b15f3dd1077848 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -625,7 +625,7 @@ index e4d4247253..296001536c 100644 2.46.0 -From d68021448f95515d251249e97a7b32156f44d1e6 Mon Sep 17 00:00:00 2001 +From 4f07eb8652148e5d435c2b239448397ebf6c73ea Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -679,7 +679,7 @@ index 1eeaf0bed9..d998a2d3b1 100644 2.46.0 -From a4443c8cb7cd8c69f58974bd3dc75387ce856b2d Mon Sep 17 00:00:00 2001 +From 31fd311fcb3dd865234328bd4baa09ca50640db3 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -714,10 +714,10 @@ the upgrade to local-only setup. 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 2153520adb..6d6884a782 100644 +index 6b7c441c8d..5d324793c6 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -707,11 +707,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -711,11 +711,9 @@ export class RemoteSettingsClient extends EventEmitter { // If the data is up-to-date but don't have metadata (records loaded from dump), // we fetch them and validate the signature immediately. @@ -731,7 +731,7 @@ index 2153520adb..6d6884a782 100644 await this.db.importChanges(metadata); // We don't bother validating the signature if the dump was just loaded. We do // if the dump was loaded at some other point (eg. from .get()). -@@ -988,38 +986,28 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -992,38 +990,28 @@ export class RemoteSettingsClient extends EventEmitter { * @returns {Promise} */ async _validateCollectionSignature(records, timestamp, metadata) { @@ -778,7 +778,7 @@ index 2153520adb..6d6884a782 100644 } } -@@ -1186,24 +1174,26 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1190,24 +1178,26 @@ export class RemoteSettingsClient extends EventEmitter { * @param since timestamp of last sync (optional) */ async _fetchChangeset(expectedTimestamp, since) { @@ -825,7 +825,7 @@ index 2153520adb..6d6884a782 100644 2.46.0 -From ef8b8eed950d5d8df7327e327bd24a65b11c8103 Mon Sep 17 00:00:00 2001 +From 8797151a31e8aa61d2854c040b6cf813b3793997 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -847,7 +847,7 @@ occurs during the session. 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 6d6884a782..eaec124e67 100644 +index 5d324793c6..2cb6237ea5 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, { @@ -866,7 +866,7 @@ index 6d6884a782..eaec124e67 100644 ChromeUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log); -@@ -334,6 +336,11 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -338,6 +340,11 @@ export class RemoteSettingsClient extends EventEmitter { this._lastCheckTimePref = lastCheckTimePref; this._verifier = null; this._syncRunning = false; @@ -878,7 +878,7 @@ index 6d6884a782..eaec124e67 100644 // This attribute allows signature verification to be disabled, when running tests // or when pulling data from a dev server. -@@ -363,6 +370,11 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -367,6 +374,11 @@ export class RemoteSettingsClient extends EventEmitter { this.db.identifier = this.identifier; } @@ -890,7 +890,7 @@ index 6d6884a782..eaec124e67 100644 get identifier() { return `${this.bucketName}/${this.collectionName}`; } -@@ -436,6 +448,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -440,6 +452,10 @@ export class RemoteSettingsClient extends EventEmitter { let lastModified = forceSync ? null : await this.db.getLastModified(); let hasLocalData = lastModified !== null; @@ -901,7 +901,7 @@ index 6d6884a782..eaec124e67 100644 if (forceSync) { if (!this._importingPromise) { this._importingPromise = (async () => { -@@ -552,7 +568,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -556,7 +572,10 @@ export class RemoteSettingsClient extends EventEmitter { // No need to verify signature on JSON dumps. // If local DB cannot be read, then we don't even try to do anything, // we return results early. @@ -913,7 +913,7 @@ index 6d6884a782..eaec124e67 100644 } lazy.console.debug( -@@ -592,6 +611,12 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -596,6 +615,12 @@ export class RemoteSettingsClient extends EventEmitter { return final; } @@ -930,7 +930,7 @@ index 6d6884a782..eaec124e67 100644 2.46.0 -From 6a2517e88429a01bdbc321ff2c55c870a8d7d3f0 Mon Sep 17 00:00:00 2001 +From 7c028195fc97984d2565977b51da2a235b0c1883 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -952,7 +952,7 @@ noticeable performance issues. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index eaec124e67..9d662ceaef 100644 +index 2cb6237ea5..bda17b8dc8 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -9,6 +9,7 @@ import { Downloader } from "resource://services-settings/Attachments.sys.mjs"; @@ -963,7 +963,7 @@ index eaec124e67..9d662ceaef 100644 ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs", Database: "resource://services-settings/Database.sys.mjs", -@@ -1174,7 +1175,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1178,7 +1179,10 @@ export class RemoteSettingsClient extends EventEmitter { const old = oldById.get(r.id); if (old) { oldById.delete(r.id); @@ -979,7 +979,7 @@ index eaec124e67..9d662ceaef 100644 2.46.0 -From 075e5ea13c2088ebd8d1f74ac1268cae6f5aacad Mon Sep 17 00:00:00 2001 +From e53435c95f1700960320c8ff6df3df8db6b91031 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -997,10 +997,10 @@ logic gets the data about the attachments from those records. 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 9d662ceaef..95f6b3efe6 100644 +index bda17b8dc8..fb517f162a 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -255,7 +255,7 @@ class AttachmentDownloader extends Downloader { +@@ -259,7 +259,7 @@ class AttachmentDownloader extends Downloader { allRecords .filter(r => !!r.attachment) .map(r => @@ -1009,7 +1009,7 @@ index 9d662ceaef..95f6b3efe6 100644 ) ); } -@@ -1134,7 +1134,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1138,7 +1138,7 @@ export class RemoteSettingsClient extends EventEmitter { // Signature failed, clear local DB because it contains // bad data (local + remote changes). lazy.console.debug(`${this.identifier} clear local data`); @@ -1018,7 +1018,7 @@ index 9d662ceaef..95f6b3efe6 100644 // Local data was tampered, throw and it will retry from empty DB. lazy.console.error(`${this.identifier} local data was corrupted`); throw new CorruptedDataError(this.identifier); -@@ -1156,7 +1156,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1160,7 +1160,7 @@ export class RemoteSettingsClient extends EventEmitter { // _importJSONDump() only clears DB if dump is available, // therefore do it here! if (imported < 0) { @@ -1027,7 +1027,7 @@ index 9d662ceaef..95f6b3efe6 100644 } } } -@@ -1196,6 +1196,12 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1200,6 +1200,12 @@ export class RemoteSettingsClient extends EventEmitter { return syncResult; } @@ -1044,7 +1044,7 @@ index 9d662ceaef..95f6b3efe6 100644 2.46.0 -From cca892a2ca1ac1b353639f814c9eead5223a6e50 Mon Sep 17 00:00:00 2001 +From feb2b958bdedf1c3e26c6698b06d3e3dee776465 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -1059,10 +1059,10 @@ necessary cleanup. So remove the checks. 1 file changed, 5 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 95f6b3efe6..3340b33852 100644 +index fb517f162a..dd050f700a 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -1076,14 +1076,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1080,14 +1080,9 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; @@ -1081,7 +1081,7 @@ index 95f6b3efe6..3340b33852 100644 2.46.0 -From d04fa9375e7373f07b49e0edb5cc5b7a025c296e Mon Sep 17 00:00:00 2001 +From 5d5bd573f5d2b79f06fe59b7965ea98bd67e10be Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached @@ -1091,10 +1091,10 @@ Subject: [PATCH 12/13] Attachments: load only from dump and drop cached 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/services/settings/Attachments.sys.mjs b/services/settings/Attachments.sys.mjs -index 7724afd5b8..98d82f8fb7 100644 +index 297646bbbf..2d0e706a1c 100644 --- a/services/settings/Attachments.sys.mjs +++ b/services/settings/Attachments.sys.mjs -@@ -202,10 +202,11 @@ export class Downloader { +@@ -316,10 +316,11 @@ export class Downloader { retries, checkHash, attachmentId = record?.id, @@ -1107,7 +1107,7 @@ index 7724afd5b8..98d82f8fb7 100644 if (!attachmentId) { // Check for pre-condition. This should not happen, but it is explicitly // checked to avoid mixing up attachments, which could be dangerous. -@@ -265,6 +266,7 @@ export class Downloader { +@@ -379,6 +380,7 @@ export class Downloader { const newBuffer = await this.downloadAsBytes(record, { retries, checkHash, @@ -1115,7 +1115,7 @@ index 7724afd5b8..98d82f8fb7 100644 }); const blob = new Blob([newBuffer]); // Store in cache but don't wait for it before returning. -@@ -298,7 +300,7 @@ export class Downloader { +@@ -412,7 +414,7 @@ export class Downloader { } try { @@ -1124,7 +1124,7 @@ index 7724afd5b8..98d82f8fb7 100644 } catch (e) { // Failed to read from cache, e.g. IndexedDB unusable. console.error(e); -@@ -386,7 +388,7 @@ export class Downloader { +@@ -500,7 +502,7 @@ export class Downloader { * @returns {String} the absolute file path to the downloaded attachment. */ async downloadToDisk(record, options = {}) { @@ -1133,7 +1133,7 @@ index 7724afd5b8..98d82f8fb7 100644 const { attachment: { filename, size, hash }, } = record; -@@ -441,33 +443,10 @@ export class Downloader { +@@ -555,33 +557,10 @@ export class Downloader { */ async downloadAsBytes(record, options = {}) { const { @@ -1174,7 +1174,7 @@ index 7724afd5b8..98d82f8fb7 100644 2.46.0 -From 354f2eaac9988f7a030649968d6874b134bf5897 Mon Sep 17 00:00:00 2001 +From ce2c48724bd8d62352a36520d3da5950239f57e5 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -1199,10 +1199,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 884a475e21..87e1256997 100644 +index 7f57eb3894..9bd2bea7d8 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -15227,7 +15227,7 @@ +@@ -15373,7 +15373,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -1212,10 +1212,10 @@ index 884a475e21..87e1256997 100644 # The CRLite filter channel to which the user is subscribed. diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 5891ae628f..f18094cda8 100644 +index d9f400be6b..5bc0715d35 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1172,6 +1172,7 @@ void nsNSSComponent::setValidationOptions( +@@ -1127,6 +1127,7 @@ void nsNSSComponent::setValidationOptions( CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled; CRLiteMode crliteMode = static_cast(StaticPrefs::security_pki_crlite_mode()); diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index c1a3fe0..06b2c19 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -1,4 +1,4 @@ -From cfcf6350be0e9a411cc9ad1f5d0b1aee61e4e132 Mon Sep 17 00:00:00 2001 +From 40ffa8e5da6ccc9ce1e349caaa4dbd2f2399fedf Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/6] geolocation: Disable API and remove Google API URLs @@ -23,10 +23,10 @@ default for now. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 87e1256997..4f9814cc2a 100644 +index 9bd2bea7d8..9ed0ac1bc8 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -5639,7 +5639,7 @@ +@@ -5695,7 +5695,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool @@ -36,10 +36,10 @@ index 87e1256997..4f9814cc2a 100644 # Time, in milliseconds, to wait for the location provider to spin up. diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 55955e8174..3e66e787eb 100644 +index 2c82290859..5ada4c44fd 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3204,7 +3204,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3220,7 +3220,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // @@ -52,7 +52,7 @@ index 55955e8174..3e66e787eb 100644 2.46.0 -From ee85f768343fa54b22d3a2eb4f56a323ec272fcc Mon Sep 17 00:00:00 2001 +From 5a1b416e824b0729aa8df47a16370b61dcb38170 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/6] Disable banners and remove URLs for mobile apps on @@ -63,10 +63,10 @@ Subject: [PATCH 2/6] Disable banners and remove URLs for mobile apps on 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index b05b474d13..52bd748d2c 100644 +index a39a4f287e..dedbeb8f5b 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2214,7 +2214,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); +@@ -2238,7 +2238,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); pref("browser.contentblocking.report.proxy.enabled", false); // Disable the mobile promotion by default. @@ -75,7 +75,7 @@ index b05b474d13..52bd748d2c 100644 // Locales in which Send to Device emails are supported // The most recent list of supported locales can be found at https://github.com/mozilla/bedrock/blob/6a08c876f65924651554decc57b849c00874b4e7/bedrock/settings/base.py#L963 -@@ -2244,7 +2244,7 @@ pref("browser.promo.pin.enabled", true); +@@ -2268,7 +2268,7 @@ pref("browser.promo.pin.enabled", true); // Set to true for Fx113 (see bug 1808611) pref("browser.promo.cookiebanners.enabled", false); @@ -84,7 +84,7 @@ index b05b474d13..52bd748d2c 100644 pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA"); pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections"); -@@ -2255,12 +2255,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi +@@ -2279,12 +2279,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients"); pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true"); pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections"); @@ -107,10 +107,10 @@ index b05b474d13..52bd748d2c 100644 2.46.0 -From bfdb53b5c15aa3bf057e36b38ae0a7c1f19afe20 Mon Sep 17 00:00:00 2001 +From ba903cc839d182ce54d5e015f028601a60ef690c Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 -Subject: [PATCH 3/6] FSDG: Remove some references to AMO +Subject: [PATCH 3/6] Remove some references to AMO * addons.mozilla.org (AMO) is a third-party repository, not compatible with the FSDG, because it is not committed to only including free @@ -145,7 +145,7 @@ Subject: [PATCH 3/6] FSDG: Remove some references to AMO 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 52bd748d2c..11f5353e7a 100644 +index dedbeb8f5b..b2e5cce829 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -22,7 +22,7 @@ @@ -318,10 +318,10 @@ index 8f8f7cafd5..8140e15fc2 100644 conservative = true, ), diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js -index e8433346ee..00c3e1caac 100644 +index 9de5de83ab..af293cb29b 100644 --- a/mobile/android/app/geckoview-prefs.js +++ b/mobile/android/app/geckoview-prefs.js -@@ -220,11 +220,11 @@ pref("extensions.experiments.enabled", false); +@@ -217,11 +217,11 @@ pref("extensions.experiments.enabled", false); // Support credit cards in GV autocomplete API (bug 1691819) pref("extensions.formautofill.addresses.capture.enabled", true); @@ -338,7 +338,7 @@ index e8433346ee..00c3e1caac 100644 // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile pref("extensions.installDistroAddons", false); diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle -index 990a88db30..20f63be756 100644 +index fa4fb6a0e2..b6791c8ac6 100644 --- a/mobile/android/fenix/app/build.gradle +++ b/mobile/android/fenix/app/build.gradle @@ -87,7 +87,7 @@ android { @@ -351,10 +351,10 @@ index 990a88db30..20f63be756 100644 def deepLinkSchemeValue = "fenix-dev" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 3e66e787eb..25360e8492 100644 +index 5ada4c44fd..28439adc25 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -1845,8 +1845,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% +@@ -1860,8 +1860,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% pref("extensions.abuseReport.enabled", false); // Whether Firefox integrated abuse reporting feature should be opening the new abuse report form hosted on AMO. @@ -365,7 +365,7 @@ index 3e66e787eb..25360e8492 100644 // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -3271,7 +3271,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); +@@ -3287,7 +3287,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); // Whether to allow the inline options browser in HTML about:addons page. pref("extensions.htmlaboutaddons.inline-options.enabled", true); // Show recommendations on the extension and theme list views. @@ -378,10 +378,10 @@ index 3e66e787eb..25360e8492 100644 2.46.0 -From 70dd56ccc24637535e735471d3a86ac53deaf240 Mon Sep 17 00:00:00 2001 +From 0baf38a5b64bcbf4a8377c242e65323196fc68a3 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Jun 2023 13:16:40 +0200 -Subject: [PATCH 4/6] FSDG: Disable Contile and autoupdate of system addons +Subject: [PATCH 4/6] Disable Contile and autoupdate of system addons 1. Contile (see change context lines) is used to fetch sponsored top sites, which are not controlled by Parabola and are likely to not @@ -398,7 +398,7 @@ only free software, remove them from the source code. 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 11f5353e7a..0dd7807072 100644 +index b2e5cce829..ee5bfb92cc 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -51,8 +51,8 @@ pref("extensions.recommendations.themeRecommendationUrl", "https://color.firefox @@ -412,7 +412,7 @@ index 11f5353e7a..0dd7807072 100644 // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.sys.mjs for values to use here. -@@ -1695,8 +1695,8 @@ pref("browser.topsites.component.enabled", false); +@@ -1703,8 +1703,8 @@ pref("browser.topsites.component.enabled", false); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) @@ -427,10 +427,10 @@ index 11f5353e7a..0dd7807072 100644 2.46.0 -From 011bec2bfeb09e61b9f020f1c276f18d2c7049e5 Mon Sep 17 00:00:00 2001 +From fd1ba4f4ce6f875271bfa8d4a4726a660f3ff451 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 26 Sep 2023 21:27:34 +0200 -Subject: [PATCH 5/6] FSDG: Disable Firefox Translations for now +Subject: [PATCH 5/6] Disable Firefox Translations for now Although fully local translation is a great achievement, I'd hesitate to keep it enabled for now, because of the following concerns: @@ -477,10 +477,10 @@ probably has the same issues with the toolchain for the models. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 0dd7807072..7267199afb 100644 +index ee5bfb92cc..335cec8529 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2070,7 +2070,7 @@ pref("browser.translation.neverForLanguages", ""); +@@ -2094,7 +2094,7 @@ pref("browser.translation.neverForLanguages", ""); // Enable Firefox translations powered by the Bergamot translations // engine https://browser.mt/. @@ -493,10 +493,10 @@ index 0dd7807072..7267199afb 100644 2.46.0 -From c5c1ea6e6414b0ec10eeafe2272a1fd6eda628e4 Mon Sep 17 00:00:00 2001 +From 8b8c16a446a5cdb4d0badcfebbb73aec1fdaa8f0 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 12 Jun 2024 00:17:17 +0200 -Subject: [PATCH 6/6] FSDG: Remove some references to Pocket and disable +Subject: [PATCH 6/6] Remove some references to Pocket and disable recommendations Please see [1]. @@ -508,7 +508,7 @@ this nonfunctional by default. [1] https://labs.parabola.nu/issues/2488#note-26 --- - browser/app/profile/firefox.js | 15 ++++--- + browser/app/profile/firefox.js | 15 +++---- .../DiscoveryStreamBase.jsx | 1 - .../CardGrid/CardGrid.jsx | 5 +-- .../DSImage/DSImage.jsx | 4 +- @@ -519,30 +519,30 @@ this nonfunctional by default. .../PocketLoggedInCta/PocketLoggedInCta.jsx | 4 +- .../docs/v2-system-addon/preferences.md | 4 +- .../newtab/lib/ActivityStream.sys.mjs | 20 ++++----- - .../newtab/lib/DiscoveryStreamFeed.sys.mjs | 44 +++---------------- + .../newtab/lib/DiscoveryStreamFeed.sys.mjs | 42 ++----------------- .../newtab/lib/SectionsManager.sys.mjs | 4 +- .../newtab/lib/TopSitesFeed.sys.mjs | 4 +- .../pocket/content/panels/home.html | 2 +- - .../js/components/ArticleList/ArticleList.jsx | 14 +----- + .../js/components/ArticleList/ArticleList.jsx | 14 +------ .../pocket/content/panels/js/main.mjs | 2 +- .../content/panels/js/style-guide/overlay.jsx | 2 +- .../pocket/content/panels/saved.html | 2 +- .../pocket/content/panels/style-guide.html | 2 +- - .../components/pocket/content/pktApi.sys.mjs | 7 ++- + .../components/pocket/content/pktApi.sys.mjs | 7 ++-- .../pocket/spocs/api/SpocsEndpointRaw.kt | 4 +- .../pocket/stories/api/PocketEndpointRaw.kt | 2 +- .../home/pocket/PocketStoriesComposables.kt | 2 +- .../mozilla/fenix/home/topsites/TopSites.kt | 2 +- - .../mozilla/fenix/settings/SupportUtils.kt | 28 +++++------- + .../mozilla/fenix/settings/SupportUtils.kt | 28 ++++++------- toolkit/modules/NewTabUtils.sys.mjs | 3 +- - 27 files changed, 63 insertions(+), 126 deletions(-) + 27 files changed, 62 insertions(+), 125 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 7267199afb..a1a2a308fe 100644 +index 335cec8529..58bbe3c6b8 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1874,7 +1874,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.enabled", - pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.searchTopsitesCompact", false); +@@ -1889,7 +1889,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.locale-thu + pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.searchTopsitesCompact", true); // User pref to show stories on newtab (feeds.system.topstories has to be set to true as well) -pref("browser.newtabpage.activity-stream.feeds.section.topstories", true); @@ -550,7 +550,7 @@ index 7267199afb..a1a2a308fe 100644 // The pref controls if search hand-off is enabled for Activity Stream. pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", true); -@@ -2426,13 +2426,14 @@ pref("browser.migrate.interactions.passwords", false); +@@ -2450,13 +2450,14 @@ pref("browser.migrate.interactions.passwords", false); pref("browser.migrate.preferences-entrypoint.enabled", true); @@ -572,7 +572,7 @@ index 7267199afb..a1a2a308fe 100644 // Enable Pocket button home panel for non link pages. pref("extensions.pocket.showHome", true); diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx -index 8b5826dd82..9084ef1b03 100644 +index 469c2455ca..f4f5ec47e6 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx @@ -22,7 +22,6 @@ import { TopSites } from "content-src/components/TopSites/TopSites"; @@ -584,10 +584,10 @@ index 8b5826dd82..9084ef1b03 100644 const DUMMY_CSS_SELECTOR = "DUMMY#CSS.SELECTOR"; diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -index d6b1723245..3f004f10e8 100644 +index e11a33f7f6..ec757bf5c4 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -@@ -224,9 +224,6 @@ export function RecentSavesContainer({ +@@ -229,9 +229,6 @@ export function RecentSavesContainer({ function renderCard(rec, index) { const url = new URL(rec.url); const urlSearchParams = new URLSearchParams(queryParams); @@ -597,7 +597,7 @@ index d6b1723245..3f004f10e8 100644 for (let [key, val] of urlSearchParams.entries()) { url.searchParams.set(key, val); -@@ -298,7 +295,7 @@ export function RecentSavesContainer({ +@@ -303,7 +300,7 @@ export function RecentSavesContainer({ +Date: Sun, 15 Sep 2024 19:19:31 +0200 +Subject: [PATCH] Disable experimental Machine Learning support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* Remove references to Mozilla Model Hub. According to FSDG [1]: + > Programs in the system should not suggest installing nonfree plugins, +documentation, and so on. +While machine learning models can be freely licensed on that hub, it's +not fully clear for me if they can be made using 100% free software +stack, without CUDA or any other nonfree stuff. And the most important +thing is, as can be seen from the other Iceweasel patches, Mozilla is +"not committed to only including free software" [1] in their +repositories, and this is likely to apply to the “Information for +practical use” [1] as well. +* Ensure the preference is disabled by default. Other parts of the code + base can override that, so there's some more patching work to do. But +I think that's not a huge concern as long as the reference to Mozilla +Model Hub is removed. Users are free to host some models themselves on +localhost and enable the feature if needed. + +[1] https://www.gnu.org/distros/free-system-distribution-guidelines.html#license-rules +--- + modules/libpref/init/all.js | 3 ++- + toolkit/components/ml/content/ModelHub.sys.mjs | 1 - + toolkit/components/ml/docs/index.rst | 2 +- + toolkit/components/ml/tests/browser/browser_ml_cache.js | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js +index 2c82290859..0554c26516 100644 +--- a/modules/libpref/init/all.js ++++ b/modules/libpref/init/all.js +@@ -3800,11 +3800,12 @@ pref("browser.translations.chaos.errors", false); + pref("browser.translations.chaos.timeoutMS", 0); + + // Enable the experimental machine learning inference engine. ++// Add dummy comment for the patch to fail once the preference below gets set to true + pref("browser.ml.enable", false); + // Set to "All" to see all logs, which are useful for debugging. + pref("browser.ml.logLevel", "Error"); + // Model hub root URL used to download models. +-pref("browser.ml.modelHubRootUrl", "https://model-hub.mozilla.org/"); ++pref("browser.ml.modelHubRootUrl", "https://localhost/"); + // Model URL template + pref("browser.ml.modelHubUrlTemplate", "{model}/{revision}"); + // Maximum disk size for ML model cache (in bytes) +diff --git a/toolkit/components/ml/content/ModelHub.sys.mjs b/toolkit/components/ml/content/ModelHub.sys.mjs +index fb47f8ccbe..6e1946232c 100644 +--- a/toolkit/components/ml/content/ModelHub.sys.mjs ++++ b/toolkit/components/ml/content/ModelHub.sys.mjs +@@ -29,7 +29,6 @@ const ALLOWED_HUBS = [ + "resource://*", + "http://localhost", + "https://localhost", +- "https://model-hub.mozilla.org", + ]; + + const ALLOWED_HEADERS_KEYS = [ +diff --git a/toolkit/components/ml/docs/index.rst b/toolkit/components/ml/docs/index.rst +index 6bbfa65e2c..4002cf64e4 100644 +--- a/toolkit/components/ml/docs/index.rst ++++ b/toolkit/components/ml/docs/index.rst +@@ -49,7 +49,7 @@ In the example below, a text summarization task is performed using the `summariz + console.log(res[0]["summary_text"]); + + +-When running this code, Firefox will look for models in the Mozilla model hub located at https://model-hub.mozilla.org ++When running this code, Iceweasel will look for models in the model hub located at https://localhost + which contains a curated list of models. + + Available Options +diff --git a/toolkit/components/ml/tests/browser/browser_ml_cache.js b/toolkit/components/ml/tests/browser/browser_ml_cache.js +index 4d2df9a619..c42b98d521 100644 +--- a/toolkit/components/ml/tests/browser/browser_ml_cache.js ++++ b/toolkit/components/ml/tests/browser/browser_ml_cache.js +@@ -38,12 +38,12 @@ const FAKE_ONNX_MODEL_ARGS = { + const badHubs = [ + "https://my.cool.hub", + "https://sub.localhost/myhub", // Subdomain of allowed domain +- "https://model-hub.mozilla.org.evil.com", // Manipulating path to mimic domain ++ "https://model-hub.invalid.evil.com", // Manipulating path to mimic domain + "httpsz://localhost/myhub", // Similar-looking scheme + "https://localhost.", // Trailing dot in domain + "resource://user@localhost", // User info in URL + "ftp://localhost/myhub", // Disallowed scheme with allowed host +- "https://model-hub.mozilla.org.hack", // Domain that contains allowed domain ++ "https://model-hub.invalid.hack", // Domain that contains allowed domain + ]; + + function createBlob(size = 8) { +@@ -67,7 +67,7 @@ let goodHubs = [ + "https:///localhost/myhub", // Triple slashes, see https://stackoverflow.com/a/22775589 + "https://localhost:8080/myhub", + "http://localhost/myhub", +- "https://model-hub.mozilla.org", ++ "https://model-hub.invalid", + "chrome://gre/somewhere/in/the/code/base", + ]; + +-- +2.46.0 + + +From 6b45b31fd1674d81e725b37b49c0730faa6f89dd Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Mon, 16 Sep 2024 01:49:27 +0200 +Subject: [PATCH] Wipe Merino hostname, disable Weather & Yelp + +Merino is yet another source of suggestions, which can steer users +towards installing nonfree software and/or other information for +practical use. In this case, suggestions can contain links to websites +of various providers, such as weather, Yelp, etc., which can serve, for +example, nonfree JavaScript code. So remove Merino hostname and disable +suggestions for Weather and Yelp since Iceweasel doesn't ship any +providers for these. +--- + browser/app/profile/firefox.js | 18 +++++++------- + browser/components/urlbar/UrlbarPrefs.sys.mjs | 2 +- + .../tests/quicksuggest/MerinoTestUtils.sys.mjs | 2 +- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index a39a4f287e..81fb248870 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -454,7 +454,7 @@ pref("browser.urlbar.weather.minKeywordLength", 0); + + // If `browser.urlbar.weather.featureGate` is true, this controls whether + // weather suggestions are turned on. +-pref("browser.urlbar.suggest.weather", true); ++pref("browser.urlbar.suggest.weather", false); + + // If `browser.urlbar.trending.featureGate` is true, this controls whether + // trending suggestions are turned on. +@@ -611,7 +611,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); + pref("browser.urlbar.groupLabels.enabled", true); + + // The Merino endpoint URL, not including parameters. +-pref("browser.urlbar.merino.endpointURL", "https://merino.services.mozilla.com/api/v1/suggest"); ++pref("browser.urlbar.merino.endpointURL", ""); + + // Timeout for Merino fetches (ms). + pref("browser.urlbar.merino.timeoutMs", 200); +@@ -634,10 +634,10 @@ pref("browser.urlbar.suggest.addons", true); + + // If `browser.urlbar.mdn.featureGate` is true, this controls whether + // mdn suggestions are turned on. +-pref("browser.urlbar.suggest.mdn", true); ++pref("browser.urlbar.suggest.mdn", false); + + // Feature gate pref for Yelp suggestions in the urlbar. +-pref("browser.urlbar.yelp.featureGate", true); ++pref("browser.urlbar.yelp.featureGate", false); + + // The minimum prefix length of a Yelp keyword the user must type to trigger the + // suggestion. 0 means the min length should be taken from Nimbus. +@@ -648,7 +648,7 @@ pref("browser.urlbar.yelp.priority", false); + + // If `browser.urlbar.yelp.featureGate` is true, this controls whether + // Yelp suggestions are turned on. +-pref("browser.urlbar.suggest.yelp", true); ++pref("browser.urlbar.suggest.yelp", false); + + // Feature gate pref for Fakespot suggestions in the urlbar. + pref("browser.urlbar.fakespot.featureGate", false); +@@ -1718,7 +1718,7 @@ pref("browser.partnerlink.campaign.topsites", "amzn_2020_a1"); + pref("browser.newtab.preload", true); + + // Weather widget for newtab +-pref("browser.newtabpage.activity-stream.showWeather", true); ++pref("browser.newtabpage.activity-stream.showWeather", false); + pref("browser.newtabpage.activity-stream.weather.query", ""); + pref("browser.newtabpage.activity-stream.weather.display", "simple"); + +@@ -1726,10 +1726,10 @@ pref("browser.newtabpage.activity-stream.weather.display", "simple"); + pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", true); + + // List of regions that get weather by default. +-pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "US,CA"); ++pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", ""); + + // List of locales that weather widget supports. +-pref("browser.newtabpage.activity-stream.discoverystream.locale-weather-config", "en-US,en-GB,en-CA"); ++pref("browser.newtabpage.activity-stream.discoverystream.locale-weather-config", ""); + + // Preference to enable wallpaper selection in the Customize Menu of new tab page + pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", true); +@@ -1851,7 +1851,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.topicSelection.locale-t + // System pref to enable topic labels on Pocket cards + pref("browser.newtabpage.activity-stream.discoverystream.topicLabels.enabled", true); + +-pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoint", "merino.services.mozilla.com"); ++pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoint", ""); + // List of regions that get spocs by default. + pref("browser.newtabpage.activity-stream.discoverystream.region-spocs-config", "US,CA,DE,GB,FR,IT,ES"); + // List of regions that don't get the 7 row layout. +diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs +index 86f6ad403e..bd8daa8077 100644 +--- a/browser/components/urlbar/UrlbarPrefs.sys.mjs ++++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs +@@ -175,7 +175,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ + ["merino.clientVariants", ""], + + // The Merino endpoint URL, not including parameters. +- ["merino.endpointURL", "https://merino.services.mozilla.com/api/v1/suggest"], ++ ["merino.endpointURL", ""], + + // Comma-separated list of providers to request from Merino + ["merino.providers", ""], +diff --git a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs +index 1828ddbceb..a0e8e5d93a 100644 +--- a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs ++++ b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs +@@ -91,7 +91,7 @@ const WEATHER_FETCH_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours + const GEOLOCATION_DATA = { + provider: "geolocation", + title: "", +- url: "https://merino.services.mozilla.com/", ++ url: "", + is_sponsored: false, + score: 0, + custom_details: { +-- +2.46.0 + diff --git a/libre/iceweasel/9003-FSDG-urihandlers.patch b/libre/iceweasel/9003-FSDG-urihandlers.patch index b122c57..4a70160 100644 --- a/libre/iceweasel/9003-FSDG-urihandlers.patch +++ b/libre/iceweasel/9003-FSDG-urihandlers.patch @@ -1,7 +1,7 @@ -From 50cf4a44a6a5b4c7217f43c527bf861d8a5a3cf3 Mon Sep 17 00:00:00 2001 +From a9e69358a46635c8a9e4c3036dafa40f6bb5a2f3 Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 -Subject: [PATCH] FSDG: Remove URI handlers that serve nonfree software +Subject: [PATCH] Remove URI handlers that serve nonfree software --- uriloader/exthandler/HandlerList.sys.mjs | 184 +---------------------- diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 0e2ddc2..21401b9 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1,14 +1,14 @@ -From a0485f5ed0c419223ae750873ec2dfa4c3a58cda Mon Sep 17 00:00:00 2001 +From 00e1f2356ff0a100e152fec1074c29e3b64101ef Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 12 Mar 2022 17:14:25 +0100 -Subject: [PATCH 1/6] FSDG: Replace upstream default bookmarks +Subject: [PATCH 1/7] Replace upstream default bookmarks --- - browser/base/content/default-bookmarks.html | 60 ++++++++------------- - 1 file changed, 21 insertions(+), 39 deletions(-) + browser/base/content/default-bookmarks.html | 50 +++++++++------------ + 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html -index c42e81ac23..e2e643bcf2 100644 +index cbed7b2ccc..ba436303df 100644 --- a/browser/base/content/default-bookmarks.html +++ b/browser/base/content/default-bookmarks.html @@ -1,14 +1,14 @@ @@ -35,24 +35,14 @@ index c42e81ac23..e2e643bcf2 100644 -@@ -29,41 +29,23 @@ +@@ -27,30 +27,20 @@ +

default-bookmarks-heading

+

-

default-bookmarks-toolbarfolder

-
default-bookmarks-toolbarfolder-description
-#ifndef NIGHTLY_BUILD --#ifdef EARLY_BETA_OR_EARLIER -

--

default-bookmarks-getting-started
-+
Parabola GNU/Linux-libre
-

--#else +-

default-bookmarks-firefox-heading

+

Parabola GNU/Linux-libre

--

default-bookmarks-getting-started
--

--#endif --

default-bookmarks-firefox-heading

--

-

default-bookmarks-firefox-get-help
-
default-bookmarks-firefox-customize
-#ifdef EARLY_BETA_OR_EARLIER @@ -63,9 +53,6 @@ index c42e81ac23..e2e643bcf2 100644 -
default-bookmarks-firefox-about
-

-#else --

--

default-bookmarks-firefox-community
--

-

default-bookmarks-nightly-heading

+
Parabola GNU/Linux-libre +
Parabola GNU/Linux-libre Packages @@ -74,6 +61,7 @@ index c42e81ac23..e2e643bcf2 100644 +

+

Free Software Foundation

+-

default-bookmarks-firefox-community
-
default-bookmarks-nightly-blog
-
default-bookmarks-bugzilla
-
default-bookmarks-mdn
@@ -90,13 +78,13 @@ index c42e81ac23..e2e643bcf2 100644 -- -2.46.0 +2.46.1 -From 4bdaad3823992fc1a6591b8751189534ed908074 Mon Sep 17 00:00:00 2001 +From 6a8e10cbe6e5c86458b882da142d004ba98b1151 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:46:48 +0200 -Subject: [PATCH 2/6] Remove 'More from Mozilla' section in Preferences +Subject: [PATCH 2/7] Remove 'More from Mozilla' section in Preferences Currently it contains functionality to provide links to nonfree software like Firefox Mobile, which is not compatible with the FSDG for the same @@ -115,23 +103,23 @@ reasons as desktop Firefox. delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index a1a2a308fe..f625803930 100644 +index 09971c2f65..0fa78ba5a2 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1235,7 +1235,7 @@ pref("browser.preferences.experimental", true); - #else - pref("browser.preferences.experimental", false); - #endif +@@ -1237,7 +1237,7 @@ pref("browser.preferences.experimental", true); + // Whether we had to hide the "Firefox Labs" section because it would be empty. + pref("browser.preferences.experimental.hidden", false); + // Whether we show the "More from Mozilla" section. -pref("browser.preferences.moreFromMozilla", true); +pref("browser.preferences.moreFromMozilla", false); - pref("browser.preferences.experimental.hidden", false); - pref("browser.preferences.defaultPerformanceSettings.enabled", true); + // Used by settings to track whether the user customized advanced + // performance settings. Not used directly elsewhere. diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index c8aaef36f4..df3911dca9 100644 +index 33ad82487b..b207203273 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -148,15 +148,6 @@ var allowlist = [ +@@ -144,15 +144,6 @@ var allowlist = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, @@ -252,7 +240,7 @@ index 7e21bab426..6a33458a99 100644 // registered and inititalized since many tests wait for the // "sync-pane-loaded" observer notification before starting the test. diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml -index 3affb19d1a..100538f5a1 100644 +index 53bdc9c912..f55c51adff 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -47,7 +47,6 @@ @@ -265,7 +253,7 @@ index 3affb19d1a..100538f5a1 100644 @@ -166,16 +165,6 @@ - + - -- -2.46.0 +2.46.1 -From d01e5136c19ee7d1183a3b430d1631b91faf79e1 Mon Sep 17 00:00:00 2001 +From f8dc1f66a9fa14ecd7510a894b9dc9411832e072 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:51:06 +0200 -Subject: [PATCH 3/6] Remove promos of Firefox Focus and Klar from Private +Subject: [PATCH 3/7] Remove promos of Firefox Focus and Klar from Private Browsing Please correct me if I'm wrong, but these are not compatible with FSDG @@ -312,10 +300,10 @@ for the same reasons as the original Firefox. delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index f625803930..4cc2f97965 100644 +index 0fa78ba5a2..25458b8b09 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2235,7 +2235,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u +@@ -2259,7 +2259,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u pref("browser.promo.focus.disallowed_regions", "cn"); // Default to enabling focus promos to be shown where allowed. @@ -325,7 +313,7 @@ index f625803930..4cc2f97965 100644 // Default to enabling pin promos to be shown where allowed. pref("browser.promo.pin.enabled", true); diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index df3911dca9..dd32916808 100644 +index b207203273..c24f610c11 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js @@ -35,8 +35,6 @@ var gExceptionPaths = [ @@ -338,10 +326,10 @@ index df3911dca9..dd32916808 100644 // toolkit/components/pdfjs/content/build/pdf.js "resource://pdf.js/web/images/", diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs -index d88d2244f2..4539d205fc 100644 +index ec36bd513c..8e785ad810 100644 --- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs +++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs -@@ -494,315 +494,6 @@ const BASE_MESSAGES = () => [ +@@ -522,315 +522,6 @@ const BASE_MESSAGES = () => [ ], }, }, @@ -658,10 +646,10 @@ index d88d2244f2..4539d205fc 100644 id: "PB_NEWTAB_PIN_PROMO", template: "pb_newtab", diff --git a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs -index 0e8383960e..2f414efca5 100644 +index 9363208ae5..999a8cf4f5 100644 --- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs +++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs -@@ -236,85 +236,6 @@ const MESSAGES = () => [ +@@ -284,85 +284,6 @@ const MESSAGES = () => [ frequency: { lifetime: 3 }, trigger: { id: "defaultBrowserCheck" }, }, @@ -988,13 +976,13 @@ index 2217ca055c..0000000000 - - -- -2.46.0 +2.46.1 -From 4fa8aade1267f5e34e123639a25a29c674bbbb80 Mon Sep 17 00:00:00 2001 +From 17de3e405ffc61c88233b71ac6c80941920fc79d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 -Subject: [PATCH 4/6] FSDG: Remove 'Extensions for developers' menu item +Subject: [PATCH 4/7] Remove 'Extensions for developers' menu item Main menu -> 'More tools' -> 'Extensions for developers' opens addons.mozilla.org (AMO), a third-party repository, not compatible with the @@ -1049,13 +1037,13 @@ index e75115c220..0abeb4d830 100644 }, }, -- -2.46.0 +2.46.1 -From 2902017b64a68ef297192639c427a0928b004b0a Mon Sep 17 00:00:00 2001 +From bffc52bbb51b46ccbb3c84ce0f10aa88becaab28 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 12 Mar 2023 21:57:14 +0100 -Subject: [PATCH 5/6] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL +Subject: [PATCH 5/7] Change DuckDuckGo URL to DuckDuckGo HTML URL Some of JavaScript files from the regular DDG URL lack license info, and I couldn't find their freely licensed sources, so they can be considered @@ -1111,27 +1099,181 @@ index 104eee6457..9a3279c622 100644 "suggest_url_get_params": "q={searchTerms}&type=list" } -- -2.46.0 +2.46.1 + +From 63322fe9cda922e44c9ee43a91d4c6030aaec3e5 Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Sun, 15 Sep 2024 22:12:44 +0200 +Subject: [PATCH 6/7] Remove references to nonfree Generative AI chats + +The GenAI chatbot feature opens the chat with the provider selected by +the user in the side panel, and essentially loads all the software +and/or information for practical use from the website of that provider. +These websites can be considered software repositories, and I haven't +found any claims about the commitment to include only free software in +those. -From 0c7f18221b09cceb576d5e8c42ffad28fad4c9dd Mon Sep 17 00:00:00 2001 +So remove references to these websites and keep only the localhost +(disabled by default). And since Iceweasel doesn't ship any local chat +provider, hide the whole set of related options from the Labs. If +somebody wants to host one locally, options can be shown by setting +browser.ml.chat.hideFromLabs to true and browser.ml.chat.hideLocalhost +to false. +--- + browser/components/genai/GenAI.sys.mjs | 78 +------------------------ + browser/locales/en-US/browser/genai.ftl | 8 +-- + 2 files changed, 3 insertions(+), 83 deletions(-) + +diff --git a/browser/components/genai/GenAI.sys.mjs b/browser/components/genai/GenAI.sys.mjs +index fae0a51136..9a61bddf19 100644 +--- a/browser/components/genai/GenAI.sys.mjs ++++ b/browser/components/genai/GenAI.sys.mjs +@@ -30,7 +30,7 @@ XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "chatHideFromLabs", + "browser.ml.chat.hideFromLabs", +- false ++ true + ); + XPCOMUtils.defineLazyPreferenceGetter( + lazy, +@@ -72,7 +72,7 @@ XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "chatProviders", + "browser.ml.chat.providers", +- "claude,chatgpt,gemini,huggingchat,lechat", ++ "", + reorderChatProviders + ); + XPCOMUtils.defineLazyPreferenceGetter( +@@ -102,85 +102,11 @@ export const GenAI = { + // showing links, and other special behaviors needed for individual providers. + chatProviders: new Map([ + // Until bug 1903900 to better handle max length issues, track in comments +- // ~14k max length uri before 431 +- [ +- "https://claude.ai/new", +- { +- id: "claude", +- link1: +- "https://www.anthropic.com/legal/archive/6370fb23-12ed-41d9-a4a2-28866dee3105", +- link2: +- "https://www.anthropic.com/legal/archive/7197103a-5e27-4ee4-93b1-f2d4c39ba1e7", +- link3: +- "https://www.anthropic.com/legal/archive/628feec9-7df9-4d38-bc69-fbf104df47b0", +- linksId: "genai-settings-chat-claude-links", +- name: "Anthropic Claude", +- }, +- ], +- // ~14k max length uri before 431 +- [ +- "https://chatgpt.com", +- { +- id: "chatgpt", +- link1: "https://openai.com/terms", +- link2: "https://openai.com/privacy", +- linksId: "genai-settings-chat-chatgpt-links", +- name: "ChatGPT", +- }, +- ], +- // ~4k max length uri before 400 +- [ +- "https://www.bing.com/chat?sendquery=1", +- { +- id: "copilot", +- link1: "https://www.bing.com/new/termsofuse", +- link2: "https://go.microsoft.com/fwlink/?LinkId=521839", +- linksId: "genai-settings-chat-copilot-links", +- name: "Copilot", +- }, +- ], +- // ~20k max length uri before 400 +- // ~55k max header (no ?q=) before 413 +- [ +- "https://gemini.google.com", +- { +- header: "X-Firefox-Gemini", +- id: "gemini", +- link1: "https://policies.google.com/terms", +- link2: "https://policies.google.com/terms/generative-ai/use-policy", +- link3: "https://support.google.com/gemini?p=privacy_notice", +- linksId: "genai-settings-chat-gemini-links", +- name: "Google Gemini", +- }, +- ], +- // ~8k max length uri before 413 +- [ +- "https://huggingface.co/chat", +- { +- id: "huggingchat", +- link1: "https://huggingface.co/chat/privacy", +- link2: "https://huggingface.co/privacy", +- linksId: "genai-settings-chat-huggingchat-links", +- name: "HuggingChat", +- }, +- ], +- // ~4k max length uri before 502 +- [ +- "https://chat.mistral.ai/chat", +- { +- id: "lechat", +- link1: "https://mistral.ai/terms/#terms-of-service-le-chat", +- link2: "https://mistral.ai/terms/#privacy-policy", +- linksId: "genai-settings-chat-lechat-links", +- name: "Le Chat Mistral", +- }, +- ], + // 8k max length uri before 414 + [ + "http://localhost:8080", + { + id: "localhost", +- link1: "https://llamafile.ai", + linksId: "genai-settings-chat-localhost-links", + name: "localhost", + }, +diff --git a/browser/locales/en-US/browser/genai.ftl b/browser/locales/en-US/browser/genai.ftl +index 06b3b1670a..db68870113 100644 +--- a/browser/locales/en-US/browser/genai.ftl ++++ b/browser/locales/en-US/browser/genai.ftl +@@ -9,13 +9,7 @@ genai-settings-chat-choose = Choose a chatbot + genai-settings-chat-choose-one-menuitem = + .label = Choose one + genai-settings-chat-links = When you choose a chatbot, you agree to the provider’s terms of use and privacy policy. +-genai-settings-chat-chatgpt-links = By choosing ChatGPT, you agree to the OpenAI Terms of Use and Privacy Policy. +-genai-settings-chat-claude-links = By choosing Anthropic Claude, you agree to the Anthropic Consumer Terms of Service, Usage Policy, and Privacy Policy. +-genai-settings-chat-copilot-links = By choosing Copilot, you agree to the Copilot AI Experiences Terms and Microsoft Privacy Statement. +-genai-settings-chat-gemini-links = By choosing Google Gemini, you agree to the Google Terms of Service, Generative AI Prohibited Use Policy, and Gemini Apps Privacy Notice. +-genai-settings-chat-huggingchat-links = By choosing HuggingChat, you agree to the HuggingChat Privacy Notice and Hugging Face Privacy Policy. +-genai-settings-chat-lechat-links = By choosing Le Chat Mistral, you agree to the Mistral AI Terms of Service and Privacy Policy. +-genai-settings-chat-localhost-links = Bring your own private local chatbot such as llamafile from { -vendor-short-name }’s Innovation group. ++genai-settings-chat-localhost-links = Bring your own private local chatbot such as llamafile. + genai-settings-chat-shortcuts = + .description = Displays a shortcut to prompts when you select text. { -brand-short-name } sends the text, page title, and prompt to the chatbot. + .label = Show prompts on text select +-- +2.46.1 + + +From 449c2d9a7aad82a9ccda16026c650f1ad74889c0 Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 -Subject: [PATCH 6/6] FSDG: Various patches +Subject: [PATCH 7/7] Various patches I'm too lazy to find the history for each, just making the whole patch set compatible with 'git am' and easier to manage. If needed, it can be found using git. --- - browser/app/permissions | 3 --- - browser/components/preferences/sync.inc.xhtml | 18 ------------- + browser/app/permissions | 3 -- + browser/components/preferences/sync.inc.xhtml | 18 ----------- .../protections/content/protections.ftl | 2 +- - .../protections/content/protections.html | 10 ------- - .../protections/content/vpn-card.mjs | 16 ------------ - .../en-US/browser/preferences/preferences.ftl | 10 ------- - .../en-US/toolkit/about/aboutAddons.ftl | 10 ++++--- - .../en-US/toolkit/branding/brandings.ftl | 26 +++++++++---------- - 8 files changed, 20 insertions(+), 75 deletions(-) + .../protections/content/protections.html | 10 ------ + .../protections/content/vpn-card.mjs | 16 ---------- + .../en-US/browser/preferences/preferences.ftl | 10 ------ + .../en-US/toolkit/about/aboutAddons.ftl | 10 +++--- + .../en-US/toolkit/branding/brandings.ftl | 32 +++++++++---------- + 8 files changed, 23 insertions(+), 78 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index 1c72a96de8..052a6a5c83 100644 @@ -1238,7 +1380,7 @@ index dd2039db2e..e70583628b 100644 const vpnBanner = this.doc.querySelector(".vpn-banner"); const exitIcon = vpnBanner.querySelector(".exit-icon"); diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl -index dfbf89fc21..0410f60294 100644 +index d197d876da..1ba738fb0d 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl @@ -845,16 +845,6 @@ sync-signedout-account-signin3 = @@ -1295,7 +1437,7 @@ index dbdbfd063d..65942db1eb 100644 addon-page-options-button = .title = Tools for all add-ons diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl -index cc95fbc3b8..ae6859bc95 100644 +index 3861d8b613..1f2d087cd5 100644 --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl @@ -15,17 +15,17 @@ @@ -1323,7 +1465,7 @@ index cc95fbc3b8..ae6859bc95 100644 -relay-brand-short-name = Relay -fakespot-brand-name = Fakespot -@@ -35,14 +35,14 @@ +@@ -35,20 +35,20 @@ # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated. -fakespot-brand-full-name = Fakespot by Mozilla @@ -1344,6 +1486,15 @@ index cc95fbc3b8..ae6859bc95 100644 # and kept in English. --firefoxview-brand-name = Firefox View +-firefoxview-brand-name = Iceweasel View + +-# Firefox Labs is the name for a page in Settings to allow users to learn about ++# Iceweasel Labs is the name for a page in Settings to allow users to learn about + # experimental and in-development features, and turn those features on and off. +-# The "Labs" portion can be localized, “Firefox” must be treated as a brand ++# The "Labs" portion can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefoxlabs-brand-name = Firefox Labs ++-firefoxlabs-brand-name = Iceweasel Labs -- -2.46.0 +2.46.1 diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index c113334..0b5402b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,9 +70,9 @@ pkgname=iceweasel epoch=1 -pkgver=129.0 +pkgver=130.0.1 pkgrel=1 -_brandingver=129.0 +_brandingver=130.0 _brandingrel=1 pkgdesc="Fast, Private & Safe Web Browser" url=https://wiki.parabola.nu/Iceweasel @@ -185,10 +185,10 @@ validpgpkeys+=( BFA8008A8265677063B11BF47171986E4B745536 # Andreas Grapentin (branding source-ball) 3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40 # bill-auger (libre source-ball) ) -sha256sums=('4b9ff955de7099f09aa1f00985e34695fa1a911e56c2d46cb4d60c3bff3d9174' +sha256sums=('027225a1e9b074f0072e22c7264cf27b0d2364c675c3ca811aa6c25fb01b9f70' 'SKIP' # $pkgname-symbolic.svg - '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58' # $pkgname.desktop + '614f2ab3f7bbe783ca50b94f4c78081ee1f98605156ee8ff379e251191b61bdb' # $pkgname.desktop 'a6e4ab312203ae1df50537f4e6631417b84df46bac4cce2d51145751a405cd8f') # nu.parabola.$pkgname.metainfo.xml sha256sums+=('86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0' # avoid-libxul-OOM-python-check.patch @@ -196,10 +196,10 @@ sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('abd8b0008dfd0948234baf7c307c42051e2f58a9c7ebd07b3b0dec9bdb6d8d78e4e1ae25d552aba8685e8b307dbdeb1360d873fef98ac108671dbbbc53c2a3af' +b2sums=('2d6496a4f476a5a276b70de43f5d58ce2a44007b754e05fcf757d4c1a1cdfcab910493f48e6a6e608b9719ab73cf56c066de56a4abc08ca42e83aa76f4f80c38' 'SKIP' # $pkgname-symbolic.svg - 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635' # $pkgname.desktop + '49b4776b3ec8c70194a8f7c5a6467f71820c6a5d6e2033a519fe2742282c6dc141855c6213c67e34b4e0774227d3c15f9083e708c33e7cd6e4c3a982830fefdf' # $pkgname.desktop '80cf1f7644f9b509fe374cd51fea288ffcca73f735c7d4c8e2a22be7543aa7e0f3c84a619315e5fb4b82967f1cc7b2b4282658af859be1a08d2f29c39f2815d7') # nu.parabola.$pkgname.metainfo.xml b2sums+=('f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882' # avoid-libxul-OOM-python-check.patch @@ -214,13 +214,6 @@ b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf # more information. _google_api_key= # anti-feature -# Mozilla API keys (see https://location.services.mozilla.com/api) -# Note: These are for Arch Linux use ONLY. For your own distribution, please -# get your own set of keys. Feel free to contact heftig@archlinux.org for -# more information. -_mozilla_api_key= # anti-feature - - ## parabola mksource over-rides ## _N_MKSOURCES=2 # number of sources=() to be isolated for mksource @@ -235,20 +228,20 @@ mksource+=( https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}- 9003-FSDG-urihandlers.patch 9004-FSDG-misc.patch process-json-files.py ) -mksha256sums+=( '2b5ad32521042ebef71a5f650ed066b50be45c8b0252132e5fd1df49e9122098' # *.branding.tar.xz +mksha256sums+=( 'b21150c048016f1b43d04baa821045186015a4cb49c4df67f059d79a1f2d6f5d' # *.branding.tar.xz 'SKIP' - '6c636d417d32e9836b8ca3e172fb13552e759885d2a29dffb0fbd945ab00878e' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '3dcf58c7e339338c7aee5507da6e9b4b887a7e7fd52aeb27af58f2e167317166' # 9002-FSDG-preference-defaults.patch - '2de7f85cc16e0a08ce6c360e29f334e483ba96dccd6ea2ff13771ba41f552fa8' # 9003-FSDG-urihandlers.patch - 'b01d7801629145f578078a63f8a944fc8467f632875715a0632b2c1989d69c10' # 9004-FSDG-misc.patch - '74d8a6172f3013ecae99974cd046481ebb347d38f04e264b285ff6183db0baee' ) # process-json-files.py -mkb2sums+=( '9cf176b7613c5665a5218ec69445479ae471614ca57f920e8affb0906f5ec39132af4f3bd109100211ae496cca46fa550e170c86e4d5c04680b35e093081936b' # *.branding.tar.xz + '4e18df3186c89938c8d795c0a6318e0b6669ec21cfc1beea106baf470a44a5dc' # 9001-FSDG-sync-remote-settings-with-local-dump.patchsettings-with-local-dump.patch + '3650fc28869e2cf207404e394e2dd0fb4821eebcead0660402916d4c16df574a' # 9002-FSDG-preference-defaults.patchefaults.patch + '905b6bfda512d23dc68af25cddf4ae20be60aa7153cb57ecd2c693df2a3d243f' # 9003-FSDG-urihandlers.patchpatch + '1df62ff939d8d5419f5a59330495274f425d296e4bf62befd5c47b1e3ff01927' # 9004-FSDG-misc.patch + 'd77624602d6064669e3c44dc4f45fb0ff12d2bf4bbe8e3d36be51a5ae94ca46e' ) # process-json-files.py +mkb2sums+=( 'f70c4d1e4bd0b09388850586aaf0db2e770407790341ac9e56f36d149bd964c657b7ead246b619bfe2917cc5d6295967d78b6ff0eaad0ac382c5a382938fcbb9' # *.branding.tar.xz 'SKIP' - 'aba0445714a47afeba9e0eeca175c46d52ed6219b270b84cf6e435713fadf9b55f04e2a4bb05a2e0cfd0463ebdb499baa210b4bfd85f725c5f7fbd9c4be7fc53' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '81c64e74ed60355bf6a65a3887a6a037222e3190796ff790576d90a8577ce368a2d9fc477c892e3513d4892efd84204a067982d9dab762e0f07ca6c219fcb1cc' # 9002-FSDG-preference-defaults.patch - 'cd88198b705393a2a44d6c7046eb84ad9c0117bcecdfd966a56af687018ce266307d0abb094c45b55121026ec6382b91509e88059db5dcf51f41ed57cb4604c1' # 9003-FSDG-urihandlers.patch - '6931d79e0860202cf5fcc6ee784ee1b4fb3973158f1760ac07cbf5e4439ef30efe11aace16ef6b32ff4eab0bbf1fef7496cd9585b31f5e6ec2d39cc8c1164ad0' # 9004-FSDG-misc.patch - 'e887b22ca3837f2be0aa1e6d86ea74b56b198b596ea14154a20ce3c16b71310e907503ae47863f84214797a68d451c06100d12bda2fd963a8ad1b380dd441fbe' ) # process-json-files.py + 'dfb13c1f8934e6e1cc31f14cd2bed0c88ea020a93540f3e6f9f3097a1729337b2f4e3ba2973ddc21cf7f020d369f11e42db37c42755d079f372b8c8ec707fe76' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '011684a8b52e775bea2bd898c851924d4b6bba84a5562c6d6cbbcf4328081c9c1788a49d5e69fc03b68f75135ae6df306d2e0c61b571773bd2525f48dd9bf450' # 9002-FSDG-preference-defaults.patch + 'ece2f939d0c5744b04000ce0a24f430f2a8b6b6d87fa350692e7d5871f0bc63776f4e3f6ba7e397a5f5d5b1980f3c500c2368ded8139c34ab979c3eb564aaa51' # 9003-FSDG-urihandlers.patch + 'ac4df72d34f2947294ee3cf6518ccb8e0134a973d729c8994c416ca7f5981a2cb56f384c092c7c63a6194b4d84fd4dfd0cdefbefba046c254f2179cbd7e9954f' # 9004-FSDG-misc.patch + '123a23027f1bf5f0e1f7851de5c95b679d0a110b07f2fc7d2447290157963fce2bbb1f5ed46b0bfdcaf32927cf86cb0226965cafd85a2924be2b1812abb9d4b9' ) # process-json-files.py source=( https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.zst{,.sig} ${source[*]:${_N_MKSOURCES}} ) sha256sums=( '536c9a068f5d605574f11eb72e8d501e5ef52b742c68cdf7cf2ddb1feaccbc48' # libre source-ball @@ -329,6 +322,16 @@ _check_patching() { local settings_err_msg="ERROR: 9001-FSDG-sync-remote-settings-with-local-dump.patch needs reworking" ! grep -qrE $settings_server_regex || ! echo "${settings_err_msg}" || return 1 + # Model Hub + local model_hub_server_regex='model-hub.(mozilla|allizom).org' + local model_hub_err_msg="ERROR: 9002-FSDG-preference-defaults.patch needs reworking" + ! grep -qrE $model_hub_server_regex || ! echo "${model_hub_err_msg}" || return 1 + + # Merino + local merino_server_regex='merino.services.(mozilla|allizom).com' + local merino_err_msg="ERROR: 9002-FSDG-preference-defaults.patch needs reworking" + ! grep -qrE $merino_server_regex || ! echo "${merino_err_msg}" || return 1 + # services.addons.mozilla.org API endpoint local amo_api_endpoint='services.addons.mozilla.org' local amo_err_msg="ERROR: 9002-FSDG-preference-defaults.patch needs reworking: AMO API endpoint hostname found in source tree" @@ -541,7 +544,6 @@ prepare() { ## general configuration ## echo -n "$_google_api_key" >google-api-key - echo -n "$_mozilla_api_key" >mozilla-api-key cat >../mozconfig <