libre/iceweasel: Update to 99.0 according to upstream changes

3 files changed, 110 insertions, 119 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 d4e4ef5d3..c773a8b08 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 15cacd9bfdb9c08def24e780d83bb8dd672c711f Mon Sep 17 00:00:00 2001
+From bec8749011d7dba665eace92557f9d36b36c3060 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
@@ -34,10 +34,10 @@ If necessary, missing files can be added later.
  9 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-index e0d8e45cc0..4cb5fca1c6 100644
+index 0a9da8d804..fdc387aa63 100644
 --- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
 +++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-@@ -1230,7 +1230,7 @@ export class ASRouterAdminInner extends React.PureComponent {
+@@ -1226,7 +1226,7 @@ export class ASRouterAdminInner extends React.PureComponent {
                    <a
                      className="providerUrl"
                      target="_blank"
@@ -47,10 +47,10 @@ index e0d8e45cc0..4cb5fca1c6 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 5227e5af81..427759dcfe 100644
+index 6e7cc5e33d..f2b4f3fcc9 100644
 --- a/browser/components/newtab/data/content/activity-stream.bundle.js
 +++ b/browser/components/newtab/data/content/activity-stream.bundle.js
-@@ -1841,7 +1841,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.Pu
+@@ -1819,7 +1819,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.Pu
          label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
            className: "providerUrl",
            target: "_blank",
@@ -60,10 +60,10 @@ index 5227e5af81..427759dcfe 100644
          }, "nimbus-desktop-experiments"), ")");
        }
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index 1ed81b6f53..edca292681 100644
+index 651d38c0e2..cb72224e1b 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -2210,7 +2210,7 @@ pref("security.cert_pinning.hpkp.enabled", false);
+@@ -2198,7 +2198,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true);
  // Remote settings preferences
  // Note: if you change this, make sure to also review security.onecrl.maximum_staleness_in_seconds
  pref("services.settings.poll_interval", 86400); // 24H
