adblock: update 4.5.1-3

* added IPFire DBL: a comprehensive, community-maintained domain blocklist
   divided in 12 categories
* LuCI: eslint fixes
* LuCI: added IPFire feed/category selection

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 7f436c3172dce2613197aeb1379bb6f7817a6c31..0877adb8dd964d23e7f1512e3eacc5626f34ff94 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.5.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 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 dee98e9aa7f84e211ef38b364b3ee074b75c65b0..ce5629cf25ee1f9e084f0e296890901ccc4dc469 100644 (file)
--- a/net/adblock/files/README.md
+++ b/net/adblock/files/README.md
@@ -29,6 +29,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 | games_tracking      |         | S    | tracking         | [Link](https://www.gameindustry.eu)                                               |
 | hagezi              |         | VAR  | compilation      | [Link](https://github.com/hagezi/dns-blocklists)                                  |
 | hblock              |         | XL   | compilation      | [Link](https://hblock.molinero.dev)                                               |
+| ipfire_dbl          |         | VAR  | compilation      | [Link](https://www.ipfire.org/dbl)                                                |
 | oisd_big            |         | XXL  | general          | [Link](https://oisd.nl)                                                           |
 | oisd_nsfw           |         | XXL  | porn             | [Link](https://oisd.nl)                                                           |
 | oisd_nsfw_small     |         | M    | porn             | [Link](https://oisd.nl)                                                           |

diff --git a/net/adblock/files/adblock.categories b/net/adblock/files/adblock.categories
index 5c31fc713390b2b7577cb9886d7c48d83adaac10..026e7fe09fde747037b95aff6cb6ba198f3869fa 100644 (file)
--- a/net/adblock/files/adblock.categories
+++ b/net/adblock/files/adblock.categories
@@ -43,6 +43,18 @@ hag;nrd-28days;domains/nrd28-22.txt
 hag;nrd-35days;domains/nrd35-29.txt
 hst;lite;Lite/domains.wildcards
 hst;xtra;Xtra/domains.wildcards
+ipf;ads;ads/domains.txt
+ipf;dating;dating/domains.txt
+ipf;doh;doh/domains.txt
+ipf;gambling;gambling/domains.txt
+ipf;games;games/domains.txt
+ipf;malware;malware/domains.txt
+ipf;phishing;phishing/domains.txt
+ipf;piracy;piracy/domains.txt
+ipf;porn;porn/domains.txt
+ipf;smart-tv;smart-tv/domains.txt
+ipf;social;social/domains.txt
+ipf;violence;violence/domains.txt
 stb;standard;hosts
 stb;standard-fakenews;alternates/fakenews/hosts
 stb;standard-fakenews-gambling;alternates/fakenews-gambling/hosts

diff --git a/net/adblock/files/adblock.feeds b/net/adblock/files/adblock.feeds
index 4fd52bace81541fdab58dca9b47271f4f83d30c8..4b2a9455ac1444446484a99cba3c6483dcbfbdae 100644 (file)
--- a/net/adblock/files/adblock.feeds
+++ b/net/adblock/files/adblock.feeds
@@ -89,14 +89,20 @@
                "size": "S",
                "descr": "tracking"
        },
+       "hagezi": {
+               "url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/",
+               "rule": "feed 1",
+               "size": "VAR",
+               "descr": "compilation"
+       },
        "hblock": {
                "url": "https://hblock.molinero.dev/hosts_domains.txt",
                "rule": "feed 1",
                "size": "XL",
                "descr": "compilation"
        },
-       "hagezi": {
-               "url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/",
+       "ipfire_dbl": {
+               "url": "https://dbl.ipfire.org/lists/",
                "rule": "feed 1",
                "size": "VAR",
                "descr": "compilation"

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 5f83b066ce1e1b88e00125daadbabd4a2c5d9a9b..4dabe6ed556de47476d7e1196e07983ade3d3da0 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -1428,6 +1428,7 @@ f_main() {
                src_entries=""
                [ "${src_name}" = "1hosts" ] && src_cat="${adb_hst_feed}"
                [ "${src_name}" = "hagezi" ] && src_cat="${adb_hag_feed}"
+               [ "${src_name}" = "ipfire_dbl" ] && src_cat="${adb_ipf_feed}"
                [ "${src_name}" = "stevenblack" ] && src_cat="${adb_stb_feed}"
                if [ -n "${src_cat}" ]; then
                        (