From d960507c5fd3cc65e50589ee846c92cdc0edbf89 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Fri, 20 Jan 2017 09:57:33 +0100
Subject: [PATCH] adblock: bugfix 2.1.2

* fix minor build error in init script

Signed-off-by: Dirk Brenken <dev@brenken.org>
---
 net/adblock/Makefile           |  2 +-
 net/adblock/files/adblock.init | 13 ++++++-------
 net/adblock/files/adblock.sh   |  3 ++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 20b141931d..a94da66443 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index 354c7d9692..da6d9a1194 100755
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -9,9 +9,7 @@ EXTRA_HELP="	suspend	Suspend adblock processing
 	resume	Resume adblock processing
 	query	<DOMAIN> Query active blocklists for specific domain"
 
-exec 2>/dev/null
 adb_script="/usr/bin/adblock.sh"
-adb_iface="$(uci -q get adblock.global.adb_iface)"
 
 boot()
 {
@@ -74,16 +72,17 @@ query()
 
 service_triggers()
 {
-    local iface
+    local iface="$(uci -q get adblock.global.adb_iface)"
 
-    procd_add_config_trigger "config.change" "adblock" /etc/init.d/adblock start
-    if [ -z "${adb_iface}" ]
+    if [ -z "${iface}" ]
     then
         procd_add_raw_trigger "interface.*.up" 1000 /etc/init.d/adblock start
     else
-        for iface in ${adb_iface}
+        for name in ${iface}
         do
-            procd_add_interface_trigger "interface.*.up" "${iface}" /etc/init.d/adblock start
+            procd_add_interface_trigger "interface.*.up" "${name}" /etc/init.d/adblock start
         done
     fi
+
+    procd_add_config_trigger "config.change" "adblock" /etc/init.d/adblock start
 }
diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 771857fc06..2573400cd6 100755
--- 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.1.1"
+adb_ver="2.1.2"
 adb_enabled=1
 adb_debug=0
 adb_whitelist="/etc/adblock/adblock.whitelist"
@@ -295,6 +295,7 @@ f_log()
 }
 
 # f_debug: gather memory & space information
+#
 f_debug()
 {
         local mem_total=0 mem_free=0 mem_swap=0 tmp_space=0 backup_space=0
-- 
2.30.2