From: Dirk Brenken <redacted>
Date: Sat, 31 May 2025 21:06:33 +0000 (+0200)
Subject: adblock: update 4.4.2-2
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7825affaf913f9807549e84e121fac6494264a71;p=openwrt-packages.git

adblock: update 4.4.2-2

* sanitize the json reporting output

Signed-off-by: Dirk Brenken <redacted>
---

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index c1512ab3f..35945dbeb 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 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 e636bcdf1..134844b22 100755
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -1544,11 +1544,11 @@ f_report() {
 			;;
 		"json")
 			if [ "${adb_map}" = "1" ]; then
-				jsn="$("${adb_catcmd}" ${report_jsn} ${map_jsn})"
-				printf "[%s]]\n" "${jsn}"
+				jsn="$("${adb_catcmd}" ${report_jsn} ${map_jsn} 2>/dev/null)"
+				[ -n "${jsn}" ] && printf "[%s]]\n" "${jsn}"
 			else
-				jsn="$("${adb_catcmd}" ${report_jsn})"
-				printf "[%s]\n" "${jsn}"
+				jsn="$("${adb_catcmd}" ${report_jsn} 2>/dev/null)"
+				[ -n "${jsn}" ] && printf "[%s]\n" "${jsn}"
 			fi
 			;;
 		"mail")