libre/iceweasel: 116.0, only upstream changes

Please note, build for x86_64 required 50+ GB of (RAM + SWAP).
This is probably due to the full LTO enabled upstream. Based on my
monitoring, memory usage does not go over 15 GB most of the build time,
but increases significantly towards the end of the build.

1 files changed, 105 insertions, 86 deletions

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 5c988def2..ef8e257ae 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 b46ca81d0aa1f481c8ac8059992c77258e5e556e Mon Sep 17 00:00:00 2001
+From 20106ae10f9c6a58f78ce42e7a319385441a1b95 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
@@ -24,7 +24,8 @@ If necessary, missing files can be added later.
 ---
  .../components/ASRouterAdmin/ASRouterAdmin.jsx            | 2 +-
  .../newtab/data/content/activity-stream.bundle.js         | 2 +-
- services/settings/Utils.sys.mjs                               | 2 +-
+ services/settings/Utils.sys.mjs                           | 2 +-
+ services/settings/docs/index.rst                          | 4 ++--
  .../periodic-updates/scripts/periodic_file_updates.sh     | 2 +-
  .../components/antitracking/docs/query-stripping/index.md | 2 +-
  .../backgroundtasks/BackgroundTask_message.sys.mjs        | 4 ++--
@@ -33,13 +34,13 @@ If necessary, missing files can be added later.
  .../components/search/docs/SearchEngineConfiguration.rst  | 2 +-
  toolkit/modules/AppConstants.sys.mjs                      | 4 ++--
  toolkit/mozapps/defaultagent/RemoteSettings.cpp           | 2 +-
- 11 files changed, 16 insertions(+), 16 deletions(-)
+ 12 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-index c4aa6a03e9..345abc1e71 100644
+index 3762be9c99..1a9c5028ff 100644
 --- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
 +++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-@@ -1240,7 +1240,7 @@ export class ASRouterAdminInner extends React.PureComponent {
+@@ -1255,7 +1255,7 @@ export class ASRouterAdminInner extends React.PureComponent {
                    <a
                      className="providerUrl"
                      target="_blank"
@@ -49,10 +50,10 @@ index c4aa6a03e9..345abc1e71 100644
                    >
                      nimbus-desktop-experiments
 diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
-index 87cb0f624c..1cf1012f29 100644
+index 0f4445a88b..5806d07265 100644
 --- a/browser/components/newtab/data/content/activity-stream.bundle.js
 +++ b/browser/components/newtab/data/content/activity-stream.bundle.js
-@@ -1749,7 +1749,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
+@@ -1783,7 +1783,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
          label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", {
            className: "providerUrl",
            target: "_blank",
@@ -62,10 +63,10 @@ index 87cb0f624c..1cf1012f29 100644
          }, "nimbus-desktop-experiments"), ")");
        }
 diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index 94f4713380..3a8165f878 100644
