A1 overrides: add missing PureVPN networks and clean up

GZ Systems Ltd. has some other networks which were not added to A1 overrides
by mistake. To clean up the list a little bit and make file processing faster,
some of the networks were allocated in bigger ones (>= /23).

Sorry for this large patch, but I guess it does not make much sense to add
a bunch of networks fist and then split them apart afterwards. :-|

Signed-off-by: Peter Müller
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/country-overrides/override-a1.txt b/country-overrides/override-a1.txt
index 62bdc346823a9aa39c58f346900b723e4152cf7d..bae4ee9ac5a43465b56babf4b39b387261f3eb92 100644 (file)
--- a/country-overrides/override-a1.txt
+++ b/country-overrides/override-a1.txt
@@ -36,6 +36,11 @@ descr:               Asiamax Ltd. VPN
 remarks:       VPN provider
 newcountry:    A1
 
+net:           AS43902
+descr:         Sys11 VPN Services UG (haftungsbeschraenkt)
+remarks:       VPN provider
+newcountry:    A1
+
 net:           AS51852
 descr:         Private Layer INC
 remarks:       VPN provider
@@ -91,12 +96,7 @@ descr:               Privax LTD
 remarks:       VPN provider
 newcountry:    A1
 
-net:           5.62.20.0/24
-descr:         Privax LTD
-remarks:       VPN provider
-newcountry:    A1
-
-net:           5.62.21.0/24
+net:           5.62.20.0/23
 descr:         Privax LTD
 remarks:       VPN provider
 newcountry:    A1
@@ -121,12 +121,7 @@ descr:             VPNTunnel
 remarks:       VPN provider
 newcountry:    A1
 
-net:           5.254.133.0/24
-descr:         VPNTunnel
-remarks:       VPN provider
-newcountry:    A1
-
-net:           5.254.134.0/24
+net:           5.254.133.0/23
 descr:         VPNTunnel
 remarks:       VPN provider
 newcountry:    A1
@@ -161,22 +156,52 @@ descr:            Zwiebelfreunde e.V.
 remarks:       Tor relay provider
 newcountry:    A1
 
-net:           37.230.128.0/24
+net:           37.230.128.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           37.230.130.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           37.230.168.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           37.230.170.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           37.230.172.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           37.230.176.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           37.230.129.0/24
+net:           37.230.180.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           37.230.170.0/24
+net:           37.230.185.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           37.230.171.0/24
+net:           37.230.186.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           37.230.191.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
@@ -186,23 +211,23 @@ descr:            Blockless VPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           46.36.200.0/24
+net:           46.36.200.0/22
 descr:         IAPS Security Services, L.L.C.
 remarks:       VPN provider
 newcountry:    A1
 
-net:           46.36.201.0/24
-descr:         IAPS Security Services, L.L.C.
+net:           43.226.229.0/24
+descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           46.36.202.0/24
-descr:         IAPS Security Services, L.L.C.
+net:           43.226.230.0/23
+descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           46.36.203.0/24
-descr:         IAPS Security Services, L.L.C.
+net:           46.243.136.0/24
+descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
@@ -216,17 +241,97 @@ descr:            GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
+net:           46.243.140.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
 net:           46.243.143.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           46.243.208.0/24
-descr:         PureVPN
+net:           46.243.144.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.148.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.150.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.204.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.211.0/24
+descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           46.243.209.0/24
+net:           46.243.212.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.217.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.218.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.221.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.233.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.234.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.237.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.239.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.240.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.244.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.248.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           46.243.208.0/23
 descr:         PureVPN
 remarks:       VPN provider
 newcountry:    A1
@@ -266,6 +371,16 @@ descr:             Aruba VPN
 remarks:       VPN provider
 newcountry:    A1
 
+net:           62.205.133.0/24
+descr:         Netassist VPN service
+remarks:       VPN provider
+newcountry:    A1
+
+net:           62.205.152.0/24
+descr:         Netassist VPN service
+remarks:       VPN provider
+newcountry:    A1
+
 net:           64.64.108.0/24
 descr:         ExpressVPN
 remarks:       VPN provider
@@ -296,6 +411,11 @@ descr:             SecuredConnectivity
 remarks:       VPN provider
 newcountry:    A1
 
+net:           77.247.80.0/21
+descr:         Sys11 VPN Services UG (haftungsbeschraenkt)
+remarks:       VPN provider
+newcountry:    A1
+
 net:           80.254.74.0/20
 descr:         Monzoon/SwissVPN
 remarks:       VPN provider [high confidence, but not proofed]
@@ -306,6 +426,36 @@ descr:             Perfect Privacy LTD
 remarks:       VPN provider
 newcountry:    A1
 
+net:           82.199.141.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           85.195.160.0/23
+descr:         IP pool for limited VPN service/SatGate LLC
+remarks:       VPN provider
+newcountry:    A1
+
+net:           85.195.188.0/24
+descr:         P pool for limited VPN service/SatGate LLC
+remarks:       VPN provider
+newcountry:    A1
+
+net:           85.195.190.0/24
+descr:         P pool for limited VPN service/SatGate LLC
+remarks:       VPN provider
+newcountry:    A1
+
+net:           85.203.23.0/24
+descr:         VPN Consumer Network
+remarks:       VPN provider
+newcountry:    A1
+
+net:           85.203.39.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
 net:           87.119.203.0/24
 descr:         Privax LTD
 remarks:       VPN provider
@@ -316,6 +466,21 @@ descr:             TopNet ISP VPN
 remarks:       VPN provider
 newcountry:    A1
 
