From 0255308cbe22a01cdfc83edcd1b32f1f4d32be7e Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 11 Apr 2026 10:48:53 +0200 Subject: [PATCH] adblock: update 4.5.4-3 * fixed a problem/regression with the display of results in f_search and f_report Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 2 +- net/adblock/files/adblock.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 7b6063886b..549e97d9ae 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=4.5.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 21248ff367..daa91bddf4 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -1468,7 +1468,7 @@ f_search() { [ "${res}" != "true" ] && printf '%s\n\n' " - no match" >>"${tmp_result}" fi "${adb_mvcmd}" -f "${tmp_result}" "${result}" - printf '%s\n' "$(< "${result}")" + "${adb_catcmd}" "${result}" 2>>"${adb_errorlog}" } # update runtime information @@ -2213,7 +2213,7 @@ f_report() { jsn="$("${adb_catcmd}" ${report_jsn} ${map_jsn} 2>>"${adb_errorlog}")" [ -n "${jsn}" ] && printf '[%s]]\n' "${jsn}" else - jsn="$(< "${report_jsn}")" 2>>"${adb_errorlog}" + jsn="$("${adb_catcmd}" "${report_jsn}" 2>>"${adb_errorlog}")" [ -n "${jsn}" ] && printf '[%s]\n' "${jsn}" fi ;;