From d1b913382ff6a005c20fd947ed32ac5f4ca264a8 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 9 Mar 2023 02:21:48 +0100 Subject: [PATCH] Add files via upload --- AdGuard Home Compilation List/AGHtest.py | 18 ++++++++---- .../AdGuardHomeCompilationList.txt | 8 +++--- .../AdGuardHomeCompilationListIPs.txt | 28 ++++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 430adc385..5faa96904 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -944,6 +944,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"http://creativecommons\.org/licenses/", + r"https://creativecommons.org/licenses/", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\r\n' @@ -1824,12 +1830,6 @@ def prepare_agh(lines) -> str: line ) - line = re.sub( - r"! Disabling of push-notifications", - r"! Title: AdGuard Annoyances Web Push\n! Homepage: https://github.com/AdguardTeam/AdguardFilters/tree/master/AnnoyancesFilter/sections\n! Sourced from: https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/sections/push-notifications.txt\n! Disabling of push-notifications", - line - ) - line = re.sub( r"^[a-z0-9.-].*[/?_+=&]$", r"", @@ -1890,6 +1890,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"http://creativecommons\.org/licenses/", + r"https://creativecommons.org/licenses/", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\r\n' diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index 2b624c760..5fe29aedc 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -1,6 +1,6 @@ [Adblock Plus 3.4] ! Title: Dandelion Sprout's AdGuard Home Compilation List -! Version: 09March2023v1-Beta +! Version: 09March2023v2-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, all of the borrowed lists' contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), except for Liste FR's and Liste AR's entries which are to be treated as CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/), and RU AdList whose loose CC BY 3.0 seems to me to enable me to relicence them under the Dandelicence. Known credits in accordance with attribution requirements, are The EasyList Authors (EasyList^³, Adblock Warning Removal List), Raymond Hill (uBlock Filters^²), AdGuard Software Limited (AdGuard Base Filter, AdGuard French Filter), smed79 (Liste AR), Daniel Kladnik (I Don't Care About Cookies), monztA & friends (ABP Filters), and Lain13 & Dimisa (RU AdList). ! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule (e.g. EasyList), which makes EasyList and similar lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it. @@ -14,9 +14,9 @@ ! To seemingly unbreak Nintendo Switch online games @@||104.198.251.169 ! ———————————————————————————————————— -! Version: 202303090020 +! Version: 202303090040 ! Title: EasyList without element hiding rules -! Last modified: 09 Mar 2023 00:20 UTC +! Last modified: 09 Mar 2023 00:40 UTC ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html ! in the forums (https://forums.lanik.us/) @@ -40407,7 +40407,7 @@ Banner468x60 ! Title: RU AdList ! Homepage: https://forums.lanik.us/viewforum.php?f=102 ! *** ruadlist:advblock.txt *** -! Лицензия CC-BY: http://creativecommons.org/licenses/by/3.0/ +! Лицензия CC-BY: https://creativecommons.org/licenses/by/3.0/ ! В разное время над списком фильтров работали: denis-ovs, Akuma, Radik245. ! в его работе, то свяжитесь с нами: ! *** advblock/popup.txt *** diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt index ca1df1d22..96456389d 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt @@ -1,9 +1,9 @@ -! Title: IP Entries from Adblock Lists -! Contains transformated entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, AdGuard Base Filter, AdGuard French Filter, EasyList Germany, ABP Anti-Circumvention Filters, RU AdList, Liste AR, EasyList Spanish -! 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. +! Title: IP Entries from Adblock Lists +! Contains transformated entries from: EasyList, uBlock Filters, uBlock Filters - Badware Risks, AdGuard Base Filter, AdGuard French Filter, EasyList Germany, ABP Anti-Circumvention Filters, RU AdList, Liste AR, EasyList Spanish +! 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: 20December2022v1-Alpha +! Version: 17February2023v1-Alpha 23.109.87.42 142.91.159.0/24 213.32.115.0/24 @@ -37,23 +37,30 @@ 146.59.223.83 176.31.68.242 185.147.34.126 +203.195.121.0/24 23.109.150.101 -23.109.248.149 -23.109.248.159 +23.109.248.0/24 23.109.82.104 23.109.82.74 +23.109.87.101 +23.109.87.42 +23.109.87.71 +35.232.188.118 5.45.79.15 51.178.195.171 51.195.115.102 51.89.115.13 -104.198.198.188 104.197.199.227 35.226.75.50 35.224.227.218 35.238.205.163 +5.61.55.143 +37.1.213.100 91.241.60.117 -91.241.60.119 146.190.12.4 +5.61.55.143 +37.1.213.100 +5.188.62.157 188.72.219.36 117.254.84.212:3000 198.16.64.66 @@ -70,4 +77,5 @@ 62.109.18.206 95.213.229.88 95.213.231.34 -35.193.89.147 \ No newline at end of file +35.193.89.147 +35.193.89.147