adblock: update 1.1.17

* change winspy url again
* various cosmetics left out in former release
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit d0eceb6b25)

adblock: update 1.1.16, release 2
* workaround for LuCI search path issue
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 26fa1c5df0)

adblock: update 1.1.16
* new config option 'adb_restricted' to disable updates of the adblock
config during runtime (no flash writes, disabled by default)
* new update function, to apply latest configuration changes if needed
(/etc/init.d/adblock cfgup)
* fix dns redirect rule
* various optimizations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 41b05a5532)

net/adblock/files/adblock-update.sh

@@ -10,15 +10,6 @@
 #
 LC_ALL=C
 
-# script debug switch (disabled by default)
-# set 'DEBUG=1' to enable script debugging
-#
-DEBUG=0
-if [ $((DEBUG)) -eq 0 ]
-then
-    exec 2>/dev/null
-fi
-
 # set pid & logger
 #
 adb_pid="${$}"
@@ -37,8 +28,8 @@ fi
 # get current directory and set script/config version
 #
 adb_scriptdir="${0%/*}"
-adb_scriptver="1.1.15"
-adb_mincfgver="2.0"
+adb_scriptver="1.1.17"
+adb_mincfgver="2.1"
 
 # source in adblock function library
 #
@@ -303,8 +294,8 @@ then
     "${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
     /etc/init.d/dnsmasq restart
     sleep 1
-    rc="$(ps | grep -q "[d]nsmasq"; printf ${?})"
-    if [ $((rc)) -eq 0 ]
+    check="$(pgrep -f "dnsmasq")"
+    if [ -n "${check}" ]
     then
         f_log "adblock lists with overall ${adb_count} domains loaded"
     else