From 4f00d8f0ee66effd40ec7c56a5a9a7395a7a8d54 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 16 Nov 2024 12:45:12 +0100 Subject: [PATCH] banIP: update to 1.0.0-10 * minimal fix to support all download utilities in currently broken apk snapshots (see https://github.com/openwrt/openwrt/issues/16907 for details) Signed-off-by: Dirk Brenken --- net/banip/Makefile | 2 +- net/banip/files/banip-functions.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/net/banip/Makefile b/net/banip/Makefile index 118a6fb2ba..eeb7bfd67b 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip PKG_VERSION:=1.0.0 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh index c0a20f4441..f5e58ccc29 100644 --- a/net/banip/files/banip-functions.sh +++ b/net/banip/files/banip-functions.sh @@ -360,10 +360,8 @@ f_actual() { f_getfetch() { local item utils insecure update="0" - if { [ "${ban_fetchcmd}" = "uclient-fetch" ] && printf "%s" "${ban_packages}" | "${ban_grepcmd}" -q '"libustream-'; } || - { [ "${ban_fetchcmd}" = "wget" ] && printf "%s" "${ban_packages}" | "${ban_grepcmd}" -q '"wget-ssl'; } || - [ "${ban_fetchcmd}" = "curl" ] || [ "${ban_fetchcmd}" = "aria2c" ]; then - ban_fetchcmd="$(f_cmd "${ban_fetchcmd}" "true")" + if [ -n "${ban_fetchcmd}" ]; then + ban_fetchcmd="$(f_cmd "${ban_fetchcmd}" optional)" fi if [ "${ban_autodetect}" = "1" ] && [ ! -x "${ban_fetchcmd}" ]; then -- 2.30.2