From ecbc056a290dbb7308c54453f0e9f42a29de1179 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 27 Nov 2016 18:26:45 +0100 Subject: [PATCH] adblock: bugfix 1.5.4 * CC/uclient-fetch compatibility fix Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 2 +- net/adblock/files/adblock-helper.sh | 6 +++--- net/adblock/files/adblock-update.sh | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 9f5d2611ee..08a11d73a4 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -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 diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh index b177fb6369..8be994108f 100644 --- a/net/adblock/files/adblock-helper.sh +++ b/net/adblock/files/adblock-helper.sh @@ -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 diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh index 500455cf21..661081d5cb 100755 --- a/net/adblock/files/adblock-update.sh +++ b/net/adblock/files/adblock-update.sh @@ -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}" ] -- 2.30.2