adblock: update 4.1.5-6

* adapted changed oisd downloads (again), fixed #20516

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0b222b7e10ebc8a775d603808e72a7d70ac90972)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index bd549920afa1920ccb0522bf41650ef0f5d69c24..22a59a926ada529e90766656b94f295e27f3f0af 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.1.5
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
index 5bb1ecea2834442451b751ded050358ba5de1e2c..95cbfeedc470ec7f0c1bdd985208da689216fac2 100644 (file)
--- a/net/adblock/files/README.md
+++ b/net/adblock/files/README.md
@@ -30,7 +30,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 | lightswitch05       |         | XL   | compilation      | [Link](https://github.com/lightswitch05/hosts)                                    |
 | notracking          |         | XL   | tracking         | [Link](https://github.com/notracking/hosts-blocklists)                            |
 | oisd_big            |         | XXL  | general          | [Link](https://oisd.nl)                                                           |
-| oisd_nsfw           |         | XL   | general          | [Link](https://oisd.nl)                                                           |
+| oisd_nsfw           |         | XXL  | porn             | [Link](https://oisd.nl)                                                           |
 | oisd_small          |         | L    | general          | [Link](https://oisd.nl)                                                           |
 | openphish           |         | S    | phishing         | [Link](https://openphish.com)                                                     |
 | phishing_army       |         | S    | phishing         | [Link](https://phishing.army)                                                     |

diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources
index e46a007ac0717b3283e43a8f958887e763d1332c..d6f56f6d4eaf08201627e7b5ee2c6a18b0c50901 100644 (file)
--- a/net/adblock/files/adblock.sources
+++ b/net/adblock/files/adblock.sources
@@ -133,21 +133,21 @@
                "descurl": "https://github.com/notracking/hosts-blocklists"
        },
        "oisd_big": {
-               "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_big.txt",
+               "url": "https://big.oisd.nl/domainswild",
                "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
                "size": "XXL",
                "focus": "general",
                "descurl": "https://oisd.nl"
        },
        "oisd_nsfw": {
-               "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_nsfw.txt",
+               "url": "https://nsfw.oisd.nl/domainswild",
                "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
-               "size": "XL",
-               "focus": "general",
+               "size": "XXL",
+               "focus": "porn",
                "descurl": "https://oisd.nl"
        },
        "oisd_small": {
-               "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_small.txt",
+               "url": "https://small.oisd.nl/domainswild",
                "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
                "size": "L",
                "focus": "general",