@@ -73,16 +73,15 @@ index 1ed81b6f53..edca292681 100644
  
  // The percentage of clients who will report uptake telemetry as
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index ee23591a6a..ef91781ac6 100644
+index f91e5dcb67..c09c58e693 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -60,11 +60,11 @@ var Utils = {
-       !Cu.isInAutomation &&
-       !isXpcshell &&
-       isNotThunderbird
--      ? "https://firefox.settings.services.mozilla.com/v1"
-+      ? "resource://app/defaults/settings"
-       : gServerURL;
+@@ -90,10 +90,10 @@ var Utils = {
+   get SERVER_URL() {
+     return allowServerURLOverride
+       ? gServerURL
+-      : "https://firefox.settings.services.mozilla.com/v1";
++      : "resource://app/defaults/settings";
    },
  
 -  CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
@@ -91,10 +90,10 @@ index ee23591a6a..ef91781ac6 100644
    /**
     * Logger instance.
 diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
-index 7764777c1a..3c8db49743 100755
+index 191d3d563b..49fb961be2 100755
 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
 +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
-@@ -279,7 +279,7 @@ function compare_suffix_lists {
+@@ -285,7 +285,7 @@ function compare_suffix_lists {
  }
  
  function compare_remote_settings_files {
@@ -104,7 +103,7 @@ index 7764777c1a..3c8db49743 100755
    # 1. List remote settings collections from server.
    echo "INFO: fetch remote settings list from server"
 diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
-index 8a3c6acb84..b0a9c4b86f 100644
+index 41d2a23e55..e123f3f392 100644
 --- a/toolkit/components/search/SearchUtils.jsm
 +++ b/toolkit/components/search/SearchUtils.jsm
 @@ -159,13 +159,13 @@ var SearchUtils = {
@@ -126,10 +125,10 @@ index 8a3c6acb84..b0a9c4b86f 100644
  
    // The following constants are left undocumented in nsISearchService.idl
 diff --git a/toolkit/components/search/docs/DefaultSearchEngines.rst b/toolkit/components/search/docs/DefaultSearchEngines.rst
-index 0648471396..37948dca31 100644
+index 1506af2913..5f43ff26f3 100644
 --- a/toolkit/components/search/docs/DefaultSearchEngines.rst
 +++ b/toolkit/components/search/docs/DefaultSearchEngines.rst
-@@ -86,4 +86,4 @@ is updated.
+@@ -99,4 +99,4 @@ is updated.
  
  .. _configuration schema: SearchConfigurationSchema.html
  .. _remote settings: /services/common/services/RemoteSettings.html
@@ -160,10 +159,10 @@ index 667d9fc628..b2bf628f29 100644
  #define PROD_CID "windows-default-browser-agent"
  #define PROD_ID "state"
 -- 
-2.31.1
+2.35.1
 
 
-From f1e92b5fb7844a57ad63d8a52b4867db9817fc14 Mon Sep 17 00:00:00 2001
+From 99e7bd7760ebcd68575d19761d35a6db20ac8b48 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
@@ -204,10 +203,10 @@ index aa1504211d..d635a2c3aa 100644
     * Call the listeners of the specified broadcasts.
     *
 diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js
-index 6d0185faf9..aae93fa440 100644
+index 4307597351..64cad55929 100644
 --- a/services/settings/remote-settings.js
 +++ b/services/settings/remote-settings.js
-@@ -441,7 +441,7 @@ function remoteSettingsFunction() {
+@@ -446,7 +446,7 @@ function remoteSettingsFunction() {
        moduleURI: __URI__,
        symbolName: "remoteSettingsBroadcastHandler",
      };
@@ -216,7 +215,7 @@ index 6d0185faf9..aae93fa440 100644
    };
  
    return remoteSettings;
-@@ -461,9 +461,6 @@ var remoteSettingsBroadcastHandler = {
+@@ -466,9 +466,6 @@ var remoteSettingsBroadcastHandler = {
        `Push notification received (version=${version} phase=${phase})`
      );
  
@@ -228,10 +227,10 @@ index 6d0185faf9..aae93fa440 100644
    },
  };
 -- 
-2.31.1
+2.35.1
 
 
-From 3054d3efe22802ab5503dd812e0a0283bbd791f1 Mon Sep 17 00:00:00 2001
+From 52e9a179bc94e96fd8959b5fea9884ef9aa5fe77 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
@@ -272,10 +271,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.31.1
+2.35.1
 
 
-From c856641861ca70da2d5aa720e402f2e505ebe5ac Mon Sep 17 00:00:00 2001
+From 04b7e9a6af031487d55eef867e581eb68c4d07c9 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
@@ -287,29 +286,29 @@ 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.jsm               | 13 ++++++++++++-
+ services/settings/Utils.jsm               | 17 ++++++++++++++---
  services/settings/dumps/monitor/moz.build |  8 ++++++++
  services/settings/dumps/moz.build         |  1 +
- 4 files changed, 22 insertions(+), 1 deletion(-)
+ 4 files changed, 24 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 ec20499166..c618c02a8f 100644
+index 73a41dc25b..04c2a3fb6a 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -298,6 +298,7 @@
+@@ -275,6 +275,7 @@
+ @RESPATH@/browser/defaults/settings/last_modified.json
  @RESPATH@/browser/defaults/settings/blocklists
- @RESPATH@/browser/defaults/settings/pinning
  @RESPATH@/browser/defaults/settings/main
 +@RESPATH@/browser/defaults/settings/monitor
  @RESPATH@/browser/defaults/settings/security-state
  
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index ef91781ac6..8736951968 100644
+index c09c58e693..f5605b1b16 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -150,7 +150,7 @@ var Utils = {
+@@ -300,7 +300,7 @@ var Utils = {
    async fetchLatestChanges(serverUrl, options = {}) {
      const { expectedTimestamp, lastEtag = "", filters = {} } = options;
  
@@ -318,7 +317,7 @@ index ef91781ac6..8736951968 100644
      const params = {
        ...filters,
        _expected: expectedTimestamp ?? 0,
-@@ -273,7 +264,10 @@ var Utils = {
+@@ -315,7 +315,10 @@ var Utils = {
            .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
            .join("&");
      }
@@ -330,7 +329,7 @@ index ef91781ac6..8736951968 100644
  
      if (response.status >= 500) {
        throw new Error(`Server error ${response.status} ${response.statusText}`);
-@@ -200,7 +194,15 @@ var Utils = {
+@@ -350,7 +353,15 @@ var Utils = {
        }
      }
  
@@ -362,7 +361,7 @@ index 0000000000..d3d017fda5
 +if CONFIG["MOZ_BUILD_APP"] == "browser":
 +    DIST_SUBDIR = "browser"
 diff --git a/services/settings/dumps/moz.build b/services/settings/dumps/moz.build
-index 3cc9436f61..3742da5667 100644
+index f407580bfa..53e9d8b45e 100644
 --- a/services/settings/dumps/moz.build
 +++ b/services/settings/dumps/moz.build
 @@ -5,6 +5,7 @@
@@ -374,10 +373,10 @@ index 3cc9436f61..3742da5667 100644
  ]
  
 -- 
-2.31.1
+2.35.1
 
 
-From a0f311bed359d484fbf85e696b5b7e3a288292f8 Mon Sep 17 00:00:00 2001
+From d2b5ce3db6af3e000f9ab7a10b2608e77cde0067 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
@@ -389,10 +388,10 @@ current and any future code that relies on it.
  1 file changed, 9 deletions(-)
 
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index 8736951968..8ac085feea 100644
+index f5605b1b16..cd189f1500 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -80,15 +80,6 @@ var Utils = {
+@@ -109,15 +109,6 @@ var Utils = {
     * @return {bool} Whether network is down or not.
     */
    get isOffline() {
@@ -409,10 +408,10 @@ index 8736951968..8ac085feea 100644
    },
  
 -- 
-2.31.1
+2.35.1
 
 
-From 95e4979573c79c987160a71e913c7564de22127f Mon Sep 17 00:00:00 2001
+From 588cd28c3cd000501be66af573ac136e55d7e1ea 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
@@ -463,10 +462,10 @@ index db5017a742..1a8e83c2e8 100644
  
    /**
 -- 
-2.31.1
+2.35.1
 
 
-From daac032f8a4e12451cda9ec6b1eca29f5a35521f Mon Sep 17 00:00:00 2001
+From bce803bdb3e4f7203042454c65c386db6f385439 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
@@ -501,10 +500,10 @@ the upgrade to local-only setup.
  1 file changed, 27 insertions(+), 35 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 80dd563e11..1025ab33a2 100644
+index bd3fddbcf2..1c9dd2378f 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
-@@ -556,11 +556,9 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -587,11 +587,9 @@ 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.
@@ -518,7 +517,7 @@ index 80dd563e11..1025ab33a2 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()).
-@@ -813,32 +811,23 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -844,32 +842,23 @@ class RemoteSettingsClient extends EventEmitter {
    async _validateCollectionSignature(records, timestamp, metadata) {
      const start = Cu.now() * 1000;
  
@@ -557,7 +556,7 @@ index 80dd563e11..1025ab33a2 100644
        ))
      ) {
        throw new InvalidSignatureError(this.identifier);
-@@ -1030,24 +1019,27 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1061,24 +1050,27 @@ class RemoteSettingsClient extends EventEmitter {
     * @param since timestamp of last sync (optional)
     */
    async _fetchChangeset(expectedTimestamp, since) {
@@ -602,10 +601,10 @@ index 80dd563e11..1025ab33a2 100644
        remoteRecords,
      };
 -- 
-2.31.1
+2.35.1
 
 
-From 4d36e599e6b24e10960ebb978c038c66c5ade06d Mon Sep 17 00:00:00 2001
+From dd4897ba2ece2d0deb23953c044c44323d9934d0 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()
@@ -627,7 +626,7 @@ occurs during the session.
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 1025ab33a2..1cebf2bc29 100644
+index 1c9dd2378f..f7a0b3bdaa 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
 @@ -16,6 +16,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
@@ -638,7 +637,7 @@ index 1025ab33a2..1cebf2bc29 100644
    Downloader: "resource://services-settings/Attachments.jsm",
    IDBHelpers: "resource://services-settings/IDBHelpers.jsm",
    KintoHttpClient: "resource://services-common/kinto-http-client.js",
-@@ -30,6 +31,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
+@@ -28,6 +29,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  });
  
  const TELEMETRY_COMPONENT = "remotesettings";
