adblock: update 4.1.5-4
authorDirk Brenken <dev@brenken.org>
Mon, 24 Oct 2022 10:34:12 +0000 (12:34 +0200)
committerDirk Brenken <dev@brenken.org>
Mon, 24 Oct 2022 10:35:24 +0000 (12:35 +0200)
* fixed broken oisd regex

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e90b4c01e1619ce4adf16abb9f63c772b44fefe9)

net/adblock/Makefile
net/adblock/files/adblock.sources

index 603f5a2a229d9bf41ba24b9c27ef2826b5871f31..b8458ca1b0f57ea1e792909860f27f15c50fa628 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.1.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
index 4d908249a465f30313340c492b4856177f44cf24..8ec10400bb71c2b92c852550faa8fbbf1595050b 100644 (file)
        },
        "oisd_basic": {
                "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_basic.txt",
-               "rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
+               "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
                "size": "L",
                "focus": "general",
                "descurl": "https://oisd.nl"
        },
        "oisd_nsfw": {
                "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_nsfw.txt",
-               "rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
+               "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
                "size": "XL",
                "focus": "general",
                "descurl": "https://oisd.nl"
        },
        "oisd_full": {
                "url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_full.txt",
-               "rule": "/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
+               "rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
                "size": "XXL",
                "focus": "general",
                "descurl": "https://oisd.nl"