diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2016-02-19 15:13:11 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2016-02-19 15:13:11 +0200 |
| commit | e51808dc8d26187f87ff0aee90d019f7091b5cc4 (patch) | |
| tree | 152cb5df1b607f7e23b93ae40335597da64d9842 | |
| parent | 1e9db6b217f7e09388c99909219c3184fd1c824a (diff) | |
| parent | c353ed253c2bbb0eeeebd3a385778028ea2d1ab3 (diff) | |
Merge pull request #2396 from dibdot/adblock
adblock: 0.70.2
| -rw-r--r-- | net/adblock/Makefile | 2 | ||||
| -rw-r--r-- | net/adblock/files/adblock-helper.sh | 9 | ||||
| -rwxr-xr-x | net/adblock/files/adblock-update.sh | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/net/adblock/Makefile b/net/adblock/Makefile index b0c8f5e58..e02136cf8 100644 --- 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 index 578e2fceb..8983a99c9 100644 --- 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 index b23d82d15..82e56f958 100755 --- 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 |