lede-packages-rs

commit fade37e5df11832a51eb6cb610e782e139aa9fd6
parent 75f2d6f71eeb9f0feeaea9afbd475bdfa3c243a9
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Sun, 27 Nov 2016 20:02:39 +0200

Merge pull request #3581 from dibdot/adblock

adblock: bugfix 1.5.4
Diffstat:
M
net/adblock/Makefile
 | 
2
+-
M
net/adblock/files/adblock-helper.sh
 | 
6
+++---
M
net/adblock/files/adblock-update.sh
 | 
3
++-

3 files changed, 6 insertions(+), 5 deletions(-)
diff --git 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 <dev@brenken.org>
diff --git 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
@@ -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}" ]