[iceweasel] 118.0.parabola1

* Update according to upstream changes
* Disable new Translations feature, see reasons in the patch.

1 files changed, 88 insertions, 65 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 0612d44de..379ce9ebc 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 20106ae10f9c6a58f78ce42e7a319385441a1b95 Mon Sep 17 00:00:00 2001
+From 2699eccd5dc65f94d65738cec193e28e71f6321e 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,6 +22,7 @@ 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/newtab/bin/import-rollouts.js          | 4 ++--
  .../components/ASRouterAdmin/ASRouterAdmin.jsx            | 2 +-
  .../newtab/data/content/activity-stream.bundle.js         | 2 +-
  services/settings/Utils.sys.mjs                           | 2 +-
@@ -34,8 +35,30 @@ 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 +-
- 12 files changed, 18 insertions(+), 18 deletions(-)
+ 13 files changed, 20 insertions(+), 20 deletions(-)
 
+diff --git a/browser/components/newtab/bin/import-rollouts.js b/browser/components/newtab/bin/import-rollouts.js
+index 8208c51aef..d012db2b25 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
+@@ -89,7 +89,7 @@ const cli = meow(
+   }
+ );
+ 
+-const RECORDS_URL = `${BASE_URL}${cli.flags.collection}/records`;
++const RECORDS_URL = `${BASE_URL}${cli.flags.collection}.json`;
+ 
+ function fetchJSON(url) {
+   return new Promise((resolve, reject) => {
 diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
 index 3762be9c99..1a9c5028ff 100644
 --- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
@@ -50,10 +73,10 @@ index 3762be9c99..1a9c5028ff 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 0f4445a88b..5806d07265 100644
+index 88a06b5702..a807face6a 100644
 --- a/browser/components/newtab/data/content/activity-stream.bundle.js
 +++ b/browser/components/newtab/data/content/activity-stream.bundle.js
-@@ -1783,7 +1783,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
+@@ -1787,7 +1787,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",
@@ -63,7 +86,7 @@ index 0f4445a88b..5806d07265 100644
          }, "nimbus-desktop-experiments"), ")");
        }
 diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index 697409ab07..316cd907a2 100644
