diff options
author | grizzlyuser <grizzlyuser@protonmail.com> | 2022-12-13 19:30:16 +0100 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-12-25 00:55:56 -0500 |
commit | e2427e709d0bffbb17ea386dd945ff0c465f9c1f (patch) | |
tree | 544ba7aefd09d010dcd46ac31c966dc6fffe6c46 /libre/iceweasel | |
parent | c6981ca32f91a440300d4fd4f20559c5a7fb00d7 (diff) |
libre/iceweasel: 108.0 upstream updates
Diffstat (limited to 'libre/iceweasel')
-rw-r--r-- | libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch | 24 | ||||
-rw-r--r-- | libre/iceweasel/9003-FSDG-urihandlers.patch | 6 | ||||
-rw-r--r-- | libre/iceweasel/PKGBUILD | 16 |
3 files changed, 23 insertions, 23 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, diff --git a/libre/iceweasel/9003-FSDG-urihandlers.patch b/libre/iceweasel/9003-FSDG-urihandlers.patch index 504d18b36..10cec261e 100644 --- a/libre/iceweasel/9003-FSDG-urihandlers.patch +++ b/libre/iceweasel/9003-FSDG-urihandlers.patch @@ -1,7 +1,7 @@ -diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm +diff --git a/uriloader/exthandler/HandlerList.sys.mjs b/uriloader/exthandler/HandlerList.sys.mjs index 04b9205..ff3aec5 100644 ---- a/uriloader/exthandler/HandlerList.jsm -+++ b/uriloader/exthandler/HandlerList.jsm +--- a/uriloader/exthandler/HandlerList.sys.mjs ++++ b/uriloader/exthandler/HandlerList.sys.mjs @@ -11,229 +11,25 @@ this.kHandlerListVersion = 1; this.kHandlerList = { default: { diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3a342f278..41ae97603 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=107.0.1 +pkgver=108.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -178,15 +178,15 @@ validpgpkeys+=( 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger ) -sha256sums=('e29950b9ba9143b0d683dc18779bbe70bbd082533aff8f6a7af69b19533e0647' +sha256sums=('ce0d31f89111fcce9e2dd490d810b6a704f7214ba0186fa2d2ec960099808e63' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58' '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'SKIP' - '77cfa1e135ba6884ee343468075491b67fe148077e4aebe8bb5ff7b5f6e022c2' + '29117bc6311dcd05c9427877fde4ec491f328b758526edf8da534f68054097b9' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' - 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' + '13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62' '0c5333c4fc28ba9ca5b4d00127918d662fe8c570d4ebc0a64e5174e0ef41ae01' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45' @@ -196,15 +196,15 @@ sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e3 '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' '1c2015e9f59c2c3bc898e04c6c6d33523f835638fd314d24944a8063cbce79d8' '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06') -b2sums=('cab3d7e723c9927518a3acfbf8d0db7846074000933074309b9bea1dcc2e182b579a7a6b2763bafeaf813d9846c4539d6e73cf75734844f3207525aff7e5c8be' +b2sums=('ac8e5d613899df4634d7126735b219938b48f49c9306c09eb1669fadcc362f6d492ec3cb6d8a8113eced73fc3351c54d6e5d4ce70b1c77a3a87db22adb76ce81' 'SKIP' 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635' '28a22a11572fba86bf8412f86a2eca8dc34ce42e790d9c9b1e0b1a66959b2b0240353e0aef22741d6d2baa08bc7ff35ddfd3770b706654ffa8089a26495e4ee3') b2sums+=('c2a2ead1b44c563583abb5cd3579e8f2724ea79e12aba1b315f201a09547d611b4a3c98de12f063b25826fd1520562d411ab917780bab4d78a1240fe56096b1b' 'SKIP' - 'fc681f1abbcdb669e60f7d40a43749f16e0693e18b790c259367f64212a28981246e01cbf269b6b9c05e9ea3a9fcb4fb7ee35340769676f3051da5585982ae5d' + 'f4c439b01302f2db242656fce1b15de483ef146ae9d7783809386f4295ce09eb1f5629335f2c1c296d8afde46e01e10fc01c97b1ea7d8c6c8c48d15e41e8fdc8' '2eaacb9fb15391557a36cae10ec6d70b5a4ab6f71c4b24d268f5c0df78b272f0d88c9c7498ae92c60f1436dff82dc8c49e94b0a535535329a2419302aee7b7a8' - '48b23fcf1e5fe3e8e0d2f85e1e43c79700449838d39a962110d30f5f7acdefcd1db6f80ccade2ab1eb7e26e5651cbfb37d8358d7f87f9e820d4a395cce8b0454' + '9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c' '42e08d0872dffa94ec73d29c08b60ce4d966be2f785e07a01ec3ef2ac05bbe895675655b60e85f9c705878291df7ead69e7ef9d7bce8c95a47b6a124231f889c' '2a746251ffdbe91bc8933c798242a32dfda7f9621d26924a752e5fa9b5f97a1b8cd83fbb0e9063d62fc36e08f8222371ac7873202c2ce5f8498c12024b4ccdc4' '5f0bb717734f94594e146d72a95e65bf631716affca84c5cdd1d3777f2c9ddd1a9ec243c806f7a846a5cfcaa5793d8f84b0e0720d4f868ae6368857a69506427' @@ -301,7 +301,7 @@ _check_patching() { echo "verifying libre patching" # URI protocol handlers - local uri_handlers=uriloader/exthandler/HandlerList.jsm + local uri_handlers=uriloader/exthandler/HandlerList.sys.mjs local webmails='google|yahoo' grep 'name:' $uri_handlers | grep '"KiwiIRC",' &> /dev/null && \ ! grep 'name:' $uri_handlers | grep -v '"KiwiIRC",' &> /dev/null && \ |