libre/iceweasel: 117.0-1.parabola1

* add libxss dependency, missed a few releases back
* update according to upstream changes

5 files changed, 57 insertions, 85 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 ef8e257ae..0612d44de 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
@@ -707,14 +707,14 @@ index 468f07bc9a..34728b6eb1 100644
 +  DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
    IDBHelpers: "resource://services-settings/IDBHelpers.sys.mjs",
    KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs",
-   RemoteSettingsWorker:
+   ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
 @@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
  });
  
  const TELEMETRY_COMPONENT = "remotesettings";
 +const DEFERRED_SYNC_DELAY_MILLISECONDS = 1000;
  
- XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);
+ ChromeUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);
  
 @@ -338,6 +340,11 @@ export class RemoteSettingsClient extends EventEmitter {
      this._lastCheckTimePref = lastCheckTimePref;
@@ -802,17 +802,17 @@ 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 34728b6eb1..debb3df51b 100644
+index 232fd5ddbf..777c999af3 100644
 --- a/services/settings/RemoteSettingsClient.sys.mjs
 +++ b/services/settings/RemoteSettingsClient.sys.mjs
-@@ -24,6 +24,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
- });
- 
- XPCOMUtils.defineLazyModuleGetters(lazy, {
-+  CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm",
-   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
- });
+@@ -9,6 +9,7 @@ import { Downloader } from "resource://services-settings/Attachments.sys.mjs";
+ const lazy = {};
  