+index c2db005b68..91aa355a87 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
 @@ -100,7 +100,7 @@ export var Utils = {
@@ -135,7 +158,7 @@ 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 65f30b5f15..13e58ac5f6 100644
+index 0e86068dd4..964475174e 100644
 --- a/toolkit/components/search/SearchUtils.sys.mjs
 +++ b/toolkit/components/search/SearchUtils.sys.mjs
 @@ -152,13 +152,13 @@ export var SearchUtils = {
@@ -207,10 +230,10 @@ index 37a376ff90..ef73563f85 100644
  #define PROD_CID "windows-default-browser-agent"
  #define PROD_ID "state"
 -- 
-2.41.0
+2.42.0
 
 
-From cc689c8b58ccb66d58586e219bc41822f1e98890 Mon Sep 17 00:00:00 2001
+From d954757081cd70d27e0dc8d5adca68d95c97cb57 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
@@ -227,10 +250,10 @@ service.
  2 files changed, 15 insertions(+), 9 deletions(-)
 
 diff --git a/dom/push/PushBroadcastService.sys.mjs b/dom/push/PushBroadcastService.sys.mjs
-index 825bb4a452..eda1eaa321 100644
+index eea31ef192..529ecd6917 100644
 --- a/dom/push/PushBroadcastService.sys.mjs
 +++ b/dom/push/PushBroadcastService.sys.mjs
-@@ -170,6 +170,19 @@ export var BroadcastService = class {
+@@ -168,6 +168,19 @@ export var BroadcastService = class {
      }
    }
  
@@ -251,10 +274,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 de49d768a8..65ca487207 100644
+index 95896f5f6e..01111aa690 100644
 --- a/services/settings/remote-settings.sys.mjs
 +++ b/services/settings/remote-settings.sys.mjs
-@@ -575,11 +575,7 @@ function remoteSettingsFunction() {
+@@ -572,11 +572,7 @@ function remoteSettingsFunction() {
        moduleURI: import.meta.url,
        symbolName: "remoteSettingsBroadcastHandler",
      };
@@ -267,7 +290,7 @@ index de49d768a8..65ca487207 100644
    };
  
    return remoteSettings;
-@@ -599,9 +595,6 @@ export var remoteSettingsBroadcastHandler = {
+@@ -596,9 +592,6 @@ export var remoteSettingsBroadcastHandler = {
        `Push notification received (version=${version} phase=${phase})`
      );
  
@@ -279,10 +302,10 @@ index de49d768a8..65ca487207 100644
    },
  };
 -- 
-2.41.0
+2.42.0
 
 
-From 53faed56ab66fd25c5e82a81b264454596b34a72 Mon Sep 17 00:00:00 2001
+From 01820751018f1b849884204d081816e7d4bcb9df 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
@@ -323,10 +346,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.41.0
+2.42.0
 
 
-From 3a48f439a47bc8db72718660691472e412fb5363 Mon Sep 17 00:00:00 2001
+From 400c2e04fa34d920e294c00235838083a0bf6bd4 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
@@ -345,10 +368,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 41d13e23c4..8fa609c2b5 100644
+index 5296d2b4b1..6d8aa0e0b1 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -270,6 +270,7 @@
+@@ -260,6 +260,7 @@
  @RESPATH@/browser/defaults/settings/last_modified.json
  @RESPATH@/browser/defaults/settings/blocklists
  @RESPATH@/browser/defaults/settings/main
@@ -357,7 +380,7 @@ index 41d13e23c4..8fa609c2b5 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 316cd907a2..8765359371 100644
+index 91aa355a87..c9e11531d4 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
 @@ -369,7 +369,7 @@ export var Utils = {
@@ -436,10 +459,10 @@ index f407580bfa..53e9d8b45e 100644
  ]
  
 -- 
-2.41.0
+2.42.0
 
 
-From e9aecc206fbece0edaebd4ab45281bf3e2715a3b Mon Sep 17 00:00:00 2001
+From 906c6cdabc913a605cf91889503072cfaa7b9085 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
@@ -451,7 +474,7 @@ current and any future code that relies on it.
  1 file changed, 10 deletions(-)
 
 diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index 8765359371..7b894cc698 100644
+index c9e11531d4..092c94376f 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
 @@ -183,16 +183,6 @@ export var Utils = {
@@ -472,10 +495,10 @@ index 8765359371..7b894cc698 100644
    },
  
 -- 
-2.41.0
+2.42.0
 
 
-From 42069dc660482b2d46cc28acd05b03a231042990 Mon Sep 17 00:00:00 2001
+From 6e4aa6ad6c0579e96e7a3eb8d3c6d9de1d8fc898 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
@@ -526,10 +549,10 @@ index 1eeaf0bed9..d998a2d3b1 100644
  
    /**
 -- 
-2.41.0
+2.42.0
 
 
-From 61f117cd66893b44dbad129e09c7f3ad44bacbd9 Mon Sep 17 00:00:00 2001
+From ae2173787a6e4690ec4f63a367210753b3ea47be 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
@@ -564,10 +587,10 @@ the upgrade to local-only setup.
  1 file changed, 28 insertions(+), 38 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
-index daf4798477..468f07bc9a 100644
+index 17a693ad93..b0efbd2403 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -706,11 +706,9 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -702,11 +702,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.
@@ -581,7 +604,7 @@ index daf4798477..468f07bc9a 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()).
-@@ -987,38 +985,28 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -983,38 +981,28 @@ export class RemoteSettingsClient extends EventEmitter {
     * @returns {Promise}
     */
    async _validateCollectionSignature(records, timestamp, metadata) {
@@ -628,7 +651,7 @@ index daf4798477..468f07bc9a 100644
      }
    }
  
