adblock: update to 4.2.2

* get rid of the opkg dependency
* fixed remaining hagezi category issues
* adblock still depends on 'gawk', but also accepts busybox awk. The readme describes two officially unsupported installation variants.

Signed-off-by: Dirk Brenken <[email protected]>

net/adblock/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=4.2.1
+PKG_VERSION:=4.2.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <[email protected]>
@@ -17,7 +17,7 @@ define Package/adblock
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=Powerful adblock script to block ad/abuse domains by using DNS
-	DEPENDS:=+jshn +jsonfilter +coreutils +coreutils-sort +gawk +ca-bundle +opkg
+	DEPENDS:=+jshn +jsonfilter +coreutils +coreutils-sort +gawk +ca-bundle +rpcd +rpcd-mod-rpcsys
 	PKGARCH:=all
 endef
 

net/adblock/files/README.md

@@ -102,8 +102,10 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 * Strong LuCI support, all relevant options are exposed to the web frontend
 
 ## Prerequisites
-* [OpenWrt](https://openwrt.org), tested with the stable release series and with the latest rolling snapshot releases.  
+* [OpenWrt](https://openwrt.org), tested with the stable release series and with the latest snapshot releases.  
   <b>Please note:</b> Devices with less than 128 MByte RAM are _not_ supported!  
+  <b>Please note:</b> For performance reasons, adblock depent on gnu awk (gawk) by default.  
+  If you insist to use the slow busybox awk implementation, remove the gawk package afterwards (_opkg remove gawk --force-depends_) or install adblock without any dependency checks/installation (_opkg install adblock --nodeps_). Both installation variants are officially unsupported.  
 * A usual setup with an enabled DNS backend at minimum - dumb AP modes without a working DNS backend are _not_ supported
 * A download utility with SSL support: 'wget', 'uclient-fetch' with one of the 'libustream-*' ssl libraries, 'aria2c' or 'curl' is required
 * A certificate store such as 'ca-bundle' or 'ca-certificates', as adblock checks the validity of the SSL certificates of all download sites by default

net/adblock/files/adblock.categories

@@ -3,7 +3,7 @@ hag;multi-normal;multi-onlydomains.txt
 hag;multi-pro;pro-onlydomains.txt
 hag;multi-pro.mini;pro.mini-onlydomains.txt
 hag;multi-pro.plus;pro.plus-onlydomains.txt
-hag;multi-pro.mini;pro.plus.mini-onlydomains.txt
+hag;multi-pro.plus.mini;pro.plus.mini-onlydomains.txt
 hag;multi-ultimate;ultimate-onlydomains.txt
 hag;multi-ultimate.mini;ultimate.mini-onlydomains.txt
 hag;threat-intelligence;tif-onlydomains.txt
@@ -18,16 +18,16 @@ hag;gambling;gambling-onlydomains.txt
 hag;gambling.medium;gambling.medium-onlydomains.txt
 hag;gambling.mini;gambling.mini-onlydomains.txt
 hag;hoster;hoster-onlydomains.txt
-hag;native.amazon;native.amazon-onlydomains.txt
-hag;native.apple;native.apple-onlydomains.txt
-hag;native.huawei;native.huawei-onlydomains.txt
-hag;native.lgwebos;native.lgwebos-onlydomains.txt
-hag;native.oppo-realme;native.oppo-realme-onlydomains.txt
-hag;native.tiktok;native.tiktok-onlydomains.txt
-hag;native.tiktok.extended;native.tiktok.extended-onlydomains.txt
-hag;native.vivo;native.vivo-onlydomains.txt
-hag;native.winoffice;native.winoffice-onlydomains.txt
-hag;native.xiaomi;native.xiaomi-onlydomains.txt
+hag;tracker.amazon;native.amazon-onlydomains.txt
+hag;tracker.apple;native.apple-onlydomains.txt
+hag;tracker.huawei;native.huawei-onlydomains.txt
+hag;tracker.lgwebos;native.lgwebos-onlydomains.txt
+hag;tracker.oppo-realme;native.oppo-realme-onlydomains.txt
+hag;tracker.tiktok;native.tiktok-onlydomains.txt
+hag;tracker.tiktok.extended;native.tiktok.extended-onlydomains.txt
+hag;tracker.vivo;native.vivo-onlydomains.txt
+hag;tracker.winoffice;native.winoffice-onlydomains.txt
+hag;tracker.xiaomi;native.xiaomi-onlydomains.txt
 hag;nosafesearch;nosafesearch-onlydomains.txt
 hag;popupads;popupads-onlydomains.txt
 hst;mini;mini/domains.wildcards