@@ -661,7 +660,7 @@ index 1025ab33a2..1cebf2bc29 100644
  
      // This attribute allows signature verification to be disabled, when running tests
      // or when pulling data from a dev server.
-@@ -290,6 +300,11 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -293,6 +303,11 @@ class RemoteSettingsClient extends EventEmitter {
      );
    }
  
@@ -673,7 +672,7 @@ index 1025ab33a2..1cebf2bc29 100644
    get identifier() {
      return `${this.bucketName}/${this.collectionName}`;
    }
-@@ -353,6 +368,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -361,6 +376,10 @@ class RemoteSettingsClient extends EventEmitter {
        let lastModified = await this.db.getLastModified();
        let hasLocalData = lastModified !== null;
  
@@ -684,7 +683,7 @@ index 1025ab33a2..1cebf2bc29 100644
        if (syncIfEmpty && !hasLocalData) {
          // .get() was called before we had the chance to synchronize the local database.
          // We'll try to avoid returning an empty list.
-@@ -414,7 +433,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -445,7 +464,10 @@ 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.
@@ -696,7 +695,7 @@ index 1025ab33a2..1cebf2bc29 100644
      }
  
      console.debug(
-@@ -452,6 +474,12 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -483,6 +505,12 @@ class RemoteSettingsClient extends EventEmitter {
      return final;
    }
  
@@ -710,10 +709,10 @@ index 1025ab33a2..1cebf2bc29 100644
     * Synchronize the local database with the remote server.
     *
 -- 
-2.31.1
+2.35.1
 
 
-From defc4080596f5407a98f0c9f1a456f685226054f Mon Sep 17 00:00:00 2001
+From 192096cd8caa2cbdfdc294a71056e6ee1b7e513d 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
@@ -735,7 +734,7 @@ noticeable performance issues.
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 1cebf2bc29..2c18c5cfb6 100644
+index f7a0b3bdaa..64ac27d149 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
 @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
@@ -746,7 +745,7 @@ index 1cebf2bc29..2c18c5cfb6 100644
    ClientEnvironmentBase:
      "resource://gre/modules/components-utils/ClientEnvironment.jsm",
    Database: "resource://services-settings/Database.jsm",
-@@ -1022,7 +1023,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1053,7 +1054,10 @@ class RemoteSettingsClient extends EventEmitter {
          const old = oldById.get(r.id);
          if (old) {
            oldById.delete(r.id);
@@ -759,10 +758,10 @@ index 1cebf2bc29..2c18c5cfb6 100644
            }
          } else {
 -- 
-2.31.1
+2.35.1
 
 
-From c2ee19f01bc37e15c7742af8a502ffaa10745a52 Mon Sep 17 00:00:00 2001
+From c834cd3beeb989f30c88aabea480d08989c02abc 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
@@ -780,10 +779,10 @@ logic gets the data about the attachments from those records.
  1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 2c18c5cfb6..8b65dc0cba 100644
+index 64ac27d149..ac6259ca2c 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
-@@ -221,7 +221,10 @@ class AttachmentDownloader extends Downloader {
+@@ -219,7 +219,10 @@ class AttachmentDownloader extends Downloader {
    async deleteAll() {
      let allRecords = await this._client.db.list();
      return Promise.all(
@@ -795,7 +794,7 @@ index 2c18c5cfb6..8b65dc0cba 100644
      );
    }
  }
-@@ -982,7 +985,7 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1013,7 +1016,7 @@ class RemoteSettingsClient extends EventEmitter {
            // Signature failed, clear local DB because it contains
            // bad data (local + remote changes).
            console.debug(`${this.identifier} clear local data`);
@@ -804,7 +803,7 @@ index 2c18c5cfb6..8b65dc0cba 100644
            // Local data was tampered, throw and it will retry from empty DB.
            console.error(`${this.identifier} local data was corrupted`);
            throw new CorruptedDataError(this.identifier);
-@@ -1004,7 +1007,7 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1035,7 +1038,7 @@ class RemoteSettingsClient extends EventEmitter {
              // _importJSONDump() only clears DB if dump is available,
              // therefore do it here!
              if (imported < 0) {
@@ -813,7 +812,7 @@ index 2c18c5cfb6..8b65dc0cba 100644
              }
            }
          }
-@@ -1044,6 +1047,12 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1075,6 +1078,12 @@ class RemoteSettingsClient extends EventEmitter {
      return syncResult;
    }
  
@@ -827,10 +826,10 @@ index 2c18c5cfb6..8b65dc0cba 100644
     * Fetch information from changeset endpoint.
     *
 -- 
-2.31.1
+2.35.1
 
 
-From 56d2af487f7077753ea4df6bd0b1e6c91ed7ab9f Mon Sep 17 00:00:00 2001
+From 68ee3019155c605ea3fefd9370209d548d1049c2 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
@@ -845,10 +844,10 @@ necessary cleanup. So remove the checks.
  1 file changed, 5 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 8b65dc0cba..6274596591 100644
+index ac6259ca2c..e59845a337 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
-@@ -917,14 +917,9 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -948,14 +948,9 @@ class RemoteSettingsClient extends EventEmitter {
        updated: [],
        deleted: [],
      };
@@ -864,10 +863,10 @@ index 8b65dc0cba..6274596591 100644
      const start = Cu.now() * 1000;
      await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
 -- 
-2.31.1
+2.35.1
 
 
-From c009c1a9ba2477c9335921b706256f115ecfd498 Mon Sep 17 00:00:00 2001
+From aa15f1fee8030b3a315312fba2f1b19e6694aad4 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
@@ -877,10 +876,10 @@ Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
  1 file changed, 8 insertions(+), 27 deletions(-)
 
 diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm
-index 0eeb632799..eaa7db8c81 100644
+index 70c02627ac..d24d8907fd 100644
 --- a/services/settings/Attachments.jsm
 +++ b/services/settings/Attachments.jsm
-@@ -143,10 +143,11 @@ class Downloader {
+@@ -141,10 +141,11 @@ class Downloader {
        checkHash,
        attachmentId = record?.id,
        useCache = false,
@@ -893,7 +892,7 @@ index 0eeb632799..eaa7db8c81 100644
      if (!useCache) {
        // For backwards compatibility.
        // WARNING: Its return type is different from what's documented.
-@@ -206,6 +207,7 @@ class Downloader {
+@@ -204,6 +205,7 @@ class Downloader {
          const newBuffer = await this.downloadAsBytes(record, {
            retries,
            checkHash,
@@ -901,7 +900,7 @@ index 0eeb632799..eaa7db8c81 100644
          });
          const blob = new Blob([newBuffer]);
          if (useCache) {
-@@ -241,7 +243,7 @@ class Downloader {
+@@ -239,7 +241,7 @@ class Downloader {
        }
  
        try {
@@ -910,7 +909,7 @@ index 0eeb632799..eaa7db8c81 100644
        } catch (e) {
          // Failed to read from cache, e.g. IndexedDB unusable.
          Cu.reportError(e);
-@@ -278,7 +280,7 @@ class Downloader {
+@@ -276,7 +278,7 @@ class Downloader {
     * @returns {String} the absolute file path to the downloaded attachment.
     */
    async downloadToDisk(record, options = {}) {
@@ -919,7 +918,7 @@ index 0eeb632799..eaa7db8c81 100644
      const {
        attachment: { filename, size, hash },
      } = record;
-@@ -335,31 +337,10 @@ class Downloader {
+@@ -333,31 +335,10 @@ class Downloader {
     */
    async downloadAsBytes(record, options = {}) {
      const {
@@ -955,10 +954,10 @@ index 0eeb632799..eaa7db8c81 100644
  
    /**
 -- 
-2.31.1
+2.35.1
 
 
-From 2035bd7a6ce1816417b619d3f1ce994a8b44ce9d Mon Sep 17 00:00:00 2001
+From 271e88d8a18a6ae30ccc616c57fe7a36290ba520 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
@@ -983,18 +982,18 @@ certificate revocations.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index edca292681..da7e23d674 100644
+index cb72224e1b..79940b598a 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -172,7 +172,7 @@ pref("security.cert_pinning.max_max_age_seconds", 5184000);
- // 0: Disable CRLite entirely
- // 1: Enable and check revocations via CRLite, but only collect telemetry
- // 2: Enable and enforce revocations via CRLite
+@@ -160,7 +160,7 @@ pref("security.xfocsp.errorReporting.automatic", false);
+ // 1: Consult CRLite but only collect telemetry.
+ // 2: Consult CRLite and enforce both "Revoked" and "Not Revoked" results.
+ // 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".
 -pref("security.pki.crlite_mode", 1);
 +pref("security.pki.crlite_mode", 0);
  
- // Represents the expected certificate transparency log merge delay (including
- // the time to generate a CRLite filter). Currently 28 hours in seconds.
+ // Issuer we use to detect MitM proxies. Set to the issuer of the cert of the
+ // Firefox update service. The string format is whatever NSS uses to print a DN.
 -- 
-2.31.1
+2.35.1
 
diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index 651317f6f..a5e843578 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -1,4 +1,4 @@
-From f3f1223d1a9bee16672c6b7ec07dc5816a5ea084 Mon Sep 17 00:00:00 2001
+From b410d2259c469d5f3c30bbbdddaeeb1956c58297 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Apr 2021 13:09:05 +0300
 Subject: [PATCH 1/2] geolocation: Disable API and remove Google API URLs
@@ -23,10 +23,10 @@ default for now.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index a9f8e6318f..81e40f6db4 100644
+index 153d7504d2..79928ac755 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -4884,7 +4884,7 @@
+@@ -5067,7 +5067,7 @@
  # Is support for Navigator.geolocation enabled?
  - name: geo.enabled
    type: bool
@@ -36,10 +36,10 @@ index a9f8e6318f..81e40f6db4 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 fab5c7b41b..9805ea69c9 100644
+index 651d38c0e2..0c5f36c5b6 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -3720,7 +3720,7 @@ pref("network.psl.onUpdate_notify", false);
+@@ -3726,7 +3726,7 @@ pref("network.psl.onUpdate_notify", false);
  // All the Geolocation preferences are here.
  //
  #ifndef EARLY_BETA_OR_EARLIER
@@ -52,37 +52,31 @@ index fab5c7b41b..9805ea69c9 100644
 2.35.1
 
 
-From bff69763d7833a187d663a443cca20f5bdd83acf Mon Sep 17 00:00:00 2001
+From f687c43eb8adc710c54d9dd2ee2ea8d57b8088e3 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Apr 2021 13:49:05 +0300
 Subject: [PATCH 2/2] Disable banners and remove URLs for mobile apps on
  about:protections page
 
 ---
- browser/app/profile/firefox.js | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ browser/app/profile/firefox.js | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 6bbc26eb86..8ea3186824 100644
+index af9c349671..0ecb9726bd 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1877,7 +1877,7 @@ pref("browser.contentblocking.report.monitor.enabled", true);
+@@ -1883,7 +1883,7 @@ pref("browser.contentblocking.report.monitor.enabled", true);
  pref("browser.contentblocking.report.proxy.enabled", false);
  
  // Disable the mobile promotion by default.
 -pref("browser.contentblocking.report.show_mobile_app", true);
 +pref("browser.contentblocking.report.show_mobile_app", false);
  
- // Avoid advertising in certain regions. Comma separated string of two letter ISO 3166-1 country codes.
- // We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.jsm only exposes the country, not the subdivision.
-@@ -1887,12 +1887,12 @@ pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,t
- pref("browser.vpn_promo.enabled", true);
+ // 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
+@@ -1902,7 +1902,7 @@ pref("browser.contentblocking.report.vpn_regions", "at,be,ca,ch,de,fr,ie,it,my,n
  
- // Enable the vpn card by default.
--pref("browser.contentblocking.report.vpn.enabled", true);
-+pref("browser.contentblocking.report.vpn.enabled", false);
- // Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes.
- pref("browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb,de,fr");
  // Comma separated string of mozilla vpn supported platforms.
  pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");
 -pref("browser.contentblocking.report.hide_vpn_banner", false);
@@ -90,7 +84,7 @@ index 6bbc26eb86..8ea3186824 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");
-@@ -1903,12 +1903,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
+@@ -1913,12 +1913,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");
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index bb71cd601..40d6f3cc9 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -59,7 +59,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=98.0.1
+pkgver=99.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=95.0-1
@@ -68,14 +68,12 @@ arch=(x86_64)
 arch+=(armv7h i686)
 license=(MPL GPL LGPL)
 url="https://wiki.parabola.nu/Iceweasel"
-depends=(gtk3 libxt mime-types dbus-glib ffmpeg4.4 nss ttf-font libpulse)
+depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
              python-setuptools python-psutil python-zstandard lld dump_syms
              wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)
 makedepends+=(quilt libxslt imagemagick git jq python-jsonschema)
-depends=( ${depends[*]/ffmpeg4.4/ffmpeg} )
-makedepends+=(libvpx=1.11.0-1)
 [[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]/jack/jack2} )
 [[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]/llvm/llvm12} )
 makedepends_i686=(gcc10) # cannot build i686 today - rust is unusable
@@ -102,13 +100,13 @@ source_armv7h=(build-arm-libopus.patch)
 source_i686=('avoid-libxul-OOM-python-check.patch'
              'rust-static-disable-network-test-on-static-libraries.patch'
              'firefox-93.0_x86_math_private_20211110.patch')
-sha256sums=('f8de2f514d94cad25a2c8a5d219399de5c05a907607d51c5c5235a8bc9bb361c'
+sha256sums=('513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327'
             'SKIP'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
 sha256sums+=('d1b9d98cea5356df97fc5c221830de1ced8f826cb39fac9427c407e3eae54c02'
              'SKIP'
-             'a4e3c3869085cb282cb5a0fcb64e816c0415f25d4792a62c4f1d599d3111b23c'
-             'cb3079a0dc30321183bf8e112532c6f2aad045f68103f8d422c9691137aa770e'
+             'af53bd22378cd87c27438c34dc1daf3f1909735e85c914b56440751a9dc16856'
+             'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b'
              'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1'
              '0471c2f625ed8e76833bc7c15dfab23e613600f4ee1abe5e81047237644eea95'
              '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83'