Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3581 from dibdot/adblock

Browse source 
adblock: bugfix 1.5.4
This commit is contained in:
Hannu Nyman 2016-11-27 20:02:39 +02:00 committed by GitHub
commit fade37e5df
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

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

6
net/adblock/files/adblock-helper.sh
View file

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

3
net/adblock/files/adblock-update.sh
View file

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