adblock: update 2.8.3

* refine manual/backup mode (exclude local blacklist processing)
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 4b387977e2eaaae530551e84b82dbd8075b78593..eca17098fb8aa71e66e5f29908b930126d6cb397 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=2.8.2
+PKG_VERSION:=2.8.3
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 7c3112877774c90c4e7fc552dd23b60aa6275948..0478f84a9a12ad5fbf98b67dc48a43b7322c3d21 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -10,7 +10,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-adb_ver="2.8.2"
+adb_ver="2.8.3"
 adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
 adb_enabled=1
 adb_debug=0
@@ -462,7 +462,7 @@ f_main()
 
         # manual mode
         #
-        if [ ${adb_manmode} -eq 1 ] && [ -z "${adb_action}" ]
+        if [ ${adb_manmode} -eq 1 ] && [ -z "${adb_action}" ] && [ "${src_name}" != "blacklist" ]
         then
             f_list restore
             if [ ${adb_rc} -eq 0 ] && [ -s "${adb_tmpfile}" ]
@@ -535,7 +535,7 @@ f_main()
         fi
     done
 
-    # hash preparation & overall sort
+    # hash preparation and overall sort
     #
     if [ -f "${adb_dnsdir}/${adb_dnsfile}" ]
     then