adblock: update to 4.2.2-7

* fixed gathering/printing of system information in adblock status
* added missing hagezi category (samsung tracker)

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 1218c8b12fb8aadc00359b384c01bcab714fe3b6..57f15441f3feeaca7dfe962dfd549d7c3324a759 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.2.2
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/adblock/files/adblock.categories b/net/adblock/files/adblock.categories
index 44b35945a42c377251ec3a1764005b7ca3b5165a..85bca4ac64f166a2a5ede3e2fce78d04a83c8d9f 100644 (file)
--- a/net/adblock/files/adblock.categories
+++ b/net/adblock/files/adblock.categories
@@ -23,6 +23,7 @@ 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.samsung;native.samsung-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

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index b8688116a1754d3bd1559899a37b782b3de434fc..dfbb522171a4ba19a686345f72c812862fd8db00 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -84,8 +84,8 @@ f_cmd() {
 f_load() {
        local bg_pid iface port ports cpu core
 
-       adb_sysver="$("${adb_ubuscmd}" -S call system board 2>/dev/null | "${adb_jsoncmd}" -q -e '@.model' -e '@.release.description' |
-               "${adb_awkcmd}" 'BEGIN{RS="";FS="\n"}{printf "%s, %s",$1,$2}')"
+       adb_sysver="$("${adb_ubuscmd}" -S call system board 2>/dev/null | "${adb_jsoncmd}" -ql1  -e '@.model' -e '@.release.target' -e '@.release.distribution' -e '@.release.version' -e '@.release.revision' |
+               "${adb_awkcmd}" 'BEGIN{RS="";FS="\n"}{printf "%s, %s, %s %s %s %s",$1,$2,$3,$4,$5,$6}')"
        adb_memory="$("${adb_awkcmd}" '/^MemAvailable/{printf "%s",int($2/1000)}' "/proc/meminfo" 2>/dev/null)"
        f_conf