From 3126e33cb053d2c2dbbf3c062b9944559194ab5f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Feb 05 2025 16:30:36 +0000 Subject: [PATCH 1/2] libre/iceweasel: 134.0 * Update patches according to the upstream changes * Remove more vendored JavaScript bundles. They are made using npm and can be considered blobs without accompanying source code. Also, after a quick look inside files that looked like actual non-minified sources, they are still concerning because they can download WebAssembly files from the Internet at runtime. --- 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 6fd5c24..82369dc 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 c572b11d9d112f534b2855e8825f81d6304fd3fd Mon Sep 17 00:00:00 2001 +From 14ce9b070ed943d21c663a2e53f15f9a2669c12b 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 @@ -22,29 +22,29 @@ If necessary, missing files can be added later. [1] https://remote-settings.readthedocs.io/en/latest/introduction.html [2] https://www.gnu.org/distros/free-system-distribution-guidelines.en.html#license-rules --- - browser/components/asrouter/bin/import-rollouts.js | 4 ++-- - .../components/ASRouterAdmin/ASRouterAdmin.jsx | 2 +- - .../components/asrouter/content/asrouter-admin.bundle.js | 2 +- - .../feature/search/telemetry/SerpTelemetryRepository.kt | 2 +- - .../support/remotesettings/RemoteSettingsClient.kt | 2 +- - .../support/remotesettings/RemoteSettingsClientTest.kt | 2 +- - .../docs/_posts/2018-08-10-fretboard.md | 2 +- - .../src/main/java/org/mozilla/fenix/components/Core.kt | 4 ++-- - .../org/mozilla/focus/telemetry/GleanMetricsService.kt | 4 ++-- - services/settings/Utils.sys.mjs | 2 +- - services/settings/docs/index.rst | 4 ++-- - .../periodic-updates/scripts/periodic_file_updates.sh | 2 +- - third_party/rust/remote_settings/.cargo-checksum.json | 2 +- - third_party/rust/remote_settings/src/client.rs | 2 +- - third_party/rust/remote_settings/src/config.rs | 6 +++--- - .../components/antitracking/docs/query-stripping/index.md | 2 +- - .../backgroundtasks/BackgroundTask_message.sys.mjs | 6 +++--- - toolkit/components/search/SearchUtils.sys.mjs | 8 ++++---- - toolkit/components/search/docs/DefaultSearchEngines.rst | 2 +- - .../components/search/docs/SearchEngineConfiguration.rst | 8 ++++---- - .../search/docs/SearchEngineConfigurationArchive.rst | 2 +- - toolkit/modules/AppConstants.sys.mjs | 4 ++-- - 22 files changed, 37 insertions(+), 37 deletions(-) + .../components/asrouter/bin/import-rollouts.js | 4 ++-- + .../components/ASRouterAdmin/ASRouterAdmin.jsx | 2 +- + .../asrouter/content/asrouter-admin.bundle.js | 2 +- + .../search/telemetry/SerpTelemetryRepository.kt | 2 +- + .../remotesettings/RemoteSettingsClient.kt | 2 +- + .../remotesettings/RemoteSettingsClientTest.kt | 2 +- + .../docs/_posts/2018-08-10-fretboard.md | 2 +- + .../java/org/mozilla/fenix/components/Core.kt | 4 ++-- + .../focus/telemetry/GleanMetricsService.kt | 4 ++-- + services/settings/Utils.sys.mjs | 2 +- + services/settings/docs/index.rst | 4 ++-- + .../scripts/periodic_file_updates.sh | 2 +- + .../rust/remote_settings/.cargo-checksum.json | 2 +- + third_party/rust/remote_settings/src/client.rs | 16 ++++++++-------- + third_party/rust/remote_settings/src/config.rs | 6 +++--- + .../antitracking/docs/query-stripping/index.md | 2 +- + .../BackgroundTask_message.sys.mjs | 6 +++--- + toolkit/components/search/SearchUtils.sys.mjs | 8 ++++---- + .../search/docs/DefaultSearchEngines.rst | 2 +- + .../search/docs/SearchEngineConfiguration.rst | 8 ++++---- + .../docs/SearchEngineConfigurationArchive.rst | 2 +- + toolkit/modules/AppConstants.sys.mjs | 4 ++-- + 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/browser/components/asrouter/bin/import-rollouts.js b/browser/components/asrouter/bin/import-rollouts.js index b8e4b3fff7..9cf2e7ebef 100644 @@ -69,10 +69,10 @@ index b8e4b3fff7..9cf2e7ebef 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 a5edd0c481..cb6e735cfc 100644 +index ab01b80e28..a528cd03ad 100644 --- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -@@ -816,7 +816,7 @@ export class ASRouterAdminInner extends React.PureComponent { +@@ -817,7 +817,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 206610282a..bac1763595 100644 +index c533a08d3a..5e07a26889 100644 --- a/browser/components/asrouter/content/asrouter-admin.bundle.js +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js @@ -1152,7 +1152,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P @@ -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 fcdc1ad20f..8403d64c0c 100644 +index 966a527fc9..2d567cb5a4 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 -@@ -676,7 +676,7 @@ class Core( +@@ -677,7 +677,7 @@ class Core( // collection name to fetch from server for SERP telemetry const val COLLECTION_NAME = "search-telemetry-v2" @@ -161,10 +161,10 @@ index fcdc1ad20f..8403d64c0c 100644 } } diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt -index b419f85faf..9a3fc984e2 100644 +index e4998c4050..1a0155cc75 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt -@@ -62,8 +62,8 @@ class GleanMetricsService(context: Context) : MetricsService { +@@ -61,8 +61,8 @@ class GleanMetricsService(context: Context) : MetricsService { const val COLLECTION_NAME = "search-telemetry-v2" // urls for prod and stage remote settings server @@ -207,56 +207,119 @@ index a834bb74a0..17c7f7b9cc 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 dd90445a30..7f3e878ca3 100755 +index cbd9e2d121..7051a59996 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -@@ -295,7 +295,7 @@ function compare_suffix_lists { - } - +@@ -403,7 +403,7 @@ function compare_suffix_lists { function compare_remote_settings_files { + # cd "${TOPSRCDIR}" + - REMOTE_SETTINGS_SERVER="https://firefox.settings.services.mozilla.com/v1" + REMOTE_SETTINGS_SERVER="resource://app/defaults/settings" # 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 edae407f85..a5396ba2c1 100644 +index 209a6a38e9..ff089f7b55 100644 --- a/third_party/rust/remote_settings/.cargo-checksum.json +++ b/third_party/rust/remote_settings/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"e607c012c7d59d412f2795ad83281d67fe373c9c10859ea2a35a48e3def02a1d","src/cache.rs":"9c16f17353730103d57132a0f055863b085d2d3eb3a78f6a6f8d095f897d0c0d","src/client.rs":"e70cbbdf8a739d6a60f588ad8cc4f127aedc3db08091ff76a43dd813424148f0","src/config.rs":"496299f100673fb862aaeffdec61173f5265779e8990ab326ac91a7270fab8cc","src/error.rs":"832b80cf4d2b4464f5824ed36a37726bc99535b28d4c5c384df22ef3b906b187","src/lib.rs":"baf2e1e47f2c059531f00320ff7715a7d84ddf7df5ad1c4ec7ec4f01bee92edf","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} +-{"files":{"Cargo.toml":"775c7ab83aec10eb748b46c9fe1b5c93ac299d735205d2e61c7049dcfbd33141","dumps/main/search-telemetry-v2.json":"1e3f49571183aa5db30c0877f0b291adb26ea7b81c04b16eac4f0320e9134a34","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"db588b7524ffc164c5870f93dfe8fb8d3168748af39d66405027b18c0ee7aca7","src/config.rs":"0294f122c76570c3df1de876289a6e70d0b03b4e8221a34ed7b893a377e68be1","src/error.rs":"f0cb9b7fa3e427c919b491f7864dd332365b2d0288be775064d115ef82311fc5","src/jexl_filter.rs":"e085f92b0ef9031106cf5d4999dbb19f467494c029f324b25d0098506b37b2e1","src/lib.rs":"16d9f3ca6336188df53410dcbe9afe6ac09a1be764ecd9094cfbec05512e7370","src/service.rs":"5445803fc9f768f6b40514bfb1add437baf6d868b67fc29a349dda70923c8b5f","src/storage.rs":"944c622c0ec7f32e0e9f6177abd4e01b7c6601f85b7c991f3752261119f87c84","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"e607c012c7d59d412f2795ad83281d67fe373c9c10859ea2a35a48e3def02a1d","src/cache.rs":"9c16f17353730103d57132a0f055863b085d2d3eb3a78f6a6f8d095f897d0c0d","src/client.rs":"b29ba1a84ec833e0a863587feedb181d594d1b0edacc4f07db5974c728790814","src/config.rs":"6893db5c9a2499aed911a276077928204f3f02ab4812bb1b78c2cdf396f53ccd","src/error.rs":"832b80cf4d2b4464f5824ed36a37726bc99535b28d4c5c384df22ef3b906b187","src/lib.rs":"baf2e1e47f2c059531f00320ff7715a7d84ddf7df5ad1c4ec7ec4f01bee92edf","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} ++{"files":{"Cargo.toml":"775c7ab83aec10eb748b46c9fe1b5c93ac299d735205d2e61c7049dcfbd33141","dumps/main/search-telemetry-v2.json":"1e3f49571183aa5db30c0877f0b291adb26ea7b81c04b16eac4f0320e9134a34","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"8cdfe19dc17837a7cc2109d7aa8f5b4cd3a16125b1917a0b0cd055684e777ebe","src/config.rs":"e0f896653941bf9d5229495b6b63aba9f8ba3315711a601298fc3d3f52a0a034","src/error.rs":"f0cb9b7fa3e427c919b491f7864dd332365b2d0288be775064d115ef82311fc5","src/jexl_filter.rs":"e085f92b0ef9031106cf5d4999dbb19f467494c029f324b25d0098506b37b2e1","src/lib.rs":"16d9f3ca6336188df53410dcbe9afe6ac09a1be764ecd9094cfbec05512e7370","src/service.rs":"5445803fc9f768f6b40514bfb1add437baf6d868b67fc29a349dda70923c8b5f","src/storage.rs":"944c622c0ec7f32e0e9f6177abd4e01b7c6601f85b7c991f3752261119f87c84","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs -index 8475b6689b..6839ae4cb2 100644 +index 1019f408f8..d67a47b621 100644 --- a/third_party/rust/remote_settings/src/client.rs +++ b/third_party/rust/remote_settings/src/client.rs -@@ -536,7 +536,7 @@ mod test { +@@ -961,7 +961,7 @@ mod test { }; let client = Client::new(config).unwrap(); assert_eq!( -- Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), -+ Url::parse("resource://app/defaults/settings").unwrap(), - client.base_url +- Url::parse("https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/the-collection").unwrap(), ++ Url::parse("resource://app/defaults/settings/main/the-collection.json").unwrap(), + client.endpoints.collection_url ); - assert_eq!(String::from("main"), client.bucket_name); + } +@@ -1799,7 +1799,7 @@ mod cached_data_tests { + let storage = Storage::new(":memory:".into())?; + + let collection_url = format!( +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", ++ "resource://app/defaults/settings/main/{}", + collection_name + ); + +@@ -1822,7 +1822,7 @@ mod cached_data_tests { + let api_client = MockApiClient::new(); + let storage = Storage::new(":memory:".into())?; + +- let collection_url = "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-telemetry-v2"; ++ let collection_url = "resource://app/defaults/settings/main/collections/search-telemetry-v2.json"; + + // First get the packaged data to know its timestamp + let rs_client = +@@ -1885,7 +1885,7 @@ mod cached_data_tests { + let storage = Storage::new(":memory:".into())?; + + let collection_url = format!( +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", ++ "resource://app/defaults/settings/main/{}", + collection_name + ); + +@@ -1942,7 +1942,7 @@ mod cached_data_tests { + let storage = Storage::new(":memory:".into())?; + + let collection_url = format!( +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", ++ "resource://app/defaults/settings/main/{}", + collection_name + ); + +@@ -1974,7 +1974,7 @@ mod cached_data_tests { + let mut storage = Storage::new(":memory:".into())?; + + let collection_url = format!( +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", ++ "resource://app/defaults/settings/main/{}", + collection_name + ); + +@@ -2016,7 +2016,7 @@ mod cached_data_tests { + let mut storage = Storage::new(":memory:".into())?; + + let collection_url = format!( +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", ++ "resource://app/defaults/settings/main/{}", + collection_name + ); + +@@ -2048,7 +2048,7 @@ mod cached_data_tests { + let mut storage = Storage::new(":memory:".into())?; + + let collection_url = format!( +- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", ++ "resource://app/defaults/settings/main/{}", + collection_name + ); + diff --git a/third_party/rust/remote_settings/src/config.rs b/third_party/rust/remote_settings/src/config.rs -index f4029e5bc6..6405328481 100644 +index 7540f9e508..0fdce0095e 100644 --- a/third_party/rust/remote_settings/src/config.rs +++ b/third_party/rust/remote_settings/src/config.rs -@@ -51,9 +51,9 @@ impl RemoteSettingsServer { +@@ -66,9 +66,9 @@ impl RemoteSettingsServer { /// inside the crate. - pub(crate) fn get_url(&self) -> Result { + pub fn get_url(&self) -> Result { Ok(match self { -- Self::Prod => Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), -- Self::Stage => Url::parse("https://firefox.settings.services.allizom.org").unwrap(), -- Self::Dev => Url::parse("https://remote-settings-dev.allizom.org").unwrap(), -+ Self::Prod => Url::parse("resource://app/defaults/settings").unwrap(), -+ Self::Stage => Url::parse("resource://app/defaults/settings").unwrap(), -+ Self::Dev => Url::parse("resource://app/defaults/settings").unwrap(), - Self::Custom { url } => Url::parse(url)?, - }) - } +- Self::Prod => Url::parse("https://firefox.settings.services.mozilla.com/v1")?, +- Self::Stage => Url::parse("https://firefox.settings.services.allizom.org/v1")?, +- Self::Dev => Url::parse("https://remote-settings-dev.allizom.org/v1")?, ++ Self::Prod => Url::parse("resource://app/defaults/settings")?, ++ Self::Stage => Url::parse("resource://app/defaults/settings")?, ++ Self::Dev => Url::parse("resource://app/defaults/settings")?, + Self::Custom { url } => { + let mut url = Url::parse(url)?; + // Custom URLs are weird and require a couple tricks for backwards compatibility. diff --git a/toolkit/components/antitracking/docs/query-stripping/index.md b/toolkit/components/antitracking/docs/query-stripping/index.md index e49d8513ba..c1c6ae5deb 100644 --- a/toolkit/components/antitracking/docs/query-stripping/index.md @@ -295,10 +358,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 d7c5c05cb5..b2e4dd3f6c 100644 +index 005ad9cce2..35ea0c2cec 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -162,13 +162,13 @@ export var SearchUtils = { +@@ -163,13 +163,13 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -354,10 +417,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 a20e45c613..6c200784fe 100644 +index 224048c55f..7772d4699d 100644 --- a/toolkit/modules/AppConstants.sys.mjs +++ b/toolkit/modules/AppConstants.sys.mjs -@@ -390,9 +390,9 @@ export var AppConstants = Object.freeze({ +@@ -399,9 +399,9 @@ export var AppConstants = Object.freeze({ REMOTE_SETTINGS_SERVER_URL: #ifdef MOZ_THUNDERBIRD @@ -370,10 +433,10 @@ index a20e45c613..6c200784fe 100644 REMOTE_SETTINGS_VERIFY_SIGNATURE: -- -2.47.0 +2.47.1 -From 23be7658779a5d1cab0e1f0c146420395b99f6f8 Mon Sep 17 00:00:00 2001 +From 2b1f4b183d1bec9c98a0fa87a1c28a6d2b435150 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 +505,10 @@ index 7a5530abd2..e17f1b5b5b 100644 }, }; -- -2.47.0 +2.47.1 -From eeae799a1b5ab7d9b167ee8010cedadebc6b56bc Mon Sep 17 00:00:00 2001 +From 5f909f9b336821c4e194b610eabc1c2809a49358 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 +549,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.47.0 +2.47.1 -From 1352df7a424eeceec577ae53660ef06337608693 Mon Sep 17 00:00:00 2001 +From 0672b94563afd9efc18b8e7fd6075e612005dd3c 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 +649,10 @@ index a3e9e9b3f2..b32a8d8691 100644 ] -- -2.47.0 +2.47.1 -From fe166bca96785e408782eeea77d9083e9b7e599a Mon Sep 17 00:00:00 2001 +From 173455fd3cb83b8bf521c9365ea14d0cc4fe75b7 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 +685,10 @@ index d5dfe84823..7fcb28863d 100644 }, -- -2.47.0 +2.47.1 -From b209bdae1c54577442378773790770dd7c1f4150 Mon Sep 17 00:00:00 2001 +From de6783ae80945936a47be9c00baee712cf05e3cf 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 +739,10 @@ index 1eeaf0bed9..d998a2d3b1 100644 /** -- -2.47.0 +2.47.1 -From 0f02e4174404f1b43f3359ab9d630b3d7c78823e Mon Sep 17 00:00:00 2001 +From 796032cfd72b9515efa8208cfbb44ade2328733c 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 +885,10 @@ index 7e98e6d5b3..64a592e055 100644 remoteRecords, }; -- -2.47.0 +2.47.1 -From 8b6f8dfd7bf32488e1f17312c483b7f1de55d4c3 Mon Sep 17 00:00:00 2001 +From 836cfa9cf69fde52e167297e95b34dfe762fb319 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 +990,10 @@ index 64a592e055..371f58bfd4 100644 * Synchronize the local database with the remote server. * -- -2.47.0 +2.47.1 -From 4346c63a3cd1312424fb79dcbce912b64c97357a Mon Sep 17 00:00:00 2001 +From 25b80ceca5997949ce288c2f38a10d309058ae4d 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 +1039,10 @@ index 371f58bfd4..3119d5b33d 100644 } } else { -- -2.47.0 +2.47.1 -From 2c094c83de139f3f0d1ab8e43fc8e5b376286c3f Mon Sep 17 00:00:00 2001 +From 3b8b0d19220f10f19ab2a6bc886fa9473fe7c3dc 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 +1104,10 @@ index 3119d5b33d..c26e81ce0a 100644 * Fetch information from changeset endpoint. * -- -2.47.0 +2.47.1 -From 8330c0202a34df1b2c33ca5cbaacf449e2a29480 Mon Sep 17 00:00:00 2001 +From a78e9320ea4daff0657085a2eae399e6f8d7d99f 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 +1141,10 @@ index c26e81ce0a..65b3393946 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.47.0 +2.47.1 -From 56ea078c21cd355e9a01c8f901a105c9985b1ebf Mon Sep 17 00:00:00 2001 +From 64dd2c01617e761a39289625bd26a63a06de1822 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 @@ -1178,10 +1241,10 @@ index 9982c27661..00c1491ea5 100644 /** -- -2.47.0 +2.47.1 -From f93a08be54f24a2cf9a1cf8693e3682288a34564 Mon Sep 17 00:00:00 2001 +From 2158c04655be16d80ab1e6b8324c10b091a2a417 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 @@ -1206,10 +1269,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 72202ac640..1d9c6f97f7 100644 +index 229a88cb12..ca5bb32afd 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -15778,7 +15778,7 @@ +@@ -15922,7 +15922,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -1219,10 +1282,10 @@ index 72202ac640..1d9c6f97f7 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 ed15648dae..0ac4762d11 100644 +index 8c0205a5ec..67b7cba763 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1142,6 +1142,7 @@ void nsNSSComponent::setValidationOptions( +@@ -1161,6 +1161,7 @@ void nsNSSComponent::setValidationOptions( CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled; CRLiteMode crliteMode = static_cast(StaticPrefs::security_pki_crlite_mode()); @@ -1231,5 +1294,5 @@ index ed15648dae..0ac4762d11 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.47.0 +2.47.1 diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index ffd5f9f..e76df02 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -1,4 +1,4 @@ -From 37eb9d2476e34d2257b47121272719bec47ec085 Mon Sep 17 00:00:00 2001 +From e04ab3a4309a77b733daba6ae892c110fa2f2154 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/8] 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 1d9c6f97f7..01834a43c0 100644 +index cc0b07a00c..c457c2ad4f 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -5849,7 +5849,7 @@ +@@ -5902,7 +5902,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool @@ -36,10 +36,10 @@ index 1d9c6f97f7..01834a43c0 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 56792b9fb6..6f54f18bb3 100644 +index f0250a901d..1f70818695 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3177,7 +3177,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3184,7 +3184,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // @@ -49,10 +49,10 @@ index 56792b9fb6..6f54f18bb3 100644 // Timeout to wait before sending the location request. pref("geo.provider.network.timeToWaitBeforeSending", 5000); -- -2.47.0 +2.47.1 -From 8bdc1c32e2b24200087cd0f1f3e96173e0b3e39a Mon Sep 17 00:00:00 2001 +From 38a116ac6807ed2c1eae8b4f165d2a8629fa0e4e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/8] Disable banners and remove URLs for mobile apps on @@ -63,10 +63,10 @@ Subject: [PATCH 2/8] 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 5f11546d69..2d9aec2570 100644 +index 1db5c83a56..5a4ed7e5c4 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2295,7 +2295,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); +@@ -2308,7 +2308,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 5f11546d69..2d9aec2570 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 -@@ -2325,7 +2325,7 @@ pref("browser.promo.pin.enabled", true); +@@ -2338,7 +2338,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 5f11546d69..2d9aec2570 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"); -@@ -2336,12 +2336,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi +@@ -2349,12 +2349,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 5f11546d69..2d9aec2570 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.47.0 +2.47.1 -From 7c3240b667a42cb53debc0be7f67d81e15963c81 Mon Sep 17 00:00:00 2001 +From 354f06ed9abb219a7f3047003b21ac6d5173c730 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 3/8] Remove some references to AMO @@ -145,7 +145,7 @@ Subject: [PATCH 3/8] 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 2d9aec2570..95426bd0e3 100644 +index 5a4ed7e5c4..24242b713e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -22,7 +22,7 @@ @@ -338,7 +338,7 @@ index b7f65feb7d..f82c8efa8c 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 444de27389..8122b65896 100644 +index 3eda92e954..44eb232edd 100644 --- a/mobile/android/fenix/app/build.gradle +++ b/mobile/android/fenix/app/build.gradle @@ -83,7 +83,7 @@ android { @@ -351,7 +351,7 @@ index 444de27389..8122b65896 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 6f54f18bb3..93f920447c 100644 +index 1f70818695..5cee788c0b 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1815,8 +1815,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% @@ -365,7 +365,7 @@ index 6f54f18bb3..93f920447c 100644 // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -3240,7 +3240,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); +@@ -3247,7 +3247,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 6f54f18bb3..93f920447c 100644 // The URL for the privacy policy related to recommended add-ons. pref("extensions.recommendations.privacyPolicyUrl", ""); -- -2.47.0 +2.47.1 -From baa86275445a3583a130b1f9449e1c05b6fe1300 Mon Sep 17 00:00:00 2001 +From 660e8b1da4ab55d0bd863356ae6bfd4ddd08638c Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Jun 2023 13:16:40 +0200 Subject: [PATCH 4/8] 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 95426bd0e3..442aac2c4a 100644 +index 24242b713e..383e5490dd 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 95426bd0e3..442aac2c4a 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. -@@ -1736,8 +1736,8 @@ pref("browser.topsites.component.enabled", false); +@@ -1749,8 +1749,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 95426bd0e3..442aac2c4a 100644 // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile. pref("browser.topsites.contile.sov.enabled", true); -- -2.47.0 +2.47.1 -From b6553c97eb31cd3ab1afedaa90f2016ee900c873 Mon Sep 17 00:00:00 2001 +From d50df9cd0f3141fbbe3c77214053d9b2015a76d9 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 26 Sep 2023 21:27:34 +0200 Subject: [PATCH 5/8] 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 442aac2c4a..c222ebcd89 100644 +index 383e5490dd..9bf266e51a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2157,7 +2157,7 @@ pref("browser.translation.neverForLanguages", ""); +@@ -2170,7 +2170,7 @@ pref("browser.translation.neverForLanguages", ""); // Enable Firefox translations powered by the Bergamot translations // engine https://browser.mt/. @@ -490,10 +490,10 @@ index 442aac2c4a..c222ebcd89 100644 // Enable the new Firefox Translations Settings UI Design pref("browser.translations.newSettingsUI.enable", false); -- -2.47.0 +2.47.1 -From efacd0a1c5a05317732cc58bb81d3c19e1aa0555 Mon Sep 17 00:00:00 2001 +From 800cd0ce28ba7f7ec8e5f3af2fe7ba84dd7fef20 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 12 Jun 2024 00:17:17 +0200 Subject: [PATCH 6/8] Remove some references to Pocket and disable @@ -508,40 +508,40 @@ 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 +- + .../CardGrid/CardGrid.jsx | 5 +--- + .../DSImage/DSImage.jsx | 4 +-- .../DSLinkMenu/DSLinkMenu.jsx | 2 +- .../DSSignup/DSSignup.jsx | 2 +- .../SafeAnchor/SafeAnchor.jsx | 2 +- - .../TopicsWidget/TopicsWidget.jsx | 6 +-- - .../PocketLoggedInCta/PocketLoggedInCta.jsx | 4 +- - .../docs/v2-system-addon/preferences.md | 4 +- - .../newtab/lib/ActivityStream.sys.mjs | 20 ++++----- - .../newtab/lib/DiscoveryStreamFeed.sys.mjs | 42 ++----------------- - .../newtab/lib/SectionsManager.sys.mjs | 4 +- - .../newtab/lib/TopSitesFeed.sys.mjs | 4 +- + .../TopicsWidget/TopicsWidget.jsx | 6 ++-- + .../PocketLoggedInCta/PocketLoggedInCta.jsx | 4 +-- + .../docs/v2-system-addon/preferences.md | 4 +-- + .../newtab/lib/ActivityStream.sys.mjs | 20 ++++++------- + .../newtab/lib/DiscoveryStreamFeed.sys.mjs | 15 ++-------- + .../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 ++-- - .../pocket/spocs/api/SpocsEndpointRaw.kt | 4 +- + .../components/pocket/content/pktApi.sys.mjs | 7 ++--- + .../pocket/spocs/api/SpocsEndpointRaw.kt | 4 +-- .../pocket/stories/api/PocketEndpointRaw.kt | 2 +- - .../fenix/home/fake/FakeHomepagePreview.kt | 11 ----- + .../fenix/home/fake/FakeHomepagePreview.kt | 11 -------- .../pocket/ui/PocketStoriesComposables.kt | 2 +- - .../mozilla/fenix/settings/SupportUtils.kt | 28 ++++++------- + .../mozilla/fenix/settings/SupportUtils.kt | 28 ++++++++----------- toolkit/modules/NewTabUtils.sys.mjs | 3 +- - 27 files changed, 61 insertions(+), 135 deletions(-) + 27 files changed, 60 insertions(+), 109 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index c222ebcd89..463c041837 100644 +index 9bf266e51a..9fb61957b7 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1946,7 +1946,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.locale-thu +@@ -1959,7 +1959,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) @@ -550,7 +550,7 @@ index c222ebcd89..463c041837 100644 // The pref controls if search hand-off is enabled for Activity Stream. pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", true); -@@ -2507,13 +2507,14 @@ pref("browser.migrate.interactions.passwords", false); +@@ -2534,13 +2534,14 @@ pref("browser.migrate.interactions.passwords", false); pref("browser.migrate.preferences-entrypoint.enabled", true); @@ -572,10 +572,10 @@ index c222ebcd89..463c041837 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 469c2455ca..f4f5ec47e6 100644 +index b9a304a9f4..6a66c91d4c 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"; +@@ -23,7 +23,6 @@ import { CardSections } from "../DiscoveryStreamComponents/CardSections/CardSect const ALLOWED_CSS_URL_PREFIXES = [ "chrome://", "resource://", @@ -584,10 +584,10 @@ index 469c2455ca..f4f5ec47e6 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 fa8729373f..0dfeb8d26d 100644 +index 86ae3a6d8e..ab383beba9 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -@@ -236,9 +236,6 @@ export function RecentSavesContainer({ +@@ -237,9 +237,6 @@ export function RecentSavesContainer({ function renderCard(rec, index) { const url = new URL(rec.url); const urlSearchParams = new URLSearchParams(queryParams); @@ -597,7 +597,7 @@ index fa8729373f..0dfeb8d26d 100644 for (let [key, val] of urlSearchParams.entries()) { url.searchParams.set(key, val); -@@ -310,7 +307,7 @@ export function RecentSavesContainer({ +@@ -311,7 +308,7 @@ export function RecentSavesContainer({ = diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt -index 4f8e14555c..e4d4054193 100644 +index 74f5acfc98..e4a4038e33 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt -@@ -296,7 +296,7 @@ fun PocketStories( - text = stringResource(R.string.pocket_stories_placeholder_text), - backgroundColor = backgroundColor, - ) { -- onDiscoverMoreClicked("https://getpocket.com/explore?$POCKET_FEATURE_UTM_KEY_VALUE") -+ onDiscoverMoreClicked("") +@@ -298,7 +298,7 @@ fun PocketStories( + text = stringResource(R.string.pocket_stories_placeholder_text), + backgroundColor = backgroundColor, + ) { +- onDiscoverMoreClicked("https://getpocket.com/explore?$POCKET_FEATURE_UTM_KEY_VALUE") ++ onDiscoverMoreClicked("") + } } - } else if (story is PocketRecommendedStory) { - PocketStory( + diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt index 1a8a1426a1..33b2950e09 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -1139,10 +1112,10 @@ index 4fb4c7f912..f6fc55c2ee 100644 * @param {Object} aOptions * {int} numItems: The max number of pocket items to fetch -- -2.47.0 +2.47.1 -From f821576f66271fd5c11dd2869a6aaed3bea52c0b Mon Sep 17 00:00:00 2001 +From db36922d516c3a0764b6f8a7ed7f41403eeb38ee Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 15 Sep 2024 19:19:31 +0200 Subject: [PATCH 7/8] Disable experimental Machine Learning support @@ -1168,23 +1141,26 @@ 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/api.rst | 2 +- - toolkit/components/ml/docs/models.rst | 2 +- - toolkit/components/ml/tests/browser/browser_ml_cache.js | 6 +++--- - 5 files changed, 7 insertions(+), 7 deletions(-) + modules/libpref/init/all.js | 3 +- + .../ml/content/EngineProcess.sys.mjs | 11 +--- + .../components/ml/content/ModelHub.sys.mjs | 2 +- + toolkit/components/ml/docs/api.rst | 52 +-------------- + toolkit/components/ml/docs/models.rst | 2 +- + .../ml/tests/browser/browser_ml_cache.js | 2 +- + .../ml/tests/browser/browser_ml_utils.js | 65 ------------------- + 7 files changed, 9 insertions(+), 128 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 93f920447c..4ef791b22f 100644 +index 5cee788c0b..8fa82fe672 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3763,11 +3763,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); +@@ -3768,12 +3768,13 @@ pref("browser.translations.chaos.timeoutMS", 0); + #ifdef NIGHTLY_BUILD + pref("browser.ml.enable", true); + #else ++ // Add dummy comment for the patch to fail once the preference below is set to true + pref("browser.ml.enable", false); + #endif // 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. @@ -1192,21 +1168,47 @@ index 93f920447c..4ef791b22f 100644 +pref("browser.ml.modelHubRootUrl", "https://localhost/"); // Model URL template pref("browser.ml.modelHubUrlTemplate", "{model}/{revision}"); - // Maximum disk size for ML model cache (in bytes) + // Maximum disk size for ML model cache (in GiB) +diff --git a/toolkit/components/ml/content/EngineProcess.sys.mjs b/toolkit/components/ml/content/EngineProcess.sys.mjs +index 77a0b3f32d..cd8f55023c 100644 +--- a/toolkit/components/ml/content/EngineProcess.sys.mjs ++++ b/toolkit/components/ml/content/EngineProcess.sys.mjs +@@ -98,17 +98,12 @@ class PipelineOptionsValidationError extends Error { + * @enum {string} + */ + export const ModelHub = { +- HUGGINGFACE: "huggingface", +- MOZILLA: "mozilla", ++ LOCALHOST: "localhost", + + apply(options, hub) { + switch (hub) { +- case ModelHub.HUGGINGFACE: +- options.modelHubRootUrl = "https://huggingface.co/"; +- options.modelHubUrlTemplate = "{model}/resolve/{revision}"; +- break; +- case ModelHub.MOZILLA: +- options.modelHubRootUrl = "https://model-hub.mozilla.org/"; ++ case ModelHub.LOCALHOST: ++ options.modelHubRootUrl = "https://localhost/"; + options.modelHubUrlTemplate = "{model}/{revision}"; + break; + default: diff --git a/toolkit/components/ml/content/ModelHub.sys.mjs b/toolkit/components/ml/content/ModelHub.sys.mjs -index 7dc055bbf7..75ad8003ae 100644 +index b0bc5577ef..03e980bdf8 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 = [ +@@ -57,7 +57,7 @@ XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "DEFAULT_ROOT_URL", + "browser.ml.modelHubRootUrl", +- "https://model-hub.mozilla.org/" ++ "https://localhost/" + ); + + const ONE_GIB = 1024 * 1024 * 1024; diff --git a/toolkit/components/ml/docs/api.rst b/toolkit/components/ml/docs/api.rst -index e5bf2eb14c..40983c0667 100644 +index ac7cf839fe..db54695ae9 100644 --- a/toolkit/components/ml/docs/api.rst +++ b/toolkit/components/ml/docs/api.rst @@ -43,7 +43,7 @@ To get access to the full toolbox, set the **devtools.debugger.remote-enabled** @@ -1218,6 +1220,70 @@ index e5bf2eb14c..40983c0667 100644 which contains a curated list of models. Available Options +@@ -112,13 +112,6 @@ Each record comes with the following fields: + + When the API is about to fetch a file, its URL is controlled in the allow/deny list. + +-Examples of patterns: +- +-- ALL models ALL VERSIONS from the mozilla organization on hugging face : https://huggingface.co/Mozilla/ +-- ALL models ALL VERSIONS from our hub: https://model-hub.mozilla.org/ +-- A specific model ALL VERSIONS https://huggingface.co/typeform/distilbert-base-uncased-mnli/ +-- A specific model and a specific version https://huggingface.co/Mozilla/distilvit/blob/v0.5.0/ +- + Each URL is tested and needs to be included in the allowlist and not in the denylist + + To bypass this check and allow Firefox to download any file for runnings models, +@@ -128,49 +121,6 @@ If you want to add a new hub, organization or a specific model, ask us by + `opening a ticket `_. + + +-Using the Hugging Face model hub +-:::::::::::::::::::::::::::::::: +- +-By default, the engine will use the Mozilla model hub. You will need to pass `huggingface` as `modelHub`. +- +-The inference engine will then look for models in the Hugging Face model hub. If the URL is +-not allowed (see previous section) and you still want to experiment with the model, +-use `MOZ_ALLOW_EXTERNAL_ML_HUB`. +- +-To run against a Hugging Face model, visit `this page `_ and select on +-the top left corner `tasks`. You can pick a task and then choose a model. +- +-For example, models for the `summarization` tasks compatible with our inference engine are listed `here `_. +- +-Let's say you want to pick the `Xenova/distilbart-cnn-6-6` model. All you have to do is use the id when calling our +-`createEngine` pipeline: +- +-.. code-block:: javascript +- +- const { createEngine } = ChromeUtils.importESModule("chrome://global/content/ml/EngineProcess.sys.mjs"); +- +- const options = { +- taskName: "summarization", +- modelId: "Xenova/distilbart-cnn-6-6", +- modelHub: "huggingface" +- }; +- +- const engine = await createEngine(options); +- +- const text = 'The tower is 324 metres (1,063 ft) tall, about the same height as an 81-storey building, ' + +- 'and the tallest structure in Paris. Its base is square, measuring 125 metres (410 ft) on each side. ' + +- 'During its construction, the Eiffel Tower surpassed the Washington Monument to become the tallest ' + +- 'man-made structure in the world, a title it held for 41 years until the Chrysler Building in New ' + +- 'York City was finished in 1930. It was the first structure to reach a height of 300 metres. Due to ' + +- 'the addition of a broadcasting aerial at the top of the tower in 1957, it is now taller than the ' + +- 'Chrysler Building by 5.2 metres (17 ft). Excluding transmitters, the Eiffel Tower is the second ' + +- 'tallest free-standing structure in France after the Millau Viaduct.'; +- +- const request = { args: [text], options: { max_new_tokens: 100 } }; +- const res = await engine.run(request); +- console.log(res[0]["summary_text"]); +- +- + Running the internal APIs + ::::::::::::::::::::::::: + diff --git a/toolkit/components/ml/docs/models.rst b/toolkit/components/ml/docs/models.rst index 3f339c2e1a..4501388a73 100644 --- a/toolkit/components/ml/docs/models.rst @@ -1232,38 +1298,133 @@ index 3f339c2e1a..4501388a73 100644 Where: - `organization` and `name` are the model id. example " `mozilla/distivit`" diff --git a/toolkit/components/ml/tests/browser/browser_ml_cache.js b/toolkit/components/ml/tests/browser/browser_ml_cache.js -index 4d69a43cd5..db4dda7f24 100644 +index 81fc266d42..39aaa26186 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 createRandomBlob(blockSize = 8, count = 1) { -@@ -77,7 +77,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", - ]; - +@@ -55,7 +55,7 @@ function createBlob(size = 8) { + */ + add_task(async function test_allow_external_ml_hub() { + Services.env.set("MOZ_ALLOW_EXTERNAL_ML_HUB", "1"); +- new ModelHub({ rootUrl: "https://huggingface.co" }); ++ new ModelHub({ rootUrl: "https://localhost" }); + Services.env.set("MOZ_ALLOW_EXTERNAL_ML_HUB", ""); + }); + +diff --git a/toolkit/components/ml/tests/browser/browser_ml_utils.js b/toolkit/components/ml/tests/browser/browser_ml_utils.js +index 5d8c5e2096..37d0be7f1e 100644 +--- a/toolkit/components/ml/tests/browser/browser_ml_utils.js ++++ b/toolkit/components/ml/tests/browser/browser_ml_utils.js +@@ -449,21 +449,6 @@ add_task(async function test_ml_utils_model_to_response() { + add_task(async function testURLChecker() { + // Example of result from remote settings + const list = [ +- { filter: "ALLOW", urlPrefix: "https://huggingface.co/mozilla/" }, +- { filter: "ALLOW", urlPrefix: "https://model-hub.mozilla.org/" }, +- { +- filter: "ALLOW", +- urlPrefix: +- "https://huggingface.co/typeform/distilbert-base-uncased-mnli/", +- }, +- { +- filter: "ALLOW", +- urlPrefix: "https://huggingface.co/mozilla/distilvit/blob/v0.5.0/", +- }, +- { +- filter: "DENY", +- urlPrefix: "https://huggingface.co/mozilla/restricted-model", +- }, + { + filter: "ALLOW", + urlPrefix: "https://localhost:8080/myhub", +@@ -474,29 +459,6 @@ add_task(async function testURLChecker() { + + // Test cases + const testCases = [ +- { +- url: "https://huggingface.co/mozilla/", +- expected: { allowed: true, rejectionType: RejectionType.NONE }, +- description: +- "Allows all models and versions from Mozilla on Hugging Face", +- }, +- { +- url: "https://huggingface.co/mozilla/distilvit/blob/v0.5.0/", +- expected: { allowed: true, rejectionType: RejectionType.NONE }, +- description: +- "Allows a specific model and version from Mozilla on Hugging Face", +- }, +- { +- url: "https://huggingface.co/mozilla/restricted-model", +- expected: { allowed: false, rejectionType: RejectionType.DENIED }, +- description: +- "Denies a specific restricted model from Mozilla on Hugging Face", +- }, +- { +- url: "https://model-hub.mozilla.org/some-model", +- expected: { allowed: true, rejectionType: RejectionType.NONE }, +- description: "Allows any model from Mozilla's model hub", +- }, + { + url: "https://my.cool.hub/", + expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, +@@ -507,12 +469,6 @@ add_task(async function testURLChecker() { + expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, + description: "Denies access to a subdomain of an approved domain", + }, +- { +- url: "https://model-hub.mozilla.org.evil.com", +- expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, +- description: +- "Denies access to URL with allowed domain as a subdomain in another domain", +- }, + { + url: "httpsz://localhost/myhub", + expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, +@@ -523,28 +479,12 @@ add_task(async function testURLChecker() { + expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, + description: "Denies access to URL with trailing dot in domain", + }, +- { +- url: "https://user@huggingface.co/mozilla/", +- expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, +- description: "Denies access to URL with user info", +- }, + { + url: "ftp://localhost/myhub/", + expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, + description: + "Denies access to URL with disallowed scheme but allowed host", + }, +- { +- url: "https://model-hub.mozilla.org.hack/", +- expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, +- description: "Denies access to domain containing an allowed domain", +- }, +- { +- url: "https:///huggingface.co/mozilla/", +- expected: { allowed: false, rejectionType: RejectionType.DISALLOWED }, +- description: +- "Denies access to URL with triple slashes, just type correctly", +- }, + { + url: "https://localhost:8080/myhub", + expected: { allowed: true, rejectionType: RejectionType.NONE }, +@@ -555,11 +495,6 @@ add_task(async function testURLChecker() { + expected: { allowed: true, rejectionType: RejectionType.NONE }, + description: "Allows access to URL with HTTP scheme on localhost", + }, +- { +- url: "https://model-hub.mozilla.org/", +- expected: { allowed: true, rejectionType: RejectionType.NONE }, +- description: "Allows access to Mozilla's approved model hub URL", +- }, + { + url: "chrome://gre/somewhere/in/the/code/base", + expected: { allowed: true, rejectionType: RejectionType.NONE }, -- -2.47.0 +2.47.1 -From d91c106c77b64f28a12b1856be9e381252d30bbc Mon Sep 17 00:00:00 2001 +From 0634dd1cdb0873c2f02a42d853f457c3b3f75b31 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Mon, 16 Sep 2024 01:49:27 +0200 Subject: [PATCH 8/8] Wipe Merino hostname, disable Weather & Yelp @@ -1279,13 +1440,15 @@ 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(-) + .../api/ContentRecommendationEndpointRaw.kt | 5 +---- + .../api/ContentRecommendationsResponse.kt | 6 ------ + 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 463c041837..0584a54fa7 100644 +index 9fb61957b7..66f7dc9297 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -468,7 +468,7 @@ pref("browser.urlbar.weather.minKeywordLength", 0); +@@ -479,7 +479,7 @@ pref("browser.urlbar.weather.minKeywordLength", 0); // If `browser.urlbar.weather.featureGate` is true, this controls whether // weather suggestions are turned on. @@ -1294,7 +1457,7 @@ index 463c041837..0584a54fa7 100644 // If `browser.urlbar.trending.featureGate` is true, this controls whether // trending suggestions are turned on. -@@ -645,7 +645,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); +@@ -656,7 +656,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); pref("browser.urlbar.groupLabels.enabled", true); // The Merino endpoint URL, not including parameters. @@ -1303,7 +1466,7 @@ index 463c041837..0584a54fa7 100644 // Timeout for Merino fetches (ms). pref("browser.urlbar.merino.timeoutMs", 200); -@@ -668,10 +668,10 @@ pref("browser.urlbar.suggest.addons", true); +@@ -679,10 +679,10 @@ pref("browser.urlbar.suggest.addons", true); // If `browser.urlbar.mdn.featureGate` is true, this controls whether // mdn suggestions are turned on. @@ -1316,7 +1479,7 @@ index 463c041837..0584a54fa7 100644 // 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. -@@ -686,7 +686,7 @@ pref("browser.urlbar.yelp.mlEnabled", false); +@@ -697,7 +697,7 @@ pref("browser.urlbar.yelp.mlEnabled", false); // If `browser.urlbar.yelp.featureGate` is true, this controls whether // Yelp suggestions are turned on. @@ -1325,7 +1488,7 @@ index 463c041837..0584a54fa7 100644 // Feature gate pref for Fakespot suggestions in the urlbar. pref("browser.urlbar.fakespot.featureGate", false); -@@ -1756,7 +1756,7 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); +@@ -1769,7 +1769,7 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/"); // Weather widget for newtab @@ -1334,7 +1497,7 @@ index 463c041837..0584a54fa7 100644 pref("browser.newtabpage.activity-stream.weather.query", ""); pref("browser.newtabpage.activity-stream.weather.display", "simple"); -@@ -1764,10 +1764,10 @@ pref("browser.newtabpage.activity-stream.weather.display", "simple"); +@@ -1777,10 +1777,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. @@ -1347,9 +1510,9 @@ index 463c041837..0584a54fa7 100644 // Preference to enable wallpaper selection in the Customize Menu of new tab page pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", true); -@@ -1908,7 +1908,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.contextualContent.local - // List of regions that get contextual content by default- TODO: update once development is closer to being finished - pref("browser.newtabpage.activity-stream.discoverystream.contextualContent.region-content-config", ""); +@@ -1921,7 +1921,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.sections.locale-content + pref("browser.newtabpage.activity-stream.discoverystream.sections.region-content-config", ""); + -pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoint", "merino.services.mozilla.com"); +pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoint", ""); @@ -1357,10 +1520,10 @@ index 463c041837..0584a54fa7 100644 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 1ec240db32..caa51d8f0d 100644 +index ede4188ff3..06f2ac5e59 100644 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs -@@ -184,7 +184,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ +@@ -187,7 +187,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ ["merino.clientVariants", ""], // The Merino endpoint URL, not including parameters. @@ -1370,18 +1533,65 @@ index 1ec240db32..caa51d8f0d 100644 // 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 69d4545caa..bd70a5a368 100644 +index 03363e67e8..9f5b694d45 100644 --- a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs +++ b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs -@@ -78,7 +78,7 @@ const WEATHER_SUGGESTION = { - const GEOLOCATION_DATA = { - provider: "geolocation", - title: "", -- url: "https://merino.services.mozilla.com/", -+ url: "", - is_sponsored: false, - score: 0, - custom_details: { +@@ -163,7 +163,7 @@ class _MerinoTestUtils { + return { + provider: "geolocation", + title: "", +- url: "https://merino.services.mozilla.com/", ++ url: "", + is_sponsored: false, + score: 0, + custom_details: { +diff --git a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt +index 3dbb410a23..3d6fb8abc0 100644 +--- a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt ++++ b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt +@@ -19,7 +19,7 @@ import org.json.JSONObject + + @VisibleForTesting + internal const val ENDPOINT_URL = +- "https://merino.services.mozilla.com/api/v1/curated-recommendations" ++ "" + + @VisibleForTesting + internal const val REQUEST_BODY_LOCALE_KEY = "locale" +@@ -37,9 +37,6 @@ internal const val REQUEST_BODY_TOPICS_KEY = "topics" + * Performs requests to the retrieve the content recommendations from the [endpointURL] server + * with the provided [config]. + * +- * See https://merino.services.mozilla.com/docs#/default/curated_content_api_v1_curated_recommendations_post +- * for documentation of the API endpoint. +- * + * @see [newInstance] to retrieve an instance. + * + * @property client The [Client] used for interacting with the content recommendations HTTP API. +diff --git a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationsResponse.kt b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationsResponse.kt +index 952b1b7b6e..8f48886551 100644 +--- a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationsResponse.kt ++++ b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationsResponse.kt +@@ -9,9 +9,6 @@ import kotlinx.serialization.Serializable + /** + * The content recommendation payload response. + * +- * This should follow the response schema in +- * https://merino.services.mozilla.com/docs#/default/curated_content_api_v1_curated_recommendations_post. +- * + * @property recommendedAt A timestamp indicating when the content recommendations was recommended. + * @property data A list of [ContentRecommendationResponseItem] from the response payload. + */ +@@ -24,9 +21,6 @@ internal data class ContentRecommendationsResponse( + /** + * A content recommendation item in the payload response. + * +- * This should follow the items schema in +- * https://merino.services.mozilla.com/docs#/default/curated_content_api_v1_curated_recommendations_post. +- * + * @property scheduledCorpusItemId The ID of the scheduled corpus item for this recommendation. + * @property url The url of the recommendation. + * @property title The title of the recommendation. -- -2.47.0 +2.47.1 diff --git a/libre/iceweasel/9003-FSDG-urihandlers.patch b/libre/iceweasel/9003-FSDG-urihandlers.patch index 1843c19..8781b09 100644 --- a/libre/iceweasel/9003-FSDG-urihandlers.patch +++ b/libre/iceweasel/9003-FSDG-urihandlers.patch @@ -1,4 +1,4 @@ -From d9c12d8f61927264c6c0c9511ad33198797698c5 Mon Sep 17 00:00:00 2001 +From 4309ea8272d594d7dc5818efde39320c3132656b Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH] Remove URI handlers that serve nonfree software @@ -216,5 +216,5 @@ index e95d627c07..81f9218da9 100644 ], }, -- -2.47.0 +2.47.1 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index a2a637c..01c6ab1 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1,4 +1,4 @@ -From 1fcf94e8377989f8b4313928cf16e8689b0e50a5 Mon Sep 17 00:00:00 2001 +From 330b832a213edc609c6ace496a7d7cd82fad4dab Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 12 Mar 2022 17:14:25 +0100 Subject: [PATCH 1/7] Replace upstream default bookmarks @@ -78,10 +78,10 @@ index cbed7b2ccc..ba436303df 100644 -- -2.47.0 +2.47.1 -From fb8153ef3ff30fd4800ed510f4a61cef8f3653d4 Mon Sep 17 00:00:00 2001 +From 92f27bf10f4853c1c2b5a7dcb8a8fb3fae8d5e6d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH 2/7] Remove 'More from Mozilla' section in Preferences @@ -103,10 +103,10 @@ 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 0584a54fa7..8125b3005e 100644 +index d23608bc35..265680dfdb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1282,7 +1282,7 @@ pref("browser.preferences.experimental", true); +@@ -1299,7 +1299,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. @@ -116,10 +116,10 @@ index 0584a54fa7..8125b3005e 100644 // 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 e4ee47767d..cb8881c458 100644 +index ff015f2849..ae31602951 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -160,15 +160,6 @@ var allowlist = [ +@@ -163,15 +163,6 @@ var allowlist = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, @@ -276,10 +276,10 @@ index 951af95159..e4ba0d94bc 100644 -- -2.47.0 +2.47.1 -From 6291b2b84fd3dc84034efc86a280512adb0e1e95 Mon Sep 17 00:00:00 2001 +From 32b7c4a17cd0e4704817061b221b040f43d19f88 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:51:06 +0200 Subject: [PATCH 3/7] Remove promos of Firefox Focus and Klar from Private @@ -299,10 +299,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 8125b3005e..b3b60b975b 100644 +index 265680dfdb..82c624d451 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2316,7 +2316,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u +@@ -2329,7 +2329,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. @@ -312,7 +312,7 @@ index 8125b3005e..b3b60b975b 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 cb8881c458..56bcd03339 100644 +index ae31602951..918a62ad58 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js @@ -41,8 +41,6 @@ var gExceptionPaths = [ @@ -645,10 +645,10 @@ index ec36bd513c..8e785ad810 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 98e1f0e9f3..313bb662d0 100644 +index 9883710a7a..327cb761f2 100644 --- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs +++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs -@@ -353,85 +353,6 @@ const MESSAGES = () => [ +@@ -451,85 +451,6 @@ const MESSAGES = () => [ frequency: { lifetime: 3 }, trigger: { id: "defaultBrowserCheck" }, }, @@ -975,10 +975,10 @@ index 2217ca055c..0000000000 - - -- -2.47.0 +2.47.1 -From 027a86a560d880561d2a002d9cc60e91d193f9c9 Mon Sep 17 00:00:00 2001 +From 28657a086b794acf8e5170aaab66611b2d1734eb Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 4/7] Remove 'Extensions for developers' menu item @@ -1036,10 +1036,10 @@ index e75115c220..0abeb4d830 100644 }, }, -- -2.47.0 +2.47.1 -From bf2a2604d7c5f4bcf2601bfdf6619c288373a7c4 Mon Sep 17 00:00:00 2001 +From cd8ecd63a928f62a45d63d49120bc1b15b32ea27 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 12 Mar 2023 21:57:14 +0100 Subject: [PATCH 5/7] Change DuckDuckGo URL to DuckDuckGo HTML URL @@ -1098,10 +1098,10 @@ index 104eee6457..9a3279c622 100644 "suggest_url_get_params": "q={searchTerms}&type=list" } -- -2.47.0 +2.47.1 -From e37c933fbba5d5f59e1557b588565d7e78262e6e Mon Sep 17 00:00:00 2001 +From 0e00104f42ba409d33e0ef2fe3089f370ee2e720 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 @@ -1125,7 +1125,7 @@ to false. 2 files changed, 3 insertions(+), 131 deletions(-) diff --git a/browser/components/genai/GenAI.sys.mjs b/browser/components/genai/GenAI.sys.mjs -index 7549762da0..a8a5726091 100644 +index 6c5ff66bff..cecf109075 100644 --- a/browser/components/genai/GenAI.sys.mjs +++ b/browser/components/genai/GenAI.sys.mjs @@ -31,7 +31,7 @@ XPCOMUtils.defineLazyPreferenceGetter( @@ -1299,10 +1299,10 @@ index 9e1ad10a88..bcfc7c5961 100644 .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.47.0 +2.47.1 -From ebe3be8a100eb6b481ea08fc9d7d3852fedcaf60 Mon Sep 17 00:00:00 2001 +From b5550f2fb97af583df13d645e3da8390cca6deb0 Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH 7/7] Various patches @@ -1336,7 +1336,7 @@ index 1c72a96de8..052a6a5c83 100644 origin remote-troubleshooting 1 https://support.mozilla.org diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml -index 492491a369..0c8c462a1d 100644 +index e59c536fc2..3540eadbc5 100644 --- a/browser/components/preferences/sync.inc.xhtml +++ b/browser/components/preferences/sync.inc.xhtml @@ -35,24 +35,6 @@ @@ -1426,7 +1426,7 @@ index d9fe35c009..1b16604876 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 584377f023..86ce3eda2a 100644 +index 313be968d3..cd10791da3 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 = @@ -1447,7 +1447,7 @@ index 584377f023..86ce3eda2a 100644 sync-profile-picture-with-alt = diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl -index 065699dc96..10b6dd1adb 100644 +index 233e9c9d12..c3d096a142 100644 --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl @@ -5,7 +5,7 @@ @@ -1459,7 +1459,7 @@ index 065699dc96..10b6dd1adb 100644 .searchbuttonlabel = Search ## Variables -@@ -344,7 +344,8 @@ install-theme-button = Install Theme +@@ -343,7 +343,8 @@ install-theme-button = Install Theme # The label of the button that appears after installing an add-on. Upon click, # the detailed add-on view is opened, from where the add-on can be managed. manage-addon-button = Manage @@ -1469,7 +1469,7 @@ index 065699dc96..10b6dd1adb 100644 find-more-themes = Find more themes # This is a label for the button to open the "more options" menu, it is only -@@ -516,9 +517,10 @@ sitepermission-heading = Manage Your Site Permissions +@@ -515,9 +516,10 @@ sitepermission-heading = Manage Your Site Permissions discover-heading = Personalize Your { -brand-short-name } shortcuts-heading = Manage Extension Shortcuts @@ -1542,5 +1542,5 @@ index 3861d8b613..1f2d087cd5 100644 --firefoxlabs-brand-name = Firefox Labs +-firefoxlabs-brand-name = Iceweasel Labs -- -2.47.0 +2.47.1 diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 36caa2f..c9084fc 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=133.0 +pkgver=134.0 pkgrel=1 _brandingver=131.0 _brandingrel=1 @@ -184,7 +184,7 @@ validpgpkeys+=( BFA8008A8265677063B11BF47171986E4B745536 # Andreas Grapentin (branding source-ball) 3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40 # bill-auger (libre source-ball) ) -sha256sums=('492b2c9a3b6d215e38ce490624e8b2b9473419accdeaddb24ba00bc6adc3cc60' +sha256sums=('ca88068bd72784c10de16df62359b2dc354672a1a427b4fd6a5fcdb34c06457e' 'SKIP' # $pkgname-symbolic.svg '614f2ab3f7bbe783ca50b94f4c78081ee1f98605156ee8ff379e251191b61bdb' # $pkgname.desktop @@ -194,7 +194,7 @@ sha256sums_i686=('65395a49fd3d998f7e06a430bdd656ad453254dafcc34e21ec7931902d8c18 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('6c356a4d34044825e86f712b959cbfa6ee27c989c74e42b0b276ee6b169ca84b467ed5ea82f850a517694b75be104362273075c2aa6019f9d30e1be4035b3dd6' +b2sums=('599049006a65bc70ce7a43b8412a260e033888609fefdec33a7aa4cf5427e0a89a725e6a74b396097a9263acafc9251f9a54294c666af1f7355c66ffeff4a007' 'SKIP' # $pkgname-symbolic.svg '49b4776b3ec8c70194a8f7c5a6467f71820c6a5d6e2033a519fe2742282c6dc141855c6213c67e34b4e0774227d3c15f9083e708c33e7cd6e4c3a982830fefdf' # $pkgname.desktop @@ -228,17 +228,18 @@ mksource+=( https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}- process-json-files.py ) mksha256sums+=( 'c2f97b90795b9cc8fdb2ebb73cda38100529794ba8f4e358d4238fcc5293cee5' # *.branding.tar.xz 'SKIP' - 'b9bb1e26b4f4ca4962be5a472f8965813ffb87354281934bbb9e2aa7b2a4a05e' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - 'e488677c244ecec60d5cf07d5a106807e35e71d19449280041944ef62325141b' # 9002-FSDG-preference-defaults.patch - '02f8f09e30fab3ea1dd05fa3dcf58fe3e5204e2aa2ee53755fb3f2966b0e4a2e' # 9003-FSDG-urihandlers.patch - '54be3c5ff632592f4db49911bc99a561aa6d5ba5e105b6f1109b884a4a3169c0' # 9004-FSDG-misc.patch + '83efa0d17df6347c64e12a3bc872e0b2905fca6ed1d08dfa15d03bae24e905da' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '5c48cf2dac27d4db41253c20577d2ae05b5c3d16172892f10d9781fd63061039' # 9002-FSDG-preference-defaults.patch + '472ce3b71c5cb231267281f8f25320e718320c90e3e8be7b2d12af25b967fa9f' # 9003-FSDG-urihandlers.patch + 'f90a059c95c7cf72a8fbdf53039e5ec24e373b53468a31a8046c68d81b5c2315' # 9004-FSDG-misc.patch 'd77624602d6064669e3c44dc4f45fb0ff12d2bf4bbe8e3d36be51a5ae94ca46e' ) # process-json-files.py mkb2sums+=( '3bdd96a8a398075651d4ea1d87fe58193a53d898a70dccc034d7c9d2c9ed13a17b7539bdc8de2925b55d76171b6583313ad6f75d373fc088f0a2a517bc33cb18' # *.branding.tar.xz 'SKIP' - 'a3fb269470123df26d388dd05d46bca468c7bee14fec539c394df8b462f69d2d12f4b66f0a1ce3a70d25e8e82bfe55569fd1c4ff125f0ab0af46b4c146315b33' # 9001-FSDG-sync-remote-settings-with-local-dump.patchsettings-with-local-dump.patch - '3c16edbcd7ec79530960097b49a9c72347ef108506bee9e51f06111035a5a09a8ea52bc66126a71e422a90ea0da67d34051568c6e9d0926cb9121281e33589fb' # 9002-FSDG-preference-defaults.patchefaults.patch - '90a4676b9dfaf79f2265bfffa85251ac50423543a4ea6c113047293a36641f5efdac19a6aa753c91861b7ab0844a69c40fe01041d4f8c880c2332f0f79964c5e' # 9003-FSDG-urihandlers.patchpatch - 'fb45647122c3af3a3c4fbdbb5175a05ef950cb47ad98af3deace3bc9fefa277e2ae57ccfbe5dfc0cb713e0d3a2faf47f5e61d22bd9d3568c310e6ea93116e901' # 9004-FSDG-misc.patch + '77a69614b71fef84a4b60eeb2e44c3f21b382ec36976ec24d26e2b4893f4833cb6b3163695ae494f446c89e8ffd98d6db5d553e9ea3b8b8fbae7bb6920acebc1' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '7fb922e7889a010a7779195f2ea89960765ca2e57b8dd0ee95eb1fd365dbe5c4aa27f007c82e0d4c1b64903cc6fe4fea18ed08b4f643bc01e69615656b5417c4' # 9002-FSDG-preference-defaults.patch + 'cb6bb45e80b11021197d1cb422757d6906157396609f46f22c970bb88b373671f0a5518d758a71148b13fd784a8326a30b79ecfa3ad32b5a4ac9132e85296c30' # 9003-FSDG-urihandlers.patch + 'cb4a2501216328d1a029df6d8ef43627cb72cfd33d9c041bca2e38d0bffd93585132a6aa20a7b850e9a2c817bcb1dcd2f188ce5c12dc68a6968cd76350982e15' # 9004-FSDG-misc.patch + '123a23027f1bf5f0e1f7851de5c95b679d0a110b07f2fc7d2447290157963fce2bbb1f5ed46b0bfdcaf32927cf86cb0226965cafd85a2924be2b1812abb9d4b9' ) # process-json-files.py source=( https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.zst{,.sig} ${source[*]:${_N_MKSOURCES}} ) @@ -453,6 +454,9 @@ mksource() { sed -i '/mappings.wasm/d' devtools/client/shared/vendor/source-map/lib/moz.build find -name '*.wasm' -exec rm -v {} \; + + sed -i '/vendor\//d' toolkit/components/ml/jar.mn + rm -frv toolkit/components/ml/vendor # Remove test-related networking dumps, because they contain code from # some Amazon webpage with no clear licensing, thus nonfree. From dd7ddfac7279ee558043d452aaab7a27f968a8b4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Feb 05 2025 22:41:06 +0000 Subject: [PATCH 2/2] libre/iceweasel: 135.0, rebase patches --- 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 82369dc..3385a3d 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 14ce9b070ed943d21c663a2e53f15f9a2669c12b Mon Sep 17 00:00:00 2001 +From 090ff14399208e96f5ad37ac10597bb3fb08f1aa 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 @@ -82,7 +82,7 @@ index ab01b80e28..a528cd03ad 100644 > nimbus-desktop-experiments diff --git a/browser/components/asrouter/content/asrouter-admin.bundle.js b/browser/components/asrouter/content/asrouter-admin.bundle.js -index c533a08d3a..5e07a26889 100644 +index ffcee92c5d..0adb63a79e 100644 --- a/browser/components/asrouter/content/asrouter-admin.bundle.js +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js @@ -1152,7 +1152,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P @@ -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 966a527fc9..2d567cb5a4 100644 +index 713b503206..cd237216e0 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 -@@ -677,7 +677,7 @@ class Core( +@@ -717,7 +717,7 @@ class Core( // collection name to fetch from server for SERP telemetry const val COLLECTION_NAME = "search-telemetry-v2" @@ -161,10 +161,10 @@ index 966a527fc9..2d567cb5a4 100644 } } diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt -index e4998c4050..1a0155cc75 100644 +index bef9b17536..64609d5a1d 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt -@@ -61,8 +61,8 @@ class GleanMetricsService(context: Context) : MetricsService { +@@ -66,8 +66,8 @@ class GleanMetricsService(context: Context) : MetricsService { const val COLLECTION_NAME = "search-telemetry-v2" // urls for prod and stage remote settings server @@ -176,7 +176,7 @@ index e4998c4050..1a0155cc75 100644 private val isEnabledByDefault: Boolean get() = !AppConstants.isKlarBuild diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index 12fef6cde8..13d940455e 100644 +index d3643aedf2..6367f6af86 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -102,7 +102,7 @@ export var Utils = { @@ -189,7 +189,7 @@ index 12fef6cde8..13d940455e 100644 /** * Logger instance. diff --git a/services/settings/docs/index.rst b/services/settings/docs/index.rst -index a834bb74a0..17c7f7b9cc 100644 +index 65aacc83de..9f4f3a349f 100644 --- a/services/settings/docs/index.rst +++ b/services/settings/docs/index.rst @@ -190,11 +190,11 @@ It is possible to package a dump of the server records that will be loaded into @@ -207,7 +207,7 @@ index a834bb74a0..17c7f7b9cc 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 cbd9e2d121..7051a59996 100755 +index ad8afba2cc..5610c33768 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh @@ -403,7 +403,7 @@ function compare_suffix_lists { @@ -220,18 +220,18 @@ index cbd9e2d121..7051a59996 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 209a6a38e9..ff089f7b55 100644 +index cb81c5acf0..bc6753c13f 100644 --- a/third_party/rust/remote_settings/.cargo-checksum.json +++ b/third_party/rust/remote_settings/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"775c7ab83aec10eb748b46c9fe1b5c93ac299d735205d2e61c7049dcfbd33141","dumps/main/search-telemetry-v2.json":"1e3f49571183aa5db30c0877f0b291adb26ea7b81c04b16eac4f0320e9134a34","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"db588b7524ffc164c5870f93dfe8fb8d3168748af39d66405027b18c0ee7aca7","src/config.rs":"0294f122c76570c3df1de876289a6e70d0b03b4e8221a34ed7b893a377e68be1","src/error.rs":"f0cb9b7fa3e427c919b491f7864dd332365b2d0288be775064d115ef82311fc5","src/jexl_filter.rs":"e085f92b0ef9031106cf5d4999dbb19f467494c029f324b25d0098506b37b2e1","src/lib.rs":"16d9f3ca6336188df53410dcbe9afe6ac09a1be764ecd9094cfbec05512e7370","src/service.rs":"5445803fc9f768f6b40514bfb1add437baf6d868b67fc29a349dda70923c8b5f","src/storage.rs":"944c622c0ec7f32e0e9f6177abd4e01b7c6601f85b7c991f3752261119f87c84","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} +-{"files":{"Cargo.toml":"3cc9adcb565e54012fdc66822cbdd9a03fe2faf1a5de7f2812b7e88ad0f0a25d","dumps/main/attachments/regions/world":"00b308033d44f61612b962f572765d14a3999586d92fc8b9fff2217a1ae070e8","dumps/main/attachments/regions/world-buffered":"1d3ed6954fac2a5b31302f5d3e8186c5fa08a20239afc0643ca5dfbb4d8a86fc","dumps/main/attachments/regions/world-buffered.meta.json":"914a71376a152036aceccb6877e079fbb9e3373c6219f24f00dd30e901a72cce","dumps/main/attachments/regions/world.meta.json":"2a47d77834997b98e563265d299723e7f7fd64c8c7a5731afc722862333d6fbd","dumps/main/regions.json":"e8990158373f82d3f89fed5089cf29e4177cc85904479128728e05025e9a0c0c","dumps/main/search-telemetry-v2.json":"1e3f49571183aa5db30c0877f0b291adb26ea7b81c04b16eac4f0320e9134a34","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"2683e3cdf0ad54ce450b14b6c2bf574e5344ec1c770a9d77541b1e4e4aa1a395","src/config.rs":"0294f122c76570c3df1de876289a6e70d0b03b4e8221a34ed7b893a377e68be1","src/error.rs":"fd831d51ebe312b7da2459f63c86ad3492a6551c490b93330ba8fdee20be7668","src/jexl_filter.rs":"e085f92b0ef9031106cf5d4999dbb19f467494c029f324b25d0098506b37b2e1","src/lib.rs":"f51bd3a8f7e3ff612dd251db80b44ed44ce02ebf84393b1825dc4b927019e844","src/macros.rs":"19735d74b6ce8d1fc21a85c39787a271f09a849a310db16ba36219aba9106736","src/service.rs":"5445803fc9f768f6b40514bfb1add437baf6d868b67fc29a349dda70923c8b5f","src/storage.rs":"ae921a8a184c7bf37ebdf7b857c481b76ca6103d20b6c09f8bb326636b083520","uniffi.toml":"bd7cc0e7c1981f53938f429c4f2541ac454ed4160a8a0b4670659e38acd23ee5"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"775c7ab83aec10eb748b46c9fe1b5c93ac299d735205d2e61c7049dcfbd33141","dumps/main/search-telemetry-v2.json":"1e3f49571183aa5db30c0877f0b291adb26ea7b81c04b16eac4f0320e9134a34","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"8cdfe19dc17837a7cc2109d7aa8f5b4cd3a16125b1917a0b0cd055684e777ebe","src/config.rs":"e0f896653941bf9d5229495b6b63aba9f8ba3315711a601298fc3d3f52a0a034","src/error.rs":"f0cb9b7fa3e427c919b491f7864dd332365b2d0288be775064d115ef82311fc5","src/jexl_filter.rs":"e085f92b0ef9031106cf5d4999dbb19f467494c029f324b25d0098506b37b2e1","src/lib.rs":"16d9f3ca6336188df53410dcbe9afe6ac09a1be764ecd9094cfbec05512e7370","src/service.rs":"5445803fc9f768f6b40514bfb1add437baf6d868b67fc29a349dda70923c8b5f","src/storage.rs":"944c622c0ec7f32e0e9f6177abd4e01b7c6601f85b7c991f3752261119f87c84","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} ++{"files":{"Cargo.toml":"3cc9adcb565e54012fdc66822cbdd9a03fe2faf1a5de7f2812b7e88ad0f0a25d","dumps/main/attachments/regions/world":"00b308033d44f61612b962f572765d14a3999586d92fc8b9fff2217a1ae070e8","dumps/main/attachments/regions/world-buffered":"1d3ed6954fac2a5b31302f5d3e8186c5fa08a20239afc0643ca5dfbb4d8a86fc","dumps/main/attachments/regions/world-buffered.meta.json":"914a71376a152036aceccb6877e079fbb9e3373c6219f24f00dd30e901a72cce","dumps/main/attachments/regions/world.meta.json":"2a47d77834997b98e563265d299723e7f7fd64c8c7a5731afc722862333d6fbd","dumps/main/regions.json":"e8990158373f82d3f89fed5089cf29e4177cc85904479128728e05025e9a0c0c","dumps/main/search-telemetry-v2.json":"1e3f49571183aa5db30c0877f0b291adb26ea7b81c04b16eac4f0320e9134a34","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"c3abda4a504c63e32fb50ed3d8ff1ad63816378224c41dfc2a3644e88ea2d727","src/config.rs":"e0f896653941bf9d5229495b6b63aba9f8ba3315711a601298fc3d3f52a0a034","src/error.rs":"fd831d51ebe312b7da2459f63c86ad3492a6551c490b93330ba8fdee20be7668","src/jexl_filter.rs":"e085f92b0ef9031106cf5d4999dbb19f467494c029f324b25d0098506b37b2e1","src/lib.rs":"f51bd3a8f7e3ff612dd251db80b44ed44ce02ebf84393b1825dc4b927019e844","src/macros.rs":"19735d74b6ce8d1fc21a85c39787a271f09a849a310db16ba36219aba9106736","src/service.rs":"5445803fc9f768f6b40514bfb1add437baf6d868b67fc29a349dda70923c8b5f","src/storage.rs":"ae921a8a184c7bf37ebdf7b857c481b76ca6103d20b6c09f8bb326636b083520","uniffi.toml":"bd7cc0e7c1981f53938f429c4f2541ac454ed4160a8a0b4670659e38acd23ee5"},"package":null} diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs -index 1019f408f8..d67a47b621 100644 +index 2226649042..567ee3121c 100644 --- a/third_party/rust/remote_settings/src/client.rs +++ b/third_party/rust/remote_settings/src/client.rs -@@ -961,7 +961,7 @@ mod test { +@@ -1021,7 +1021,7 @@ mod test { }; let client = Client::new(config).unwrap(); assert_eq!( @@ -240,7 +240,7 @@ index 1019f408f8..d67a47b621 100644 client.endpoints.collection_url ); } -@@ -1799,7 +1799,7 @@ mod cached_data_tests { +@@ -1859,7 +1859,7 @@ mod cached_data_tests { let storage = Storage::new(":memory:".into())?; let collection_url = format!( @@ -249,7 +249,7 @@ index 1019f408f8..d67a47b621 100644 collection_name ); -@@ -1822,7 +1822,7 @@ mod cached_data_tests { +@@ -1882,7 +1882,7 @@ mod cached_data_tests { let api_client = MockApiClient::new(); let storage = Storage::new(":memory:".into())?; @@ -258,7 +258,7 @@ index 1019f408f8..d67a47b621 100644 // First get the packaged data to know its timestamp let rs_client = -@@ -1885,7 +1885,7 @@ mod cached_data_tests { +@@ -1945,7 +1945,7 @@ mod cached_data_tests { let storage = Storage::new(":memory:".into())?; let collection_url = format!( @@ -267,7 +267,7 @@ index 1019f408f8..d67a47b621 100644 collection_name ); -@@ -1942,7 +1942,7 @@ mod cached_data_tests { +@@ -2002,7 +2002,7 @@ mod cached_data_tests { let storage = Storage::new(":memory:".into())?; let collection_url = format!( @@ -276,7 +276,7 @@ index 1019f408f8..d67a47b621 100644 collection_name ); -@@ -1974,7 +1974,7 @@ mod cached_data_tests { +@@ -2034,7 +2034,7 @@ mod cached_data_tests { let mut storage = Storage::new(":memory:".into())?; let collection_url = format!( @@ -285,7 +285,7 @@ index 1019f408f8..d67a47b621 100644 collection_name ); -@@ -2016,7 +2016,7 @@ mod cached_data_tests { +@@ -2076,7 +2076,7 @@ mod cached_data_tests { let mut storage = Storage::new(":memory:".into())?; let collection_url = format!( @@ -294,8 +294,8 @@ index 1019f408f8..d67a47b621 100644 collection_name ); -@@ -2048,7 +2048,7 @@ mod cached_data_tests { - let mut storage = Storage::new(":memory:".into())?; +@@ -2139,7 +2139,7 @@ mod test_packaged_metadata { + let storage = Storage::new(":memory:".into())?; let collection_url = format!( - "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/{}", @@ -358,7 +358,7 @@ 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 005ad9cce2..35ea0c2cec 100644 +index 54db3e1925..134267e1d2 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs @@ -163,13 +163,13 @@ export var SearchUtils = { @@ -433,10 +433,10 @@ index 224048c55f..7772d4699d 100644 REMOTE_SETTINGS_VERIFY_SIGNATURE: -- -2.47.1 +2.48.1 -From 2b1f4b183d1bec9c98a0fa87a1c28a6d2b435150 Mon Sep 17 00:00:00 2001 +From 0ea47b776177c87427fd013ff2b17d96c00dbe51 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 @@ -453,10 +453,10 @@ service. 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dom/push/PushBroadcastService.sys.mjs b/dom/push/PushBroadcastService.sys.mjs -index eea31ef192..529ecd6917 100644 +index a0b049b94b..aba7a7d194 100644 --- a/dom/push/PushBroadcastService.sys.mjs +++ b/dom/push/PushBroadcastService.sys.mjs -@@ -168,6 +168,19 @@ export var BroadcastService = class { +@@ -165,6 +165,19 @@ export var BroadcastService = class { } } @@ -477,10 +477,10 @@ index eea31ef192..529ecd6917 100644 * Call the listeners of the specified broadcasts. * diff --git a/services/settings/remote-settings.sys.mjs b/services/settings/remote-settings.sys.mjs -index 7a5530abd2..e17f1b5b5b 100644 +index 57f61de40c..3dc050433e 100644 --- a/services/settings/remote-settings.sys.mjs +++ b/services/settings/remote-settings.sys.mjs -@@ -586,11 +586,7 @@ function remoteSettingsFunction() { +@@ -694,11 +694,7 @@ function remoteSettingsFunction() { moduleURI: import.meta.url, symbolName: "remoteSettingsBroadcastHandler", }; @@ -493,7 +493,7 @@ index 7a5530abd2..e17f1b5b5b 100644 }; return remoteSettings; -@@ -610,9 +606,6 @@ export var remoteSettingsBroadcastHandler = { +@@ -718,9 +714,6 @@ export var remoteSettingsBroadcastHandler = { `Push notification received (version=${version} phase=${phase})` ); @@ -505,10 +505,10 @@ index 7a5530abd2..e17f1b5b5b 100644 }, }; -- -2.47.1 +2.48.1 -From 5f909f9b336821c4e194b610eabc1c2809a49358 Mon Sep 17 00:00:00 2001 +From 26019a47d85079cfef352fed39d0e7defef0cade 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 @@ -549,10 +549,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.47.1 +2.48.1 -From 0672b94563afd9efc18b8e7fd6075e612005dd3c Mon Sep 17 00:00:00 2001 +From cf5f469961b1e861c11b8d4576e73580d1708fc4 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 @@ -570,7 +570,7 @@ code that expects them. create mode 100644 services/settings/dumps/monitor/moz.build diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index 13d940455e..d5dfe84823 100644 +index 6367f6af86..0744070bfe 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -411,7 +411,7 @@ export var Utils = { @@ -649,10 +649,10 @@ index a3e9e9b3f2..b32a8d8691 100644 ] -- -2.47.1 +2.48.1 -From 173455fd3cb83b8bf521c9365ea14d0cc4fe75b7 Mon Sep 17 00:00:00 2001 +From 62a24a953606eae771899bb6ac582030531138f9 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 @@ -664,7 +664,7 @@ current and any future code that relies on it. 1 file changed, 10 deletions(-) diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index d5dfe84823..7fcb28863d 100644 +index 0744070bfe..1fbc107670 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -192,16 +192,6 @@ export var Utils = { @@ -685,10 +685,10 @@ index d5dfe84823..7fcb28863d 100644 }, -- -2.47.1 +2.48.1 -From de6783ae80945936a47be9c00baee712cf05e3cf Mon Sep 17 00:00:00 2001 +From 3283ba7f4a9a3d4aff3c171cc6b4d6fe5dc30dc4 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 @@ -739,10 +739,10 @@ index 1eeaf0bed9..d998a2d3b1 100644 /** -- -2.47.1 +2.48.1 -From 796032cfd72b9515efa8208cfbb44ade2328733c Mon Sep 17 00:00:00 2001 +From ec40e9feb82997fdef254cfb83ba0c1df2bcb20e 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 @@ -777,10 +777,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 7e98e6d5b3..64a592e055 100644 +index 32dcdd45d8..3587bdc5ea 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -714,11 +714,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -725,11 +725,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. @@ -794,10 +794,10 @@ index 7e98e6d5b3..64a592e055 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()). -@@ -995,38 +993,28 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1006,38 +1004,28 @@ export class RemoteSettingsClient extends EventEmitter { * @returns {Promise} */ - async _validateCollectionSignature(records, timestamp, metadata) { + async validateCollectionSignature(records, timestamp, metadata) { - if (!metadata?.signature) { + if (!metadata?.json_dump_metadata) { throw new MissingSignatureError(this.identifier); @@ -836,12 +836,12 @@ index 7e98e6d5b3..64a592e055 100644 + hash )) ) { -- throw new InvalidSignatureError(this.identifier, x5u); +- throw new InvalidSignatureError(this.identifier, x5u, this.signerName); + throw new InvalidSignatureError(this.identifier); } } -@@ -1193,24 +1181,26 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1204,24 +1192,26 @@ export class RemoteSettingsClient extends EventEmitter { * @param since timestamp of last sync (optional) */ async _fetchChangeset(expectedTimestamp, since) { @@ -885,10 +885,10 @@ index 7e98e6d5b3..64a592e055 100644 remoteRecords, }; -- -2.47.1 +2.48.1 -From 836cfa9cf69fde52e167297e95b34dfe762fb319 Mon Sep 17 00:00:00 2001 +From 0682721ee199fa2417df8cddb5773e65c6c5d9c6 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() @@ -910,7 +910,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 64a592e055..371f58bfd4 100644 +index 3587bdc5ea..9846df839c 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, { @@ -921,7 +921,7 @@ index 64a592e055..371f58bfd4 100644 IDBHelpers: "resource://services-settings/IDBHelpers.sys.mjs", KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs", ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs", -@@ -23,6 +24,7 @@ ChromeUtils.defineESModuleGetters(lazy, { +@@ -24,6 +25,7 @@ ChromeUtils.defineESModuleGetters(lazy, { }); const TELEMETRY_COMPONENT = "Remotesettings"; @@ -929,7 +929,7 @@ index 64a592e055..371f58bfd4 100644 ChromeUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log); -@@ -341,6 +343,11 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -342,6 +344,11 @@ export class RemoteSettingsClient extends EventEmitter { this._lastCheckTimePref = lastCheckTimePref; this._verifier = null; this._syncRunning = false; @@ -941,7 +941,7 @@ index 64a592e055..371f58bfd4 100644 // This attribute allows signature verification to be disabled, when running tests // or when pulling data from a dev server. -@@ -370,6 +377,11 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -371,6 +378,11 @@ export class RemoteSettingsClient extends EventEmitter { this.db.identifier = this.identifier; } @@ -953,7 +953,7 @@ index 64a592e055..371f58bfd4 100644 get identifier() { return `${this.bucketName}/${this.collectionName}`; } -@@ -443,6 +455,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -444,6 +456,10 @@ export class RemoteSettingsClient extends EventEmitter { let lastModified = forceSync ? null : await this.db.getLastModified(); let hasLocalData = lastModified !== null; @@ -964,7 +964,7 @@ index 64a592e055..371f58bfd4 100644 if (forceSync) { if (!this._importingPromise) { this._importingPromise = (async () => { -@@ -559,7 +575,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -578,7 +594,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. @@ -975,8 +975,8 @@ index 64a592e055..371f58bfd4 100644 + return filtered; } - lazy.console.debug( -@@ -599,6 +618,12 @@ export class RemoteSettingsClient extends EventEmitter { + if (verifySignature) { +@@ -610,6 +629,12 @@ export class RemoteSettingsClient extends EventEmitter { return final; } @@ -990,10 +990,10 @@ index 64a592e055..371f58bfd4 100644 * Synchronize the local database with the remote server. * -- -2.47.1 +2.48.1 -From 25b80ceca5997949ce288c2f38a10d309058ae4d Mon Sep 17 00:00:00 2001 +From 840e49d45a94f5363312e34c8103716891888df5 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 @@ -1015,7 +1015,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 371f58bfd4..3119d5b33d 100644 +index 9846df839c..3ecc86efdf 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"; @@ -1026,7 +1026,7 @@ index 371f58bfd4..3119d5b33d 100644 ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs", Database: "resource://services-settings/Database.sys.mjs", -@@ -1181,7 +1182,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1192,7 +1193,10 @@ export class RemoteSettingsClient extends EventEmitter { const old = oldById.get(r.id); if (old) { oldById.delete(r.id); @@ -1039,10 +1039,10 @@ index 371f58bfd4..3119d5b33d 100644 } } else { -- -2.47.1 +2.48.1 -From 3b8b0d19220f10f19ab2a6bc886fa9473fe7c3dc Mon Sep 17 00:00:00 2001 +From f57fb08c3d70d8b5eb8be16b47e08745839b27e9 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 @@ -1060,10 +1060,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 3119d5b33d..c26e81ce0a 100644 +index 3ecc86efdf..1248d8e55f 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -262,7 +262,7 @@ class AttachmentDownloader extends Downloader { +@@ -263,7 +263,7 @@ class AttachmentDownloader extends Downloader { allRecords .filter(r => !!r.attachment) .map(r => @@ -1072,7 +1072,7 @@ index 3119d5b33d..c26e81ce0a 100644 ) ); } -@@ -1141,7 +1141,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1152,7 +1152,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`); @@ -1081,7 +1081,7 @@ index 3119d5b33d..c26e81ce0a 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); -@@ -1163,7 +1163,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1174,7 +1174,7 @@ export class RemoteSettingsClient extends EventEmitter { // _importJSONDump() only clears DB if dump is available, // therefore do it here! if (imported < 0) { @@ -1090,7 +1090,7 @@ index 3119d5b33d..c26e81ce0a 100644 } } } -@@ -1203,6 +1203,12 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1214,6 +1214,12 @@ export class RemoteSettingsClient extends EventEmitter { return syncResult; } @@ -1104,10 +1104,10 @@ index 3119d5b33d..c26e81ce0a 100644 * Fetch information from changeset endpoint. * -- -2.47.1 +2.48.1 -From a78e9320ea4daff0657085a2eae399e6f8d7d99f Mon Sep 17 00:00:00 2001 +From 54b9017af80fc444ddef140e9a26ebed948ca5fe 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 @@ -1122,10 +1122,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 c26e81ce0a..65b3393946 100644 +index 1248d8e55f..f46f57bf5b 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -1083,14 +1083,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1094,14 +1094,9 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; @@ -1141,10 +1141,10 @@ index c26e81ce0a..65b3393946 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.47.1 +2.48.1 -From 64dd2c01617e761a39289625bd26a63a06de1822 Mon Sep 17 00:00:00 2001 +From aaf38cd8c0c037210166f1260698844087845df6 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 @@ -1241,10 +1241,10 @@ index 9982c27661..00c1491ea5 100644 /** -- -2.47.1 +2.48.1 -From 2158c04655be16d80ab1e6b8324c10b091a2a417 Mon Sep 17 00:00:00 2001 +From 9e36f46dab6c7d885982a8d1bf0df66f324715bb 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 @@ -1264,28 +1264,32 @@ possible to make clients for blessed collections to communicate to real Remote Settings server. For example, for collections related to certificate revocations. --- - modules/libpref/init/StaticPrefList.yaml | 2 +- + modules/libpref/init/StaticPrefList.yaml | 6 +----- security/manager/ssl/nsNSSComponent.cpp | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 229a88cb12..ca5bb32afd 100644 +index 7364514f74..a870031571 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -15922,7 +15922,7 @@ +@@ -16132,11 +16132,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 +-#ifdef NIGHTLY_BUILD +- value: 2 +-#else - value: 3 +-#endif + value: 0 mirror: always # 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 8c0205a5ec..67b7cba763 100644 +index 8d00ed7349..09d5d580e1 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1161,6 +1161,7 @@ void nsNSSComponent::setValidationOptions( +@@ -1157,6 +1157,7 @@ void nsNSSComponent::setValidationOptions( CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled; CRLiteMode crliteMode = static_cast(StaticPrefs::security_pki_crlite_mode()); @@ -1294,5 +1298,5 @@ index 8c0205a5ec..67b7cba763 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.47.1 +2.48.1 diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index e76df02..27ca044 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -1,4 +1,4 @@ -From e04ab3a4309a77b733daba6ae892c110fa2f2154 Mon Sep 17 00:00:00 2001 +From 02d937db6f04108539f89b5744b145cb5e024763 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/8] 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 cc0b07a00c..c457c2ad4f 100644 +index a870031571..283efb1731 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -5902,7 +5902,7 @@ +@@ -5953,7 +5953,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool @@ -36,10 +36,10 @@ index cc0b07a00c..c457c2ad4f 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 f0250a901d..1f70818695 100644 +index 9ed86d00d0..ef4ccf0eb4 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3184,7 +3184,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3096,7 +3096,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // @@ -49,10 +49,10 @@ index f0250a901d..1f70818695 100644 // Timeout to wait before sending the location request. pref("geo.provider.network.timeToWaitBeforeSending", 5000); -- -2.47.1 +2.48.1 -From 38a116ac6807ed2c1eae8b4f165d2a8629fa0e4e Mon Sep 17 00:00:00 2001 +From 72384816a2ef0c26a62f4aaebb8a80770365d71d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/8] Disable banners and remove URLs for mobile apps on @@ -63,10 +63,10 @@ Subject: [PATCH 2/8] 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 1db5c83a56..5a4ed7e5c4 100644 +index 8cbe147d48..2f75216eb9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2308,7 +2308,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); +@@ -2357,7 +2357,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 1db5c83a56..5a4ed7e5c4 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 -@@ -2338,7 +2338,7 @@ pref("browser.promo.pin.enabled", true); +@@ -2387,7 +2387,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 1db5c83a56..5a4ed7e5c4 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"); -@@ -2349,12 +2349,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi +@@ -2398,12 +2398,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 1db5c83a56..5a4ed7e5c4 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.47.1 +2.48.1 -From 354f06ed9abb219a7f3047003b21ac6d5173c730 Mon Sep 17 00:00:00 2001 +From 898992820bc0fe8f63d2f92f8bd6b12cb6ba30b3 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 3/8] Remove some references to AMO @@ -145,7 +145,7 @@ Subject: [PATCH 3/8] 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 5a4ed7e5c4..24242b713e 100644 +index 2f75216eb9..b25f27935a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -22,7 +22,7 @@ @@ -177,10 +177,10 @@ index 5a4ed7e5c4..24242b713e 100644 // The URL for the privacy policy related to recommended extensions. pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_content=privacy-policy-link#addons"); diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt -index e5a49d7b8f..593157d8ff 100644 +index eab37c0660..bc6f9599f5 100644 --- a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt +++ b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt -@@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap +@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit internal const val API_VERSION = "api/v4" @@ -190,10 +190,10 @@ index e5a49d7b8f..593157d8ff 100644 internal const val DEFAULT_COLLECTION_NAME = "7e8d6dc651b54ab385fb8791bf9dac" internal const val COLLECTION_FILE_NAME_PREFIX = "mozilla_components_addon_collection" diff --git a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt -index 8f8f7cafd5..8140e15fc2 100644 +index ba7438b20d..73aad698b5 100644 --- a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt +++ b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt -@@ -77,8 +77,7 @@ class AMOAddonsProviderTest { +@@ -85,8 +85,7 @@ class AMOAddonsProviderTest { assertNull(addon.author) verify(client).fetch( Request( @@ -203,7 +203,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -145,8 +144,7 @@ class AMOAddonsProviderTest { +@@ -153,8 +152,7 @@ class AMOAddonsProviderTest { verify(client).fetch( Request( @@ -213,7 +213,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -163,8 +161,7 @@ class AMOAddonsProviderTest { +@@ -171,8 +169,7 @@ class AMOAddonsProviderTest { provider.getFeaturedAddons(readTimeoutInSeconds = 5) verify(mockedClient).fetch( Request( @@ -223,7 +223,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(5, TimeUnit.SECONDS), conservative = true, ), -@@ -419,8 +416,7 @@ class AMOAddonsProviderTest { +@@ -428,8 +425,7 @@ class AMOAddonsProviderTest { provider.getFeaturedAddons() verify(mockedClient).fetch( Request( @@ -233,7 +233,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -445,8 +441,7 @@ class AMOAddonsProviderTest { +@@ -455,8 +451,7 @@ class AMOAddonsProviderTest { verify(mockedClient).fetch( Request( @@ -243,7 +243,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -463,8 +458,7 @@ class AMOAddonsProviderTest { +@@ -474,8 +469,7 @@ class AMOAddonsProviderTest { verify(mockedClient).fetch( Request( @@ -253,7 +253,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -481,8 +475,7 @@ class AMOAddonsProviderTest { +@@ -493,8 +487,7 @@ class AMOAddonsProviderTest { verify(mockedClient).fetch( Request( @@ -263,7 +263,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -499,8 +492,7 @@ class AMOAddonsProviderTest { +@@ -512,8 +505,7 @@ class AMOAddonsProviderTest { verify(mockedClient).fetch( Request( @@ -273,7 +273,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -517,8 +509,7 @@ class AMOAddonsProviderTest { +@@ -531,8 +523,7 @@ class AMOAddonsProviderTest { verify(mockedClient).fetch( Request( @@ -283,7 +283,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -535,8 +526,7 @@ class AMOAddonsProviderTest { +@@ -550,8 +541,7 @@ class AMOAddonsProviderTest { verify(mockedClient).fetch( Request( @@ -293,7 +293,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -560,10 +550,7 @@ class AMOAddonsProviderTest { +@@ -576,10 +566,7 @@ class AMOAddonsProviderTest { provider.getFeaturedAddons() verify(mockedClient).fetch( Request( @@ -305,7 +305,7 @@ index 8f8f7cafd5..8140e15fc2 100644 readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS), conservative = true, ), -@@ -587,10 +574,7 @@ class AMOAddonsProviderTest { +@@ -604,10 +591,7 @@ class AMOAddonsProviderTest { provider.getFeaturedAddons() verify(mockedClient).fetch( Request( @@ -338,7 +338,7 @@ index b7f65feb7d..f82c8efa8c 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 3eda92e954..44eb232edd 100644 +index 6ca30aa422..138c2bbe7a 100644 --- a/mobile/android/fenix/app/build.gradle +++ b/mobile/android/fenix/app/build.gradle @@ -83,7 +83,7 @@ android { @@ -351,10 +351,10 @@ index 3eda92e954..44eb232edd 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 1f70818695..5cee788c0b 100644 +index ef4ccf0eb4..e557a5ac31 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -1815,8 +1815,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% +@@ -1767,8 +1767,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 1f70818695..5cee788c0b 100644 // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -3247,7 +3247,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); +@@ -3159,7 +3159,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 1f70818695..5cee788c0b 100644 // The URL for the privacy policy related to recommended add-ons. pref("extensions.recommendations.privacyPolicyUrl", ""); -- -2.47.1 +2.48.1 -From 660e8b1da4ab55d0bd863356ae6bfd4ddd08638c Mon Sep 17 00:00:00 2001 +From f4d7da207cdf683fa0030abd16482f46216050f1 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Jun 2023 13:16:40 +0200 Subject: [PATCH 4/8] 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 24242b713e..383e5490dd 100644 +index b25f27935a..b166d48bf7 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 24242b713e..383e5490dd 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. -@@ -1749,8 +1749,8 @@ pref("browser.topsites.component.enabled", false); +@@ -1776,8 +1776,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 24242b713e..383e5490dd 100644 // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile. pref("browser.topsites.contile.sov.enabled", true); -- -2.47.1 +2.48.1 -From d50df9cd0f3141fbbe3c77214053d9b2015a76d9 Mon Sep 17 00:00:00 2001 +From 995ea0e44044f2f66f074baae491a17cb880531e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 26 Sep 2023 21:27:34 +0200 Subject: [PATCH 5/8] 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 383e5490dd..9bf266e51a 100644 +index b166d48bf7..62684e89cc 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2170,7 +2170,7 @@ pref("browser.translation.neverForLanguages", ""); +@@ -2219,7 +2219,7 @@ pref("browser.translation.neverForLanguages", ""); // Enable Firefox translations powered by the Bergamot translations // engine https://browser.mt/. @@ -490,10 +490,10 @@ index 383e5490dd..9bf266e51a 100644 // Enable the new Firefox Translations Settings UI Design pref("browser.translations.newSettingsUI.enable", false); -- -2.47.1 +2.48.1 -From 800cd0ce28ba7f7ec8e5f3af2fe7ba84dd7fef20 Mon Sep 17 00:00:00 2001 +From 9af188a68933af7a3f29359bbd7d329b38f95e0d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 12 Jun 2024 00:17:17 +0200 Subject: [PATCH 6/8] Remove some references to Pocket and disable @@ -538,10 +538,10 @@ this nonfunctional by default. 27 files changed, 60 insertions(+), 109 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 9bf266e51a..9fb61957b7 100644 +index 62684e89cc..fd5ddfb4bd 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1959,7 +1959,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.locale-thu +@@ -1991,7 +1991,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) @@ -550,7 +550,7 @@ index 9bf266e51a..9fb61957b7 100644 // The pref controls if search hand-off is enabled for Activity Stream. pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", true); -@@ -2534,13 +2534,14 @@ pref("browser.migrate.interactions.passwords", false); +@@ -2583,13 +2583,14 @@ pref("browser.migrate.interactions.passwords", false); pref("browser.migrate.preferences-entrypoint.enabled", true); @@ -584,10 +584,10 @@ index b9a304a9f4..6a66c91d4c 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 86ae3a6d8e..ab383beba9 100644 +index 262bb65737..4e2a13d529 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -@@ -237,9 +237,6 @@ export function RecentSavesContainer({ +@@ -242,9 +242,6 @@ export function RecentSavesContainer({ function renderCard(rec, index) { const url = new URL(rec.url); const urlSearchParams = new URLSearchParams(queryParams); @@ -597,7 +597,7 @@ index 86ae3a6d8e..ab383beba9 100644 for (let [key, val] of urlSearchParams.entries()) { url.searchParams.set(key, val); -@@ -311,7 +308,7 @@ export function RecentSavesContainer({ +@@ -316,7 +313,7 @@ export function RecentSavesContainer({ diff --git a/browser/components/pocket/content/panels/style-guide.html b/browser/components/pocket/content/panels/style-guide.html -index cdc3368178..b42145c06c 100644 +index 2ed4a8deca..a93b873edb 100644 --- a/browser/components/pocket/content/panels/style-guide.html +++ b/browser/components/pocket/content/panels/style-guide.html @@ -4,7 +4,7 @@ @@ -995,7 +995,7 @@ index 132f9369ce..583f313a0c 100644 * call as data parameter * - {function(Object data, XMLHttpRequest xhr) | undefined} success: diff --git a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt -index 8b1639a7fc..538fec67ee 100644 +index 81bf2dd7e2..7a43fac926 100644 --- a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt +++ b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/spocs/api/SpocsEndpointRaw.kt @@ -24,8 +24,8 @@ import org.json.JSONObject @@ -1010,7 +1010,7 @@ index 8b1639a7fc..538fec67ee 100644 private const val SPOCS_ENDPOINT_DELETE_PROFILE_PATH = "user" private const val SPOCS_PROXY_VERSION_KEY = "version" diff --git a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/api/PocketEndpointRaw.kt b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/api/PocketEndpointRaw.kt -index bba2adcfbc..4ea4785f72 100644 +index 6d7c8b8187..d1c364f1e6 100644 --- a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/api/PocketEndpointRaw.kt +++ b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/stories/api/PocketEndpointRaw.kt @@ -38,7 +38,7 @@ internal class PocketEndpointRaw internal constructor( @@ -1023,7 +1023,7 @@ index bba2adcfbc..4ea4785f72 100644 /** * Returns a new instance of [PocketEndpointRaw]. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt -index ad4925a34c..bd3da441d4 100644 +index 12e42d150c..c8220857a2 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt @@ -233,17 +233,6 @@ internal object FakeHomepagePreview { @@ -1045,10 +1045,10 @@ index ad4925a34c..bd3da441d4 100644 internal fun recentTabs(tabCount: Int = 2): List = diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt -index 74f5acfc98..e4a4038e33 100644 +index ce7f8df717..d14ec8ffcd 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt -@@ -298,7 +298,7 @@ fun PocketStories( +@@ -355,7 +355,7 @@ fun PocketStories( text = stringResource(R.string.pocket_stories_placeholder_text), backgroundColor = backgroundColor, ) { @@ -1058,7 +1058,7 @@ index 74f5acfc98..e4a4038e33 100644 } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt -index 1a8a1426a1..33b2950e09 100644 +index 65e0f1f394..9ab35acb14 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -21,23 +21,19 @@ import java.net.URLEncoder @@ -1112,10 +1112,10 @@ index 4fb4c7f912..f6fc55c2ee 100644 * @param {Object} aOptions * {int} numItems: The max number of pocket items to fetch -- -2.47.1 +2.48.1 -From db36922d516c3a0764b6f8a7ed7f41403eeb38ee Mon Sep 17 00:00:00 2001 +From 58033bbf15d9887c37864da444df0930113eadf4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 15 Sep 2024 19:19:31 +0200 Subject: [PATCH 7/8] Disable experimental Machine Learning support @@ -1142,19 +1142,19 @@ 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 +- - .../ml/content/EngineProcess.sys.mjs | 11 +--- + .../ml/content/EngineProcess.sys.mjs | 12 +--- .../components/ml/content/ModelHub.sys.mjs | 2 +- toolkit/components/ml/docs/api.rst | 52 +-------------- toolkit/components/ml/docs/models.rst | 2 +- .../ml/tests/browser/browser_ml_cache.js | 2 +- .../ml/tests/browser/browser_ml_utils.js | 65 ------------------- - 7 files changed, 9 insertions(+), 128 deletions(-) + 7 files changed, 9 insertions(+), 129 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 5cee788c0b..8fa82fe672 100644 +index e557a5ac31..65abb31312 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3768,12 +3768,13 @@ pref("browser.translations.chaos.timeoutMS", 0); +@@ -3676,12 +3676,13 @@ pref("browser.translations.chaos.timeoutMS", 0); #ifdef NIGHTLY_BUILD pref("browser.ml.enable", true); #else @@ -1170,10 +1170,10 @@ index 5cee788c0b..8fa82fe672 100644 pref("browser.ml.modelHubUrlTemplate", "{model}/{revision}"); // Maximum disk size for ML model cache (in GiB) diff --git a/toolkit/components/ml/content/EngineProcess.sys.mjs b/toolkit/components/ml/content/EngineProcess.sys.mjs -index 77a0b3f32d..cd8f55023c 100644 +index ac7ce70033..2ffc1e3e21 100644 --- a/toolkit/components/ml/content/EngineProcess.sys.mjs +++ b/toolkit/components/ml/content/EngineProcess.sys.mjs -@@ -98,17 +98,12 @@ class PipelineOptionsValidationError extends Error { +@@ -133,18 +133,12 @@ class PipelineOptionsValidationError extends Error { * @enum {string} */ export const ModelHub = { @@ -1186,14 +1186,15 @@ index 77a0b3f32d..cd8f55023c 100644 - case ModelHub.HUGGINGFACE: - options.modelHubRootUrl = "https://huggingface.co/"; - options.modelHubUrlTemplate = "{model}/resolve/{revision}"; +- options.modelRevision = "main"; - break; - case ModelHub.MOZILLA: - options.modelHubRootUrl = "https://model-hub.mozilla.org/"; + case ModelHub.LOCALHOST: + options.modelHubRootUrl = "https://localhost/"; options.modelHubUrlTemplate = "{model}/{revision}"; + options.modelRevision = "main"; break; - default: diff --git a/toolkit/components/ml/content/ModelHub.sys.mjs b/toolkit/components/ml/content/ModelHub.sys.mjs index b0bc5577ef..03e980bdf8 100644 --- a/toolkit/components/ml/content/ModelHub.sys.mjs @@ -1208,10 +1209,10 @@ index b0bc5577ef..03e980bdf8 100644 const ONE_GIB = 1024 * 1024 * 1024; diff --git a/toolkit/components/ml/docs/api.rst b/toolkit/components/ml/docs/api.rst -index ac7cf839fe..db54695ae9 100644 +index cbe2e9173d..8b64fa52f9 100644 --- a/toolkit/components/ml/docs/api.rst +++ b/toolkit/components/ml/docs/api.rst -@@ -43,7 +43,7 @@ To get access to the full toolbox, set the **devtools.debugger.remote-enabled** +@@ -56,7 +56,7 @@ To get access to the full toolbox, set the **devtools.debugger.remote-enabled** We recommend using the toolbox to get access to more tools. You will get a security warning when starting it, when the toolbox connects to the browser. @@ -1220,7 +1221,7 @@ index ac7cf839fe..db54695ae9 100644 which contains a curated list of models. Available Options -@@ -112,13 +112,6 @@ Each record comes with the following fields: +@@ -127,13 +127,6 @@ Each record comes with the following fields: When the API is about to fetch a file, its URL is controlled in the allow/deny list. @@ -1234,7 +1235,7 @@ index ac7cf839fe..db54695ae9 100644 Each URL is tested and needs to be included in the allowlist and not in the denylist To bypass this check and allow Firefox to download any file for runnings models, -@@ -128,49 +121,6 @@ If you want to add a new hub, organization or a specific model, ask us by +@@ -143,49 +136,6 @@ If you want to add a new hub, organization or a specific model, ask us by `opening a ticket `_. @@ -1298,7 +1299,7 @@ index 3f339c2e1a..4501388a73 100644 Where: - `organization` and `name` are the model id. example " `mozilla/distivit`" diff --git a/toolkit/components/ml/tests/browser/browser_ml_cache.js b/toolkit/components/ml/tests/browser/browser_ml_cache.js -index 81fc266d42..39aaa26186 100644 +index ba197e45e0..75c81407f0 100644 --- a/toolkit/components/ml/tests/browser/browser_ml_cache.js +++ b/toolkit/components/ml/tests/browser/browser_ml_cache.js @@ -55,7 +55,7 @@ function createBlob(size = 8) { @@ -1421,10 +1422,10 @@ index 5d8c5e2096..37d0be7f1e 100644 url: "chrome://gre/somewhere/in/the/code/base", expected: { allowed: true, rejectionType: RejectionType.NONE }, -- -2.47.1 +2.48.1 -From 0634dd1cdb0873c2f02a42d853f457c3b3f75b31 Mon Sep 17 00:00:00 2001 +From e4eda6d4b139eed6ed6a2ba12a5338f56e1842a4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Mon, 16 Sep 2024 01:49:27 +0200 Subject: [PATCH 8/8] Wipe Merino hostname, disable Weather & Yelp @@ -1438,17 +1439,18 @@ suggestions for Weather and Yelp since Iceweasel doesn't ship any providers for these. --- browser/app/profile/firefox.js | 18 +++++++++--------- + .../CardSections.test.jsx | 2 +- browser/components/urlbar/UrlbarPrefs.sys.mjs | 2 +- .../tests/quicksuggest/MerinoTestUtils.sys.mjs | 2 +- .../api/ContentRecommendationEndpointRaw.kt | 5 +---- .../api/ContentRecommendationsResponse.kt | 6 ------ - 5 files changed, 12 insertions(+), 21 deletions(-) + 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 9fb61957b7..66f7dc9297 100644 +index fd5ddfb4bd..06e7a3d9b0 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -479,7 +479,7 @@ pref("browser.urlbar.weather.minKeywordLength", 0); +@@ -501,7 +501,7 @@ pref("browser.urlbar.weather.uiTreatment", 0); // If `browser.urlbar.weather.featureGate` is true, this controls whether // weather suggestions are turned on. @@ -1457,7 +1459,7 @@ index 9fb61957b7..66f7dc9297 100644 // If `browser.urlbar.trending.featureGate` is true, this controls whether // trending suggestions are turned on. -@@ -656,7 +656,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); +@@ -678,7 +678,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); pref("browser.urlbar.groupLabels.enabled", true); // The Merino endpoint URL, not including parameters. @@ -1466,7 +1468,7 @@ index 9fb61957b7..66f7dc9297 100644 // Timeout for Merino fetches (ms). pref("browser.urlbar.merino.timeoutMs", 200); -@@ -679,10 +679,10 @@ pref("browser.urlbar.suggest.addons", true); +@@ -701,10 +701,10 @@ pref("browser.urlbar.suggest.addons", true); // If `browser.urlbar.mdn.featureGate` is true, this controls whether // mdn suggestions are turned on. @@ -1479,7 +1481,7 @@ index 9fb61957b7..66f7dc9297 100644 // 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. -@@ -697,7 +697,7 @@ pref("browser.urlbar.yelp.mlEnabled", false); +@@ -719,7 +719,7 @@ pref("browser.urlbar.yelp.mlEnabled", false); // If `browser.urlbar.yelp.featureGate` is true, this controls whether // Yelp suggestions are turned on. @@ -1488,7 +1490,7 @@ index 9fb61957b7..66f7dc9297 100644 // Feature gate pref for Fakespot suggestions in the urlbar. pref("browser.urlbar.fakespot.featureGate", false); -@@ -1769,7 +1769,7 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); +@@ -1801,7 +1801,7 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/"); // Weather widget for newtab @@ -1497,7 +1499,7 @@ index 9fb61957b7..66f7dc9297 100644 pref("browser.newtabpage.activity-stream.weather.query", ""); pref("browser.newtabpage.activity-stream.weather.display", "simple"); -@@ -1777,10 +1777,10 @@ pref("browser.newtabpage.activity-stream.weather.display", "simple"); +@@ -1809,10 +1809,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. @@ -1510,7 +1512,7 @@ index 9fb61957b7..66f7dc9297 100644 // Preference to enable wallpaper selection in the Customize Menu of new tab page pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", true); -@@ -1921,7 +1921,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.sections.locale-content +@@ -1953,7 +1953,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.sections.locale-content pref("browser.newtabpage.activity-stream.discoverystream.sections.region-content-config", ""); @@ -1519,8 +1521,21 @@ index 9fb61957b7..66f7dc9297 100644 // 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/newtab/test/unit/content-src/components/DiscoveryStreamComponents/CardSections.test.jsx b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/CardSections.test.jsx +index 9dc0d1b45e..3ba7e46efc 100644 +--- a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/CardSections.test.jsx ++++ b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/CardSections.test.jsx +@@ -70,7 +70,7 @@ const DEFAULT_PROPS = { + }, + feed: { + embed_reference: null, +- url: "https://merino.services.mozilla.com/api/v1/curated-recommendations", ++ url: "", + }, + }; + diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs -index ede4188ff3..06f2ac5e59 100644 +index 23540cd21d..194b7f7169 100644 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs @@ -187,7 +187,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ @@ -1546,7 +1561,7 @@ index 03363e67e8..9f5b694d45 100644 score: 0, custom_details: { diff --git a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt -index 3dbb410a23..3d6fb8abc0 100644 +index 59ea47be23..5bef9cba75 100644 --- a/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt +++ b/mobile/android/android-components/components/service/pocket/src/main/java/mozilla/components/service/pocket/recommendations/api/ContentRecommendationEndpointRaw.kt @@ -19,7 +19,7 @@ import org.json.JSONObject @@ -1593,5 +1608,5 @@ index 952b1b7b6e..8f48886551 100644 * @property url The url of the recommendation. * @property title The title of the recommendation. -- -2.47.1 +2.48.1 diff --git a/libre/iceweasel/9003-FSDG-urihandlers.patch b/libre/iceweasel/9003-FSDG-urihandlers.patch index 8781b09..5f301d4 100644 --- a/libre/iceweasel/9003-FSDG-urihandlers.patch +++ b/libre/iceweasel/9003-FSDG-urihandlers.patch @@ -1,4 +1,4 @@ -From 4309ea8272d594d7dc5818efde39320c3132656b Mon Sep 17 00:00:00 2001 +From 20fecb50b986056e85508a831fd63f9b9230899b Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH] Remove URI handlers that serve nonfree software @@ -216,5 +216,5 @@ index e95d627c07..81f9218da9 100644 ], }, -- -2.47.1 +2.48.1 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 01c6ab1..dd60051 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1,4 +1,4 @@ -From 330b832a213edc609c6ace496a7d7cd82fad4dab Mon Sep 17 00:00:00 2001 +From b676903845b2eee713719987ae9037f1c80850bd Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 12 Mar 2022 17:14:25 +0100 Subject: [PATCH 1/7] Replace upstream default bookmarks @@ -78,10 +78,10 @@ index cbed7b2ccc..ba436303df 100644 -- -2.47.1 +2.48.1 -From 92f27bf10f4853c1c2b5a7dcb8a8fb3fae8d5e6d Mon Sep 17 00:00:00 2001 +From fed2bc8b2e8a5cd5faf7f8d248b9dec9a57e6163 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH 2/7] Remove 'More from Mozilla' section in Preferences @@ -103,10 +103,10 @@ 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 d23608bc35..265680dfdb 100644 +index 06e7a3d9b0..9356ed0b6d 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1299,7 +1299,7 @@ pref("browser.preferences.experimental", true); +@@ -1326,7 +1326,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. @@ -116,10 +116,10 @@ index d23608bc35..265680dfdb 100644 // 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 ff015f2849..ae31602951 100644 +index c368ade2ad..08703f6bb6 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -163,15 +163,6 @@ var allowlist = [ +@@ -165,15 +165,6 @@ var allowlist = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, @@ -276,10 +276,10 @@ index 951af95159..e4ba0d94bc 100644 -- -2.47.1 +2.48.1 -From 32b7c4a17cd0e4704817061b221b040f43d19f88 Mon Sep 17 00:00:00 2001 +From 33a3e822cfc7a2e863bfa2813c0730ee2f6da9f9 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:51:06 +0200 Subject: [PATCH 3/7] Remove promos of Firefox Focus and Klar from Private @@ -299,10 +299,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 265680dfdb..82c624d451 100644 +index 9356ed0b6d..1e77f0d8d2 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2329,7 +2329,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u +@@ -2378,7 +2378,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,au,bd,be,bg,br,ca,ch,c pref("browser.promo.focus.disallowed_regions", "cn"); // Default to enabling focus promos to be shown where allowed. @@ -312,10 +312,10 @@ index 265680dfdb..82c624d451 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 ae31602951..918a62ad58 100644 +index 08703f6bb6..e74305dbc3 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -41,8 +41,6 @@ var gExceptionPaths = [ +@@ -40,8 +40,6 @@ var gExceptionPaths = [ "chrome://activity-stream/content/data/content/assets/euo-chatbot.svg", "chrome://browser/content/assets/moz-vpn.svg", "chrome://browser/content/assets/vpn-logo.svg", @@ -645,10 +645,10 @@ index ec36bd513c..8e785ad810 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 9883710a7a..327cb761f2 100644 +index 340b5422cc..a04d55fd31 100644 --- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs +++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs -@@ -451,85 +451,6 @@ const MESSAGES = () => [ +@@ -515,85 +515,6 @@ const MESSAGES = () => [ frequency: { lifetime: 3 }, trigger: { id: "defaultBrowserCheck" }, }, @@ -975,10 +975,10 @@ index 2217ca055c..0000000000 - - -- -2.47.1 +2.48.1 -From 28657a086b794acf8e5170aaab66611b2d1734eb Mon Sep 17 00:00:00 2001 +From 704f5fa9770814422da2fa10107466933883f8cf Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 4/7] Remove 'Extensions for developers' menu item @@ -1036,10 +1036,10 @@ index e75115c220..0abeb4d830 100644 }, }, -- -2.47.1 +2.48.1 -From cd8ecd63a928f62a45d63d49120bc1b15b32ea27 Mon Sep 17 00:00:00 2001 +From 896b2c42c2b11b73b7c885d0321a910141c2efdb Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 12 Mar 2023 21:57:14 +0100 Subject: [PATCH 5/7] Change DuckDuckGo URL to DuckDuckGo HTML URL @@ -1098,10 +1098,10 @@ index 104eee6457..9a3279c622 100644 "suggest_url_get_params": "q={searchTerms}&type=list" } -- -2.47.1 +2.48.1 -From 0e00104f42ba409d33e0ef2fe3089f370ee2e720 Mon Sep 17 00:00:00 2001 +From 51ebe6f1e8a6467c37771628492cf3f566405079 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 @@ -1125,7 +1125,7 @@ to false. 2 files changed, 3 insertions(+), 131 deletions(-) diff --git a/browser/components/genai/GenAI.sys.mjs b/browser/components/genai/GenAI.sys.mjs -index 6c5ff66bff..cecf109075 100644 +index c1c38a6c34..062ee33b90 100644 --- a/browser/components/genai/GenAI.sys.mjs +++ b/browser/components/genai/GenAI.sys.mjs @@ -31,7 +31,7 @@ XPCOMUtils.defineLazyPreferenceGetter( @@ -1280,7 +1280,7 @@ index 6c5ff66bff..cecf109075 100644 name: "localhost", maxLength: 8192, diff --git a/browser/locales/en-US/browser/genai.ftl b/browser/locales/en-US/browser/genai.ftl -index 9e1ad10a88..bcfc7c5961 100644 +index b1b815821f..574842c9c2 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 @@ -1299,10 +1299,10 @@ index 9e1ad10a88..bcfc7c5961 100644 .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.47.1 +2.48.1 -From b5550f2fb97af583df13d645e3da8390cca6deb0 Mon Sep 17 00:00:00 2001 +From b6b2bee813c7f0ee968209324ae90719cf4ffc8d Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH 7/7] Various patches @@ -1378,7 +1378,7 @@ index 0f5b96e7ff..9617795e92 100644 vpn-banner-header = Protection that extends beyond the browser # Note This text is not being translated, and the
will need to be removed if or when it does get translated diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html -index 4f5b2d71a9..d672be9c0d 100644 +index d9f0c3f3f9..5eef0cf7a8 100644 --- a/browser/components/protections/content/protections.html +++ b/browser/components/protections/content/protections.html @@ -571,16 +571,6 @@ @@ -1426,10 +1426,10 @@ index d9fe35c009..1b16604876 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 313be968d3..cd10791da3 100644 +index 5bb198b045..ec2e3dec98 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 = +@@ -838,16 +838,6 @@ sync-signedout-account-signin3 = .label = Sign in to sync… .accesskey = i @@ -1542,5 +1542,5 @@ index 3861d8b613..1f2d087cd5 100644 --firefoxlabs-brand-name = Firefox Labs +-firefoxlabs-brand-name = Iceweasel Labs -- -2.47.1 +2.48.1 diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index c9084fc..ccd0244 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=134.0 +pkgver=135.0 pkgrel=1 _brandingver=131.0 _brandingrel=1 @@ -184,7 +184,7 @@ validpgpkeys+=( BFA8008A8265677063B11BF47171986E4B745536 # Andreas Grapentin (branding source-ball) 3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40 # bill-auger (libre source-ball) ) -sha256sums=('ca88068bd72784c10de16df62359b2dc354672a1a427b4fd6a5fcdb34c06457e' +sha256sums=('827e12a962ef47511089af4498f65ebf42fa57ca31db790bfd7e9a820d16b960' 'SKIP' # $pkgname-symbolic.svg '614f2ab3f7bbe783ca50b94f4c78081ee1f98605156ee8ff379e251191b61bdb' # $pkgname.desktop @@ -194,7 +194,7 @@ sha256sums_i686=('65395a49fd3d998f7e06a430bdd656ad453254dafcc34e21ec7931902d8c18 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('599049006a65bc70ce7a43b8412a260e033888609fefdec33a7aa4cf5427e0a89a725e6a74b396097a9263acafc9251f9a54294c666af1f7355c66ffeff4a007' +b2sums=('a9309d125b48988bc4e5c6989f2a1a0ee169dc7661a3d8d67d6bb32271812b2e22b885fa8384c027835ba1907fe00ad2fb8c8c1e8d87f8dafebbc9939c378edd' 'SKIP' # $pkgname-symbolic.svg '49b4776b3ec8c70194a8f7c5a6467f71820c6a5d6e2033a519fe2742282c6dc141855c6213c67e34b4e0774227d3c15f9083e708c33e7cd6e4c3a982830fefdf' # $pkgname.desktop @@ -228,17 +228,18 @@ mksource+=( https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}- process-json-files.py ) mksha256sums+=( 'c2f97b90795b9cc8fdb2ebb73cda38100529794ba8f4e358d4238fcc5293cee5' # *.branding.tar.xz 'SKIP' - '83efa0d17df6347c64e12a3bc872e0b2905fca6ed1d08dfa15d03bae24e905da' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '5c48cf2dac27d4db41253c20577d2ae05b5c3d16172892f10d9781fd63061039' # 9002-FSDG-preference-defaults.patch - '472ce3b71c5cb231267281f8f25320e718320c90e3e8be7b2d12af25b967fa9f' # 9003-FSDG-urihandlers.patch - 'f90a059c95c7cf72a8fbdf53039e5ec24e373b53468a31a8046c68d81b5c2315' # 9004-FSDG-misc.patch + '81359c5e50d5b4034dca044e193e582ec37ac68be8d8665efe9b596fa4e0ca3f' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + 'e2a5e97ba3a76301ed1ea9560b80e6ae88a32f899e555d173e2542404e0a028e' # 9002-FSDG-preference-defaults.patch + '5ad05d37fe745620023430eb2d21d3656a946f0f9b8894e7f7793b9a74a6b6f8' # 9003-FSDG-urihandlers.patch + 'fc68996ea5416fea2969c9a841e0ffbf2b11857f4e9f1fc18f6e901e331f4648' # 9004-FSDG-misc.patch 'd77624602d6064669e3c44dc4f45fb0ff12d2bf4bbe8e3d36be51a5ae94ca46e' ) # process-json-files.py mkb2sums+=( '3bdd96a8a398075651d4ea1d87fe58193a53d898a70dccc034d7c9d2c9ed13a17b7539bdc8de2925b55d76171b6583313ad6f75d373fc088f0a2a517bc33cb18' # *.branding.tar.xz 'SKIP' - '77a69614b71fef84a4b60eeb2e44c3f21b382ec36976ec24d26e2b4893f4833cb6b3163695ae494f446c89e8ffd98d6db5d553e9ea3b8b8fbae7bb6920acebc1' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '7fb922e7889a010a7779195f2ea89960765ca2e57b8dd0ee95eb1fd365dbe5c4aa27f007c82e0d4c1b64903cc6fe4fea18ed08b4f643bc01e69615656b5417c4' # 9002-FSDG-preference-defaults.patch - 'cb6bb45e80b11021197d1cb422757d6906157396609f46f22c970bb88b373671f0a5518d758a71148b13fd784a8326a30b79ecfa3ad32b5a4ac9132e85296c30' # 9003-FSDG-urihandlers.patch - 'cb4a2501216328d1a029df6d8ef43627cb72cfd33d9c041bca2e38d0bffd93585132a6aa20a7b850e9a2c817bcb1dcd2f188ce5c12dc68a6968cd76350982e15' # 9004-FSDG-misc.patch + '15599fce8a21337f73131886583c38a1dbf4c34f61c32bea951e0fefe9844da7373eead45a5820fef868e4fb2d74277e5f36c26b0548cd51e20783e57467b7f8' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '7e069ad6becd5a3347ea6c6a5a764106edd5811d9e9f249b5dc8717b461de31dd485051cd031bd6b0747b700fabc29180f47c950b55ace920351e654d8299110' # 9002-FSDG-preference-defaults.patch + 'ba73d3c358f254cd06a752a8bf458e138bfb9aa5548fca00bd2b350cb3dbaae522559d6e436183441f1566616847e89e1b6997b3e2775a51e4deb219a74fd36c' # 9003-FSDG-urihandlers.patch + '52611a9550875fd51b769eabfcd8881fa5eaadfc34265b50c54e3b71de245d8343738bc3285711f4a933565b39803b110b48b334c90abe6592274d8d52b93178' # 9004-FSDG-misc.patch + '123a23027f1bf5f0e1f7851de5c95b679d0a110b07f2fc7d2447290157963fce2bbb1f5ed46b0bfdcaf32927cf86cb0226965cafd85a2924be2b1812abb9d4b9' ) # process-json-files.py source=( https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.zst{,.sig} @@ -450,7 +451,8 @@ mksource() { rm -rf .git/ echo "removing pre-built bits" rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/**/*.a | sed 's|/[^/]*\.a$|/*.a|' | sort -u - find \( -iregex '.+test.+bundle\.js' -o -iregex '.+[_.]min\.js' -o -name 'minified.js' \) -exec rm -v {} \; + find \( ! -name 'test_remote_settings_startup_bundle.js' \ + -iregex '.+test.+bundle\.js' -o -iregex '.+[_.]min\.js' -o -name 'minified.js' \) -exec rm -v {} \; sed -i '/mappings.wasm/d' devtools/client/shared/vendor/source-map/lib/moz.build find -name '*.wasm' -exec rm -v {} \;