adblock: update 4.5.0-3

* fixed a potential deadlock during startup, when dns reporting is disabled

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index e09ca1cdf5c75a1e41a0f7fb2516eb872e77fcfd..59823d666cae0a4f799f0a89b7b997968a66514c 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.0
-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 de9fd26eb9720235ef10cc6bbd37c8d2d77e760f..f90181ad97bae4a969243fbafb67b6437edb486f 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -130,9 +130,10 @@ f_load() {
                f_log "info" "please install the package 'tcpdump' or 'tcpdump-mini' to use the reporting feature"
        elif [ -x "${adb_dumpcmd}" ]; then
                bg_pid="$("${adb_pgrepcmd}" -nf "${adb_reportdir}/adb_report.pcap")"
-               if [ "${adb_report}" = "0" ] || { [ -n "${bg_pid}" ] && { [ "${adb_action}" = "stop" ] || [ "${adb_action}" = "restart" ]; }; }; then
+               if [ -n "${bg_pid}" ] && { [ "${adb_report}" = "0" ] || [ "${adb_action}" = "stop" ] || [ "${adb_action}" = "restart" ]; }; then
                        if kill -HUP "${bg_pid}" 2>/dev/null; then
-                               while kill -0 "${bg_pid}" 2>/dev/null; do
+                               for cnt in 1 2 3; do
+                                       kill -0 "${bg_pid}" >/dev/null 2>&1 || break
                                        sleep 1
                                done
                        fi