adblock: update to 4.2.2-4

* fixed wrongly detected NX domains in adblock reporting
* remove existing pcap files when restarting/stopping adblock
   to prevent problems when changing tcpdump parameters

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

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 4f97215ddb2004997389e15dc3b1e04e59a77532..a14b74e1bb17f1185e24f8bde8c1643167e92f98 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:=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.sh b/net/adblock/files/adblock.sh
index d98344ba851d3e7a6da99ae98c48e669c293e0aa..4f2948d51e74f306d68e7c0ed8180b45c4b8e843 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -11,7 +11,7 @@
 export LC_ALL=C
 export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 
-adb_ver="4.2.2-r3"
+adb_ver="4.2.2-r4"
 adb_enabled="0"
 adb_debug="0"
 adb_forcedns="0"
@@ -128,6 +128,7 @@ f_load() {
                        done
                        unset bg_pid
                fi
+               rm -f "${adb_reportdir}"/adb_report.pcap*
        fi
 
        if [ -x "${adb_dumpcmd}" ] && [ "${adb_report}" = "1" ] && [ -z "${bg_pid}" ] && [ "${adb_action}" != "report" ] && [ "${adb_action}" != "stop" ]; then
@@ -1328,7 +1329,7 @@ f_report() {
                                                if(type=="."&&$(NF-2)!="CNAME")
                                                        {domain=substr($(NF-1),1,length($(NF-1))-1);type="RQ"}
                                                else
-                                                       {if($(NF-1)~/[0-9]\/[0-9]\/[0-9]/||$(NF-1)=="0.0.0.0"){type="NX"}else{type="OK"};domain=""};
+                                                       {if($(NF-2)~/NXDomain/||$(NF-1)=="0.0.0.0"){type="NX"}else{type="OK"};domain=""};
                                                printf "%08d\t%s\t%s\t%s\t%-25s\t%s\n",$9,type,$1,substr($2,1,8),$6,domain}' >>"${report_raw}"
                                else
                                        "${adb_dumpcmd}" "${resolve}" --immediate-mode -T domain -tttt -r "${file}" 2>/dev/null |
@@ -1337,7 +1338,7 @@ f_report() {
                                                if(type=="."&&$(NF-2)!="CNAME")
                                                        {domain=substr($(NF-1),1,length($(NF-1))-1);type="RQ"}
                                                else
-                                                       {if($(NF-1)~/[0-9]\/[0-9]\/[0-9]/||$(NF-1)=="0.0.0.0"){type="NX"}else{type="OK"};domain=""};
+                                                       {if($(NF-2)~/NXDomain/||$(NF-1)=="0.0.0.0"){type="NX"}else{type="OK"};domain=""};
                                                printf "%08d\t%s\t%s\t%s\t%-25s\t%s\n",$7,type,$1,substr($2,1,8),$4,domain}' >>"${report_raw}"
                                fi
                        ) &