adblock: update 1.0.3

* remove syntax glitch & cosmetics
* probably the last 1.0.x release

Signed-off-by: Dirk Brenken <openwrt@brenken.org>
(cherry picked from commit 40a9c0a92d7f28ca2f1019023049603c9f536e33)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 3fcbc9d8445a971f96fb01aa916a4842da76014d..2333a1134302f523248d9c1086777dead669f3dc 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <openwrt@brenken.org>

diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh
index 7f9ea55448f86f74bd67a5e1c6797441cb2fc091..246f98b9609ae02a5837b28fcd5bba79612c8f6e 100644 (file)
--- a/net/adblock/files/adblock-helper.sh
+++ b/net/adblock/files/adblock-helper.sh
@@ -205,7 +205,6 @@ f_envparse()
     else
         network_get_device adb_wandev4 "${adb_wanif4}"
         network_get_device adb_wandev6 "${adb_wanif6}"
-        break
     fi
 
     # get lan ip addresses
@@ -505,8 +504,6 @@ f_space()
 {
     local mp="${1}"
 
-    # check relevant mount points in a subshell
-    #
     if [ -d "${mp}" ]
     then
         av_space="$(df "${mp}" | tail -n1 | awk '{printf $4}')"

diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh
index f516e414def74b0dbc250bbc24f1fc95664d60a3..cce8dcb1724552749fda89d30db810a9bad82210 100755 (executable)
--- a/net/adblock/files/adblock-update.sh
+++ b/net/adblock/files/adblock-update.sh
@@ -36,7 +36,7 @@ fi
 # get current directory, script- and openwrt version
 #
 adb_scriptdir="${0%/*}"
-adb_scriptver="1.0.2"
+adb_scriptver="1.0.3"
 openwrt_version="$(cat /etc/openwrt_version)"
 
 # source in adblock function library