lede-packages-rs

commit e51808dc8d26187f87ff0aee90d019f7091b5cc4
parent 1e9db6b217f7e09388c99909219c3184fd1c824a
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Fri, 19 Feb 2016 15:13:11 +0200

Merge pull request #2396 from dibdot/adblock

adblock: 0.70.2
Diffstat:
M
net/adblock/Makefile
 | 
2
+-
M
net/adblock/files/adblock-helper.sh
 | 
9
+++++++--
M
net/adblock/files/adblock-update.sh
 | 
2
+-

3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/net/adblock/Makefile b/net/adblock/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=0.70.1
+PKG_VERSION:=0.70.2
 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
@@ -472,8 +472,13 @@ f_envcheck()
                     f_restore
                 fi
             fi
-            check="$(cat /sys/class/net/${adb_wandev}/operstate 2>/dev/null)"
-            if [ "${check}" = "up" ]
+            if [ -n "${adb_wandev4}" ]
+            then
+                rc="$(/bin/ping -c1 -W1 8.8.8.8 -I ${adb_wandev} >/dev/null 2>&1; printf $?)"
+            else
+                rc="$(/bin/ping -6 -c1 -W1 2001:4860:4860::8888 -I ${adb_wandev} >/dev/null 2>&1; printf $?)"
+            fi
+            if [ $((rc)) -eq 0  ]
             then
                 f_log "get active wan update interface/device (${adb_wanif}/${adb_wandev})"
                 break 2
diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh
@@ -45,7 +45,7 @@ fi
 # get current directory, script- and openwrt version
 #
 adb_scriptdir="${0%/*}"
-adb_scriptver="0.70.1"
+adb_scriptver="0.70.2"
 openwrt_version="$(cat /etc/openwrt_version 2>/dev/null)"
 
 # source in adblock function library