Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adblock: 0.70.2

Browse source 
* fix wan update detection failure

Signed-off-by: Dirk Brenken <openwrt@brenken.org>
This commit is contained in:
Dirk Brenken 2016-02-19 13:59:40 +01:00
parent d27b8c82a9
commit c353ed253c
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=0.70.1 PKG_VERSION:=0.70.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <openwrt@brenken.org> PKG_MAINTAINER:=Dirk Brenken <openwrt@brenken.org>

9
net/adblock/files/adblock-helper.sh
View file

@ -472,8 +472,13 @@ f_envcheck()
f_restore f_restore
fi fi
fi fi
check="$(cat /sys/class/net/${adb_wandev}/operstate 2>/dev/null)" if [ -n "${adb_wandev4}" ]
if [ "${check}" = "up" ] 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 then
f_log "get active wan update interface/device (${adb_wanif}/${adb_wandev})" f_log "get active wan update interface/device (${adb_wanif}/${adb_wandev})"
break 2 break 2

2
net/adblock/files/adblock-update.sh
View file

@ -45,7 +45,7 @@ fi
# get current directory, script- and openwrt version # get current directory, script- and openwrt version
# #
adb_scriptdir="${0%/*}" adb_scriptdir="${0%/*}"
adb_scriptver="0.70.1" adb_scriptver="0.70.2"
openwrt_version="$(cat /etc/openwrt_version 2>/dev/null)" openwrt_version="$(cat /etc/openwrt_version 2>/dev/null)"
# source in adblock function library # source in adblock function library