Browse Source

adblock: bugfix 1.5.4

* CC/uclient-fetch compatibility fix

Signed-off-by: Dirk Brenken <dev@brenken.org>
lilik-openwrt-22.03
Dirk Brenken 8 years ago
parent
commit
ecbc056a29
3 changed files with 6 additions and 5 deletions
  1. +1
    -1
      net/adblock/Makefile
  2. +3
    -3
      net/adblock/files/adblock-helper.sh
  3. +2
    -1
      net/adblock/files/adblock-update.sh

+ 1
- 1
net/adblock/Makefile 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>


+ 3
- 3
net/adblock/files/adblock-helper.sh 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


+ 2
- 1
net/adblock/files/adblock-update.sh 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}" ]


Loading…
Cancel
Save