adblock: bugfix 1.5.4

* CC/uclient-fetch compatibility fix

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 9f5d2611ee4d766b401aa747d306826b01e8572e..08a11d73a4496e58a977564b18db3e9aec1eef9f 100644 (file)
--- 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
index b177fb63699f9c693ecdc4edb59f92fbcf0c2db3..8be994108f99b06fc3bba41431bd4fb82d6c394b 100644 (file)
--- 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 500455cf21d1173da465b83b97777950ee1305f0..661081d5cb6e7743ec52c30a8cefff85039635d7 100755 (executable)
--- 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}" ]