From 27c44bf735f5d022188324ade8b10eb8c9c59aab Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 15 Mar 2026 19:16:44 +0100 Subject: [PATCH] adblock: release 4.5.3-1 * refine the domain validator regarding prefix handling, esp. relevant for ABP-syntax * adapted the adguard feed to make use of the new prefix handling * LuCI: various fixes & optimizations Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 4 ++-- net/adblock/files/adblock.feeds | 2 +- net/adblock/files/adblock.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index f59490b1b5..87e3a7e366 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock -PKG_VERSION:=4.5.2 -PKG_RELEASE:=4 +PKG_VERSION:=4.5.3 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/adblock.feeds b/net/adblock/files/adblock.feeds index 4b2a9455ac..34a4372615 100644 --- a/net/adblock/files/adblock.feeds +++ b/net/adblock/files/adblock.feeds @@ -7,7 +7,7 @@ }, "adguard": { "url": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", - "rule": "feed 3 [|^]", + "rule": "feed || 3 [|^]", "size": "L", "descr": "general" }, diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index b8a817b60c..8f123345e0 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -284,7 +284,7 @@ f_chkdom() { # add www. for google safe search if (type=="google" && domain ~ /^\.+/) { sub(/^\.+/, "", domain); domain="www."domain } # check optional search prefix - if (pre != "" && $1 != pre) next + if (pre != "" && index($0, pre) != 1) next # skip empty lines, comments and special domains if (domain == "" || domain ~ ("^(#|localhost|loopback|" chk ")")) next # no domain with trailing dot @@ -1628,7 +1628,7 @@ f_main() { done f_list prepare ) & - + # normal handling for feeds without categories # else