pfBlocker - fix alias array check before loop, fix duplicates on autmatic rules and update country lists

1 files changed, 94 insertions, 44 deletions

diff --git a/config/pf-blocker/lists/Oceania_cidr.txt b/config/pf-blocker/lists/Oceania_cidr.txt
index dab52eee..6fd18ce8 100755
--- a/config/pf-blocker/lists/Oceania_cidr.txt
+++ b/config/pf-blocker/lists/Oceania_cidr.txt
@@ -12,8 +12,8 @@
 # Total Subnets:  0
 # Country: AUSTRALIA
 # ISO Code: AU
-# Total Networks: 5,907
-# Total Subnets:  47,565,568
+# Total Networks: 5,945
+# Total Subnets:  47,559,680
 1.0.0.0/24
 1.0.4.0/22
 1.1.1.0/24
@@ -36,7 +36,8 @@
 14.192.160.0/19
 14.200.0.0/14
 27.0.64.0/19
-27.32.0.0/15
+27.32.0.0/16
+27.33.0.0/16
 27.34.224.0/21
 27.50.48.0/20
 27.50.64.0/19
@@ -79,7 +80,8 @@
 42.62.192.0/18
 42.241.0.0/16
 49.0.8.0/21
-49.2.0.0/15
+49.2.0.0/16
+49.3.0.0/16
 49.127.0.0/16
 49.128.1.0/24
 49.128.12.0/22
@@ -107,10 +109,12 @@
 58.96.0.0/17
 58.96.128.0/19
 58.96.192.0/18
-58.104.0.0/15
+58.104.0.0/16
+58.105.0.0/16
 58.106.0.0/16
 58.107.0.0/16
-58.108.0.0/15
+58.108.0.0/16
+58.109.0.0/16
 58.110.0.0/16
 58.111.0.0/16
 58.145.128.0/19
@@ -121,7 +125,8 @@
 58.179.0.0/16
 58.181.64.0/19
 59.86.160.0/19
-59.100.0.0/15
+59.100.0.0/16
+59.101.0.0/16
 59.102.0.0/17
 59.154.0.0/16
 59.167.0.0/17
@@ -219,6 +224,8 @@
 103.5.212.0/23
 103.5.214.0/24
 103.5.230.0/23
+103.6.12.0/22
+103.6.24.0/23
 103.10.8.0/24
 103.10.11.0/24
 103.10.32.0/22
@@ -266,6 +273,12 @@
 103.28.20.0/24
 103.28.40.0/22
 103.28.48.0/22
+103.28.72.0/24
+103.28.92.0/24
+103.28.128.0/22
+103.28.160.0/24
+103.28.196.0/22
+103.28.216.0/23
 103.29.40.0/24
 103.29.41.0/24
 103.29.43.0/24
@@ -301,13 +314,29 @@
 103.246.233.0/24
 103.246.234.0/24
 103.246.235.0/24
+103.247.0.0/22
+103.247.19.0/24
+103.247.64.0/24
+103.247.65.0/24
+103.247.67.0/24
+103.247.76.0/22
+103.247.116.0/24
+103.247.118.0/23
+103.247.128.0/22
+103.247.184.0/22
+103.247.224.0/23
+103.247.236.0/23
+103.247.248.0/22
 106.0.1.0/24
-106.68.0.0/15
-106.70.0.0/15
+106.68.0.0/16
+106.69.0.0/16
+106.70.0.0/16
+106.71.0.0/16
 110.5.80.0/20
 110.5.116.0/22
 110.20.0.0/14
-110.32.0.0/15
+110.32.0.0/16
+110.33.0.0/16
 110.34.52.0/22
 110.44.24.0/22
 110.44.28.0/22
@@ -320,7 +349,8 @@
 110.93.8.0/22
 110.93.16.0/22
 110.93.20.0/22
-110.140.0.0/15
+110.140.0.0/16
+110.141.0.0/16
 110.142.0.0/16
 110.143.0.0/16
 110.144.0.0/13