+index 697409ab07..316cd907a2 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
-@@ -108,7 +108,7 @@ var Utils = {
+@@ -100,7 +100,7 @@ export var Utils = {
        : AppConstants.REMOTE_SETTINGS_SERVER_URL;
    },
  
@@ -74,6 +75,24 @@ index 94f4713380..3a8165f878 100644
  
    /**
     * Logger instance.
+diff --git a/services/settings/docs/index.rst b/services/settings/docs/index.rst
+index 3e042f67e4..dc8584c318 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
+ 
+ The JSON dump will serve as the default dataset for ``.get()``, instead of doing a round-trip to pull the latest data. It will also reduce the amount of data to be downloaded on the first synchronization.
+ 
+-#. Place the JSON dump of the server records in the ``services/settings/dumps/main/`` folder. Using this command:
++#. Place the JSON dump of the server records in the ``services/settings/dumps/main/`` folder. Using this command (replace 'https://settings.invalid' with your Remote Settings address):
+    ::
+ 
+       CID="your-collection"
+-      curl "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/${CID}/changeset?_expected=0" | jq '{"data": .changes, "timestamp": .timestamp}' > services/settings/dumps/main/${CID}.json``
++      curl "https://settings.invalid/v1/buckets/main/collections/${CID}/changeset?_expected=0" | jq '{"data": .changes, "timestamp": .timestamp}' > services/settings/dumps/main/${CID}.json``
+ 
+ #. 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 b88ee476da..440615e4e1 100755
 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
@@ -101,7 +120,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 1d9e4cb79b..7c1f9895fc 100644
+index bb9d71b5c0..ec0c5f11d7 100644
 --- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 +++ b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 @@ -19,8 +19,8 @@
@@ -116,10 +135,10 @@ index 1d9e4cb79b..7c1f9895fc 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 2d15977ae2..815bf5cac9 100644
+index 65f30b5f15..13e58ac5f6 100644
 --- a/toolkit/components/search/SearchUtils.sys.mjs
 +++ b/toolkit/components/search/SearchUtils.sys.mjs
-@@ -151,13 +151,13 @@ export var SearchUtils = {
+@@ -152,13 +152,13 @@ export var SearchUtils = {
  
    ENGINES_URLS: {
      "prod-main":
@@ -175,10 +194,10 @@ index b430666f68..0f640980ae 100644
  
    REMOTE_SETTINGS_VERIFY_SIGNATURE:
 diff --git a/toolkit/mozapps/defaultagent/RemoteSettings.cpp b/toolkit/mozapps/defaultagent/RemoteSettings.cpp
-index 667d9fc628..b2bf628f29 100644
+index 37a376ff90..ef73563f85 100644
 --- a/toolkit/mozapps/defaultagent/RemoteSettings.cpp
 +++ b/toolkit/mozapps/defaultagent/RemoteSettings.cpp
-@@ -23,7 +23,7 @@ extern "C" {
+@@ -25,7 +25,7 @@ extern "C" {
  HRESULT IsAgentRemoteDisabledRust(const char* szUrl, DWORD* lpdwDisabled);
  }
  
@@ -188,10 +207,10 @@ index 667d9fc628..b2bf628f29 100644
  #define PROD_CID "windows-default-browser-agent"
  #define PROD_ID "state"
 -- 
-2.40.0
+2.41.0
 
 
-From 8183f65cfcd0596c0beaf25904b7a97c267f5032 Mon Sep 17 00:00:00 2001
+From cc689c8b58ccb66d58586e219bc41822f1e98890 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
@@ -232,10 +251,10 @@ index 825bb4a452..eda1eaa321 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 4ce80b0b8b..235d32df0e 100644
+index de49d768a8..65ca487207 100644
 --- a/services/settings/remote-settings.sys.mjs
 +++ b/services/settings/remote-settings.sys.mjs
-@@ -578,11 +578,7 @@ function remoteSettingsFunction() {
+@@ -575,11 +575,7 @@ function remoteSettingsFunction() {
        moduleURI: import.meta.url,
        symbolName: "remoteSettingsBroadcastHandler",
      };
@@ -248,7 +267,7 @@ index 4ce80b0b8b..235d32df0e 100644
    };
  
    return remoteSettings;
-@@ -602,9 +598,6 @@ export var remoteSettingsBroadcastHandler = {
+@@ -599,9 +595,6 @@ export var remoteSettingsBroadcastHandler = {
        `Push notification received (version=${version} phase=${phase})`
      );
  
@@ -260,10 +279,10 @@ index 4ce80b0b8b..235d32df0e 100644
    },
  };
 -- 
-2.40.0
+2.41.0
 
 
-From 1c40cc62a19085d898a9a861decd610a8db143ca Mon Sep 17 00:00:00 2001
+From 53faed56ab66fd25c5e82a81b264454596b34a72 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
@@ -304,10 +323,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.40.0
+2.41.0
 
 
-From d5ed0ed92a5a65ca841290becc9f42fe83b3e0dc Mon Sep 17 00:00:00 2001
+From 3a48f439a47bc8db72718660691472e412fb5363 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
@@ -319,17 +338,17 @@ timestamps from that file and mock response headers to not confuse any
 code that expects them.
 ---
  browser/installer/package-manifest.in     |  1 +
- services/settings/Utils.sys.mjs               | 28 ++++++++++++++++++++---
+ services/settings/Utils.sys.mjs           | 28 ++++++++++++++++++++---
  services/settings/dumps/monitor/moz.build |  8 +++++++
  services/settings/dumps/moz.build         |  1 +
  4 files changed, 35 insertions(+), 3 deletions(-)
  create mode 100644 services/settings/dumps/monitor/moz.build
 
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 8caff8de94..1e53e074c9 100644
+index 41d13e23c4..8fa609c2b5 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -262,6 +262,7 @@
+@@ -270,6 +270,7 @@
  @RESPATH@/browser/defaults/settings/last_modified.json
  @RESPATH@/browser/defaults/settings/blocklists
  @RESPATH@/browser/defaults/settings/main
@@ -338,10 +357,10 @@ index 8caff8de94..1e53e074c9 100644
  
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index 3a8165f878..90922cc6ff 100644
+index 316cd907a2..8765359371 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
-@@ -377,7 +377,7 @@ var Utils = {
+@@ -369,7 +369,7 @@ export var Utils = {
    async fetchLatestChanges(serverUrl, options = {}) {
      const { expectedTimestamp, lastEtag = "", filters = {} } = options;
  
@@ -350,7 +369,7 @@ index 3a8165f878..90922cc6ff 100644
      const params = {
        ...filters,
        _expected: expectedTimestamp ?? 0,
-@@ -392,7 +392,21 @@ var Utils = {
+@@ -384,7 +384,21 @@ export var Utils = {
            .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
            .join("&");
      }
@@ -373,7 +392,7 @@ index 3a8165f878..90922cc6ff 100644
  
      if (response.status >= 500) {
        throw new Error(`Server error ${response.status} ${response.statusText}`);
-@@ -427,7 +441,15 @@ var Utils = {
+@@ -419,7 +433,15 @@ export var Utils = {
        }
      }
  
@@ -417,10 +436,10 @@ index f407580bfa..53e9d8b45e 100644
  ]
  
 -- 
-2.40.0
+2.41.0
 
 
-From a68b1806bf33a57a383924226d2b8bd5e7692ba7 Mon Sep 17 00:00:00 2001
+From e9aecc206fbece0edaebd4ab45281bf3e2715a3b 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
@@ -432,10 +451,10 @@ 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 90922cc6ff..a4a578a73a 100644
+index 8765359371..7b894cc698 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
-@@ -191,16 +191,6 @@ var Utils = {
+@@ -183,16 +183,6 @@ export var Utils = {
     * @return {bool} Whether network is down or not.
     */
    get isOffline() {
@@ -453,10 +472,10 @@ index 90922cc6ff..a4a578a73a 100644
    },
  
 -- 
-2.40.0
+2.41.0
 
 
-From ad8c0e91a1e948d545a5c179fe8c6e5ae25d6fbf Mon Sep 17 00:00:00 2001
+From 42069dc660482b2d46cc28acd05b03a231042990 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
@@ -465,14 +484,14 @@ It is used instead of internal signature validation mechanism, for
 integrity checking of the locally cached data.
 ---
  services/settings/RemoteSettingsWorker.sys.mjs | 4 ++++
- services/settings/SharedUtils.jsm              | 9 +++++++--
+ services/settings/SharedUtils.sys.mjs          | 9 +++++++--
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsWorker.sys.mjs b/services/settings/RemoteSettingsWorker.sys.mjs
-index c08adbca98..a46114e1d6 100644
+index 57bfb3f3d5..52a0b7961a 100644
 --- a/services/settings/RemoteSettingsWorker.sys.mjs
 +++ b/services/settings/RemoteSettingsWorker.sys.mjs
-@@ -182,6 +182,10 @@ class Worker {
+@@ -177,6 +177,10 @@ class Worker {
      // task on the current thread instead of the worker thread.
      return lazy.SharedUtils.checkContentHash(buffer, size, hash);
    }
@@ -483,11 +502,11 @@ index c08adbca98..a46114e1d6 100644
  }
  
  // Now, first add a shutdown blocker. If that fails, we must have
-diff --git a/services/settings/SharedUtils.jsm b/services/settings/SharedUtils.jsm
-index 9804e80c91..de67b0fb6f 100644
---- a/services/settings/SharedUtils.jsm
-+++ b/services/settings/SharedUtils.jsm
-@@ -23,11 +23,16 @@ var SharedUtils = {
+diff --git a/services/settings/SharedUtils.sys.mjs b/services/settings/SharedUtils.sys.mjs
+index 1eeaf0bed9..d998a2d3b1 100644
+--- a/services/settings/SharedUtils.sys.mjs
++++ b/services/settings/SharedUtils.sys.mjs
+@@ -21,11 +21,16 @@ export var SharedUtils = {
        return false;
      }
      // Has expected content?
@@ -507,10 +526,10 @@ index 9804e80c91..de67b0fb6f 100644
  
    /**
 -- 
-2.40.0
+2.41.0
 
 
-From 9ff50eb26a00dcd58449c1299e1f7121803116f2 Mon Sep 17 00:00:00 2001
+From 61f117cd66893b44dbad129e09c7f3ad44bacbd9 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
@@ -545,7 +564,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 7506ce3a71..b69f5ca39d 100644
+index daf4798477..468f07bc9a 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
 @@ -706,11 +706,9 @@ export class RemoteSettingsClient extends EventEmitter {
@@ -609,7 +628,7 @@ index 7506ce3a71..b69f5ca39d 100644
      }
    }
  
-@@ -1188,24 +1176,26 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1185,24 +1173,26 @@ export class RemoteSettingsClient extends EventEmitter {
     * @param since timestamp of last sync (optional)
     */
    async _fetchChangeset(expectedTimestamp, since) {
@@ -653,10 +672,10 @@ index 7506ce3a71..b69f5ca39d 100644
        remoteRecords,
      };
 -- 
-2.40.0
+2.41.0
 
 
-From 3dade2e006301402a7837694bcd3303fd0dfa3c0 Mon Sep 17 00:00:00 2001
+From 413b18048e8d302862d4c2795ce4e6b62fcad71a 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()
@@ -678,17 +697,17 @@ 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 b69f5ca39d..5cc577ea8f 100644
+index 468f07bc9a..34728b6eb1 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -11,6 +11,7 @@ const lazy = {};
+@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
    ClientEnvironmentBase:
      "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs",
    Database: "resource://services-settings/Database.sys.mjs",
 +  DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
+   IDBHelpers: "resource://services-settings/IDBHelpers.sys.mjs",
+   KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs",
    RemoteSettingsWorker:
-     "resource://services-settings/RemoteSettingsWorker.sys.mjs",
-   UptakeTelemetry: "resource://services-common/uptake-telemetry.sys.mjs",
 @@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
  });
  
