From: Dirk Brenken <redacted>
Date: Thu, 10 Sep 2026 18:32:44 +0000 (+0200)
Subject: adblock: update 4.5.8-2
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=c65b4d5ab81fd9d7b9015087ca6b800762962e0b;p=openwrt-packages.git

adblock: update 4.5.8-2

- refine the reload trigger call logic

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

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index da26496d5..2056df3c0 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.5.8
-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/README.md b/net/adblock/README.md
index 871b85937..de9013062 100644
--- a/net/adblock/README.md
+++ b/net/adblock/README.md
@@ -141,7 +141,7 @@ Support of the following fully pre-configured domain blocklist feeds (free for p
 * Install the LuCI companion package `luci-app-adblock` which also installs the main `adblock` package as a dependency
 * Enable the adblock system service (System -> Startup) and enable adblock itself (adblock -> General Settings)
 * It's strongly recommended to use the LuCI frontend to easily configure all aspects of adblock, the application is located in LuCI under the `Services` menu
-* It's also recommended to configure a `Startup Trigger Interface` to depend on your WAN interface events during boot or restart of your router. Listing IPv6 interfaces (wan6) is fine as well: a trigger only starts a run if the last one did not succeed, so the chatty netifd update events no longer cause repeated downloads
+* It's also recommended to configure a `Startup Trigger Interface` to depend on your WAN interface events during boot or restart of your router. Listing IPv6 interfaces (wan6) is fine as well: a trigger only starts a run if the last one did not succeed or if its blocklist is gone, so the chatty netifd update events no longer cause repeated downloads
 
 <a id="adblock-cli-interface"></a>
 ## Adblock CLI interface
diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index 6810629eb..938691557 100755
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -55,7 +55,7 @@ boot() {
 }
 
 start_service() {
-	local status
+	local status backend blocklist
 
 	if "${adb_init}" enabled; then
 		if [ "${action}" = "boot" ]; then
@@ -65,7 +65,13 @@ start_service() {
 			json_init
 			json_load_file "${adb_rtfile}" >/dev/null 2>&1
 			json_get_var status "adblock_status"
-			[ -n "${status}" ] && [ "${status}" != "error" ] && return 0
+			json_get_var backend "dns_backend"
+			if [ -n "${status}" ] && [ "${status}" != "error" ]; then
+				[ "${status}" != "enabled" ] && return 0
+				blocklist="${backend#*, }"
+				blocklist="${blocklist%%,*}/adb_list.overall"
+				[ -s "${blocklist}" ] && return 0
+			fi
 		fi
 
 		procd_open_instance "adblock"