adblock: bugfix 1.5.4

* CC/uclient-fetch compatibility fix

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2016-11-27 18:26:45 +01:00
parent 8a4917a0a1
commit ecbc056a29
3 changed files with 6 additions and 5 deletions

View File

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

View File

@ -6,7 +6,7 @@
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_scriptver="1.5.3"
adb_scriptver="1.5.4"
adb_mincfgver="2.5"
adb_hotplugif=""
adb_lanif="lan"
@ -232,8 +232,8 @@ f_envcheck()
if [ "${package_ok}" = "true" ]
then
adb_fetch="$(which uclient-fetch)"
fetch_parm="-q --timeout=${adb_fetchttl}"
response_parm="--spider"
fetch_parm="-q"
response_parm=
fi
fi
fi

View File

@ -85,7 +85,8 @@ do
if [ "${src_name}" = "blacklist" ]
then
url_time="$(date -r "${url}")"
else
elif [ -n "${response_parm}" ]
then
url_time="$(${adb_fetch} ${fetch_parm} ${response_parm} "${url}" 2>&1 | awk '$0 ~ /Last-Modified/ {printf substr($0,18)}')"
fi
if [ -z "${url_time}" ]