+net:           94.199.160.0/23
+descr:         MIK Telecom VPN pool
+remarks:       VPN provider
+newcountry:    A1
+
+net:           95.192.58.0/24
+descr:         Azimut-R VPN Service
+remarks:       VPN provider [high confidence, but not proofed]
+newcountry:    A1
+
+net:           95.129.59.0/24
+descr:         Azimut-R VPN Service
+remarks:       VPN provider [high confidence, but not proofed]
+newcountry:    A1
+
 net:           91.238.214.0/23
 descr:         Privax LTD
 remarks:       VPN provider
@@ -361,11 +526,31 @@ descr:            Pruska VPN
 remarks:       VPN provider
 newcountry:    A1
 
+net:           103.46.142.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           103.47.146.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           104.37.2.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
 net:           104.37.57.0/24
 descr:         Privax LTD
 remarks:       VPN provider
 newcountry:    A1
 
+net:           104.143.84.0/24
+descr:         VPN Consumer Network
+remarks:       VPN Provider
+newcountry:    A1
+
 net:           104.238.32.0/24
 descr:         Nobis Technology VPN Service
 remarks:       VPN provider
@@ -381,12 +566,47 @@ descr:            Proxy Brazil/Global Flash Telecom
 remarks:       VPN provider [high confidence, but not proofed]
 newcountry:    A1
 
-net:           141.101.134.0/24
+net:           141.101.134.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.143.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.148.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.152.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.156.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.160.0/21
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.168.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           141.101.172.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           141.101.135.0/24
+net:           141.101.174.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
@@ -396,9 +616,14 @@ descr:             WIFI and PROXY NET/Atlantique Telecom
 remarks:       VPN provider [high confidence, but not proofed]
 newcountry:    A1
 
+net:           154.16.139.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
 net:           172.94.73.0/24
 descr:         Secure Internet LLC
-remarks:       VPN provider [high confidence, same person as for GZ Systems Ltd., but not proofed]
+remarks:       VPN provider [high confidence, same contact person as for GZ Systems Ltd., but not proofed]
 newcountry:    A1
 
 net:           173.239.207.0/24
@@ -416,22 +641,22 @@ descr:            VPN Consumer Network (C05922486)/Logicweb
 remarks:       VPN provider [high confidence, but not proofed]
 newcountry:    A1
 
-net:           173.245.202.0/24
+net:           173.245.202.0/23
 descr:         SecuredConnectivity
 remarks:       VPN provider
 newcountry:    A1
 
-net:           173.245.203.0/24
-descr:         SecuredConnectivity
+net:           178.170.136.0/22
+descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           178.170.139.0/24
+net:           178.170.141.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           178.170.141.0/24
+net:           178.170.144.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
@@ -441,14 +666,19 @@ descr:            GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           185.161.200.0/24
-descr:         ProtonVPN AG
+net:           179.61.220.0/24
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           185.56.128.0/22
+descr:         Sys11 VPN Services UG (haftungsbeschraenkt)
 remarks:       VPN provider
 newcountry:    A1
 
-net:           185.161.201.0/24
+net:           185.161.200.0/23
 descr:         ProtonVPN AG
-descr:         VPN provider
+remarks:       VPN provider
 newcountry:    A1
 
 net:           185.198.240.0/24
@@ -461,52 +691,77 @@ descr:            Zwiebelfreunde e.V.
 remarks:       Tor relay provider
 newcountry:    A1
 
-net:           188.72.81.0/24
+net:           188.72.80.0/21
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.82.0/24
+net:           188.72.88.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.83.0/24
+net:           188.72.90.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.85.0/24
+net:           188.72.95.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.86.0/24
+net:           188.72.97.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.87.0/24
-descr:         PureVPN
+net:           188.72.98.0/23
+descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.88.0/24
+net:           188.72.100.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.97.0/24
+net:           188.72.104.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           188.72.106.0/23
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.104.0/24
+net:           188.72.110.0/22
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
 
-net:           188.72.105.0/24
+net:           188.72.112.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           188.72.116.0/22
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           188.72.124.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           191.96.1.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           191.96.75.0/24
 descr:         GZ Systems Limited/PureVPN
 remarks:       VPN provider
 newcountry:    A1
@@ -516,6 +771,11 @@ descr:             ExpressVPN
 remarks:       VPN provider
 newcountry:    A1
 
+net:           191.101.56.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
 net:           192.36.31.0/24
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
@@ -541,6 +801,21 @@ descr:             Privax LTD
 remarks:       VPN provider
 newcountry:    A1
 
+net:           192.241.169.122/32
+descr:         ssltunnel.net et al.
+remarks:       Open proxy provider
+newcountry:    A1
+
+net:           193.150.8.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
+net:           193.150.10.0/23
+descr:         GZ Systems Limited/PureVPN
+remarks:       VPN provider
+newcountry:    A1
+
 net:           193.200.150.0/24
 descr:         Anonymouse/Anonymous S.A.
 remarks:       VPN and open proxy provider
@@ -571,6 +846,16 @@ descr:             Perfect Privacy LTD
 remarks:       VPN provider
 newcountry:    A1
 
+net:           196.29.162.0/24
+descr:         Canar VPN Range
+remarks:       VPN provider
+newcountry:    A1
+
+net:           196.29.165.0/24
+descr:         Canar VPN Range
+remarks:       VPN provider
+newcountry:    A1
+
 net:           199.38.234.0/24
 descr:         Privax LTD
 remarks:       VPN provider
@@ -730,3 +1015,8 @@ net:               2a03:f85:6::/48
 descr:         Zwiebelfreunde e.V.
 remarks:       Tor relay provider
 newcountry:    A1
+
+net:           2a0b:f4c0:16c::/48
+descr:         Network for Tor-Exit traffic/F3 Netze e.V.
+remarks:       Tor relay provider
+newcountry:    A1