-@@ -1185,24 +1173,26 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1181,24 +1169,26 @@ export class RemoteSettingsClient extends EventEmitter {
     * @param since timestamp of last sync (optional)
     */
    async _fetchChangeset(expectedTimestamp, since) {
@@ -672,10 +695,10 @@ index daf4798477..468f07bc9a 100644
        remoteRecords,
      };
 -- 
-2.41.0
+2.42.0
 
 
-From 413b18048e8d302862d4c2795ce4e6b62fcad71a Mon Sep 17 00:00:00 2001
+From 4b80ad7284b8b2397afcc0c33de070e0c9abf223 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()
@@ -697,10 +720,10 @@ 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 468f07bc9a..34728b6eb1 100644
+index b0efbd2403..232fd5ddbf 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
    ClientEnvironmentBase:
      "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs",
    Database: "resource://services-settings/Database.sys.mjs",
@@ -708,7 +731,7 @@ index 468f07bc9a..34728b6eb1 100644
    IDBHelpers: "resource://services-settings/IDBHelpers.sys.mjs",
    KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs",
    ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
-@@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
+@@ -23,6 +24,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
  });
  
  const TELEMETRY_COMPONENT = "remotesettings";
@@ -716,7 +739,7 @@ index 468f07bc9a..34728b6eb1 100644
  
  ChromeUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);
  
