cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

adblock: update 3.8.15

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

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2020-02-02 15:36:04 +01:00
parent e73b2a0a07
commit 8dffab34b4
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/adblock/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=3.8.14 PKG_VERSION:=3.8.15
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
net/adblock/files/adblock.conf
+6 -6
View File
@@ -61,6 +61,12 @@ config source 'malwarelist'
option adb_src_desc 'focus on malware, daily updates, approx. 1.200 entries' option adb_src_desc 'focus on malware, daily updates, approx. 1.200 entries'
option enabled '0' 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' config source 'openphish'
option adb_src 'https://openphish.com/feed.txt' option adb_src 'https://openphish.com/feed.txt'
option adb_src_rset 'BEGIN{FS=\"/\"}/^http[s]?:\/\/([[:alnum:]_-]+\.)+[[:alpha:]]+(\/|$)/{print tolower(\$3)}' 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 adb_src_desc 'focus on chinese ads plus generic easylist additions, daily updates, approx. 11.700 entries'
option enabled '0' 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' config source 'reg_de'
option adb_src 'https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt' option adb_src 'https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt'
option adb_src_rset 'BEGIN{FS=\"[|^]\"}/^\|\|([[:alnum:]_-]+\.)+[[:alpha:]]+\^("\\\$third-party")?$/{print tolower(\$3)}' option adb_src_rset 'BEGIN{FS=\"[|^]\"}/^\|\|([[:alnum:]_-]+\.)+[[:alpha:]]+\^("\\\$third-party")?$/{print tolower(\$3)}'
net/adblock/files/adblock.init
+4 -3
View File
@@ -4,11 +4,12 @@
START=30 START=30
USE_PROCD=1 USE_PROCD=1
EXTRA_COMMANDS="suspend resume query report" EXTRA_COMMANDS="suspend resume query report status"
EXTRA_HELP=" suspend Suspend adblock processing EXTRA_HELP=" suspend Suspend adblock processing
resume Resume adblock processing resume Resume adblock processing
query <DOMAIN> Query active blocklists for specific domains 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_init="/etc/init.d/adblock"
adb_script="/usr/bin/adblock.sh" adb_script="/usr/bin/adblock.sh"
@@ -83,7 +84,7 @@ report()
rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}" rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}"
} }
status_service() status()
{ {
local key keylist value local key keylist value
local rtfile="$(uci_get adblock extra adb_rtfile "/tmp/adb_runtime.json")" local rtfile="$(uci_get adblock extra adb_rtfile "/tmp/adb_runtime.json")"
net/adblock/files/adblock.sh
+1 -1
View File
@@ -13,7 +13,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="3.8.14" adb_ver="3.8.15"
adb_basever="" adb_basever=""
adb_enabled=0 adb_enabled=0
adb_debug=0 adb_debug=0