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

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

diff --git a/net/adblock/files/adblock.feeds b/net/adblock/files/adblock.feeds
index 4b2a9455ac1444446484a99cba3c6483dcbfbdae..34a437261533a59d415f0f5faaee2cba20541872 100644 (file)
--- 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 b8a817b60ce08928800ae4ac10d1b27522dbae0e..8f123345e03c62988b213ab1a805ec15527007af 100755 (executable)
--- 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