+ ChromeUtils.defineESModuleGetters(lazy, {
++  CanonicalJSON: "resource://gre/modules/CanonicalJSON.sys.mjs",
+   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 {
          const old = oldById.get(r.id);
          if (old) {
diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index ea12feab3..c32ff866f 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -76,9 +76,9 @@ index a7d255df89..801816dc41 100644
  // 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
 @@ -1989,7 +1989,7 @@ pref("browser.promo.cookiebanners.enabled", false);
+ // Set to true for Fx113 (see bug 1808611)
+ pref("browser.promo.cookiebanners.enabled", false);
  
- // 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);
 +pref("browser.contentblocking.report.hide_vpn_banner", true);
  pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA");
diff --git a/libre/iceweasel/9003-FSDG-urihandlers.patch b/libre/iceweasel/9003-FSDG-urihandlers.patch
index 10cec261e..80b3c4578 100644
--- a/libre/iceweasel/9003-FSDG-urihandlers.patch
+++ b/libre/iceweasel/9003-FSDG-urihandlers.patch
@@ -1,54 +1,32 @@
 diff --git a/uriloader/exthandler/HandlerList.sys.mjs b/uriloader/exthandler/HandlerList.sys.mjs
-index 04b9205..ff3aec5 100644
+index e95d627c07..81f9218da9 100644
 --- a/uriloader/exthandler/HandlerList.sys.mjs
 +++ b/uriloader/exthandler/HandlerList.sys.mjs
-@@ -11,229 +11,25 @@ this.kHandlerListVersion = 1;
- this.kHandlerList = {
+@@ -7,197 +7,25 @@ export const kHandlerListVersion = 1;
+ export const kHandlerList = {
    default: {
      schemes: {
 -      mailto: {
-+      irc: {
-         handlers: [
-           {
+-        handlers: [
+-          {
 -            name: "Gmail",
 -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",
-+            name: "KiwiIRC",
-+            uriTemplate: "https://web.libera.chat/?url=%s",
-           },
-         ],
-       },
+-          },
+-        ],
+-      },
 -    },
 -  },
 -  cs: {
 -    schemes: {
 -      mailto: {
-+      ircs: {
-         handlers: [
-           {
+-        handlers: [
+-          {
 -            name: "Seznam",
 -            uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s",
 -          },
 -          {
 -            name: "Gmail",
 -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",
-+            name: "KiwiIRC",
-+            uriTemplate: "https://web.libera.chat/?url=%s",
-           },
-         ],
-       },
--    },
--  },
--  csb: {
--    schemes: {
-       mailto: {
-         handlers: [
-           {
--            name: "Poczta Interia.pl",
--            uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s",
--          },
--          {
--            name: "OnetPoczta",
--            uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s",
 -          },
 -        ],
 -      },
@@ -74,40 +52,46 @@ index 04b9205..ff3aec5 100644
 -  "ja-JP-mac": {
 -    schemes: {
 -      mailto: {
--        handlers: [
--          {
++      irc: {
+         handlers: [
+           {
 -            name: "Yahoo!メール",
 -            uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",
 -          },
 -          {
 -            name: "Gmail",
 -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",
--          },
--        ],
--      },
++            name: "KiwiIRC",
++            uriTemplate: "https://web.libera.chat/?url=%s",
+           },
+         ],
+       },
 -    },
 -  },
 -  ja: {
 -    schemes: {
 -      mailto: {
--        handlers: [
--          {
++      ircs: {
+         handlers: [
+           {
 -            name: "Yahoo!メール",
 -            uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",
 -          },
 -          {
 -            name: "Gmail",
 -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",
--          },
--        ],
--      },
++            name: "KiwiIRC",
++            uriTemplate: "https://web.libera.chat/?url=%s",
+           },
+         ],
+       },
 -    },
 -  },
 -  kk: {
 -    schemes: {
--      mailto: {
--        handlers: [
--          {
+       mailto: {
+         handlers: [
+           {
 -            name: "Яндекс.Почта",
 -            uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",
 -          },
@@ -191,22 +175,6 @@ index 04b9205..ff3aec5 100644
 -      },
 -    },
 -  },
--  sah: {
--    schemes: {
--      mailto: {
--        handlers: [
--          {
--            name: "Яндекс.Почта",
--            uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",
--          },
--          {
--            name: "Mail.Ru",
--            uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",
--          },
--        ],
--      },
--    },
--  },
 -  uk: {
 -    schemes: {
 -      mailto: {
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index c6d8e92b1..d5b7d57f9 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -1192,6 +1192,7 @@ index a52cde5532..251acad0f8 100644
 +-focus-brand-name = Iceweasel Focus
 +-relay-brand-name = Iceweasel Relay
  -relay-brand-short-name = Relay
+ -fakespot-brand-name = Fakespot
  
 -# “Suggest” can be localized, “Firefox” must be treated as a brand
 +# “Suggest” can be localized, “Iceweasel” must be treated as a brand
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index e6ff7b8c4..523d830ef 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,7 +70,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=116.0
+pkgver=117.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=115.0
@@ -91,6 +91,7 @@ depends=(
   ffmpeg
   gtk3
   libpulse
+  libxss
   libxt
   mime-types
   nss
@@ -173,21 +174,23 @@ source_i686=(
   fix-i686-xsimd-incomplete.patch
 )
 validpgpkeys=(
-  '14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases <release@mozilla.com>
+  # Mozilla Software Releases <release@mozilla.com>
+  # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/
+  14F26682D0916CDD81E37B6D61B7B526D98F0353
 )
 validpgpkeys+=(
   'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
   '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger
 )
-sha256sums=('215d076945bf744327a252f498227ab68e9ba4e3b703e058683d9e4ab92cba76'
+sha256sums=('fa524cb9a63334d74ef996f3cbaf1559b5836f6c8ef6e890fa20846029242ac7'
             'SKIP'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
 sha256sums+=('b701b4c47fca2661feeabe172e398c76c8015ee08ff4cc3cc2f7c3ef2ed692a7'
              'SKIP'
-             'd8f9a78c06bac7e444dd2c98e4ae493583d9286cf21aef6adfe93ef801287eeb'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-             '48813738459b55d8b5d61eb553ef838dbd0dd4fcdba4398c2cb1c245925be2b7'  # 9002-FSDG-preference-defaults.patch
-             '13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62'  # 9003-FSDG-urihandlers.patch
-             'f01c4bda81b859f400c741ca97fcf945a768a799efe73943f45eb327d717eaa2'  # 9004-FSDG-misc.patch
+             '60d4373f55bc72b4803420d545c7a895339b38b855e86b6cdc6429463b875ec9'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+             '7de621cecbd05a12606cc977c53a86deebe7bd36e317f427d13b271bb7162ac4'  # 9002-FSDG-preference-defaults.patch
+             '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62'  # 9003-FSDG-urihandlers.patch
+             'e75975be17acf458c76adcdb7ebb0cedee6d480bef6a0e241bbd4d3cf1e38913'  # 9004-FSDG-misc.patch
              '00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332'  # process-json-files.py
              '8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc'  # vendor.js.in
              'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
@@ -197,15 +200,15 @@ sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e3
                  'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'
                  '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'
                  'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544')
-b2sums=('844f37e6f1f0947771a5e9a629ad44c04733906cb5922d5541ec12c4193dee4307cd435c381a97ce4ff20be1f31200a0c13c6e33a0308fcab9ce16b1327723c1'
+b2sums=('748e7ea88f493d449e52e94a268190f9beca671aebba057f7089897dee51d3e8d45c6f9721d38891c787b401cb6b32128d3b3b25073e17326c8fca80fe07d015'
         'SKIP'
         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635')
 b2sums+=('a22044292e464b3922eb2e4a8cf0993524d232eeb4a8602707589d00f690498d3b76e515c8d0ce4995b3bf8a65df9aa814b49de469178aa1f8cc07ec19dd5d32'
          'SKIP'
-         'c2f3df87a04b04740181eaedd1b6bf6606c03c926c82a02a07e7aad0843d748406d4be9980f4b966792fb79802e6d935c4493c208d238333fceea221a4ed058d'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-         '0220e899506fefa2b6e5de5192c4b56f824b3a9340fb33ea6f3062fa57ff0c91c8c084df4a9761eb102fdab359b1282888bc3138733b581043a8b5b5138628b4'  # 9002-FSDG-preference-defaults.patch
-         '9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c'  # 9003-FSDG-urihandlers.patch
-         '2213f136bb3c66baed52bbff1c09f3d883c5e9bb0b06d9d0777ad718fcd55ce68a5f512d4cca796de78d254aba1078d0d254070e79275571e3d94aacbbb8556f'  # 9004-FSDG-misc.patch
+         'abd0c76b5baecda36c3303b034760bbb8a69c0bd1a7ba7646a203772083f54e79ce07af1f0b1c7f1ae1b7294695b4e259d3a796e48afa4b9782de865277a92c6'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+         'bc3dc2155f8d7d6a19f22b9977bfa1a30a9b4300011470706f3733b2eb71995f8b42290a98b02928362bc9ef05aa8c490b5b9c5bd35d0d64fa8e9904704e4794'  # 9002-FSDG-preference-defaults.patch
+         'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde'  # 9003-FSDG-urihandlers.patch
+         '7b70fcaab0bae5b02aaa3e55ac9429945359e6bbe0691c9b6216b63bd3a81390f7bae7324f0a03253809b8da07d6eff42f08f29a6188c7f0c537348857315739'  # 9004-FSDG-misc.patch
          '085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4'  # process-json-files.py
          '5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a'  # vendor.js.in
          '2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff