Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adblock: update 4.1.5-2

Browse source 
* fixed broken/blocked oisd download links (switched to the official github mirror)
* made sure that curl error out on http errors as well
* removed obsolete compatibility stuff from init script

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit f83baf221d)
This commit is contained in:
Dirk Brenken 2022-10-20 11:46:09 +02:00
parent 997737ee83
commit 667ba42946
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
4 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=4.1.5 PKG_VERSION:=4.1.5
PKG_RELEASE:=1 PKG_RELEASE:=2
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>

25
net/adblock/files/adblock.init
View file

@ -8,23 +8,12 @@
START=30 START=30
USE_PROCD=1 USE_PROCD=1
if [ -n "$(type -t extra_command)" ]; then extra_command "suspend" "Suspend adblock processing"
extra_command "suspend" "Suspend adblock processing" extra_command "resume" "Resume adblock processing"
extra_command "resume" "Resume adblock processing" extra_command "query" "<domain> Query active blocklists and backups for a specific domain"
extra_command "query" "<domain> Query active blocklists and backups for a specific domain" extra_command "report" "[[<cli>|<mail>|<gen>|<json>] [<top_count>] [<res_count>] [<search>]] Print DNS statistics with an optional search parameter"
extra_command "report" "[[<cli>|<mail>|<gen>|<json>] [<top_count>] [<res_count>] [<search>]] Print DNS statistics with an optional search parameter" extra_command "list" "[<add>|<add_sha>|<add_utc>|<add_eng>|<add_stb>|<remove>|<remove_sha>|<remove_utc>|<remove_eng>|<remove_stb>] <source(s)> List/Edit available sources"
extra_command "list" "[<add>|<add_sha>|<add_utc>|<add_eng>|<add_stb>|<remove>|<remove_sha>|<remove_utc>|<remove_eng>|<remove_stb>] <source(s)> List/Edit available sources" extra_command "timer" "[<add> <tasks> <hour> [<minute>] [<weekday>]]|[<remove> <line no.>] List/Edit cron update intervals"
extra_command "timer" "[<add> <tasks> <hour> [<minute>] [<weekday>]]|[<remove> <line no.>] List/Edit cron update intervals"
else
EXTRA_COMMANDS="status suspend resume query report list timer version"
EXTRA_HELP=" status Service status
suspend Suspend adblock processing
resume Resume adblock processing
query <domain> Query active blocklists and backups for a specific domain
report [[<cli>|<mail>|<gen>|<json>] [<count>] [<search>]] Print DNS statistics with an optional search parameter
list [<add>|<add_sha>|<add_utc>|<add_eng>|<add_stb>|<remove>|<remove_sha>|<remove_utc>|<remove_eng>|<remove_stb>] <source(s)> List/Edit available sources
timer [<add> <tasks> <hour> [<minute>] [<weekday>]]|[<remove> <line no.>] List/Edit cron update intervals"
fi
adb_init="/etc/init.d/adblock" adb_init="/etc/init.d/adblock"
adb_script="/usr/bin/adblock.sh" adb_script="/usr/bin/adblock.sh"
@ -34,7 +23,7 @@ if [ -s "${adb_pidfile}" ] && { [ "${action}" = "start" ] || [ "${action}" = "st
[ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "report" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "report" ] ||
[ "${action}" = "suspend" ] || [ "${action}" = "resume" ] || [ "${action}" = "query" ] || [ "${action}" = "suspend" ] || [ "${action}" = "resume" ] || [ "${action}" = "query" ] ||
{ [ "${action}" = "list" ] && [ -n "${1}" ]; }; }; then { [ "${action}" = "list" ] && [ -n "${1}" ]; }; }; then
exit 0 return 0
fi fi
boot() { boot() {

2
net/adblock/files/adblock.sh
View file

@ -400,7 +400,7 @@ f_fetch() {
;; ;;
"curl") "curl")
[ "${adb_fetchinsecure}" = "1" ] && insecure="--insecure" [ "${adb_fetchinsecure}" = "1" ] && insecure="--insecure"
adb_fetchparm="${adb_fetchparm:-"${insecure} --connect-timeout 20 --silent --show-error --location -o"}" adb_fetchparm="${adb_fetchparm:-"${insecure} --connect-timeout 20 --fail --silent --show-error --location -o"}"
;; ;;
"uclient-fetch") "uclient-fetch")
[ "${adb_fetchinsecure}" = "1" ] && insecure="--no-check-certificate" [ "${adb_fetchinsecure}" = "1" ] && insecure="--no-check-certificate"

6
net/adblock/files/adblock.sources
View file

@ -133,21 +133,21 @@
"descurl": "https://github.com/notracking/hosts-blocklists" "descurl": "https://github.com/notracking/hosts-blocklists"
}, },
"oisd_basic": { "oisd_basic": {
"url": "https://dblw.oisd.nl/basic/", "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_basic.txt",
"rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}", "rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
"size": "L", "size": "L",
"focus": "general", "focus": "general",
"descurl": "https://oisd.nl" "descurl": "https://oisd.nl"
}, },
"oisd_nsfw": { "oisd_nsfw": {
"url": "https://dblw.oisd.nl/nsfw/", "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_nsfw.txt",
"rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}", "rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
"size": "XL", "size": "XL",
"focus": "general", "focus": "general",
"descurl": "https://oisd.nl" "descurl": "https://oisd.nl"
}, },
"oisd_full": { "oisd_full": {
"url": "https://dblw.oisd.nl", "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_full.txt",
"rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}", "rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
"size": "XXL", "size": "XXL",
"focus": "general", "focus": "general",