diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 4fa958f76..1a0d3007c 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -662,6 +662,24 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^@.*(gatewaypundit|wltreport).*$", + r"", + line + ) + + line = re.sub( + r"^[|:/._a-z0-9-].*akamaiedge.*$", + r"", + line + ) + + line = re.sub( + r"^([|:/._a-z0-9-].*(akamai|azure[we]|\.cdn77\.org|amazonaws\.).*[^|])$", + r"\1$dnstype=~CNAME", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\n' @@ -760,7 +778,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^![a-z #].*$", + r"^!([a-z #]|\[).*$", r"", line ) @@ -809,7 +827,7 @@ def prepare_ip(lines) -> str: line = re.sub( r"# Version: (.*)-.*$", - r"! Version: \1-PreAlpha", + r"! Version: \1-Alpha", line ) @@ -909,6 +927,12 @@ def prepare_ip(lines) -> str: line ) + line = re.sub( + r"\.\.", + r".", + line + ) + if is_supported_ip(line) and not line == '': text += line + '\n' @@ -1134,12 +1158,6 @@ def prepare_agh(lines) -> str: line ) - line = re.sub( - r"^\|[a-z0-9].*$", - "", - line - ) - line = re.sub( r"^;[a-z0-9].*$", "", @@ -1460,7 +1478,7 @@ def prepare_agh(lines) -> str: line = re.sub( r"^/([a-zA-Z0-9].*$)", - r"//\1", + r"|\1", line ) diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt index 676949aa5..1beccdc8a 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt @@ -3,13 +3,12 @@ ! Expires: 14 days ! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such. ! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners. -! Version: 08October2024v1-PreAlpha +! Version: 05November2024v1-Alpha 142.91.159.0/24 213.32.115.0/24 217.182.11.0/24 51.195.31.0/24 141.98.82.232 -142.91.159.0/24 157.90.183.248 158.247.208.0/24 162.252.214.4 @@ -63,11 +62,14 @@ 203.195.121.72 203.195.121.73 203.195.121.74 +23.109.121.125 23.109.150.208 23.109.150.253 23.109.170.212 23.109.170.228 23.109.170.241 +23.109.170.255 +23.109.170.60 23.109.248.125 23.109.248.129 23.109.248.130 @@ -156,7 +158,6 @@ 51.178.195.171 51.195.115.102 51.89.115.13 -35.226.75.50 35.224.227.218 35.238.205.163 23.109.87.170 @@ -193,7 +194,6 @@ 198.16.64.66 213.206.98.70 23.83.114.131 -172.255.6.0/24 62.212.73.45 85.114.133.62 130.211.212.60