libre/iceweasel: Update to 89.0 upstreams, add info to Remote Settings patch

4 files changed, 25 insertions, 12 deletions

diff --git a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
index c3f4fde4d..605be7c75 100644
--- a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names
  2 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 5eb43aa0ae632..ff331c3b2076e 100644
+index 3a9928cee4525..da60306cfaf01 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4363,11 +4363,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4358,11 +4358,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
diff --git a/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
index 79d53a45f..30b64089e 100644
--- a/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
+++ b/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
@@ -3,12 +3,24 @@ 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
 
-Basically replace every occurrence of Remote Settings server domain name
+This patch series tries to remove any network communication with Remote
+Settings [1], which can be used by Mozilla to silently push data to client
+browsers. This data can include references to nonfree software, for example,
+to search engines or other websites that contain nonfree JavaScript code.
+Without this patching, it would be hard to make sure the browser does not
+violate paragraph 4 of [2]: "Programs in the system should not suggest
+installing nonfree plugins, documentation, and so on."
+
+Changes in the current patch:
+First of all, replace every occurrence of Remote Settings server domain name
 with URIs that point to built-in local files within omni.ja.
 
 Some links to json files may point to non-existing files, but that's OK
 because it's better than leave them point to Remote Settings server.
 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
 ---
  .../components/ASRouterAdmin/ASRouterAdmin.jsx            | 2 +-
  .../newtab/data/content/activity-stream.bundle.js         | 2 +-
diff --git a/libre/iceweasel/9002-preference-defaults.patch b/libre/iceweasel/9002-preference-defaults.patch
index 29fde8276..d41e427d7 100644
--- a/libre/iceweasel/9002-preference-defaults.patch
+++ b/libre/iceweasel/9002-preference-defaults.patch
@@ -85,9 +85,9 @@ index ef44a16daa..2feabdc67f 100644
 -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");
+ 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");
+ 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/PKGBUILD b/libre/iceweasel/PKGBUILD
index 9f656f9ed..d4ab26f69 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,7 +47,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=88.0.1
+pkgver=89.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=87.0-1
@@ -65,10 +65,11 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_US: Spell checking, American English')
+            'hunspell-en_US: Spell checking, American English'
+            'xdg-desktop-portal: Screensharing with Wayland')
 replaces=('firefox')
 options=(!emptydirs !makeflags !strip)
-source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
+source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}
@@ -81,14 +82,14 @@ source_armv7h=(arm.patch
                build-arm-libopus.patch)
 source_i686=('avoid-libxul-OOM-python-check.patch'
              'rust-static-disable-network-test-on-static-libraries.patch')
-sha256sums=('83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc'
+sha256sums=('db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a'
             'SKIP'
-            '1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc'
+            '98b6b30973bb1e12e17e8a78baf7d1db0d5085f35252f4611870bb23e8faeff1'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
 sha256sums+=('e0a0c7434a057dffdce49bb3e5f53fa190aef24f2666cdc50262170df8fec94f'
              'SKIP'
-             'be579cc7aa0674a35485b7a5a37f69a2c8b144b72362621db4b699e5a2741f19'
-             '219648efd053ffff3411dfd85935e1e9aabfcaf5bbbf65caad3d4f7300452859'
+             '798d5d167ff4c8030aebd9dbc931df80c34f08a6aed718b878b064e47e4b4f16'
+             'f6114bfe02716442658874e80e553d1cd5fadf4626b461fb94cfb2623cd34b7b'
              '39e3a5e1ad137e21f842a44d7e3bd24050292d2b41fe59b4e7c7dfed52a195dd'
              '90e710662f06c619de8752b088ce56bf3779f24168387b1c18e733391bedd143'
              '4e4ef3f5643da6a23b05de9266c1b2c5310483638b23670944374e12aa446a35')