adblock: update 3.8.15

* remove 'reg_cz' list (abandoned)
* add 'notracking' list (provided by @rcarmo)
* 19.07-only: fix/bring back status message

Upstream: 8dffab34b4eb105841b8fa4faa9bcb818c7944a7

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index ec64901968e70174c3b15c8324698ac155c90428..3c55ff9e89248fb2bc288f03b931f91f2acd846f 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=3.8.14
+PKG_VERSION:=3.8.15
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

diff --git a/net/adblock/files/adblock.conf b/net/adblock/files/adblock.conf
index 478636ff21de23eee3f0001c042d135cae5992f8..084c1acbd3115ea163e194ab83bf1e9a47984d76 100644 (file)
--- a/net/adblock/files/adblock.conf
+++ b/net/adblock/files/adblock.conf
@@ -61,6 +61,12 @@ config source 'malwarelist'
        option adb_src_desc 'focus on malware, daily updates, approx. 1.200 entries'
        option enabled '0'
 
+config source 'notracking'
+       option adb_src 'https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt'
+       option adb_src_rset '/^([[:alnum:]_-]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}'
+       option adb_src_desc 'notrack domains, daily updates, approx. 60.000 entries'
+       option enabled '0'
+
 config source 'openphish'
        option adb_src 'https://openphish.com/feed.txt'
        option adb_src_rset 'BEGIN{FS=\"/\"}/^http[s]?:\/\/([[:alnum:]_-]+\.)+[[:alpha:]]+(\/|$)/{print tolower(\$3)}'
@@ -73,12 +79,6 @@ config source 'reg_cn'
        option adb_src_desc 'focus on chinese ads plus generic easylist additions, daily updates, approx. 11.700 entries'
        option enabled '0'
 
-config source 'reg_cz'
-       option adb_src 'https://raw.githubusercontent.com/qxstyles/turris-hole-czech-block-list/master/turris-hole-czech-block-list'
-       option adb_src_rset '/^([[:alnum:]_-]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}'
-       option adb_src_desc 'focus on czech ads maintained by Turris Omnia Users, infrequent updates, approx. 100 entries'
-       option enabled '0'
-
 config source 'reg_de'
        option adb_src 'https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt'
        option adb_src_rset 'BEGIN{FS=\"[|^]\"}/^\|\|([[:alnum:]_-]+\.)+[[:alpha:]]+\^("\\\$third-party")?$/{print tolower(\$3)}'

diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index 9928698705c7679131041ea087d88bd7c6f86350..c2a4bdb55ca0eb0d98043303f98ba6834de4d6fd 100755 (executable)
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -4,11 +4,12 @@
 START=30
 USE_PROCD=1
 
-EXTRA_COMMANDS="suspend resume query report"
+EXTRA_COMMANDS="suspend resume query report status"
 EXTRA_HELP="   suspend Suspend adblock processing
        resume  Resume adblock processing
        query   <DOMAIN> Query active blocklists for specific domains
-       report  <SEARCH> Print dns query statistics with an optional search parameter"
+       report  <SEARCH> Print dns query statistics with an optional search parameter
+       status  Service status"
 
 adb_init="/etc/init.d/adblock"
 adb_script="/usr/bin/adblock.sh"
@@ -83,7 +84,7 @@ report()
        rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}"
 }
 
-status_service()
+status()
 {
        local key keylist value
        local rtfile="$(uci_get adblock extra adb_rtfile "/tmp/adb_runtime.json")"

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 5da153a9c75dc173e553ffab9de9b291089c9dee..bd53a248c69ec3572ada9fb424dc8ddee1cff5e1 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -13,7 +13,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-adb_ver="3.8.14"
+adb_ver="3.8.15"
 adb_basever=""
 adb_enabled=0
 adb_debug=0