@@ -758,10 +777,10 @@ index b69f5ca39d..5cc577ea8f 100644
     * Synchronize the local database with the remote server.
     *
 -- 
-2.40.0
+2.41.0
 
 
-From aa31402b33353697d89d75f068f5f17bf9120d8a Mon Sep 17 00:00:00 2001
+From 950176b012206ac2455abf39b0337c3763b41b2f 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
@@ -783,18 +802,18 @@ 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 e19cece909..39d5c239bf 100644
+index 34728b6eb1..debb3df51b 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -20,6 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -24,6 +24,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
  });
  
  XPCOMUtils.defineLazyModuleGetters(lazy, {
 +  CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm",
-   IDBHelpers: "resource://services-settings/IDBHelpers.jsm",
-   KintoHttpClient: "resource://services-common/kinto-http-client.js",
    ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-@@ -1176,7 +1177,10 @@ export class RemoteSettingsClient extends EventEmitter {
+ });
+ 
+@@ -1173,7 +1174,10 @@ export class RemoteSettingsClient extends EventEmitter {
          const old = oldById.get(r.id);
          if (old) {
            oldById.delete(r.id);
@@ -807,10 +826,10 @@ index e19cece909..39d5c239bf 100644
            }
          } else {
 -- 
-2.40.0
+2.41.0
 
 
-From 96305ff73eed9d556752b39fd265892a698a943e Mon Sep 17 00:00:00 2001
+From 1969cb005348ecaff8a0b6cd5e68bf46c6d066ce 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
@@ -828,7 +847,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 833400d047..e4c2175e06 100644
+index debb3df51b..d2968c4faf 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
 @@ -259,7 +259,7 @@ class AttachmentDownloader extends Downloader {
@@ -840,7 +859,7 @@ index 833400d047..e4c2175e06 100644
          )
      );
    }
