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 <redacted>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 7b6063886bc9835cae30b002daa7a9f7c573ecd1..549e97d9ae01ae6d54dc97ec33d1ec422764d6c4 100644 (file)
--- 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 <dev@brenken.org>
 

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 21248ff3679db8eb17112b6a2c7b68919eb858d9..daa91bddf498c99a91f056c9feb217f35696f715 100755 (executable)
--- 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
                        ;;