From 5c486088916365145b4593826800d0022e74abd7 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: May 09 2024 15:04:57 +0000
Subject: libre/iceweasel 125.0.2.parabola1


---

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 e81f2d5..5ca7892 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 924f9c99de6f3223a46e472339c59726e60e5c79 Mon Sep 17 00:00:00 2001
+From f5fee3a8375aa0a40b8023840722e5d5e48b509a Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:20:39 +0200
 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server
@@ -22,9 +22,9 @@ 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 +-
- browser/components/newtab/bin/import-rollouts.js          | 4 ++--
  services/settings/Utils.sys.mjs                           | 2 +-
  services/settings/docs/index.rst                          | 4 ++--
  .../periodic-updates/scripts/periodic_file_updates.sh     | 2 +-
@@ -38,11 +38,33 @@ If necessary, missing files can be added later.
  toolkit/modules/AppConstants.sys.mjs                      | 4 ++--
  14 files changed, 22 insertions(+), 22 deletions(-)
 
+diff --git a/browser/components/asrouter/bin/import-rollouts.js b/browser/components/asrouter/bin/import-rollouts.js
+index d29a31a068..28a94b1bb9 100644
+--- a/browser/components/asrouter/bin/import-rollouts.js
++++ b/browser/components/asrouter/bin/import-rollouts.js
+@@ -36,7 +36,7 @@ const jsonschema = require("../../../../third_party/js/cfworker/json-schema.js")
+ 
+ const DEFAULT_COLLECTION_ID = "nimbus-desktop-experiments";
+ const BASE_URL =
+-  "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/";
++  "resource://app/defaults/settings/main/";
+ const EXPERIMENTER_URL = "https://experimenter.services.mozilla.com/nimbus/";
+ const OUTPUT_PATH = "./tests/NimbusRolloutMessageProvider.sys.mjs";
+ const LICENSE_STRING = `/* This Source Code Form is subject to the terms of the Mozilla Public
+@@ -233,7 +233,7 @@ async function main() {
+     }
+   );
+ 
+-  const RECORDS_URL = `${BASE_URL}${cli.flags.collection}/records`;
++  const RECORDS_URL = `${BASE_URL}${cli.flags.collection}.json`;
+ 
+   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 7d4484dc83..9346d518e6 100644
+index befce707ef..eb20567593 100644
 --- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
 +++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-@@ -874,7 +874,7 @@ export class ASRouterAdminInner extends React.PureComponent {
+@@ -870,7 +870,7 @@ export class ASRouterAdminInner extends React.PureComponent {
                    <a
                      className="providerUrl"
                      target="_blank"
@@ -52,10 +74,10 @@ index 7d4484dc83..9346d518e6 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 614e8a62a1..3ce250c6ed 100644
+index b38d551a17..5c2920d822 100644
 --- a/browser/components/asrouter/content/asrouter-admin.bundle.js
 +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js
-@@ -1641,7 +1641,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P
+@@ -1622,7 +1622,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P
          label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", {
            className: "providerUrl",
            target: "_blank",
@@ -64,28 +86,6 @@ index 614e8a62a1..3ce250c6ed 100644
            rel: "noopener noreferrer"
          }, "nimbus-desktop-experiments"), ")");
        }
-diff --git a/browser/components/newtab/bin/import-rollouts.js b/browser/components/newtab/bin/import-rollouts.js
-index ce22d4a114..b2dc35e9d9 100644
---- a/browser/components/newtab/bin/import-rollouts.js
-+++ b/browser/components/newtab/bin/import-rollouts.js
-@@ -36,7 +36,7 @@ const jsonschema = require("../../../../third_party/js/cfworker/json-schema.js")
- 
- const DEFAULT_COLLECTION_ID = "nimbus-desktop-experiments";
- const BASE_URL =
--  "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/";
-+  "resource://app/defaults/settings/main/";
- const EXPERIMENTER_URL = "https://experimenter.services.mozilla.com/nimbus/";
- const OUTPUT_PATH = "./test/NimbusRolloutMessageProvider.sys.mjs";
- const LICENSE_STRING = `/* This Source Code Form is subject to the terms of the Mozilla Public
-@@ -237,7 +237,7 @@ async function main() {
-     }
-   );
- 
--  const RECORDS_URL = `${BASE_URL}${cli.flags.collection}/records`;
-+  const RECORDS_URL = `${BASE_URL}${cli.flags.collection}.json`;
- 
-   console.log(`Fetching records from ${chalk.underline.yellow(RECORDS_URL)}`);
- 
 diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
 index 73c83e526b..653cabe7e1 100644
 --- a/services/settings/Utils.sys.mjs
@@ -100,7 +100,7 @@ index 73c83e526b..653cabe7e1 100644
    /**
     * Logger instance.
 diff --git a/services/settings/docs/index.rst b/services/settings/docs/index.rst
-index 3e042f67e4..dc8584c318 100644
+index c91d5e6ba6..eb358715f7 100644
 --- a/services/settings/docs/index.rst
 +++ b/services/settings/docs/index.rst
 @@ -177,11 +177,11 @@ It is possible to package a dump of the server records that will be loaded into
@@ -118,10 +118,10 @@ index 3e042f67e4..dc8584c318 100644
  #. Add the filename to the ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build``
  #. Add the filename to the ``[browser]`` section of ``mobile/android/installer/package-manifest.in`` IF the file should be bundled with Android.
 diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
-index 160b7fbc35..2e9dcde464 100755
+index f01f5cd9c3..0524504266 100755
 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
 +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
-@@ -286,7 +286,7 @@ function compare_suffix_lists {
+@@ -293,7 +293,7 @@ function compare_suffix_lists {
  }
  
  function compare_remote_settings_files {
@@ -131,15 +131,15 @@ index 160b7fbc35..2e9dcde464 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 28ac46a2c2..e8a54e1bac 100644
+index 8a2b63f314..c6796dddbd 100644
 --- a/third_party/rust/remote_settings/.cargo-checksum.json
 +++ b/third_party/rust/remote_settings/.cargo-checksum.json
 @@ -1 +1 @@
--{"files":{"Cargo.toml":"cf0a08d6b0d6285a459b78115aa24818a04b5987652655e64b80ffd8c8ae0813","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"3d87162e6913a81cc6f5178a7ca791e262d0d029e7dedf3df4fe2f66e5501185","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}
+-{"files":{"Cargo.toml":"4fa89b0606fe8ec8ac8c479b8b9adf33d0c936b09fa5af108ded74139ace37fb","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"fb3f2cd47460e5ae07a5e8d61b358d588d14075bd9dd6b6e818e1af74abd5dba","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"2e71491ad3894d17e5bde0663d9490bfea6294d99cdbe9d67a36137faeedc593","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}
 \ No newline at end of file
-+{"files":{"Cargo.toml":"cf0a08d6b0d6285a459b78115aa24818a04b5987652655e64b80ffd8c8ae0813","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"ff1ab5961fe695989d1ff343c5042ce0f907dc323da2ba87005fc9437919b448","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}
++{"files":{"Cargo.toml":"4fa89b0606fe8ec8ac8c479b8b9adf33d0c936b09fa5af108ded74139ace37fb","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"07e0bc48379de4ead6ae06a42a6329ed62febc8ad84ed4dc1cdf0060dde3709d","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"2e71491ad3894d17e5bde0663d9490bfea6294d99cdbe9d67a36137faeedc593","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}
 diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs
-index 9585a7cc7c..1c97208b82 100644
+index 0d99de9cc1..ad0e2acf41 100644
 --- a/third_party/rust/remote_settings/src/client.rs
 +++ b/third_party/rust/remote_settings/src/client.rs
 @@ -33,7 +33,7 @@ impl Client {
@@ -151,7 +151,7 @@ index 9585a7cc7c..1c97208b82 100644
          let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main"));
          let base_url = Url::parse(&server_url)?;
  
-@@ -518,7 +518,7 @@ mod test {
+@@ -521,7 +521,7 @@ mod test {
          };
          let client = Client::new(config).unwrap();
          assert_eq!(
@@ -174,7 +174,7 @@ index e49d8513ba..c1c6ae5deb 100644
  they apply.
  
 diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
-index bb9d71b5c0..ec0c5f11d7 100644
+index 6fc1d789b9..ca0e5c719f 100644
 --- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 +++ b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 @@ -19,8 +19,8 @@
@@ -189,10 +189,10 @@ index bb9d71b5c0..ec0c5f11d7 100644
  // --preview: enable Remote Settings and Experiment previews.
  //
 diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs
-index 8e474b58a2..a8cd3cccac 100644
+index 27c8f8ad03..d67f112985 100644
 --- a/toolkit/components/search/SearchUtils.sys.mjs
 +++ b/toolkit/components/search/SearchUtils.sys.mjs
-@@ -193,13 +193,13 @@ export var SearchUtils = {
+@@ -201,13 +201,13 @@ export var SearchUtils = {
  
    ENGINES_URLS: {
      "prod-main":
@@ -232,10 +232,10 @@ index c782f9f7c3..4d773d27c5 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 36b26056ec..ba54202045 100644
+index bfc87fa622..a7527af0fd 100644
 --- a/toolkit/modules/AppConstants.sys.mjs
 +++ b/toolkit/modules/AppConstants.sys.mjs
-@@ -416,9 +416,9 @@ export var AppConstants = Object.freeze({
+@@ -419,9 +419,9 @@ export var AppConstants = Object.freeze({
  
    REMOTE_SETTINGS_SERVER_URL:
  #ifdef MOZ_THUNDERBIRD
@@ -248,10 +248,10 @@ index 36b26056ec..ba54202045 100644
  
    REMOTE_SETTINGS_VERIFY_SIGNATURE:
 -- 
-2.43.0
+2.44.0
 
 
-From 3536b16aa46bda48ac8692ca72e978837fcef796 Mon Sep 17 00:00:00 2001
+From 5695ac81d69210b834715ff627c14aef23c8925e Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:34:08 +0200
 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts
@@ -292,10 +292,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 b93da0f0e4..8d59bc6b05 100644
+index c06e99eb2a..3bb8832c4b 100644
 --- a/services/settings/remote-settings.sys.mjs
 +++ b/services/settings/remote-settings.sys.mjs
-@@ -575,11 +575,7 @@ function remoteSettingsFunction() {
+@@ -578,11 +578,7 @@ function remoteSettingsFunction() {
        moduleURI: import.meta.url,
        symbolName: "remoteSettingsBroadcastHandler",
      };
@@ -308,7 +308,7 @@ index b93da0f0e4..8d59bc6b05 100644
    };
  
    return remoteSettings;
-@@ -599,9 +595,6 @@ export var remoteSettingsBroadcastHandler = {
+@@ -602,9 +598,6 @@ export var remoteSettingsBroadcastHandler = {
        `Push notification received (version=${version} phase=${phase})`
      );
  
@@ -320,10 +320,10 @@ index b93da0f0e4..8d59bc6b05 100644
    },
  };
 -- 
-2.43.0
+2.44.0
 
 
-From 528c5d6d9437c003b731b3531273dbeb10422a0c Mon Sep 17 00:00:00 2001
+From 4d33af45258c3c21424a7a3299d2541d32dec2af Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:41:54 +0200
 Subject: [PATCH 03/13] Remove timer that triggers polling for changes
@@ -364,10 +364,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.43.0
+2.44.0
 
 
-From d13036fd21af770da7d305d058ecedd560afba2f Mon Sep 17 00:00:00 2001
+From 9e51dd108accc4247fea093d9bba0a533fab5623 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:47:41 +0200
 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally
@@ -386,10 +386,10 @@ code that expects them.
  create mode 100644 services/settings/dumps/monitor/moz.build
 
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index b3213b8c44..0f953c3425 100644
+index 1b87a9ab4a..0542b8b239 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -258,6 +258,7 @@
+@@ -248,6 +248,7 @@
  @RESPATH@/browser/defaults/settings/last_modified.json
  @RESPATH@/browser/defaults/settings/blocklists
  @RESPATH@/browser/defaults/settings/main
@@ -477,10 +477,10 @@ index f407580bfa..53e9d8b45e 100644
  ]
  
 -- 
-2.43.0
+2.44.0
 
 
-From b2a061b8b79988eeef189af214fa03e4d7c76153 Mon Sep 17 00:00:00 2001
+From 0dcc08dcb124b552415b7d9603d90b2005307d82 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:52:10 +0200
 Subject: [PATCH 05/13] Utils: disable offline checking
@@ -513,10 +513,10 @@ index e4d4247253..296001536c 100644
    },
  
 -- 
-2.43.0
+2.44.0
 
 
-From 96d145c3ca83e835c4ec6711e75c01627e509ea0 Mon Sep 17 00:00:00 2001
+From 1bca9bbd252fa445cbf26c22f91ef74b868adf95 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:56:02 +0200
 Subject: [PATCH 06/13] Refactor hashing logic to a separate function
@@ -567,10 +567,10 @@ index 1eeaf0bed9..d998a2d3b1 100644
  
    /**
 -- 
-2.43.0
+2.44.0
 
 
-From b612fe1de7381746ac51694a4110268d0769ca6c Mon Sep 17 00:00:00 2001
+From 33b69866397602678bdcf7e16d9374ca569a6f6c Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 18:05:02 +0200
 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump
@@ -605,7 +605,7 @@ 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 7e95b9baab..989a3180b8 100644
+index c521b72123..16d288da38 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
 @@ -706,11 +706,9 @@ export class RemoteSettingsClient extends EventEmitter {
@@ -713,10 +713,10 @@ index 7e95b9baab..989a3180b8 100644
        remoteRecords,
      };
 -- 
-2.43.0
+2.44.0
 
 
-From 9eaa21162fc1e2abeb24381edd4bea01fd103065 Mon Sep 17 00:00:00 2001
+From f0c05d180b69a5d32f0c5db3fa99fccdf0750daa Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 18:42:56 +0200
 Subject: [PATCH 08/13] Client: start deferred sync on get() or on()
@@ -738,7 +738,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 989a3180b8..c2c2a5734b 100644
+index 16d288da38..ab1f507e8a 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
 @@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -818,10 +818,10 @@ index 989a3180b8..c2c2a5734b 100644
     * Synchronize the local database with the remote server.
     *
 -- 
-2.43.0
+2.44.0
 
 
-From 4598808209c3a9a8cd3902053b250c88861bced2 Mon Sep 17 00:00:00 2001
+From fd0363ac2bab5ae134ab840a7bc73e95fe0c8207 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 18:53:51 +0200
 Subject: [PATCH 09/13] Client: deep compare records if timestamps match
@@ -843,7 +843,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 c2c2a5734b..ee612a049c 100644
+index ab1f507e8a..c5b6dacc15 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";
@@ -867,10 +867,10 @@ index c2c2a5734b..ee612a049c 100644
            }
          } else {
 -- 
-2.43.0
+2.44.0
 
 
-From 79445efeb9c18ad9c2e2c4070cdc72aa6b736d1e Mon Sep 17 00:00:00 2001
+From 32623ba28e591f36ded9afa495d8bd4f4aea90a2 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:01:39 +0200
 Subject: [PATCH 10/13] Client: delete more data on cleanup
@@ -888,7 +888,7 @@ 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 ee612a049c..b3c6caebba 100644
+index c5b6dacc15..003d1bb4d0 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
 @@ -255,7 +255,7 @@ class AttachmentDownloader extends Downloader {
@@ -932,10 +932,10 @@ index ee612a049c..b3c6caebba 100644
     * Fetch information from changeset endpoint.
     *
 -- 
-2.43.0
+2.44.0
 
 
-From 24ba3c8ca82381eba887a318fb09f6d24e07064c Mon Sep 17 00:00:00 2001
+From 0ce759fdd68a9a1e7c4d163fab32f34071e3f6ca Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:07:56 +0200
 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps
@@ -950,7 +950,7 @@ 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 b3c6caebba..264a6cc831 100644
+index 003d1bb4d0..610b327c1e 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
 @@ -1075,14 +1075,9 @@ export class RemoteSettingsClient extends EventEmitter {
@@ -969,10 +969,10 @@ index b3c6caebba..264a6cc831 100644
      await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
        clear: retry,
 -- 
-2.43.0
+2.44.0
 
 
-From 633d8d40e00786b388e62898e32414d1305fa91f Mon Sep 17 00:00:00 2001
+From 32dca09cb4163315643939ddc9fd98e3f03227f0 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:15:44 +0200
 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
@@ -982,22 +982,23 @@ Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
  1 file changed, 8 insertions(+), 29 deletions(-)
 
 diff --git a/services/settings/Attachments.sys.mjs b/services/settings/Attachments.sys.mjs
-index 5ddc6bb046..f7888cb769 100644
+index 345bf1e8e6..3db73c9cab 100644
 --- a/services/settings/Attachments.sys.mjs
 +++ b/services/settings/Attachments.sys.mjs
-@@ -147,9 +147,10 @@ export class Downloader {
+@@ -200,10 +200,11 @@ export class Downloader {
        retries,
        checkHash,
        attachmentId = record?.id,
 -      fallbackToCache = false,
        fallbackToDump = false,
+       avoidDownload = false,
      } = options || {};
 +    const fallbackToCache = false;
 +
      if (!attachmentId) {
        // Check for pre-condition. This should not happen, but it is explicitly
        // checked to avoid mixing up attachments, which could be dangerous.
-@@ -200,6 +201,7 @@ export class Downloader {
+@@ -254,6 +255,7 @@ export class Downloader {
          const newBuffer = await this.downloadAsBytes(record, {
            retries,
            checkHash,
@@ -1005,7 +1006,7 @@ index 5ddc6bb046..f7888cb769 100644
          });
          const blob = new Blob([newBuffer]);
          // Store in cache but don't wait for it before returning.
-@@ -233,7 +235,7 @@ export class Downloader {
+@@ -287,7 +289,7 @@ export class Downloader {
        }
  
        try {
@@ -1014,7 +1015,7 @@ index 5ddc6bb046..f7888cb769 100644
        } catch (e) {
          // Failed to read from cache, e.g. IndexedDB unusable.
          console.error(e);
-@@ -318,7 +320,7 @@ export class Downloader {
+@@ -375,7 +377,7 @@ export class Downloader {
     * @returns {String} the absolute file path to the downloaded attachment.
     */
    async downloadToDisk(record, options = {}) {
@@ -1023,7 +1024,7 @@ index 5ddc6bb046..f7888cb769 100644
      const {
        attachment: { filename, size, hash },
      } = record;
-@@ -373,33 +375,10 @@ export class Downloader {
+@@ -430,33 +432,10 @@ export class Downloader {
     */
    async downloadAsBytes(record, options = {}) {
      const {
@@ -1061,10 +1062,10 @@ index 5ddc6bb046..f7888cb769 100644
  
    /**
 -- 
-2.43.0
+2.44.0
 
 
-From c0b96623a42ed3c74218fcc2574f78196fd901ff Mon Sep 17 00:00:00 2001
+From b4225f1c9949f27349d29bfa266ad6fa5dc97cd9 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:22:20 +0200
 Subject: [PATCH 13/13] Disable CRLite entirely for now
@@ -1089,10 +1090,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 592ddd3229..9688ee64fd 100644
+index 835450712a..c9f8b2927a 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -14167,7 +14167,7 @@
+@@ -14563,7 +14563,7 @@
  # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".
  - name: security.pki.crlite_mode
    type: RelaxedAtomicUint32
@@ -1102,10 +1103,10 @@ index 592ddd3229..9688ee64fd 100644
  
  - name: security.tls.version.min
 diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
-index dd14b5c24c..90350be691 100644
+index 5f3792fd52..f5b655c2f0 100644
 --- a/security/manager/ssl/nsNSSComponent.cpp
 +++ b/security/manager/ssl/nsNSSComponent.cpp
-@@ -1129,6 +1129,7 @@ void nsNSSComponent::setValidationOptions(
+@@ -1176,6 +1176,7 @@ void nsNSSComponent::setValidationOptions(
    CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;
    CRLiteMode crliteMode =
        static_cast<CRLiteMode>(StaticPrefs::security_pki_crlite_mode());
@@ -1114,5 +1115,5 @@ index dd14b5c24c..90350be691 100644
      case CRLiteMode::Disabled:
      case CRLiteMode::TelemetryOnly:
 -- 
-2.43.0
+2.44.0
 
diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index 667c55e..74d7742 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -1,7 +1,7 @@
-From 2fec68a4597270e7fce1c0a4e3a328be4766a2d3 Mon Sep 17 00:00:00 2001
+From 9f77e0e2463614448a5575c8b24fab8fdd417f95 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Apr 2021 13:09:05 +0300
-Subject: [PATCH 1/5] geolocation: Disable API and remove Google API URLs
+Subject: [PATCH 1/6] geolocation: Disable API and remove Google API URLs
 
 The idea for Iceweasel is to reference only services which can be
 self-hosted using 100% free software stack.
@@ -18,14 +18,15 @@ possible while keeping the SW stack 100% free, release builds don't have
 any valid geolocation provider, so let's disable geolocation API by
 default for now.
 ---
+ modules/libpref/init/StaticPrefList.yaml | 2 +-
  modules/libpref/init/all.js              | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 5632486c69..b977858e04 100644
+index c9f8b2927a..4d93c69b4f 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -5616,7 +5616,7 @@
+@@ -5559,7 +5559,7 @@
  # Is support for Navigator.geolocation enabled?
  - name: geo.enabled
    type: bool
@@ -35,10 +36,10 @@ index 5632486c69..b977858e04 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 af04cba691..514f750a23 100644
+index 7157f197e8..3c962f6dc1 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -3094,7 +3094,7 @@ pref("network.psl.onUpdate_notify", false);
+@@ -3110,7 +3110,7 @@ pref("network.psl.onUpdate_notify", false);
  
  // All the Geolocation preferences are here.
  //
@@ -48,13 +49,13 @@ index af04cba691..514f750a23 100644
  // Timeout to wait before sending the location request.
  pref("geo.provider.network.timeToWaitBeforeSending", 5000);
 -- 
-2.41.0
+2.44.0
 
 
-From 413f141022f562beb53ed87370146a123872f35b Mon Sep 17 00:00:00 2001
+From 4bbdf5c5e986d99e9df238549731428b212e8fee Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Apr 2021 13:49:05 +0300
-Subject: [PATCH 2/5] Disable banners and remove URLs for mobile apps on
+Subject: [PATCH 2/6] Disable banners and remove URLs for mobile apps on
  about:protections page
 
 ---
@@ -62,10 +63,10 @@ Subject: [PATCH 2/5] 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 a7d255df89..801816dc41 100644
+index 32cd57b0ed..fd8dde1cda 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1955,7 +1955,7 @@ pref("browser.contentblocking.report.monitor.enabled", false);
+@@ -2116,7 +2116,7 @@ pref("browser.contentblocking.report.monitor.enabled", false);
  pref("browser.contentblocking.report.proxy.enabled", false);
  
  // Disable the mobile promotion by default.
@@ -74,7 +75,7 @@ index a7d255df89..801816dc41 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
-@@ -1989,7 +1989,7 @@ pref("browser.promo.cookiebanners.enabled", false);
+@@ -2146,7 +2146,7 @@ pref("browser.promo.pin.enabled", true);
  // Set to true for Fx113 (see bug 1808611)
  pref("browser.promo.cookiebanners.enabled", false);
  
@@ -83,7 +84,7 @@ index a7d255df89..801816dc41 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");
-@@ -2000,12 +2000,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
+@@ -2157,12 +2157,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");
@@ -103,13 +104,13 @@ index a7d255df89..801816dc41 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.41.0
+2.44.0
 
 
-From 275785d94093d5c2dd46739484a2744642df357f Mon Sep 17 00:00:00 2001
+From 33a3782b5b5e0ac27b4f39d2f10b625915d8c14f Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Tue, 17 Jan 2023 21:59:51 +0100
-Subject: [PATCH 3/5] FSDG: Remove some references to AMO
+Subject: [PATCH 3/6] FSDG: Remove some references to AMO
 
 * addons.mozilla.org (AMO) is a third-party repository, not compatible
   with the FSDG, because it is not committed to only including free
@@ -133,16 +134,29 @@ Subject: [PATCH 3/5] FSDG: Remove some references to AMO
 
 [1] https://labs.parabola.nu/issues/2409#note-4
 ---
- browser/app/profile/firefox.js        | 12 ++++++------
+ browser/app/profile/firefox.js        | 18 +++++++++---------
  mobile/android/app/geckoview-prefs.js |  8 ++++----
  modules/libpref/init/all.js           |  8 ++++----
- 3 files changed, 14 insertions(+), 14 deletions(-)
+ 3 files changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 801816dc41..9c2562ff23 100644
+index fd8dde1cda..475eb1b77f 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -33,12 +33,12 @@ pref("extensions.postDownloadThirdPartyPrompt", true);
+@@ -22,9 +22,9 @@
+ pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindowMac.xhtml");
+ 
+ // Set add-ons abuse report related prefs specific to Firefox Desktop.
+-pref("extensions.abuseReport.enabled", true);
+-pref("extensions.abuseReport.amWebAPI.enabled", true);
+-pref("extensions.abuseReport.amoFormEnabled", true);
++pref("extensions.abuseReport.enabled", false);
++pref("extensions.abuseReport.amWebAPI.enabled", false);
++pref("extensions.abuseReport.amoFormEnabled", false);
+ 
+ // Enables some extra Extension System Logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
+@@ -38,12 +38,12 @@ pref("extensions.postDownloadThirdPartyPrompt", true);
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
@@ -162,10 +176,10 @@ index 801816dc41..9c2562ff23 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/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
-index c1983abc2b..35c24e5d43 100644
+index 6d136b1a0a..604df7045c 100644
 --- a/mobile/android/app/geckoview-prefs.js
 +++ b/mobile/android/app/geckoview-prefs.js
-@@ -228,11 +228,11 @@ pref("extensions.experiments.enabled", false);
+@@ -223,11 +223,11 @@ pref("extensions.experiments.enabled", false);
  // Support credit cards in GV autocomplete API (bug 1691819)
  pref("extensions.formautofill.addresses.capture.enabled", true);
  
@@ -182,10 +196,10 @@ index c1983abc2b..35c24e5d43 100644
  // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile
  pref("extensions.installDistroAddons", false);
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index 514f750a23..abbf229223 100644
+index 3c962f6dc1..5f4e6b2e4a 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -1851,11 +1851,11 @@ pref("services.common.uptake.sampleRate", 1);   // 1%
+@@ -1880,11 +1880,11 @@ pref("services.common.uptake.sampleRate", 1);   // 1%
  pref("extensions.abuseReport.enabled", false);
  // Whether abuse report originated from AMO should use the Firefox integrated dialog.
  pref("extensions.abuseReport.amWebAPI.enabled", false);
@@ -200,7 +214,7 @@ index 514f750a23..abbf229223 100644
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -3158,7 +3158,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true);
+@@ -3174,7 +3174,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.
@@ -209,31 +223,14 @@ index 514f750a23..abbf229223 100644
  
  // The URL for the privacy policy related to recommended add-ons.
  pref("extensions.recommendations.privacyPolicyUrl", "");
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 1f1b1cbd3e..7ea9d82cdf 100644
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -22,9 +22,9 @@
- pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindowMac.xhtml");
- 
- // Set add-ons abuse report related prefs specific to Firefox Desktop.
--pref("extensions.abuseReport.enabled", true);
--pref("extensions.abuseReport.amWebAPI.enabled", true);
--pref("extensions.abuseReport.amoFormEnabled", true);
-+pref("extensions.abuseReport.enabled", false);
-+pref("extensions.abuseReport.amWebAPI.enabled", false);
-+pref("extensions.abuseReport.amoFormEnabled", false);
- 
- // Enables some extra Extension System Logging (can reduce performance)
- pref("extensions.logging.enabled", false);
 -- 
-2.41.0
+2.44.0
 
 
-From 7c742c2c0e0bd817fd646d0b83a0265c67d6c5fb Mon Sep 17 00:00:00 2001
+From dd0e60923858fb40bebb02df7c62be2e5cd763d3 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Jun 2023 13:16:40 +0200
-Subject: [PATCH 4/5] FSDG: Disable Contile and autoupdate of system addons
+Subject: [PATCH 4/6] FSDG: Disable Contile and autoupdate of system addons
 
 1. Contile (see change context lines) is used to fetch sponsored top
    sites, which are not controlled by Parabola and are likely to not
@@ -250,10 +247,10 @@ 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 9c2562ff23..7577fbe008 100644
+index 475eb1b77f..8f4ed154de 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -48,8 +48,8 @@ pref("extensions.recommendations.themeRecommendationUrl", "https://color.firefox
+@@ -53,8 +53,8 @@ pref("extensions.recommendations.themeRecommendationUrl", "https://color.firefox
  pref("extensions.update.autoUpdateDefault", true);
  
  // Check AUS for system add-on updates.
@@ -263,8 +260,8 @@ index 9c2562ff23..7577fbe008 100644
 +pref("extensions.systemAddon.update.enabled", false);
  
  // Disable add-ons that are not installed by the user in all scopes by default.
- // See the SCOPE constants in AddonManager.jsm for values to use here.
-@@ -1603,8 +1603,8 @@ pref("prompts.defaultModalType", 3);
+ // See the SCOPE constants in AddonManager.sys.mjs for values to use here.
+@@ -1667,8 +1667,8 @@ pref("prompts.defaultModalType", 3);
  
  pref("browser.topsites.useRemoteSetting", true);
  // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
@@ -276,80 +273,79 @@ index 9c2562ff23..7577fbe008 100644
  // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile.
  pref("browser.topsites.contile.sov.enabled", true);
 -- 
-2.41.0
+2.44.0
 
 
-From 40f5b56ba68e3f256fa3672a77efd0c1951d7e00 Mon Sep 17 00:00:00 2001
+From bf7d0977cb8d1f24aeceafc97c32bbd29a210d27 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Tue, 26 Sep 2023 21:27:34 +0200
-Subject: [PATCH 5/5] FSDG: Disable Firefox Translations for now
+Subject: [PATCH 5/6] FSDG: Disable Firefox Translations for now
 
-Although fully local translation is a great achievement, I'd hesitate to keep it 
+Although fully local translation is a great achievement, I'd hesitate to keep it
 enabled for now, because of the following concerns:
 
 1. According to the FSDG [1]:
 
- > All information for practical use in a free distribution must be available in 
+ > All information for practical use in a free distribution must be available in
 source form.
- 
- Translation models are downloaded as Remote Settings attachments, see their 
-paths on the attachment server, for example in [2] in the source tree. The 
-hostname of that server is returned by Remote Settings server, access to which 
-is disabled by 9001-FSDG-sync-remote-settings-with-local-dump.patch and 
-PKGBUILD. So in my understanding, to comply with the FSDG, the distro has to 
-make sources of those models available. It looks like those can be found using 
+
+ Translation models are downloaded as Remote Settings attachments, see their
+paths on the attachment server, for example in [2] in the source tree. The
+hostname of that server is returned by Remote Settings server, access to which
+is disabled by 9001-FSDG-sync-remote-settings-with-local-dump.patch and
+PKGBUILD. So in my understanding, to comply with the FSDG, the distro has to
+make sources of those models available. It looks like those can be found using
 info from [4], but even then...
- 
+
 2. According to FSDG [3]:
 
- > a free system distribution cannot include free software that can only be 
+ > a free system distribution cannot include free software that can only be
 built by using nonfree software.
- 
- It depends on whether those models can be considered software (or "information 
-for practical use" in case the FSDG is not totally precise when talking only 
-about software here). While the models are freely licensed [4], their README 
-mentions the first training pipeline [5] that lists CUDA and CUDNN in the 
-requirements. Both are nonfree and blocklisted in Parabola. Further research is 
+
+ It depends on whether those models can be considered software (or "information
+for practical use" in case the FSDG is not totally precise when talking only
+about software here). While the models are freely licensed [4], their README
+mentions the first training pipeline [5] that lists CUDA and CUDNN in the
+requirements. Both are nonfree and blocklisted in Parabola. Further research is
 needed on possibility to make the models with 100% free software stack.
 
-3. Because calls to Remote Settings server are disabled, as mentioned above, the 
-models won't be downloaded anyway, and Firefox Translations feature will be 
-broken, so keeping it enabled would lead to poor user experience. An alternative 
-would be to use something like [6], but that requires additional research and 
+3. Because calls to Remote Settings server are disabled, as mentioned above, the
+models won't be downloaded anyway, and Firefox Translations feature will be
+broken, so keeping it enabled would lead to poor user experience. An alternative
+would be to use something like [6], but that requires additional research and
 probably has the same issues with the toolchain for the models.
- 
+
 [1] https://www.gnu.org/distros/free-system-distribution-guidelines.html#license-rules
 [2] services/settings/dumps/main/translations-models.json
 [3] https://www.gnu.org/distros/free-system-distribution-guidelines.html#complete-distros
 [4] WARNING! GitHub webpage is likely to run nonfree software in user's web browser, so at least disable JavaScript when opening: https://github.com/mozilla/firefox-translations-models
 [5] WARNING! GitHub webpage is likely to run nonfree software in user's web browser, so at least disable JavaScript when opening: https://github.com/mozilla/firefox-translations-training
 [6] https://addons.mozilla.org/en-US/firefox/addon/translatelocally-for-firefox/
-
 ---
  browser/app/profile/firefox.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index f58075204d..a2ffbec390 100644
+index 8f4ed154de..83c8be3f66 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1882,7 +1882,7 @@ pref("browser.translation.neverForLanguages", "");
+@@ -1979,7 +1979,7 @@ pref("browser.translation.neverForLanguages", "");
  
  // Enable Firefox translations powered by the Bergamot translations
  // engine https://browser.mt/.
 -pref("browser.translations.enable", true);
 +pref("browser.translations.enable", false);
-
+ 
  // Enable the new Firefox Translations Settings UI Design
  pref("browser.translations.newSettingsUI.enable", false);
 -- 
-2.42.0
+2.44.0
 
 
-From e0f27816208ff4371f9de3e2a9190f1a26a4a2f8 Mon Sep 17 00:00:00 2001
+From 9403ce83446a514b5e38150645d46da30496772e Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Fri, 17 Nov 2023 20:52:18 +0100
-Subject: [PATCH] FSDG: Put a fuse, to blow up when upstream switches to
+Subject: [PATCH 6/6] FSDG: Put a fuse, to blow up when upstream switches to
  search-config-v2
 
 process-json-files.py will probably need rework.
@@ -358,10 +354,10 @@ process-json-files.py will probably need rework.
  1 file changed, 2 insertions(+)
 
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index 86bfe71247..af91481d2d 100644
+index 5f4e6b2e4a..33ebfaff66 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -3462,6 +3462,8 @@ pref("browser.search.removeEngineInfobar.enabled", true);
+@@ -3476,6 +3476,8 @@ pref("browser.search.removeEngineInfobar.enabled", true);
  // Enables a new search configuration style with no functional changes for the
  // user. This is solely intended as a rollout button - it will go away once the
  // new configuration has been rolled out.
@@ -371,4 +367,5 @@ index 86bfe71247..af91481d2d 100644
  
  // GMPInstallManager prefs
 -- 
-2.42.1
+2.44.0
+
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index aa7fd8a..e5a7195 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -149,11 +149,11 @@ index df8a1997a7..40696ea097 100644
  
    // layout/mathml/nsMathMLChar.cpp
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index 2131a15cee..dd4697a368 100644
+index 3b60d18e48..a99a427e1d 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -14,11 +14,8 @@ browser.jar:
-    content/browser/preferences/containers.js
+@@ -15,11 +15,8 @@ browser.jar:
+    content/browser/preferences/translations.js
     content/browser/preferences/sync.js
     content/browser/preferences/experimental.js
 -   content/browser/preferences/moreFromMozilla.js
@@ -253,10 +253,10 @@ index 115a67c962..3f9b72b021 100644
    // registered and inititalized since many tests wait for the
    // "sync-pane-loaded" observer notification before starting the test.
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index a355a63d64..835cebe655 100644
+index eee227822a..7ebf547d2c 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
-@@ -31,7 +31,6 @@
+@@ -47,7 +47,6 @@
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
    <link rel="localization" href="browser/preferences/fonts.ftl"/>
@@ -264,7 +264,7 @@ index a355a63d64..835cebe655 100644
    <link rel="localization" href="browser/preferences/preferences.ftl"/>
    <link rel="localization" href="toolkit/branding/accounts.ftl"/>
    <link rel="localization" href="toolkit/branding/brandings.ftl"/>
-@@ -156,16 +155,6 @@
+@@ -168,16 +167,6 @@
            <image class="category-icon"/>
            <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>
          </richlistitem>
@@ -278,11 +278,11 @@ index a355a63d64..835cebe655 100644
 -          <image class="category-icon"/>
 -          <label class="category-name" flex="1" data-l10n-id="more-from-moz-title"></label>
 -        </richlistitem>
-       </richlistbox>
  
-       <spacer flex="1"/>
-@@ -214,7 +203,6 @@
- #include containers.inc.xhtml
+         <!-- The following <richlistitem> elements are hidden from the list of items via the hidden-category class.
+             The intent is that they act as sub-pages, accessible from the UI of one of the main pages, but are
+@@ -247,7 +236,6 @@
+ #include translations.inc.xhtml
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
 -#include moreFromMozilla.inc.xhtml
@@ -338,10 +338,10 @@ index df8a1997a7..d3cafd9c7f 100644
  
    // toolkit/components/pdfjs/content/build/pdf.js
    "resource://pdf.js/web/images/",
-diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
 index 49a76defeb..38407b8e4b 100644
---- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+--- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
++++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
 @@ -505,315 +505,6 @@ const BASE_MESSAGES = () => [
        ],
      },
@@ -658,10 +658,10 @@ index 49a76defeb..38407b8e4b 100644
    {
      id: "PB_NEWTAB_PIN_PROMO",
      template: "pb_newtab",
-diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+diff --git a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs
 index b5ff59290a..eb5fc60451 100644
---- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs
-+++ b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+--- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs
++++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs
 @@ -367,85 +367,6 @@ const MESSAGES = () => [
      frequency: { lifetime: 3 },
      trigger: { id: "defaultBrowserCheck" },
@@ -1003,15 +1003,15 @@ Subject: [PATCH] FSDG: Remove 'Extensions for developers' menu item
 
 [1] https://labs.parabola.nu/issues/2409#note-4
 ---
- browser/components/newtab/lib/CFRPageActions.jsm |  2 +-
+ browser/components/asrouter/modules/CFRPageActions.sys.mjs |  2 +-
  devtools/client/framework/devtools-browser.js    |  3 ++-
  devtools/client/menus.js                         |  2 +-
  3 files changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/browser/components/newtab/lib/CFRPageActions.jsm b/browser/components/newtab/lib/CFRPageActions.jsm
+diff --git a/browser/components/asrouter/modules/CFRPageActions.sys.mjs b/browser/components/asrouter/modules/CFRPageActions.sys.mjs
 index 2ca59d73e3..6e06ee7c93 100644
---- a/browser/components/newtab/lib/CFRPageActions.jsm
-+++ b/browser/components/newtab/lib/CFRPageActions.jsm
+--- a/browser/components/asrouter/modules/CFRPageActions.sys.mjs
++++ b/browser/components/asrouter/modules/CFRPageActions.sys.mjs
 @@ -38,7 +38,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref(
    "app.support.baseURL"
  );
@@ -1042,7 +1042,7 @@ index b47e1c4a3f..fd62bfd3df 100644
 +++ b/devtools/client/menus.js
 @@ -189,7 +189,7 @@ exports.menuitems = [
      appMenuL10nId: "appmenu-developer-tools-extensions",
-     oncommand(event) {
+     oncommand() {
        openDocLink(
 -        "https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/"
 +        ""
@@ -1114,6 +1114,25 @@ index 1e1bffed47..14b6cf9f5a 100644
 -- 
 2.39.2
 
+From a985a80d5df1226f4d7f84a72dd6c03b51fc86e4 Mon Sep 17 00:00:00 2001
+From: various_authors <various_authors@parabola.nu>
+Date: Mon, Sep 17 00:00:00 2001 +0100
+Subject: [PATCH] FSDG: Various patches
+
+I'm too lazy to find the history for each, just making the whole patch
+set compatible with 'git am' and easier to manage. If needed, it can be
+found using git.
+---
+ browser/app/permissions                          |  3 ---
+ browser/components/preferences/sync.inc.xhtml    | 16 ----------------
+ .../protections/content/protections.ftl          |  2 +-
+ .../protections/content/protections.html         | 10 ----------
+ .../components/protections/content/vpn-card.mjs  | 16 ----------------
+ .../en-US/browser/preferences/preferences.ftl    | 10 ----------
+ .../locales/en-US/toolkit/about/aboutAddons.ftl  | 10 ++++++----
+ .../locales/en-US/toolkit/branding/brandings.ftl | 14 +++++++-------
+ 8 files changed, 14 insertions(+), 67 deletions(-)
+
 diff --git a/browser/app/permissions b/browser/app/permissions
 index 1c72a96de8..052a6a5c83 100644
 --- a/browser/app/permissions
@@ -1184,7 +1203,9 @@ index 504598d05e..075f9f60cb 100644
  -relay-brand-short-name = Relay
  -fakespot-brand-name = Fakespot
  
-@@ -34,14 +34,14 @@
+ # Note the name of the website is capitalized.
+ -fakespot-website-name = Fakespot.com
+ 
  # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated.
  -fakespot-brand-full-name = Fakespot by Mozilla
  
@@ -1323,3 +1344,5 @@ index 2417f1a641..698c48ccc3 100644
  
      const vpnBanner = this.doc.querySelector(".vpn-banner");
      const exitIcon = vpnBanner.querySelector(".exit-icon");
+--
+2.39.2
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 77b09ab..e363576 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,7 +70,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=123.0.1
+pkgver=125.0.2
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=123.0
@@ -125,7 +125,7 @@ makedepends+=(
   libxslt
   python-jsonschema
   python-setuptools
-  python-typing-extensions
+  python-typing_extensions
   python-zstandard
   quilt
 )
@@ -177,16 +177,16 @@ validpgpkeys+=(
   '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger
 )
 
-sha256sums=('d5dcb955b65e0f164a90cac0760724486e36e896221b98f244801dfd045d741c'
+sha256sums=('69d0563361bab375407b25430c782346bec7623f3f1005e7dc505351ac69f799'
             'SKIP'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop
                                                                                 # identity-icons-brand.svg
 sha256sums+=('3a365374e3565a8963b000410cdd863d2fe3b4da9f63aa90d4150d1e1822102b'  # *.branding.tar.xz
              'SKIP'
-             'b6b100d7749387362bda9c8c8c19fe742870ec8a7a39172878b8dbfe773efeee' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-             '8f530e41f19675bd74e62f5182f7975a24b690d5d17420fbe8a5365d55b71910' # 9002-FSDG-preference-defaults.patch
-             '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch
-             '47050470053380f81391eb0631d9977bcc3abaeab632331bdce8576a0ceae1f9' # 9004-FSDG-misc.patch
+             'c96d4420738e1bd8dcfed07141aeadbfc6d4fbf453a8cc20c121f48342a95ef8'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+             'ec3dd6573379added898fa6833153beaff1c01563b6547f0683680b40e3ebb52'  # 9002-FSDG-preference-defaults.patch
+             '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62'  # 9003-FSDG-urihandlers.patch
+             '9fef95cc7ee0c32a6742740a321c748552312e2f0dd5241a1704bdfaf5a669bd'  # 9004-FSDG-misc.patch
              'c1d57c2b5b3621b34a4c5e7cc6e83170cfa576965b341c71e750e610440f490c'  # process-json-files.py
              '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in
 sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0'  # avoid-libxul-OOM-python-check.patch
@@ -194,17 +194,17 @@ sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1
                  'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'  # firefox-111.0.1-fdlibm.patch
                  '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'  # fix-i686-build-moz-1792159.patch
                  'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch
-b2sums=('837f2edf2dcf51f19d8cad1f8234723236f318defa1196885b019e46878b377a24a83093ccbf8ef43e7ea94ddd1520f2918bcea520c59379453d40251ff972d6'
+b2sums=('70d27d0ee0bfdf7156546e8762b608c442bd35ba8f33ad89a6d5544eedef4d59b24db2b1988aab9ca626e9a01898f7b0c00a4c7550f78cba9bb722dd3c6d155e'
         'SKIP'
         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop
                                                                                                                                             # identity-icons-brand.svg
 b2sums+=('96ee9ddf3306db08e9d3e6efdae87900e088aedebadb4b703524f2396ebd26e67120298bb6ec7fee2363e9fe4a83395b1a314ef34732b059870cdf161eaecc8b'  # *.branding.tar.xz
          'SKIP'
-         'adb8c96328cbc6f8c7e50207b89c2d4c68733dd1fdcd341ae2ac4a3a1702430c2e5983e4249682153e0e593e0f54ab0258ed01d849589e8dc77c8729beccf3e7' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-         '97bc57322635a7fa5d55b087303ece6f982104db5ef945393e74722acd783262bcc63e5cd3e5748eae9f07a9add59925898b67a2e20fa8420d4c7bfc4cd39867' # 9002-FSDG-preference-defaults.patch
+         '0295f895af6eff20a0d2e6db2807a25d893d564d50bd6ec27312e3b14846991ec88d6de44caf2c4b120af627822ad12f322a0b6af50b804a33eb88bf857c6a71' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+         '6ba97308faa7e8818762899806c4194b60fb00a2b9dd71c0c82c52060ae52771fbb3f85b7781e0ab84414771f7f0137957aaea2373df5f5aac3aca50d283e7c8' # 9002-FSDG-preference-defaults.patch
          'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch
-         '1d7c896bc1b447e833e3f15410d5db16983d002042de23f3e456a40e8cca23a2c82db6b0f73b5095b51de4f48258039ab37b410653b7c7e8653d2996eaab2019' # 9004-FSDG-misc.patch
-         '74e81a58faa219d6a822caae0212896561ecf8d97f736b9b23c6aec2b6e9dbd284702093ee1c75bd99638d8f86c4755542ae4b0dfa0ce8a25064e3430a6f2135'  # process-json-files.py
+         'ad01a57ebeab90337656bd3a3d9261d063d698a967d6bba305ea1a61f6bd43fe5dd559c3bae32edfe98797614d40a7842a2667ad61f621ddf21039be2c136e10' # 9004-FSDG-misc.patch
+         '74e81a58faa219d6a822caae0212896561ecf8d97f736b9b23c6aec2b6e9dbd284702093ee1c75bd99638d8f86c4755542ae4b0dfa0ce8a25064e3430a6f2135' # process-json-files.py
          'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in
 b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882'  # avoid-libxul-OOM-python-check.patch
              '32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9'  # rust-static-disable-network-test-on-static-libraries.patch

