From d7084c5c61ef99c70eac74793de04527f57f1b56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:03:50 +0000 Subject: [PATCH 01/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8c0f765..2992c9f 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -15,7 +15,7 @@ Name: mozilla-ublock-origin Version: 1.16.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -60,6 +60,9 @@ appstream-util validate-relax --nonet %{buildroot}%{metainfodir}/%{name}.metainf %{metainfodir}/%{name}.metainfo.xml %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.16.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Dominik Mierzejewski - 1.16.12-1 - update to 1.16.12 (#1567576) From 4691ab26e4a8b8f9baf18a18a1c8df7536a289f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:31:40 +0000 Subject: [PATCH 02/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index e3c3254..7bdd501 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -15,7 +15,7 @@ Name: mozilla-ublock-origin Version: 1.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet %{buildroot}%{metainfodir}/%{name}.metainf %{metainfodir}/%{name}.metainfo.xml %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Oct 27 2018 Dominik Mierzejewski - 1.17.2-1 - update to 1.17.2 From dcdd273df105e9b68c9d303cea1205bb4995f97f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:45:47 +0000 Subject: [PATCH 03/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ecf5cf0..6f09454 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.19.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.19.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 13 2019 Dominik Mierzejewski - 1.19.2-1 - update to 1.19.2 (#1689200) From bb7cd10c2454eecb0c087d2e15ea4cec3b86800a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 9 Sep 2019 09:43:31 +0200 Subject: [PATCH 04/84] update to 1.22.2 (#1713383) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ede40fd..177c58b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 2403352 +%global fileid 3392439 Name: mozilla-ublock-origin -Version: 1.19.2 +Version: 1.22.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Sep 09 2019 Dominik Mierzejewski - 1.22.2-1 +- update to 1.22.2 (#1713383) + * Mon May 13 2019 Dominik Mierzejewski - 1.19.2-1 - update to 1.19.2 (#1689200) diff --git a/sources b/sources index fee1040..c61b4ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.19.2-an+fx.xpi) = f3111eb1b77654cbb1f87f1b24f7d622eb75e8e53dd98dba452400f8b8abddcfddca9ccb8d101e2b75424a03c023b8d62d5fc68c557b872e9530e4aa392113fe +SHA512 (ublock_origin-1.22.2-an+fx.xpi) = 6c558e8fe6e549a5e5b2e9ad1f6c77d96618b223436004f01f98238015aea6be1d4ad76130aad28768bf96b3193a681d193c1fc4b3cd1c52ec71b1e710f70da8 From b44d3510ce80f136feecd1852d331a5f83dfa58f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 11 Sep 2019 12:01:34 +0200 Subject: [PATCH 05/84] fix wrong fileid was pointing to 1.20.0 instead of 1.22.2 --- mozilla-ublock-origin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 177c58b..0669a8b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,11 +5,11 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3392439 +%global fileid 3398284 Name: mozilla-ublock-origin Version: 1.22.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Sep 11 2019 Dominik Mierzejewski - 1.22.2-2 +- fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2) + * Mon Sep 09 2019 Dominik Mierzejewski - 1.22.2-1 - update to 1.22.2 (#1713383) diff --git a/sources b/sources index c61b4ca..aba1c58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.22.2-an+fx.xpi) = 6c558e8fe6e549a5e5b2e9ad1f6c77d96618b223436004f01f98238015aea6be1d4ad76130aad28768bf96b3193a681d193c1fc4b3cd1c52ec71b1e710f70da8 +SHA512 (ublock_origin-1.22.2-an+fx.xpi) = 63c645325fe5e4c01b0a48f5da86bbfe4cbaf2872f29a20b8d77b48d033811e2f035d2c480532f635bd2090c52a983d83fad2d96be599f5e65f32c8b5aabc99c From 6dd9e87536bc5db92aa76b0ca0f6d82c334904dc Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 29 Sep 2019 01:58:36 +0200 Subject: [PATCH 06/84] update to 1.22.4 (#1756060) --- mozilla-ublock-origin.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 0669a8b..8c8365a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,11 +5,11 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3398284 +%global fileid 3412681 Name: mozilla-ublock-origin -Version: 1.22.2 -Release: 2%{?dist} +Version: 1.22.4 +Release: 1%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sat Sep 28 2019 Dominik Mierzejewski - 1.22.4-1 +- update to 1.22.4 (#1756060) + * Wed Sep 11 2019 Dominik Mierzejewski - 1.22.2-2 - fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2) diff --git a/sources b/sources index aba1c58..87cd5f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.22.2-an+fx.xpi) = 63c645325fe5e4c01b0a48f5da86bbfe4cbaf2872f29a20b8d77b48d033811e2f035d2c480532f635bd2090c52a983d83fad2d96be599f5e65f32c8b5aabc99c +SHA512 (ublock_origin-1.22.4-an+fx.xpi) = 164970e75bbec13d7be88cb70dc8e3b1263cedd82e9a0b83d9449b3dfde44e520abd1fc2b1b1419037dc4cc19f24ee90818080aebdb1106f2ed3060278337459 From 28a23541ad71dfc33673df02e5cfd06eb9177723 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 1 Dec 2019 15:25:00 +0100 Subject: [PATCH 07/84] update to 1.24.2 (#1763778) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8123362..d6acc65 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3412681 +%global fileid 3452970 Name: mozilla-ublock-origin -Version: 1.22.4 +Version: 1.24.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 +- update to 1.24.2 (#1763778) + * Sat Sep 28 2019 Dominik Mierzejewski - 1.22.4-1 - update to 1.22.4 (#1756060) diff --git a/sources b/sources index 87cd5f9..dfbd6ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.22.4-an+fx.xpi) = 164970e75bbec13d7be88cb70dc8e3b1263cedd82e9a0b83d9449b3dfde44e520abd1fc2b1b1419037dc4cc19f24ee90818080aebdb1106f2ed3060278337459 +SHA512 (ublock_origin-1.24.2-an+fx.xpi) = b5a5b65816a763f5b87aed97281acda9cf479d6f75d05b91e3d2a123db17598cfb2efc9a0aa2c6578e26049002732c7956acba1eb0f962fc2d45d7b55c659bb2 From 97cdf87f4e23d4f4bbc5874a34a2e2a35fb565c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:06:21 +0000 Subject: [PATCH 08/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index b87e25f..8c73e23 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.24.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 - update to 1.24.2 (#1763778) From f7f41376f0d575b5b82acb79256c53bc1ce90a82 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 15 Mar 2020 00:36:41 +0100 Subject: [PATCH 09/84] update to 1.25.2 (#1797341) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index d6acc65..6c9664c 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3452970 +%global fileid 3521827 Name: mozilla-ublock-origin -Version: 1.24.2 +Version: 1.25.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sat Mar 14 2020 Dominik Mierzejewski - 1.25.2-1 +- update to 1.25.2 (#1797341) + * Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 - update to 1.24.2 (#1763778) diff --git a/sources b/sources index dfbd6ea..aef0647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.24.2-an+fx.xpi) = b5a5b65816a763f5b87aed97281acda9cf479d6f75d05b91e3d2a123db17598cfb2efc9a0aa2c6578e26049002732c7956acba1eb0f962fc2d45d7b55c659bb2 +SHA512 (ublock_origin-1.25.2-an+fx.xpi) = 339216973c3430ee8ea81be36d60caca26f4e6a99b163586966ddede1c75afef8a2f34066689c693b194bd758f156a479d27f2f3e5430479659bbc746b267cae From 30ba19a8206f490fdb0fd80400ed4db4634c8f59 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Apr 2020 21:55:55 +0200 Subject: [PATCH 10/84] update to 1.26.0 (#1820622) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 6c9664c..25c2d2d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3521827 +%global fileid 3541312 Name: mozilla-ublock-origin -Version: 1.25.2 +Version: 1.26.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Apr 12 2020 Dominik Mierzejewski - 1.26.0-1 +- update to 1.26.0 (#1820622) + * Sat Mar 14 2020 Dominik Mierzejewski - 1.25.2-1 - update to 1.25.2 (#1797341) diff --git a/sources b/sources index aef0647..e8293a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.25.2-an+fx.xpi) = 339216973c3430ee8ea81be36d60caca26f4e6a99b163586966ddede1c75afef8a2f34066689c693b194bd758f156a479d27f2f3e5430479659bbc746b267cae +SHA512 (ublock_origin-1.26.0-an+fx.xpi) = fb14d1f4087642e3100d87107aaa672b4fada025cb226ed3128b0289f0de202c44e841857e4aeb493c79ecf791f3d7fc4dd5b251e11e9d26e2a7abaeded493d9 From 4c3218f6ebdab1aa2cb35371bc1f35349729f04a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 3 May 2020 14:17:40 +0200 Subject: [PATCH 11/84] update to 1.26.2 (#1825039) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 884a3d2..b319c08 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3541312 +%global fileid 3551054 Name: mozilla-ublock-origin -Version: 1.26.0 +Version: 1.26.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun May 03 2020 Dominik Mierzejewski - 1.26.2-1 +- update to 1.26.2 (#1825039) + * Sun Apr 12 2020 Dominik Mierzejewski - 1.26.0-1 - update to 1.26.0 (#1820622) diff --git a/sources b/sources index e8293a8..3151cbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ublock_origin-1.26.0-an+fx.xpi) = fb14d1f4087642e3100d87107aaa672b4fada025cb226ed3128b0289f0de202c44e841857e4aeb493c79ecf791f3d7fc4dd5b251e11e9d26e2a7abaeded493d9 +SHA512 (ublock_origin-1.26.2-an+fx.xpi) = 588809eef4f62f82d31344061e491c00e35899ee7bfa3cf327312f148d6368c6f924e65d5ec5bde361000a3ccaf11375ae1052ec628a1902a4b967356babb83b From 40cf8c62a04409a4fb88f6d54005a32ff449b996 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jul 2020 12:39:12 +0200 Subject: [PATCH 12/84] update to 1.28.2 (#1835275) "build" from upstream "source" directly drop non-free components from upstream uAssets tarball --- .gitignore | 2 ++ mozilla-ublock-origin-nonfree.patch | 23 +++++++++++++++ mozilla-ublock-origin.spec | 43 +++++++++++++++++++++++++---- sources | 3 +- uAssets-mktarball.sh | 30 ++++++++++++++++++++ 5 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 mozilla-ublock-origin-nonfree.patch create mode 100755 uAssets-mktarball.sh diff --git a/.gitignore b/.gitignore index 1bb2712..c9b5d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /ublock_origin-*.xpi +/uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz +/uBlock-1.28.2.tar.gz diff --git a/mozilla-ublock-origin-nonfree.patch b/mozilla-ublock-origin-nonfree.patch new file mode 100644 index 0000000..3b8013e --- /dev/null +++ b/mozilla-ublock-origin-nonfree.patch @@ -0,0 +1,23 @@ +diff -up uBlock-1.28.2/assets/assets.json.nonfree uBlock-1.28.2/assets/assets.json +--- uBlock-1.28.2/assets/assets.json.nonfree 2020-07-11 15:27:35.000000000 +0200 ++++ uBlock-1.28.2/assets/assets.json 2020-07-12 11:14:14.848879857 +0200 +@@ -251,8 +251,6 @@ + "title": "Peter Lowe’s Ad and tracking server list", + "contentURL": [ + "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", +- "assets/thirdparties/pgl.yoyo.org/as/serverlist.txt", +- "assets/thirdparties/pgl.yoyo.org/as/serverlist" + ], + "supportURL": "https://pgl.yoyo.org/adservers/" + }, +diff -up uBlock-1.28.2/tools/make-assets.sh.nonfree uBlock-1.28.2/tools/make-assets.sh +--- uBlock-1.28.2/tools/make-assets.sh.nonfree 2020-07-11 15:26:44.000000000 +0200 ++++ uBlock-1.28.2/tools/make-assets.sh 2020-07-12 13:55:16.683519181 +0200 +@@ -17,7 +17,6 @@ cp -R ./assets $DES/ + + mkdir $DES/thirdparties + cp -R ../uAssets/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/ +-cp -R ../uAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/ + cp -R ../uAssets/thirdparties/publicsuffix.org $DES/thirdparties/ + cp -R ../uAssets/thirdparties/urlhaus-filter $DES/thirdparties/ + diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index b319c08..6f6f172 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,21 +5,29 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global fileid 3551054 +%global uAssets_commit 2c7a9f6d661d76089c823b67711ea27791dfc2f9 Name: mozilla-ublock-origin -Version: 1.26.2 +Version: 1.28.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL URL: https://github.com/gorhill/uBlock -Source0: https://addons.mozilla.org/firefox/downloads/file/%{fileid}/ublock_origin-%{version}-an+fx.xpi +Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml +Source2: uAssets-%{uAssets_commit}.tar.gz +# uAssets tarball contains non-free filter lists +# thirdparties/mirror1.malwaredomains.com - http://www.malwaredomains.com/?page_id=1508 +# thirdparties/pgl.yoyo.org - https://pgl.yoyo.org/license/ +# generate a free one with the mktarball.sh script below +Source10: %{name}-assets-mktarball.sh +Patch0: %{name}-nonfree.patch Requires: mozilla-filesystem BuildArch: noarch BuildRequires: libappstream-glib +BuildRequires: wabt # css/fonts/fontawesome-webfont.ttf http://fontawesome.io/ OFL # img/fontawesome/fontawesome-defs.svg Provides: bundled(fontawesome-fonts) = 4.7.0 @@ -40,23 +48,46 @@ Flexible, it's more than an "ad blocker": it can also read and create filters from hosts files. %prep +# https://github.com/gorhill/uBlock/tree/master/dist#build-instructions-for-developers %setup -qc +mkdir uAssets +tar -xz -C uAssets --strip-components=1 -f %{SOURCE2} +pushd uBlock-%{version} +%patch0 -p1 +rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm +popd %build -echo Nothing to build +pushd uBlock-%{version} +for d in src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}} ; do + pushd $d + for f in *.wat ; do + wat2wasm $f + done + popd +done +./tools/make-firefox.sh all +popd %install -install -Dpm644 %{SOURCE0} %{buildroot}%{firefox_inst_dir}/%{ext_id}.xpi +install -Dpm644 uBlock-%{version}/dist/build/uBlock0.firefox.xpi %{buildroot}%{firefox_inst_dir}/%{ext_id}.xpi install -Dpm644 %{SOURCE1} %{buildroot}%{_metainfodir}/%{name}.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml %files -%license LICENSE.txt css/fonts/OFL.txt lib/codemirror/LICENSE +%license uBlock-%{version}/LICENSE.txt +%license uBlock-%{version}/src/css/fonts/OFL.txt +%license uBlock-%{version}/src/lib/codemirror/LICENSE %{firefox_inst_dir}/%{ext_id}.xpi %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jul 12 2020 Dominik Mierzejewski - 1.28.2-1 +- update to 1.28.2 (#1835275) +- "build" from upstream "source" directly +- drop non-free components from upstream uAssets tarball + * Sun May 03 2020 Dominik Mierzejewski - 1.26.2-1 - update to 1.26.2 (#1825039) diff --git a/sources b/sources index 3151cbd..468e347 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (ublock_origin-1.26.2-an+fx.xpi) = 588809eef4f62f82d31344061e491c00e35899ee7bfa3cf327312f148d6368c6f924e65d5ec5bde361000a3ccaf11375ae1052ec628a1902a4b967356babb83b +SHA512 (uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz) = c989102af5653aab38935eb7a38145ea8fb2d9f87fddcbdccc67494a7f823ed566fbb32f61e7c4d65927f9e8f13d143ee5401c74edcaf1e95f3a1b571092db23 +SHA512 (uBlock-1.28.2.tar.gz) = ab48a35e4a9a849d584ca3e2f37b735af9f977b45952179710ea6f05a58b478f8587f6597e56a7ee881dbe50dc9fcc31db668d467e67e065663e15d9939ba215 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh new file mode 100755 index 0000000..ef56e62 --- /dev/null +++ b/uAssets-mktarball.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +set -e +set -x + +tmp=$(mktemp -d) + +trap cleanup EXIT +cleanup() { + set +e + [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" +} + +unset CDPATH +pwd=$(pwd) +name=uAssets +commit=2c7a9f6d661d76089c823b67711ea27791dfc2f9 +url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz +pushd "$tmp" +curl -L ${url} | tar xzf - +pushd ${name}-${commit} +# Malwaredomains list is non-commercial-only +# http://www.malwaredomains.com/?page_id=1508 +rm -r thirdparties/mirror1.malwaredomains.com +# Peter Lowe's adservers list is non-commercial-only +# https://github.com/uBlockOrigin/uAssets/issues/7657 +rm -r thirdparties/pgl.yoyo.org +popd +tar czf "$pwd"/${name}-${commit}.tar.gz ${name}-${commit} +popd From 7fc0c224f2c559c6064df9c5786aa70222612bee Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jul 2020 12:42:09 +0200 Subject: [PATCH 13/84] document bundled publicsuffix-list --- mozilla-ublock-origin.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 6f6f172..e174c97 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -39,6 +39,10 @@ Provides: bundled(js-github-swatinem-diff) Provides: bundled(js-codemirror) = 5.37.0 # lib/lz4 https://github.com/gorhill/lz4-wasm BSD Provides: bundled(lz4-wasm) +# usually much newer than Fedora's publicsuffix-list package +# easy to unbundle, but might affect security +# assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat +Provides: bundled(publicsuffix-list) = 20200627 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and From f4f6daec5ad21e8a6ee474374b30ce5d314bf29d Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jul 2020 13:09:45 +0200 Subject: [PATCH 14/84] fix mktarball script name --- mozilla-ublock-origin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index e174c97..4bcff7d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -21,7 +21,7 @@ Source2: uAssets-%{uAssets_commit}.tar.gz # thirdparties/mirror1.malwaredomains.com - http://www.malwaredomains.com/?page_id=1508 # thirdparties/pgl.yoyo.org - https://pgl.yoyo.org/license/ # generate a free one with the mktarball.sh script below -Source10: %{name}-assets-mktarball.sh +Source10: uAssets-mktarball.sh Patch0: %{name}-nonfree.patch Requires: mozilla-filesystem From 152ca6465249aee56b89feadbb2e913c32fab456 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jul 2020 13:18:40 +0200 Subject: [PATCH 15/84] use python3 in build script explicitly --- mozilla-ublock-origin-python3.patch | 12 ++++++++++++ mozilla-ublock-origin.spec | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 mozilla-ublock-origin-python3.patch diff --git a/mozilla-ublock-origin-python3.patch b/mozilla-ublock-origin-python3.patch new file mode 100644 index 0000000..24b37ee --- /dev/null +++ b/mozilla-ublock-origin-python3.patch @@ -0,0 +1,12 @@ +diff -up uBlock-1.28.2/tools/make-firefox.sh.py3 uBlock-1.28.2/tools/make-firefox.sh +--- uBlock-1.28.2/tools/make-firefox.sh.py3 2020-07-11 15:26:44.000000000 +0200 ++++ uBlock-1.28.2/tools/make-firefox.sh 2020-07-13 13:16:00.501025776 +0200 +@@ -34,7 +34,7 @@ rm $DES/js/vapi-usercss.pseudo.js + rm $DES/img/icon_128.png + + echo "*** uBlock0.firefox: Generating meta..." +-python tools/make-firefox-meta.py $DES/ ++python3 tools/make-firefox-meta.py $DES/ + + if [ "$1" = all ]; then + echo "*** uBlock0.firefox: Creating package..." diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 4bcff7d..32e9601 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -23,6 +23,8 @@ Source2: uAssets-%{uAssets_commit}.tar.gz # generate a free one with the mktarball.sh script below Source10: uAssets-mktarball.sh Patch0: %{name}-nonfree.patch +# call python3 instead of python +Patch1: %{name}-python3.patch Requires: mozilla-filesystem BuildArch: noarch @@ -58,6 +60,7 @@ mkdir uAssets tar -xz -C uAssets --strip-components=1 -f %{SOURCE2} pushd uBlock-%{version} %patch0 -p1 +%patch1 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm popd @@ -87,6 +90,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-2 +- use python3 in build script explicitly + * Sun Jul 12 2020 Dominik Mierzejewski - 1.28.2-1 - update to 1.28.2 (#1835275) - "build" from upstream "source" directly From 3f033c36e8c3bf577a736e587b99d3bc9a12df35 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jul 2020 13:21:55 +0200 Subject: [PATCH 16/84] actually bump release --- mozilla-ublock-origin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 32e9601..8f53cee 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.28.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL From 47074c90771c820fa785d5ad3580ae5300805729 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jul 2020 13:30:07 +0200 Subject: [PATCH 17/84] add missing explicit BR on python3 --- mozilla-ublock-origin.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8f53cee..cc7398b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.28.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -29,6 +29,7 @@ Patch1: %{name}-python3.patch Requires: mozilla-filesystem BuildArch: noarch BuildRequires: libappstream-glib +BuildRequires: python3 BuildRequires: wabt # css/fonts/fontawesome-webfont.ttf http://fontawesome.io/ OFL # img/fontawesome/fontawesome-defs.svg @@ -90,6 +91,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 +- add missing explicit BR on python3 + * Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-2 - use python3 in build script explicitly From d629b814fc248d48c843824577b8b0d45604c37d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:29:02 +0000 Subject: [PATCH 18/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index b348551..6a73c7a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.28.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -91,6 +91,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.28.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 - add missing explicit BR on python3 From fb284aac93716d4a70a8a8b7d27ccf8b723482c9 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 6 Aug 2020 02:26:33 +0200 Subject: [PATCH 19/84] update to 1.28.4 (#1857445) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 9 ++++++--- sources | 4 ++-- uAssets-mktarball.sh | 3 +-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c9b5d6c..296d051 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /ublock_origin-*.xpi /uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz /uBlock-1.28.2.tar.gz +/uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz +/uBlock-1.28.4.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index cc7398b..bc7cb41 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,11 +5,11 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 2c7a9f6d661d76089c823b67711ea27791dfc2f9 +%global uAssets_commit b3a7e049f483573d4e7877744ed52ba699633d8d Name: mozilla-ublock-origin -Version: 1.28.2 -Release: 3%{?dist} +Version: 1.28.4 +Release: 1%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -91,6 +91,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 +- update to 1.28.4 (#1857445) + * Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 - add missing explicit BR on python3 diff --git a/sources b/sources index 468e347..150b217 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz) = c989102af5653aab38935eb7a38145ea8fb2d9f87fddcbdccc67494a7f823ed566fbb32f61e7c4d65927f9e8f13d143ee5401c74edcaf1e95f3a1b571092db23 -SHA512 (uBlock-1.28.2.tar.gz) = ab48a35e4a9a849d584ca3e2f37b735af9f977b45952179710ea6f05a58b478f8587f6597e56a7ee881dbe50dc9fcc31db668d467e67e065663e15d9939ba215 +SHA512 (uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz) = 5245abbb8fd8f626d7f5103b504abb8e4d2a26fcdeb55ca701afdd8e589a3f5adc0b56a083aadd6eae78dab106f3beaca1919822f4ecb24d3621fa74a47fe169 +SHA512 (uBlock-1.28.4.tar.gz) = 4fa2e1872fa7ef9803a944c0090e69cb3b027b538f3633ce7d3df36ada12e9e2e13874abc6ade87da9ca88d0fbee690a12e33240ef8a31bb4a7e23d341d55d83 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index ef56e62..f81e192 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e -set -x tmp=$(mktemp -d) @@ -14,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=2c7a9f6d661d76089c823b67711ea27791dfc2f9 +commit=b3a7e049f483573d4e7877744ed52ba699633d8d url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From dbec7b0d29c0fcb8b2bf151694861d4b5b6f5561 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 6 Aug 2020 02:30:04 +0200 Subject: [PATCH 20/84] avoid building on big-endian wabt doesn't work there --- mozilla-ublock-origin.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index bc7cb41..c1a71b1 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -28,6 +28,8 @@ Patch1: %{name}-python3.patch Requires: mozilla-filesystem BuildArch: noarch +# wabt doesn't work correctly on big-endian +ExcludeArch: ppc64 s390x BuildRequires: libappstream-glib BuildRequires: python3 BuildRequires: wabt @@ -93,6 +95,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %changelog * Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 - update to 1.28.4 (#1857445) +- avoid building on big-endian, wabt doesn't work there * Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 - add missing explicit BR on python3 From 83c1cd0bab465b121e719eef86503a18713f3ce3 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 6 Aug 2020 16:01:55 +0200 Subject: [PATCH 21/84] fix invalid JSON after Patch0 (caught by Raymond Hill) --- mozilla-ublock-origin-nonfree.patch | 16 ++++++++++------ mozilla-ublock-origin.spec | 5 ++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/mozilla-ublock-origin-nonfree.patch b/mozilla-ublock-origin-nonfree.patch index 3b8013e..8dda1c4 100644 --- a/mozilla-ublock-origin-nonfree.patch +++ b/mozilla-ublock-origin-nonfree.patch @@ -1,15 +1,19 @@ -diff -up uBlock-1.28.2/assets/assets.json.nonfree uBlock-1.28.2/assets/assets.json ---- uBlock-1.28.2/assets/assets.json.nonfree 2020-07-11 15:27:35.000000000 +0200 -+++ uBlock-1.28.2/assets/assets.json 2020-07-12 11:14:14.848879857 +0200 -@@ -251,8 +251,6 @@ +diff -up uBlock-1.28.4/assets/assets.json.orig uBlock-1.28.4/assets/assets.json +--- uBlock-1.28.4/assets/assets.json.orig 2020-07-15 21:54:20.000000000 +0200 ++++ uBlock-1.28.4/assets/assets.json 2020-08-06 15:57:44.011128188 +0200 +@@ -249,11 +249,8 @@ + "group": "multipurpose", + "updateAfter": 13, "title": "Peter Lowe’s Ad and tracking server list", - "contentURL": [ +- "contentURL": [ ++ "contentURL": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", - "assets/thirdparties/pgl.yoyo.org/as/serverlist.txt", - "assets/thirdparties/pgl.yoyo.org/as/serverlist" - ], +- ], "supportURL": "https://pgl.yoyo.org/adservers/" }, + "ara-0": { diff -up uBlock-1.28.2/tools/make-assets.sh.nonfree uBlock-1.28.2/tools/make-assets.sh --- uBlock-1.28.2/tools/make-assets.sh.nonfree 2020-07-11 15:26:44.000000000 +0200 +++ uBlock-1.28.2/tools/make-assets.sh 2020-07-12 13:55:16.683519181 +0200 diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index c1a71b1..2eb313b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.28.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -93,6 +93,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Aug 06 2020 Dominik Mierzejewski - 1.28.4-2 +- fix invalid JSON after Patch0 (caught by Raymond Hill) + * Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 - update to 1.28.4 (#1857445) - avoid building on big-endian, wabt doesn't work there From f9a1ae1156b517d17539bdf63445df6721283d6f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 20 Aug 2020 13:01:40 +0200 Subject: [PATCH 22/84] update to 1.29.0 (#1867396) optimize lz4 wasm code per upstream docs --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 14 +++++++++++--- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 296d051..6863247 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /uBlock-1.28.2.tar.gz /uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz /uBlock-1.28.4.tar.gz +/uAssets-4a183b74dddc934ca2d0f3867706213e58e6e454.tar.gz +/uBlock-1.29.0.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 2eb313b..459703d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,11 +5,11 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit b3a7e049f483573d4e7877744ed52ba699633d8d +%global uAssets_commit 4a183b74dddc934ca2d0f3867706213e58e6e454 Name: mozilla-ublock-origin -Version: 1.28.4 -Release: 2%{?dist} +Version: 1.29.0 +Release: 1%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL @@ -30,6 +30,7 @@ Requires: mozilla-filesystem BuildArch: noarch # wabt doesn't work correctly on big-endian ExcludeArch: ppc64 s390x +BuildRequires: binaryen BuildRequires: libappstream-glib BuildRequires: python3 BuildRequires: wabt @@ -76,6 +77,9 @@ for d in src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}} ; do done popd done +pushd src/lib/lz4 +wasm-opt ./lz4-block-codec.wasm -O4 -o ./lz4-block-codec.wasm +popd ./tools/make-firefox.sh all popd @@ -93,6 +97,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Aug 20 2020 Dominik Mierzejewski - 1.29.0-1 +- update to 1.29.0 (#1867396) +- optimize lz4 wasm code per upstream docs + * Thu Aug 06 2020 Dominik Mierzejewski - 1.28.4-2 - fix invalid JSON after Patch0 (caught by Raymond Hill) diff --git a/sources b/sources index 150b217..06f6fee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz) = 5245abbb8fd8f626d7f5103b504abb8e4d2a26fcdeb55ca701afdd8e589a3f5adc0b56a083aadd6eae78dab106f3beaca1919822f4ecb24d3621fa74a47fe169 -SHA512 (uBlock-1.28.4.tar.gz) = 4fa2e1872fa7ef9803a944c0090e69cb3b027b538f3633ce7d3df36ada12e9e2e13874abc6ade87da9ca88d0fbee690a12e33240ef8a31bb4a7e23d341d55d83 +SHA512 (uAssets-4a183b74dddc934ca2d0f3867706213e58e6e454.tar.gz) = 51139b33ff60fccb2b2f42df1fc6a9c6ce2ba43321094c58d38994fa8c103b0d3fa874c46ac7685eb6f599d4489f3e97011675fe4ccd1c2eb468a4fed1b073f2 +SHA512 (uBlock-1.29.0.tar.gz) = d4e2e3541af1d380142fe13ce8ef19edafafbdf6cd7cfffec70cfc61ed2c92797817fc28b73a4254b5cc75d1baaf74bb5eeb92c39007a0129401f2d480c7a90d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index f81e192..7176b49 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=b3a7e049f483573d4e7877744ed52ba699633d8d +commit=4a183b74dddc934ca2d0f3867706213e58e6e454 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 2ed749ae81b7854b620b260396f060d9da20870a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 20 Jan 2021 23:19:56 +0100 Subject: [PATCH 23/84] update to 1.32.4 (#1918447) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 22 ++++++++++++++++------ sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6863247..b573bf7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /uBlock-1.28.4.tar.gz /uAssets-4a183b74dddc934ca2d0f3867706213e58e6e454.tar.gz /uBlock-1.29.0.tar.gz +/uAssets-3a00c406e41114c159dfebd5b6bc30fc02dd4014.tar.gz +/uBlock-1.32.4.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 189879f..ab16c30 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -8,11 +8,11 @@ %global uAssets_commit 4a183b74dddc934ca2d0f3867706213e58e6e454 Name: mozilla-ublock-origin -Version: 1.29.0 +Version: 1.32.4 Release: 1%{?dist} Summary: An efficient blocker for Firefox -License: GPLv3+ and LGPLv3 and MIT and OFL +License: GPLv3+ and LGPLv3 and MIT and OFL and Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml @@ -34,9 +34,12 @@ BuildRequires: binaryen BuildRequires: libappstream-glib BuildRequires: python3 BuildRequires: wabt -# css/fonts/fontawesome-webfont.ttf http://fontawesome.io/ OFL -# img/fontawesome/fontawesome-defs.svg +# img/fontawesome/fontawesome-defs.svg http://fontawesome.io/ OFL Provides: bundled(fontawesome-fonts) = 4.7.0 +# css/fonts/Inter/Inter-*.woff2 https://github.com/rsms/inter OFL +Provides: bundled(inter-fonts) +# css/fonts/Metropolis/Metropolis-*.woff2 https://github.com/chrismsimpson/Metropolis Unlicense +Provides: bundled(metropolis-fonts) # lib/punycode.js https://mths.be/punycode MIT Provides: bundled(js-punycode) = 1.3.2 # lib/diff https://github.com/Swatinem/diff LGPLv3 @@ -48,7 +51,7 @@ Provides: bundled(lz4-wasm) # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -Provides: bundled(publicsuffix-list) = 20200627 +Provides: bundled(publicsuffix-list) = 20201229 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and @@ -66,6 +69,8 @@ pushd uBlock-%{version} %patch0 -p1 %patch1 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm +mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt +mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt popd %build @@ -91,12 +96,17 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %files %license uBlock-%{version}/LICENSE.txt -%license uBlock-%{version}/src/css/fonts/OFL.txt +%license uBlock-%{version}/LICENSE.fontawesome.txt +%license uBlock-%{version}/LICENSE.Inter.txt +%license uBlock-%{version}/src/css/fonts/Metropolis/UNLICENSE %license uBlock-%{version}/src/lib/codemirror/LICENSE %{firefox_inst_dir}/%{ext_id}.xpi %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 +- update to 1.32.4 (#1918447) + * Thu Aug 20 2020 Dominik Mierzejewski - 1.29.0-1 - update to 1.29.0 (#1867396) - optimize lz4 wasm code per upstream docs diff --git a/sources b/sources index 06f6fee..2050d5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-4a183b74dddc934ca2d0f3867706213e58e6e454.tar.gz) = 51139b33ff60fccb2b2f42df1fc6a9c6ce2ba43321094c58d38994fa8c103b0d3fa874c46ac7685eb6f599d4489f3e97011675fe4ccd1c2eb468a4fed1b073f2 -SHA512 (uBlock-1.29.0.tar.gz) = d4e2e3541af1d380142fe13ce8ef19edafafbdf6cd7cfffec70cfc61ed2c92797817fc28b73a4254b5cc75d1baaf74bb5eeb92c39007a0129401f2d480c7a90d +SHA512 (uAssets-3a00c406e41114c159dfebd5b6bc30fc02dd4014.tar.gz) = d63d927e1462169cd6e65df4768d79d3470e667d4b325fe879d47f3f34923261c99b9a52fb4848c4683d916be348f2c57a343df2b175da237772484d33d00103 +SHA512 (uBlock-1.32.4.tar.gz) = 9d4bff5f91a3b2190b19490419c7c7d7df543b6b44c16797ebbbad6c013a671dfae52acec918b03d5a2df8825469b10918fd27eea6f0805c092ae348b306e624 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 7176b49..9eadf46 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=4a183b74dddc934ca2d0f3867706213e58e6e454 +commit=3a00c406e41114c159dfebd5b6bc30fc02dd4014 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From f52650eba826454d07c301c581d0673851e3abab Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 20 Jan 2021 23:27:52 +0100 Subject: [PATCH 24/84] update uAssets commit id --- mozilla-ublock-origin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ab16c30..829726d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,7 +5,7 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 4a183b74dddc934ca2d0f3867706213e58e6e454 +%global uAssets_commit 3a00c406e41114c159dfebd5b6bc30fc02dd4014 Name: mozilla-ublock-origin Version: 1.32.4 From b5157ee7bdf63b68c19234301f9cf6d5ed37ca37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:51:15 +0000 Subject: [PATCH 25/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ce0138a..18661ab 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.32.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL and Unlicense @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.32.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 - update to 1.32.4 (#1918447) From 5084bce7f4f0b6daf469a1340a59c4427a39e4ce Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 2 Feb 2021 12:06:40 +0100 Subject: [PATCH 26/84] update to 1.33.2 (#1922482) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 9 ++++++--- sources | 4 ++-- uAssets-mktarball.sh | 5 +---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b573bf7..42e6183 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /uBlock-1.29.0.tar.gz /uAssets-3a00c406e41114c159dfebd5b6bc30fc02dd4014.tar.gz /uBlock-1.32.4.tar.gz +/uAssets-f3dac523af291e1e109ffdce234c554f48f57564.tar.gz +/uBlock-1.33.2.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 829726d..a045092 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 3a00c406e41114c159dfebd5b6bc30fc02dd4014 +%global uAssets_commit f3dac523af291e1e109ffdce234c554f48f57564 Name: mozilla-ublock-origin -Version: 1.32.4 +Version: 1.33.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -45,7 +45,7 @@ Provides: bundled(js-punycode) = 1.3.2 # lib/diff https://github.com/Swatinem/diff LGPLv3 Provides: bundled(js-github-swatinem-diff) # lib/codemirror http://codemirror.net MIT -Provides: bundled(js-codemirror) = 5.37.0 +Provides: bundled(js-codemirror) = 5.59.0 # lib/lz4 https://github.com/gorhill/lz4-wasm BSD Provides: bundled(lz4-wasm) # usually much newer than Fedora's publicsuffix-list package @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Feb 02 2021 Dominik Mierzejewski - 1.33.2-1 +- update to 1.33.2 (#1922482) + * Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 - update to 1.32.4 (#1918447) diff --git a/sources b/sources index 2050d5b..515b87a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-3a00c406e41114c159dfebd5b6bc30fc02dd4014.tar.gz) = d63d927e1462169cd6e65df4768d79d3470e667d4b325fe879d47f3f34923261c99b9a52fb4848c4683d916be348f2c57a343df2b175da237772484d33d00103 -SHA512 (uBlock-1.32.4.tar.gz) = 9d4bff5f91a3b2190b19490419c7c7d7df543b6b44c16797ebbbad6c013a671dfae52acec918b03d5a2df8825469b10918fd27eea6f0805c092ae348b306e624 +SHA512 (uAssets-f3dac523af291e1e109ffdce234c554f48f57564.tar.gz) = bb97706fbf475b65fb0168cfeb7772fdb9241be0bbb32ae7488c79a570b4902a218cf4140f10c576bc96a8074578b1b14d8ed2ee7ef7d1a3c6b67f19f1f50f46 +SHA512 (uBlock-1.33.2.tar.gz) = c0272244d7bfaa4c36b8b6dfc088e157a8bfc376ee7a2257b7433dd1a12633f66bb45e4bbf9267eda079ffecbe7e4b87ba7874e241ba9ff895ab702f6f75ddb1 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 9eadf46..810819f 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,14 +13,11 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=3a00c406e41114c159dfebd5b6bc30fc02dd4014 +commit=f3dac523af291e1e109ffdce234c554f48f57564 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - pushd ${name}-${commit} -# Malwaredomains list is non-commercial-only -# http://www.malwaredomains.com/?page_id=1508 -rm -r thirdparties/mirror1.malwaredomains.com # Peter Lowe's adservers list is non-commercial-only # https://github.com/uBlockOrigin/uAssets/issues/7657 rm -r thirdparties/pgl.yoyo.org From d9b501043f13705f1801259636ac9ee2517fbf65 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 2 Apr 2021 01:05:32 +0200 Subject: [PATCH 27/84] update to 1.34.0 (#1925264) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 42e6183..058d97b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /uBlock-1.32.4.tar.gz /uAssets-f3dac523af291e1e109ffdce234c554f48f57564.tar.gz /uBlock-1.33.2.tar.gz +/uAssets-2ab5d1799337fdab4b855fc3461e0d7908802887.tar.gz +/uBlock-1.34.0.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index a045092..bcfd72d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit f3dac523af291e1e109ffdce234c554f48f57564 +%global uAssets_commit 2ab5d1799337fdab4b855fc3461e0d7908802887 Name: mozilla-ublock-origin -Version: 1.33.2 +Version: 1.34.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Apr 01 2021 Dominik Mierzejewski - 1.34.0-1 +- update to 1.34.0 (#1925264) + * Tue Feb 02 2021 Dominik Mierzejewski - 1.33.2-1 - update to 1.33.2 (#1922482) diff --git a/sources b/sources index 515b87a..a2f1129 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-f3dac523af291e1e109ffdce234c554f48f57564.tar.gz) = bb97706fbf475b65fb0168cfeb7772fdb9241be0bbb32ae7488c79a570b4902a218cf4140f10c576bc96a8074578b1b14d8ed2ee7ef7d1a3c6b67f19f1f50f46 -SHA512 (uBlock-1.33.2.tar.gz) = c0272244d7bfaa4c36b8b6dfc088e157a8bfc376ee7a2257b7433dd1a12633f66bb45e4bbf9267eda079ffecbe7e4b87ba7874e241ba9ff895ab702f6f75ddb1 +SHA512 (uAssets-2ab5d1799337fdab4b855fc3461e0d7908802887.tar.gz) = 869106e92e60309cdf1664072e879a0cdbfed94e1ca4153f4d5dbe85c4279afb42f7948650435b87943175b338574f8493b925457d778e594398e2511494dd4d +SHA512 (uBlock-1.34.0.tar.gz) = aa578e4fe92ef842b2cd811f838b685f33fdb3e7fa8a91631cb4c89f6ef278ac7667ff602eb72c34f3dea9ea0432acf53c3056df35dda3d54fb44e2de3dfd525 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 810819f..6d4bc68 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=f3dac523af291e1e109ffdce234c554f48f57564 +commit=2ab5d1799337fdab4b855fc3461e0d7908802887 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From aeba5541aaae61ee2ee2add736b25461a38a13ef Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 23 Apr 2021 15:41:00 +0200 Subject: [PATCH 28/84] update to 1.35.0 (#1946869) update bundled codemirror version --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 9 ++++++--- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 058d97b..290904f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /uBlock-1.33.2.tar.gz /uAssets-2ab5d1799337fdab4b855fc3461e0d7908802887.tar.gz /uBlock-1.34.0.tar.gz +/uAssets-5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e.tar.gz +/uBlock-1.35.0.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index bcfd72d..475fbdd 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 2ab5d1799337fdab4b855fc3461e0d7908802887 +%global uAssets_commit 5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e Name: mozilla-ublock-origin -Version: 1.34.0 +Version: 1.35.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -45,7 +45,7 @@ Provides: bundled(js-punycode) = 1.3.2 # lib/diff https://github.com/Swatinem/diff LGPLv3 Provides: bundled(js-github-swatinem-diff) # lib/codemirror http://codemirror.net MIT -Provides: bundled(js-codemirror) = 5.59.0 +Provides: bundled(js-codemirror) = 5.59.2 # lib/lz4 https://github.com/gorhill/lz4-wasm BSD Provides: bundled(lz4-wasm) # usually much newer than Fedora's publicsuffix-list package @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Apr 23 2021 Dominik Mierzejewski - 1.35.0-1 +- update to 1.35.0 (#1946869) + * Thu Apr 01 2021 Dominik Mierzejewski - 1.34.0-1 - update to 1.34.0 (#1925264) diff --git a/sources b/sources index a2f1129..18f9830 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-2ab5d1799337fdab4b855fc3461e0d7908802887.tar.gz) = 869106e92e60309cdf1664072e879a0cdbfed94e1ca4153f4d5dbe85c4279afb42f7948650435b87943175b338574f8493b925457d778e594398e2511494dd4d -SHA512 (uBlock-1.34.0.tar.gz) = aa578e4fe92ef842b2cd811f838b685f33fdb3e7fa8a91631cb4c89f6ef278ac7667ff602eb72c34f3dea9ea0432acf53c3056df35dda3d54fb44e2de3dfd525 +SHA512 (uAssets-5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e.tar.gz) = 73695472ab863554875378ea73d9ed0f1d97781f5947072586dce62085eb21370122cad5f4c40ade37a726f57b4d2933edfe2ff32d07767fe1b0716a0bd8db1f +SHA512 (uBlock-1.35.0.tar.gz) = 4a4aea89117d2462e4ae9d4f3857dce32eade7d7edf83c7114c2ed29ba7811ed9d9004506baf1b71a92abceacb3c85cef5a2c1b10883b9a7a42754d30369b8c9 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 6d4bc68..521a0c1 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=2ab5d1799337fdab4b855fc3461e0d7908802887 +commit=5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From fb8bcc7e554756d46c6b9ef20c311929075c7ab9 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 8 Jun 2021 15:37:20 +0200 Subject: [PATCH 29/84] update to 1.35.2 (#1954349) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 290904f..ad9b253 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /uBlock-1.34.0.tar.gz /uAssets-5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e.tar.gz /uBlock-1.35.0.tar.gz +/uAssets-f521473026f5f60cc753fa4a533af41badfc700e.tar.gz +/uBlock-1.35.2.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 3c4ed64..2accc72 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e +%global uAssets_commit f521473026f5f60cc753fa4a533af41badfc700e Name: mozilla-ublock-origin -Version: 1.35.0 +Version: 1.35.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Jun 08 2021 Dominik Mierzejewski - 1.35.2-1 +- update to 1.35.2 (#1954349) + * Fri Apr 23 2021 Dominik Mierzejewski - 1.35.0-1 - update to 1.35.0 (#1946869) diff --git a/sources b/sources index 18f9830..3f75802 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e.tar.gz) = 73695472ab863554875378ea73d9ed0f1d97781f5947072586dce62085eb21370122cad5f4c40ade37a726f57b4d2933edfe2ff32d07767fe1b0716a0bd8db1f -SHA512 (uBlock-1.35.0.tar.gz) = 4a4aea89117d2462e4ae9d4f3857dce32eade7d7edf83c7114c2ed29ba7811ed9d9004506baf1b71a92abceacb3c85cef5a2c1b10883b9a7a42754d30369b8c9 +SHA512 (uAssets-f521473026f5f60cc753fa4a533af41badfc700e.tar.gz) = 9f5949e6f66a916cb5b63525e17b58721405436705aec822f440c9aeb772bb235ca81d582723886df54e80e4fdcf45b6916734757f30ceee38ee6afebd52a943 +SHA512 (uBlock-1.35.2.tar.gz) = d42128defb8f3a7682ef585e300f64e6a8582bec7e9db18b9c7aeb5d4d3df3cea1fc9a621992a6d3457e3027f2560cff20599b81e7166257c8b18419f0171b4c diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 521a0c1..cf7756c 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e +commit=f521473026f5f60cc753fa4a533af41badfc700e url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From b6222bce8f6abd7d83da1a78d463bbb18f168013 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 5 Jul 2021 14:06:49 +0200 Subject: [PATCH 30/84] update to 1.36.0 (#1974010) update declared version of bundled publicsuffix-list --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 10 +++++++--- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ad9b253..e11af29 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /uBlock-1.35.0.tar.gz /uAssets-f521473026f5f60cc753fa4a533af41badfc700e.tar.gz /uBlock-1.35.2.tar.gz +/uAssets-84e1ceb064703418c9a260cc13416bdf6d9b6a8b.tar.gz +/uBlock-1.36.0.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 2accc72..f6edd36 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit f521473026f5f60cc753fa4a533af41badfc700e +%global uAssets_commit 84e1ceb064703418c9a260cc13416bdf6d9b6a8b Name: mozilla-ublock-origin -Version: 1.35.2 +Version: 1.36.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -51,7 +51,7 @@ Provides: bundled(lz4-wasm) # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -Provides: bundled(publicsuffix-list) = 20201229 +Provides: bundled(publicsuffix-list) = 20210518 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and @@ -104,6 +104,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Jul 05 2021 Dominik Mierzejewski - 1.36.0-1 +- update to 1.36.0 (#1974010) +- update declared version of bundled publicsuffix-list + * Tue Jun 08 2021 Dominik Mierzejewski - 1.35.2-1 - update to 1.35.2 (#1954349) diff --git a/sources b/sources index 3f75802..552183c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-f521473026f5f60cc753fa4a533af41badfc700e.tar.gz) = 9f5949e6f66a916cb5b63525e17b58721405436705aec822f440c9aeb772bb235ca81d582723886df54e80e4fdcf45b6916734757f30ceee38ee6afebd52a943 -SHA512 (uBlock-1.35.2.tar.gz) = d42128defb8f3a7682ef585e300f64e6a8582bec7e9db18b9c7aeb5d4d3df3cea1fc9a621992a6d3457e3027f2560cff20599b81e7166257c8b18419f0171b4c +SHA512 (uAssets-84e1ceb064703418c9a260cc13416bdf6d9b6a8b.tar.gz) = 8a231d5039e629d9003d080c71fc154ec631baf1af9ab7606ce777a79fccb4d564015dc37d003caf1f53b9000cf4b7db954b9962bfdad31d781506b8086ae7ec +SHA512 (uBlock-1.36.0.tar.gz) = 777798bc3e8b594e3eac2859775810cd1455255bffa5949d2592238c7759a35023b2e590b0144060240c1143f42195d62cfa08238429dd29e5d2b08740651721 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index cf7756c..c745326 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=f521473026f5f60cc753fa4a533af41badfc700e +commit=84e1ceb064703418c9a260cc13416bdf6d9b6a8b url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 0671a0f9010bec8e0508458ba4450f752ce8f17d Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 18 Jul 2021 00:08:49 +0200 Subject: [PATCH 31/84] update to 1.36.2 (#1979628) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e11af29..4357f49 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /uBlock-1.35.2.tar.gz /uAssets-84e1ceb064703418c9a260cc13416bdf6d9b6a8b.tar.gz /uBlock-1.36.0.tar.gz +/uAssets-2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094.tar.gz +/uBlock-1.36.2.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index f6edd36..f43c20c 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 84e1ceb064703418c9a260cc13416bdf6d9b6a8b +%global uAssets_commit 2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094 Name: mozilla-ublock-origin -Version: 1.36.0 +Version: 1.36.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 +- update to 1.36.2 (#1979628) + * Mon Jul 05 2021 Dominik Mierzejewski - 1.36.0-1 - update to 1.36.0 (#1974010) - update declared version of bundled publicsuffix-list diff --git a/sources b/sources index 552183c..9b45fd8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-84e1ceb064703418c9a260cc13416bdf6d9b6a8b.tar.gz) = 8a231d5039e629d9003d080c71fc154ec631baf1af9ab7606ce777a79fccb4d564015dc37d003caf1f53b9000cf4b7db954b9962bfdad31d781506b8086ae7ec -SHA512 (uBlock-1.36.0.tar.gz) = 777798bc3e8b594e3eac2859775810cd1455255bffa5949d2592238c7759a35023b2e590b0144060240c1143f42195d62cfa08238429dd29e5d2b08740651721 +SHA512 (uAssets-2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094.tar.gz) = adb3b3be65c6f420d89d5a96afb13ea1f7af6e395e4fa304d212358a1ba8a88b3d304e08d8ea01383ce7c440c6a7c3259b81cee6e906bbe2f15d305738e9d2ba +SHA512 (uBlock-1.36.2.tar.gz) = e6816388efcaac841563153cb548129eb408d8d4ea37c518cdc77a9de4088f3686088f4944fe45f6fa7d06e28d43a47eddaba16aebd8892d667476ef2605e3dc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c745326..bab224c 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=84e1ceb064703418c9a260cc13416bdf6d9b6a8b +commit=2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 284c6c7fe01c1197c6ec140a20eb91a1d6407ef6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:25:37 +0000 Subject: [PATCH 32/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 9287a0a..5f9a47f 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.36.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3+ and LGPLv3 and MIT and OFL and Unlicense @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.36.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 - update to 1.36.2 (#1979628) From 5bde95f8b90d01adb30748ca68542f16a5ce6ead Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 24 Jul 2021 22:33:39 +0200 Subject: [PATCH 33/84] update to 1.37.0 (#1985343) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 11 ++++++++--- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4357f49..a5942a4 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /uBlock-1.36.0.tar.gz /uAssets-2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094.tar.gz /uBlock-1.36.2.tar.gz +/uAssets-2adc43042b179e29266dc5bbed8349c7fde5a3c8.tar.gz +/uBlock-1.37.0.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index f43c20c..fcf5ce8 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,14 +5,14 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094 +%global uAssets_commit 2adc43042b179e29266dc5bbed8349c7fde5a3c8 Name: mozilla-ublock-origin -Version: 1.36.2 +Version: 1.37.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox -License: GPLv3+ and LGPLv3 and MIT and OFL and Unlicense +License: GPLv3 and OFL and Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml @@ -48,6 +48,8 @@ Provides: bundled(js-github-swatinem-diff) Provides: bundled(js-codemirror) = 5.59.2 # lib/lz4 https://github.com/gorhill/lz4-wasm BSD Provides: bundled(lz4-wasm) +# lib/regexanalyzer https://github.com/foo123/RegexAnalyzer Copyleft +Provides: bundled(js-regexanalyzer) = 1.1.0 # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat @@ -104,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sat Jul 24 2021 Dominik Mierzejewski - 1.37.0-1 +- update to 1.37.0 (#1985343) + * Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 - update to 1.36.2 (#1979628) diff --git a/sources b/sources index 9b45fd8..0fccc9b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094.tar.gz) = adb3b3be65c6f420d89d5a96afb13ea1f7af6e395e4fa304d212358a1ba8a88b3d304e08d8ea01383ce7c440c6a7c3259b81cee6e906bbe2f15d305738e9d2ba -SHA512 (uBlock-1.36.2.tar.gz) = e6816388efcaac841563153cb548129eb408d8d4ea37c518cdc77a9de4088f3686088f4944fe45f6fa7d06e28d43a47eddaba16aebd8892d667476ef2605e3dc +SHA512 (uAssets-2adc43042b179e29266dc5bbed8349c7fde5a3c8.tar.gz) = 4e4791ba4657b124895f5160a966b88b5ecc771b579cf04fb6347029ec602e2b4c7bad404e0e1a1ea8faf488bcfbf98840a6b15916556de59ba1d57e1e017a43 +SHA512 (uBlock-1.37.0.tar.gz) = 7931615203c77c4711b422db3978f639aeb641e47c37e8dda1cef3dfb2e8d4c73d014dd3dc0063ced18949fc2c8f64e5b509a9bf9a03e350cfb9e88afaf38453 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index bab224c..8df866d 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094 +commit=2adc43042b179e29266dc5bbed8349c7fde5a3c8 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From ce926936de719dc53448028e3796c6a33152935c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 28 Jul 2021 23:48:47 +0200 Subject: [PATCH 34/84] update to 1.37.2 (#1986999) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a5942a4..2a1b56d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /uBlock-1.36.2.tar.gz /uAssets-2adc43042b179e29266dc5bbed8349c7fde5a3c8.tar.gz /uBlock-1.37.0.tar.gz +/uAssets-3cd931fd4e2421634828cb5155f1f68f5e561351.tar.gz +/uBlock-1.37.2.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index fcf5ce8..8961fe6 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 2adc43042b179e29266dc5bbed8349c7fde5a3c8 +%global uAssets_commit 3cd931fd4e2421634828cb5155f1f68f5e561351 Name: mozilla-ublock-origin -Version: 1.37.0 +Version: 1.37.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Jul 28 2021 Dominik Mierzejewski - 1.37.2-1 +- update to 1.37.2 (#1986999) + * Sat Jul 24 2021 Dominik Mierzejewski - 1.37.0-1 - update to 1.37.0 (#1985343) diff --git a/sources b/sources index 0fccc9b..0e4db3f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-2adc43042b179e29266dc5bbed8349c7fde5a3c8.tar.gz) = 4e4791ba4657b124895f5160a966b88b5ecc771b579cf04fb6347029ec602e2b4c7bad404e0e1a1ea8faf488bcfbf98840a6b15916556de59ba1d57e1e017a43 -SHA512 (uBlock-1.37.0.tar.gz) = 7931615203c77c4711b422db3978f639aeb641e47c37e8dda1cef3dfb2e8d4c73d014dd3dc0063ced18949fc2c8f64e5b509a9bf9a03e350cfb9e88afaf38453 +SHA512 (uAssets-3cd931fd4e2421634828cb5155f1f68f5e561351.tar.gz) = aa2ea4e083057599e2217db82e2cd95d3787cfd5187bc0e1c9548085a280b2de69d056a7aee484d3c0f05ae9fc54844e1796f12fe39ceb9c67a03ef79fb49fa5 +SHA512 (uBlock-1.37.2.tar.gz) = 7ca33cb1747014fd0c52c682c7e642c02205e4391d6b3dc763a952f8e69768c858c0a4660b993c65f58547e7c7f60800178024bfa20e10b8c6788ef88b2e02c9 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 8df866d..ae25ec9 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=2adc43042b179e29266dc5bbed8349c7fde5a3c8 +commit=3cd931fd4e2421634828cb5155f1f68f5e561351 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 428028b138f8faf384143f20d04682301fffe064 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 21 Sep 2021 23:24:23 +0200 Subject: [PATCH 35/84] update to 1.38.0 (#2005514) drop obsolete patch --- .gitignore | 2 ++ mozilla-ublock-origin-nonfree.patch | 28 +++++++++++++----------- mozilla-ublock-origin-python3.patch | 12 ----------- mozilla-ublock-origin.spec | 33 +++++++++++++---------------- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 6 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 mozilla-ublock-origin-python3.patch diff --git a/.gitignore b/.gitignore index 2a1b56d..4e97b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /uBlock-1.37.0.tar.gz /uAssets-3cd931fd4e2421634828cb5155f1f68f5e561351.tar.gz /uBlock-1.37.2.tar.gz +/uAssets-cfe4ae71348fa08bfd5018a20946d13df3be9813.tar.gz +/uBlock-1.38.0.tar.gz diff --git a/mozilla-ublock-origin-nonfree.patch b/mozilla-ublock-origin-nonfree.patch index 8dda1c4..30facd3 100644 --- a/mozilla-ublock-origin-nonfree.patch +++ b/mozilla-ublock-origin-nonfree.patch @@ -1,7 +1,7 @@ -diff -up uBlock-1.28.4/assets/assets.json.orig uBlock-1.28.4/assets/assets.json ---- uBlock-1.28.4/assets/assets.json.orig 2020-07-15 21:54:20.000000000 +0200 -+++ uBlock-1.28.4/assets/assets.json 2020-08-06 15:57:44.011128188 +0200 -@@ -249,11 +249,8 @@ +diff -up uBlock-1.38.0/assets/assets.json.orig uBlock-1.38.0/assets/assets.json +--- uBlock-1.38.0/assets/assets.json.orig 2021-09-17 21:47:33.000000000 +0200 ++++ uBlock-1.38.0/assets/assets.json 2021-09-21 23:45:54.426942127 +0200 +@@ -299,11 +299,8 @@ "group": "multipurpose", "updateAfter": 13, "title": "Peter Lowe’s Ad and tracking server list", @@ -14,14 +14,18 @@ diff -up uBlock-1.28.4/assets/assets.json.orig uBlock-1.28.4/assets/assets.json "supportURL": "https://pgl.yoyo.org/adservers/" }, "ara-0": { -diff -up uBlock-1.28.2/tools/make-assets.sh.nonfree uBlock-1.28.2/tools/make-assets.sh ---- uBlock-1.28.2/tools/make-assets.sh.nonfree 2020-07-11 15:26:44.000000000 +0200 -+++ uBlock-1.28.2/tools/make-assets.sh 2020-07-12 13:55:16.683519181 +0200 -@@ -17,7 +17,6 @@ cp -R ./assets $DES/ +diff -up uBlock-1.38.0/tools/make-assets.sh.orig uBlock-1.38.0/tools/make-assets.sh +--- uBlock-1.38.0/tools/make-assets.sh.orig 2021-09-17 21:47:33.000000000 +0200 ++++ uBlock-1.38.0/tools/make-assets.sh 2021-09-22 07:42:48.339621145 +0200 +@@ -13,11 +13,9 @@ cp -R ./assets $DES/ mkdir $DES/thirdparties - cp -R ../uAssets/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/ --cp -R ../uAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/ - cp -R ../uAssets/thirdparties/publicsuffix.org $DES/thirdparties/ - cp -R ../uAssets/thirdparties/urlhaus-filter $DES/thirdparties/ + +-git submodule update --depth 1 --init + UASSETS=submodules/uAssets + + cp -R $UASSETS/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/ +-cp -R $UASSETS/thirdparties/pgl.yoyo.org $DES/thirdparties/ + cp -R $UASSETS/thirdparties/publicsuffix.org $DES/thirdparties/ + cp -R $UASSETS/thirdparties/urlhaus-filter $DES/thirdparties/ diff --git a/mozilla-ublock-origin-python3.patch b/mozilla-ublock-origin-python3.patch deleted file mode 100644 index 24b37ee..0000000 --- a/mozilla-ublock-origin-python3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up uBlock-1.28.2/tools/make-firefox.sh.py3 uBlock-1.28.2/tools/make-firefox.sh ---- uBlock-1.28.2/tools/make-firefox.sh.py3 2020-07-11 15:26:44.000000000 +0200 -+++ uBlock-1.28.2/tools/make-firefox.sh 2020-07-13 13:16:00.501025776 +0200 -@@ -34,7 +34,7 @@ rm $DES/js/vapi-usercss.pseudo.js - rm $DES/img/icon_128.png - - echo "*** uBlock0.firefox: Generating meta..." --python tools/make-firefox-meta.py $DES/ -+python3 tools/make-firefox-meta.py $DES/ - - if [ "$1" = all ]; then - echo "*** uBlock0.firefox: Creating package..." diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8961fe6..9e85574 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 3cd931fd4e2421634828cb5155f1f68f5e561351 +%global uAssets_commit cfe4ae71348fa08bfd5018a20946d13df3be9813 Name: mozilla-ublock-origin -Version: 1.37.2 +Version: 1.38.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -23,8 +23,6 @@ Source2: uAssets-%{uAssets_commit}.tar.gz # generate a free one with the mktarball.sh script below Source10: uAssets-mktarball.sh Patch0: %{name}-nonfree.patch -# call python3 instead of python -Patch1: %{name}-python3.patch Requires: mozilla-filesystem BuildArch: noarch @@ -64,19 +62,15 @@ from hosts files. %prep # https://github.com/gorhill/uBlock/tree/master/dist#build-instructions-for-developers -%setup -qc -mkdir uAssets -tar -xz -C uAssets --strip-components=1 -f %{SOURCE2} -pushd uBlock-%{version} +%setup -q -n uBlock-%{version} +tar -xz -C submodules/uAssets --strip-components=1 -f %{SOURCE2} %patch0 -p1 -%patch1 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt -popd +mv src/lib/codemirror/LICENSE LICENSE.codemirror.txt %build -pushd uBlock-%{version} for d in src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}} ; do pushd $d for f in *.wat ; do @@ -88,24 +82,27 @@ pushd src/lib/lz4 wasm-opt ./lz4-block-codec.wasm -O4 -o ./lz4-block-codec.wasm popd ./tools/make-firefox.sh all -popd %install -install -Dpm644 uBlock-%{version}/dist/build/uBlock0.firefox.xpi %{buildroot}%{firefox_inst_dir}/%{ext_id}.xpi +install -Dpm644 dist/build/uBlock0.firefox.xpi %{buildroot}%{firefox_inst_dir}/%{ext_id}.xpi install -Dpm644 %{SOURCE1} %{buildroot}%{_metainfodir}/%{name}.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml %files -%license uBlock-%{version}/LICENSE.txt -%license uBlock-%{version}/LICENSE.fontawesome.txt -%license uBlock-%{version}/LICENSE.Inter.txt -%license uBlock-%{version}/src/css/fonts/Metropolis/UNLICENSE -%license uBlock-%{version}/src/lib/codemirror/LICENSE +%license LICENSE.txt +%license LICENSE.codemirror.txt +%license LICENSE.fontawesome.txt +%license LICENSE.Inter.txt +%license src/css/fonts/Metropolis/UNLICENSE %{firefox_inst_dir}/%{ext_id}.xpi %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Sep 21 2021 Dominik Mierzejewski - 1.38.0-1 +- update to 1.38.0 (#2005514) +- drop obsolete patch + * Wed Jul 28 2021 Dominik Mierzejewski - 1.37.2-1 - update to 1.37.2 (#1986999) diff --git a/sources b/sources index 0e4db3f..33d55df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-3cd931fd4e2421634828cb5155f1f68f5e561351.tar.gz) = aa2ea4e083057599e2217db82e2cd95d3787cfd5187bc0e1c9548085a280b2de69d056a7aee484d3c0f05ae9fc54844e1796f12fe39ceb9c67a03ef79fb49fa5 -SHA512 (uBlock-1.37.2.tar.gz) = 7ca33cb1747014fd0c52c682c7e642c02205e4391d6b3dc763a952f8e69768c858c0a4660b993c65f58547e7c7f60800178024bfa20e10b8c6788ef88b2e02c9 +SHA512 (uAssets-cfe4ae71348fa08bfd5018a20946d13df3be9813.tar.gz) = eef3b55f3ff3591b12320fa972e454c8926e5d3a08d629f6e98794c667814768db748663751f02bda0c3a80cbb58e7fd2246cda918505c4ccf436ef874919d39 +SHA512 (uBlock-1.38.0.tar.gz) = 173116a5269c7d42d9f6e95744e66a35b5d30892ef28c08f996db047a78140fe6a1a812b794685dd7e2deae8e162384dd43bc29ee6c3a7fb2d9568f2dae38cf2 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index ae25ec9..1e14ec9 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=3cd931fd4e2421634828cb5155f1f68f5e561351 +commit=cfe4ae71348fa08bfd5018a20946d13df3be9813 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 2a0a914fdb65b4cb396c55d95dcee26284ba9d47 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 15 Oct 2021 12:04:35 +0200 Subject: [PATCH 36/84] update to 1.38.6 (#2009380) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4e97b2d..ad044ed 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /uBlock-1.37.2.tar.gz /uAssets-cfe4ae71348fa08bfd5018a20946d13df3be9813.tar.gz /uBlock-1.38.0.tar.gz +/uAssets-5c857ff1834fa44a482e0190e212d933bb41d28a.tar.gz +/uBlock-1.38.6.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 9e85574..07f03a7 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit cfe4ae71348fa08bfd5018a20946d13df3be9813 +%global uAssets_commit 5c857ff1834fa44a482e0190e212d933bb41d28a Name: mozilla-ublock-origin -Version: 1.38.0 +Version: 1.38.6 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Oct 15 2021 Dominik Mierzejewski - 1.38.6-1 +- update to 1.38.6 (#2009380) + * Tue Sep 21 2021 Dominik Mierzejewski - 1.38.0-1 - update to 1.38.0 (#2005514) - drop obsolete patch diff --git a/sources b/sources index 33d55df..be62d3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-cfe4ae71348fa08bfd5018a20946d13df3be9813.tar.gz) = eef3b55f3ff3591b12320fa972e454c8926e5d3a08d629f6e98794c667814768db748663751f02bda0c3a80cbb58e7fd2246cda918505c4ccf436ef874919d39 -SHA512 (uBlock-1.38.0.tar.gz) = 173116a5269c7d42d9f6e95744e66a35b5d30892ef28c08f996db047a78140fe6a1a812b794685dd7e2deae8e162384dd43bc29ee6c3a7fb2d9568f2dae38cf2 +SHA512 (uAssets-5c857ff1834fa44a482e0190e212d933bb41d28a.tar.gz) = a960a7f45b318f4afd427401253c5743264aeafd7dd2e04042c8b82a7da528525e43a7c35e4fd74a2d4365ce6df3976b90301cf4a9dab7c22a70f9d5ac0ec047 +SHA512 (uBlock-1.38.6.tar.gz) = 2037388ff55ca323dfd8e847a509e079f8fc846feaa0dcb37ced83b6954a30eb1f37fbb3b196a3231b352930d5d1397706e49c7b0249086ce1b7595cb1bc29fc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 1e14ec9..a70a154 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=cfe4ae71348fa08bfd5018a20946d13df3be9813 +commit=5c857ff1834fa44a482e0190e212d933bb41d28a url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 748e65a8b9a297a2da553bae1da04e4020f73c5d Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sun, 5 Dec 2021 01:07:57 +0100 Subject: [PATCH 37/84] update to 1.39.2 (#2025622) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ad044ed..988263b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /uBlock-1.38.0.tar.gz /uAssets-5c857ff1834fa44a482e0190e212d933bb41d28a.tar.gz /uBlock-1.38.6.tar.gz +/uAssets-36f330e6f0ff4e7ca2dec82f767d44d68037cd2c.tar.gz +/uBlock-1.39.2.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 683fc87..bb139b1 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 5c857ff1834fa44a482e0190e212d933bb41d28a +%global uAssets_commit 36f330e6f0ff4e7ca2dec82f767d44d68037cd2c Name: mozilla-ublock-origin -Version: 1.38.6 +Version: 1.39.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sat Dec 04 2021 Dominik Mierzejewski - 1.39.2-1 +- update to 1.39.2 (#2025622) + * Fri Oct 15 2021 Dominik Mierzejewski - 1.38.6-1 - update to 1.38.6 (#2009380) diff --git a/sources b/sources index be62d3b..dc02145 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-5c857ff1834fa44a482e0190e212d933bb41d28a.tar.gz) = a960a7f45b318f4afd427401253c5743264aeafd7dd2e04042c8b82a7da528525e43a7c35e4fd74a2d4365ce6df3976b90301cf4a9dab7c22a70f9d5ac0ec047 -SHA512 (uBlock-1.38.6.tar.gz) = 2037388ff55ca323dfd8e847a509e079f8fc846feaa0dcb37ced83b6954a30eb1f37fbb3b196a3231b352930d5d1397706e49c7b0249086ce1b7595cb1bc29fc +SHA512 (uAssets-36f330e6f0ff4e7ca2dec82f767d44d68037cd2c.tar.gz) = f2108b034cda799a7402923234076e667aa0eba1c318fbd19296f1cdaa1f6b48e52b5c77fc9bd981706dd29126769b4490021e098c2d6ed63a42db9c96bd2f5d +SHA512 (uBlock-1.39.2.tar.gz) = 1b341aa96d1cfe95ac2d11f560e66b64532b9284a177517e15d2cb2a4f828a43b88f70b3ca21aef049eb42fe29d6e8e621e8467f256c870ca651523e17673f93 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index a70a154..535bbdc 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=5c857ff1834fa44a482e0190e212d933bb41d28a +commit=36f330e6f0ff4e7ca2dec82f767d44d68037cd2c url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 74f8b8ec1981d5eabe9e6cc736e3b247b2faefb9 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 15 Jan 2022 00:00:20 +0100 Subject: [PATCH 38/84] update to 1.40.8 (#2034966) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 9 ++++++--- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 988263b..3229909 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /uBlock-1.38.6.tar.gz /uAssets-36f330e6f0ff4e7ca2dec82f767d44d68037cd2c.tar.gz /uBlock-1.39.2.tar.gz +/uAssets-4243816d324cf89aea3f61eadeb130db09b7c057.tar.gz +/uBlock-1.40.8.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index bb139b1..98b0fb2 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 36f330e6f0ff4e7ca2dec82f767d44d68037cd2c +%global uAssets_commit 4243816d324cf89aea3f61eadeb130db09b7c057 Name: mozilla-ublock-origin -Version: 1.39.2 +Version: 1.40.8 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -51,7 +51,7 @@ Provides: bundled(js-regexanalyzer) = 1.1.0 # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -Provides: bundled(publicsuffix-list) = 20210518 +Provides: bundled(publicsuffix-list) = 20211226 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 +- update to 1.40.8 (#2034966) + * Sat Dec 04 2021 Dominik Mierzejewski - 1.39.2-1 - update to 1.39.2 (#2025622) diff --git a/sources b/sources index dc02145..7dd5a2e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-36f330e6f0ff4e7ca2dec82f767d44d68037cd2c.tar.gz) = f2108b034cda799a7402923234076e667aa0eba1c318fbd19296f1cdaa1f6b48e52b5c77fc9bd981706dd29126769b4490021e098c2d6ed63a42db9c96bd2f5d -SHA512 (uBlock-1.39.2.tar.gz) = 1b341aa96d1cfe95ac2d11f560e66b64532b9284a177517e15d2cb2a4f828a43b88f70b3ca21aef049eb42fe29d6e8e621e8467f256c870ca651523e17673f93 +SHA512 (uAssets-4243816d324cf89aea3f61eadeb130db09b7c057.tar.gz) = 63d4ac946e3df4258194edca4282c59bf0190fb92ff185105221757d44de9a86ab0ae9fc06b4d9498810998e9a51a9f3721e73a2c78a590b12cb42fea32c5c65 +SHA512 (uBlock-1.40.8.tar.gz) = 0a528074e895e4c41f1519dbff54638b8593a476bb630ec6c549fc35aa82d1600daa128fe3786de14fdd441d5e774d56ff23e1f8a07f591b36254f35afd6b3a4 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 535bbdc..2fd1605 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=36f330e6f0ff4e7ca2dec82f767d44d68037cd2c +commit=4243816d324cf89aea3f61eadeb130db09b7c057 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From c1a6ee468299508fe1ec99ad553617d07e73ae8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:28:13 +0000 Subject: [PATCH 39/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ac12d88..9ced06e 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.40.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and OFL and Unlicense @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.40.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 - update to 1.40.8 (#2034966) From 05d9a918852ea5d018c9a677ed11abb92218a283 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 16 Feb 2022 08:38:16 +0100 Subject: [PATCH 40/84] update to 1.41.2 (#2052004) --- .gitignore | 2 ++ mozilla-ublock-origin-nonfree.patch | 14 +++++++------- mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 3229909..f872faf 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ /uBlock-1.39.2.tar.gz /uAssets-4243816d324cf89aea3f61eadeb130db09b7c057.tar.gz /uBlock-1.40.8.tar.gz +/uAssets-6eb110153ca39e7e7af14456ebaf1de2eff8ac4c.tar.gz +/uBlock-1.41.2.tar.gz diff --git a/mozilla-ublock-origin-nonfree.patch b/mozilla-ublock-origin-nonfree.patch index 30facd3..5aadc21 100644 --- a/mozilla-ublock-origin-nonfree.patch +++ b/mozilla-ublock-origin-nonfree.patch @@ -1,19 +1,19 @@ -diff -up uBlock-1.38.0/assets/assets.json.orig uBlock-1.38.0/assets/assets.json ---- uBlock-1.38.0/assets/assets.json.orig 2021-09-17 21:47:33.000000000 +0200 -+++ uBlock-1.38.0/assets/assets.json 2021-09-21 23:45:54.426942127 +0200 -@@ -299,11 +299,8 @@ +diff -up uBlock-1.41.2/assets/assets.json.orig uBlock-1.41.2/assets/assets.json +--- uBlock-1.41.2/assets/assets.json.orig 2022-02-10 13:30:26.000000000 +0100 ++++ uBlock-1.41.2/assets/assets.json 2022-02-16 08:30:59.720172418 +0100 +@@ -323,11 +323,7 @@ "group": "multipurpose", "updateAfter": 13, "title": "Peter Lowe’s Ad and tracking server list", - "contentURL": [ -+ "contentURL": - "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", +- "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", - "assets/thirdparties/pgl.yoyo.org/as/serverlist.txt", - "assets/thirdparties/pgl.yoyo.org/as/serverlist" - ], ++ "contentURL": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", "supportURL": "https://pgl.yoyo.org/adservers/" }, - "ara-0": { + "ALB-0": { diff -up uBlock-1.38.0/tools/make-assets.sh.orig uBlock-1.38.0/tools/make-assets.sh --- uBlock-1.38.0/tools/make-assets.sh.orig 2021-09-17 21:47:33.000000000 +0200 +++ uBlock-1.38.0/tools/make-assets.sh 2021-09-22 07:42:48.339621145 +0200 diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 98b0fb2..4f4f0a7 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 4243816d324cf89aea3f61eadeb130db09b7c057 +%global uAssets_commit 6eb110153ca39e7e7af14456ebaf1de2eff8ac4c Name: mozilla-ublock-origin -Version: 1.40.8 +Version: 1.41.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Feb 15 2022 Dominik Mierzejewski - 1.41.2-1 +- update to 1.41.2 (#2052004) + * Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 - update to 1.40.8 (#2034966) diff --git a/sources b/sources index 7dd5a2e..138763e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-4243816d324cf89aea3f61eadeb130db09b7c057.tar.gz) = 63d4ac946e3df4258194edca4282c59bf0190fb92ff185105221757d44de9a86ab0ae9fc06b4d9498810998e9a51a9f3721e73a2c78a590b12cb42fea32c5c65 -SHA512 (uBlock-1.40.8.tar.gz) = 0a528074e895e4c41f1519dbff54638b8593a476bb630ec6c549fc35aa82d1600daa128fe3786de14fdd441d5e774d56ff23e1f8a07f591b36254f35afd6b3a4 +SHA512 (uAssets-6eb110153ca39e7e7af14456ebaf1de2eff8ac4c.tar.gz) = 453d78b6b5740aae864623e75e926ce0ef11009612fa4a5c76c3cc746ad0a71fb3f9c8ecaaf83bc80b038193a9218cb1f3116309b534487956c36aababfbca74 +SHA512 (uBlock-1.41.2.tar.gz) = 3be9deb4e361a17f7151826d61bc066a69c6607d989bfc7f3ce2d9eaf365f01a73dc340dfd0a9d932d1024a33d6dceefe3511e57d6faf4c3f8e0d69f649f9cdc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 2fd1605..d96f58c 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=4243816d324cf89aea3f61eadeb130db09b7c057 +commit=6eb110153ca39e7e7af14456ebaf1de2eff8ac4c url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From dc56c32c621a4c8704d16e7d01897024b6d3b757 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 11 Mar 2022 15:09:29 +0100 Subject: [PATCH 41/84] update to 1.41.8 (#2055291) --- .gitignore | 2 ++ mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f872faf..4cfe836 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /uBlock-1.40.8.tar.gz /uAssets-6eb110153ca39e7e7af14456ebaf1de2eff8ac4c.tar.gz /uBlock-1.41.2.tar.gz +/uAssets-51417b36f28f1608352b0c0a9d53d80fa3e85a00.tar.gz +/uBlock-1.41.8.tar.gz diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 4f4f0a7..f7048d4 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 6eb110153ca39e7e7af14456ebaf1de2eff8ac4c +%global uAssets_commit 51417b36f28f1608352b0c0a9d53d80fa3e85a00 Name: mozilla-ublock-origin -Version: 1.41.2 +Version: 1.41.8 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 +- update to 1.41.8 (#2055291) + * Tue Feb 15 2022 Dominik Mierzejewski - 1.41.2-1 - update to 1.41.2 (#2052004) diff --git a/sources b/sources index 138763e..36a19d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-6eb110153ca39e7e7af14456ebaf1de2eff8ac4c.tar.gz) = 453d78b6b5740aae864623e75e926ce0ef11009612fa4a5c76c3cc746ad0a71fb3f9c8ecaaf83bc80b038193a9218cb1f3116309b534487956c36aababfbca74 -SHA512 (uBlock-1.41.2.tar.gz) = 3be9deb4e361a17f7151826d61bc066a69c6607d989bfc7f3ce2d9eaf365f01a73dc340dfd0a9d932d1024a33d6dceefe3511e57d6faf4c3f8e0d69f649f9cdc +SHA512 (uAssets-51417b36f28f1608352b0c0a9d53d80fa3e85a00.tar.gz) = 74c09d46e54d818b3a29bf6791d080124bf5d2311dce47cb3a42a12bde60d78fb9802539c1f4856048923c7f86fdcec933c5014cd4d2b7388c09ed487e26420d +SHA512 (uBlock-1.41.8.tar.gz) = 83ab4a803079ab9e8754f838a1505d95952b8fa31da4c4f4fb9a4dc1de9dcbd4b35f584d3bbb4143132e4bace801138b309270744248ee538296dccf36b314af diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index d96f58c..3223257 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=6eb110153ca39e7e7af14456ebaf1de2eff8ac4c +commit=51417b36f28f1608352b0c0a9d53d80fa3e85a00 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 2769dbce73462cea8909a312a8938cb6db8e629f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 11 Mar 2022 15:09:37 +0100 Subject: [PATCH 42/84] use wildcards to keep .gitignore small --- .gitignore | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 4cfe836..017eaa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,3 @@ /ublock_origin-*.xpi -/uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz -/uBlock-1.28.2.tar.gz -/uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz -/uBlock-1.28.4.tar.gz -/uAssets-4a183b74dddc934ca2d0f3867706213e58e6e454.tar.gz -/uBlock-1.29.0.tar.gz -/uAssets-3a00c406e41114c159dfebd5b6bc30fc02dd4014.tar.gz -/uBlock-1.32.4.tar.gz -/uAssets-f3dac523af291e1e109ffdce234c554f48f57564.tar.gz -/uBlock-1.33.2.tar.gz -/uAssets-2ab5d1799337fdab4b855fc3461e0d7908802887.tar.gz -/uBlock-1.34.0.tar.gz -/uAssets-5ce4e0d2f57bc3f15bb6e69528e69cfc0a95f03e.tar.gz -/uBlock-1.35.0.tar.gz -/uAssets-f521473026f5f60cc753fa4a533af41badfc700e.tar.gz -/uBlock-1.35.2.tar.gz -/uAssets-84e1ceb064703418c9a260cc13416bdf6d9b6a8b.tar.gz -/uBlock-1.36.0.tar.gz -/uAssets-2b8c7b40757b43c1e3f6a5fc80c49ff02cb5e094.tar.gz -/uBlock-1.36.2.tar.gz -/uAssets-2adc43042b179e29266dc5bbed8349c7fde5a3c8.tar.gz -/uBlock-1.37.0.tar.gz -/uAssets-3cd931fd4e2421634828cb5155f1f68f5e561351.tar.gz -/uBlock-1.37.2.tar.gz -/uAssets-cfe4ae71348fa08bfd5018a20946d13df3be9813.tar.gz -/uBlock-1.38.0.tar.gz -/uAssets-5c857ff1834fa44a482e0190e212d933bb41d28a.tar.gz -/uBlock-1.38.6.tar.gz -/uAssets-36f330e6f0ff4e7ca2dec82f767d44d68037cd2c.tar.gz -/uBlock-1.39.2.tar.gz -/uAssets-4243816d324cf89aea3f61eadeb130db09b7c057.tar.gz -/uBlock-1.40.8.tar.gz -/uAssets-6eb110153ca39e7e7af14456ebaf1de2eff8ac4c.tar.gz -/uBlock-1.41.2.tar.gz -/uAssets-51417b36f28f1608352b0c0a9d53d80fa3e85a00.tar.gz -/uBlock-1.41.8.tar.gz +/uAssets-*.tar.gz +/uBlock-*.tar.gz From f4ff1fe0ae31408e3c53f0330a0532b81f54e651 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 22 May 2022 16:57:33 +0200 Subject: [PATCH 43/84] update to 1.42.4 (#2070185) new bundled library: hsluv --- mozilla-ublock-origin.spec | 14 ++++++++++---- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ac60209..87c1d6f 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,14 +5,14 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 51417b36f28f1608352b0c0a9d53d80fa3e85a00 +%global uAssets_commit 61a6b9477a2c591d00fea1c2694afa11f8106a28 Name: mozilla-ublock-origin -Version: 1.41.8 +Version: 1.42.4 Release: 1%{?dist} Summary: An efficient blocker for Firefox -License: GPLv3 and OFL and Unlicense +License: GPLv3 and MIT and OFL and Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml @@ -48,10 +48,12 @@ Provides: bundled(js-codemirror) = 5.59.2 Provides: bundled(lz4-wasm) # lib/regexanalyzer https://github.com/foo123/RegexAnalyzer Copyleft Provides: bundled(js-regexanalyzer) = 1.1.0 +# lib/hsluv https://github.com/hsluv/hsluv/ MIT +Provides: bundled(js-hsluv) = 0.1.0 # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -Provides: bundled(publicsuffix-list) = 20211226 +Provides: bundled(publicsuffix-list) = 20220330 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and @@ -99,6 +101,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 +- update to 1.42.4 (#2070185) +- new bundled library: hsluv + * Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 - update to 1.41.8 (#2055291) diff --git a/sources b/sources index 36a19d3..1ed5572 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-51417b36f28f1608352b0c0a9d53d80fa3e85a00.tar.gz) = 74c09d46e54d818b3a29bf6791d080124bf5d2311dce47cb3a42a12bde60d78fb9802539c1f4856048923c7f86fdcec933c5014cd4d2b7388c09ed487e26420d -SHA512 (uBlock-1.41.8.tar.gz) = 83ab4a803079ab9e8754f838a1505d95952b8fa31da4c4f4fb9a4dc1de9dcbd4b35f584d3bbb4143132e4bace801138b309270744248ee538296dccf36b314af +SHA512 (uBlock-1.42.4.tar.gz) = 79bde26c531e33e07f7611bf4c13a6005f8143cfd7e7633c3c1cedf405d9765482eb23760d34175ed1588f52bc8253d76e78d89882fa4ec614791a585fbf2de5 +SHA512 (uAssets-61a6b9477a2c591d00fea1c2694afa11f8106a28.tar.gz) = 1e1876334919437ddcc7276acd65cd35e2223e63a886098f1de50eb07d3ff08c1ad924c909067badbf355de9127a62af0c1c78ac786b5af9b7af43cccbcc4c0e diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 3223257..cb7411e 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=51417b36f28f1608352b0c0a9d53d80fa3e85a00 +commit=61a6b9477a2c591d00fea1c2694afa11f8106a28 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 7db1fd8a6efa48854e820f5add14ea4f62432d3c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 22 May 2022 17:27:31 +0200 Subject: [PATCH 44/84] fix build with wabt-1.0.25+ --- mozilla-ublock-origin-wa1.0.patch | 2525 +++++++++++++++++++++++++++++ mozilla-ublock-origin.spec | 4 + 2 files changed, 2529 insertions(+) create mode 100644 mozilla-ublock-origin-wa1.0.patch diff --git a/mozilla-ublock-origin-wa1.0.patch b/mozilla-ublock-origin-wa1.0.patch new file mode 100644 index 0000000..19b7f30 --- /dev/null +++ b/mozilla-ublock-origin-wa1.0.patch @@ -0,0 +1,2525 @@ +diff -up uBlock-1.42.4/src/js/wasm/biditrie.wat.wa1.0 uBlock-1.42.4/src/js/wasm/biditrie.wat +--- uBlock-1.42.4/src/js/wasm/biditrie.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/js/wasm/biditrie.wat 2022-05-22 17:25:47.974606558 +0200 +@@ -64,92 +64,92 @@ + (local $x i32) + (local $y i32) + ;; trie index is a uint32 offset, need to convert to uint8 offset +- get_local $icell ++ local.get $icell + i32.const 2 + i32.shl +- set_local $icell ++ local.set $icell + ;; const buf32 = this.buf32; + ;; const buf8 = this.buf8; + ;; const char0 = buf32[CHAR0_SLOT]; + i32.const 2060 + i32.load align=4 +- set_local $char0 ++ local.set $char0 + ;; const aR = buf32[HAYSTACK_SIZE_SLOT]; + i32.const 2048 + i32.load align=4 +- set_local $aR ++ local.set $aR + ;; let al = ai; +- get_local $ai +- set_local $al ++ local.get $ai ++ local.set $al + block $matchFound + block $matchNotFound + ;; for (;;) { + loop $mainLoop + ;; x = buf8[al]; +- get_local $al ++ local.get $al + i32.load8_u +- set_local $x ++ local.set $x + ;; al += 1; +- get_local $al ++ local.get $al + i32.const 1 + i32.add +- set_local $al ++ local.set $al + ;; // find matching segment + ;; for (;;) { + block $nextSegment loop $findSegment + ;; y = buf32[icell+SEGMENT_INFO]; +- get_local $icell ++ local.get $icell + i32.load offset=8 align=4 +- tee_local $y ++ local.tee $y + ;; bl = char0 + (y & 0x00FFFFFF); + i32.const 0x00FFFFFF + i32.and +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $bl ++ local.tee $bl + ;; if ( buf8[bl] === x ) { + i32.load8_u +- get_local $x ++ local.get $x + i32.eq + if + ;; y = (y >>> 24) - 1; +- get_local $y ++ local.get $y + i32.const 24 + i32.shr_u + i32.const 1 + i32.sub +- tee_local $y ++ local.tee $y + ;; if ( n !== 0 ) { + if + ;; x = al + y; +- get_local $y +- get_local $al ++ local.get $y ++ local.get $al + i32.add +- tee_local $x ++ local.tee $x + ;; if ( x > aR ) { return 0; } +- get_local $aR ++ local.get $aR + i32.gt_u + br_if $matchNotFound + ;; for (;;) { + loop + ;; bl += 1; +- get_local $bl ++ local.get $bl + i32.const 1 + i32.add +- tee_local $bl ++ local.tee $bl + ;; if ( buf8[bl] !== buf8[al] ) { return 0; } + i32.load8_u +- get_local $al ++ local.get $al + i32.load8_u + i32.ne + br_if $matchNotFound + ;; al += 1; +- get_local $al ++ local.get $al + i32.const 1 + i32.add +- tee_local $al ++ local.tee $al + ;; if ( al === x ) { break; } +- get_local $x ++ local.get $x + i32.ne + br_if 0 + end +@@ -158,11 +158,11 @@ + br $nextSegment + end + ;; icell = buf32[icell+CELL_OR]; +- get_local $icell ++ local.get $icell + i32.load offset=4 align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound +@@ -171,14 +171,14 @@ + end end + ;; // next segment + ;; icell = buf32[icell+CELL_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; const x = buf32[icell+BCELL_EXTRA]; + i32.load offset=8 align=4 +- tee_local $x ++ local.tee $x + ;; if ( x <= BCELL_EXTRA_MAX ) { + i32.const 0x00FFFFFF + i32.le_u +@@ -186,43 +186,43 @@ + ;; if ( x !== 0 && this.matchesExtra(ai, al, x) !== 0 ) { + ;; return 1; + ;; } +- get_local $x ++ local.get $x + if +- get_local $ai +- get_local $al +- get_local $x ++ local.get $ai ++ local.get $al ++ local.get $x + call $matchesExtra + br_if $matchFound + end + ;; x = buf32[icell+BCELL_ALT_AND]; +- get_local $icell ++ local.get $icell + i32.load offset=4 align=4 + i32.const 2 + i32.shl +- tee_local $x ++ local.tee $x + ;; if ( x !== 0 && this.matchesLeft(x, ai, al) !== 0 ) { + if +- get_local $x +- get_local $ai +- get_local $al ++ local.get $x ++ local.get $ai ++ local.get $al + call $matchesLeft + br_if $matchFound + ;; } + end + ;; icell = buf32[icell+BCELL_NEXT_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound + ;; } + end + ;; if ( al === aR ) { return 0; } +- get_local $al +- get_local $aR ++ local.get $al ++ local.get $aR + i32.ne + br_if $mainLoop + ;; } +@@ -255,60 +255,60 @@ + ;; const char0 = buf32[CHAR0_SLOT]; + i32.const 2060 + i32.load align=4 +- set_local $char0 ++ local.set $char0 + block $matchFound + block $matchNotFound + ;; for (;;) { + loop $mainLoop + ;; if ( ar === 0 ) { return 0; } +- get_local $ar ++ local.get $ar + i32.eqz + br_if $matchNotFound + ;; ar -= 1; +- get_local $ar ++ local.get $ar + i32.const 1 + i32.sub +- tee_local $ar ++ local.tee $ar + ;; x = buf8[ar]; + i32.load8_u +- set_local $x ++ local.set $x + ;; // find matching segment + ;; for (;;) { + block $nextSegment loop $findSegment + ;; y = buf32[icell+SEGMENT_INFO]; +- get_local $icell ++ local.get $icell + i32.load offset=8 align=4 +- tee_local $y ++ local.tee $y + ;; br = char0 + (y & 0x00FFFFFF); + i32.const 0x00FFFFFF + i32.and +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $br ++ local.tee $br + ;; y = (y >>> 24) - 1; +- get_local $y ++ local.get $y + i32.const 24 + i32.shr_u + i32.const 1 + i32.sub +- tee_local $y ++ local.tee $y + ;; br += y; + i32.add +- tee_local $br ++ local.tee $br + ;; if ( buf8[br] === x ) { + i32.load8_u +- get_local $x ++ local.get $x + i32.eq + if + ;; // all characters in segment must match + ;; if ( y !== 0 ) { +- get_local $y ++ local.get $y + if + ;; x = ar - y; +- get_local $ar +- get_local $y ++ local.get $ar ++ local.get $y + i32.sub +- tee_local $x ++ local.tee $x + ;; if ( x < 0 ) { return 0; } + i32.const 0 + i32.lt_s +@@ -317,21 +317,21 @@ + loop + ;; ar -= 1; br -= 1; + ;; if ( buf8[ar] !== buf8[br] ) { return 0; } +- get_local $ar ++ local.get $ar + i32.const 1 + i32.sub +- tee_local $ar ++ local.tee $ar + i32.load8_u +- get_local $br ++ local.get $br + i32.const 1 + i32.sub +- tee_local $br ++ local.tee $br + i32.load8_u + i32.ne + br_if $matchNotFound + ;; if ( ar === x ) { break; } +- get_local $ar +- get_local $x ++ local.get $ar ++ local.get $x + i32.ne + br_if 0 + end +@@ -340,11 +340,11 @@ + br $nextSegment + end + ;; icell = buf32[icell+CELL_OR]; +- get_local $icell ++ local.get $icell + i32.load offset=4 align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound +@@ -353,14 +353,14 @@ + end end + ;; // next segment + ;; icell = buf32[icell+CELL_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; const x = buf32[icell+BCELL_EXTRA]; + i32.load offset=8 align=4 +- tee_local $x ++ local.tee $x + ;; if ( x <= BCELL_EXTRA_MAX ) { + i32.const 0x00FFFFFF + i32.le_u +@@ -368,20 +368,20 @@ + ;; if ( x !== 0 && this.matchesExtra(ar, r, x) !== 0 ) { + ;; return 1; + ;; } +- get_local $x ++ local.get $x + if +- get_local $ar +- get_local $r +- get_local $x ++ local.get $ar ++ local.get $r ++ local.get $x + call $matchesExtra + br_if $matchFound + end + ;; icell = buf32[icell+BCELL_NEXT_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound +@@ -414,35 +414,35 @@ + ;; if ( ix !== 1 ) { + ;; const iu = this.extraHandler(l, r, ix); + ;; if ( iu === 0 ) { return 0; } +- get_local $ix ++ local.get $ix + i32.const 1 + i32.ne + if +- get_local $l +- get_local $r +- get_local $ix ++ local.get $l ++ local.get $r ++ local.get $ix + call $extraHandler +- tee_local $iu ++ local.tee $iu + i32.eqz + br_if $fail + ;; } else { + ;; iu = -1; + else + i32.const -1 +- set_local $iu ++ local.set $iu + ;; } + end + ;; this.buf32[RESULT_IU_SLOT] = iu; + i32.const 2076 +- get_local $iu ++ local.get $iu + i32.store align=4 + ;; this.buf32[RESULT_L_SLOT] = l; + i32.const 2068 +- get_local $l ++ local.get $l + i32.store align=4 + ;; this.buf32[RESULT_R_SLOT] = r; + i32.const 2072 +- get_local $r ++ local.get $r + i32.store align=4 + end ;; $succeed + i32.const 1 +@@ -470,49 +470,49 @@ + ;; if ( haystackLeft < 0 || (haystackLeft + needleLen) > haystackRight ) { + ;; return 0; + ;; } +- get_local $haystackLeft ++ local.get $haystackLeft + i32.const 0 + i32.lt_s + br_if $fail +- get_local $haystackLeft +- get_local $needleLen ++ local.get $haystackLeft ++ local.get $needleLen + i32.add +- get_local $haystackRight ++ local.get $haystackRight + i32.gt_u + br_if $fail + ;; const charCodes = this.buf8; + ;; needleLeft += this.buf32[CHAR0_SLOT]; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 2060 ;; CHAR0_SLOT memory address + i32.load align=4 ;; CHAR0 memory address + i32.add ;; needle memory address +- tee_local $needleLeft ++ local.tee $needleLeft + ;; const needleRight = needleLeft + needleLen; +- get_local $needleLen ++ local.get $needleLen + i32.add +- set_local $needleRight ++ local.set $needleRight + ;; while ( charCodes[haystackLeft] === charCodes[needleLeft] ) { + loop $compare +- get_local $haystackLeft ++ local.get $haystackLeft + i32.load8_u +- get_local $needleLeft ++ local.get $needleLeft + i32.load8_u + i32.ne + br_if $fail + ;; needleLeft += 1; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 1 + i32.add +- tee_local $needleLeft ++ local.tee $needleLeft + ;; if ( needleLeft === needleRight ) { return 1; } +- get_local $needleRight ++ local.get $needleRight + i32.eq + br_if $succeed + ;; haystackLeft += 1; + i32.const 1 +- get_local $haystackLeft ++ local.get $haystackLeft + i32.add +- set_local $haystackLeft ++ local.set $haystackLeft + br $compare + end + ;; } +@@ -545,76 +545,76 @@ + block $fail + block $succeed + ;; if ( needleLen === 0 ) { return haystackLeft; } +- get_local $needleLen ++ local.get $needleLen + i32.eqz + br_if $succeed + ;; haystackEnd -= needleLen; +- get_local $haystackEnd +- get_local $needleLen ++ local.get $haystackEnd ++ local.get $needleLen + i32.sub +- tee_local $haystackEnd ++ local.tee $haystackEnd + ;; if ( haystackEnd < haystackLeft ) { return -1; } +- get_local $haystackLeft ++ local.get $haystackLeft + i32.lt_s + br_if $fail + ;; needleLeft += this.buf32[CHAR0_SLOT]; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 2060 ;; CHAR0_SLOT memory address + i32.load align=4 ;; CHAR0 memory address + i32.add ;; needle memory address +- tee_local $needleLeft ++ local.tee $needleLeft + ;; const needleRight = needleLeft + needleLen; +- get_local $needleLen ++ local.get $needleLen + i32.add +- set_local $needleRight ++ local.set $needleRight + ;; const charCodes = this.buf8; + ;; for (;;) { + loop $mainLoop + ;; let i = haystackLeft; + ;; let j = needleLeft; +- get_local $haystackLeft +- set_local $i +- get_local $needleLeft +- set_local $j ++ local.get $haystackLeft ++ local.set $i ++ local.get $needleLeft ++ local.set $j + ;; while ( charCodes[i] === charCodes[j] ) { + block $breakMatchChars loop $matchChars +- get_local $i ++ local.get $i + i32.load8_u +- get_local $j ++ local.get $j + i32.load8_u + i32.ne + br_if $breakMatchChars + ;; j += 1; +- get_local $j ++ local.get $j + i32.const 1 + i32.add +- tee_local $j ++ local.tee $j + ;; if ( j === needleRight ) { return haystackLeft; } +- get_local $needleRight ++ local.get $needleRight + i32.eq + br_if $succeed + ;; i += 1; +- get_local $i ++ local.get $i + i32.const 1 + i32.add +- set_local $i ++ local.set $i + br $matchChars + ;; } + end end + ;; haystackLeft += 1; +- get_local $haystackLeft ++ local.get $haystackLeft + i32.const 1 + i32.add +- tee_local $haystackLeft ++ local.tee $haystackLeft + ;; if ( haystackLeft > haystackEnd ) { break; } +- get_local $haystackEnd ++ local.get $haystackEnd + i32.gt_u + br_if $fail + br $mainLoop + ;; } + end + end ;; $succeed +- get_local $haystackLeft ++ local.get $haystackLeft + return + end ;; $fail + ;; return -1; +@@ -640,82 +640,82 @@ + (local $j i32) + (local $c0 i32) + ;; if ( needleLen === 0 ) { return haystackBeg; } +- get_local $needleLen ++ local.get $needleLen + i32.eqz + if +- get_local $haystackBeg ++ local.get $haystackBeg + return + end + block $fail + block $succeed + ;; let haystackLeft = haystackEnd - needleLen; +- get_local $haystackEnd +- get_local $needleLen ++ local.get $haystackEnd ++ local.get $needleLen + i32.sub +- tee_local $haystackLeft ++ local.tee $haystackLeft + ;; if ( haystackLeft < haystackBeg ) { return -1; } +- get_local $haystackBeg ++ local.get $haystackBeg + i32.lt_s + br_if $fail + ;; needleLeft += this.buf32[CHAR0_SLOT]; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 2060 ;; CHAR0_SLOT memory address + i32.load align=4 ;; CHAR0 memory address + i32.add ;; needle memory address +- tee_local $needleLeft ++ local.tee $needleLeft + ;; const needleRight = needleLeft + needleLen; +- get_local $needleLen ++ local.get $needleLen + i32.add +- set_local $needleRight ++ local.set $needleRight + ;; const charCodes = this.buf8; + ;; for (;;) { + loop $mainLoop + ;; let i = haystackLeft; + ;; let j = needleLeft; +- get_local $haystackLeft +- set_local $i +- get_local $needleLeft +- set_local $j ++ local.get $haystackLeft ++ local.set $i ++ local.get $needleLeft ++ local.set $j + ;; while ( charCodes[i] === charCodes[j] ) { + block $breakMatchChars loop $matchChars +- get_local $i ++ local.get $i + i32.load8_u +- get_local $j ++ local.get $j + i32.load8_u + i32.ne + br_if $breakMatchChars + ;; j += 1; +- get_local $j ++ local.get $j + i32.const 1 + i32.add +- tee_local $j ++ local.tee $j + ;; if ( j === needleRight ) { return haystackLeft; } +- get_local $needleRight ++ local.get $needleRight + i32.eq + br_if $succeed + ;; i += 1; +- get_local $i ++ local.get $i + i32.const 1 + i32.add +- set_local $i ++ local.set $i + br $matchChars + ;; } + end end + ;; if ( haystackLeft === haystackBeg ) { break; } + ;; haystackLeft -= 1; +- get_local $haystackLeft +- get_local $haystackBeg ++ local.get $haystackLeft ++ local.get $haystackBeg + i32.eq + br_if $fail +- get_local $haystackLeft ++ local.get $haystackLeft + i32.const 1 + i32.sub +- set_local $haystackLeft ++ local.set $haystackLeft + br $mainLoop + ;; } + end + end ;; $succeed +- get_local $haystackLeft ++ local.get $haystackLeft + return + end ;; $fail + ;; return -1; +diff -up uBlock-1.42.4/src/js/wasm/hntrie.wat.wa1.0 uBlock-1.42.4/src/js/wasm/hntrie.wat +--- uBlock-1.42.4/src/js/wasm/hntrie.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/js/wasm/hntrie.wat 2022-05-22 17:25:47.975606555 +0200 +@@ -64,19 +64,19 @@ + ;; + i32.const 264 ;; start of char section is stored at addr 264 + i32.load +- set_local $char0 ++ local.set $char0 + ;; let ineedle = this.buf[255]; + i32.const 255 ;; addr of needle is stored at addr 255 + i32.load8_u +- set_local $ineedle ++ local.set $ineedle + ;; let icell = this.buf32[iroot+0]; +- get_local $iroot ++ local.get $iroot + i32.const 2 + i32.shl + i32.load + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return -1; } + i32.eqz + if +@@ -86,43 +86,43 @@ + ;; for (;;) { + block $noSegment loop $nextSegment + ;; if ( ineedle === 0 ) { return -1; } +- get_local $ineedle ++ local.get $ineedle + i32.eqz + if + i32.const -1 + return + end + ;; ineedle -= 1; +- get_local $ineedle ++ local.get $ineedle + i32.const -1 + i32.add +- tee_local $ineedle ++ local.tee $ineedle + ;; let c = this.buf[ineedle]; + i32.load8_u +- set_local $c ++ local.set $c + ;; for (;;) { + block $foundSegment loop $findSegment + ;; v = this.buf32[icell+2]; +- get_local $icell ++ local.get $icell + i32.load offset=8 +- tee_local $v ++ local.tee $v + ;; i0 = char0 + (v >>> 8); + i32.const 8 + i32.shr_u +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $i0 ++ local.tee $i0 + ;; if ( this.buf[i0] === c ) { break; } + i32.load8_u +- get_local $c ++ local.get $c + i32.eq + br_if $foundSegment + ;; icell = this.buf32[icell+0]; +- get_local $icell ++ local.get $icell + i32.load + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + i32.eqz + if + i32.const -1 +@@ -131,44 +131,44 @@ + br 0 + end end + ;; let n = v & 0x7F; +- get_local $v ++ local.get $v + i32.const 0x7F + i32.and +- tee_local $n ++ local.tee $n + ;; if ( n > 1 ) { + i32.const 1 + i32.gt_u + if + ;; n -= 1; +- get_local $n ++ local.get $n + i32.const -1 + i32.add +- tee_local $n ++ local.tee $n + ;; if ( n > ineedle ) { return -1; } +- get_local $ineedle ++ local.get $ineedle + i32.gt_u + if + i32.const -1 + return + end +- get_local $i0 ++ local.get $i0 + i32.const 1 + i32.add +- tee_local $i0 ++ local.tee $i0 + ;; const i1 = i0 + n; +- get_local $n ++ local.get $n + i32.add +- set_local $i1 ++ local.set $i1 + ;; do { + loop + ;; ineedle -= 1; +- get_local $ineedle ++ local.get $ineedle + i32.const -1 + i32.add +- tee_local $ineedle ++ local.tee $ineedle + ;; if ( this.buf[i0] !== this.buf[ineedle] ) { return -1; } + i32.load8_u +- get_local $i0 ++ local.get $i0 + i32.load8_u + i32.ne + if +@@ -176,47 +176,47 @@ + return + end + ;; i0 += 1; +- get_local $i0 ++ local.get $i0 + i32.const 1 + i32.add +- tee_local $i0 ++ local.tee $i0 + ;; } while ( i0 < i1 ); +- get_local $i1 ++ local.get $i1 + i32.lt_u + br_if 0 + end + end + ;; if ( (v & 0x80) !== 0 ) { +- get_local $v ++ local.get $v + i32.const 0x80 + i32.and + if + ;; if ( ineedle === 0 || buf8[ineedle-1] === 0x2E /* '.' */ ) { + ;; return ineedle; + ;; } +- get_local $ineedle ++ local.get $ineedle + i32.eqz + if + i32.const 0 + return + end +- get_local $ineedle ++ local.get $ineedle + i32.const -1 + i32.add + i32.load8_u + i32.const 0x2E + i32.eq + if +- get_local $ineedle ++ local.get $ineedle + return + end + end + ;; icell = this.buf32[icell+1]; +- get_local $icell ++ local.get $icell + i32.load offset=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { break; } + br_if 0 + end end +@@ -245,7 +245,7 @@ + ;; let lhnchar = this.buf[255]; + i32.const 255 + i32.load8_u +- tee_local $lhnchar ++ local.tee $lhnchar + ;; if ( lhnchar === 0 ) { return 0; } + i32.eqz + if +@@ -281,21 +281,21 @@ + end + end + ;; let icell = this.buf32[iroot+0]; +- get_local $iroot ++ local.get $iroot + i32.const 2 + i32.shl +- tee_local $iroot ++ local.tee $iroot + i32.load + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( this.buf32[icell+2] === 0 ) { + i32.eqz + if + ;; this.buf32[iroot+0] = this.addLeafCell(lhnchar); + ;; return 1; +- get_local $iroot +- get_local $lhnchar ++ local.get $iroot ++ local.get $lhnchar + call $addLeafCell + i32.store + i32.const 1 +@@ -304,37 +304,37 @@ + ;; const char0 = this.buf32[HNBIGTRIE_CHAR0_SLOT]; + i32.const 264 + i32.load +- set_local $char0 ++ local.set $char0 + ;; for (;;) { + loop $nextSegment + ;; const v = this.buf32[icell+2]; +- get_local $icell ++ local.get $icell + i32.load offset=8 +- tee_local $v ++ local.tee $v + ;; let isegchar0 = char0 + (v >>> 8); + i32.const 8 + i32.shr_u +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $isegchar0 ++ local.tee $isegchar0 + ;; if ( this.buf[isegchar0] !== this.buf[lhnchar-1] ) { + i32.load8_u +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add + i32.load8_u + i32.ne + if + ;; inext = this.buf32[icell+0]; +- get_local $icell ++ local.get $icell + i32.load +- tee_local $inext ++ local.tee $inext + ;; if ( inext === 0 ) { + i32.eqz + if + ;; this.buf32[icell+0] = this.addLeafCell(lhnchar); +- get_local $icell +- get_local $lhnchar ++ local.get $icell ++ local.get $lhnchar + call $addLeafCell + i32.store + ;; return 1; +@@ -342,25 +342,25 @@ + return + end + ;; icell = inext; +- get_local $inext ++ local.get $inext + i32.const 2 + i32.shl +- set_local $icell ++ local.set $icell + br $nextSegment + end + ;; let isegchar = 1; + i32.const 1 +- set_local $isegchar ++ local.set $isegchar + ;; lhnchar -= 1; +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add +- set_local $lhnchar ++ local.set $lhnchar + ;; const lsegchar = v & 0x7F; +- get_local $v ++ local.get $v + i32.const 0x7F + i32.and +- tee_local $lsegchar ++ local.tee $lsegchar + ;; if ( lsegchar !== 1 ) { + i32.const 1 + i32.ne +@@ -368,69 +368,69 @@ + ;; for (;;) { + block $mismatch loop + ;; if ( isegchar === lsegchar ) { break; } +- get_local $isegchar +- get_local $lsegchar ++ local.get $isegchar ++ local.get $lsegchar + i32.eq + br_if $mismatch +- get_local $lhnchar ++ local.get $lhnchar + i32.eqz + br_if $mismatch + ;; if ( this.buf[isegchar0+isegchar] !== this.buf[lhnchar-1] ) { break; } +- get_local $isegchar0 +- get_local $isegchar ++ local.get $isegchar0 ++ local.get $isegchar + i32.add + i32.load8_u +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add + i32.load8_u + i32.ne + br_if $mismatch + ;; isegchar += 1; +- get_local $isegchar ++ local.get $isegchar + i32.const 1 + i32.add +- set_local $isegchar ++ local.set $isegchar + ;; lhnchar -= 1; +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add +- set_local $lhnchar ++ local.set $lhnchar + br 0 + end end + end + ;; const boundaryBit = v & 0x80; +- get_local $v ++ local.get $v + i32.const 0x80 + i32.and +- set_local $boundaryBit ++ local.set $boundaryBit + ;; if ( isegchar === lsegchar ) { +- get_local $isegchar +- get_local $lsegchar ++ local.get $isegchar ++ local.get $lsegchar + i32.eq + if + ;; if ( lhnchar === 0 ) { +- get_local $lhnchar ++ local.get $lhnchar + i32.eqz + if + ;; if ( boundaryBit !== 0 ) { return 0; } +- get_local $boundaryBit ++ local.get $boundaryBit + if + i32.const 0 + return + end + ;; this.buf32[icell+2] = v | 0x80; +- get_local $icell +- get_local $v ++ local.get $icell ++ local.get $v + i32.const 0x80 + i32.or + i32.store offset=8 + else + ;; if ( boundaryBit !== 0 ) { +- get_local $boundaryBit ++ local.get $boundaryBit + if + ;; if ( this.buf[lhnchar-1] === 0x2E /* '.' */ ) { return -1; } +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add + i32.load8_u +@@ -442,36 +442,36 @@ + end + end + ;; inext = this.buf32[icell+1]; +- get_local $icell ++ local.get $icell + i32.load offset=4 +- tee_local $inext ++ local.tee $inext + ;; if ( inext !== 0 ) { + if + ;; icell = inext; +- get_local $inext ++ local.get $inext + i32.const 2 + i32.shl +- set_local $icell ++ local.set $icell + ;; continue; + br $nextSegment + end + ;; this.buf32[icell+1] = this.addLeafCell(lhnchar); +- get_local $icell +- get_local $lhnchar ++ local.get $icell ++ local.get $lhnchar + call $addLeafCell + i32.store offset=4 + end + else + ;; isegchar0 -= char0; +- get_local $icell +- get_local $isegchar0 +- get_local $char0 ++ local.get $icell ++ local.get $isegchar0 ++ local.get $char0 + i32.sub +- tee_local $isegchar0 ++ local.tee $isegchar0 + ;; this.buf32[icell+2] = isegchar0 << 8 | isegchar; + i32.const 8 + i32.shl +- get_local $isegchar ++ local.get $isegchar + i32.or + i32.store offset=8 + ;; inext = this.addCell( +@@ -479,39 +479,39 @@ + ;; this.buf32[icell+1], + ;; isegchar0 + isegchar << 8 | boundaryBit | lsegchar - isegchar + ;; ); +- get_local $icell ++ local.get $icell + i32.const 0 +- get_local $icell ++ local.get $icell + i32.load offset=4 +- get_local $isegchar0 +- get_local $isegchar ++ local.get $isegchar0 ++ local.get $isegchar + i32.add + i32.const 8 + i32.shl +- get_local $boundaryBit ++ local.get $boundaryBit + i32.or +- get_local $lsegchar +- get_local $isegchar ++ local.get $lsegchar ++ local.get $isegchar + i32.sub + i32.or + call $addCell +- tee_local $inext ++ local.tee $inext + ;; this.buf32[icell+1] = inext; + i32.store offset=4 + ;; if ( lhnchar !== 0 ) { +- get_local $lhnchar ++ local.get $lhnchar + if + ;; this.buf32[inext+0] = this.addLeafCell(lhnchar); +- get_local $inext ++ local.get $inext + i32.const 2 + i32.shl +- get_local $lhnchar ++ local.get $lhnchar + call $addLeafCell + i32.store + else + ;; this.buf32[icell+2] |= 0x80; +- get_local $icell +- get_local $icell ++ local.get $icell ++ local.get $icell + i32.load offset=8 + i32.const 0x80 + i32.or +@@ -547,24 +547,24 @@ + i32.const 260 + i32.const 260 + i32.load +- tee_local $icell ++ local.tee $icell + i32.const 12 + i32.add + i32.store + ;; this.buf32[icell+0] = idown; +- get_local $icell +- get_local $idown ++ local.get $icell ++ local.get $idown + i32.store + ;; this.buf32[icell+1] = iright; +- get_local $icell +- get_local $iright ++ local.get $icell ++ local.get $iright + i32.store offset=4 + ;; this.buf32[icell+2] = v; +- get_local $icell +- get_local $v ++ local.get $icell ++ local.get $v + i32.store offset=8 + ;; return icell; +- get_local $icell ++ local.get $icell + i32.const 2 + i32.shr_u + ) +@@ -582,58 +582,58 @@ + ;; const r = this.buf32[TRIE1_SLOT] >>> 2; + i32.const 260 + i32.load +- tee_local $r ++ local.tee $r + ;; let i = r; +- set_local $i ++ local.set $i + ;; while ( lsegchar > 127 ) { + block $lastSegment loop +- get_local $lsegchar ++ local.get $lsegchar + i32.const 127 + i32.le_u + br_if $lastSegment + ;; this.buf32[i+0] = 0; +- get_local $i ++ local.get $i + i32.const 0 + i32.store + ;; this.buf32[i+1] = i + 3; +- get_local $i +- get_local $i ++ local.get $i ++ local.get $i + i32.const 12 + i32.add + i32.const 2 + i32.shr_u + i32.store offset=4 + ;; this.buf32[i+2] = this.addSegment(lsegchar, lsegchar - 127); +- get_local $i +- get_local $lsegchar +- get_local $lsegchar ++ local.get $i ++ local.get $lsegchar ++ local.get $lsegchar + i32.const 127 + i32.sub + call $addSegment + i32.store offset=8 + ;; lsegchar -= 127; +- get_local $lsegchar ++ local.get $lsegchar + i32.const 127 + i32.sub +- set_local $lsegchar ++ local.set $lsegchar + ;; i += 3; +- get_local $i ++ local.get $i + i32.const 12 + i32.add +- set_local $i ++ local.set $i + br 0 + end end + ;; this.buf32[i+0] = 0; +- get_local $i ++ local.get $i + i32.const 0 + i32.store + ;; this.buf32[i+1] = 0; +- get_local $i ++ local.get $i + i32.const 0 + i32.store offset=4 + ;; this.buf32[i+2] = this.addSegment(lsegchar, 0) | 0x80; +- get_local $i +- get_local $lsegchar ++ local.get $i ++ local.get $lsegchar + i32.const 0 + call $addSegment + i32.const 0x80 +@@ -641,12 +641,12 @@ + i32.store offset=8 + ;; this.buf32[TRIE1_SLOT] = i + 3 << 2; + i32.const 260 +- get_local $i ++ local.get $i + i32.const 12 + i32.add + i32.store + ;; return r; +- get_local $r ++ local.get $r + i32.const 2 + i32.shr_u + ) +@@ -666,7 +666,7 @@ + (local $i i32) ;; iterator + ;; + ;; if ( lsegchar === 0 ) { return 0; } +- get_local $lsegchar ++ local.get $lsegchar + i32.eqz + if + i32.const 0 +@@ -675,45 +675,45 @@ + ;; let char1 = this.buf32[HNBIGTRIE_CHAR1_SLOT]; + i32.const 268 + i32.load +- tee_local $char1 ++ local.tee $char1 + ;; const isegchar = char1 - this.buf32[HNBIGTRIE_CHAR0_SLOT]; + i32.const 264 + i32.load + i32.sub +- set_local $isegchar ++ local.set $isegchar + ;; let i = lsegchar; +- get_local $lsegchar +- set_local $i ++ local.get $lsegchar ++ local.set $i + ;; do { + loop + ;; this.buf[char1++] = this.buf[--i]; +- get_local $char1 +- get_local $i ++ local.get $char1 ++ local.get $i + i32.const -1 + i32.add +- tee_local $i ++ local.tee $i + i32.load8_u + i32.store8 +- get_local $char1 ++ local.get $char1 + i32.const 1 + i32.add +- set_local $char1 ++ local.set $char1 + ;; } while ( i !== lsegend ); +- get_local $i +- get_local $lsegend ++ local.get $i ++ local.get $lsegend + i32.ne + br_if 0 + end + ;; this.buf32[HNBIGTRIE_CHAR1_SLOT] = char1; + i32.const 268 +- get_local $char1 ++ local.get $char1 + i32.store + ;; return isegchar << 8 | lsegchar - lsegend; +- get_local $isegchar ++ local.get $isegchar + i32.const 8 + i32.shl +- get_local $lsegchar +- get_local $lsegend ++ local.get $lsegchar ++ local.get $lsegend + i32.sub + i32.or + ) +diff -up uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat.wa1.0 uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat +--- uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat 2022-05-22 17:25:47.975606555 +0200 +@@ -68,15 +68,15 @@ + (func (export "lz4BlockEncodeBound") + (param $ilen i32) + (result i32) +- get_local $ilen ++ local.get $ilen + i32.const 0x7E000000 + i32.gt_u + if + i32.const 0 + return + end +- get_local $ilen +- get_local $ilen ++ local.get $ilen ++ local.get $ilen + i32.const 255 + i32.div_u + i32.add +@@ -123,14 +123,14 @@ + (local $llen i32) ;; length of found literals + (local $moffset i32) ;; offset to found match from current input position + (local $mlen i32) ;; length of found match +- get_local $ilen ;; empty input = empty output ++ local.get $ilen ;; empty input = empty output + i32.const 0x7E000000 ;; max input size: 0x7E000000 + i32.gt_u + if + i32.const 0 + return + end +- get_local $ilen ;; "blocks < 13 bytes cannot be compressed" ++ local.get $ilen ;; "blocks < 13 bytes cannot be compressed" + i32.const 13 + i32.lt_u + if +@@ -138,78 +138,78 @@ + return + end + call $getLinearMemoryOffset ;; hash table is at start of usable memory +- set_local $hashPtrBeg +- get_local $inPtr +- tee_local $anchorPtr +- get_local $ilen ++ local.set $hashPtrBeg ++ local.get $inPtr ++ local.tee $anchorPtr ++ local.get $ilen + i32.add +- tee_local $inPtrEnd ++ local.tee $inPtrEnd + i32.const -5 ;; "The last 5 bytes are always literals." + i32.add +- tee_local $inPtrEnd2 ++ local.tee $inPtrEnd2 + i32.const -7 ;; "The last match must start at least 12 bytes before end of block" + i32.add +- set_local $inPtrEnd1 +- get_local $outPtr +- set_local $outPtrBeg ++ local.set $inPtrEnd1 ++ local.get $outPtr ++ local.set $outPtrBeg + ;; + ;; sequence processing loop + ;; + block $noMoreSequence loop $nextSequence +- get_local $inPtr +- get_local $inPtrEnd1 ++ local.get $inPtr ++ local.get $inPtrEnd1 + i32.ge_u ;; 5 or less bytes left? + br_if $noMoreSequence +- get_local $inPtr ;; first sequence of 3 bytes before match-finding loop ++ local.get $inPtr ;; first sequence of 3 bytes before match-finding loop + i32.load8_u + i32.const 8 + i32.shl +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=1 + i32.const 16 + i32.shl + i32.or +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=2 + i32.const 24 + i32.shl + i32.or +- set_local $seq32 ++ local.set $seq32 + ;; + ;; match-finding loop + ;; + loop $findMatch block $noMatchFound +- get_local $inPtr +- get_local $inPtrEnd2 ++ local.get $inPtr ++ local.get $inPtrEnd2 + i32.gt_u ;; less than 12 bytes left? + br_if $noMoreSequence +- get_local $seq32 ;; update last byte of current sequence ++ local.get $seq32 ;; update last byte of current sequence + i32.const 8 + i32.shr_u +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=3 + i32.const 24 + i32.shl + i32.or +- tee_local $seq32 ++ local.tee $seq32 + i32.const 0x9E3779B1 ;; compute 16-bit hash + i32.mul + i32.const 16 + i32.shr_u ;; hash value is at top of stack + i32.const 2 ;; lookup refPtr at hash entry + i32.shl +- get_local $hashPtrBeg ++ local.get $hashPtrBeg + i32.add +- tee_local $hashPtr ++ local.tee $hashPtr + i32.load +- set_local $refPtr +- get_local $hashPtr ;; update hash entry with inPtr +- get_local $inPtr ++ local.set $refPtr ++ local.get $hashPtr ;; update hash entry with inPtr ++ local.get $inPtr + i32.store +- get_local $inPtr +- get_local $refPtr ++ local.get $inPtr ++ local.get $refPtr + i32.sub +- tee_local $moffset ;; remember match offset, we will need it in case of match ++ local.tee $moffset ;; remember match offset, we will need it in case of match + i32.const 0xFFFF + i32.gt_s ;; match offset > 65535 = unusable match + br_if $noMatchFound +@@ -217,177 +217,177 @@ + ;; confirm match: different sequences can yield same hash + ;; compare-branch each byte to potentially save memory read ops + ;; +- get_local $seq32 ;; byte 0 ++ local.get $seq32 ;; byte 0 + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u + i32.ne ;; refPtr[0] !== inPtr[0] + br_if $noMatchFound +- get_local $seq32 ;; byte 1 ++ local.get $seq32 ;; byte 1 + i32.const 8 + i32.shr_u + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u offset=1 + i32.ne + br_if $noMatchFound ;; refPtr[1] !== inPtr[1] +- get_local $seq32 ;; byte 2 ++ local.get $seq32 ;; byte 2 + i32.const 16 + i32.shr_u + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u offset=2 + i32.ne ;; refPtr[2] !== inPtr[2] + br_if $noMatchFound +- get_local $seq32 ;; byte 3 ++ local.get $seq32 ;; byte 3 + i32.const 24 + i32.shr_u + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u offset=3 + i32.ne ;; refPtr[3] !== inPtr[3] + br_if $noMatchFound + ;; + ;; a valid match has been found at this point + ;; +- get_local $inPtr ;; compute length of literals +- get_local $anchorPtr ++ local.get $inPtr ;; compute length of literals ++ local.get $anchorPtr + i32.sub +- set_local $llen +- get_local $inPtr ;; find match length ++ local.set $llen ++ local.get $inPtr ;; find match length + i32.const 4 ;; skip over confirmed 4-byte match + i32.add +- set_local $inPtr +- get_local $refPtr ++ local.set $inPtr ++ local.get $refPtr + i32.const 4 + i32.add +- tee_local $mlen ;; remember refPtr to later compute match length +- set_local $refPtr ++ local.tee $mlen ;; remember refPtr to later compute match length ++ local.set $refPtr + block $endOfMatch loop ;; scan input buffer until match ends +- get_local $inPtr +- get_local $inPtrEnd2 ++ local.get $inPtr ++ local.get $inPtrEnd2 + i32.ge_u + br_if $endOfMatch +- get_local $inPtr ++ local.get $inPtr + i32.load8_u +- get_local $refPtr ++ local.get $refPtr + i32.load8_u + i32.ne + br_if $endOfMatch +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- get_local $refPtr ++ local.set $inPtr ++ local.get $refPtr + i32.const 1 + i32.add +- set_local $refPtr ++ local.set $refPtr + br 0 + end end $endOfMatch + ;; encode token +- get_local $outPtr ;; output token +- get_local $llen +- get_local $refPtr +- get_local $mlen ++ local.get $outPtr ;; output token ++ local.get $llen ++ local.get $refPtr ++ local.get $mlen + i32.sub +- tee_local $mlen ++ local.tee $mlen + call $writeToken +- get_local $outPtr ++ local.get $outPtr + i32.const 1 + i32.add +- set_local $outPtr +- get_local $llen ;; encode/write length of literals if needed ++ local.set $outPtr ++ local.get $llen ;; encode/write length of literals if needed + i32.const 15 + i32.ge_s + if +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + call $writeLength +- set_local $outPtr ++ local.set $outPtr + end + ;; copy literals +- get_local $outPtr +- get_local $anchorPtr +- get_local $llen ++ local.get $outPtr ++ local.get $anchorPtr ++ local.get $llen + call $copy +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + i32.add +- set_local $outPtr ++ local.set $outPtr + ;; encode match offset +- get_local $outPtr +- get_local $moffset ++ local.get $outPtr ++ local.get $moffset + i32.store8 +- get_local $outPtr +- get_local $moffset ++ local.get $outPtr ++ local.get $moffset + i32.const 8 + i32.shr_u + i32.store8 offset=1 +- get_local $outPtr ++ local.get $outPtr + i32.const 2 + i32.add +- set_local $outPtr +- get_local $mlen ;; encode/write length of match if needed ++ local.set $outPtr ++ local.get $mlen ;; encode/write length of match if needed + i32.const 15 + i32.ge_s + if +- get_local $outPtr +- get_local $mlen ++ local.get $outPtr ++ local.get $mlen + call $writeLength +- set_local $outPtr ++ local.set $outPtr + end +- get_local $inPtr ;; advance anchor to current position +- set_local $anchorPtr ++ local.get $inPtr ;; advance anchor to current position ++ local.set $anchorPtr + br $nextSequence + end $noMatchFound +- get_local $inPtr ;; no match found: advance to next byte ++ local.get $inPtr ;; no match found: advance to next byte + i32.const 1 + i32.add +- set_local $inPtr ++ local.set $inPtr + br $findMatch end ;; match offset > 65535 = unusable match + end end $noMoreSequence + ;; + ;; generate last (match-less) sequence if compression succeeded + ;; +- get_local $outPtr +- get_local $outPtrBeg ++ local.get $outPtr ++ local.get $outPtrBeg + i32.eq + if + i32.const 0 + return + end +- get_local $outPtr +- get_local $inPtrEnd +- get_local $anchorPtr ++ local.get $outPtr ++ local.get $inPtrEnd ++ local.get $anchorPtr + i32.sub +- tee_local $llen ++ local.tee $llen + i32.const 0 + call $writeToken +- get_local $outPtr ++ local.get $outPtr + i32.const 1 + i32.add +- set_local $outPtr +- get_local $llen ++ local.set $outPtr ++ local.get $llen + i32.const 15 + i32.ge_u + if +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + call $writeLength +- set_local $outPtr ++ local.set $outPtr + end +- get_local $outPtr +- get_local $anchorPtr +- get_local $llen ++ local.get $outPtr ++ local.get $anchorPtr ++ local.get $llen + call $copy +- get_local $outPtr ;; return number of written bytes +- get_local $llen ++ local.get $outPtr ;; return number of written bytes ++ local.get $llen + i32.add +- get_local $outPtrBeg ++ local.get $outPtrBeg + i32.sub + ) + +@@ -413,128 +413,128 @@ + (local $token i32) ;; sequence token + (local $clen i32) ;; number of bytes to copy + (local $_ i32) ;; general purpose variable +- get_local $ilen ;; if ( ilen == 0 ) { return 0; } ++ local.get $ilen ;; if ( ilen == 0 ) { return 0; } + i32.eqz + if + i32.const 0 + return + end +- get_local $inPtr0 +- tee_local $inPtr ;; current position in input buffer +- get_local $ilen ++ local.get $inPtr0 ++ local.tee $inPtr ;; current position in input buffer ++ local.get $ilen + i32.add +- set_local $inPtrEnd +- get_local $outPtr0 ;; start of output buffer +- set_local $outPtr ;; current position in output buffer ++ local.set $inPtrEnd ++ local.get $outPtr0 ;; start of output buffer ++ local.set $outPtr ;; current position in output buffer + block $noMoreSequence loop ;; iterate through all sequences +- get_local $inPtr +- get_local $inPtrEnd ++ local.get $inPtr ++ local.get $inPtrEnd + i32.ge_u + br_if $noMoreSequence ;; break when nothing left to read in input buffer +- get_local $inPtr ;; read token -- consume one byte ++ local.get $inPtr ;; read token -- consume one byte + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- tee_local $token ;; extract length of literals from token ++ local.set $inPtr ++ local.tee $token ;; extract length of literals from token + i32.const 4 + i32.shr_u +- tee_local $clen ;; consume extra length bytes if present ++ local.tee $clen ;; consume extra length bytes if present + i32.eqz + if else +- get_local $clen ++ local.get $clen + i32.const 15 + i32.eq + if loop +- get_local $inPtr ++ local.get $inPtr + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- tee_local $_ +- get_local $clen ++ local.set $inPtr ++ local.tee $_ ++ local.get $clen + i32.add +- set_local $clen +- get_local $_ ++ local.set $clen ++ local.get $_ + i32.const 255 + i32.eq + br_if 0 + end end +- get_local $outPtr ;; copy literals to ouput buffer +- get_local $inPtr +- get_local $clen ++ local.get $outPtr ;; copy literals to ouput buffer ++ local.get $inPtr ++ local.get $clen + call $copy +- get_local $outPtr ;; advance output buffer pointer past copy +- get_local $clen ++ local.get $outPtr ;; advance output buffer pointer past copy ++ local.get $clen + i32.add +- set_local $outPtr +- get_local $clen ;; advance input buffer pointer past literals +- get_local $inPtr ++ local.set $outPtr ++ local.get $clen ;; advance input buffer pointer past literals ++ local.get $inPtr + i32.add +- tee_local $inPtr +- get_local $inPtrEnd ;; exit if this is the last sequence ++ local.tee $inPtr ++ local.get $inPtrEnd ;; exit if this is the last sequence + i32.eq + br_if $noMoreSequence + end +- get_local $outPtr ;; read match offset +- get_local $inPtr ++ local.get $outPtr ;; read match offset ++ local.get $inPtr + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=1 + i32.const 8 + i32.shl + i32.or + i32.sub +- tee_local $matchPtr +- get_local $outPtr ;; match position can't be outside input buffer bounds ++ local.tee $matchPtr ++ local.get $outPtr ;; match position can't be outside input buffer bounds + i32.eq + br_if $noMoreSequence +- get_local $matchPtr +- get_local $inPtrEnd ++ local.get $matchPtr ++ local.get $inPtrEnd + i32.lt_u + br_if $noMoreSequence +- get_local $inPtr ;; advance input pointer past match offset bytes ++ local.get $inPtr ;; advance input pointer past match offset bytes + i32.const 2 + i32.add +- set_local $inPtr +- get_local $token ;; extract length of match from token ++ local.set $inPtr ++ local.get $token ;; extract length of match from token + i32.const 15 + i32.and + i32.const 4 + i32.add +- tee_local $clen ++ local.tee $clen + i32.const 19 ;; consume extra length bytes if present + i32.eq + if loop +- get_local $inPtr ++ local.get $inPtr + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- tee_local $_ +- get_local $clen ++ local.set $inPtr ++ local.tee $_ ++ local.get $clen + i32.add +- set_local $clen +- get_local $_ ++ local.set $clen ++ local.get $_ + i32.const 255 + i32.eq + br_if 0 + end end +- get_local $outPtr ;; copy match to ouput buffer +- get_local $matchPtr +- get_local $clen ++ local.get $outPtr ;; copy match to ouput buffer ++ local.get $matchPtr ++ local.get $clen + call $copy +- get_local $clen ;; advance output buffer pointer past copy +- get_local $outPtr ++ local.get $clen ;; advance output buffer pointer past copy ++ local.get $outPtr + i32.add +- set_local $outPtr ++ local.set $outPtr + br 0 + end end $noMoreSequence +- get_local $outPtr ;; return number of written bytes +- get_local $outPtr0 ++ local.get $outPtr ;; return number of written bytes ++ local.get $outPtr0 + i32.sub + ) + +@@ -552,18 +552,18 @@ + (param $outPtr i32) + (param $llen i32) + (param $mlen i32) +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + i32.const 15 +- get_local $llen ++ local.get $llen + i32.const 15 + i32.lt_u + select + i32.const 4 + i32.shl +- get_local $mlen ++ local.get $mlen + i32.const 15 +- get_local $mlen ++ local.get $mlen + i32.const 15 + i32.lt_u + select +@@ -582,32 +582,32 @@ + (param $outPtr i32) + (param $len i32) + (result i32) +- get_local $len ++ local.get $len + i32.const 15 + i32.sub +- set_local $len ++ local.set $len + loop +- get_local $outPtr +- get_local $len ++ local.get $outPtr ++ local.get $len + i32.const 255 +- get_local $len ++ local.get $len + i32.const 255 + i32.lt_u + select + i32.store8 +- get_local $outPtr ++ local.get $outPtr + i32.const 1 + i32.add +- set_local $outPtr +- get_local $len ++ local.set $outPtr ++ local.get $len + i32.const 255 + i32.sub +- tee_local $len ++ local.tee $len + i32.const 0 + i32.ge_s + br_if 0 + end +- get_local $outPtr ++ local.get $outPtr + ) + + ;; +@@ -621,119 +621,119 @@ + (param $src i32) + (param $len i32) + block $lessThan8 loop +- get_local $len ++ local.get $len + i32.const 8 + i32.lt_u + br_if $lessThan8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=1 + i32.store8 offset=1 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=2 + i32.store8 offset=2 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=3 + i32.store8 offset=3 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=4 + i32.store8 offset=4 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=5 + i32.store8 offset=5 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=6 + i32.store8 offset=6 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=7 + i32.store8 offset=7 +- get_local $dst ++ local.get $dst + i32.const 8 + i32.add +- set_local $dst +- get_local $src ++ local.set $dst ++ local.get $src + i32.const 8 + i32.add +- set_local $src +- get_local $len ++ local.set $src ++ local.get $len + i32.const -8 + i32.add +- set_local $len ++ local.set $len + br 0 + end end $lessThan8 +- get_local $len ++ local.get $len + i32.const 4 + i32.ge_u + if +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=1 + i32.store8 offset=1 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=2 + i32.store8 offset=2 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=3 + i32.store8 offset=3 +- get_local $dst ++ local.get $dst + i32.const 4 + i32.add +- set_local $dst +- get_local $src ++ local.set $dst ++ local.get $src + i32.const 4 + i32.add +- set_local $src +- get_local $len ++ local.set $src ++ local.get $len + i32.const -4 + i32.add +- set_local $len ++ local.set $len + end +- get_local $len ++ local.get $len + i32.const 2 + i32.ge_u + if +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=1 + i32.store8 offset=1 +- get_local $dst ++ local.get $dst + i32.const 2 + i32.add +- set_local $dst +- get_local $src ++ local.set $dst ++ local.get $src + i32.const 2 + i32.add +- set_local $src +- get_local $len ++ local.set $src ++ local.get $len + i32.const -2 + i32.add +- set_local $len ++ local.set $len + end +- get_local $len ++ local.get $len + i32.eqz + if else +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 + end +diff -up uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat.wa1.0 uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat +--- uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat 2022-05-22 17:26:22.674470312 +0200 +@@ -83,133 +83,133 @@ + ;; const iCharData = buf32[CHARDATA_PTR_SLOT]; + i32.const 404 + i32.load +- set_local $iCharData ++ local.set $iCharData + ;; let iNode = pslBuffer32[RULES_PTR_SLOT]; + i32.const 400 + i32.load + i32.const 2 + i32.shl +- set_local $iNode ++ local.set $iNode + ;; let iLabel = LABEL_INDICES_SLOT; + i32.const 256 +- set_local $iLabel ++ local.set $iLabel + ;; let cursorPos = -1; + i32.const -1 +- set_local $cursorPos ++ local.set $cursorPos + ;; label-lookup loop + ;; for (;;) { + block $labelLookupDone loop $labelLookup + ;; // Extract label indices + ;; const labelBeg = buf8[iLabel+1]; + ;; const labelLen = buf8[iLabel+0] - labelBeg; +- get_local $iLabel ++ local.get $iLabel + i32.load8_u +- get_local $iLabel ++ local.get $iLabel + i32.load8_u offset=1 +- tee_local $labelBeg ++ local.tee $labelBeg + i32.sub +- set_local $labelLen ++ local.set $labelLen + ;; // Match-lookup loop: binary search + ;; let r = buf32[iNode+0] >>> 16; + ;; if ( r === 0 ) { break; } +- get_local $iNode ++ local.get $iNode + i32.load16_u offset=2 +- tee_local $r ++ local.tee $r + i32.eqz + br_if $labelLookupDone + ;; const iCandidates = buf32[iNode+2]; +- get_local $iNode ++ local.get $iNode + i32.load offset=8 + i32.const 2 + i32.shl +- set_local $iCandidates ++ local.set $iCandidates + ;; let l = 0; + ;; let iFound = 0; + i32.const 0 +- tee_local $l +- set_local $iFound ++ local.tee $l ++ local.set $iFound + ;; while ( l < r ) { + block $binarySearchDone loop $binarySearch +- get_local $l +- get_local $r ++ local.get $l ++ local.get $r + i32.ge_u + br_if $binarySearchDone + ;; const iCandidate = l + r >>> 1; +- get_local $l +- get_local $r ++ local.get $l ++ local.get $r + i32.add + i32.const 1 + i32.shr_u +- tee_local $iCandidate ++ local.tee $iCandidate + ;; const iCandidateNode = iCandidates + iCandidate + (iCandidate << 1); + i32.const 2 + i32.shl +- tee_local $_1 +- get_local $_1 ++ local.tee $_1 ++ local.get $_1 + i32.const 1 + i32.shl + i32.add +- get_local $iCandidates ++ local.get $iCandidates + i32.add +- tee_local $iCandidateNode ++ local.tee $iCandidateNode + ;; const candidateLen = buf32[iCandidateNode+0] & 0x000000FF; + i32.load8_u +- set_local $candidateLen ++ local.set $candidateLen + ;; let d = labelLen - candidateLen; +- get_local $labelLen +- get_local $candidateLen ++ local.get $labelLen ++ local.get $candidateLen + i32.sub +- tee_local $d ++ local.tee $d + ;; if ( d === 0 ) { + i32.eqz + if + ;; const iCandidateChar = candidateLen <= 4 +- get_local $candidateLen ++ local.get $candidateLen + i32.const 4 + i32.le_u + if + ;; ? iCandidateNode + 1 << 2 +- get_local $iCandidateNode ++ local.get $iCandidateNode + i32.const 4 + i32.add +- set_local $iCandidateChar ++ local.set $iCandidateChar + else + ;; : buf32[CHARDATA_PTR_SLOT] + buf32[iCandidateNode+1]; +- get_local $iCharData +- get_local $iCandidateNode ++ local.get $iCharData ++ local.get $iCandidateNode + i32.load offset=4 + i32.add +- set_local $iCandidateChar ++ local.set $iCandidateChar + end + ;; for ( let i = 0; i < labelLen; i++ ) { +- get_local $labelBeg +- tee_local $_1 +- get_local $labelLen ++ local.get $labelBeg ++ local.tee $_1 ++ local.get $labelLen + i32.add +- set_local $_3 +- get_local $iCandidateChar +- set_local $_2 ++ local.set $_3 ++ local.get $iCandidateChar ++ local.set $_2 + block $findDiffDone loop $findDiff + ;; d = buf8[labelBeg+i] - buf8[iCandidateChar+i]; + ;; if ( d !== 0 ) { break; } +- get_local $_1 ++ local.get $_1 + i32.load8_u +- get_local $_2 ++ local.get $_2 + i32.load8_u + i32.sub +- tee_local $d ++ local.tee $d + br_if $findDiffDone +- get_local $_1 ++ local.get $_1 + i32.const 1 + i32.add +- tee_local $_1 +- get_local $_3 ++ local.tee $_1 ++ local.get $_3 + i32.eq + br_if $findDiffDone +- get_local $_2 ++ local.get $_2 + i32.const 1 + i32.add +- set_local $_2 ++ local.set $_2 + br $findDiff + ;; } + end end +@@ -217,32 +217,32 @@ + end + ;; if ( d < 0 ) { + ;; r = iCandidate; +- get_local $d ++ local.get $d + i32.const 0 + i32.lt_s + if +- get_local $iCandidate +- set_local $r ++ local.get $iCandidate ++ local.set $r + br $binarySearch + end + ;; } else if ( d > 0 ) { + ;; l = iCandidate + 1; +- get_local $d ++ local.get $d + i32.const 0 + i32.gt_s + if +- get_local $iCandidate ++ local.get $iCandidate + i32.const 1 + i32.add +- set_local $l ++ local.set $l + br $binarySearch + end + ;; } else /* if ( d === 0 ) */ { + ;; iFound = iCandidateNode; + ;; break; + ;; } +- get_local $iCandidateNode +- set_local $iFound ++ local.get $iCandidateNode ++ local.set $iFound + end end + ;; } + ;; // 2. If no rules match, the prevailing rule is "*". +@@ -251,10 +251,10 @@ + ;; buf8[SUFFIX_NOT_FOUND_SLOT] = 1; + ;; iFound = iCandidates; + ;; } +- get_local $iFound ++ local.get $iFound + i32.eqz + if +- get_local $iCandidates ++ local.get $iCandidates + i32.load offset=4 + i32.const 0x2A + i32.ne +@@ -262,12 +262,12 @@ + i32.const 399 + i32.const 1 + i32.store8 +- get_local $iCandidates +- set_local $iFound ++ local.get $iCandidates ++ local.set $iFound + end + ;; iNode = iFound; +- get_local $iFound +- tee_local $iNode ++ local.get $iFound ++ local.tee $iNode + ;; // 5. If the prevailing rule is a exception rule, modify it by + ;; // removing the leftmost label. + ;; if ( (buf32[iNode+0] & 0x00000200) !== 0 ) { +@@ -277,15 +277,15 @@ + ;; break; + ;; } + i32.load8_u offset=1 +- tee_local $_1 ++ local.tee $_1 + i32.const 0x02 + i32.and + if +- get_local $iLabel ++ local.get $iLabel + i32.const 256 + i32.gt_u + if +- get_local $iLabel ++ local.get $iLabel + i32.const -2 + i32.add + return +@@ -295,25 +295,25 @@ + ;; if ( (buf32[iNode+0] & 0x00000100) !== 0 ) { + ;; cursorPos = labelBeg; + ;; } +- get_local $_1 ++ local.get $_1 + i32.const 0x01 + i32.and + if +- get_local $iLabel +- set_local $cursorPos ++ local.get $iLabel ++ local.set $cursorPos + end + ;; if ( labelBeg === 0 ) { break; } +- get_local $labelBeg ++ local.get $labelBeg + i32.eqz + br_if $labelLookupDone + ;; iLabel += 2; +- get_local $iLabel ++ local.get $iLabel + i32.const 2 + i32.add +- set_local $iLabel ++ local.set $iLabel + br $labelLookup + end end +- get_local $cursorPos ++ local.get $cursorPos + ) + + ;; diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index a9d85a7..bd6da11 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -23,6 +23,8 @@ Source2: uAssets-%{uAssets_commit}.tar.gz # generate a free one with the mktarball.sh script below Source10: uAssets-mktarball.sh Patch0: %{name}-nonfree.patch +# use WebAssembly 1.0 function names (see https://github.com/WebAssembly/wabt/issues/1820) +Patch1: %{name}-wa1.0.patch Requires: mozilla-filesystem BuildArch: noarch @@ -67,6 +69,7 @@ from hosts files. %setup -q -n uBlock-%{version} tar -xz -C submodules/uAssets --strip-components=1 -f %{SOURCE2} %patch0 -p1 +%patch1 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt @@ -104,6 +107,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain * Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 - update to 1.42.4 (#2070185) - new bundled library: hsluv +- fix build with wabt 1.0.25+ * Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 - update to 1.41.8 (#2055291) From a82bb371453b18b21ae7619220a4b37eafdabfd6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 22 May 2022 17:27:31 +0200 Subject: [PATCH 45/84] fix build with wabt-1.0.25+ --- mozilla-ublock-origin-wa1.0.patch | 2525 +++++++++++++++++++++++++++++ mozilla-ublock-origin.spec | 4 + 2 files changed, 2529 insertions(+) create mode 100644 mozilla-ublock-origin-wa1.0.patch diff --git a/mozilla-ublock-origin-wa1.0.patch b/mozilla-ublock-origin-wa1.0.patch new file mode 100644 index 0000000..19b7f30 --- /dev/null +++ b/mozilla-ublock-origin-wa1.0.patch @@ -0,0 +1,2525 @@ +diff -up uBlock-1.42.4/src/js/wasm/biditrie.wat.wa1.0 uBlock-1.42.4/src/js/wasm/biditrie.wat +--- uBlock-1.42.4/src/js/wasm/biditrie.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/js/wasm/biditrie.wat 2022-05-22 17:25:47.974606558 +0200 +@@ -64,92 +64,92 @@ + (local $x i32) + (local $y i32) + ;; trie index is a uint32 offset, need to convert to uint8 offset +- get_local $icell ++ local.get $icell + i32.const 2 + i32.shl +- set_local $icell ++ local.set $icell + ;; const buf32 = this.buf32; + ;; const buf8 = this.buf8; + ;; const char0 = buf32[CHAR0_SLOT]; + i32.const 2060 + i32.load align=4 +- set_local $char0 ++ local.set $char0 + ;; const aR = buf32[HAYSTACK_SIZE_SLOT]; + i32.const 2048 + i32.load align=4 +- set_local $aR ++ local.set $aR + ;; let al = ai; +- get_local $ai +- set_local $al ++ local.get $ai ++ local.set $al + block $matchFound + block $matchNotFound + ;; for (;;) { + loop $mainLoop + ;; x = buf8[al]; +- get_local $al ++ local.get $al + i32.load8_u +- set_local $x ++ local.set $x + ;; al += 1; +- get_local $al ++ local.get $al + i32.const 1 + i32.add +- set_local $al ++ local.set $al + ;; // find matching segment + ;; for (;;) { + block $nextSegment loop $findSegment + ;; y = buf32[icell+SEGMENT_INFO]; +- get_local $icell ++ local.get $icell + i32.load offset=8 align=4 +- tee_local $y ++ local.tee $y + ;; bl = char0 + (y & 0x00FFFFFF); + i32.const 0x00FFFFFF + i32.and +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $bl ++ local.tee $bl + ;; if ( buf8[bl] === x ) { + i32.load8_u +- get_local $x ++ local.get $x + i32.eq + if + ;; y = (y >>> 24) - 1; +- get_local $y ++ local.get $y + i32.const 24 + i32.shr_u + i32.const 1 + i32.sub +- tee_local $y ++ local.tee $y + ;; if ( n !== 0 ) { + if + ;; x = al + y; +- get_local $y +- get_local $al ++ local.get $y ++ local.get $al + i32.add +- tee_local $x ++ local.tee $x + ;; if ( x > aR ) { return 0; } +- get_local $aR ++ local.get $aR + i32.gt_u + br_if $matchNotFound + ;; for (;;) { + loop + ;; bl += 1; +- get_local $bl ++ local.get $bl + i32.const 1 + i32.add +- tee_local $bl ++ local.tee $bl + ;; if ( buf8[bl] !== buf8[al] ) { return 0; } + i32.load8_u +- get_local $al ++ local.get $al + i32.load8_u + i32.ne + br_if $matchNotFound + ;; al += 1; +- get_local $al ++ local.get $al + i32.const 1 + i32.add +- tee_local $al ++ local.tee $al + ;; if ( al === x ) { break; } +- get_local $x ++ local.get $x + i32.ne + br_if 0 + end +@@ -158,11 +158,11 @@ + br $nextSegment + end + ;; icell = buf32[icell+CELL_OR]; +- get_local $icell ++ local.get $icell + i32.load offset=4 align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound +@@ -171,14 +171,14 @@ + end end + ;; // next segment + ;; icell = buf32[icell+CELL_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; const x = buf32[icell+BCELL_EXTRA]; + i32.load offset=8 align=4 +- tee_local $x ++ local.tee $x + ;; if ( x <= BCELL_EXTRA_MAX ) { + i32.const 0x00FFFFFF + i32.le_u +@@ -186,43 +186,43 @@ + ;; if ( x !== 0 && this.matchesExtra(ai, al, x) !== 0 ) { + ;; return 1; + ;; } +- get_local $x ++ local.get $x + if +- get_local $ai +- get_local $al +- get_local $x ++ local.get $ai ++ local.get $al ++ local.get $x + call $matchesExtra + br_if $matchFound + end + ;; x = buf32[icell+BCELL_ALT_AND]; +- get_local $icell ++ local.get $icell + i32.load offset=4 align=4 + i32.const 2 + i32.shl +- tee_local $x ++ local.tee $x + ;; if ( x !== 0 && this.matchesLeft(x, ai, al) !== 0 ) { + if +- get_local $x +- get_local $ai +- get_local $al ++ local.get $x ++ local.get $ai ++ local.get $al + call $matchesLeft + br_if $matchFound + ;; } + end + ;; icell = buf32[icell+BCELL_NEXT_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound + ;; } + end + ;; if ( al === aR ) { return 0; } +- get_local $al +- get_local $aR ++ local.get $al ++ local.get $aR + i32.ne + br_if $mainLoop + ;; } +@@ -255,60 +255,60 @@ + ;; const char0 = buf32[CHAR0_SLOT]; + i32.const 2060 + i32.load align=4 +- set_local $char0 ++ local.set $char0 + block $matchFound + block $matchNotFound + ;; for (;;) { + loop $mainLoop + ;; if ( ar === 0 ) { return 0; } +- get_local $ar ++ local.get $ar + i32.eqz + br_if $matchNotFound + ;; ar -= 1; +- get_local $ar ++ local.get $ar + i32.const 1 + i32.sub +- tee_local $ar ++ local.tee $ar + ;; x = buf8[ar]; + i32.load8_u +- set_local $x ++ local.set $x + ;; // find matching segment + ;; for (;;) { + block $nextSegment loop $findSegment + ;; y = buf32[icell+SEGMENT_INFO]; +- get_local $icell ++ local.get $icell + i32.load offset=8 align=4 +- tee_local $y ++ local.tee $y + ;; br = char0 + (y & 0x00FFFFFF); + i32.const 0x00FFFFFF + i32.and +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $br ++ local.tee $br + ;; y = (y >>> 24) - 1; +- get_local $y ++ local.get $y + i32.const 24 + i32.shr_u + i32.const 1 + i32.sub +- tee_local $y ++ local.tee $y + ;; br += y; + i32.add +- tee_local $br ++ local.tee $br + ;; if ( buf8[br] === x ) { + i32.load8_u +- get_local $x ++ local.get $x + i32.eq + if + ;; // all characters in segment must match + ;; if ( y !== 0 ) { +- get_local $y ++ local.get $y + if + ;; x = ar - y; +- get_local $ar +- get_local $y ++ local.get $ar ++ local.get $y + i32.sub +- tee_local $x ++ local.tee $x + ;; if ( x < 0 ) { return 0; } + i32.const 0 + i32.lt_s +@@ -317,21 +317,21 @@ + loop + ;; ar -= 1; br -= 1; + ;; if ( buf8[ar] !== buf8[br] ) { return 0; } +- get_local $ar ++ local.get $ar + i32.const 1 + i32.sub +- tee_local $ar ++ local.tee $ar + i32.load8_u +- get_local $br ++ local.get $br + i32.const 1 + i32.sub +- tee_local $br ++ local.tee $br + i32.load8_u + i32.ne + br_if $matchNotFound + ;; if ( ar === x ) { break; } +- get_local $ar +- get_local $x ++ local.get $ar ++ local.get $x + i32.ne + br_if 0 + end +@@ -340,11 +340,11 @@ + br $nextSegment + end + ;; icell = buf32[icell+CELL_OR]; +- get_local $icell ++ local.get $icell + i32.load offset=4 align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound +@@ -353,14 +353,14 @@ + end end + ;; // next segment + ;; icell = buf32[icell+CELL_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; const x = buf32[icell+BCELL_EXTRA]; + i32.load offset=8 align=4 +- tee_local $x ++ local.tee $x + ;; if ( x <= BCELL_EXTRA_MAX ) { + i32.const 0x00FFFFFF + i32.le_u +@@ -368,20 +368,20 @@ + ;; if ( x !== 0 && this.matchesExtra(ar, r, x) !== 0 ) { + ;; return 1; + ;; } +- get_local $x ++ local.get $x + if +- get_local $ar +- get_local $r +- get_local $x ++ local.get $ar ++ local.get $r ++ local.get $x + call $matchesExtra + br_if $matchFound + end + ;; icell = buf32[icell+BCELL_NEXT_AND]; +- get_local $icell ++ local.get $icell + i32.load align=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return 0; } + i32.eqz + br_if $matchNotFound +@@ -414,35 +414,35 @@ + ;; if ( ix !== 1 ) { + ;; const iu = this.extraHandler(l, r, ix); + ;; if ( iu === 0 ) { return 0; } +- get_local $ix ++ local.get $ix + i32.const 1 + i32.ne + if +- get_local $l +- get_local $r +- get_local $ix ++ local.get $l ++ local.get $r ++ local.get $ix + call $extraHandler +- tee_local $iu ++ local.tee $iu + i32.eqz + br_if $fail + ;; } else { + ;; iu = -1; + else + i32.const -1 +- set_local $iu ++ local.set $iu + ;; } + end + ;; this.buf32[RESULT_IU_SLOT] = iu; + i32.const 2076 +- get_local $iu ++ local.get $iu + i32.store align=4 + ;; this.buf32[RESULT_L_SLOT] = l; + i32.const 2068 +- get_local $l ++ local.get $l + i32.store align=4 + ;; this.buf32[RESULT_R_SLOT] = r; + i32.const 2072 +- get_local $r ++ local.get $r + i32.store align=4 + end ;; $succeed + i32.const 1 +@@ -470,49 +470,49 @@ + ;; if ( haystackLeft < 0 || (haystackLeft + needleLen) > haystackRight ) { + ;; return 0; + ;; } +- get_local $haystackLeft ++ local.get $haystackLeft + i32.const 0 + i32.lt_s + br_if $fail +- get_local $haystackLeft +- get_local $needleLen ++ local.get $haystackLeft ++ local.get $needleLen + i32.add +- get_local $haystackRight ++ local.get $haystackRight + i32.gt_u + br_if $fail + ;; const charCodes = this.buf8; + ;; needleLeft += this.buf32[CHAR0_SLOT]; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 2060 ;; CHAR0_SLOT memory address + i32.load align=4 ;; CHAR0 memory address + i32.add ;; needle memory address +- tee_local $needleLeft ++ local.tee $needleLeft + ;; const needleRight = needleLeft + needleLen; +- get_local $needleLen ++ local.get $needleLen + i32.add +- set_local $needleRight ++ local.set $needleRight + ;; while ( charCodes[haystackLeft] === charCodes[needleLeft] ) { + loop $compare +- get_local $haystackLeft ++ local.get $haystackLeft + i32.load8_u +- get_local $needleLeft ++ local.get $needleLeft + i32.load8_u + i32.ne + br_if $fail + ;; needleLeft += 1; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 1 + i32.add +- tee_local $needleLeft ++ local.tee $needleLeft + ;; if ( needleLeft === needleRight ) { return 1; } +- get_local $needleRight ++ local.get $needleRight + i32.eq + br_if $succeed + ;; haystackLeft += 1; + i32.const 1 +- get_local $haystackLeft ++ local.get $haystackLeft + i32.add +- set_local $haystackLeft ++ local.set $haystackLeft + br $compare + end + ;; } +@@ -545,76 +545,76 @@ + block $fail + block $succeed + ;; if ( needleLen === 0 ) { return haystackLeft; } +- get_local $needleLen ++ local.get $needleLen + i32.eqz + br_if $succeed + ;; haystackEnd -= needleLen; +- get_local $haystackEnd +- get_local $needleLen ++ local.get $haystackEnd ++ local.get $needleLen + i32.sub +- tee_local $haystackEnd ++ local.tee $haystackEnd + ;; if ( haystackEnd < haystackLeft ) { return -1; } +- get_local $haystackLeft ++ local.get $haystackLeft + i32.lt_s + br_if $fail + ;; needleLeft += this.buf32[CHAR0_SLOT]; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 2060 ;; CHAR0_SLOT memory address + i32.load align=4 ;; CHAR0 memory address + i32.add ;; needle memory address +- tee_local $needleLeft ++ local.tee $needleLeft + ;; const needleRight = needleLeft + needleLen; +- get_local $needleLen ++ local.get $needleLen + i32.add +- set_local $needleRight ++ local.set $needleRight + ;; const charCodes = this.buf8; + ;; for (;;) { + loop $mainLoop + ;; let i = haystackLeft; + ;; let j = needleLeft; +- get_local $haystackLeft +- set_local $i +- get_local $needleLeft +- set_local $j ++ local.get $haystackLeft ++ local.set $i ++ local.get $needleLeft ++ local.set $j + ;; while ( charCodes[i] === charCodes[j] ) { + block $breakMatchChars loop $matchChars +- get_local $i ++ local.get $i + i32.load8_u +- get_local $j ++ local.get $j + i32.load8_u + i32.ne + br_if $breakMatchChars + ;; j += 1; +- get_local $j ++ local.get $j + i32.const 1 + i32.add +- tee_local $j ++ local.tee $j + ;; if ( j === needleRight ) { return haystackLeft; } +- get_local $needleRight ++ local.get $needleRight + i32.eq + br_if $succeed + ;; i += 1; +- get_local $i ++ local.get $i + i32.const 1 + i32.add +- set_local $i ++ local.set $i + br $matchChars + ;; } + end end + ;; haystackLeft += 1; +- get_local $haystackLeft ++ local.get $haystackLeft + i32.const 1 + i32.add +- tee_local $haystackLeft ++ local.tee $haystackLeft + ;; if ( haystackLeft > haystackEnd ) { break; } +- get_local $haystackEnd ++ local.get $haystackEnd + i32.gt_u + br_if $fail + br $mainLoop + ;; } + end + end ;; $succeed +- get_local $haystackLeft ++ local.get $haystackLeft + return + end ;; $fail + ;; return -1; +@@ -640,82 +640,82 @@ + (local $j i32) + (local $c0 i32) + ;; if ( needleLen === 0 ) { return haystackBeg; } +- get_local $needleLen ++ local.get $needleLen + i32.eqz + if +- get_local $haystackBeg ++ local.get $haystackBeg + return + end + block $fail + block $succeed + ;; let haystackLeft = haystackEnd - needleLen; +- get_local $haystackEnd +- get_local $needleLen ++ local.get $haystackEnd ++ local.get $needleLen + i32.sub +- tee_local $haystackLeft ++ local.tee $haystackLeft + ;; if ( haystackLeft < haystackBeg ) { return -1; } +- get_local $haystackBeg ++ local.get $haystackBeg + i32.lt_s + br_if $fail + ;; needleLeft += this.buf32[CHAR0_SLOT]; +- get_local $needleLeft ++ local.get $needleLeft + i32.const 2060 ;; CHAR0_SLOT memory address + i32.load align=4 ;; CHAR0 memory address + i32.add ;; needle memory address +- tee_local $needleLeft ++ local.tee $needleLeft + ;; const needleRight = needleLeft + needleLen; +- get_local $needleLen ++ local.get $needleLen + i32.add +- set_local $needleRight ++ local.set $needleRight + ;; const charCodes = this.buf8; + ;; for (;;) { + loop $mainLoop + ;; let i = haystackLeft; + ;; let j = needleLeft; +- get_local $haystackLeft +- set_local $i +- get_local $needleLeft +- set_local $j ++ local.get $haystackLeft ++ local.set $i ++ local.get $needleLeft ++ local.set $j + ;; while ( charCodes[i] === charCodes[j] ) { + block $breakMatchChars loop $matchChars +- get_local $i ++ local.get $i + i32.load8_u +- get_local $j ++ local.get $j + i32.load8_u + i32.ne + br_if $breakMatchChars + ;; j += 1; +- get_local $j ++ local.get $j + i32.const 1 + i32.add +- tee_local $j ++ local.tee $j + ;; if ( j === needleRight ) { return haystackLeft; } +- get_local $needleRight ++ local.get $needleRight + i32.eq + br_if $succeed + ;; i += 1; +- get_local $i ++ local.get $i + i32.const 1 + i32.add +- set_local $i ++ local.set $i + br $matchChars + ;; } + end end + ;; if ( haystackLeft === haystackBeg ) { break; } + ;; haystackLeft -= 1; +- get_local $haystackLeft +- get_local $haystackBeg ++ local.get $haystackLeft ++ local.get $haystackBeg + i32.eq + br_if $fail +- get_local $haystackLeft ++ local.get $haystackLeft + i32.const 1 + i32.sub +- set_local $haystackLeft ++ local.set $haystackLeft + br $mainLoop + ;; } + end + end ;; $succeed +- get_local $haystackLeft ++ local.get $haystackLeft + return + end ;; $fail + ;; return -1; +diff -up uBlock-1.42.4/src/js/wasm/hntrie.wat.wa1.0 uBlock-1.42.4/src/js/wasm/hntrie.wat +--- uBlock-1.42.4/src/js/wasm/hntrie.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/js/wasm/hntrie.wat 2022-05-22 17:25:47.975606555 +0200 +@@ -64,19 +64,19 @@ + ;; + i32.const 264 ;; start of char section is stored at addr 264 + i32.load +- set_local $char0 ++ local.set $char0 + ;; let ineedle = this.buf[255]; + i32.const 255 ;; addr of needle is stored at addr 255 + i32.load8_u +- set_local $ineedle ++ local.set $ineedle + ;; let icell = this.buf32[iroot+0]; +- get_local $iroot ++ local.get $iroot + i32.const 2 + i32.shl + i32.load + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { return -1; } + i32.eqz + if +@@ -86,43 +86,43 @@ + ;; for (;;) { + block $noSegment loop $nextSegment + ;; if ( ineedle === 0 ) { return -1; } +- get_local $ineedle ++ local.get $ineedle + i32.eqz + if + i32.const -1 + return + end + ;; ineedle -= 1; +- get_local $ineedle ++ local.get $ineedle + i32.const -1 + i32.add +- tee_local $ineedle ++ local.tee $ineedle + ;; let c = this.buf[ineedle]; + i32.load8_u +- set_local $c ++ local.set $c + ;; for (;;) { + block $foundSegment loop $findSegment + ;; v = this.buf32[icell+2]; +- get_local $icell ++ local.get $icell + i32.load offset=8 +- tee_local $v ++ local.tee $v + ;; i0 = char0 + (v >>> 8); + i32.const 8 + i32.shr_u +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $i0 ++ local.tee $i0 + ;; if ( this.buf[i0] === c ) { break; } + i32.load8_u +- get_local $c ++ local.get $c + i32.eq + br_if $foundSegment + ;; icell = this.buf32[icell+0]; +- get_local $icell ++ local.get $icell + i32.load + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + i32.eqz + if + i32.const -1 +@@ -131,44 +131,44 @@ + br 0 + end end + ;; let n = v & 0x7F; +- get_local $v ++ local.get $v + i32.const 0x7F + i32.and +- tee_local $n ++ local.tee $n + ;; if ( n > 1 ) { + i32.const 1 + i32.gt_u + if + ;; n -= 1; +- get_local $n ++ local.get $n + i32.const -1 + i32.add +- tee_local $n ++ local.tee $n + ;; if ( n > ineedle ) { return -1; } +- get_local $ineedle ++ local.get $ineedle + i32.gt_u + if + i32.const -1 + return + end +- get_local $i0 ++ local.get $i0 + i32.const 1 + i32.add +- tee_local $i0 ++ local.tee $i0 + ;; const i1 = i0 + n; +- get_local $n ++ local.get $n + i32.add +- set_local $i1 ++ local.set $i1 + ;; do { + loop + ;; ineedle -= 1; +- get_local $ineedle ++ local.get $ineedle + i32.const -1 + i32.add +- tee_local $ineedle ++ local.tee $ineedle + ;; if ( this.buf[i0] !== this.buf[ineedle] ) { return -1; } + i32.load8_u +- get_local $i0 ++ local.get $i0 + i32.load8_u + i32.ne + if +@@ -176,47 +176,47 @@ + return + end + ;; i0 += 1; +- get_local $i0 ++ local.get $i0 + i32.const 1 + i32.add +- tee_local $i0 ++ local.tee $i0 + ;; } while ( i0 < i1 ); +- get_local $i1 ++ local.get $i1 + i32.lt_u + br_if 0 + end + end + ;; if ( (v & 0x80) !== 0 ) { +- get_local $v ++ local.get $v + i32.const 0x80 + i32.and + if + ;; if ( ineedle === 0 || buf8[ineedle-1] === 0x2E /* '.' */ ) { + ;; return ineedle; + ;; } +- get_local $ineedle ++ local.get $ineedle + i32.eqz + if + i32.const 0 + return + end +- get_local $ineedle ++ local.get $ineedle + i32.const -1 + i32.add + i32.load8_u + i32.const 0x2E + i32.eq + if +- get_local $ineedle ++ local.get $ineedle + return + end + end + ;; icell = this.buf32[icell+1]; +- get_local $icell ++ local.get $icell + i32.load offset=4 + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( icell === 0 ) { break; } + br_if 0 + end end +@@ -245,7 +245,7 @@ + ;; let lhnchar = this.buf[255]; + i32.const 255 + i32.load8_u +- tee_local $lhnchar ++ local.tee $lhnchar + ;; if ( lhnchar === 0 ) { return 0; } + i32.eqz + if +@@ -281,21 +281,21 @@ + end + end + ;; let icell = this.buf32[iroot+0]; +- get_local $iroot ++ local.get $iroot + i32.const 2 + i32.shl +- tee_local $iroot ++ local.tee $iroot + i32.load + i32.const 2 + i32.shl +- tee_local $icell ++ local.tee $icell + ;; if ( this.buf32[icell+2] === 0 ) { + i32.eqz + if + ;; this.buf32[iroot+0] = this.addLeafCell(lhnchar); + ;; return 1; +- get_local $iroot +- get_local $lhnchar ++ local.get $iroot ++ local.get $lhnchar + call $addLeafCell + i32.store + i32.const 1 +@@ -304,37 +304,37 @@ + ;; const char0 = this.buf32[HNBIGTRIE_CHAR0_SLOT]; + i32.const 264 + i32.load +- set_local $char0 ++ local.set $char0 + ;; for (;;) { + loop $nextSegment + ;; const v = this.buf32[icell+2]; +- get_local $icell ++ local.get $icell + i32.load offset=8 +- tee_local $v ++ local.tee $v + ;; let isegchar0 = char0 + (v >>> 8); + i32.const 8 + i32.shr_u +- get_local $char0 ++ local.get $char0 + i32.add +- tee_local $isegchar0 ++ local.tee $isegchar0 + ;; if ( this.buf[isegchar0] !== this.buf[lhnchar-1] ) { + i32.load8_u +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add + i32.load8_u + i32.ne + if + ;; inext = this.buf32[icell+0]; +- get_local $icell ++ local.get $icell + i32.load +- tee_local $inext ++ local.tee $inext + ;; if ( inext === 0 ) { + i32.eqz + if + ;; this.buf32[icell+0] = this.addLeafCell(lhnchar); +- get_local $icell +- get_local $lhnchar ++ local.get $icell ++ local.get $lhnchar + call $addLeafCell + i32.store + ;; return 1; +@@ -342,25 +342,25 @@ + return + end + ;; icell = inext; +- get_local $inext ++ local.get $inext + i32.const 2 + i32.shl +- set_local $icell ++ local.set $icell + br $nextSegment + end + ;; let isegchar = 1; + i32.const 1 +- set_local $isegchar ++ local.set $isegchar + ;; lhnchar -= 1; +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add +- set_local $lhnchar ++ local.set $lhnchar + ;; const lsegchar = v & 0x7F; +- get_local $v ++ local.get $v + i32.const 0x7F + i32.and +- tee_local $lsegchar ++ local.tee $lsegchar + ;; if ( lsegchar !== 1 ) { + i32.const 1 + i32.ne +@@ -368,69 +368,69 @@ + ;; for (;;) { + block $mismatch loop + ;; if ( isegchar === lsegchar ) { break; } +- get_local $isegchar +- get_local $lsegchar ++ local.get $isegchar ++ local.get $lsegchar + i32.eq + br_if $mismatch +- get_local $lhnchar ++ local.get $lhnchar + i32.eqz + br_if $mismatch + ;; if ( this.buf[isegchar0+isegchar] !== this.buf[lhnchar-1] ) { break; } +- get_local $isegchar0 +- get_local $isegchar ++ local.get $isegchar0 ++ local.get $isegchar + i32.add + i32.load8_u +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add + i32.load8_u + i32.ne + br_if $mismatch + ;; isegchar += 1; +- get_local $isegchar ++ local.get $isegchar + i32.const 1 + i32.add +- set_local $isegchar ++ local.set $isegchar + ;; lhnchar -= 1; +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add +- set_local $lhnchar ++ local.set $lhnchar + br 0 + end end + end + ;; const boundaryBit = v & 0x80; +- get_local $v ++ local.get $v + i32.const 0x80 + i32.and +- set_local $boundaryBit ++ local.set $boundaryBit + ;; if ( isegchar === lsegchar ) { +- get_local $isegchar +- get_local $lsegchar ++ local.get $isegchar ++ local.get $lsegchar + i32.eq + if + ;; if ( lhnchar === 0 ) { +- get_local $lhnchar ++ local.get $lhnchar + i32.eqz + if + ;; if ( boundaryBit !== 0 ) { return 0; } +- get_local $boundaryBit ++ local.get $boundaryBit + if + i32.const 0 + return + end + ;; this.buf32[icell+2] = v | 0x80; +- get_local $icell +- get_local $v ++ local.get $icell ++ local.get $v + i32.const 0x80 + i32.or + i32.store offset=8 + else + ;; if ( boundaryBit !== 0 ) { +- get_local $boundaryBit ++ local.get $boundaryBit + if + ;; if ( this.buf[lhnchar-1] === 0x2E /* '.' */ ) { return -1; } +- get_local $lhnchar ++ local.get $lhnchar + i32.const -1 + i32.add + i32.load8_u +@@ -442,36 +442,36 @@ + end + end + ;; inext = this.buf32[icell+1]; +- get_local $icell ++ local.get $icell + i32.load offset=4 +- tee_local $inext ++ local.tee $inext + ;; if ( inext !== 0 ) { + if + ;; icell = inext; +- get_local $inext ++ local.get $inext + i32.const 2 + i32.shl +- set_local $icell ++ local.set $icell + ;; continue; + br $nextSegment + end + ;; this.buf32[icell+1] = this.addLeafCell(lhnchar); +- get_local $icell +- get_local $lhnchar ++ local.get $icell ++ local.get $lhnchar + call $addLeafCell + i32.store offset=4 + end + else + ;; isegchar0 -= char0; +- get_local $icell +- get_local $isegchar0 +- get_local $char0 ++ local.get $icell ++ local.get $isegchar0 ++ local.get $char0 + i32.sub +- tee_local $isegchar0 ++ local.tee $isegchar0 + ;; this.buf32[icell+2] = isegchar0 << 8 | isegchar; + i32.const 8 + i32.shl +- get_local $isegchar ++ local.get $isegchar + i32.or + i32.store offset=8 + ;; inext = this.addCell( +@@ -479,39 +479,39 @@ + ;; this.buf32[icell+1], + ;; isegchar0 + isegchar << 8 | boundaryBit | lsegchar - isegchar + ;; ); +- get_local $icell ++ local.get $icell + i32.const 0 +- get_local $icell ++ local.get $icell + i32.load offset=4 +- get_local $isegchar0 +- get_local $isegchar ++ local.get $isegchar0 ++ local.get $isegchar + i32.add + i32.const 8 + i32.shl +- get_local $boundaryBit ++ local.get $boundaryBit + i32.or +- get_local $lsegchar +- get_local $isegchar ++ local.get $lsegchar ++ local.get $isegchar + i32.sub + i32.or + call $addCell +- tee_local $inext ++ local.tee $inext + ;; this.buf32[icell+1] = inext; + i32.store offset=4 + ;; if ( lhnchar !== 0 ) { +- get_local $lhnchar ++ local.get $lhnchar + if + ;; this.buf32[inext+0] = this.addLeafCell(lhnchar); +- get_local $inext ++ local.get $inext + i32.const 2 + i32.shl +- get_local $lhnchar ++ local.get $lhnchar + call $addLeafCell + i32.store + else + ;; this.buf32[icell+2] |= 0x80; +- get_local $icell +- get_local $icell ++ local.get $icell ++ local.get $icell + i32.load offset=8 + i32.const 0x80 + i32.or +@@ -547,24 +547,24 @@ + i32.const 260 + i32.const 260 + i32.load +- tee_local $icell ++ local.tee $icell + i32.const 12 + i32.add + i32.store + ;; this.buf32[icell+0] = idown; +- get_local $icell +- get_local $idown ++ local.get $icell ++ local.get $idown + i32.store + ;; this.buf32[icell+1] = iright; +- get_local $icell +- get_local $iright ++ local.get $icell ++ local.get $iright + i32.store offset=4 + ;; this.buf32[icell+2] = v; +- get_local $icell +- get_local $v ++ local.get $icell ++ local.get $v + i32.store offset=8 + ;; return icell; +- get_local $icell ++ local.get $icell + i32.const 2 + i32.shr_u + ) +@@ -582,58 +582,58 @@ + ;; const r = this.buf32[TRIE1_SLOT] >>> 2; + i32.const 260 + i32.load +- tee_local $r ++ local.tee $r + ;; let i = r; +- set_local $i ++ local.set $i + ;; while ( lsegchar > 127 ) { + block $lastSegment loop +- get_local $lsegchar ++ local.get $lsegchar + i32.const 127 + i32.le_u + br_if $lastSegment + ;; this.buf32[i+0] = 0; +- get_local $i ++ local.get $i + i32.const 0 + i32.store + ;; this.buf32[i+1] = i + 3; +- get_local $i +- get_local $i ++ local.get $i ++ local.get $i + i32.const 12 + i32.add + i32.const 2 + i32.shr_u + i32.store offset=4 + ;; this.buf32[i+2] = this.addSegment(lsegchar, lsegchar - 127); +- get_local $i +- get_local $lsegchar +- get_local $lsegchar ++ local.get $i ++ local.get $lsegchar ++ local.get $lsegchar + i32.const 127 + i32.sub + call $addSegment + i32.store offset=8 + ;; lsegchar -= 127; +- get_local $lsegchar ++ local.get $lsegchar + i32.const 127 + i32.sub +- set_local $lsegchar ++ local.set $lsegchar + ;; i += 3; +- get_local $i ++ local.get $i + i32.const 12 + i32.add +- set_local $i ++ local.set $i + br 0 + end end + ;; this.buf32[i+0] = 0; +- get_local $i ++ local.get $i + i32.const 0 + i32.store + ;; this.buf32[i+1] = 0; +- get_local $i ++ local.get $i + i32.const 0 + i32.store offset=4 + ;; this.buf32[i+2] = this.addSegment(lsegchar, 0) | 0x80; +- get_local $i +- get_local $lsegchar ++ local.get $i ++ local.get $lsegchar + i32.const 0 + call $addSegment + i32.const 0x80 +@@ -641,12 +641,12 @@ + i32.store offset=8 + ;; this.buf32[TRIE1_SLOT] = i + 3 << 2; + i32.const 260 +- get_local $i ++ local.get $i + i32.const 12 + i32.add + i32.store + ;; return r; +- get_local $r ++ local.get $r + i32.const 2 + i32.shr_u + ) +@@ -666,7 +666,7 @@ + (local $i i32) ;; iterator + ;; + ;; if ( lsegchar === 0 ) { return 0; } +- get_local $lsegchar ++ local.get $lsegchar + i32.eqz + if + i32.const 0 +@@ -675,45 +675,45 @@ + ;; let char1 = this.buf32[HNBIGTRIE_CHAR1_SLOT]; + i32.const 268 + i32.load +- tee_local $char1 ++ local.tee $char1 + ;; const isegchar = char1 - this.buf32[HNBIGTRIE_CHAR0_SLOT]; + i32.const 264 + i32.load + i32.sub +- set_local $isegchar ++ local.set $isegchar + ;; let i = lsegchar; +- get_local $lsegchar +- set_local $i ++ local.get $lsegchar ++ local.set $i + ;; do { + loop + ;; this.buf[char1++] = this.buf[--i]; +- get_local $char1 +- get_local $i ++ local.get $char1 ++ local.get $i + i32.const -1 + i32.add +- tee_local $i ++ local.tee $i + i32.load8_u + i32.store8 +- get_local $char1 ++ local.get $char1 + i32.const 1 + i32.add +- set_local $char1 ++ local.set $char1 + ;; } while ( i !== lsegend ); +- get_local $i +- get_local $lsegend ++ local.get $i ++ local.get $lsegend + i32.ne + br_if 0 + end + ;; this.buf32[HNBIGTRIE_CHAR1_SLOT] = char1; + i32.const 268 +- get_local $char1 ++ local.get $char1 + i32.store + ;; return isegchar << 8 | lsegchar - lsegend; +- get_local $isegchar ++ local.get $isegchar + i32.const 8 + i32.shl +- get_local $lsegchar +- get_local $lsegend ++ local.get $lsegchar ++ local.get $lsegend + i32.sub + i32.or + ) +diff -up uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat.wa1.0 uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat +--- uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat 2022-05-22 17:25:47.975606555 +0200 +@@ -68,15 +68,15 @@ + (func (export "lz4BlockEncodeBound") + (param $ilen i32) + (result i32) +- get_local $ilen ++ local.get $ilen + i32.const 0x7E000000 + i32.gt_u + if + i32.const 0 + return + end +- get_local $ilen +- get_local $ilen ++ local.get $ilen ++ local.get $ilen + i32.const 255 + i32.div_u + i32.add +@@ -123,14 +123,14 @@ + (local $llen i32) ;; length of found literals + (local $moffset i32) ;; offset to found match from current input position + (local $mlen i32) ;; length of found match +- get_local $ilen ;; empty input = empty output ++ local.get $ilen ;; empty input = empty output + i32.const 0x7E000000 ;; max input size: 0x7E000000 + i32.gt_u + if + i32.const 0 + return + end +- get_local $ilen ;; "blocks < 13 bytes cannot be compressed" ++ local.get $ilen ;; "blocks < 13 bytes cannot be compressed" + i32.const 13 + i32.lt_u + if +@@ -138,78 +138,78 @@ + return + end + call $getLinearMemoryOffset ;; hash table is at start of usable memory +- set_local $hashPtrBeg +- get_local $inPtr +- tee_local $anchorPtr +- get_local $ilen ++ local.set $hashPtrBeg ++ local.get $inPtr ++ local.tee $anchorPtr ++ local.get $ilen + i32.add +- tee_local $inPtrEnd ++ local.tee $inPtrEnd + i32.const -5 ;; "The last 5 bytes are always literals." + i32.add +- tee_local $inPtrEnd2 ++ local.tee $inPtrEnd2 + i32.const -7 ;; "The last match must start at least 12 bytes before end of block" + i32.add +- set_local $inPtrEnd1 +- get_local $outPtr +- set_local $outPtrBeg ++ local.set $inPtrEnd1 ++ local.get $outPtr ++ local.set $outPtrBeg + ;; + ;; sequence processing loop + ;; + block $noMoreSequence loop $nextSequence +- get_local $inPtr +- get_local $inPtrEnd1 ++ local.get $inPtr ++ local.get $inPtrEnd1 + i32.ge_u ;; 5 or less bytes left? + br_if $noMoreSequence +- get_local $inPtr ;; first sequence of 3 bytes before match-finding loop ++ local.get $inPtr ;; first sequence of 3 bytes before match-finding loop + i32.load8_u + i32.const 8 + i32.shl +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=1 + i32.const 16 + i32.shl + i32.or +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=2 + i32.const 24 + i32.shl + i32.or +- set_local $seq32 ++ local.set $seq32 + ;; + ;; match-finding loop + ;; + loop $findMatch block $noMatchFound +- get_local $inPtr +- get_local $inPtrEnd2 ++ local.get $inPtr ++ local.get $inPtrEnd2 + i32.gt_u ;; less than 12 bytes left? + br_if $noMoreSequence +- get_local $seq32 ;; update last byte of current sequence ++ local.get $seq32 ;; update last byte of current sequence + i32.const 8 + i32.shr_u +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=3 + i32.const 24 + i32.shl + i32.or +- tee_local $seq32 ++ local.tee $seq32 + i32.const 0x9E3779B1 ;; compute 16-bit hash + i32.mul + i32.const 16 + i32.shr_u ;; hash value is at top of stack + i32.const 2 ;; lookup refPtr at hash entry + i32.shl +- get_local $hashPtrBeg ++ local.get $hashPtrBeg + i32.add +- tee_local $hashPtr ++ local.tee $hashPtr + i32.load +- set_local $refPtr +- get_local $hashPtr ;; update hash entry with inPtr +- get_local $inPtr ++ local.set $refPtr ++ local.get $hashPtr ;; update hash entry with inPtr ++ local.get $inPtr + i32.store +- get_local $inPtr +- get_local $refPtr ++ local.get $inPtr ++ local.get $refPtr + i32.sub +- tee_local $moffset ;; remember match offset, we will need it in case of match ++ local.tee $moffset ;; remember match offset, we will need it in case of match + i32.const 0xFFFF + i32.gt_s ;; match offset > 65535 = unusable match + br_if $noMatchFound +@@ -217,177 +217,177 @@ + ;; confirm match: different sequences can yield same hash + ;; compare-branch each byte to potentially save memory read ops + ;; +- get_local $seq32 ;; byte 0 ++ local.get $seq32 ;; byte 0 + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u + i32.ne ;; refPtr[0] !== inPtr[0] + br_if $noMatchFound +- get_local $seq32 ;; byte 1 ++ local.get $seq32 ;; byte 1 + i32.const 8 + i32.shr_u + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u offset=1 + i32.ne + br_if $noMatchFound ;; refPtr[1] !== inPtr[1] +- get_local $seq32 ;; byte 2 ++ local.get $seq32 ;; byte 2 + i32.const 16 + i32.shr_u + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u offset=2 + i32.ne ;; refPtr[2] !== inPtr[2] + br_if $noMatchFound +- get_local $seq32 ;; byte 3 ++ local.get $seq32 ;; byte 3 + i32.const 24 + i32.shr_u + i32.const 0xFF + i32.and +- get_local $refPtr ++ local.get $refPtr + i32.load8_u offset=3 + i32.ne ;; refPtr[3] !== inPtr[3] + br_if $noMatchFound + ;; + ;; a valid match has been found at this point + ;; +- get_local $inPtr ;; compute length of literals +- get_local $anchorPtr ++ local.get $inPtr ;; compute length of literals ++ local.get $anchorPtr + i32.sub +- set_local $llen +- get_local $inPtr ;; find match length ++ local.set $llen ++ local.get $inPtr ;; find match length + i32.const 4 ;; skip over confirmed 4-byte match + i32.add +- set_local $inPtr +- get_local $refPtr ++ local.set $inPtr ++ local.get $refPtr + i32.const 4 + i32.add +- tee_local $mlen ;; remember refPtr to later compute match length +- set_local $refPtr ++ local.tee $mlen ;; remember refPtr to later compute match length ++ local.set $refPtr + block $endOfMatch loop ;; scan input buffer until match ends +- get_local $inPtr +- get_local $inPtrEnd2 ++ local.get $inPtr ++ local.get $inPtrEnd2 + i32.ge_u + br_if $endOfMatch +- get_local $inPtr ++ local.get $inPtr + i32.load8_u +- get_local $refPtr ++ local.get $refPtr + i32.load8_u + i32.ne + br_if $endOfMatch +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- get_local $refPtr ++ local.set $inPtr ++ local.get $refPtr + i32.const 1 + i32.add +- set_local $refPtr ++ local.set $refPtr + br 0 + end end $endOfMatch + ;; encode token +- get_local $outPtr ;; output token +- get_local $llen +- get_local $refPtr +- get_local $mlen ++ local.get $outPtr ;; output token ++ local.get $llen ++ local.get $refPtr ++ local.get $mlen + i32.sub +- tee_local $mlen ++ local.tee $mlen + call $writeToken +- get_local $outPtr ++ local.get $outPtr + i32.const 1 + i32.add +- set_local $outPtr +- get_local $llen ;; encode/write length of literals if needed ++ local.set $outPtr ++ local.get $llen ;; encode/write length of literals if needed + i32.const 15 + i32.ge_s + if +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + call $writeLength +- set_local $outPtr ++ local.set $outPtr + end + ;; copy literals +- get_local $outPtr +- get_local $anchorPtr +- get_local $llen ++ local.get $outPtr ++ local.get $anchorPtr ++ local.get $llen + call $copy +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + i32.add +- set_local $outPtr ++ local.set $outPtr + ;; encode match offset +- get_local $outPtr +- get_local $moffset ++ local.get $outPtr ++ local.get $moffset + i32.store8 +- get_local $outPtr +- get_local $moffset ++ local.get $outPtr ++ local.get $moffset + i32.const 8 + i32.shr_u + i32.store8 offset=1 +- get_local $outPtr ++ local.get $outPtr + i32.const 2 + i32.add +- set_local $outPtr +- get_local $mlen ;; encode/write length of match if needed ++ local.set $outPtr ++ local.get $mlen ;; encode/write length of match if needed + i32.const 15 + i32.ge_s + if +- get_local $outPtr +- get_local $mlen ++ local.get $outPtr ++ local.get $mlen + call $writeLength +- set_local $outPtr ++ local.set $outPtr + end +- get_local $inPtr ;; advance anchor to current position +- set_local $anchorPtr ++ local.get $inPtr ;; advance anchor to current position ++ local.set $anchorPtr + br $nextSequence + end $noMatchFound +- get_local $inPtr ;; no match found: advance to next byte ++ local.get $inPtr ;; no match found: advance to next byte + i32.const 1 + i32.add +- set_local $inPtr ++ local.set $inPtr + br $findMatch end ;; match offset > 65535 = unusable match + end end $noMoreSequence + ;; + ;; generate last (match-less) sequence if compression succeeded + ;; +- get_local $outPtr +- get_local $outPtrBeg ++ local.get $outPtr ++ local.get $outPtrBeg + i32.eq + if + i32.const 0 + return + end +- get_local $outPtr +- get_local $inPtrEnd +- get_local $anchorPtr ++ local.get $outPtr ++ local.get $inPtrEnd ++ local.get $anchorPtr + i32.sub +- tee_local $llen ++ local.tee $llen + i32.const 0 + call $writeToken +- get_local $outPtr ++ local.get $outPtr + i32.const 1 + i32.add +- set_local $outPtr +- get_local $llen ++ local.set $outPtr ++ local.get $llen + i32.const 15 + i32.ge_u + if +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + call $writeLength +- set_local $outPtr ++ local.set $outPtr + end +- get_local $outPtr +- get_local $anchorPtr +- get_local $llen ++ local.get $outPtr ++ local.get $anchorPtr ++ local.get $llen + call $copy +- get_local $outPtr ;; return number of written bytes +- get_local $llen ++ local.get $outPtr ;; return number of written bytes ++ local.get $llen + i32.add +- get_local $outPtrBeg ++ local.get $outPtrBeg + i32.sub + ) + +@@ -413,128 +413,128 @@ + (local $token i32) ;; sequence token + (local $clen i32) ;; number of bytes to copy + (local $_ i32) ;; general purpose variable +- get_local $ilen ;; if ( ilen == 0 ) { return 0; } ++ local.get $ilen ;; if ( ilen == 0 ) { return 0; } + i32.eqz + if + i32.const 0 + return + end +- get_local $inPtr0 +- tee_local $inPtr ;; current position in input buffer +- get_local $ilen ++ local.get $inPtr0 ++ local.tee $inPtr ;; current position in input buffer ++ local.get $ilen + i32.add +- set_local $inPtrEnd +- get_local $outPtr0 ;; start of output buffer +- set_local $outPtr ;; current position in output buffer ++ local.set $inPtrEnd ++ local.get $outPtr0 ;; start of output buffer ++ local.set $outPtr ;; current position in output buffer + block $noMoreSequence loop ;; iterate through all sequences +- get_local $inPtr +- get_local $inPtrEnd ++ local.get $inPtr ++ local.get $inPtrEnd + i32.ge_u + br_if $noMoreSequence ;; break when nothing left to read in input buffer +- get_local $inPtr ;; read token -- consume one byte ++ local.get $inPtr ;; read token -- consume one byte + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- tee_local $token ;; extract length of literals from token ++ local.set $inPtr ++ local.tee $token ;; extract length of literals from token + i32.const 4 + i32.shr_u +- tee_local $clen ;; consume extra length bytes if present ++ local.tee $clen ;; consume extra length bytes if present + i32.eqz + if else +- get_local $clen ++ local.get $clen + i32.const 15 + i32.eq + if loop +- get_local $inPtr ++ local.get $inPtr + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- tee_local $_ +- get_local $clen ++ local.set $inPtr ++ local.tee $_ ++ local.get $clen + i32.add +- set_local $clen +- get_local $_ ++ local.set $clen ++ local.get $_ + i32.const 255 + i32.eq + br_if 0 + end end +- get_local $outPtr ;; copy literals to ouput buffer +- get_local $inPtr +- get_local $clen ++ local.get $outPtr ;; copy literals to ouput buffer ++ local.get $inPtr ++ local.get $clen + call $copy +- get_local $outPtr ;; advance output buffer pointer past copy +- get_local $clen ++ local.get $outPtr ;; advance output buffer pointer past copy ++ local.get $clen + i32.add +- set_local $outPtr +- get_local $clen ;; advance input buffer pointer past literals +- get_local $inPtr ++ local.set $outPtr ++ local.get $clen ;; advance input buffer pointer past literals ++ local.get $inPtr + i32.add +- tee_local $inPtr +- get_local $inPtrEnd ;; exit if this is the last sequence ++ local.tee $inPtr ++ local.get $inPtrEnd ;; exit if this is the last sequence + i32.eq + br_if $noMoreSequence + end +- get_local $outPtr ;; read match offset +- get_local $inPtr ++ local.get $outPtr ;; read match offset ++ local.get $inPtr + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.load8_u offset=1 + i32.const 8 + i32.shl + i32.or + i32.sub +- tee_local $matchPtr +- get_local $outPtr ;; match position can't be outside input buffer bounds ++ local.tee $matchPtr ++ local.get $outPtr ;; match position can't be outside input buffer bounds + i32.eq + br_if $noMoreSequence +- get_local $matchPtr +- get_local $inPtrEnd ++ local.get $matchPtr ++ local.get $inPtrEnd + i32.lt_u + br_if $noMoreSequence +- get_local $inPtr ;; advance input pointer past match offset bytes ++ local.get $inPtr ;; advance input pointer past match offset bytes + i32.const 2 + i32.add +- set_local $inPtr +- get_local $token ;; extract length of match from token ++ local.set $inPtr ++ local.get $token ;; extract length of match from token + i32.const 15 + i32.and + i32.const 4 + i32.add +- tee_local $clen ++ local.tee $clen + i32.const 19 ;; consume extra length bytes if present + i32.eq + if loop +- get_local $inPtr ++ local.get $inPtr + i32.load8_u +- get_local $inPtr ++ local.get $inPtr + i32.const 1 + i32.add +- set_local $inPtr +- tee_local $_ +- get_local $clen ++ local.set $inPtr ++ local.tee $_ ++ local.get $clen + i32.add +- set_local $clen +- get_local $_ ++ local.set $clen ++ local.get $_ + i32.const 255 + i32.eq + br_if 0 + end end +- get_local $outPtr ;; copy match to ouput buffer +- get_local $matchPtr +- get_local $clen ++ local.get $outPtr ;; copy match to ouput buffer ++ local.get $matchPtr ++ local.get $clen + call $copy +- get_local $clen ;; advance output buffer pointer past copy +- get_local $outPtr ++ local.get $clen ;; advance output buffer pointer past copy ++ local.get $outPtr + i32.add +- set_local $outPtr ++ local.set $outPtr + br 0 + end end $noMoreSequence +- get_local $outPtr ;; return number of written bytes +- get_local $outPtr0 ++ local.get $outPtr ;; return number of written bytes ++ local.get $outPtr0 + i32.sub + ) + +@@ -552,18 +552,18 @@ + (param $outPtr i32) + (param $llen i32) + (param $mlen i32) +- get_local $outPtr +- get_local $llen ++ local.get $outPtr ++ local.get $llen + i32.const 15 +- get_local $llen ++ local.get $llen + i32.const 15 + i32.lt_u + select + i32.const 4 + i32.shl +- get_local $mlen ++ local.get $mlen + i32.const 15 +- get_local $mlen ++ local.get $mlen + i32.const 15 + i32.lt_u + select +@@ -582,32 +582,32 @@ + (param $outPtr i32) + (param $len i32) + (result i32) +- get_local $len ++ local.get $len + i32.const 15 + i32.sub +- set_local $len ++ local.set $len + loop +- get_local $outPtr +- get_local $len ++ local.get $outPtr ++ local.get $len + i32.const 255 +- get_local $len ++ local.get $len + i32.const 255 + i32.lt_u + select + i32.store8 +- get_local $outPtr ++ local.get $outPtr + i32.const 1 + i32.add +- set_local $outPtr +- get_local $len ++ local.set $outPtr ++ local.get $len + i32.const 255 + i32.sub +- tee_local $len ++ local.tee $len + i32.const 0 + i32.ge_s + br_if 0 + end +- get_local $outPtr ++ local.get $outPtr + ) + + ;; +@@ -621,119 +621,119 @@ + (param $src i32) + (param $len i32) + block $lessThan8 loop +- get_local $len ++ local.get $len + i32.const 8 + i32.lt_u + br_if $lessThan8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=1 + i32.store8 offset=1 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=2 + i32.store8 offset=2 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=3 + i32.store8 offset=3 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=4 + i32.store8 offset=4 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=5 + i32.store8 offset=5 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=6 + i32.store8 offset=6 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=7 + i32.store8 offset=7 +- get_local $dst ++ local.get $dst + i32.const 8 + i32.add +- set_local $dst +- get_local $src ++ local.set $dst ++ local.get $src + i32.const 8 + i32.add +- set_local $src +- get_local $len ++ local.set $src ++ local.get $len + i32.const -8 + i32.add +- set_local $len ++ local.set $len + br 0 + end end $lessThan8 +- get_local $len ++ local.get $len + i32.const 4 + i32.ge_u + if +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=1 + i32.store8 offset=1 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=2 + i32.store8 offset=2 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=3 + i32.store8 offset=3 +- get_local $dst ++ local.get $dst + i32.const 4 + i32.add +- set_local $dst +- get_local $src ++ local.set $dst ++ local.get $src + i32.const 4 + i32.add +- set_local $src +- get_local $len ++ local.set $src ++ local.get $len + i32.const -4 + i32.add +- set_local $len ++ local.set $len + end +- get_local $len ++ local.get $len + i32.const 2 + i32.ge_u + if +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u offset=1 + i32.store8 offset=1 +- get_local $dst ++ local.get $dst + i32.const 2 + i32.add +- set_local $dst +- get_local $src ++ local.set $dst ++ local.get $src + i32.const 2 + i32.add +- set_local $src +- get_local $len ++ local.set $src ++ local.get $len + i32.const -2 + i32.add +- set_local $len ++ local.set $len + end +- get_local $len ++ local.get $len + i32.eqz + if else +- get_local $dst +- get_local $src ++ local.get $dst ++ local.get $src + i32.load8_u + i32.store8 + end +diff -up uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat.wa1.0 uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat +--- uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 ++++ uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat 2022-05-22 17:26:22.674470312 +0200 +@@ -83,133 +83,133 @@ + ;; const iCharData = buf32[CHARDATA_PTR_SLOT]; + i32.const 404 + i32.load +- set_local $iCharData ++ local.set $iCharData + ;; let iNode = pslBuffer32[RULES_PTR_SLOT]; + i32.const 400 + i32.load + i32.const 2 + i32.shl +- set_local $iNode ++ local.set $iNode + ;; let iLabel = LABEL_INDICES_SLOT; + i32.const 256 +- set_local $iLabel ++ local.set $iLabel + ;; let cursorPos = -1; + i32.const -1 +- set_local $cursorPos ++ local.set $cursorPos + ;; label-lookup loop + ;; for (;;) { + block $labelLookupDone loop $labelLookup + ;; // Extract label indices + ;; const labelBeg = buf8[iLabel+1]; + ;; const labelLen = buf8[iLabel+0] - labelBeg; +- get_local $iLabel ++ local.get $iLabel + i32.load8_u +- get_local $iLabel ++ local.get $iLabel + i32.load8_u offset=1 +- tee_local $labelBeg ++ local.tee $labelBeg + i32.sub +- set_local $labelLen ++ local.set $labelLen + ;; // Match-lookup loop: binary search + ;; let r = buf32[iNode+0] >>> 16; + ;; if ( r === 0 ) { break; } +- get_local $iNode ++ local.get $iNode + i32.load16_u offset=2 +- tee_local $r ++ local.tee $r + i32.eqz + br_if $labelLookupDone + ;; const iCandidates = buf32[iNode+2]; +- get_local $iNode ++ local.get $iNode + i32.load offset=8 + i32.const 2 + i32.shl +- set_local $iCandidates ++ local.set $iCandidates + ;; let l = 0; + ;; let iFound = 0; + i32.const 0 +- tee_local $l +- set_local $iFound ++ local.tee $l ++ local.set $iFound + ;; while ( l < r ) { + block $binarySearchDone loop $binarySearch +- get_local $l +- get_local $r ++ local.get $l ++ local.get $r + i32.ge_u + br_if $binarySearchDone + ;; const iCandidate = l + r >>> 1; +- get_local $l +- get_local $r ++ local.get $l ++ local.get $r + i32.add + i32.const 1 + i32.shr_u +- tee_local $iCandidate ++ local.tee $iCandidate + ;; const iCandidateNode = iCandidates + iCandidate + (iCandidate << 1); + i32.const 2 + i32.shl +- tee_local $_1 +- get_local $_1 ++ local.tee $_1 ++ local.get $_1 + i32.const 1 + i32.shl + i32.add +- get_local $iCandidates ++ local.get $iCandidates + i32.add +- tee_local $iCandidateNode ++ local.tee $iCandidateNode + ;; const candidateLen = buf32[iCandidateNode+0] & 0x000000FF; + i32.load8_u +- set_local $candidateLen ++ local.set $candidateLen + ;; let d = labelLen - candidateLen; +- get_local $labelLen +- get_local $candidateLen ++ local.get $labelLen ++ local.get $candidateLen + i32.sub +- tee_local $d ++ local.tee $d + ;; if ( d === 0 ) { + i32.eqz + if + ;; const iCandidateChar = candidateLen <= 4 +- get_local $candidateLen ++ local.get $candidateLen + i32.const 4 + i32.le_u + if + ;; ? iCandidateNode + 1 << 2 +- get_local $iCandidateNode ++ local.get $iCandidateNode + i32.const 4 + i32.add +- set_local $iCandidateChar ++ local.set $iCandidateChar + else + ;; : buf32[CHARDATA_PTR_SLOT] + buf32[iCandidateNode+1]; +- get_local $iCharData +- get_local $iCandidateNode ++ local.get $iCharData ++ local.get $iCandidateNode + i32.load offset=4 + i32.add +- set_local $iCandidateChar ++ local.set $iCandidateChar + end + ;; for ( let i = 0; i < labelLen; i++ ) { +- get_local $labelBeg +- tee_local $_1 +- get_local $labelLen ++ local.get $labelBeg ++ local.tee $_1 ++ local.get $labelLen + i32.add +- set_local $_3 +- get_local $iCandidateChar +- set_local $_2 ++ local.set $_3 ++ local.get $iCandidateChar ++ local.set $_2 + block $findDiffDone loop $findDiff + ;; d = buf8[labelBeg+i] - buf8[iCandidateChar+i]; + ;; if ( d !== 0 ) { break; } +- get_local $_1 ++ local.get $_1 + i32.load8_u +- get_local $_2 ++ local.get $_2 + i32.load8_u + i32.sub +- tee_local $d ++ local.tee $d + br_if $findDiffDone +- get_local $_1 ++ local.get $_1 + i32.const 1 + i32.add +- tee_local $_1 +- get_local $_3 ++ local.tee $_1 ++ local.get $_3 + i32.eq + br_if $findDiffDone +- get_local $_2 ++ local.get $_2 + i32.const 1 + i32.add +- set_local $_2 ++ local.set $_2 + br $findDiff + ;; } + end end +@@ -217,32 +217,32 @@ + end + ;; if ( d < 0 ) { + ;; r = iCandidate; +- get_local $d ++ local.get $d + i32.const 0 + i32.lt_s + if +- get_local $iCandidate +- set_local $r ++ local.get $iCandidate ++ local.set $r + br $binarySearch + end + ;; } else if ( d > 0 ) { + ;; l = iCandidate + 1; +- get_local $d ++ local.get $d + i32.const 0 + i32.gt_s + if +- get_local $iCandidate ++ local.get $iCandidate + i32.const 1 + i32.add +- set_local $l ++ local.set $l + br $binarySearch + end + ;; } else /* if ( d === 0 ) */ { + ;; iFound = iCandidateNode; + ;; break; + ;; } +- get_local $iCandidateNode +- set_local $iFound ++ local.get $iCandidateNode ++ local.set $iFound + end end + ;; } + ;; // 2. If no rules match, the prevailing rule is "*". +@@ -251,10 +251,10 @@ + ;; buf8[SUFFIX_NOT_FOUND_SLOT] = 1; + ;; iFound = iCandidates; + ;; } +- get_local $iFound ++ local.get $iFound + i32.eqz + if +- get_local $iCandidates ++ local.get $iCandidates + i32.load offset=4 + i32.const 0x2A + i32.ne +@@ -262,12 +262,12 @@ + i32.const 399 + i32.const 1 + i32.store8 +- get_local $iCandidates +- set_local $iFound ++ local.get $iCandidates ++ local.set $iFound + end + ;; iNode = iFound; +- get_local $iFound +- tee_local $iNode ++ local.get $iFound ++ local.tee $iNode + ;; // 5. If the prevailing rule is a exception rule, modify it by + ;; // removing the leftmost label. + ;; if ( (buf32[iNode+0] & 0x00000200) !== 0 ) { +@@ -277,15 +277,15 @@ + ;; break; + ;; } + i32.load8_u offset=1 +- tee_local $_1 ++ local.tee $_1 + i32.const 0x02 + i32.and + if +- get_local $iLabel ++ local.get $iLabel + i32.const 256 + i32.gt_u + if +- get_local $iLabel ++ local.get $iLabel + i32.const -2 + i32.add + return +@@ -295,25 +295,25 @@ + ;; if ( (buf32[iNode+0] & 0x00000100) !== 0 ) { + ;; cursorPos = labelBeg; + ;; } +- get_local $_1 ++ local.get $_1 + i32.const 0x01 + i32.and + if +- get_local $iLabel +- set_local $cursorPos ++ local.get $iLabel ++ local.set $cursorPos + end + ;; if ( labelBeg === 0 ) { break; } +- get_local $labelBeg ++ local.get $labelBeg + i32.eqz + br_if $labelLookupDone + ;; iLabel += 2; +- get_local $iLabel ++ local.get $iLabel + i32.const 2 + i32.add +- set_local $iLabel ++ local.set $iLabel + br $labelLookup + end end +- get_local $cursorPos ++ local.get $cursorPos + ) + + ;; diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 87c1d6f..292c0f2 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -23,6 +23,8 @@ Source2: uAssets-%{uAssets_commit}.tar.gz # generate a free one with the mktarball.sh script below Source10: uAssets-mktarball.sh Patch0: %{name}-nonfree.patch +# use WebAssembly 1.0 function names (see https://github.com/WebAssembly/wabt/issues/1820) +Patch1: %{name}-wa1.0.patch Requires: mozilla-filesystem BuildArch: noarch @@ -67,6 +69,7 @@ from hosts files. %setup -q -n uBlock-%{version} tar -xz -C submodules/uAssets --strip-components=1 -f %{SOURCE2} %patch0 -p1 +%patch1 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt @@ -104,6 +107,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain * Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 - update to 1.42.4 (#2070185) - new bundled library: hsluv +- fix build with wabt 1.0.25+ * Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 - update to 1.41.8 (#2055291) From 0900ffd42f42f566e2acbf76781bfd1a82966787 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Jun 2022 11:32:45 +0200 Subject: [PATCH 46/84] update to 1.43.0 (#2095350) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 292c0f2..f640520 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 61a6b9477a2c591d00fea1c2694afa11f8106a28 +%global uAssets_commit a971d3b616851b139f44de77f4d636afffa09ac5 Name: mozilla-ublock-origin -Version: 1.42.4 +Version: 1.43.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 +- update to 1.43.0 (#2095350) + * Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 - update to 1.42.4 (#2070185) - new bundled library: hsluv diff --git a/sources b/sources index 1ed5572..a30379f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uBlock-1.42.4.tar.gz) = 79bde26c531e33e07f7611bf4c13a6005f8143cfd7e7633c3c1cedf405d9765482eb23760d34175ed1588f52bc8253d76e78d89882fa4ec614791a585fbf2de5 -SHA512 (uAssets-61a6b9477a2c591d00fea1c2694afa11f8106a28.tar.gz) = 1e1876334919437ddcc7276acd65cd35e2223e63a886098f1de50eb07d3ff08c1ad924c909067badbf355de9127a62af0c1c78ac786b5af9b7af43cccbcc4c0e +SHA512 (uBlock-1.43.0.tar.gz) = 537d8ea8d316348a423fe0688919dad507a3b5b5334a40b95efa4a2b5ee7a2dc740f52f260be32a019beca6477523b99ff33c78ea462ff01e046bdf7d069b0ae +SHA512 (uAssets-a971d3b616851b139f44de77f4d636afffa09ac5.tar.gz) = 71a68b267850516e7bfbd218379b89cb33291b5f96cf8bcca0ddb2ef946f13faa358a208b84c507f16b79ce8a92f89e83e4c8180bd3db8c0d95dd19778798df1 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index cb7411e..a519548 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=61a6b9477a2c591d00fea1c2694afa11f8106a28 +commit=a971d3b616851b139f44de77f4d636afffa09ac5 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 7fba3dd4891a8c2fcd5ff2089aa4a8c4ef7a7244 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:47:28 +0000 Subject: [PATCH 47/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ef6c9e4..d23e396 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.43.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 - update to 1.43.0 (#2095350) From d7788557c4b4bc9306e86bb0e7826cc946554bd9 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 4 Oct 2022 14:49:26 +0200 Subject: [PATCH 48/84] update to 1.44.4 (#2118741) drop obsolete patch --- mozilla-ublock-origin-wa1.0.patch | 2525 ----------------------------- mozilla-ublock-origin.spec | 11 +- sources | 4 +- uAssets-mktarball.sh | 2 +- 4 files changed, 9 insertions(+), 2533 deletions(-) delete mode 100644 mozilla-ublock-origin-wa1.0.patch diff --git a/mozilla-ublock-origin-wa1.0.patch b/mozilla-ublock-origin-wa1.0.patch deleted file mode 100644 index 19b7f30..0000000 --- a/mozilla-ublock-origin-wa1.0.patch +++ /dev/null @@ -1,2525 +0,0 @@ -diff -up uBlock-1.42.4/src/js/wasm/biditrie.wat.wa1.0 uBlock-1.42.4/src/js/wasm/biditrie.wat ---- uBlock-1.42.4/src/js/wasm/biditrie.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 -+++ uBlock-1.42.4/src/js/wasm/biditrie.wat 2022-05-22 17:25:47.974606558 +0200 -@@ -64,92 +64,92 @@ - (local $x i32) - (local $y i32) - ;; trie index is a uint32 offset, need to convert to uint8 offset -- get_local $icell -+ local.get $icell - i32.const 2 - i32.shl -- set_local $icell -+ local.set $icell - ;; const buf32 = this.buf32; - ;; const buf8 = this.buf8; - ;; const char0 = buf32[CHAR0_SLOT]; - i32.const 2060 - i32.load align=4 -- set_local $char0 -+ local.set $char0 - ;; const aR = buf32[HAYSTACK_SIZE_SLOT]; - i32.const 2048 - i32.load align=4 -- set_local $aR -+ local.set $aR - ;; let al = ai; -- get_local $ai -- set_local $al -+ local.get $ai -+ local.set $al - block $matchFound - block $matchNotFound - ;; for (;;) { - loop $mainLoop - ;; x = buf8[al]; -- get_local $al -+ local.get $al - i32.load8_u -- set_local $x -+ local.set $x - ;; al += 1; -- get_local $al -+ local.get $al - i32.const 1 - i32.add -- set_local $al -+ local.set $al - ;; // find matching segment - ;; for (;;) { - block $nextSegment loop $findSegment - ;; y = buf32[icell+SEGMENT_INFO]; -- get_local $icell -+ local.get $icell - i32.load offset=8 align=4 -- tee_local $y -+ local.tee $y - ;; bl = char0 + (y & 0x00FFFFFF); - i32.const 0x00FFFFFF - i32.and -- get_local $char0 -+ local.get $char0 - i32.add -- tee_local $bl -+ local.tee $bl - ;; if ( buf8[bl] === x ) { - i32.load8_u -- get_local $x -+ local.get $x - i32.eq - if - ;; y = (y >>> 24) - 1; -- get_local $y -+ local.get $y - i32.const 24 - i32.shr_u - i32.const 1 - i32.sub -- tee_local $y -+ local.tee $y - ;; if ( n !== 0 ) { - if - ;; x = al + y; -- get_local $y -- get_local $al -+ local.get $y -+ local.get $al - i32.add -- tee_local $x -+ local.tee $x - ;; if ( x > aR ) { return 0; } -- get_local $aR -+ local.get $aR - i32.gt_u - br_if $matchNotFound - ;; for (;;) { - loop - ;; bl += 1; -- get_local $bl -+ local.get $bl - i32.const 1 - i32.add -- tee_local $bl -+ local.tee $bl - ;; if ( buf8[bl] !== buf8[al] ) { return 0; } - i32.load8_u -- get_local $al -+ local.get $al - i32.load8_u - i32.ne - br_if $matchNotFound - ;; al += 1; -- get_local $al -+ local.get $al - i32.const 1 - i32.add -- tee_local $al -+ local.tee $al - ;; if ( al === x ) { break; } -- get_local $x -+ local.get $x - i32.ne - br_if 0 - end -@@ -158,11 +158,11 @@ - br $nextSegment - end - ;; icell = buf32[icell+CELL_OR]; -- get_local $icell -+ local.get $icell - i32.load offset=4 align=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( icell === 0 ) { return 0; } - i32.eqz - br_if $matchNotFound -@@ -171,14 +171,14 @@ - end end - ;; // next segment - ;; icell = buf32[icell+CELL_AND]; -- get_local $icell -+ local.get $icell - i32.load align=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; const x = buf32[icell+BCELL_EXTRA]; - i32.load offset=8 align=4 -- tee_local $x -+ local.tee $x - ;; if ( x <= BCELL_EXTRA_MAX ) { - i32.const 0x00FFFFFF - i32.le_u -@@ -186,43 +186,43 @@ - ;; if ( x !== 0 && this.matchesExtra(ai, al, x) !== 0 ) { - ;; return 1; - ;; } -- get_local $x -+ local.get $x - if -- get_local $ai -- get_local $al -- get_local $x -+ local.get $ai -+ local.get $al -+ local.get $x - call $matchesExtra - br_if $matchFound - end - ;; x = buf32[icell+BCELL_ALT_AND]; -- get_local $icell -+ local.get $icell - i32.load offset=4 align=4 - i32.const 2 - i32.shl -- tee_local $x -+ local.tee $x - ;; if ( x !== 0 && this.matchesLeft(x, ai, al) !== 0 ) { - if -- get_local $x -- get_local $ai -- get_local $al -+ local.get $x -+ local.get $ai -+ local.get $al - call $matchesLeft - br_if $matchFound - ;; } - end - ;; icell = buf32[icell+BCELL_NEXT_AND]; -- get_local $icell -+ local.get $icell - i32.load align=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( icell === 0 ) { return 0; } - i32.eqz - br_if $matchNotFound - ;; } - end - ;; if ( al === aR ) { return 0; } -- get_local $al -- get_local $aR -+ local.get $al -+ local.get $aR - i32.ne - br_if $mainLoop - ;; } -@@ -255,60 +255,60 @@ - ;; const char0 = buf32[CHAR0_SLOT]; - i32.const 2060 - i32.load align=4 -- set_local $char0 -+ local.set $char0 - block $matchFound - block $matchNotFound - ;; for (;;) { - loop $mainLoop - ;; if ( ar === 0 ) { return 0; } -- get_local $ar -+ local.get $ar - i32.eqz - br_if $matchNotFound - ;; ar -= 1; -- get_local $ar -+ local.get $ar - i32.const 1 - i32.sub -- tee_local $ar -+ local.tee $ar - ;; x = buf8[ar]; - i32.load8_u -- set_local $x -+ local.set $x - ;; // find matching segment - ;; for (;;) { - block $nextSegment loop $findSegment - ;; y = buf32[icell+SEGMENT_INFO]; -- get_local $icell -+ local.get $icell - i32.load offset=8 align=4 -- tee_local $y -+ local.tee $y - ;; br = char0 + (y & 0x00FFFFFF); - i32.const 0x00FFFFFF - i32.and -- get_local $char0 -+ local.get $char0 - i32.add -- tee_local $br -+ local.tee $br - ;; y = (y >>> 24) - 1; -- get_local $y -+ local.get $y - i32.const 24 - i32.shr_u - i32.const 1 - i32.sub -- tee_local $y -+ local.tee $y - ;; br += y; - i32.add -- tee_local $br -+ local.tee $br - ;; if ( buf8[br] === x ) { - i32.load8_u -- get_local $x -+ local.get $x - i32.eq - if - ;; // all characters in segment must match - ;; if ( y !== 0 ) { -- get_local $y -+ local.get $y - if - ;; x = ar - y; -- get_local $ar -- get_local $y -+ local.get $ar -+ local.get $y - i32.sub -- tee_local $x -+ local.tee $x - ;; if ( x < 0 ) { return 0; } - i32.const 0 - i32.lt_s -@@ -317,21 +317,21 @@ - loop - ;; ar -= 1; br -= 1; - ;; if ( buf8[ar] !== buf8[br] ) { return 0; } -- get_local $ar -+ local.get $ar - i32.const 1 - i32.sub -- tee_local $ar -+ local.tee $ar - i32.load8_u -- get_local $br -+ local.get $br - i32.const 1 - i32.sub -- tee_local $br -+ local.tee $br - i32.load8_u - i32.ne - br_if $matchNotFound - ;; if ( ar === x ) { break; } -- get_local $ar -- get_local $x -+ local.get $ar -+ local.get $x - i32.ne - br_if 0 - end -@@ -340,11 +340,11 @@ - br $nextSegment - end - ;; icell = buf32[icell+CELL_OR]; -- get_local $icell -+ local.get $icell - i32.load offset=4 align=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( icell === 0 ) { return 0; } - i32.eqz - br_if $matchNotFound -@@ -353,14 +353,14 @@ - end end - ;; // next segment - ;; icell = buf32[icell+CELL_AND]; -- get_local $icell -+ local.get $icell - i32.load align=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; const x = buf32[icell+BCELL_EXTRA]; - i32.load offset=8 align=4 -- tee_local $x -+ local.tee $x - ;; if ( x <= BCELL_EXTRA_MAX ) { - i32.const 0x00FFFFFF - i32.le_u -@@ -368,20 +368,20 @@ - ;; if ( x !== 0 && this.matchesExtra(ar, r, x) !== 0 ) { - ;; return 1; - ;; } -- get_local $x -+ local.get $x - if -- get_local $ar -- get_local $r -- get_local $x -+ local.get $ar -+ local.get $r -+ local.get $x - call $matchesExtra - br_if $matchFound - end - ;; icell = buf32[icell+BCELL_NEXT_AND]; -- get_local $icell -+ local.get $icell - i32.load align=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( icell === 0 ) { return 0; } - i32.eqz - br_if $matchNotFound -@@ -414,35 +414,35 @@ - ;; if ( ix !== 1 ) { - ;; const iu = this.extraHandler(l, r, ix); - ;; if ( iu === 0 ) { return 0; } -- get_local $ix -+ local.get $ix - i32.const 1 - i32.ne - if -- get_local $l -- get_local $r -- get_local $ix -+ local.get $l -+ local.get $r -+ local.get $ix - call $extraHandler -- tee_local $iu -+ local.tee $iu - i32.eqz - br_if $fail - ;; } else { - ;; iu = -1; - else - i32.const -1 -- set_local $iu -+ local.set $iu - ;; } - end - ;; this.buf32[RESULT_IU_SLOT] = iu; - i32.const 2076 -- get_local $iu -+ local.get $iu - i32.store align=4 - ;; this.buf32[RESULT_L_SLOT] = l; - i32.const 2068 -- get_local $l -+ local.get $l - i32.store align=4 - ;; this.buf32[RESULT_R_SLOT] = r; - i32.const 2072 -- get_local $r -+ local.get $r - i32.store align=4 - end ;; $succeed - i32.const 1 -@@ -470,49 +470,49 @@ - ;; if ( haystackLeft < 0 || (haystackLeft + needleLen) > haystackRight ) { - ;; return 0; - ;; } -- get_local $haystackLeft -+ local.get $haystackLeft - i32.const 0 - i32.lt_s - br_if $fail -- get_local $haystackLeft -- get_local $needleLen -+ local.get $haystackLeft -+ local.get $needleLen - i32.add -- get_local $haystackRight -+ local.get $haystackRight - i32.gt_u - br_if $fail - ;; const charCodes = this.buf8; - ;; needleLeft += this.buf32[CHAR0_SLOT]; -- get_local $needleLeft -+ local.get $needleLeft - i32.const 2060 ;; CHAR0_SLOT memory address - i32.load align=4 ;; CHAR0 memory address - i32.add ;; needle memory address -- tee_local $needleLeft -+ local.tee $needleLeft - ;; const needleRight = needleLeft + needleLen; -- get_local $needleLen -+ local.get $needleLen - i32.add -- set_local $needleRight -+ local.set $needleRight - ;; while ( charCodes[haystackLeft] === charCodes[needleLeft] ) { - loop $compare -- get_local $haystackLeft -+ local.get $haystackLeft - i32.load8_u -- get_local $needleLeft -+ local.get $needleLeft - i32.load8_u - i32.ne - br_if $fail - ;; needleLeft += 1; -- get_local $needleLeft -+ local.get $needleLeft - i32.const 1 - i32.add -- tee_local $needleLeft -+ local.tee $needleLeft - ;; if ( needleLeft === needleRight ) { return 1; } -- get_local $needleRight -+ local.get $needleRight - i32.eq - br_if $succeed - ;; haystackLeft += 1; - i32.const 1 -- get_local $haystackLeft -+ local.get $haystackLeft - i32.add -- set_local $haystackLeft -+ local.set $haystackLeft - br $compare - end - ;; } -@@ -545,76 +545,76 @@ - block $fail - block $succeed - ;; if ( needleLen === 0 ) { return haystackLeft; } -- get_local $needleLen -+ local.get $needleLen - i32.eqz - br_if $succeed - ;; haystackEnd -= needleLen; -- get_local $haystackEnd -- get_local $needleLen -+ local.get $haystackEnd -+ local.get $needleLen - i32.sub -- tee_local $haystackEnd -+ local.tee $haystackEnd - ;; if ( haystackEnd < haystackLeft ) { return -1; } -- get_local $haystackLeft -+ local.get $haystackLeft - i32.lt_s - br_if $fail - ;; needleLeft += this.buf32[CHAR0_SLOT]; -- get_local $needleLeft -+ local.get $needleLeft - i32.const 2060 ;; CHAR0_SLOT memory address - i32.load align=4 ;; CHAR0 memory address - i32.add ;; needle memory address -- tee_local $needleLeft -+ local.tee $needleLeft - ;; const needleRight = needleLeft + needleLen; -- get_local $needleLen -+ local.get $needleLen - i32.add -- set_local $needleRight -+ local.set $needleRight - ;; const charCodes = this.buf8; - ;; for (;;) { - loop $mainLoop - ;; let i = haystackLeft; - ;; let j = needleLeft; -- get_local $haystackLeft -- set_local $i -- get_local $needleLeft -- set_local $j -+ local.get $haystackLeft -+ local.set $i -+ local.get $needleLeft -+ local.set $j - ;; while ( charCodes[i] === charCodes[j] ) { - block $breakMatchChars loop $matchChars -- get_local $i -+ local.get $i - i32.load8_u -- get_local $j -+ local.get $j - i32.load8_u - i32.ne - br_if $breakMatchChars - ;; j += 1; -- get_local $j -+ local.get $j - i32.const 1 - i32.add -- tee_local $j -+ local.tee $j - ;; if ( j === needleRight ) { return haystackLeft; } -- get_local $needleRight -+ local.get $needleRight - i32.eq - br_if $succeed - ;; i += 1; -- get_local $i -+ local.get $i - i32.const 1 - i32.add -- set_local $i -+ local.set $i - br $matchChars - ;; } - end end - ;; haystackLeft += 1; -- get_local $haystackLeft -+ local.get $haystackLeft - i32.const 1 - i32.add -- tee_local $haystackLeft -+ local.tee $haystackLeft - ;; if ( haystackLeft > haystackEnd ) { break; } -- get_local $haystackEnd -+ local.get $haystackEnd - i32.gt_u - br_if $fail - br $mainLoop - ;; } - end - end ;; $succeed -- get_local $haystackLeft -+ local.get $haystackLeft - return - end ;; $fail - ;; return -1; -@@ -640,82 +640,82 @@ - (local $j i32) - (local $c0 i32) - ;; if ( needleLen === 0 ) { return haystackBeg; } -- get_local $needleLen -+ local.get $needleLen - i32.eqz - if -- get_local $haystackBeg -+ local.get $haystackBeg - return - end - block $fail - block $succeed - ;; let haystackLeft = haystackEnd - needleLen; -- get_local $haystackEnd -- get_local $needleLen -+ local.get $haystackEnd -+ local.get $needleLen - i32.sub -- tee_local $haystackLeft -+ local.tee $haystackLeft - ;; if ( haystackLeft < haystackBeg ) { return -1; } -- get_local $haystackBeg -+ local.get $haystackBeg - i32.lt_s - br_if $fail - ;; needleLeft += this.buf32[CHAR0_SLOT]; -- get_local $needleLeft -+ local.get $needleLeft - i32.const 2060 ;; CHAR0_SLOT memory address - i32.load align=4 ;; CHAR0 memory address - i32.add ;; needle memory address -- tee_local $needleLeft -+ local.tee $needleLeft - ;; const needleRight = needleLeft + needleLen; -- get_local $needleLen -+ local.get $needleLen - i32.add -- set_local $needleRight -+ local.set $needleRight - ;; const charCodes = this.buf8; - ;; for (;;) { - loop $mainLoop - ;; let i = haystackLeft; - ;; let j = needleLeft; -- get_local $haystackLeft -- set_local $i -- get_local $needleLeft -- set_local $j -+ local.get $haystackLeft -+ local.set $i -+ local.get $needleLeft -+ local.set $j - ;; while ( charCodes[i] === charCodes[j] ) { - block $breakMatchChars loop $matchChars -- get_local $i -+ local.get $i - i32.load8_u -- get_local $j -+ local.get $j - i32.load8_u - i32.ne - br_if $breakMatchChars - ;; j += 1; -- get_local $j -+ local.get $j - i32.const 1 - i32.add -- tee_local $j -+ local.tee $j - ;; if ( j === needleRight ) { return haystackLeft; } -- get_local $needleRight -+ local.get $needleRight - i32.eq - br_if $succeed - ;; i += 1; -- get_local $i -+ local.get $i - i32.const 1 - i32.add -- set_local $i -+ local.set $i - br $matchChars - ;; } - end end - ;; if ( haystackLeft === haystackBeg ) { break; } - ;; haystackLeft -= 1; -- get_local $haystackLeft -- get_local $haystackBeg -+ local.get $haystackLeft -+ local.get $haystackBeg - i32.eq - br_if $fail -- get_local $haystackLeft -+ local.get $haystackLeft - i32.const 1 - i32.sub -- set_local $haystackLeft -+ local.set $haystackLeft - br $mainLoop - ;; } - end - end ;; $succeed -- get_local $haystackLeft -+ local.get $haystackLeft - return - end ;; $fail - ;; return -1; -diff -up uBlock-1.42.4/src/js/wasm/hntrie.wat.wa1.0 uBlock-1.42.4/src/js/wasm/hntrie.wat ---- uBlock-1.42.4/src/js/wasm/hntrie.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 -+++ uBlock-1.42.4/src/js/wasm/hntrie.wat 2022-05-22 17:25:47.975606555 +0200 -@@ -64,19 +64,19 @@ - ;; - i32.const 264 ;; start of char section is stored at addr 264 - i32.load -- set_local $char0 -+ local.set $char0 - ;; let ineedle = this.buf[255]; - i32.const 255 ;; addr of needle is stored at addr 255 - i32.load8_u -- set_local $ineedle -+ local.set $ineedle - ;; let icell = this.buf32[iroot+0]; -- get_local $iroot -+ local.get $iroot - i32.const 2 - i32.shl - i32.load - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( icell === 0 ) { return -1; } - i32.eqz - if -@@ -86,43 +86,43 @@ - ;; for (;;) { - block $noSegment loop $nextSegment - ;; if ( ineedle === 0 ) { return -1; } -- get_local $ineedle -+ local.get $ineedle - i32.eqz - if - i32.const -1 - return - end - ;; ineedle -= 1; -- get_local $ineedle -+ local.get $ineedle - i32.const -1 - i32.add -- tee_local $ineedle -+ local.tee $ineedle - ;; let c = this.buf[ineedle]; - i32.load8_u -- set_local $c -+ local.set $c - ;; for (;;) { - block $foundSegment loop $findSegment - ;; v = this.buf32[icell+2]; -- get_local $icell -+ local.get $icell - i32.load offset=8 -- tee_local $v -+ local.tee $v - ;; i0 = char0 + (v >>> 8); - i32.const 8 - i32.shr_u -- get_local $char0 -+ local.get $char0 - i32.add -- tee_local $i0 -+ local.tee $i0 - ;; if ( this.buf[i0] === c ) { break; } - i32.load8_u -- get_local $c -+ local.get $c - i32.eq - br_if $foundSegment - ;; icell = this.buf32[icell+0]; -- get_local $icell -+ local.get $icell - i32.load - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - i32.eqz - if - i32.const -1 -@@ -131,44 +131,44 @@ - br 0 - end end - ;; let n = v & 0x7F; -- get_local $v -+ local.get $v - i32.const 0x7F - i32.and -- tee_local $n -+ local.tee $n - ;; if ( n > 1 ) { - i32.const 1 - i32.gt_u - if - ;; n -= 1; -- get_local $n -+ local.get $n - i32.const -1 - i32.add -- tee_local $n -+ local.tee $n - ;; if ( n > ineedle ) { return -1; } -- get_local $ineedle -+ local.get $ineedle - i32.gt_u - if - i32.const -1 - return - end -- get_local $i0 -+ local.get $i0 - i32.const 1 - i32.add -- tee_local $i0 -+ local.tee $i0 - ;; const i1 = i0 + n; -- get_local $n -+ local.get $n - i32.add -- set_local $i1 -+ local.set $i1 - ;; do { - loop - ;; ineedle -= 1; -- get_local $ineedle -+ local.get $ineedle - i32.const -1 - i32.add -- tee_local $ineedle -+ local.tee $ineedle - ;; if ( this.buf[i0] !== this.buf[ineedle] ) { return -1; } - i32.load8_u -- get_local $i0 -+ local.get $i0 - i32.load8_u - i32.ne - if -@@ -176,47 +176,47 @@ - return - end - ;; i0 += 1; -- get_local $i0 -+ local.get $i0 - i32.const 1 - i32.add -- tee_local $i0 -+ local.tee $i0 - ;; } while ( i0 < i1 ); -- get_local $i1 -+ local.get $i1 - i32.lt_u - br_if 0 - end - end - ;; if ( (v & 0x80) !== 0 ) { -- get_local $v -+ local.get $v - i32.const 0x80 - i32.and - if - ;; if ( ineedle === 0 || buf8[ineedle-1] === 0x2E /* '.' */ ) { - ;; return ineedle; - ;; } -- get_local $ineedle -+ local.get $ineedle - i32.eqz - if - i32.const 0 - return - end -- get_local $ineedle -+ local.get $ineedle - i32.const -1 - i32.add - i32.load8_u - i32.const 0x2E - i32.eq - if -- get_local $ineedle -+ local.get $ineedle - return - end - end - ;; icell = this.buf32[icell+1]; -- get_local $icell -+ local.get $icell - i32.load offset=4 - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( icell === 0 ) { break; } - br_if 0 - end end -@@ -245,7 +245,7 @@ - ;; let lhnchar = this.buf[255]; - i32.const 255 - i32.load8_u -- tee_local $lhnchar -+ local.tee $lhnchar - ;; if ( lhnchar === 0 ) { return 0; } - i32.eqz - if -@@ -281,21 +281,21 @@ - end - end - ;; let icell = this.buf32[iroot+0]; -- get_local $iroot -+ local.get $iroot - i32.const 2 - i32.shl -- tee_local $iroot -+ local.tee $iroot - i32.load - i32.const 2 - i32.shl -- tee_local $icell -+ local.tee $icell - ;; if ( this.buf32[icell+2] === 0 ) { - i32.eqz - if - ;; this.buf32[iroot+0] = this.addLeafCell(lhnchar); - ;; return 1; -- get_local $iroot -- get_local $lhnchar -+ local.get $iroot -+ local.get $lhnchar - call $addLeafCell - i32.store - i32.const 1 -@@ -304,37 +304,37 @@ - ;; const char0 = this.buf32[HNBIGTRIE_CHAR0_SLOT]; - i32.const 264 - i32.load -- set_local $char0 -+ local.set $char0 - ;; for (;;) { - loop $nextSegment - ;; const v = this.buf32[icell+2]; -- get_local $icell -+ local.get $icell - i32.load offset=8 -- tee_local $v -+ local.tee $v - ;; let isegchar0 = char0 + (v >>> 8); - i32.const 8 - i32.shr_u -- get_local $char0 -+ local.get $char0 - i32.add -- tee_local $isegchar0 -+ local.tee $isegchar0 - ;; if ( this.buf[isegchar0] !== this.buf[lhnchar-1] ) { - i32.load8_u -- get_local $lhnchar -+ local.get $lhnchar - i32.const -1 - i32.add - i32.load8_u - i32.ne - if - ;; inext = this.buf32[icell+0]; -- get_local $icell -+ local.get $icell - i32.load -- tee_local $inext -+ local.tee $inext - ;; if ( inext === 0 ) { - i32.eqz - if - ;; this.buf32[icell+0] = this.addLeafCell(lhnchar); -- get_local $icell -- get_local $lhnchar -+ local.get $icell -+ local.get $lhnchar - call $addLeafCell - i32.store - ;; return 1; -@@ -342,25 +342,25 @@ - return - end - ;; icell = inext; -- get_local $inext -+ local.get $inext - i32.const 2 - i32.shl -- set_local $icell -+ local.set $icell - br $nextSegment - end - ;; let isegchar = 1; - i32.const 1 -- set_local $isegchar -+ local.set $isegchar - ;; lhnchar -= 1; -- get_local $lhnchar -+ local.get $lhnchar - i32.const -1 - i32.add -- set_local $lhnchar -+ local.set $lhnchar - ;; const lsegchar = v & 0x7F; -- get_local $v -+ local.get $v - i32.const 0x7F - i32.and -- tee_local $lsegchar -+ local.tee $lsegchar - ;; if ( lsegchar !== 1 ) { - i32.const 1 - i32.ne -@@ -368,69 +368,69 @@ - ;; for (;;) { - block $mismatch loop - ;; if ( isegchar === lsegchar ) { break; } -- get_local $isegchar -- get_local $lsegchar -+ local.get $isegchar -+ local.get $lsegchar - i32.eq - br_if $mismatch -- get_local $lhnchar -+ local.get $lhnchar - i32.eqz - br_if $mismatch - ;; if ( this.buf[isegchar0+isegchar] !== this.buf[lhnchar-1] ) { break; } -- get_local $isegchar0 -- get_local $isegchar -+ local.get $isegchar0 -+ local.get $isegchar - i32.add - i32.load8_u -- get_local $lhnchar -+ local.get $lhnchar - i32.const -1 - i32.add - i32.load8_u - i32.ne - br_if $mismatch - ;; isegchar += 1; -- get_local $isegchar -+ local.get $isegchar - i32.const 1 - i32.add -- set_local $isegchar -+ local.set $isegchar - ;; lhnchar -= 1; -- get_local $lhnchar -+ local.get $lhnchar - i32.const -1 - i32.add -- set_local $lhnchar -+ local.set $lhnchar - br 0 - end end - end - ;; const boundaryBit = v & 0x80; -- get_local $v -+ local.get $v - i32.const 0x80 - i32.and -- set_local $boundaryBit -+ local.set $boundaryBit - ;; if ( isegchar === lsegchar ) { -- get_local $isegchar -- get_local $lsegchar -+ local.get $isegchar -+ local.get $lsegchar - i32.eq - if - ;; if ( lhnchar === 0 ) { -- get_local $lhnchar -+ local.get $lhnchar - i32.eqz - if - ;; if ( boundaryBit !== 0 ) { return 0; } -- get_local $boundaryBit -+ local.get $boundaryBit - if - i32.const 0 - return - end - ;; this.buf32[icell+2] = v | 0x80; -- get_local $icell -- get_local $v -+ local.get $icell -+ local.get $v - i32.const 0x80 - i32.or - i32.store offset=8 - else - ;; if ( boundaryBit !== 0 ) { -- get_local $boundaryBit -+ local.get $boundaryBit - if - ;; if ( this.buf[lhnchar-1] === 0x2E /* '.' */ ) { return -1; } -- get_local $lhnchar -+ local.get $lhnchar - i32.const -1 - i32.add - i32.load8_u -@@ -442,36 +442,36 @@ - end - end - ;; inext = this.buf32[icell+1]; -- get_local $icell -+ local.get $icell - i32.load offset=4 -- tee_local $inext -+ local.tee $inext - ;; if ( inext !== 0 ) { - if - ;; icell = inext; -- get_local $inext -+ local.get $inext - i32.const 2 - i32.shl -- set_local $icell -+ local.set $icell - ;; continue; - br $nextSegment - end - ;; this.buf32[icell+1] = this.addLeafCell(lhnchar); -- get_local $icell -- get_local $lhnchar -+ local.get $icell -+ local.get $lhnchar - call $addLeafCell - i32.store offset=4 - end - else - ;; isegchar0 -= char0; -- get_local $icell -- get_local $isegchar0 -- get_local $char0 -+ local.get $icell -+ local.get $isegchar0 -+ local.get $char0 - i32.sub -- tee_local $isegchar0 -+ local.tee $isegchar0 - ;; this.buf32[icell+2] = isegchar0 << 8 | isegchar; - i32.const 8 - i32.shl -- get_local $isegchar -+ local.get $isegchar - i32.or - i32.store offset=8 - ;; inext = this.addCell( -@@ -479,39 +479,39 @@ - ;; this.buf32[icell+1], - ;; isegchar0 + isegchar << 8 | boundaryBit | lsegchar - isegchar - ;; ); -- get_local $icell -+ local.get $icell - i32.const 0 -- get_local $icell -+ local.get $icell - i32.load offset=4 -- get_local $isegchar0 -- get_local $isegchar -+ local.get $isegchar0 -+ local.get $isegchar - i32.add - i32.const 8 - i32.shl -- get_local $boundaryBit -+ local.get $boundaryBit - i32.or -- get_local $lsegchar -- get_local $isegchar -+ local.get $lsegchar -+ local.get $isegchar - i32.sub - i32.or - call $addCell -- tee_local $inext -+ local.tee $inext - ;; this.buf32[icell+1] = inext; - i32.store offset=4 - ;; if ( lhnchar !== 0 ) { -- get_local $lhnchar -+ local.get $lhnchar - if - ;; this.buf32[inext+0] = this.addLeafCell(lhnchar); -- get_local $inext -+ local.get $inext - i32.const 2 - i32.shl -- get_local $lhnchar -+ local.get $lhnchar - call $addLeafCell - i32.store - else - ;; this.buf32[icell+2] |= 0x80; -- get_local $icell -- get_local $icell -+ local.get $icell -+ local.get $icell - i32.load offset=8 - i32.const 0x80 - i32.or -@@ -547,24 +547,24 @@ - i32.const 260 - i32.const 260 - i32.load -- tee_local $icell -+ local.tee $icell - i32.const 12 - i32.add - i32.store - ;; this.buf32[icell+0] = idown; -- get_local $icell -- get_local $idown -+ local.get $icell -+ local.get $idown - i32.store - ;; this.buf32[icell+1] = iright; -- get_local $icell -- get_local $iright -+ local.get $icell -+ local.get $iright - i32.store offset=4 - ;; this.buf32[icell+2] = v; -- get_local $icell -- get_local $v -+ local.get $icell -+ local.get $v - i32.store offset=8 - ;; return icell; -- get_local $icell -+ local.get $icell - i32.const 2 - i32.shr_u - ) -@@ -582,58 +582,58 @@ - ;; const r = this.buf32[TRIE1_SLOT] >>> 2; - i32.const 260 - i32.load -- tee_local $r -+ local.tee $r - ;; let i = r; -- set_local $i -+ local.set $i - ;; while ( lsegchar > 127 ) { - block $lastSegment loop -- get_local $lsegchar -+ local.get $lsegchar - i32.const 127 - i32.le_u - br_if $lastSegment - ;; this.buf32[i+0] = 0; -- get_local $i -+ local.get $i - i32.const 0 - i32.store - ;; this.buf32[i+1] = i + 3; -- get_local $i -- get_local $i -+ local.get $i -+ local.get $i - i32.const 12 - i32.add - i32.const 2 - i32.shr_u - i32.store offset=4 - ;; this.buf32[i+2] = this.addSegment(lsegchar, lsegchar - 127); -- get_local $i -- get_local $lsegchar -- get_local $lsegchar -+ local.get $i -+ local.get $lsegchar -+ local.get $lsegchar - i32.const 127 - i32.sub - call $addSegment - i32.store offset=8 - ;; lsegchar -= 127; -- get_local $lsegchar -+ local.get $lsegchar - i32.const 127 - i32.sub -- set_local $lsegchar -+ local.set $lsegchar - ;; i += 3; -- get_local $i -+ local.get $i - i32.const 12 - i32.add -- set_local $i -+ local.set $i - br 0 - end end - ;; this.buf32[i+0] = 0; -- get_local $i -+ local.get $i - i32.const 0 - i32.store - ;; this.buf32[i+1] = 0; -- get_local $i -+ local.get $i - i32.const 0 - i32.store offset=4 - ;; this.buf32[i+2] = this.addSegment(lsegchar, 0) | 0x80; -- get_local $i -- get_local $lsegchar -+ local.get $i -+ local.get $lsegchar - i32.const 0 - call $addSegment - i32.const 0x80 -@@ -641,12 +641,12 @@ - i32.store offset=8 - ;; this.buf32[TRIE1_SLOT] = i + 3 << 2; - i32.const 260 -- get_local $i -+ local.get $i - i32.const 12 - i32.add - i32.store - ;; return r; -- get_local $r -+ local.get $r - i32.const 2 - i32.shr_u - ) -@@ -666,7 +666,7 @@ - (local $i i32) ;; iterator - ;; - ;; if ( lsegchar === 0 ) { return 0; } -- get_local $lsegchar -+ local.get $lsegchar - i32.eqz - if - i32.const 0 -@@ -675,45 +675,45 @@ - ;; let char1 = this.buf32[HNBIGTRIE_CHAR1_SLOT]; - i32.const 268 - i32.load -- tee_local $char1 -+ local.tee $char1 - ;; const isegchar = char1 - this.buf32[HNBIGTRIE_CHAR0_SLOT]; - i32.const 264 - i32.load - i32.sub -- set_local $isegchar -+ local.set $isegchar - ;; let i = lsegchar; -- get_local $lsegchar -- set_local $i -+ local.get $lsegchar -+ local.set $i - ;; do { - loop - ;; this.buf[char1++] = this.buf[--i]; -- get_local $char1 -- get_local $i -+ local.get $char1 -+ local.get $i - i32.const -1 - i32.add -- tee_local $i -+ local.tee $i - i32.load8_u - i32.store8 -- get_local $char1 -+ local.get $char1 - i32.const 1 - i32.add -- set_local $char1 -+ local.set $char1 - ;; } while ( i !== lsegend ); -- get_local $i -- get_local $lsegend -+ local.get $i -+ local.get $lsegend - i32.ne - br_if 0 - end - ;; this.buf32[HNBIGTRIE_CHAR1_SLOT] = char1; - i32.const 268 -- get_local $char1 -+ local.get $char1 - i32.store - ;; return isegchar << 8 | lsegchar - lsegend; -- get_local $isegchar -+ local.get $isegchar - i32.const 8 - i32.shl -- get_local $lsegchar -- get_local $lsegend -+ local.get $lsegchar -+ local.get $lsegend - i32.sub - i32.or - ) -diff -up uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat.wa1.0 uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat ---- uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 -+++ uBlock-1.42.4/src/lib/lz4/lz4-block-codec.wat 2022-05-22 17:25:47.975606555 +0200 -@@ -68,15 +68,15 @@ - (func (export "lz4BlockEncodeBound") - (param $ilen i32) - (result i32) -- get_local $ilen -+ local.get $ilen - i32.const 0x7E000000 - i32.gt_u - if - i32.const 0 - return - end -- get_local $ilen -- get_local $ilen -+ local.get $ilen -+ local.get $ilen - i32.const 255 - i32.div_u - i32.add -@@ -123,14 +123,14 @@ - (local $llen i32) ;; length of found literals - (local $moffset i32) ;; offset to found match from current input position - (local $mlen i32) ;; length of found match -- get_local $ilen ;; empty input = empty output -+ local.get $ilen ;; empty input = empty output - i32.const 0x7E000000 ;; max input size: 0x7E000000 - i32.gt_u - if - i32.const 0 - return - end -- get_local $ilen ;; "blocks < 13 bytes cannot be compressed" -+ local.get $ilen ;; "blocks < 13 bytes cannot be compressed" - i32.const 13 - i32.lt_u - if -@@ -138,78 +138,78 @@ - return - end - call $getLinearMemoryOffset ;; hash table is at start of usable memory -- set_local $hashPtrBeg -- get_local $inPtr -- tee_local $anchorPtr -- get_local $ilen -+ local.set $hashPtrBeg -+ local.get $inPtr -+ local.tee $anchorPtr -+ local.get $ilen - i32.add -- tee_local $inPtrEnd -+ local.tee $inPtrEnd - i32.const -5 ;; "The last 5 bytes are always literals." - i32.add -- tee_local $inPtrEnd2 -+ local.tee $inPtrEnd2 - i32.const -7 ;; "The last match must start at least 12 bytes before end of block" - i32.add -- set_local $inPtrEnd1 -- get_local $outPtr -- set_local $outPtrBeg -+ local.set $inPtrEnd1 -+ local.get $outPtr -+ local.set $outPtrBeg - ;; - ;; sequence processing loop - ;; - block $noMoreSequence loop $nextSequence -- get_local $inPtr -- get_local $inPtrEnd1 -+ local.get $inPtr -+ local.get $inPtrEnd1 - i32.ge_u ;; 5 or less bytes left? - br_if $noMoreSequence -- get_local $inPtr ;; first sequence of 3 bytes before match-finding loop -+ local.get $inPtr ;; first sequence of 3 bytes before match-finding loop - i32.load8_u - i32.const 8 - i32.shl -- get_local $inPtr -+ local.get $inPtr - i32.load8_u offset=1 - i32.const 16 - i32.shl - i32.or -- get_local $inPtr -+ local.get $inPtr - i32.load8_u offset=2 - i32.const 24 - i32.shl - i32.or -- set_local $seq32 -+ local.set $seq32 - ;; - ;; match-finding loop - ;; - loop $findMatch block $noMatchFound -- get_local $inPtr -- get_local $inPtrEnd2 -+ local.get $inPtr -+ local.get $inPtrEnd2 - i32.gt_u ;; less than 12 bytes left? - br_if $noMoreSequence -- get_local $seq32 ;; update last byte of current sequence -+ local.get $seq32 ;; update last byte of current sequence - i32.const 8 - i32.shr_u -- get_local $inPtr -+ local.get $inPtr - i32.load8_u offset=3 - i32.const 24 - i32.shl - i32.or -- tee_local $seq32 -+ local.tee $seq32 - i32.const 0x9E3779B1 ;; compute 16-bit hash - i32.mul - i32.const 16 - i32.shr_u ;; hash value is at top of stack - i32.const 2 ;; lookup refPtr at hash entry - i32.shl -- get_local $hashPtrBeg -+ local.get $hashPtrBeg - i32.add -- tee_local $hashPtr -+ local.tee $hashPtr - i32.load -- set_local $refPtr -- get_local $hashPtr ;; update hash entry with inPtr -- get_local $inPtr -+ local.set $refPtr -+ local.get $hashPtr ;; update hash entry with inPtr -+ local.get $inPtr - i32.store -- get_local $inPtr -- get_local $refPtr -+ local.get $inPtr -+ local.get $refPtr - i32.sub -- tee_local $moffset ;; remember match offset, we will need it in case of match -+ local.tee $moffset ;; remember match offset, we will need it in case of match - i32.const 0xFFFF - i32.gt_s ;; match offset > 65535 = unusable match - br_if $noMatchFound -@@ -217,177 +217,177 @@ - ;; confirm match: different sequences can yield same hash - ;; compare-branch each byte to potentially save memory read ops - ;; -- get_local $seq32 ;; byte 0 -+ local.get $seq32 ;; byte 0 - i32.const 0xFF - i32.and -- get_local $refPtr -+ local.get $refPtr - i32.load8_u - i32.ne ;; refPtr[0] !== inPtr[0] - br_if $noMatchFound -- get_local $seq32 ;; byte 1 -+ local.get $seq32 ;; byte 1 - i32.const 8 - i32.shr_u - i32.const 0xFF - i32.and -- get_local $refPtr -+ local.get $refPtr - i32.load8_u offset=1 - i32.ne - br_if $noMatchFound ;; refPtr[1] !== inPtr[1] -- get_local $seq32 ;; byte 2 -+ local.get $seq32 ;; byte 2 - i32.const 16 - i32.shr_u - i32.const 0xFF - i32.and -- get_local $refPtr -+ local.get $refPtr - i32.load8_u offset=2 - i32.ne ;; refPtr[2] !== inPtr[2] - br_if $noMatchFound -- get_local $seq32 ;; byte 3 -+ local.get $seq32 ;; byte 3 - i32.const 24 - i32.shr_u - i32.const 0xFF - i32.and -- get_local $refPtr -+ local.get $refPtr - i32.load8_u offset=3 - i32.ne ;; refPtr[3] !== inPtr[3] - br_if $noMatchFound - ;; - ;; a valid match has been found at this point - ;; -- get_local $inPtr ;; compute length of literals -- get_local $anchorPtr -+ local.get $inPtr ;; compute length of literals -+ local.get $anchorPtr - i32.sub -- set_local $llen -- get_local $inPtr ;; find match length -+ local.set $llen -+ local.get $inPtr ;; find match length - i32.const 4 ;; skip over confirmed 4-byte match - i32.add -- set_local $inPtr -- get_local $refPtr -+ local.set $inPtr -+ local.get $refPtr - i32.const 4 - i32.add -- tee_local $mlen ;; remember refPtr to later compute match length -- set_local $refPtr -+ local.tee $mlen ;; remember refPtr to later compute match length -+ local.set $refPtr - block $endOfMatch loop ;; scan input buffer until match ends -- get_local $inPtr -- get_local $inPtrEnd2 -+ local.get $inPtr -+ local.get $inPtrEnd2 - i32.ge_u - br_if $endOfMatch -- get_local $inPtr -+ local.get $inPtr - i32.load8_u -- get_local $refPtr -+ local.get $refPtr - i32.load8_u - i32.ne - br_if $endOfMatch -- get_local $inPtr -+ local.get $inPtr - i32.const 1 - i32.add -- set_local $inPtr -- get_local $refPtr -+ local.set $inPtr -+ local.get $refPtr - i32.const 1 - i32.add -- set_local $refPtr -+ local.set $refPtr - br 0 - end end $endOfMatch - ;; encode token -- get_local $outPtr ;; output token -- get_local $llen -- get_local $refPtr -- get_local $mlen -+ local.get $outPtr ;; output token -+ local.get $llen -+ local.get $refPtr -+ local.get $mlen - i32.sub -- tee_local $mlen -+ local.tee $mlen - call $writeToken -- get_local $outPtr -+ local.get $outPtr - i32.const 1 - i32.add -- set_local $outPtr -- get_local $llen ;; encode/write length of literals if needed -+ local.set $outPtr -+ local.get $llen ;; encode/write length of literals if needed - i32.const 15 - i32.ge_s - if -- get_local $outPtr -- get_local $llen -+ local.get $outPtr -+ local.get $llen - call $writeLength -- set_local $outPtr -+ local.set $outPtr - end - ;; copy literals -- get_local $outPtr -- get_local $anchorPtr -- get_local $llen -+ local.get $outPtr -+ local.get $anchorPtr -+ local.get $llen - call $copy -- get_local $outPtr -- get_local $llen -+ local.get $outPtr -+ local.get $llen - i32.add -- set_local $outPtr -+ local.set $outPtr - ;; encode match offset -- get_local $outPtr -- get_local $moffset -+ local.get $outPtr -+ local.get $moffset - i32.store8 -- get_local $outPtr -- get_local $moffset -+ local.get $outPtr -+ local.get $moffset - i32.const 8 - i32.shr_u - i32.store8 offset=1 -- get_local $outPtr -+ local.get $outPtr - i32.const 2 - i32.add -- set_local $outPtr -- get_local $mlen ;; encode/write length of match if needed -+ local.set $outPtr -+ local.get $mlen ;; encode/write length of match if needed - i32.const 15 - i32.ge_s - if -- get_local $outPtr -- get_local $mlen -+ local.get $outPtr -+ local.get $mlen - call $writeLength -- set_local $outPtr -+ local.set $outPtr - end -- get_local $inPtr ;; advance anchor to current position -- set_local $anchorPtr -+ local.get $inPtr ;; advance anchor to current position -+ local.set $anchorPtr - br $nextSequence - end $noMatchFound -- get_local $inPtr ;; no match found: advance to next byte -+ local.get $inPtr ;; no match found: advance to next byte - i32.const 1 - i32.add -- set_local $inPtr -+ local.set $inPtr - br $findMatch end ;; match offset > 65535 = unusable match - end end $noMoreSequence - ;; - ;; generate last (match-less) sequence if compression succeeded - ;; -- get_local $outPtr -- get_local $outPtrBeg -+ local.get $outPtr -+ local.get $outPtrBeg - i32.eq - if - i32.const 0 - return - end -- get_local $outPtr -- get_local $inPtrEnd -- get_local $anchorPtr -+ local.get $outPtr -+ local.get $inPtrEnd -+ local.get $anchorPtr - i32.sub -- tee_local $llen -+ local.tee $llen - i32.const 0 - call $writeToken -- get_local $outPtr -+ local.get $outPtr - i32.const 1 - i32.add -- set_local $outPtr -- get_local $llen -+ local.set $outPtr -+ local.get $llen - i32.const 15 - i32.ge_u - if -- get_local $outPtr -- get_local $llen -+ local.get $outPtr -+ local.get $llen - call $writeLength -- set_local $outPtr -+ local.set $outPtr - end -- get_local $outPtr -- get_local $anchorPtr -- get_local $llen -+ local.get $outPtr -+ local.get $anchorPtr -+ local.get $llen - call $copy -- get_local $outPtr ;; return number of written bytes -- get_local $llen -+ local.get $outPtr ;; return number of written bytes -+ local.get $llen - i32.add -- get_local $outPtrBeg -+ local.get $outPtrBeg - i32.sub - ) - -@@ -413,128 +413,128 @@ - (local $token i32) ;; sequence token - (local $clen i32) ;; number of bytes to copy - (local $_ i32) ;; general purpose variable -- get_local $ilen ;; if ( ilen == 0 ) { return 0; } -+ local.get $ilen ;; if ( ilen == 0 ) { return 0; } - i32.eqz - if - i32.const 0 - return - end -- get_local $inPtr0 -- tee_local $inPtr ;; current position in input buffer -- get_local $ilen -+ local.get $inPtr0 -+ local.tee $inPtr ;; current position in input buffer -+ local.get $ilen - i32.add -- set_local $inPtrEnd -- get_local $outPtr0 ;; start of output buffer -- set_local $outPtr ;; current position in output buffer -+ local.set $inPtrEnd -+ local.get $outPtr0 ;; start of output buffer -+ local.set $outPtr ;; current position in output buffer - block $noMoreSequence loop ;; iterate through all sequences -- get_local $inPtr -- get_local $inPtrEnd -+ local.get $inPtr -+ local.get $inPtrEnd - i32.ge_u - br_if $noMoreSequence ;; break when nothing left to read in input buffer -- get_local $inPtr ;; read token -- consume one byte -+ local.get $inPtr ;; read token -- consume one byte - i32.load8_u -- get_local $inPtr -+ local.get $inPtr - i32.const 1 - i32.add -- set_local $inPtr -- tee_local $token ;; extract length of literals from token -+ local.set $inPtr -+ local.tee $token ;; extract length of literals from token - i32.const 4 - i32.shr_u -- tee_local $clen ;; consume extra length bytes if present -+ local.tee $clen ;; consume extra length bytes if present - i32.eqz - if else -- get_local $clen -+ local.get $clen - i32.const 15 - i32.eq - if loop -- get_local $inPtr -+ local.get $inPtr - i32.load8_u -- get_local $inPtr -+ local.get $inPtr - i32.const 1 - i32.add -- set_local $inPtr -- tee_local $_ -- get_local $clen -+ local.set $inPtr -+ local.tee $_ -+ local.get $clen - i32.add -- set_local $clen -- get_local $_ -+ local.set $clen -+ local.get $_ - i32.const 255 - i32.eq - br_if 0 - end end -- get_local $outPtr ;; copy literals to ouput buffer -- get_local $inPtr -- get_local $clen -+ local.get $outPtr ;; copy literals to ouput buffer -+ local.get $inPtr -+ local.get $clen - call $copy -- get_local $outPtr ;; advance output buffer pointer past copy -- get_local $clen -+ local.get $outPtr ;; advance output buffer pointer past copy -+ local.get $clen - i32.add -- set_local $outPtr -- get_local $clen ;; advance input buffer pointer past literals -- get_local $inPtr -+ local.set $outPtr -+ local.get $clen ;; advance input buffer pointer past literals -+ local.get $inPtr - i32.add -- tee_local $inPtr -- get_local $inPtrEnd ;; exit if this is the last sequence -+ local.tee $inPtr -+ local.get $inPtrEnd ;; exit if this is the last sequence - i32.eq - br_if $noMoreSequence - end -- get_local $outPtr ;; read match offset -- get_local $inPtr -+ local.get $outPtr ;; read match offset -+ local.get $inPtr - i32.load8_u -- get_local $inPtr -+ local.get $inPtr - i32.load8_u offset=1 - i32.const 8 - i32.shl - i32.or - i32.sub -- tee_local $matchPtr -- get_local $outPtr ;; match position can't be outside input buffer bounds -+ local.tee $matchPtr -+ local.get $outPtr ;; match position can't be outside input buffer bounds - i32.eq - br_if $noMoreSequence -- get_local $matchPtr -- get_local $inPtrEnd -+ local.get $matchPtr -+ local.get $inPtrEnd - i32.lt_u - br_if $noMoreSequence -- get_local $inPtr ;; advance input pointer past match offset bytes -+ local.get $inPtr ;; advance input pointer past match offset bytes - i32.const 2 - i32.add -- set_local $inPtr -- get_local $token ;; extract length of match from token -+ local.set $inPtr -+ local.get $token ;; extract length of match from token - i32.const 15 - i32.and - i32.const 4 - i32.add -- tee_local $clen -+ local.tee $clen - i32.const 19 ;; consume extra length bytes if present - i32.eq - if loop -- get_local $inPtr -+ local.get $inPtr - i32.load8_u -- get_local $inPtr -+ local.get $inPtr - i32.const 1 - i32.add -- set_local $inPtr -- tee_local $_ -- get_local $clen -+ local.set $inPtr -+ local.tee $_ -+ local.get $clen - i32.add -- set_local $clen -- get_local $_ -+ local.set $clen -+ local.get $_ - i32.const 255 - i32.eq - br_if 0 - end end -- get_local $outPtr ;; copy match to ouput buffer -- get_local $matchPtr -- get_local $clen -+ local.get $outPtr ;; copy match to ouput buffer -+ local.get $matchPtr -+ local.get $clen - call $copy -- get_local $clen ;; advance output buffer pointer past copy -- get_local $outPtr -+ local.get $clen ;; advance output buffer pointer past copy -+ local.get $outPtr - i32.add -- set_local $outPtr -+ local.set $outPtr - br 0 - end end $noMoreSequence -- get_local $outPtr ;; return number of written bytes -- get_local $outPtr0 -+ local.get $outPtr ;; return number of written bytes -+ local.get $outPtr0 - i32.sub - ) - -@@ -552,18 +552,18 @@ - (param $outPtr i32) - (param $llen i32) - (param $mlen i32) -- get_local $outPtr -- get_local $llen -+ local.get $outPtr -+ local.get $llen - i32.const 15 -- get_local $llen -+ local.get $llen - i32.const 15 - i32.lt_u - select - i32.const 4 - i32.shl -- get_local $mlen -+ local.get $mlen - i32.const 15 -- get_local $mlen -+ local.get $mlen - i32.const 15 - i32.lt_u - select -@@ -582,32 +582,32 @@ - (param $outPtr i32) - (param $len i32) - (result i32) -- get_local $len -+ local.get $len - i32.const 15 - i32.sub -- set_local $len -+ local.set $len - loop -- get_local $outPtr -- get_local $len -+ local.get $outPtr -+ local.get $len - i32.const 255 -- get_local $len -+ local.get $len - i32.const 255 - i32.lt_u - select - i32.store8 -- get_local $outPtr -+ local.get $outPtr - i32.const 1 - i32.add -- set_local $outPtr -- get_local $len -+ local.set $outPtr -+ local.get $len - i32.const 255 - i32.sub -- tee_local $len -+ local.tee $len - i32.const 0 - i32.ge_s - br_if 0 - end -- get_local $outPtr -+ local.get $outPtr - ) - - ;; -@@ -621,119 +621,119 @@ - (param $src i32) - (param $len i32) - block $lessThan8 loop -- get_local $len -+ local.get $len - i32.const 8 - i32.lt_u - br_if $lessThan8 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u - i32.store8 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=1 - i32.store8 offset=1 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=2 - i32.store8 offset=2 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=3 - i32.store8 offset=3 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=4 - i32.store8 offset=4 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=5 - i32.store8 offset=5 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=6 - i32.store8 offset=6 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=7 - i32.store8 offset=7 -- get_local $dst -+ local.get $dst - i32.const 8 - i32.add -- set_local $dst -- get_local $src -+ local.set $dst -+ local.get $src - i32.const 8 - i32.add -- set_local $src -- get_local $len -+ local.set $src -+ local.get $len - i32.const -8 - i32.add -- set_local $len -+ local.set $len - br 0 - end end $lessThan8 -- get_local $len -+ local.get $len - i32.const 4 - i32.ge_u - if -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u - i32.store8 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=1 - i32.store8 offset=1 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=2 - i32.store8 offset=2 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=3 - i32.store8 offset=3 -- get_local $dst -+ local.get $dst - i32.const 4 - i32.add -- set_local $dst -- get_local $src -+ local.set $dst -+ local.get $src - i32.const 4 - i32.add -- set_local $src -- get_local $len -+ local.set $src -+ local.get $len - i32.const -4 - i32.add -- set_local $len -+ local.set $len - end -- get_local $len -+ local.get $len - i32.const 2 - i32.ge_u - if -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u - i32.store8 -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u offset=1 - i32.store8 offset=1 -- get_local $dst -+ local.get $dst - i32.const 2 - i32.add -- set_local $dst -- get_local $src -+ local.set $dst -+ local.get $src - i32.const 2 - i32.add -- set_local $src -- get_local $len -+ local.set $src -+ local.get $len - i32.const -2 - i32.add -- set_local $len -+ local.set $len - end -- get_local $len -+ local.get $len - i32.eqz - if else -- get_local $dst -- get_local $src -+ local.get $dst -+ local.get $src - i32.load8_u - i32.store8 - end -diff -up uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat.wa1.0 uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat ---- uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat.wa1.0 2022-04-06 18:50:50.000000000 +0200 -+++ uBlock-1.42.4/src/lib/publicsuffixlist/wasm/publicsuffixlist.wat 2022-05-22 17:26:22.674470312 +0200 -@@ -83,133 +83,133 @@ - ;; const iCharData = buf32[CHARDATA_PTR_SLOT]; - i32.const 404 - i32.load -- set_local $iCharData -+ local.set $iCharData - ;; let iNode = pslBuffer32[RULES_PTR_SLOT]; - i32.const 400 - i32.load - i32.const 2 - i32.shl -- set_local $iNode -+ local.set $iNode - ;; let iLabel = LABEL_INDICES_SLOT; - i32.const 256 -- set_local $iLabel -+ local.set $iLabel - ;; let cursorPos = -1; - i32.const -1 -- set_local $cursorPos -+ local.set $cursorPos - ;; label-lookup loop - ;; for (;;) { - block $labelLookupDone loop $labelLookup - ;; // Extract label indices - ;; const labelBeg = buf8[iLabel+1]; - ;; const labelLen = buf8[iLabel+0] - labelBeg; -- get_local $iLabel -+ local.get $iLabel - i32.load8_u -- get_local $iLabel -+ local.get $iLabel - i32.load8_u offset=1 -- tee_local $labelBeg -+ local.tee $labelBeg - i32.sub -- set_local $labelLen -+ local.set $labelLen - ;; // Match-lookup loop: binary search - ;; let r = buf32[iNode+0] >>> 16; - ;; if ( r === 0 ) { break; } -- get_local $iNode -+ local.get $iNode - i32.load16_u offset=2 -- tee_local $r -+ local.tee $r - i32.eqz - br_if $labelLookupDone - ;; const iCandidates = buf32[iNode+2]; -- get_local $iNode -+ local.get $iNode - i32.load offset=8 - i32.const 2 - i32.shl -- set_local $iCandidates -+ local.set $iCandidates - ;; let l = 0; - ;; let iFound = 0; - i32.const 0 -- tee_local $l -- set_local $iFound -+ local.tee $l -+ local.set $iFound - ;; while ( l < r ) { - block $binarySearchDone loop $binarySearch -- get_local $l -- get_local $r -+ local.get $l -+ local.get $r - i32.ge_u - br_if $binarySearchDone - ;; const iCandidate = l + r >>> 1; -- get_local $l -- get_local $r -+ local.get $l -+ local.get $r - i32.add - i32.const 1 - i32.shr_u -- tee_local $iCandidate -+ local.tee $iCandidate - ;; const iCandidateNode = iCandidates + iCandidate + (iCandidate << 1); - i32.const 2 - i32.shl -- tee_local $_1 -- get_local $_1 -+ local.tee $_1 -+ local.get $_1 - i32.const 1 - i32.shl - i32.add -- get_local $iCandidates -+ local.get $iCandidates - i32.add -- tee_local $iCandidateNode -+ local.tee $iCandidateNode - ;; const candidateLen = buf32[iCandidateNode+0] & 0x000000FF; - i32.load8_u -- set_local $candidateLen -+ local.set $candidateLen - ;; let d = labelLen - candidateLen; -- get_local $labelLen -- get_local $candidateLen -+ local.get $labelLen -+ local.get $candidateLen - i32.sub -- tee_local $d -+ local.tee $d - ;; if ( d === 0 ) { - i32.eqz - if - ;; const iCandidateChar = candidateLen <= 4 -- get_local $candidateLen -+ local.get $candidateLen - i32.const 4 - i32.le_u - if - ;; ? iCandidateNode + 1 << 2 -- get_local $iCandidateNode -+ local.get $iCandidateNode - i32.const 4 - i32.add -- set_local $iCandidateChar -+ local.set $iCandidateChar - else - ;; : buf32[CHARDATA_PTR_SLOT] + buf32[iCandidateNode+1]; -- get_local $iCharData -- get_local $iCandidateNode -+ local.get $iCharData -+ local.get $iCandidateNode - i32.load offset=4 - i32.add -- set_local $iCandidateChar -+ local.set $iCandidateChar - end - ;; for ( let i = 0; i < labelLen; i++ ) { -- get_local $labelBeg -- tee_local $_1 -- get_local $labelLen -+ local.get $labelBeg -+ local.tee $_1 -+ local.get $labelLen - i32.add -- set_local $_3 -- get_local $iCandidateChar -- set_local $_2 -+ local.set $_3 -+ local.get $iCandidateChar -+ local.set $_2 - block $findDiffDone loop $findDiff - ;; d = buf8[labelBeg+i] - buf8[iCandidateChar+i]; - ;; if ( d !== 0 ) { break; } -- get_local $_1 -+ local.get $_1 - i32.load8_u -- get_local $_2 -+ local.get $_2 - i32.load8_u - i32.sub -- tee_local $d -+ local.tee $d - br_if $findDiffDone -- get_local $_1 -+ local.get $_1 - i32.const 1 - i32.add -- tee_local $_1 -- get_local $_3 -+ local.tee $_1 -+ local.get $_3 - i32.eq - br_if $findDiffDone -- get_local $_2 -+ local.get $_2 - i32.const 1 - i32.add -- set_local $_2 -+ local.set $_2 - br $findDiff - ;; } - end end -@@ -217,32 +217,32 @@ - end - ;; if ( d < 0 ) { - ;; r = iCandidate; -- get_local $d -+ local.get $d - i32.const 0 - i32.lt_s - if -- get_local $iCandidate -- set_local $r -+ local.get $iCandidate -+ local.set $r - br $binarySearch - end - ;; } else if ( d > 0 ) { - ;; l = iCandidate + 1; -- get_local $d -+ local.get $d - i32.const 0 - i32.gt_s - if -- get_local $iCandidate -+ local.get $iCandidate - i32.const 1 - i32.add -- set_local $l -+ local.set $l - br $binarySearch - end - ;; } else /* if ( d === 0 ) */ { - ;; iFound = iCandidateNode; - ;; break; - ;; } -- get_local $iCandidateNode -- set_local $iFound -+ local.get $iCandidateNode -+ local.set $iFound - end end - ;; } - ;; // 2. If no rules match, the prevailing rule is "*". -@@ -251,10 +251,10 @@ - ;; buf8[SUFFIX_NOT_FOUND_SLOT] = 1; - ;; iFound = iCandidates; - ;; } -- get_local $iFound -+ local.get $iFound - i32.eqz - if -- get_local $iCandidates -+ local.get $iCandidates - i32.load offset=4 - i32.const 0x2A - i32.ne -@@ -262,12 +262,12 @@ - i32.const 399 - i32.const 1 - i32.store8 -- get_local $iCandidates -- set_local $iFound -+ local.get $iCandidates -+ local.set $iFound - end - ;; iNode = iFound; -- get_local $iFound -- tee_local $iNode -+ local.get $iFound -+ local.tee $iNode - ;; // 5. If the prevailing rule is a exception rule, modify it by - ;; // removing the leftmost label. - ;; if ( (buf32[iNode+0] & 0x00000200) !== 0 ) { -@@ -277,15 +277,15 @@ - ;; break; - ;; } - i32.load8_u offset=1 -- tee_local $_1 -+ local.tee $_1 - i32.const 0x02 - i32.and - if -- get_local $iLabel -+ local.get $iLabel - i32.const 256 - i32.gt_u - if -- get_local $iLabel -+ local.get $iLabel - i32.const -2 - i32.add - return -@@ -295,25 +295,25 @@ - ;; if ( (buf32[iNode+0] & 0x00000100) !== 0 ) { - ;; cursorPos = labelBeg; - ;; } -- get_local $_1 -+ local.get $_1 - i32.const 0x01 - i32.and - if -- get_local $iLabel -- set_local $cursorPos -+ local.get $iLabel -+ local.set $cursorPos - end - ;; if ( labelBeg === 0 ) { break; } -- get_local $labelBeg -+ local.get $labelBeg - i32.eqz - br_if $labelLookupDone - ;; iLabel += 2; -- get_local $iLabel -+ local.get $iLabel - i32.const 2 - i32.add -- set_local $iLabel -+ local.set $iLabel - br $labelLookup - end end -- get_local $cursorPos -+ local.get $cursorPos - ) - - ;; diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index f640520..69a98aa 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit a971d3b616851b139f44de77f4d636afffa09ac5 +%global uAssets_commit 3cd137904ffe979f337f8e0099a46ca2d0c41e5f Name: mozilla-ublock-origin -Version: 1.43.0 +Version: 1.44.4 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -23,8 +23,6 @@ Source2: uAssets-%{uAssets_commit}.tar.gz # generate a free one with the mktarball.sh script below Source10: uAssets-mktarball.sh Patch0: %{name}-nonfree.patch -# use WebAssembly 1.0 function names (see https://github.com/WebAssembly/wabt/issues/1820) -Patch1: %{name}-wa1.0.patch Requires: mozilla-filesystem BuildArch: noarch @@ -69,7 +67,6 @@ from hosts files. %setup -q -n uBlock-%{version} tar -xz -C submodules/uAssets --strip-components=1 -f %{SOURCE2} %patch0 -p1 -%patch1 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt @@ -104,6 +101,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Oct 04 2022 Dominik Mierzejewski - 1.44.4-1 +- update to 1.44.4 (#2118741) +- drop obsolete patch + * Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 - update to 1.43.0 (#2095350) diff --git a/sources b/sources index a30379f..aacb376 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uBlock-1.43.0.tar.gz) = 537d8ea8d316348a423fe0688919dad507a3b5b5334a40b95efa4a2b5ee7a2dc740f52f260be32a019beca6477523b99ff33c78ea462ff01e046bdf7d069b0ae -SHA512 (uAssets-a971d3b616851b139f44de77f4d636afffa09ac5.tar.gz) = 71a68b267850516e7bfbd218379b89cb33291b5f96cf8bcca0ddb2ef946f13faa358a208b84c507f16b79ce8a92f89e83e4c8180bd3db8c0d95dd19778798df1 +SHA512 (uBlock-1.44.4.tar.gz) = ac90bed87603ce8ef1a1c41aef329a9159efc5c9c864c345694b32612dc8bf24ecc06ec506e064ee6b824ea54576c21454dd53b2f358e63d7ac73bf2d2ffebd6 +SHA512 (uAssets-3cd137904ffe979f337f8e0099a46ca2d0c41e5f.tar.gz) = 416732adaa049394c22418820ca475e591d9a8726957c5f6ee036b37d94d8055e56eed89d3407991d76ffd091a624ec4e3a7fb014362bc399fe4684d87b9d2e3 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index a519548..c6a3373 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=a971d3b616851b139f44de77f4d636afffa09ac5 +commit=3cd137904ffe979f337f8e0099a46ca2d0c41e5f url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 5bfe8f826dfc8ea4ac7c8b3b76b3b88127e5d51f Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Mon, 5 Dec 2022 18:02:10 +0100 Subject: [PATCH 49/84] update to 1.45.2 (#2141681) --- mozilla-ublock-origin.spec | 7 ++++++- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 389c8e6..2164aa3 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -8,7 +8,7 @@ %global uAssets_commit 3cd137904ffe979f337f8e0099a46ca2d0c41e5f Name: mozilla-ublock-origin -Version: 1.44.4 +Version: 1.45.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -32,6 +32,8 @@ BuildRequires: binaryen BuildRequires: libappstream-glib BuildRequires: python3 BuildRequires: wabt +# lib/csstree https://github.com/csstree/csstree MIT +Provides: bundled(npm-css-tree) = 2.2.1 # img/fontawesome/fontawesome-defs.svg http://fontawesome.io/ OFL Provides: bundled(fontawesome-fonts) = 4.7.0 # css/fonts/Inter/Inter-*.woff2 https://github.com/rsms/inter OFL @@ -101,6 +103,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Dec 05 2022 Dominik Mierzejewski - 1.45.2-1 +- update to 1.45.2 (#2141681) + * Tue Oct 04 2022 Dominik Mierzejewski - 1.44.4-1 - update to 1.44.4 (#2118741) - drop obsolete patch diff --git a/sources b/sources index aacb376..9dfe912 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uBlock-1.44.4.tar.gz) = ac90bed87603ce8ef1a1c41aef329a9159efc5c9c864c345694b32612dc8bf24ecc06ec506e064ee6b824ea54576c21454dd53b2f358e63d7ac73bf2d2ffebd6 -SHA512 (uAssets-3cd137904ffe979f337f8e0099a46ca2d0c41e5f.tar.gz) = 416732adaa049394c22418820ca475e591d9a8726957c5f6ee036b37d94d8055e56eed89d3407991d76ffd091a624ec4e3a7fb014362bc399fe4684d87b9d2e3 +SHA512 (uBlock-1.45.2.tar.gz) = 70af2612bf343e6a79a680d401b0beb29cfb113d1efad97511d6968f817746408611f35da8fe9bffbaee0e859f41d2c578374cf4577b22de0abc1f53fead3987 +SHA512 (uAssets-12c220af91139b025d9793e733328a5f8358db8e.tar.gz) = 1a1cfba41a5273324bd8cfe7f67d7f7d51956be0864b2ea75103ea8b0b309809a67d860d0bc24d97f101d4b78da58b76aa4721ae6754f72d7c2156f1ae5bb76e diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c6a3373..16048d4 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=3cd137904ffe979f337f8e0099a46ca2d0c41e5f +commit=12c220af91139b025d9793e733328a5f8358db8e url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 29798fefb5e814df6653735d800e93c60c080c42 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 6 Dec 2022 10:18:40 +0100 Subject: [PATCH 50/84] use correct uAssets source commit --- mozilla-ublock-origin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 2164aa3..3589be6 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,7 +5,7 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 3cd137904ffe979f337f8e0099a46ca2d0c41e5f +%global uAssets_commit 12c220af91139b025d9793e733328a5f8358db8e Name: mozilla-ublock-origin Version: 1.45.2 From 53db18ca31838c0aff65866355efbc2ca9c24255 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 27 Dec 2022 23:35:37 +0100 Subject: [PATCH 51/84] update to 1.46.0 (#2156059) --- mozilla-ublock-origin-nonfree.patch | 38 +++++++---------------------- mozilla-ublock-origin.spec | 12 ++++++--- sources | 4 +-- uAssets-mktarball.sh | 2 +- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/mozilla-ublock-origin-nonfree.patch b/mozilla-ublock-origin-nonfree.patch index 5aadc21..3ac53ba 100644 --- a/mozilla-ublock-origin-nonfree.patch +++ b/mozilla-ublock-origin-nonfree.patch @@ -1,31 +1,11 @@ -diff -up uBlock-1.41.2/assets/assets.json.orig uBlock-1.41.2/assets/assets.json ---- uBlock-1.41.2/assets/assets.json.orig 2022-02-10 13:30:26.000000000 +0100 -+++ uBlock-1.41.2/assets/assets.json 2022-02-16 08:30:59.720172418 +0100 -@@ -323,11 +323,7 @@ - "group": "multipurpose", - "updateAfter": 13, - "title": "Peter Lowe’s Ad and tracking server list", -- "contentURL": [ -- "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", -- "assets/thirdparties/pgl.yoyo.org/as/serverlist.txt", -- "assets/thirdparties/pgl.yoyo.org/as/serverlist" -- ], -+ "contentURL": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", - "supportURL": "https://pgl.yoyo.org/adservers/" - }, - "ALB-0": { -diff -up uBlock-1.38.0/tools/make-assets.sh.orig uBlock-1.38.0/tools/make-assets.sh ---- uBlock-1.38.0/tools/make-assets.sh.orig 2021-09-17 21:47:33.000000000 +0200 -+++ uBlock-1.38.0/tools/make-assets.sh 2021-09-22 07:42:48.339621145 +0200 -@@ -13,11 +13,9 @@ cp -R ./assets $DES/ +diff -up uBlock-1.46.0/tools/make-assets.sh.orig uBlock-1.46.0/tools/make-assets.sh +--- uBlock-1.46.0/tools/make-assets.sh.orig 2022-12-22 17:10:56.000000000 +0100 ++++ uBlock-1.46.0/tools/make-assets.sh 2022-12-27 22:26:00.897541783 +0100 +@@ -16,7 +16,6 @@ mkdir $DES/thirdparties + ASSETS_MAIN=dist/build/uAssets/main + ASSETS_PROD=dist/build/uAssets/prod - mkdir $DES/thirdparties - --git submodule update --depth 1 --init - UASSETS=submodules/uAssets - - cp -R $UASSETS/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/ --cp -R $UASSETS/thirdparties/pgl.yoyo.org $DES/thirdparties/ - cp -R $UASSETS/thirdparties/publicsuffix.org $DES/thirdparties/ - cp -R $UASSETS/thirdparties/urlhaus-filter $DES/thirdparties/ +-cp -R $ASSETS_MAIN/thirdparties/pgl.yoyo.org $DES/thirdparties/ + cp -R $ASSETS_MAIN/thirdparties/publicsuffix.org $DES/thirdparties/ + cp -R $ASSETS_MAIN/thirdparties/urlhaus-filter $DES/thirdparties/ diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 3589be6..ea0376d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 12c220af91139b025d9793e733328a5f8358db8e +%global uAssets_commit 3dfee87c164d9db69162ee75e0d15e39701e8217 Name: mozilla-ublock-origin -Version: 1.45.2 +Version: 1.46.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -67,7 +67,10 @@ from hosts files. %prep # https://github.com/gorhill/uBlock/tree/master/dist#build-instructions-for-developers %setup -q -n uBlock-%{version} -tar -xz -C submodules/uAssets --strip-components=1 -f %{SOURCE2} +mkdir -p dist/build/uAssets/{main,prod} +tar -xz -C dist/build/uAssets/main --strip-components=1 -f %{SOURCE2} +ln -s ../main/thirdparties/easylist-downloads.adblockplus.org dist/build/uAssets/prod/thirdparties +ln -s ../main/filters dist/build/uAssets/prod/filters %patch0 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt @@ -103,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 +- update to 1.46.0 (#2156059) + * Mon Dec 05 2022 Dominik Mierzejewski - 1.45.2-1 - update to 1.45.2 (#2141681) diff --git a/sources b/sources index 9dfe912..c49cb16 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uBlock-1.45.2.tar.gz) = 70af2612bf343e6a79a680d401b0beb29cfb113d1efad97511d6968f817746408611f35da8fe9bffbaee0e859f41d2c578374cf4577b22de0abc1f53fead3987 -SHA512 (uAssets-12c220af91139b025d9793e733328a5f8358db8e.tar.gz) = 1a1cfba41a5273324bd8cfe7f67d7f7d51956be0864b2ea75103ea8b0b309809a67d860d0bc24d97f101d4b78da58b76aa4721ae6754f72d7c2156f1ae5bb76e +SHA512 (uBlock-1.46.0.tar.gz) = caf7c825f53ef931e72993d775a0d831aead08b808e0a34e4d66181f4d4f9cbe6c715207d930529049b5e9df3291e90af94d5eefdf67f4ff9376f192aa3c0f6d +SHA512 (uAssets-3dfee87c164d9db69162ee75e0d15e39701e8217.tar.gz) = 306d5bc7fa701b195d7f480a3684d67c832f563c20bec073dd4b5dcb297888e05c9800947bd28f9add09f9bd68fb2ed372176ad3111ae33101dabad1e0a62ade diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 16048d4..5a12ae5 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=12c220af91139b025d9793e733328a5f8358db8e +commit=3dfee87c164d9db69162ee75e0d15e39701e8217 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 8541989f5461aa1626b4439e546ca06118f78718 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:46:47 +0000 Subject: [PATCH 52/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 30a1949..cd0f4a8 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.46.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.46.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 - update to 1.46.0 (#2156059) From a09d2c3a2a6ac919c373cfa3393832627a0e4024 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 17 Feb 2023 12:30:14 +0100 Subject: [PATCH 53/84] update to 1.47.0 (#2170209) --- mozilla-ublock-origin.spec | 9 ++++++--- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ea0376d..a4fe11e 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 3dfee87c164d9db69162ee75e0d15e39701e8217 +%global uAssets_commit 64cacb4a496e2ae7f14554ec73287aadf1d34e57 Name: mozilla-ublock-origin -Version: 1.46.0 +Version: 1.47.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -49,7 +49,7 @@ Provides: bundled(js-codemirror) = 5.59.2 # lib/lz4 https://github.com/gorhill/lz4-wasm BSD Provides: bundled(lz4-wasm) # lib/regexanalyzer https://github.com/foo123/RegexAnalyzer Copyleft -Provides: bundled(js-regexanalyzer) = 1.1.0 +Provides: bundled(js-regexanalyzer) = 1.2.0 # lib/hsluv https://github.com/hsluv/hsluv/ MIT Provides: bundled(js-hsluv) = 0.1.0 # usually much newer than Fedora's publicsuffix-list package @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Feb 17 2023 Dominik Mierzejewski - 1.47.0-1 +- update to 1.47.0 (#2170209) + * Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 - update to 1.46.0 (#2156059) diff --git a/sources b/sources index c49cb16..45575b8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uBlock-1.46.0.tar.gz) = caf7c825f53ef931e72993d775a0d831aead08b808e0a34e4d66181f4d4f9cbe6c715207d930529049b5e9df3291e90af94d5eefdf67f4ff9376f192aa3c0f6d -SHA512 (uAssets-3dfee87c164d9db69162ee75e0d15e39701e8217.tar.gz) = 306d5bc7fa701b195d7f480a3684d67c832f563c20bec073dd4b5dcb297888e05c9800947bd28f9add09f9bd68fb2ed372176ad3111ae33101dabad1e0a62ade +SHA512 (uAssets-64cacb4a496e2ae7f14554ec73287aadf1d34e57.tar.gz) = cb56819d8a176d2e64b03d207dfa883ce284f5ab4e4be51b00a223f9222cee96bc2c25efeec684b495fa1a909af1f22d3b917a5848e77c2e53457b2e9abfd0e7 +SHA512 (uBlock-1.47.0.tar.gz) = 9a25dff314d8e731cc4e79f2ec89ce7ce9f979f547318cdfcb5f21bece95c8b95a9489698cf806e188d6255b662b8e356cd3bd8a5c8a245a34de4d9a4b51a8e2 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 5a12ae5..468f072 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=3dfee87c164d9db69162ee75e0d15e39701e8217 +commit=64cacb4a496e2ae7f14554ec73287aadf1d34e57 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 26757ca2ad1cdc5601af6a8c9fb27ab0ef8b1ffa Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 13 Mar 2023 12:06:53 +0100 Subject: [PATCH 54/84] update to 1.47.4 (#2172525) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index a4fe11e..d78698a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 64cacb4a496e2ae7f14554ec73287aadf1d34e57 +%global uAssets_commit b4025f91ab39afa17476c7ba10c403e52ff92e89 Name: mozilla-ublock-origin -Version: 1.47.0 +Version: 1.47.4 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Mar 13 2023 Dominik Mierzejewski - 1.47.4-1 +- update to 1.47.4 (#2172525) + * Fri Feb 17 2023 Dominik Mierzejewski - 1.47.0-1 - update to 1.47.0 (#2170209) diff --git a/sources b/sources index 45575b8..b8723c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-64cacb4a496e2ae7f14554ec73287aadf1d34e57.tar.gz) = cb56819d8a176d2e64b03d207dfa883ce284f5ab4e4be51b00a223f9222cee96bc2c25efeec684b495fa1a909af1f22d3b917a5848e77c2e53457b2e9abfd0e7 -SHA512 (uBlock-1.47.0.tar.gz) = 9a25dff314d8e731cc4e79f2ec89ce7ce9f979f547318cdfcb5f21bece95c8b95a9489698cf806e188d6255b662b8e356cd3bd8a5c8a245a34de4d9a4b51a8e2 +SHA512 (uAssets-b4025f91ab39afa17476c7ba10c403e52ff92e89.tar.gz) = 4b34e043a6ac977275440309ea97445d21f06de5ad545799194c1efd16de8a268db5786367ce3e019324fcbb5d958c4faf6888dba553edc008d4d1e25167ab8a +SHA512 (uBlock-1.47.4.tar.gz) = c2887b7cadf818392cd6b45c769fe1261111ddb24a71c785b3f4ae4a56760bfc4d8f0534c29be4d492e45a3db4a9d2c9c0b737136b19d169f935d9db883d9355 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 468f072..cd13103 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=64cacb4a496e2ae7f14554ec73287aadf1d34e57 +commit=b4025f91ab39afa17476c7ba10c403e52ff92e89 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From cf34856af66c1d68844bbf15144f15a4fc2f6307 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 6 May 2023 18:29:18 +0200 Subject: [PATCH 55/84] update to 1.49.2 (#2180855) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index d78698a..95e8521 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,10 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit b4025f91ab39afa17476c7ba10c403e52ff92e89 +%global uAssets_commit 4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17 Name: mozilla-ublock-origin -Version: 1.47.4 +Version: 1.49.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 +- update to 1.49.2 (#2180855) + * Mon Mar 13 2023 Dominik Mierzejewski - 1.47.4-1 - update to 1.47.4 (#2172525) diff --git a/sources b/sources index b8723c4..2219689 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-b4025f91ab39afa17476c7ba10c403e52ff92e89.tar.gz) = 4b34e043a6ac977275440309ea97445d21f06de5ad545799194c1efd16de8a268db5786367ce3e019324fcbb5d958c4faf6888dba553edc008d4d1e25167ab8a -SHA512 (uBlock-1.47.4.tar.gz) = c2887b7cadf818392cd6b45c769fe1261111ddb24a71c785b3f4ae4a56760bfc4d8f0534c29be4d492e45a3db4a9d2c9c0b737136b19d169f935d9db883d9355 +SHA512 (uAssets-4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17.tar.gz) = ce01e8b48c2dd8a6079b7560e6dcef81d79523c8a0b63fbb11f87608bb0163ebc0901d759e74ea8a2f98d9d5f5237bcf405d1e4088e519ad31aaa65ff6455942 +SHA512 (uBlock-1.49.2.tar.gz) = 2b4f3627f221a3f45516a0d5258daa6b57b88a78cf15a2a77a997b92c3eb6da28707aeae5a14ee20852481e59b33deb7c73da7d84b2fc5e3f6077729f5f4ac79 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index cd13103..5f51d6e 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=b4025f91ab39afa17476c7ba10c403e52ff92e89 +commit=4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17 url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz pushd "$tmp" curl -L ${url} | tar xzf - From 60f7229a0e7d76d9c5c4edeacf34013ca670671a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 12 Jun 2023 23:22:06 +0200 Subject: [PATCH 56/84] update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps --- mozilla-ublock-origin.spec | 20 ++++++++++++-------- sources | 4 ++-- uAssets-mktarball.sh | 18 +++++++++++------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 9033af1..60a1831 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,8 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17 - Name: mozilla-ublock-origin -Version: 1.49.2 +Version: 1.50.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -16,7 +14,7 @@ License: GPLv3 and MIT and OFL and Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml -Source2: uAssets-%{uAssets_commit}.tar.gz +Source2: uAssets-%{version}.tar.gz # uAssets tarball contains non-free filter lists # thirdparties/mirror1.malwaredomains.com - http://www.malwaredomains.com/?page_id=1508 # thirdparties/pgl.yoyo.org - https://pgl.yoyo.org/license/ @@ -30,6 +28,7 @@ BuildArch: noarch ExcludeArch: ppc64 s390x BuildRequires: binaryen BuildRequires: libappstream-glib +BuildRequires: nodejs BuildRequires: python3 BuildRequires: wabt # lib/csstree https://github.com/csstree/csstree MIT @@ -67,10 +66,11 @@ from hosts files. %prep # https://github.com/gorhill/uBlock/tree/master/dist#build-instructions-for-developers %setup -q -n uBlock-%{version} -mkdir -p dist/build/uAssets/{main,prod} -tar -xz -C dist/build/uAssets/main --strip-components=1 -f %{SOURCE2} -ln -s ../main/thirdparties/easylist-downloads.adblockplus.org dist/build/uAssets/prod/thirdparties -ln -s ../main/filters dist/build/uAssets/prod/filters +mkdir -p dist/build/uAssets +tar -xz -C dist/build/uAssets -f %{SOURCE2} +pushd dist/build/uAssets/main +tools/make-ublock.sh +popd %patch0 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt @@ -106,6 +106,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 +- update to 1.50.0 (#2213457) +- match upstream build process for uAssets to avoid missing timestamps + * Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 - update to 1.49.2 (#2180855) diff --git a/sources b/sources index 2219689..f7218c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17.tar.gz) = ce01e8b48c2dd8a6079b7560e6dcef81d79523c8a0b63fbb11f87608bb0163ebc0901d759e74ea8a2f98d9d5f5237bcf405d1e4088e519ad31aaa65ff6455942 -SHA512 (uBlock-1.49.2.tar.gz) = 2b4f3627f221a3f45516a0d5258daa6b57b88a78cf15a2a77a997b92c3eb6da28707aeae5a14ee20852481e59b33deb7c73da7d84b2fc5e3f6077729f5f4ac79 +SHA512 (uAssets-1.50.0.tar.gz) = 39a478bdd16924f044c274a8cf8b5e761e77a0521387325a1df210daf9c98e53a99db479d3812f61f92712b5a21fcad5a006ad7e12ceab38eb0e546ca6cabccd +SHA512 (uBlock-1.50.0.tar.gz) = bde1c632309861205e5108e6d79e7dfa3f23a8634f25f2c7f622db1336f442af52586378446d873347d54d2f445b85dd96e28e2d06aae9b41688be08e771acde diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 5f51d6e..10bcfa4 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,14 +13,18 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17 -url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz +version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) +commit_master=071cef3879b968973728085576f8fbbe25619567 +commit_gh_pages=5788c6b92447d8211fcd9a3da91e5499c641fb4f +url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz +url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" -curl -L ${url} | tar xzf - -pushd ${name}-${commit} +curl -L ${url_master} | tar xzf - +mv ${name}-${commit_master} main # Peter Lowe's adservers list is non-commercial-only # https://github.com/uBlockOrigin/uAssets/issues/7657 -rm -r thirdparties/pgl.yoyo.org -popd -tar czf "$pwd"/${name}-${commit}.tar.gz ${name}-${commit} +rm -r main/thirdparties/pgl.yoyo.org +curl -L ${url_gh_pages} | tar xzf - +mv ${name}-${commit_gh_pages} prod +tar czf "$pwd"/${name}-${version}.tar.gz main prod popd From 394fd479120cda2f0afb84558b0c43e160a3f01a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 13 Jun 2023 09:53:28 +0200 Subject: [PATCH 57/84] fix deprecated patchN macro usage --- mozilla-ublock-origin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 60a1831..8cbc85e 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -71,7 +71,7 @@ tar -xz -C dist/build/uAssets -f %{SOURCE2} pushd dist/build/uAssets/main tools/make-ublock.sh popd -%patch0 -p1 +%patch 0 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt @@ -109,6 +109,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps +- fix deprecated patchN macro usage * Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 - update to 1.49.2 (#2180855) From f02278d499ace79709b34e58dddd35fb20a47e60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:51:02 +0000 Subject: [PATCH 58/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index e73209a..cf4e49a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.50.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.50.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps From 77e946728711cb871010d9117788bedeb83e3857 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 31 Aug 2023 22:48:44 +0200 Subject: [PATCH 59/84] update to 1.51.0 (#2224682) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8cbc85e..01845e3 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.50.0 +Version: 1.51.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 +- update to 1.51.0 (#2224682) + * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps diff --git a/sources b/sources index f7218c7..c8a1db9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.50.0.tar.gz) = 39a478bdd16924f044c274a8cf8b5e761e77a0521387325a1df210daf9c98e53a99db479d3812f61f92712b5a21fcad5a006ad7e12ceab38eb0e546ca6cabccd -SHA512 (uBlock-1.50.0.tar.gz) = bde1c632309861205e5108e6d79e7dfa3f23a8634f25f2c7f622db1336f442af52586378446d873347d54d2f445b85dd96e28e2d06aae9b41688be08e771acde +SHA512 (uAssets-1.51.0.tar.gz) = a42121c19ad086b7c51b4d23aae7c0d3a077200a450bbce76ef510f829f79a13db1c3a885f0338637837141f68795e0d21cf387717c0e8f2aa59039c8daeff5a +SHA512 (uBlock-1.51.0.tar.gz) = a593fb19263d35423e69bb151cf56c6eb6f10fe16e3f1539820783cc06845c5604f9beb35ae828cdb20fad34127f59b8aec4c77a58edafd25b61d6c5a7b2d6ea diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 10bcfa4..6d80c39 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=071cef3879b968973728085576f8fbbe25619567 -commit_gh_pages=5788c6b92447d8211fcd9a3da91e5499c641fb4f +commit_master=8abf7f8515a27ab8cabb1c1c4a3aeddc84078a25 +commit_gh_pages=e6cfb0f03b682b9927c5e25393c3cf6cc4d3b7e0 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 07e5a216eb1209ca11b9ed98e598287f3dcaff27 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 31 Aug 2023 22:57:40 +0200 Subject: [PATCH 60/84] new bundled dependency: js-beautify --- mozilla-ublock-origin.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 01845e3..021ba50 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -39,6 +39,8 @@ Provides: bundled(fontawesome-fonts) = 4.7.0 Provides: bundled(inter-fonts) # css/fonts/Metropolis/Metropolis-*.woff2 https://github.com/chrismsimpson/Metropolis Unlicense Provides: bundled(metropolis-fonts) +# lib/js-beautify https://github.com/beautify-web/js-beautify MIT +Provides: bundled(js-beautify) = 1.14.7 # lib/punycode.js https://mths.be/punycode MIT Provides: bundled(js-punycode) = 1.3.2 # lib/diff https://github.com/Swatinem/diff LGPLv3 @@ -75,6 +77,7 @@ popd rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt +mv src/lib/js-beautify/LICENSE LICENSE.js-beautify.txt mv src/lib/codemirror/LICENSE LICENSE.codemirror.txt %build @@ -100,6 +103,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %license LICENSE.txt %license LICENSE.codemirror.txt %license LICENSE.fontawesome.txt +%license LICENSE.js-beautify.txt %license LICENSE.Inter.txt %license src/css/fonts/Metropolis/UNLICENSE %{firefox_inst_dir}/%{ext_id}.xpi @@ -108,6 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %changelog * Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 - update to 1.51.0 (#2224682) +- new bundled dependency: js-beautify * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) From 61e4f45c582789633507132f632a674f271d1475 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 29 Sep 2023 11:48:56 +0200 Subject: [PATCH 61/84] update to 1.52.2 (#2238126) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 021ba50..5add87d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.51.0 +Version: 1.52.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 +- update to 1.52.2 (#2238126) + * Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 - update to 1.51.0 (#2224682) - new bundled dependency: js-beautify diff --git a/sources b/sources index c8a1db9..7aae05d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.51.0.tar.gz) = a42121c19ad086b7c51b4d23aae7c0d3a077200a450bbce76ef510f829f79a13db1c3a885f0338637837141f68795e0d21cf387717c0e8f2aa59039c8daeff5a -SHA512 (uBlock-1.51.0.tar.gz) = a593fb19263d35423e69bb151cf56c6eb6f10fe16e3f1539820783cc06845c5604f9beb35ae828cdb20fad34127f59b8aec4c77a58edafd25b61d6c5a7b2d6ea +SHA512 (uAssets-1.52.2.tar.gz) = 616d187e99b4744854cdd97c0e41193b92c9c612f308e980afee4dda23d3ca7fe4fbf9d61e0e25fcb625bec1eb4c1da2277c291364b52c1126715cd4b61531fb +SHA512 (uBlock-1.52.2.tar.gz) = 02deb47dcf14ff6688d095982030ff301be95af1942b690e01862bc8a8ce4c6e868730f5f850971ca08d6a2977a2e9c14ec062b7ce093009defd5b1c1562ed9d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 6d80c39..c51fd76 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=8abf7f8515a27ab8cabb1c1c4a3aeddc84078a25 -commit_gh_pages=e6cfb0f03b682b9927c5e25393c3cf6cc4d3b7e0 +commit_master=b92abdcba730f7daefc322cbcd11d5b4bea13cd0 +commit_gh_pages=b754776b80d52727dc4a84a2912b1497b2217923 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From a4d06ef555ddf11fb93159fd585586b556acde6a Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 21 Nov 2023 14:22:02 +0100 Subject: [PATCH 62/84] update to 1.53.0 (#2247578) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 73c26df..b491e08 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.52.2 +Version: 1.53.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 +- update to 1.53.0 (#2247578) + * Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 - update to 1.52.2 (#2238126) diff --git a/sources b/sources index 7aae05d..937efd2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.52.2.tar.gz) = 616d187e99b4744854cdd97c0e41193b92c9c612f308e980afee4dda23d3ca7fe4fbf9d61e0e25fcb625bec1eb4c1da2277c291364b52c1126715cd4b61531fb -SHA512 (uBlock-1.52.2.tar.gz) = 02deb47dcf14ff6688d095982030ff301be95af1942b690e01862bc8a8ce4c6e868730f5f850971ca08d6a2977a2e9c14ec062b7ce093009defd5b1c1562ed9d +SHA512 (uAssets-1.53.0.tar.gz) = db06c76c18a17e442efdba86def5a1246cb0a77c93566a5a8ae9f017ecaafb1ef4ef8660a1dbabc3449beca1f92253197ac9a16c6c51ecea2151424ac6514754 +SHA512 (uBlock-1.53.0.tar.gz) = cd479805061648ca425c690c7237441bb16392bf058b11c0739b5e0539feb2c7c3b0e21b9a9f5456a14f5c8742c092ff989c3d1d67f6bfadcae76dba8e1f8706 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c51fd76..008ed0e 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=b92abdcba730f7daefc322cbcd11d5b4bea13cd0 -commit_gh_pages=b754776b80d52727dc4a84a2912b1497b2217923 +commit_master=908d3753dc41e5339f26c104071bb3c8bc3d7e5a +commit_gh_pages=415f32afe7e63a734c2c068c5fe151aa3f6daa40 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 08984b0e87161a54b4fc9f56e59449a64eca9d6b Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 28 Nov 2023 13:18:54 +0100 Subject: [PATCH 63/84] update to 1.54.0 (#2251068) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index b491e08..5b86f05 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.53.0 +Version: 1.54.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 +- update to 1.54.0 (#2251068) + * Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 - update to 1.53.0 (#2247578) diff --git a/sources b/sources index 937efd2..d92dab4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.53.0.tar.gz) = db06c76c18a17e442efdba86def5a1246cb0a77c93566a5a8ae9f017ecaafb1ef4ef8660a1dbabc3449beca1f92253197ac9a16c6c51ecea2151424ac6514754 -SHA512 (uBlock-1.53.0.tar.gz) = cd479805061648ca425c690c7237441bb16392bf058b11c0739b5e0539feb2c7c3b0e21b9a9f5456a14f5c8742c092ff989c3d1d67f6bfadcae76dba8e1f8706 +SHA512 (uAssets-1.54.0.tar.gz) = efbc1f317ba205407f0943d327a6dcf2f1d417ea6ec33cb57113d679f132982845b51c6fe5cbabdbeedb1965be1a0ae42f4936010d45120cd311eae2dd7a6795 +SHA512 (uBlock-1.54.0.tar.gz) = 388453c24c9af3adbfc57d58514dbeb9ac4394a69c37037db35cd4b9ce9a0103af1d0b986a882df3291777de33a58ef5ceb2793cad3bbb05dc4fd59abf03f35f diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 008ed0e..5aed4b4 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=908d3753dc41e5339f26c104071bb3c8bc3d7e5a -commit_gh_pages=415f32afe7e63a734c2c068c5fe151aa3f6daa40 +commit_master=8ddfc42ba36e8a84b42af9dfb635cb1c0fd19982 +commit_gh_pages=308f134cde53e991f519be82203006622e07d696 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 19ba1a7b1d636ddb4f78c95604f94de734553670 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:41:52 +0000 Subject: [PATCH 64/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 1f85d9b..7bf907b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.54.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 - update to 1.54.0 (#2251068) From 36da233f607a24ce53ece3cf1159bac3ca4ba7eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:08:29 +0000 Subject: [PATCH 65/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 7bf907b..1a1b112 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.54.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.54.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bc6b4b27080f20791e284989a84cb25b0e3c13e6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 6 Mar 2024 12:38:26 +0100 Subject: [PATCH 66/84] update to 1.56.0 (#2256730) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 5b86f05..4844beb 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.54.0 +Version: 1.56.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 +- update to 1.56.0 (#2256730) + * Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 - update to 1.54.0 (#2251068) diff --git a/sources b/sources index d92dab4..6214956 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.54.0.tar.gz) = efbc1f317ba205407f0943d327a6dcf2f1d417ea6ec33cb57113d679f132982845b51c6fe5cbabdbeedb1965be1a0ae42f4936010d45120cd311eae2dd7a6795 -SHA512 (uBlock-1.54.0.tar.gz) = 388453c24c9af3adbfc57d58514dbeb9ac4394a69c37037db35cd4b9ce9a0103af1d0b986a882df3291777de33a58ef5ceb2793cad3bbb05dc4fd59abf03f35f +SHA512 (uAssets-1.56.0.tar.gz) = 631f6995c0131abd7901da516e12108ede9a0d50796061592821ac762b5185c1086e47cc29bfa91184590035c3a1c2d95c32d63bac2f0cc22896a10f8d07a67e +SHA512 (uBlock-1.56.0.tar.gz) = acb7d75058aababae8811580b720cea2697dc096144d1388acee6e3c486184e091d3aa91d1d71b47097329b0654904700434d339e7e76c7c1fe4de99a912e617 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 5aed4b4..fde8764 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=8ddfc42ba36e8a84b42af9dfb635cb1c0fd19982 -commit_gh_pages=308f134cde53e991f519be82203006622e07d696 +commit_master=c192966530cad92ed41fce38a7c5e7262d291b22 +commit_gh_pages=0e089e6ee827063bb63f955fd6b4bfabf275bbf4 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From b2539175b71cb4e27fff1b709f499c6a3a3119b1 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 5 Apr 2024 23:16:25 +0200 Subject: [PATCH 67/84] update to 1.57.0 (#2272273) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 4844beb..47e1727 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.56.0 +Version: 1.57.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 +- update to 1.57.0 (#2272273) + * Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 - update to 1.56.0 (#2256730) diff --git a/sources b/sources index 6214956..07b9fbf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.56.0.tar.gz) = 631f6995c0131abd7901da516e12108ede9a0d50796061592821ac762b5185c1086e47cc29bfa91184590035c3a1c2d95c32d63bac2f0cc22896a10f8d07a67e -SHA512 (uBlock-1.56.0.tar.gz) = acb7d75058aababae8811580b720cea2697dc096144d1388acee6e3c486184e091d3aa91d1d71b47097329b0654904700434d339e7e76c7c1fe4de99a912e617 +SHA512 (uAssets-1.57.0.tar.gz) = b47ad67d1e8bd28146711e0166e5ec8a1fb26eed41f8e957d07297cd5ffc48c0a534d8407f7f9724da2e44e1736556481eaa1772fead16a68caf01ca83e91bce +SHA512 (uBlock-1.57.0.tar.gz) = 2e5f9e38763e1f646b90eaee8fd9441bc40f42dec1014d44f8bea92718a0cb40d0183d189dd06868897ce6c3d19e194dbe9bd8e83f0d75bf25be009a4684d50b diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index fde8764..c274ebd 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=c192966530cad92ed41fce38a7c5e7262d291b22 -commit_gh_pages=0e089e6ee827063bb63f955fd6b4bfabf275bbf4 +commit_master=3d0822155990e74a09c6736f3e0891e54b83536a +commit_gh_pages=4e66b02957ec55e4a67797e02e27d8f118f70e0f url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From c7869abaaed8ba7f5682908a96b5d921c6b6560b Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 16 Jun 2024 17:53:55 +0200 Subject: [PATCH 68/84] update to 1.58.0 (#2274003) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 27a65dd..7aea3ac 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.57.0 +Version: 1.58.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -56,7 +56,7 @@ Provides: bundled(js-hsluv) = 0.1.0 # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -Provides: bundled(publicsuffix-list) = 20220330 +Provides: bundled(publicsuffix-list) = 20240504 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 +- update to 1.58.0 (#2274003) + * Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 - update to 1.57.0 (#2272273) diff --git a/sources b/sources index 07b9fbf..70944a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.57.0.tar.gz) = b47ad67d1e8bd28146711e0166e5ec8a1fb26eed41f8e957d07297cd5ffc48c0a534d8407f7f9724da2e44e1736556481eaa1772fead16a68caf01ca83e91bce -SHA512 (uBlock-1.57.0.tar.gz) = 2e5f9e38763e1f646b90eaee8fd9441bc40f42dec1014d44f8bea92718a0cb40d0183d189dd06868897ce6c3d19e194dbe9bd8e83f0d75bf25be009a4684d50b +SHA512 (uAssets-1.58.0.tar.gz) = 94744824185ac8b912aa403458670d069f9c2c400632c13592c005ae6663ea28db977ed29cf9fcdf6fd1873a7b0eb07b61aeccf912a4e6548df0eada503abdd7 +SHA512 (uBlock-1.58.0.tar.gz) = 99d1687a31e1866cebcb687ec2237a946c189f62f5fe16ea0179d19f22a276b1d6a2f691bf0f03f0e5ca43eaadd7a6fc09f7c2e3fba0536f22e48221dec627c6 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c274ebd..ff9e650 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=3d0822155990e74a09c6736f3e0891e54b83536a -commit_gh_pages=4e66b02957ec55e4a67797e02e27d8f118f70e0f +commit_master=175185a665d450ad9b4a6cbca6ba2a92b7a47997 +commit_gh_pages=6a3c1d6abef5adc4d0be13f4b3ad6ca3f52847bf url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From ba671ffda2c7084a95d36e28579d958c0dff7a3c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 16 Jun 2024 17:54:59 +0200 Subject: [PATCH 69/84] +- update Firefox app ID reference (#2279889) --- mozilla-ublock-origin.metainfo.xml | 2 +- mozilla-ublock-origin.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.metainfo.xml b/mozilla-ublock-origin.metainfo.xml index aa870dc..c319a55 100644 --- a/mozilla-ublock-origin.metainfo.xml +++ b/mozilla-ublock-origin.metainfo.xml @@ -2,7 +2,7 @@ mozilla-ublock-origin - firefox.desktop + org.mozilla.firefox.desktop uBlock Origin for Firefox An efficient blocker for Firefox. Fast and lean. https://github.com/gorhill/uBlock diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 6451750..d8636cf 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -112,6 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %changelog * Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 - update to 1.58.0 (#2274003) +- update Firefox app ID reference (#2279889) * Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 - update to 1.57.0 (#2272273) From dd574d90844d95ef5717928f90befb755a939821 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:42:24 +0000 Subject: [PATCH 70/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index d8636cf..212ae1d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.58.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 - update to 1.58.0 (#2274003) - update Firefox app ID reference (#2279889) From da98788b6038883a52f9b736ef5a401b8f10ff5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 11:59:49 +0200 Subject: [PATCH 71/84] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- mozilla-ublock-origin.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 212ae1d..2cdbbc2 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,10 +7,11 @@ Name: mozilla-ublock-origin Version: 1.58.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An efficient blocker for Firefox -License: GPLv3 and MIT and OFL and Unlicense +# Automatically converted from old format: GPLv3 and MIT and OFL and Unlicense - review is highly recommended. +License: GPL-3.0-only AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-OFL AND Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml @@ -110,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Sep 02 2024 Miroslav Suchý - 1.58.0-3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 67a3dd13185c3919ff52674e7ae893828ac433d1 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 11 Oct 2024 14:30:37 +0200 Subject: [PATCH 72/84] update to 1.60.0 (#2302506) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 7aea3ac..75203c2 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.58.0 +Version: 1.60.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Oct 11 2024 Dominik Mierzejewski - 1.60.0-1 +- update to 1.60.0 (#2302506) + * Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 - update to 1.58.0 (#2274003) diff --git a/sources b/sources index 70944a1..d64b699 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.58.0.tar.gz) = 94744824185ac8b912aa403458670d069f9c2c400632c13592c005ae6663ea28db977ed29cf9fcdf6fd1873a7b0eb07b61aeccf912a4e6548df0eada503abdd7 -SHA512 (uBlock-1.58.0.tar.gz) = 99d1687a31e1866cebcb687ec2237a946c189f62f5fe16ea0179d19f22a276b1d6a2f691bf0f03f0e5ca43eaadd7a6fc09f7c2e3fba0536f22e48221dec627c6 +SHA512 (uAssets-1.60.0.tar.gz) = 76b900d2dd352879f1ae242526ec7161fb1d0a053559f1845f9dfc3ce7a8ef76322c0a0c9c7ad46c5d92f44953ae734186e8f6615fc1d98039222e17539a91c3 +SHA512 (uBlock-1.60.0.tar.gz) = 6723e2d337157b5d2a12659ee4389c241cd8581ccec3315c5d54cfd9d2bbedce52e2f76eb05f3a7d0f7ce1591a024ceb6da6b14891b4a27c5b101337f60e90e0 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index ff9e650..8f5bdb6 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=175185a665d450ad9b4a6cbca6ba2a92b7a47997 -commit_gh_pages=6a3c1d6abef5adc4d0be13f4b3ad6ca3f52847bf +commit_master=550100432896041b3d82ca30e146d4cd75b73200 +commit_gh_pages=01f2f97080eb6f33d7e3d48008a3124095b79f43 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 6a780997e2d825393ad1309213f7a9eb7fc147a0 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 24 Nov 2024 12:33:17 +0100 Subject: [PATCH 73/84] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 238 ++++++++++++++++++++++++++++++++++++ mozilla-ublock-origin.spec | 241 +------------------------------------ 2 files changed, 240 insertions(+), 239 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..624990d --- /dev/null +++ b/changelog @@ -0,0 +1,238 @@ +* Fri Oct 11 2024 Dominik Mierzejewski - 1.60.0-1 +- update to 1.60.0 (#2302506) + +* Mon Sep 02 2024 Miroslav Suchý - 1.58.0-3 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 +- update to 1.58.0 (#2274003) +- update Firefox app ID reference (#2279889) + +* Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 +- update to 1.57.0 (#2272273) + +* Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 +- update to 1.56.0 (#2256730) + +* Thu Jan 25 2024 Fedora Release Engineering - 1.54.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 +- update to 1.54.0 (#2251068) + +* Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 +- update to 1.53.0 (#2247578) + +* Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 +- update to 1.52.2 (#2238126) + +* Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 +- update to 1.51.0 (#2224682) +- new bundled dependency: js-beautify + +* Thu Jul 20 2023 Fedora Release Engineering - 1.50.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 +- update to 1.50.0 (#2213457) +- match upstream build process for uAssets to avoid missing timestamps +- fix deprecated patchN macro usage + +* Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 +- update to 1.49.2 (#2180855) + +* Mon Mar 13 2023 Dominik Mierzejewski - 1.47.4-1 +- update to 1.47.4 (#2172525) + +* Fri Feb 17 2023 Dominik Mierzejewski - 1.47.0-1 +- update to 1.47.0 (#2170209) + +* Thu Jan 19 2023 Fedora Release Engineering - 1.46.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 +- update to 1.46.0 (#2156059) + +* Mon Dec 05 2022 Dominik Mierzejewski - 1.45.2-1 +- update to 1.45.2 (#2141681) + +* Tue Oct 04 2022 Dominik Mierzejewski - 1.44.4-1 +- update to 1.44.4 (#2118741) +- drop obsolete patch + +* Thu Jul 21 2022 Fedora Release Engineering - 1.43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 +- update to 1.43.0 (#2095350) + +* Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 +- update to 1.42.4 (#2070185) +- new bundled library: hsluv +- fix build with wabt 1.0.25+ + +* Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 +- update to 1.41.8 (#2055291) + +* Tue Feb 15 2022 Dominik Mierzejewski - 1.41.2-1 +- update to 1.41.2 (#2052004) + +* Thu Jan 20 2022 Fedora Release Engineering - 1.40.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 +- update to 1.40.8 (#2034966) + +* Sat Dec 04 2021 Dominik Mierzejewski - 1.39.2-1 +- update to 1.39.2 (#2025622) + +* Fri Oct 15 2021 Dominik Mierzejewski - 1.38.6-1 +- update to 1.38.6 (#2009380) + +* Tue Sep 21 2021 Dominik Mierzejewski - 1.38.0-1 +- update to 1.38.0 (#2005514) +- drop obsolete patch + +* Wed Jul 28 2021 Dominik Mierzejewski - 1.37.2-1 +- update to 1.37.2 (#1986999) + +* Sat Jul 24 2021 Dominik Mierzejewski - 1.37.0-1 +- update to 1.37.0 (#1985343) + +* Thu Jul 22 2021 Fedora Release Engineering - 1.36.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 +- update to 1.36.2 (#1979628) + +* Mon Jul 05 2021 Dominik Mierzejewski - 1.36.0-1 +- update to 1.36.0 (#1974010) +- update declared version of bundled publicsuffix-list + +* Tue Jun 08 2021 Dominik Mierzejewski - 1.35.2-1 +- update to 1.35.2 (#1954349) + +* Fri Apr 23 2021 Dominik Mierzejewski - 1.35.0-1 +- update to 1.35.0 (#1946869) + +* Thu Apr 01 2021 Dominik Mierzejewski - 1.34.0-1 +- update to 1.34.0 (#1925264) + +* Tue Feb 02 2021 Dominik Mierzejewski - 1.33.2-1 +- update to 1.33.2 (#1922482) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.32.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 +- update to 1.32.4 (#1918447) + +* Thu Aug 20 2020 Dominik Mierzejewski - 1.29.0-1 +- update to 1.29.0 (#1867396) +- optimize lz4 wasm code per upstream docs + +* Thu Aug 06 2020 Dominik Mierzejewski - 1.28.4-2 +- fix invalid JSON after Patch0 (caught by Raymond Hill) + +* Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 +- update to 1.28.4 (#1857445) +- avoid building on big-endian, wabt doesn't work there + +* Tue Jul 28 2020 Fedora Release Engineering - 1.28.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 +- add missing explicit BR on python3 + +* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-2 +- use python3 in build script explicitly + +* Sun Jul 12 2020 Dominik Mierzejewski - 1.28.2-1 +- update to 1.28.2 (#1835275) +- "build" from upstream "source" directly +- drop non-free components from upstream uAssets tarball + +* Sun May 03 2020 Dominik Mierzejewski - 1.26.2-1 +- update to 1.26.2 (#1825039) + +* Sun Apr 12 2020 Dominik Mierzejewski - 1.26.0-1 +- update to 1.26.0 (#1820622) + +* Sat Mar 14 2020 Dominik Mierzejewski - 1.25.2-1 +- update to 1.25.2 (#1797341) + +* Wed Jan 29 2020 Fedora Release Engineering - 1.24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 +- update to 1.24.2 (#1763778) + +* Sat Sep 28 2019 Dominik Mierzejewski - 1.22.4-1 +- update to 1.22.4 (#1756060) + +* Wed Sep 11 2019 Dominik Mierzejewski - 1.22.2-2 +- fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2) + +* Mon Sep 09 2019 Dominik Mierzejewski - 1.22.2-1 +- update to 1.22.2 (#1713383) + +* Thu Jul 25 2019 Fedora Release Engineering - 1.19.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon May 13 2019 Dominik Mierzejewski - 1.19.2-1 +- update to 1.19.2 (#1689200) + +* Thu Mar 14 2019 Dominik Mierzejewski - 1.18.6-1 +- update to 1.18.6 (#1680421) +- drop conditionals that are true in F26+ + +* Wed Feb 20 2019 Dominik Mierzejewski - 1.18.4-1 +- update to 1.18.4 (#1669295) +- update bundled fontawesome version + +* Fri Feb 01 2019 Fedora Release Engineering - 1.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Oct 27 2018 Dominik Mierzejewski - 1.17.2-1 +- update to 1.17.2 + +* Mon Jul 30 2018 Dominik Mierzejewski - 1.16.14-1 +- update to 1.16.14 (#1598265) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.16.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Dominik Mierzejewski - 1.16.12-1 +- update to 1.16.12 (#1567576) + +* Wed May 23 2018 Dominik Mierzejewski - 1.16.6-1 +- update to 1.16.6 (#1567576) +- update bundled codemirror version + +* Fri Apr 13 2018 Dominik Mierzejewski - 1.15.24-1 +- update to 1.15.24 +- use correct path for metainfo file +- update bundled components list and license tag +- include license texts in the standard location, too + +* Tue Feb 20 2018 Dominik Mierzejewski - 1.15.10-1 +- update to 1.15.10 + +* Thu Feb 08 2018 Fedora Release Engineering - 1.14.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Feb 01 2018 Dominik Mierzejewski - 1.14.24-1 +- update to 1.14.24 + +* Fri Dec 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.22-1 +- update to 1.14.22 +- install the appdata metainfo file into correct place + +* Wed Nov 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.18-1 +- Initial package diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index bcc7386..1e6d347 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.60.0 -Release: 1%{?dist} +Release: %autorelease Summary: An efficient blocker for Firefox # Automatically converted from old format: GPLv3 and MIT and OFL and Unlicense - review is highly recommended. @@ -111,241 +111,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog -* Fri Oct 11 2024 Dominik Mierzejewski - 1.60.0-1 -- update to 1.60.0 (#2302506) - -* Mon Sep 02 2024 Miroslav Suchý - 1.58.0-3 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 -- update to 1.58.0 (#2274003) -- update Firefox app ID reference (#2279889) - -* Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 -- update to 1.57.0 (#2272273) - -* Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 -- update to 1.56.0 (#2256730) - -* Thu Jan 25 2024 Fedora Release Engineering - 1.54.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 -- update to 1.54.0 (#2251068) - -* Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 -- update to 1.53.0 (#2247578) - -* Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 -- update to 1.52.2 (#2238126) - -* Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 -- update to 1.51.0 (#2224682) -- new bundled dependency: js-beautify - -* Thu Jul 20 2023 Fedora Release Engineering - 1.50.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 -- update to 1.50.0 (#2213457) -- match upstream build process for uAssets to avoid missing timestamps -- fix deprecated patchN macro usage - -* Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 -- update to 1.49.2 (#2180855) - -* Mon Mar 13 2023 Dominik Mierzejewski - 1.47.4-1 -- update to 1.47.4 (#2172525) - -* Fri Feb 17 2023 Dominik Mierzejewski - 1.47.0-1 -- update to 1.47.0 (#2170209) - -* Thu Jan 19 2023 Fedora Release Engineering - 1.46.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 -- update to 1.46.0 (#2156059) - -* Mon Dec 05 2022 Dominik Mierzejewski - 1.45.2-1 -- update to 1.45.2 (#2141681) - -* Tue Oct 04 2022 Dominik Mierzejewski - 1.44.4-1 -- update to 1.44.4 (#2118741) -- drop obsolete patch - -* Thu Jul 21 2022 Fedora Release Engineering - 1.43.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 -- update to 1.43.0 (#2095350) - -* Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 -- update to 1.42.4 (#2070185) -- new bundled library: hsluv -- fix build with wabt 1.0.25+ - -* Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 -- update to 1.41.8 (#2055291) - -* Tue Feb 15 2022 Dominik Mierzejewski - 1.41.2-1 -- update to 1.41.2 (#2052004) - -* Thu Jan 20 2022 Fedora Release Engineering - 1.40.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 -- update to 1.40.8 (#2034966) - -* Sat Dec 04 2021 Dominik Mierzejewski - 1.39.2-1 -- update to 1.39.2 (#2025622) - -* Fri Oct 15 2021 Dominik Mierzejewski - 1.38.6-1 -- update to 1.38.6 (#2009380) - -* Tue Sep 21 2021 Dominik Mierzejewski - 1.38.0-1 -- update to 1.38.0 (#2005514) -- drop obsolete patch - -* Wed Jul 28 2021 Dominik Mierzejewski - 1.37.2-1 -- update to 1.37.2 (#1986999) - -* Sat Jul 24 2021 Dominik Mierzejewski - 1.37.0-1 -- update to 1.37.0 (#1985343) - -* Thu Jul 22 2021 Fedora Release Engineering - 1.36.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 -- update to 1.36.2 (#1979628) - -* Mon Jul 05 2021 Dominik Mierzejewski - 1.36.0-1 -- update to 1.36.0 (#1974010) -- update declared version of bundled publicsuffix-list - -* Tue Jun 08 2021 Dominik Mierzejewski - 1.35.2-1 -- update to 1.35.2 (#1954349) - -* Fri Apr 23 2021 Dominik Mierzejewski - 1.35.0-1 -- update to 1.35.0 (#1946869) - -* Thu Apr 01 2021 Dominik Mierzejewski - 1.34.0-1 -- update to 1.34.0 (#1925264) - -* Tue Feb 02 2021 Dominik Mierzejewski - 1.33.2-1 -- update to 1.33.2 (#1922482) - -* Tue Jan 26 2021 Fedora Release Engineering - 1.32.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 -- update to 1.32.4 (#1918447) - -* Thu Aug 20 2020 Dominik Mierzejewski - 1.29.0-1 -- update to 1.29.0 (#1867396) -- optimize lz4 wasm code per upstream docs - -* Thu Aug 06 2020 Dominik Mierzejewski - 1.28.4-2 -- fix invalid JSON after Patch0 (caught by Raymond Hill) - -* Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 -- update to 1.28.4 (#1857445) -- avoid building on big-endian, wabt doesn't work there - -* Tue Jul 28 2020 Fedora Release Engineering - 1.28.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 -- add missing explicit BR on python3 - -* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-2 -- use python3 in build script explicitly - -* Sun Jul 12 2020 Dominik Mierzejewski - 1.28.2-1 -- update to 1.28.2 (#1835275) -- "build" from upstream "source" directly -- drop non-free components from upstream uAssets tarball - -* Sun May 03 2020 Dominik Mierzejewski - 1.26.2-1 -- update to 1.26.2 (#1825039) - -* Sun Apr 12 2020 Dominik Mierzejewski - 1.26.0-1 -- update to 1.26.0 (#1820622) - -* Sat Mar 14 2020 Dominik Mierzejewski - 1.25.2-1 -- update to 1.25.2 (#1797341) - -* Wed Jan 29 2020 Fedora Release Engineering - 1.24.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 -- update to 1.24.2 (#1763778) - -* Sat Sep 28 2019 Dominik Mierzejewski - 1.22.4-1 -- update to 1.22.4 (#1756060) - -* Wed Sep 11 2019 Dominik Mierzejewski - 1.22.2-2 -- fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2) - -* Mon Sep 09 2019 Dominik Mierzejewski - 1.22.2-1 -- update to 1.22.2 (#1713383) - -* Thu Jul 25 2019 Fedora Release Engineering - 1.19.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 13 2019 Dominik Mierzejewski - 1.19.2-1 -- update to 1.19.2 (#1689200) - -* Thu Mar 14 2019 Dominik Mierzejewski - 1.18.6-1 -- update to 1.18.6 (#1680421) -- drop conditionals that are true in F26+ - -* Wed Feb 20 2019 Dominik Mierzejewski - 1.18.4-1 -- update to 1.18.4 (#1669295) -- update bundled fontawesome version - -* Fri Feb 01 2019 Fedora Release Engineering - 1.17.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Oct 27 2018 Dominik Mierzejewski - 1.17.2-1 -- update to 1.17.2 - -* Mon Jul 30 2018 Dominik Mierzejewski - 1.16.14-1 -- update to 1.16.14 (#1598265) - -* Fri Jul 13 2018 Fedora Release Engineering - 1.16.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Dominik Mierzejewski - 1.16.12-1 -- update to 1.16.12 (#1567576) - -* Wed May 23 2018 Dominik Mierzejewski - 1.16.6-1 -- update to 1.16.6 (#1567576) -- update bundled codemirror version - -* Fri Apr 13 2018 Dominik Mierzejewski - 1.15.24-1 -- update to 1.15.24 -- use correct path for metainfo file -- update bundled components list and license tag -- include license texts in the standard location, too - -* Tue Feb 20 2018 Dominik Mierzejewski - 1.15.10-1 -- update to 1.15.10 - -* Thu Feb 08 2018 Fedora Release Engineering - 1.14.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Feb 01 2018 Dominik Mierzejewski - 1.14.24-1 -- update to 1.14.24 - -* Fri Dec 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.22-1 -- update to 1.14.22 -- install the appdata metainfo file into correct place - -* Wed Nov 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.18-1 -- Initial package +%autochangelog From f4feb96e93977982ea5333bfefa2d9aa7dd4557f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 24 Nov 2024 12:44:35 +0100 Subject: [PATCH 74/84] fix Firefox desktop ID --- mozilla-ublock-origin.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.metainfo.xml b/mozilla-ublock-origin.metainfo.xml index c319a55..3e84206 100644 --- a/mozilla-ublock-origin.metainfo.xml +++ b/mozilla-ublock-origin.metainfo.xml @@ -2,7 +2,7 @@ mozilla-ublock-origin - org.mozilla.firefox.desktop + org.mozilla.firefox uBlock Origin for Firefox An efficient blocker for Firefox. Fast and lean. https://github.com/gorhill/uBlock From 9530c8607677ad2a4d7116775105683bab8cd14e Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 24 Nov 2024 12:50:09 +0100 Subject: [PATCH 75/84] update to 1.61.2 (resolves rhbz#2324274) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 1e6d347..c72aa65 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.60.0 +Version: 1.61.2 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index d64b699..a20a312 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.60.0.tar.gz) = 76b900d2dd352879f1ae242526ec7161fb1d0a053559f1845f9dfc3ce7a8ef76322c0a0c9c7ad46c5d92f44953ae734186e8f6615fc1d98039222e17539a91c3 -SHA512 (uBlock-1.60.0.tar.gz) = 6723e2d337157b5d2a12659ee4389c241cd8581ccec3315c5d54cfd9d2bbedce52e2f76eb05f3a7d0f7ce1591a024ceb6da6b14891b4a27c5b101337f60e90e0 +SHA512 (uAssets-1.61.2.tar.gz) = 2a13e8ecdc04e3b6dcce73d17db83233e5a35c0ff2088ca77c73fff46f0f4fed5ef20b267a636641f678fd2ef744bd9e0c5dfe612138b8a77bce8e7344696103 +SHA512 (uBlock-1.61.2.tar.gz) = c2938dbe402ce5e960c9e1cca5fae88ea0b51ef6eef0ee396a07f0244e90eed0274e7175539d81973460d3377b5a05483d918836f6b77c9dcaecef6ba1445dfc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 8f5bdb6..589d385 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=550100432896041b3d82ca30e146d4cd75b73200 -commit_gh_pages=01f2f97080eb6f33d7e3d48008a3124095b79f43 +commit_master=3010690024ff55b8c58cb7df4f426d0206629ad2 +commit_gh_pages=88d3031866a6dc4727905e7fa28286d3e8008915 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 28b60c69b9d115897f4f5bf1b881f05486452b09 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 12 Jan 2025 12:11:11 +0100 Subject: [PATCH 76/84] update to 1.62.0 (resolves rhbz#2335170) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index c72aa65..d4c0cd7 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.61.2 +Version: 1.62.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index a20a312..a210e32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.61.2.tar.gz) = 2a13e8ecdc04e3b6dcce73d17db83233e5a35c0ff2088ca77c73fff46f0f4fed5ef20b267a636641f678fd2ef744bd9e0c5dfe612138b8a77bce8e7344696103 -SHA512 (uBlock-1.61.2.tar.gz) = c2938dbe402ce5e960c9e1cca5fae88ea0b51ef6eef0ee396a07f0244e90eed0274e7175539d81973460d3377b5a05483d918836f6b77c9dcaecef6ba1445dfc +SHA512 (uAssets-1.62.0.tar.gz) = 3ad60e530a4e0ee349cf4b7f5bc033d068544e40b7bde5ef2eaf1a40dedab8e02a2b7ceaadb42cdca67e08de49f57b3c24a6e825a518ef308dd9ed583739fcfb +SHA512 (uBlock-1.62.0.tar.gz) = cd9702b9037dc84a4420936a3ba65fb1d5c98e9c235dd5196fddcc0c78f29cba27e5f6cd554140138c91b2968038dd4e0f483ded79d68b6a989c56ae0062acf5 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 589d385..824ebb3 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=3010690024ff55b8c58cb7df4f426d0206629ad2 -commit_gh_pages=88d3031866a6dc4727905e7fa28286d3e8008915 +commit_master=7fb1c293e63a102fc0d83f6ce9d2327d33940e6e +commit_gh_pages=2e78e9651f855f36fc3d0d7f6dbcf8634c06f9ef url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 5865dd0ce539a76e69e314ff73843f9b67b3fd9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:09:48 +0000 Subject: [PATCH 77/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5341d8185f7a639924cd2790cc2c8ee264aad91c Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 4 Apr 2025 17:16:52 +0200 Subject: [PATCH 78/84] update to 1.63.2 (resolves rhbz#2353115) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index d4c0cd7..ee3a5bf 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.62.0 +Version: 1.63.2 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index a210e32..803d1e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.62.0.tar.gz) = 3ad60e530a4e0ee349cf4b7f5bc033d068544e40b7bde5ef2eaf1a40dedab8e02a2b7ceaadb42cdca67e08de49f57b3c24a6e825a518ef308dd9ed583739fcfb -SHA512 (uBlock-1.62.0.tar.gz) = cd9702b9037dc84a4420936a3ba65fb1d5c98e9c235dd5196fddcc0c78f29cba27e5f6cd554140138c91b2968038dd4e0f483ded79d68b6a989c56ae0062acf5 +SHA512 (uAssets-1.63.2.tar.gz) = f586c59e883c28a2b3664e5cebf120fec1fbf307e8c8c6fa0ed9e54cd12798c06336a0dbd8e0887131c426533764afe2432c046a18a83ff6a9f6dc1606ee1d06 +SHA512 (uBlock-1.63.2.tar.gz) = 5687617aa33cced43bde19de857f298d928a328d16f21ae82903f41caa38a7794495626b2731201107fefc08c53c9dcc40d056760c6de051a81839b9645f0d30 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 824ebb3..00029bc 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=7fb1c293e63a102fc0d83f6ce9d2327d33940e6e -commit_gh_pages=2e78e9651f855f36fc3d0d7f6dbcf8634c06f9ef +commit_master=14dfe816109abe31aea2ea5ee4d318cf701329cb +commit_gh_pages=b8c1c9fc1eb7ce44b664f5a8d3f369f406fd6326 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 70ca72a018b6eb423f9eb8d5b3e716f1f34ec659 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 19 May 2025 19:51:04 +0200 Subject: [PATCH 79/84] update to 1.64.0 (resolves rhbz#2366177) - fixes CVE-2025-4215 --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ee3a5bf..8be779b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.63.2 +Version: 1.64.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 803d1e6..82d4295 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.63.2.tar.gz) = f586c59e883c28a2b3664e5cebf120fec1fbf307e8c8c6fa0ed9e54cd12798c06336a0dbd8e0887131c426533764afe2432c046a18a83ff6a9f6dc1606ee1d06 -SHA512 (uBlock-1.63.2.tar.gz) = 5687617aa33cced43bde19de857f298d928a328d16f21ae82903f41caa38a7794495626b2731201107fefc08c53c9dcc40d056760c6de051a81839b9645f0d30 +SHA512 (uAssets-1.64.0.tar.gz) = 9560894223b86859fd9f04b7af3c8800957f9d86f41a4139f77e4e39319fb4b858995f0ecf8ba086623bde549915ac75757dba7f11a2480f19a1b849ab503acf +SHA512 (uBlock-1.64.0.tar.gz) = 72fb54d093002cdc81befd0d0cbfd82013ceec519195a0e8c75a9bbf31a3e5074b7521432a7bcf92b1ddf3cc689d7e60c3faf41db202226f4ed65198074e3bfc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 00029bc..abba7c7 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=14dfe816109abe31aea2ea5ee4d318cf701329cb -commit_gh_pages=b8c1c9fc1eb7ce44b664f5a8d3f369f406fd6326 +commit_master=ec20c13add56b1fded7892dab2fe8ffaa2e21e58 +commit_gh_pages=005ab2b48f5f3cb26aa737bdbb45516e0251ff7b url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 83e1978771aea8e7e4d1ed9b8927a2891127a818 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 11 Jul 2025 23:47:45 +0200 Subject: [PATCH 80/84] update to 1.65.0 (resolves rhbz#2379467) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8be779b..66f42a9 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.64.0 +Version: 1.65.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 82d4295..5d5c6ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.64.0.tar.gz) = 9560894223b86859fd9f04b7af3c8800957f9d86f41a4139f77e4e39319fb4b858995f0ecf8ba086623bde549915ac75757dba7f11a2480f19a1b849ab503acf -SHA512 (uBlock-1.64.0.tar.gz) = 72fb54d093002cdc81befd0d0cbfd82013ceec519195a0e8c75a9bbf31a3e5074b7521432a7bcf92b1ddf3cc689d7e60c3faf41db202226f4ed65198074e3bfc +SHA512 (uAssets-1.65.0.tar.gz) = debe265b77108210136f13fb50dfdd2b43f039275b0b9b7eff1853bd94c746c2267107a45d72a72c577a484f5c79a276926442c538dbe314e41e7d8370167574 +SHA512 (uBlock-1.65.0.tar.gz) = 61c80541eb646872ce3e70228134ccc3e33bea433f1005c43e3d2ccd26377a539f593ab244437f4679baace0482b975e626c0649f5fbdec80df6045a88fc3d7d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index abba7c7..38a0496 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=ec20c13add56b1fded7892dab2fe8ffaa2e21e58 -commit_gh_pages=005ab2b48f5f3cb26aa737bdbb45516e0251ff7b +commit_master=80e93b0e5b8d4018100110fdf13c0093e6e511bd +commit_gh_pages=e7ed6bf236adeac4a95807f5b3fb985800e52b0f url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 08b5966f7b55a1376b4b92e0c3123e8dd52f8fc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:22:33 +0000 Subject: [PATCH 81/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f500f9fbb2fb831b55a5153d79f6fa4bedf17ac2 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 27 Sep 2025 13:21:12 +0200 Subject: [PATCH 82/84] update to 1.66.4 (resolves rhbz#2393682) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 66f42a9..f6e1aed 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.65.0 +Version: 1.66.4 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 5d5c6ea..10fa125 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.65.0.tar.gz) = debe265b77108210136f13fb50dfdd2b43f039275b0b9b7eff1853bd94c746c2267107a45d72a72c577a484f5c79a276926442c538dbe314e41e7d8370167574 -SHA512 (uBlock-1.65.0.tar.gz) = 61c80541eb646872ce3e70228134ccc3e33bea433f1005c43e3d2ccd26377a539f593ab244437f4679baace0482b975e626c0649f5fbdec80df6045a88fc3d7d +SHA512 (uAssets-1.66.4.tar.gz) = d753ef6fd30af7affbcf1f31a771b9cfb4b3c3237478983b5044caed7fa741089b6cbdb835050801314d57d8efa22633611acc063f77dd420439ad4b482683b7 +SHA512 (uBlock-1.66.4.tar.gz) = 13d8ea19077e68d1a50c057303784259498295089b5db21b125df09c5e1c715b34067f580107655f13fa85427a49d0e2b5760adc6851e90ea8da4a3d30a0ad60 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 38a0496..c78b837 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=80e93b0e5b8d4018100110fdf13c0093e6e511bd -commit_gh_pages=e7ed6bf236adeac4a95807f5b3fb985800e52b0f +commit_master=fc274fd22fa64db0aef0141a0c6ace8964d89cd0 +commit_gh_pages=b1c72587f3f652645a4a56f7ad3315b6e561360a url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 37b32640c8144dc4f9a67b029d1936a1626f4275 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 8 Nov 2025 19:36:35 +0100 Subject: [PATCH 83/84] update to 1.67.0 (resolves rhbz#2404220) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index f6e1aed..3d6184a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.66.4 +Version: 1.67.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 10fa125..0e54644 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.66.4.tar.gz) = d753ef6fd30af7affbcf1f31a771b9cfb4b3c3237478983b5044caed7fa741089b6cbdb835050801314d57d8efa22633611acc063f77dd420439ad4b482683b7 -SHA512 (uBlock-1.66.4.tar.gz) = 13d8ea19077e68d1a50c057303784259498295089b5db21b125df09c5e1c715b34067f580107655f13fa85427a49d0e2b5760adc6851e90ea8da4a3d30a0ad60 +SHA512 (uAssets-1.67.0.tar.gz) = aae8328fc9e6f240a9c4230a780cca7d43657a1f0d542dbbbcbc568db0b9fa4b863629a57ad250c423365f192f7d2a9521fbef304e070853fbcffc281aa26915 +SHA512 (uBlock-1.67.0.tar.gz) = 02565b800f6dbae550793a2f9bc46c2925e8d12bf66f416044ccb48eff668ca20e28abc7ac596c8fd9bec5361bf7926dc0b61620586628dbc6fa2aa165104949 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c78b837..961d35f 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=fc274fd22fa64db0aef0141a0c6ace8964d89cd0 -commit_gh_pages=b1c72587f3f652645a4a56f7ad3315b6e561360a +commit_master=aae6be054144902879205a6bd90f62ab14198e61 +commit_gh_pages=6e6201e63c48190f4c6c4b622c4a7e48ca531469 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From b2b67543cd499efa81eb6d66be960c33a733b1b2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 27 Nov 2025 21:06:46 +0100 Subject: [PATCH 84/84] update to 1.68.0 (resolves rhbz#2417502) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 3d6184a..f42be5d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.67.0 +Version: 1.68.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 0e54644..0a46ef1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.67.0.tar.gz) = aae8328fc9e6f240a9c4230a780cca7d43657a1f0d542dbbbcbc568db0b9fa4b863629a57ad250c423365f192f7d2a9521fbef304e070853fbcffc281aa26915 -SHA512 (uBlock-1.67.0.tar.gz) = 02565b800f6dbae550793a2f9bc46c2925e8d12bf66f416044ccb48eff668ca20e28abc7ac596c8fd9bec5361bf7926dc0b61620586628dbc6fa2aa165104949 +SHA512 (uAssets-1.68.0.tar.gz) = 360fa9d0b32a94711323db40f4ee16533f5b6f625ab893d740b5bed4084aa0dbcd97f03c207f02d44644fa6322be564eef09dd1ce64d555f442dfda00ff3a077 +SHA512 (uBlock-1.68.0.tar.gz) = ec4c3c956abf0e1cbf813a8e19f60a461bc04ea3644e7f0bd5fce25c0dbe6d45ede67871135ed49e2ab507ac2fe294b945d2dd8dcce14c3fddfcfad6a16de96d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 961d35f..cdc7123 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=aae6be054144902879205a6bd90f62ab14198e61 -commit_gh_pages=6e6201e63c48190f4c6c4b622c4a7e48ca531469 +commit_master=5f9f16404dce279a66b533edbccf869196b8d2b1 +commit_gh_pages=d975a96651a13bf8649bd16ee293e66b731aebc7 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp"