From: Dirk Brenken <dev@brenken.org>
Date: Mon, 24 Oct 2022 10:34:12 +0000 (+0200)
Subject: adblock: update 4.1.5-4
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7132a6b55d645e25782f53c8ca2ce54c48112f0e;p=feed%2Fpackages.git

adblock: update 4.1.5-4

* fixed broken oisd regex

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

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 603f5a2a22..b8458ca1b0 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -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>
 
diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources
index 4d908249a4..8ec10400bb 100644
--- a/net/adblock/files/adblock.sources
+++ b/net/adblock/files/adblock.sources
@@ -134,21 +134,21 @@
 	},
 	"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"