-@@ -1136,7 +1136,7 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1133,7 +1133,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`);
@@ -849,7 +868,7 @@ index 833400d047..e4c2175e06 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);
-@@ -1158,7 +1158,7 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1155,7 +1155,7 @@ export class RemoteSettingsClient extends EventEmitter {
              // _importJSONDump() only clears DB if dump is available,
              // therefore do it here!
              if (imported < 0) {
@@ -858,7 +877,7 @@ index 833400d047..e4c2175e06 100644
              }
            }
          }
-@@ -1198,6 +1198,12 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1195,6 +1195,12 @@ export class RemoteSettingsClient extends EventEmitter {
      return syncResult;
    }
  
@@ -872,10 +891,10 @@ index 833400d047..e4c2175e06 100644
     * Fetch information from changeset endpoint.
     *
 -- 
-2.40.0
+2.41.0
 
 
-From cb660b9206bd321c98379a0336c72b4c67fa8dc6 Mon Sep 17 00:00:00 2001
+From 51d266f167d239cba380d581670a6b0e237423d0 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
@@ -890,10 +909,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 e4c2175e06..6b5ce4e447 100644
+index d2968c4faf..8233fe17cb 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -1078,14 +1078,9 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1075,14 +1075,9 @@ export class RemoteSettingsClient extends EventEmitter {
        updated: [],
        deleted: [],
      };
@@ -909,10 +928,10 @@ index e4c2175e06..6b5ce4e447 100644
      await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
        clear: retry,
 -- 
-2.40.0
+2.41.0
 
 
-From 2010e9105610657a0c31c58f94ef82a228992195 Mon Sep 17 00:00:00 2001
+From a60122e67c4a865f9690becaed275e5dd10d98dc 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
@@ -922,10 +941,10 @@ Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
  1 file changed, 8 insertions(+), 29 deletions(-)
 
 diff --git a/services/settings/Attachments.sys.mjs b/services/settings/Attachments.sys.mjs
-index ce4a0dd1ba..8dd03eee32 100644
+index 5ddc6bb046..f7888cb769 100644
 --- a/services/settings/Attachments.sys.mjs
 +++ b/services/settings/Attachments.sys.mjs
-@@ -152,9 +152,10 @@ export class Downloader {
+@@ -147,9 +147,10 @@ export class Downloader {
        retries,
        checkHash,
        attachmentId = record?.id,
@@ -937,7 +956,7 @@ index ce4a0dd1ba..8dd03eee32 100644
      if (!attachmentId) {
        // Check for pre-condition. This should not happen, but it is explicitly
        // checked to avoid mixing up attachments, which could be dangerous.
-@@ -205,6 +206,7 @@ export class Downloader {
+@@ -200,6 +201,7 @@ export class Downloader {
          const newBuffer = await this.downloadAsBytes(record, {
            retries,
            checkHash,
@@ -945,7 +964,7 @@ index ce4a0dd1ba..8dd03eee32 100644
          });
          const blob = new Blob([newBuffer]);
          // Store in cache but don't wait for it before returning.
-@@ -238,7 +240,7 @@ export class Downloader {
+@@ -233,7 +235,7 @@ export class Downloader {
        }
  
        try {
@@ -954,7 +973,7 @@ index ce4a0dd1ba..8dd03eee32 100644
        } catch (e) {
          // Failed to read from cache, e.g. IndexedDB unusable.
          console.error(e);
-@@ -310,7 +312,7 @@ export class Downloader {
+@@ -318,7 +320,7 @@ export class Downloader {
     * @returns {String} the absolute file path to the downloaded attachment.
     */
    async downloadToDisk(record, options = {}) {
@@ -963,7 +982,7 @@ index ce4a0dd1ba..8dd03eee32 100644
      const {
        attachment: { filename, size, hash },
      } = record;
-@@ -365,33 +367,10 @@ export class Downloader {
+@@ -373,33 +375,10 @@ export class Downloader {
     */
    async downloadAsBytes(record, options = {}) {
      const {
@@ -1001,10 +1020,10 @@ index ce4a0dd1ba..8dd03eee32 100644
  
    /**
 -- 
-2.40.0
+2.41.0
 
 
-From 269b327583b25ab611e29347fbca914d7a755817 Mon Sep 17 00:00:00 2001
+From 0a9a01a5ffc04de7de047ea4e0209bcdc5556c0b 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
@@ -1029,10 +1048,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 c373cde395..d898dc9267 100644
+index 5632486c69..8a26664c08 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -13686,7 +13686,7 @@
+@@ -14065,7 +14065,7 @@
  # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".
  - name: security.pki.crlite_mode
    type: RelaxedAtomicUint32
@@ -1042,10 +1061,10 @@ index c373cde395..d898dc9267 100644
  
  - name: security.tls.version.min
 diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
-index 5844ffecfd..6084ffc93c 100644
+index 737f94812d..8762011f05 100644
 --- a/security/manager/ssl/nsNSSComponent.cpp
 +++ b/security/manager/ssl/nsNSSComponent.cpp
-@@ -1430,6 +1430,7 @@ void nsNSSComponent::setValidationOptions(
+@@ -1390,6 +1390,7 @@ void nsNSSComponent::setValidationOptions(
    CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;
    CRLiteMode crliteMode =
        static_cast<CRLiteMode>(StaticPrefs::security_pki_crlite_mode());
@@ -1054,5 +1073,5 @@ index 5844ffecfd..6084ffc93c 100644
      case CRLiteMode::Disabled:
      case CRLiteMode::TelemetryOnly:
 -- 
-2.40.0
+2.41.0