From 5cc7c997567112857d2d1f668ed5f76082bacc34 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 26 Oct 2024 21:54:31 +0200 Subject: [PATCH] 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 (cherry picked from commit bbaa72d739368ef2131d4d7aca8ab626be6658b3) --- net/adblock/Makefile | 2 +- net/adblock/files/adblock.categories | 1 + net/adblock/files/adblock.sh | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 1218c8b12f..57f15441f3 100644 --- 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 diff --git a/net/adblock/files/adblock.categories b/net/adblock/files/adblock.categories index 44b35945a4..85bca4ac64 100644 --- 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 b8688116a1..dfbb522171 100755 --- 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 -- 2.30.2