From 6da95de9efecc0b8c44e4981c3506aa7d414e7d5 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 19 Oct 2019 16:01:20 +0200 Subject: [PATCH] adblock: minor update 3.8.6-2 * fix service status message * refine readme regarding reload cron job (provided by @novoid) Signed-off-by: Dirk Brenken (cherry picked from commit a94610c88fb851072ea98b7fb41cd2ca10aa9f3d) --- net/adblock/Makefile | 2 +- net/adblock/files/README.md | 3 ++- net/adblock/files/adblock.init | 4 ++-- net/adblock/files/adblock.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 670d951473..c1fb465435 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=3.8.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md index d6c363f132..cb5b547de3 100644 --- a/net/adblock/files/README.md +++ b/net/adblock/files/README.md @@ -269,8 +269,9 @@ Finally enable email support and add a valid email address in LuCI. [...] ``` -**Cronjob for a regular block list update (`/etc/crontabs/root`):** +**Cronjob for regular block list updates (`/etc/crontabs/root`):** +The following command as a cron job updates each individual block list from their source so that they hold the most current domains to block: ``` 0 06 * * * /etc/init.d/adblock reload ``` diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init index 0917288ea9..192617fbab 100755 --- a/net/adblock/files/adblock.init +++ b/net/adblock/files/adblock.init @@ -83,9 +83,9 @@ report() rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}" } -status() +status_service() { - local key keylist value + local key keylist value local rtfile="$(uci_get adblock extra adb_rtfile "/tmp/adb_runtime.json")" if [ -s "${rtfile}" ] diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index b8bfbb775d..b5b2781b54 100755 --- 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.6" +adb_ver="3.8.6-2" adb_basever="" adb_enabled=0 adb_debug=0 -- 2.30.2