adblock-fast: improve the processing of combined list

Signed-off-by: Nikolay Manev <redacted>
adblock-fast: modify gawk statement

Signed-off-by: Nikolay Manev <redacted>

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index d30cbc811da4eb915efc3295a23fa30f261b8df9..0083b52fc2af552c7b19db4537c4dc5fc7b0ee89 100644 (file)
--- a/net/adblock-fast/Makefile
+++ b/net/adblock-fast/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock-fast
 PKG_VERSION:=1.1.3
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=AGPL-3.0-or-later
 

diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast
index 24be72cfa4a246c4fb755cfa3f2bf71d85872efb..39745d499bae98c0031fdb77574d0e739f198ca1 100755 (executable)
--- a/net/adblock-fast/files/etc/init.d/adblock-fast
+++ b/net/adblock-fast/files/etc/init.d/adblock-fast
@@ -1471,7 +1471,7 @@ download_lists() {
        # shellcheck disable=SC2016
                        if $awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' "$A_TMP" > "$B_TMP"; then
                                if sort "$B_TMP" > "$A_TMP"; then
-                                       if $awk '{if(NR=1){tld=$NF};while(getline){if($NF!~tld"\\."){print tld;tld=$NF}}print tld}' "$A_TMP" > "$B_TMP"; then
+                                       if $awk '{ if (NR == 1) { tld = $NF; } else { if ($NF !~ tld "\\.") { results[++count] = tld; print tld; tld = $NF; } } } END { results[++count] = tld; for (i = 1; i <= count; i++) {print results[i];} }' "$A_TMP" > "$B_TMP"; then
                                                if $awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' "$B_TMP" > "$A_TMP"; then
                                                        if sort -u "$A_TMP" > "$B_TMP"; then
                                                                output_ok