@@ -329,7 +359,8 @@
 110.173.228.0/22
 110.173.232.0/22
 110.173.236.0/22
-110.174.0.0/15
+110.174.0.0/16
+110.175.0.0/16
 110.232.112.0/22
 110.232.116.0/22
 110.232.140.0/22
@@ -393,7 +424,8 @@
 114.31.96.0/21
 114.31.192.0/20
 114.72.0.0/14
-114.76.0.0/15
+114.76.0.0/16
+114.77.0.0/16
 114.78.0.0/16
 114.111.128.0/20
 114.111.144.0/20
@@ -548,8 +580,10 @@
 120.138.32.0/19
 120.144.0.0/13
 120.152.0.0/14
-120.156.0.0/15
-120.158.0.0/15
+120.156.0.0/16
+120.157.0.0/16
+120.158.0.0/16
+120.159.0.0/16
 121.0.0.0/21
 121.44.0.0/16
 121.45.0.0/16
@@ -585,17 +619,21 @@
 122.102.96.0/21
 122.102.104.0/22
 122.102.108.0/22
-122.104.0.0/15
+122.104.0.0/16
+122.105.0.0/16
 122.106.0.0/16
 122.107.0.0/16
-122.108.0.0/15
+122.108.0.0/16
+122.109.0.0/16
 122.110.0.0/16
 122.111.0.0/16
 122.128.88.0/21
 122.129.128.0/19
 122.129.216.0/21
-122.148.0.0/15
-122.150.0.0/15
+122.148.0.0/16
+122.149.0.0/16
+122.150.0.0/16
+122.151.0.0/16
 122.199.0.0/18
 122.200.24.0/21
 122.200.56.0/21
@@ -641,13 +679,15 @@
 124.47.128.0/18
 124.108.0.0/22
 124.109.64.0/19
-124.148.0.0/15
+124.148.0.0/16
+124.149.0.0/16
 124.150.0.0/17
 124.158.16.0/21
 124.158.24.0/22
 124.168.0.0/16
 124.169.0.0/16
-124.170.0.0/15
+124.170.0.0/16
+124.171.0.0/16
 124.176.0.0/14
 124.180.0.0/14
 124.184.0.0/14
@@ -1791,7 +1831,6 @@
 202.83.112.0/21
 202.83.176.0/21
 202.85.240.0/21
-202.86.32.0/20
 202.86.48.0/21
 202.86.112.0/24
 202.86.113.0/24
@@ -1998,7 +2037,6 @@
 202.166.187.0/24
 202.168.0.0/19
 202.168.32.0/19
-202.168.80.0/21
 202.168.96.0/19
 202.169.16.0/21
 202.169.96.0/19
@@ -2767,7 +2805,6 @@
 203.13.228.0/24
 203.13.229.0/24
 203.13.230.0/24
-203.13.231.0/24
 203.13.232.0/24
 203.13.234.0/23
 203.13.236.0/24
@@ -2796,7 +2833,8 @@
 203.14.54.0/24
 203.14.55.0/24
 203.14.57.0/24
-203.14.58.0/23
+203.14.58.0/24
+203.14.59.0/24
 203.14.60.0/24
 203.14.63.0/24
 203.14.64.0/20
@@ -5051,7 +5089,8 @@
 203.36.0.0/14
 203.40.0.0/13
 203.48.0.0/14
-203.52.0.0/15
+203.52.0.0/16
+203.53.0.0/16
 203.54.0.0/16
 203.55.0.0/23
 203.55.5.0/24
@@ -5066,7 +5105,8 @@
 203.55.23.0/24
 203.55.24.0/24
 203.55.25.0/24
-203.55.26.0/23
+203.55.26.0/24
+203.55.27.0/24
 203.55.28.0/23
 203.55.31.0/24
 203.55.32.0/21
@@ -5326,8 +5366,7 @@
 203.57.44.0/23
 203.57.47.0/24
 203.57.48.0/23
-203.57.50.0/24
-203.57.51.0/24
+203.57.50.0/23
 203.57.52.0/22
 203.57.56.0/23
 203.57.59.0/24
