From 65cbdbc1d4cc6a0dc12c7a2d807746c35f73b250 Mon Sep 17 00:00:00 2001
From: ValdikSS <iam@valdikss.org.ru>
Date: Mon, 14 Dec 2020 18:58:39 +0300
Subject: [PATCH] Remove 33a-5536/2019 filtering (Telegram, obsolete) and add
 33-4/2018 IP filtering-out

---
 generate-pac.sh | 2 +-
 parse.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generate-pac.sh b/generate-pac.sh
index 7e5479a..4476ae4 100755
--- a/generate-pac.sh
+++ b/generate-pac.sh
@@ -18,7 +18,7 @@ awk -f scripts/generate-pac-domains.awk result/hostlist_zones.txt >> "$PACFILE"
 # Collapse IP list
 scripts/collapse_blockedbyip_noid2971.py
 
-echo "// This variable now excludes IP addresses blocked by 27-31-2018/Id2971-18 (since 27.06.2019) and 33a-5536/2019 (since 17.05.2020)" >> "$PACFILE"
+echo "// This variable now excludes IP addresses blocked by 33a-5536/2019 (since 17.05.2020) and 33-4/2018 (since 14.12.2020)" >> "$PACFILE"
 sort -Vu temp/include-ips.txt result/iplist_blockedbyip_noid2971_collapsed.txt | \
     grep -v -F -x -f temp/exclude-ips.txt | awk -f scripts/generate-pac-ipaddrs.awk >> "$PACFILE"
 
diff --git a/parse.sh b/parse.sh
index 7eda4ee..57a2d92 100755
--- a/parse.sh
+++ b/parse.sh
@@ -36,7 +36,7 @@ awk -F ';' '($1 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}/) {gsub(/ \| /, RS, $1); print $
 awk -F ';' '($1 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}/) && (($2 == "" && $3 == "") || ($1 == $2)) {gsub(/ \| /, RS); print $1}' temp/list.csv | \
     awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/' | sort -u > result/iplist_blockedbyip.txt
 
-grep -F -v 'Ид2971-18' temp/list.csv | grep -F -v '33а-5536/2019' | \
+grep -F -v '33-4/2018' temp/list.csv | grep -F -v '33а-5536/2019' | \
     awk -F ';' '($1 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}/) && (($2 == "" && $3 == "") || ($1 == $2)) {gsub(/ \| /, RS); print $1}' | \
     awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/' | sort -u > result/iplist_blockedbyip_noid2971.txt