commit 73e6480daf79f520f765022d16534d54859323d5 parent a37eb09d3be45f8385e87a44d2e4b9864df2ba26 Author: Hannu Nyman <hannu.nyman@iki.fi> Date: Mon, 30 Jan 2017 09:27:10 +0200 Merge pull request #3927 from dibdot/adblock adblock: bugfix 2.1.5 (release 2) Diffstat:
| M | net/adblock/Makefile | | | 2 | +- |
| M | net/adblock/files/adblock.sh | | | 10 | +++++----- |
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/adblock/Makefile b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=2.1.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh @@ -109,15 +109,15 @@ f_envcheck() # check fetch utility # - 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 - if [ "${adb_fetch}" = "/usr/bin/wget" ] && [ "$(readlink -fn "${adb_fetch}")" = "/bin/uclient-fetch" ] + if [ ! -f "${adb_fetch}" ] && [ "$(readlink -fn "/bin/wget")" = "/bin/uclient-fetch" ] then adb_fetch="/bin/uclient-fetch" adb_fetchparm="-q --timeout=5 --no-check-certificate -O" 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 #