libre/iceweasel: 108.0 upstream updates

1 files changed, 12 insertions, 12 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 67d1a17ae..2cc30dd70 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
@@ -30,7 +30,7 @@ If necessary, missing files can be added later.
  toolkit/components/search/SearchUtils.sys.mjs             | 8 ++++----
  toolkit/components/search/docs/DefaultSearchEngines.rst   | 2 +-
  .../components/search/docs/SearchEngineConfiguration.rst  | 2 +-
- toolkit/modules/AppConstants.jsm                          | 4 ++--
+ toolkit/modules/AppConstants.sys.mjs                          | 4 ++--
  toolkit/mozapps/defaultagent/RemoteSettings.cpp           | 2 +-
  10 files changed, 15 insertions(+), 15 deletions(-)
 
@@ -144,10 +144,10 @@ index c782f9f7c3..4d773d27c5 100644
 -.. _viewed live: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records
 +.. _viewed live: resource://app/defaults/settings/main/search-config.json
  .. _Normandy: /toolkit/components/normandy/normandy/services.html
-diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
+diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
 index 15125bcca0..1b3e502730 100644
---- a/toolkit/modules/AppConstants.jsm
-+++ b/toolkit/modules/AppConstants.jsm
+--- a/toolkit/modules/AppConstants.sys.mjs
++++ b/toolkit/modules/AppConstants.sys.mjs
 @@ -420,9 +420,9 @@ var AppConstants = Object.freeze({
  
    REMOTE_SETTINGS_SERVER_URL:
@@ -189,14 +189,14 @@ 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.jsm    | 13 +++++++++++++
+ dom/push/PushBroadcastService.sys.mjs    | 13 +++++++++++++
  services/settings/remote-settings.js | 11 ++---------
  2 files changed, 15 insertions(+), 9 deletions(-)
 
-diff --git a/dom/push/PushBroadcastService.jsm b/dom/push/PushBroadcastService.jsm
+diff --git a/dom/push/PushBroadcastService.sys.mjs b/dom/push/PushBroadcastService.sys.mjs
 index 80df53ee49..109d602d4a 100644
---- a/dom/push/PushBroadcastService.jsm
-+++ b/dom/push/PushBroadcastService.jsm
+--- a/dom/push/PushBroadcastService.sys.mjs
++++ b/dom/push/PushBroadcastService.sys.mjs
 @@ -179,6 +179,19 @@ var BroadcastService = class {
      }
    }
@@ -692,16 +692,16 @@ index 75589ff02e..90280fc848 100644
      return `${this.bucketName}/${this.collectionName}`;
    }
 @@ -419,6 +431,10 @@ class RemoteSettingsClient extends EventEmitter {
-       let lastModified = await this.db.getLastModified();
+       let lastModified = forceSync ? null : await this.db.getLastModified();
        let hasLocalData = lastModified !== null;
  
 +      if (!(await this._isSynced())) {
 +        throw new MissingSignatureError(this.identifier);
 +      }
 +
-       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.
+       if (forceSync) {
+         if (!this._importingPromise) {
+           this._importingPromise = (async () => {
 @@ -527,7 +543,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,