adblock: update 2.6.2

* refine 'force dns' handling:
  - enabled-check before firewall reload
  - add rule name (better LuCI experience)

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index f2d40c6da2a50ece44ebbde9588cf2fdefd4a31b..15117902e94944258feb999e3fddf89d4f8aceb2 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=2.6.1
+PKG_VERSION:=2.6.2
 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 701712384b9c6c5519c1dc789b94597128b4a2d6..03f86b03e4fdc1257f36fbc31394730d394bf810 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.6.1"
+adb_ver="2.6.2"
 adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
 adb_enabled=1
 adb_debug=0
@@ -121,6 +121,7 @@ f_envload()
     if [ ${adb_forcedns} -eq 1 ] && [ -z "$(uci -q get firewall.adblock_dns)" ]
     then
         uci -q set firewall.adblock_dns="redirect"
+        uci -q set firewall.adblock_dns.name="Adblock DNS"
         uci -q set firewall.adblock_dns.src="lan"
         uci -q set firewall.adblock_dns.proto="tcp udp"
         uci -q set firewall.adblock_dns.src_dport="53"
@@ -133,7 +134,10 @@ f_envload()
     if [ -n "$(uci -q changes firewall)" ]
     then
         uci -q commit firewall
-        /etc/init.d/firewall reload >/dev/null 2>&1
+        if [ $(/etc/init.d/firewall enabled; printf ${?}) -eq 0 ]
+        then
+            /etc/init.d/firewall reload >/dev/null 2>&1
+        fi
     fi
 }