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 <dev@brenken.org>
(cherry picked from commit a94610c88fb851072ea98b7fb41cd2ca10aa9f3d)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 670d951473da3e318ea03f2e84be3746bc31f986..c1fb4654352af8a10e4d55a5def91e437d1a1748 100644 (file)
--- 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 <dev@brenken.org>
 

diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
index d6c363f132bc318405ec7cd376dcd3edca567ee7..cb5b547de3866d6cb727f1cce31cd788f5597e3a 100644 (file)
--- 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 0917288ea9e167c4515ed53eefd2d99657e3d4d3..192617fbaba9ebca4604b0e0611d5b7a6adf6fa2 100755 (executable)
--- 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 b8bfbb775d60a0f589a0b71e91dcd3a57e2e1b32..b5b2781b54f202e56b9383ae3f285a53ed1ec2e5 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.6"
+adb_ver="3.8.6-2"
 adb_basever=""
 adb_enabled=0
 adb_debug=0