[iceweasel] 112.0, update according to upstream changes

1 files changed, 118 insertions, 118 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 f1049cf7d..682618f7d 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 5ebd63727f5981043f872ca90f4b274e4b201e27 Mon Sep 17 00:00:00 2001
+From b46ca81d0aa1f481c8ac8059992c77258e5e556e 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
@@ -49,10 +49,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 3e3b7d7db3..17d27d0e47 100644
+index 87cb0f624c..1cf1012f29 100644
 --- a/browser/components/newtab/data/content/activity-stream.bundle.js
 +++ b/browser/components/newtab/data/content/activity-stream.bundle.js
-@@ -1748,7 +1748,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
+@@ -1749,7 +1749,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",
@@ -101,7 +101,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 dbbfa53d39..11b93b07f2 100644
+index 1d9e4cb79b..7c1f9895fc 100644
 --- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 +++ b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 @@ -19,8 +19,8 @@
@@ -116,10 +116,10 @@ index dbbfa53d39..11b93b07f2 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 d519793560..94657f6828 100644
+index 2d15977ae2..815bf5cac9 100644
 --- a/toolkit/components/search/SearchUtils.sys.mjs
 +++ b/toolkit/components/search/SearchUtils.sys.mjs
-@@ -150,13 +150,13 @@ export var SearchUtils = {
+@@ -151,13 +151,13 @@ export var SearchUtils = {
  
    ENGINES_URLS: {
      "prod-main":
@@ -188,27 +188,27 @@ index 667d9fc628..b2bf628f29 100644
  #define PROD_CID "windows-default-browser-agent"
  #define PROD_ID "state"
 -- 
-2.39.2
+2.40.0
 
 
-From 32fdc1f6e70188788165d1b11bbf8d4793c17fc9 Mon Sep 17 00:00:00 2001
+From 8183f65cfcd0596c0beaf25904b7a97c267f5032 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
 
-When initialized, remote-settings.js adds a listener to push broadcasts,
+When initialized, remote-settings.sys.mjs adds a listener to push broadcasts,
 that let Remote Settings server send push messages to trigger polling
 for changes from the client side. This is not needed for local-only
 setup. Remove the record from broadcast-listeners.json file stored in
 the user profile, so that it doesn't get picked up by push broadcast
 service.
 ---
- dom/push/PushBroadcastService.sys.mjs | 13 +++++++++++++
- services/settings/remote-settings.js  | 11 ++---------
+ dom/push/PushBroadcastService.sys.mjs     | 13 +++++++++++++
+ services/settings/remote-settings.sys.mjs | 11 ++---------
  2 files changed, 15 insertions(+), 9 deletions(-)
 
 diff --git a/dom/push/PushBroadcastService.sys.mjs b/dom/push/PushBroadcastService.sys.mjs
-index cca80fee6c..c83b0f77d7 100644
+index 825bb4a452..eda1eaa321 100644
 --- a/dom/push/PushBroadcastService.sys.mjs
 +++ b/dom/push/PushBroadcastService.sys.mjs
 @@ -170,6 +170,19 @@ export var BroadcastService = class {
@@ -231,12 +231,12 @@ index cca80fee6c..c83b0f77d7 100644
    /**
     * Call the listeners of the specified broadcasts.
     *
-diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js
-index 1ecadd51d3..da820a2de8 100644
---- a/services/settings/remote-settings.js
-+++ b/services/settings/remote-settings.js
-@@ -586,11 +586,7 @@ function remoteSettingsFunction() {
-       moduleURI: __URI__,
+diff --git a/services/settings/remote-settings.sys.mjs b/services/settings/remote-settings.sys.mjs
+index 4ce80b0b8b..235d32df0e 100644
+--- a/services/settings/remote-settings.sys.mjs
++++ b/services/settings/remote-settings.sys.mjs
+@@ -578,11 +578,7 @@ function remoteSettingsFunction() {
+       moduleURI: import.meta.url,
        symbolName: "remoteSettingsBroadcastHandler",
      };
 -    lazy.pushBroadcastService.addListener(
@@ -248,7 +248,7 @@ index 1ecadd51d3..da820a2de8 100644
    };
  
    return remoteSettings;
-@@ -610,9 +606,6 @@ var remoteSettingsBroadcastHandler = {
+@@ -602,9 +598,6 @@ export var remoteSettingsBroadcastHandler = {
        `Push notification received (version=${version} phase=${phase})`
      );
  
@@ -260,10 +260,10 @@ index 1ecadd51d3..da820a2de8 100644
    },
  };
 -- 
-2.39.2
+2.40.0
 
 
-From b02cc5ac855b3111ed99c9838af2a0664b79e186 Mon Sep 17 00:00:00 2001
+From 1c40cc62a19085d898a9a861decd610a8db143ca 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
@@ -275,7 +275,7 @@ That is not needed for local-only setup.
  2 files changed, 1 insertion(+), 12 deletions(-)
 
 diff --git a/services/settings/components.conf b/services/settings/components.conf
-index 9a737802ee..25109415a7 100644
+index fbc4df9bfc..25109415a7 100644
 --- a/services/settings/components.conf
 +++ b/services/settings/components.conf
 @@ -4,11 +4,4 @@
@@ -286,7 +286,7 @@ index 9a737802ee..25109415a7 100644
 -    {
 -        'cid': '{5e756573-234a-49ea-bbe4-59ec7a70657d}',
 -        'contract_ids': ['@mozilla.org/services/settings;1'],
--        'jsm': 'resource://services-settings/RemoteSettingsComponents.jsm',
+-        'esModule': 'resource://services-settings/RemoteSettingsComponents.sys.mjs',
 -        'constructor': 'RemoteSettingsTimer',
 -    },
 -]
@@ -304,10 +304,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.39.2
+2.40.0
 
 
-From 2e784bb89094a5bdbecf559eb16e4843dca7a72c Mon Sep 17 00:00:00 2001
+From d5ed0ed92a5a65ca841290becc9f42fe83b3e0dc 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
@@ -326,10 +326,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 9229a0bd0e..565a7b7508 100644
+index 8caff8de94..1e53e074c9 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -263,6 +263,7 @@
+@@ -262,6 +262,7 @@
  @RESPATH@/browser/defaults/settings/last_modified.json
  @RESPATH@/browser/defaults/settings/blocklists
  @RESPATH@/browser/defaults/settings/main
@@ -417,10 +417,10 @@ index f407580bfa..53e9d8b45e 100644
  ]
  
 -- 
-2.39.2
+2.40.0
 
 
-From b9f19c6068861e2fb4fac86bc6551354826594c7 Mon Sep 17 00:00:00 2001
+From a68b1806bf33a57a383924226d2b8bd5e7692ba7 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
@@ -453,10 +453,10 @@ index 90922cc6ff..a4a578a73a 100644
    },
  
 -- 
-2.39.2
+2.40.0
 
 
-From 04c53d514c8a2016091d12043735be7be8ca13db Mon Sep 17 00:00:00 2001
+From ad8c0e91a1e948d545a5c179fe8c6e5ae25d6fbf 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
@@ -464,15 +464,15 @@ Subject: [PATCH 06/13] Refactor hashing logic to a separate function
 It is used instead of internal signature validation mechanism, for
 integrity checking of the locally cached data.
 ---
- services/settings/RemoteSettingsWorker.jsm | 4 ++++
- services/settings/SharedUtils.jsm          | 9 +++++++--
+ services/settings/RemoteSettingsWorker.sys.mjs | 4 ++++
+ services/settings/SharedUtils.jsm              | 9 +++++++--
  2 files changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/services/settings/RemoteSettingsWorker.jsm b/services/settings/RemoteSettingsWorker.jsm
-index b47ceff9d0..44560fd461 100644
---- a/services/settings/RemoteSettingsWorker.jsm
-+++ b/services/settings/RemoteSettingsWorker.jsm
-@@ -189,6 +189,10 @@ class Worker {
+diff --git a/services/settings/RemoteSettingsWorker.sys.mjs b/services/settings/RemoteSettingsWorker.sys.mjs
+index c08adbca98..a46114e1d6 100644
+--- a/services/settings/RemoteSettingsWorker.sys.mjs
++++ b/services/settings/RemoteSettingsWorker.sys.mjs
+@@ -182,6 +182,10 @@ class Worker {
      // task on the current thread instead of the worker thread.
      return lazy.SharedUtils.checkContentHash(buffer, size, hash);
    }
@@ -507,10 +507,10 @@ index 9804e80c91..de67b0fb6f 100644
  
    /**
 -- 
-2.39.2
+2.40.0
 
 
-From c36cecafd243aa049c0cff10b33af62aae29225e Mon Sep 17 00:00:00 2001
+From 9ff50eb26a00dcd58449c1299e1f7121803116f2 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
@@ -541,14 +541,14 @@ the upgrade to local-only setup.
 
 [1] https://firefox-source-docs.mozilla.org/services/common/services/RemoteSettings.html#initial-data
 ---
- services/settings/RemoteSettingsClient.jsm | 66 +++++++++-------------
+ .../settings/RemoteSettingsClient.sys.mjs     | 66 ++++++++-----------
  1 file changed, 28 insertions(+), 38 deletions(-)
 
-diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 82b16c8a24..7ab9debe73 100644
---- a/services/settings/RemoteSettingsClient.jsm
-+++ b/services/settings/RemoteSettingsClient.jsm
-@@ -711,11 +711,9 @@ class RemoteSettingsClient extends EventEmitter {
+diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
+index 7506ce3a71..b69f5ca39d 100644
+--- a/services/settings/RemoteSettingsClient.sys.mjs
++++ b/services/settings/RemoteSettingsClient.sys.mjs
+@@ -706,11 +706,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.
@@ -562,7 +562,7 @@ index 82b16c8a24..7ab9debe73 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()).
-@@ -992,38 +990,28 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -987,38 +985,28 @@ export class RemoteSettingsClient extends EventEmitter {
     * @returns {Promise}
     */
    async _validateCollectionSignature(records, timestamp, metadata) {
@@ -609,7 +609,7 @@ index 82b16c8a24..7ab9debe73 100644
      }
    }
  
-@@ -1193,24 +1181,26 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1188,24 +1176,26 @@ export class RemoteSettingsClient extends EventEmitter {
     * @param since timestamp of last sync (optional)
     */
    async _fetchChangeset(expectedTimestamp, since) {
@@ -653,15 +653,15 @@ index 82b16c8a24..7ab9debe73 100644
        remoteRecords,
      };
 -- 
-2.39.2
+2.40.0
 
 
-From c516024e544579c33f6df9008a4f7bd29bc6f6b6 Mon Sep 17 00:00:00 2001
+From 3dade2e006301402a7837694bcd3303fd0dfa3c0 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()
 
-The users of the RemoteSettingsClient.jsm can receive records from it in
+The users of the RemoteSettingsClient.sys.mjs can receive records from it in
 two ways: by calling get(), and by subscribing to events by calling
 on().
 
@@ -674,22 +674,22 @@ false, it triggers a sync. Then adds a flag if the client has been
 correctly synchronized with the dump, so that no metadata checking
 occurs during the session.
 ---
- services/settings/RemoteSettingsClient.jsm | 27 +++++++++++++++++++++-
+ .../settings/RemoteSettingsClient.sys.mjs     | 27 ++++++++++++++++++-
  1 file changed, 26 insertions(+), 1 deletion(-)
 
-diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 7ab9debe73..39108bca89 100644
---- a/services/settings/RemoteSettingsClient.jsm
-+++ b/services/settings/RemoteSettingsClient.jsm
-@@ -22,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
-   ClientEnvironmentBase:
-     "resource://gre/modules/components-utils/ClientEnvironment.jsm",
-   Database: "resource://services-settings/Database.jsm",
-+  DeferredTask: "resource://gre/modules/DeferredTask.jsm",
-   IDBHelpers: "resource://services-settings/IDBHelpers.jsm",
-   KintoHttpClient: "resource://services-common/kinto-http-client.js",
-   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-@@ -32,6 +33,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
+diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
+index b69f5ca39d..5cc577ea8f 100644
+--- a/services/settings/RemoteSettingsClient.sys.mjs
++++ b/services/settings/RemoteSettingsClient.sys.mjs
+@@ -11,6 +11,7 @@ const lazy = {};
+ 
+ ChromeUtils.defineESModuleGetters(lazy, {
+   Database: "resource://services-settings/Database.sys.mjs",
++  DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
+   RemoteSettingsWorker:
+     "resource://services-settings/RemoteSettingsWorker.sys.mjs",
+   UptakeTelemetry: "resource://services-common/uptake-telemetry.sys.mjs",
+@@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
  });
  
  const TELEMETRY_COMPONENT = "remotesettings";
@@ -697,7 +697,7 @@ index 7ab9debe73..39108bca89 100644
  
  XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);
  
-@@ -343,6 +345,11 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -338,6 +340,11 @@ export class RemoteSettingsClient extends EventEmitter {
      this._lastCheckTimePref = lastCheckTimePref;
      this._verifier = null;
      this._syncRunning = false;
@@ -709,7 +709,7 @@ index 7ab9debe73..39108bca89 100644
  
      // This attribute allows signature verification to be disabled, when running tests
      // or when pulling data from a dev server.
-@@ -372,6 +379,11 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -367,6 +374,11 @@ export class RemoteSettingsClient extends EventEmitter {
      this.db.identifier = this.identifier;
    }
  
@@ -721,7 +721,7 @@ index 7ab9debe73..39108bca89 100644
    get identifier() {
      return `${this.bucketName}/${this.collectionName}`;
    }
-@@ -445,6 +457,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -440,6 +452,10 @@ export class RemoteSettingsClient extends EventEmitter {
        let lastModified = forceSync ? null : await this.db.getLastModified();
        let hasLocalData = lastModified !== null;
  
@@ -732,7 +732,7 @@ index 7ab9debe73..39108bca89 100644
        if (forceSync) {
          if (!this._importingPromise) {
            this._importingPromise = (async () => {
-@@ -560,7 +576,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -555,7 +571,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.
@@ -744,7 +744,7 @@ index 7ab9debe73..39108bca89 100644
      }
  
      lazy.console.debug(
-@@ -600,6 +619,12 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -595,6 +614,12 @@ export class RemoteSettingsClient extends EventEmitter {
      return final;
    }
  
@@ -758,10 +758,10 @@ index 7ab9debe73..39108bca89 100644
     * Synchronize the local database with the remote server.
     *
 -- 
-2.39.2
+2.40.0
 
 
-From a7b8fa4c2ef5500996ba8f7f923a16735759a86c Mon Sep 17 00:00:00 2001
+From aa31402b33353697d89d75f068f5f17bf9120d8a 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
@@ -779,22 +779,22 @@ on the safe side. This should happen only once after upgrading to each
 new version of the application, so is not likely to introduce any
 noticeable performance issues.
 ---
- services/settings/RemoteSettingsClient.jsm | 6 +++++-
+ services/settings/RemoteSettingsClient.sys.mjs | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 39108bca89..6edb78f58e 100644
---- a/services/settings/RemoteSettingsClient.jsm
-+++ b/services/settings/RemoteSettingsClient.jsm
-@@ -19,6 +19,7 @@ const { Downloader } = ChromeUtils.import(
- const lazy = {};
+diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
+index 5cc577ea8f..833400d047 100644
+--- a/services/settings/RemoteSettingsClient.sys.mjs
++++ b/services/settings/RemoteSettingsClient.sys.mjs
+@@ -18,6 +18,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+ });
  
  XPCOMUtils.defineLazyModuleGetters(lazy, {
 +  CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm",
    ClientEnvironmentBase:
      "resource://gre/modules/components-utils/ClientEnvironment.jsm",
-   Database: "resource://services-settings/Database.jsm",
-@@ -1181,7 +1182,10 @@ class RemoteSettingsClient extends EventEmitter {
+   IDBHelpers: "resource://services-settings/IDBHelpers.jsm",
+@@ -1176,7 +1177,10 @@ export class RemoteSettingsClient extends EventEmitter {
          const old = oldById.get(r.id);
          if (old) {
            oldById.delete(r.id);
@@ -807,10 +807,10 @@ index 39108bca89..6edb78f58e 100644
            }
          } else {
 -- 
-2.39.2
+2.40.0
 
 
-From be54cdb2360f09fe6695ba96b878b7a863828b45 Mon Sep 17 00:00:00 2001
+From 96305ff73eed9d556752b39fd265892a698a943e 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
@@ -819,19 +819,19 @@ When the client detects the local data is invalid (i.e. it came from
 real Remote Settings and can have unwanted records), delete not only
 the records, but also the attachments that came with them, because they
 too can be problematic. And last check time preference, because it's not
-useful anyway when remote-settings.js doesn't do any polling for changes.
+useful anyway when remote-settings.sys.mjs doesn't do any polling for changes.
 
 Note that attachments should be deleted before the records, because the
 logic gets the data about the attachments from those records.
 ---
- services/settings/RemoteSettingsClient.jsm | 12 +++++++++---
+ services/settings/RemoteSettingsClient.sys.mjs | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
-diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 6edb78f58e..110ab320cb 100644
---- a/services/settings/RemoteSettingsClient.jsm
-+++ b/services/settings/RemoteSettingsClient.jsm
-@@ -264,7 +264,7 @@ class AttachmentDownloader extends Downloader {
+diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
+index 833400d047..e4c2175e06 100644
+--- a/services/settings/RemoteSettingsClient.sys.mjs
++++ b/services/settings/RemoteSettingsClient.sys.mjs
+@@ -259,7 +259,7 @@ class AttachmentDownloader extends Downloader {
        allRecords
          .filter(r => !!r.attachment)
          .map(r =>
@@ -840,7 +840,7 @@ index 6edb78f58e..110ab320cb 100644
          )
      );
    }
-@@ -1141,7 +1141,7 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1136,7 +1136,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 +849,7 @@ index 6edb78f58e..110ab320cb 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 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1158,7 +1158,7 @@ export class RemoteSettingsClient extends EventEmitter {
              // _importJSONDump() only clears DB if dump is available,
              // therefore do it here!
              if (imported < 0) {
@@ -858,7 +858,7 @@ index 6edb78f58e..110ab320cb 100644
              }
            }
          }
-@@ -1203,6 +1203,12 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1198,6 +1198,12 @@ export class RemoteSettingsClient extends EventEmitter {
      return syncResult;
    }
  
@@ -872,10 +872,10 @@ index 6edb78f58e..110ab320cb 100644
     * Fetch information from changeset endpoint.
     *
 -- 
-2.39.2
+2.40.0
 
 
-From 1d03a18d5165a4a69f99e08560a2f6a329b553ba Mon Sep 17 00:00:00 2001
+From cb660b9206bd321c98379a0336c72b4c67fa8dc6 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
@@ -886,14 +886,14 @@ is newer than the packaged local dump, then this comparison logic can
 lead to early return of old data, skipping the integrity checking and
 necessary cleanup. So remove the checks.
 ---
- services/settings/RemoteSettingsClient.jsm | 5 -----
+ services/settings/RemoteSettingsClient.sys.mjs | 5 -----
  1 file changed, 5 deletions(-)
 
-diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 110ab320cb..60bf3dcde3 100644
---- a/services/settings/RemoteSettingsClient.jsm
-+++ b/services/settings/RemoteSettingsClient.jsm
-@@ -1083,14 +1083,9 @@ class RemoteSettingsClient extends EventEmitter {
+diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
+index e4c2175e06..6b5ce4e447 100644
+--- a/services/settings/RemoteSettingsClient.sys.mjs
++++ b/services/settings/RemoteSettingsClient.sys.mjs
+@@ -1078,14 +1078,9 @@ export class RemoteSettingsClient extends EventEmitter {
        updated: [],
        deleted: [],
      };
@@ -909,23 +909,23 @@ index 110ab320cb..60bf3dcde3 100644
      await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
        clear: retry,
 -- 
-2.39.2
+2.40.0
 
 
-From 2fb08d4166e324c9caeb26ff47039da45f2061f6 Mon Sep 17 00:00:00 2001
+From 2010e9105610657a0c31c58f94ef82a228992195 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
 
 ---
- services/settings/Attachments.jsm | 37 +++++++------------------------
+ services/settings/Attachments.sys.mjs | 37 ++++++---------------------
  1 file changed, 8 insertions(+), 29 deletions(-)
 
-diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm
-index d8fc0a211d..bf9d72012f 100644
---- a/services/settings/Attachments.jsm
-+++ b/services/settings/Attachments.jsm
-@@ -150,9 +150,10 @@ class Downloader {
+diff --git a/services/settings/Attachments.sys.mjs b/services/settings/Attachments.sys.mjs
+index ce4a0dd1ba..8dd03eee32 100644
+--- a/services/settings/Attachments.sys.mjs
++++ b/services/settings/Attachments.sys.mjs
+@@ -152,9 +152,10 @@ export class Downloader {
        retries,
        checkHash,
        attachmentId = record?.id,
@@ -937,7 +937,7 @@ index d8fc0a211d..bf9d72012f 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.
-@@ -203,6 +204,7 @@ class Downloader {
+@@ -205,6 +206,7 @@ export class Downloader {
          const newBuffer = await this.downloadAsBytes(record, {
            retries,
            checkHash,
@@ -945,7 +945,7 @@ index d8fc0a211d..bf9d72012f 100644
          });
          const blob = new Blob([newBuffer]);
          // Store in cache but don't wait for it before returning.
-@@ -236,7 +238,7 @@ class Downloader {
+@@ -238,7 +240,7 @@ export class Downloader {
        }
  
        try {
@@ -954,7 +954,7 @@ index d8fc0a211d..bf9d72012f 100644
        } catch (e) {
          // Failed to read from cache, e.g. IndexedDB unusable.
          console.error(e);
-@@ -308,7 +310,7 @@ class Downloader {
+@@ -310,7 +312,7 @@ export class Downloader {
     * @returns {String} the absolute file path to the downloaded attachment.
     */
    async downloadToDisk(record, options = {}) {
@@ -963,7 +963,7 @@ index d8fc0a211d..bf9d72012f 100644
      const {
        attachment: { filename, size, hash },
      } = record;
-@@ -363,33 +365,10 @@ class Downloader {
+@@ -365,33 +367,10 @@ export class Downloader {
     */
    async downloadAsBytes(record, options = {}) {
      const {
@@ -1001,10 +1001,10 @@ index d8fc0a211d..bf9d72012f 100644
  
    /**
 -- 
-2.39.2
+2.40.0
 
 
-From 53632cb8587284498e10a10d4fe936a7953fef2e Mon Sep 17 00:00:00 2001
+From 269b327583b25ab611e29347fbca914d7a755817 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 +1029,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 fdb61eaf0c..f6a356b92b 100644
+index c373cde395..d898dc9267 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -13579,7 +13579,7 @@
+@@ -13686,7 +13686,7 @@
  # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".
  - name: security.pki.crlite_mode
    type: RelaxedAtomicUint32
@@ -1054,5 +1054,5 @@ index 5844ffecfd..6084ffc93c 100644
      case CRLiteMode::Disabled:
      case CRLiteMode::TelemetryOnly:
 -- 
-2.39.2
+2.40.0