@@ -5547,7 +5586,8 @@
 203.100.61.0/24
 203.100.224.0/19
 203.101.224.0/19
-203.102.0.0/15
+203.102.0.0/16
+203.103.0.0/16
 203.104.0.0/20
 203.105.192.0/19
 203.108.0.0/16
@@ -5584,7 +5624,6 @@
 203.123.64.0/19
 203.123.96.0/20
 203.123.112.0/20
-203.124.96.0/19
 203.124.176.0/21
 203.124.184.0/21
 203.128.128.0/19
@@ -5828,7 +5867,6 @@
 210.87.0.0/19
 210.87.32.0/19
 210.89.128.0/19
-210.176.32.0/20
 210.185.64.0/19
 210.185.96.0/19
 210.193.128.0/17
@@ -6051,8 +6089,8 @@
 223.29.160.0/20
 # Country: NEW ZEALAND
 # ISO Code: NZ
-# Total Networks: 1,226
-# Total Subnets:  6,945,536
+# Total Networks: 1,238
+# Total Subnets:  6,950,400
 14.1.32.0/19
 14.1.64.0/19
 14.128.4.0/22
@@ -6089,6 +6127,7 @@
 103.5.108.0/22
 103.5.156.0/22
 103.5.224.0/22
+103.6.28.0/22
 103.10.44.0/22
 103.10.233.0/24
 103.11.21.0/24
@@ -6105,6 +6144,11 @@
 103.246.52.0/22
 103.246.180.0/22
 103.246.250.0/23
+103.247.56.0/22
+103.247.72.0/22
+103.247.152.0/22
+103.247.192.0/22
+103.247.247.0/24
 110.34.48.0/22
 110.44.16.0/22
 110.92.16.0/22
@@ -6129,7 +6173,8 @@
 115.126.128.0/21
 115.187.96.0/20
 115.187.112.0/20
-115.188.0.0/15
+115.188.0.0/16
+115.189.0.0/16
 116.12.56.0/21
 116.66.240.0/21
 116.89.224.0/20
@@ -6151,8 +6196,10 @@
 118.82.128.0/18
 118.82.192.0/18
 118.90.0.0/16
-118.92.0.0/15
-118.148.0.0/15
+118.92.0.0/16
+118.93.0.0/16
+118.148.0.0/16
+118.149.0.0/16
 119.15.0.0/19
 119.47.112.0/21
 119.47.120.0/21
@@ -6165,7 +6212,8 @@
 120.136.56.0/21
 120.138.16.0/21
 120.138.24.0/21
-121.72.0.0/15
+121.72.0.0/16
+121.73.0.0/16
 121.74.0.0/16
 121.75.0.0/16
 121.79.192.0/19
@@ -6175,8 +6223,10 @@
 121.79.248.0/21
 121.98.0.0/16
 121.99.0.0/16
-122.56.0.0/15
-122.58.0.0/15
+122.56.0.0/16
+122.57.0.0/16
+122.58.0.0/16
+122.59.0.0/16
 122.60.0.0/14
 122.252.152.0/21
 122.252.184.0/21
@@ -6193,8 +6243,10 @@
 124.198.128.0/18
 124.198.192.0/18
 124.248.128.0/20
-125.236.0.0/15
-125.238.0.0/15
+125.236.0.0/16
+125.237.0.0/16
+125.238.0.0/16
+125.239.0.0/16
 130.123.0.0/16
 130.195.0.0/16
 130.216.0.0/16
@@ -7232,7 +7284,6 @@
 203.176.188.0/24
 203.184.0.0/18
 203.190.208.0/21
-203.191.7.0/24
 203.207.60.0/23
 203.208.21.0/24
 203.211.64.0/20
@@ -7266,7 +7317,6 @@
 218.100.26.0/24
 218.100.56.0/24
 218.100.65.0/24
-218.100.68.0/24
 218.100.79.0/24
 218.101.0.0/18
 218.101.64.0/18