Merge pull request #3927 from dibdot/adblock
adblock: bugfix 2.1.5 (release 2)
This commit is contained in:
commit
73e6480daf
2 changed files with 6 additions and 6 deletions
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=adblock
|
PKG_NAME:=adblock
|
||||||
PKG_VERSION:=2.1.5
|
PKG_VERSION:=2.1.5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
PKG_LICENSE:=GPL-3.0+
|
PKG_LICENSE:=GPL-3.0+
|
||||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||||
|
|
||||||
|
|
|
@ -109,15 +109,15 @@ f_envcheck()
|
||||||
|
|
||||||
# check fetch utility
|
# check fetch utility
|
||||||
#
|
#
|
||||||
if [ -z "${adb_fetch}" ] || [ -z "${adb_fetchparm}" ] || [ ! -f "${adb_fetch}" ] || [ "$(readlink -fn "${adb_fetch}")" = "/bin/busybox" ]
|
if [ ! -f "${adb_fetch}" ] && [ "$(readlink -fn "/bin/wget")" = "/bin/uclient-fetch" ]
|
||||||
then
|
|
||||||
f_log "error" "status ::: required download utility with ssl support not found, e.g. install full 'wget' package"
|
|
||||||
fi
|
|
||||||
if [ "${adb_fetch}" = "/usr/bin/wget" ] && [ "$(readlink -fn "${adb_fetch}")" = "/bin/uclient-fetch" ]
|
|
||||||
then
|
then
|
||||||
adb_fetch="/bin/uclient-fetch"
|
adb_fetch="/bin/uclient-fetch"
|
||||||
adb_fetchparm="-q --timeout=5 --no-check-certificate -O"
|
adb_fetchparm="-q --timeout=5 --no-check-certificate -O"
|
||||||
fi
|
fi
|
||||||
|
if [ -z "${adb_fetch}" ] || [ -z "${adb_fetchparm}" ] || [ ! -f "${adb_fetch}" ] || [ "$(readlink -fn "${adb_fetch}")" = "/bin/busybox" ]
|
||||||
|
then
|
||||||
|
f_log "error" "status ::: required download utility with ssl support not found, e.g. install full 'wget' package"
|
||||||
|
fi
|
||||||
|
|
||||||
# create dns hideout directory
|
# create dns hideout directory
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue