adblock: update 4.0.5-5

* add regional list source for czech/slovak
* add regional list source for korea
* adapt oisd_nl changes, switch to adb-syntax domains

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

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 9d5237823a1acab40807682d5595088240cc77fc..b50c00f0b13b70519de3517785f6bc796c22f477 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.0.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 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 826913a952681440905321c8e29397096dc41819..7c3ebb6c49a47dd72c2405537ebb0a7ef75e6b42 100644 (file)
--- a/net/adblock/files/README.md
+++ b/net/adblock/files/README.md
@@ -27,11 +27,13 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 | openphish           |         | S    | phishing         | [Link](https://openphish.com)                                    |
 | phishing_army       |         | S    | phishing         | [Link](https://phishing.army)                                    |
 | reg_cn              |         | M    | reg_china        | [Link](https://easylist.to)                                      |
+| reg_cz              |         | M    | reg_czech+slovak | [Link](https://easylist.to)                                      |
 | reg_de              |         | M    | reg_germany      | [Link](https://easylist.to)                                      |
 | reg_es              |         | M    | reg_espania      | [Link](https://easylist.to)                                      |
 | reg_fi              |         | S    | reg_finland      | [Link](https://github.com/finnish-easylist-addition)             |
 | reg_fr              |         | S    | reg_france       | [Link](https://forums.lanik.us/viewforum.php?f=91)               |
 | reg_id              |         | M    | reg_indonesia    | [Link](https://easylist.to)                                      |
+| reg_kr              |         | M    | reg_korea        | [Link](https://list-kr.github.io)                                |
 | reg_nl              |         | M    | reg_netherlands  | [Link](https://easylist.to)                                      |
 | reg_pl              |         | M    | reg_poland       | [Link](https://kadantiscam.netlify.com)                          |
 | reg_ro              |         | M    | reg_romania      | [Link](https://easylist.to)                                      |
@@ -41,7 +43,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 | shallalist_porn     |         | XXL  | general+porn     | [Link](http://www.shallalist.de)                                 |
 | smarttv             |         | S    | smarttv          | [Link](https://github.com/Perflyst/PiHoleBlocklist)              |
 | spam404             |         | S    | general          | [Link](https://github.com/Dawsey21)                              |
-| stevenblack         |         | L    | compilation+porn | [Link](https://github.com/StevenBlack/hosts)                     |
+| stevenblack         |         | L    | compilation      | [Link](https://github.com/StevenBlack/hosts)                     |
 | stevenblack_porn    |         | L    | compilation+porn | [Link](https://github.com/StevenBlack/hosts)                     |
 | stopforumspam       |         | S    | spam             | [Link](https://www.stopforumspam.com)                            |
 | sysctl              |         | M    | general          | [Link](http://sysctl.org/cameleon)                               |

diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources
index e9da27698730db6f56019df0972b93fec1f5478a..2fd07d87c04f0792abeae5c66247ec254bb7fcac 100644 (file)
--- a/net/adblock/files/adblock.sources
+++ b/net/adblock/files/adblock.sources
@@ -105,8 +105,8 @@
                "descurl": "https://github.com/notracking/hosts-blocklists"
        },
        "oisd_nl": {
-               "url": "https://dbl.oisd.nl",
-               "rule": "/^0\\.0\\.0\\.0[[:space:]]+([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
+               "url": "https://abp.oisd.nl/",
+               "rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
                "size": "XXL",
                "focus": "general",
                "descurl": "https://oisd.nl"
@@ -132,6 +132,13 @@
                "focus": "reg_china",
                "descurl": "https://easylist.to"
        },
+       "reg_cz": {
+               "url": "https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt",
+               "rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
+               "size": "M",
+               "focus": "reg_czech+slovak",
+               "descurl": "https://easylist.to"
+       },
        "reg_de": {
                "url": "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt",
                "rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
@@ -167,6 +174,13 @@
                "focus": "reg_indonesia",
                "descurl": "https://easylist.to"
        },
+       "reg_kr": {
+               "url": "https://raw.githubusercontent.com/List-KR/List-KR/master/filter.txt",
+               "rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
+               "size": "S",
+               "focus": "reg_korea",
+               "descurl": "https://list-kr.github.io"
+       },
        "reg_nl": {
                "url": "https://easylist-downloads.adblockplus.org/easylistdutch+easylist.txt",
                "rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",