-@@ -338,6 +340,11 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -334,6 +336,11 @@ export class RemoteSettingsClient extends EventEmitter {
      this._lastCheckTimePref = lastCheckTimePref;
      this._verifier = null;
      this._syncRunning = false;
@@ -728,7 +751,7 @@ index 468f07bc9a..34728b6eb1 100644
  
      // This attribute allows signature verification to be disabled, when running tests
      // or when pulling data from a dev server.
-@@ -367,6 +374,11 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -363,6 +370,11 @@ export class RemoteSettingsClient extends EventEmitter {
      this.db.identifier = this.identifier;
    }
  
@@ -740,7 +763,7 @@ index 468f07bc9a..34728b6eb1 100644
    get identifier() {
      return `${this.bucketName}/${this.collectionName}`;
    }
-@@ -440,6 +452,10 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -436,6 +448,10 @@ export class RemoteSettingsClient extends EventEmitter {
        let lastModified = forceSync ? null : await this.db.getLastModified();
        let hasLocalData = lastModified !== null;
  
@@ -751,7 +774,7 @@ index 468f07bc9a..34728b6eb1 100644
        if (forceSync) {
          if (!this._importingPromise) {
            this._importingPromise = (async () => {
-@@ -555,7 +571,10 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -551,7 +567,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.
@@ -763,7 +786,7 @@ index 468f07bc9a..34728b6eb1 100644
      }
  
      lazy.console.debug(
-@@ -595,6 +614,12 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -591,6 +610,12 @@ export class RemoteSettingsClient extends EventEmitter {
      return final;
    }
  
@@ -777,10 +800,10 @@ index 468f07bc9a..34728b6eb1 100644
     * Synchronize the local database with the remote server.
     *
 -- 
-2.41.0
+2.42.0
 
 
-From 950176b012206ac2455abf39b0337c3763b41b2f Mon Sep 17 00:00:00 2001
+From 4947e8705cdde1b78e223f2713edb435233d03b7 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
@@ -802,7 +825,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 232fd5ddbf..777c999af3 100644
+index 232fd5ddbf..64fda00c7f 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";
@@ -813,7 +836,7 @@ index 232fd5ddbf..777c999af3 100644
    ClientEnvironmentBase:
      "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs",
    Database: "resource://services-settings/Database.sys.mjs",
-@@ -1173,7 +1174,10 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1169,7 +1170,10 @@ export class RemoteSettingsClient extends EventEmitter {
          const old = oldById.get(r.id);
          if (old) {
            oldById.delete(r.id);
@@ -826,10 +849,10 @@ index 232fd5ddbf..777c999af3 100644
            }
          } else {
 -- 
-2.41.0
+2.42.0
 
 
-From 1969cb005348ecaff8a0b6cd5e68bf46c6d066ce Mon Sep 17 00:00:00 2001
+From 31e3597a5fc978ccbec4dda6ee51a129f8a41a1e 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
@@ -847,10 +870,10 @@ logic gets the data about the attachments from those records.
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
-index debb3df51b..d2968c4faf 100644
+index 64fda00c7f..396f1c3eac 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -259,7 +259,7 @@ class AttachmentDownloader extends Downloader {
+@@ -255,7 +255,7 @@ class AttachmentDownloader extends Downloader {
        allRecords
          .filter(r => !!r.attachment)
          .map(r =>
@@ -859,7 +882,7 @@ index debb3df51b..d2968c4faf 100644
          )
      );
    }
-@@ -1133,7 +1133,7 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1129,7 +1129,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`);
@@ -868,7 +891,7 @@ index debb3df51b..d2968c4faf 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);
-@@ -1155,7 +1155,7 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1151,7 +1151,7 @@ export class RemoteSettingsClient extends EventEmitter {
              // _importJSONDump() only clears DB if dump is available,
              // therefore do it here!
              if (imported < 0) {
@@ -877,7 +900,7 @@ index debb3df51b..d2968c4faf 100644
              }
            }
          }
-@@ -1195,6 +1195,12 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1191,6 +1191,12 @@ export class RemoteSettingsClient extends EventEmitter {
      return syncResult;
    }
  
@@ -891,10 +914,10 @@ index debb3df51b..d2968c4faf 100644
     * Fetch information from changeset endpoint.
     *
 -- 
-2.41.0
+2.42.0
 
 
-From 51d266f167d239cba380d581670a6b0e237423d0 Mon Sep 17 00:00:00 2001
+From 0e73e5552e2c9b4189a1bb19ce086420e5f54336 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
@@ -909,10 +932,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 d2968c4faf..8233fe17cb 100644
+index 396f1c3eac..60be4b0372 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -1075,14 +1075,9 @@ export class RemoteSettingsClient extends EventEmitter {
+@@ -1071,14 +1071,9 @@ export class RemoteSettingsClient extends EventEmitter {
        updated: [],
        deleted: [],
      };
@@ -928,10 +951,10 @@ index d2968c4faf..8233fe17cb 100644
      await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
        clear: retry,
 -- 
-2.41.0
+2.42.0
 
 
-From a60122e67c4a865f9690becaed275e5dd10d98dc Mon Sep 17 00:00:00 2001
+From 1423f0168d322121a302b227be9ae64fd9f0adea 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
@@ -1020,10 +1043,10 @@ index 5ddc6bb046..f7888cb769 100644
  
    /**
 -- 
-2.41.0
+2.42.0
 
 
-From 0a9a01a5ffc04de7de047ea4e0209bcdc5556c0b Mon Sep 17 00:00:00 2001
+From 961ada13d31f49efbc1e8b56aa8a8811ca61408a 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
@@ -1048,10 +1071,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 5632486c69..8a26664c08 100644
+index c7ca7ae249..f5d7c4e320 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -14065,7 +14065,7 @@
+@@ -13980,7 +13980,7 @@
  # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".
  - name: security.pki.crlite_mode
    type: RelaxedAtomicUint32
@@ -1061,10 +1084,10 @@ index 5632486c69..8a26664c08 100644
  
  - name: security.tls.version.min
 diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
-index 737f94812d..8762011f05 100644
+index 3893cdcdf2..adf85992a4 100644
 --- a/security/manager/ssl/nsNSSComponent.cpp
 +++ b/security/manager/ssl/nsNSSComponent.cpp
-@@ -1390,6 +1390,7 @@ void nsNSSComponent::setValidationOptions(
+@@ -1129,6 +1129,7 @@ void nsNSSComponent::setValidationOptions(
    CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;
    CRLiteMode crliteMode =
        static_cast<CRLiteMode>(StaticPrefs::security_pki_crlite_mode());
@@ -1073,5 +1096,5 @@ index 737f94812d..8762011f05 100644
      case CRLiteMode::Disabled:
      case CRLiteMode::TelemetryOnly:
 -- 
-2.41.0
+2.42.0