From 7ac962d4f98eb4d3ce916259ebe6be03abe203a8 Mon Sep 17 00:00:00 2001 From: Zelo72 Date: Fri, 22 Oct 2021 13:53:30 +0200 Subject: [PATCH] build auto-update --- pihole/blocklists/build/build.log | 1216 +++++++++++++------- pihole/blocklists/build/buildList.sh | 17 +- pihole/blocklists/build/updateWhitelist.sh | 7 +- 3 files changed, 838 insertions(+), 402 deletions(-) diff --git a/pihole/blocklists/build/build.log b/pihole/blocklists/build/build.log index be98204d..9da3b972 100755 --- a/pihole/blocklists/build/build.log +++ b/pihole/blocklists/build/build.log @@ -3,32 +3,75 @@ Initialize ... =========================================== Bereits aktuell. -Auf Branch master -Ihr Branch ist auf demselben Stand wie 'origin/master'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[master 3401e1a] auto-update + 205 files changed, 280705 insertions(+), 117288 deletions(-) + delete mode 100755 pihole/blocklists/build/affiliatetracking/affiliatetracking.block + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unblocklist.removed + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.new + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.old + create mode 100755 pihole/blocklists/build/affiliatetracking/rules.txt + create mode 100755 pihole/blocklists/build/big/big.config.prioblocklists + create mode 100755 pihole/blocklists/build/big/big.config.whitelists + create mode 100755 pihole/blocklists/build/big/big.white + create mode 100644 pihole/blocklists/build/big/exceptions.txt + create mode 100755 pihole/blocklists/build/big/exclusions.txt + create mode 100644 pihole/blocklists/build/big/out/big.domains.prioblocklist.added + create mode 100644 pihole/blocklists/build/big/out/big.domains.whitelist.removed + create mode 100644 pihole/blocklists/build/big/out/big.domains.wildcard.removed + delete mode 100644 pihole/blocklists/build/big/out/md5.new + delete mode 100644 pihole/blocklists/build/big/out/md5.old + create mode 100755 pihole/blocklists/build/big/rules.txt + delete mode 100644 pihole/blocklists/build/big_extension/out/md5.new + delete mode 100644 pihole/blocklists/build/big_extension/out/md5.old + delete mode 100644 pihole/blocklists/build/black/out/md5.new + delete mode 100644 pihole/blocklists/build/black/out/md5.old + delete mode 100644 pihole/blocklists/build/d3host/out/md5.new + delete mode 100644 pihole/blocklists/build/d3host/out/md5.old + delete mode 100644 pihole/blocklists/build/dead/out/md5.new + delete mode 100644 pihole/blocklists/build/dead/out/md5.old + delete mode 100644 pihole/blocklists/build/exclude/out/md5.new + delete mode 100644 pihole/blocklists/build/exclude/out/md5.old + rewrite pihole/blocklists/build/experimental/exceptions.txt (100%) + create mode 100644 pihole/blocklists/build/experimental/experimental.config.whitelists + rewrite pihole/blocklists/build/experimental/out/experimental.domains.prioblocklist.added (88%) + delete mode 100644 pihole/blocklists/build/experimental/out/md5.new + delete mode 100644 pihole/blocklists/build/experimental/out/md5.old + delete mode 100644 pihole/blocklists/build/fake/out/md5.new + delete mode 100644 pihole/blocklists/build/fake/out/md5.old + delete mode 100644 pihole/blocklists/build/light/out/md5.new + delete mode 100644 pihole/blocklists/build/light/out/md5.old + delete mode 100644 pihole/blocklists/build/multi/out/md5.new + delete mode 100644 pihole/blocklists/build/multi/out/md5.old + delete mode 100644 pihole/blocklists/build/personal/out/md5.new + delete mode 100644 pihole/blocklists/build/personal/out/md5.old + create mode 100644 pihole/blocklists/build/rules/out/rules.domains + create mode 100644 pihole/blocklists/build/rules/out/rules.domains.checkfordead + create mode 100644 pihole/blocklists/build/rules/out/rules.domains.sourceurls + create mode 100644 pihole/blocklists/build/rules/out/rules.stats + create mode 100644 pihole/blocklists/build/rules/rules.config + create mode 100644 pihole/blocklists/build/rules/rules.config.sourcelists + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.new + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.old + delete mode 100644 pihole/blocklists/data/exceptions.adguard + delete mode 100644 pihole/blocklists/data/exclusions.adguard + create mode 100644 pihole/blocklists/data/rules.list.block + create mode 100644 pihole/blocklists/sources/adguardteam_adguardsdnsfilter_filters_rules.txt + rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_covid_domains.txt (95%) + rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_malicious_domains.txt (97%) + create mode 100644 pihole/blocklists/sources/nextdns_cname-cloaking-blocklist_domains.txt + create mode 100644 pihole/blocklists/sources/nextdns_metadata_security_parked-domains-cname.txt Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main a5d208f] auto-update + 14 files changed, 96205 insertions(+), 11064 deletions(-) Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. +[main 2e9625a] auto-update + 15 files changed, 83918 insertions(+), 45957 deletions(-) -nichts zu committen, Arbeitsverzeichnis unverändert - -Aktualisiere b7b2438..1b6a70d -Fast-forward - dnsmasq/01-pihole.conf | 3 ++- - pihole/setupVars.conf | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) -Auf Branch master -Ihr Branch ist auf demselben Stand wie 'origin/master'. - -nichts zu committen, Arbeitsverzeichnis unverändert +Bereits aktuell. +[master 30f5d5b] auto-update + 3 files changed, 23 insertions(+), 9 deletions(-) =========================================== @@ -40,7 +83,7 @@ Whitelist ... 893 /media/nas/git/rpi/pihole/blocklists/data/white.list.referral 43 /media/nas/git/rpi/pihole/blocklists/data/white.list.shc 3092 /media/nas/git/rpi/pihole/blocklists/data/white.list.oisd -481 /media/nas/git/rpi/pihole/blocklists/data/white.list.adguard +577 /media/nas/git/rpi/pihole/blocklists/data/white.list.adguard ### Compile exclude Blocklist ### @@ -59,7 +102,7 @@ Initialize ... Nr | Count | Format | Source | Status | File | URL/File 1 | 92 | white | http | online | unchanged | https://gist.githubusercontent.com/ookangzheng/232057d3562bffc31daa7739dfdb4469/raw/c3246079b96bf6091081407efdea2a1bfa87223a/xiaomi-whitelist.txt - 2 | 45152 | white | http | online | changed | https://github.com/T145/black-mirror/releases/download/latest/white_domain.txt + 2 | 45152 | white | http | online | unchanged | https://github.com/T145/black-mirror/releases/download/latest/white_domain.txt 3 | 89 | white | http | online | unchanged | https://gitlab.com/KevinThomas0/cryptoscamdb-lists/-/raw/master/cryptoscamdb-allowlist.txt 4 | 500 | white | http | online | unchanged | https://gitlab.com/KevinThomas0/cryptoscamdb-lists/-/raw/master/potential-false-positives.txt 5 | 116 | white | http | online | unchanged | https://gitlab.com/Natizyskunk/pi-hole-lists/raw/master/whitelist/personal_mega_whitelist/whitelist.txt @@ -74,7 +117,7 @@ Initialize ... 14 | 44 | white | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/RemovedDomains 15 | 698 | white | http | online | unchanged | https://raw.githubusercontent.com/RPiList/specials/master/dev/corona%20whitelist 16 | 3143 | white | http | online | unchanged | https://raw.githubusercontent.com/RPiList/specials/master/dev/whitelist - 17 | 25570 | white | http | online | changed | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Whitelists/Filter + 17 | 25573 | white | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Whitelists/Filter 18 | 307 | white | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Whitelists/Whitelist 19 | 949 | white | http | online | unchanged | https://raw.githubusercontent.com/Ultimate-Hosts-Blacklist/whitelist/master/domains.list 20 | 769 | white | http | online | unchanged | https://raw.githubusercontent.com/anudeepND/blacklist/master/miscellaneous/false-positives.txt @@ -83,7 +126,7 @@ Initialize ... 23 | 191 | white | http | online | unchanged | https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt 24 | 70 | white | http | online | unchanged | https://raw.githubusercontent.com/badmojr/1Hosts/master/submit_here/exclude_for_all.txt 25 | 18 | white | http | online | unchanged | https://raw.githubusercontent.com/blokadaorg/landing-github-pages/master/scripts/whitelist - 26 | 626 | white | http | online | changed | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/WhitelistedDomains.txt + 26 | 626 | white | http | online | unchanged | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/WhitelistedDomains.txt 27 | 419 | white | http | online | unchanged | https://raw.githubusercontent.com/boutetnico/url-shorteners/master/list.txt 28 | 4420 | white | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/accomplist/master/whitelist/optimized.white.domain.list 29 | 678 | white | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/my-allowlist/master/allow.list @@ -96,25 +139,25 @@ Initialize ... 36 | 982 | white | http | online | unchanged | https://raw.githubusercontent.com/raghavdua1995/DNSlock-PiHole-whitelist/master/whitelist.list 37 | 739 | white | http | online | unchanged | https://raw.githubusercontent.com/rspamd/maps/master/rspamd/dmarc_whitelist.inc 38 | 79 | white | http | online | unchanged | https://raw.githubusercontent.com/zebpalmer/dns_blocklists/master/whitelist.txt - 39 | 690 | white | local | online | unchanged | white.list - 40 | 893 | white | local | online | unchanged | white.list.referral + 39 | 675 | white | local | online | changed | white.list + 40 | 893 | white | local | online | changed | white.list.referral 41 | 12 | white | local | online | unchanged | white.list.important - 42 | 481 | white | local | online | unchanged | white.list.adguard - 43 | 3092 | white | local | online | changed | white.list.oisd + 42 | 577 | white | local | online | changed | white.list.adguard + 43 | 3092 | white | local | online | unchanged | white.list.oisd 44 | 43 | white | local | online | unchanged | white.list.shc # Build exclude Domainlist ... Stats exclude: -** Source (raw): 110365 -== Source (unique): 58352 (-52013) -++ FLD from SLD: 64690 (+6338) -++ FLD: 64782 (+92) -++ WWW: 92512 (+27730) +** Source (raw): 110449 +== Source (unique): 58450 (-51999) +++ FLD from SLD: 64789 (+6339) +++ FLD: 64881 (+92) +++ WWW: 92612 (+27731) -92512 unique Domains - Version 2021.1022.060051 -MD5 Domains RAW: 0934bb07a881bff6ab68b7c2d1bb74fe +92612 unique Domains - Version 2021.1022.132406 +MD5 Domains RAW: b1d6d58d69b76059bf6df22f03ea5e33 # Push exclude to local Repositories ... @@ -139,8 +182,8 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 93050 | dead | http | online | changed | https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/domains.dead.txt - 2 | 27947 | dead | http | online | changed | https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/hostnames.dead.txt + 1 | 93050 | dead | http | online | unchanged | https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/domains.dead.txt + 2 | 27947 | dead | http | online | unchanged | https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/hostnames.dead.txt 3 | 47 | dead | http | online | unchanged | https://raw.githubusercontent.com/dead-hosts/Zelo72s_rpi.pihole.blocklists.multi/master/output/origin.list/domains/INACTIVE/list 4 | 357 | dead | http | online | unchanged | https://raw.githubusercontent.com/dead-hosts/Zelo72s_rpi.pihole.blocklists.fake/master/output/origin.list/domains/INACTIVE/list 5 | 30560 | dead | local | online | unchanged | dead.list.afftrack @@ -156,7 +199,7 @@ Stats dead: ** Source (raw): 763053 == Source (unique): 535116 (-227937) -535116 unique Domains - Version 2021.1022.060111 +535116 unique Domains - Version 2021.1022.132427 MD5 Domains RAW: 98cd0908b3f5968ded3ebde40e2653a5 # Push dead to local Repositories ... @@ -164,20 +207,20 @@ MD5 Domains RAW: 98cd0908b3f5968ded3ebde40e2653a5 dead - Done! Bereits aktuell. -[master 2e52bcb] white-dead auto-update - 19 files changed, 5317 insertions(+), 1781 deletions(-) +[master 5d6a7c3] white-dead auto-update + 13 files changed, 49 insertions(+), 13 deletions(-) + create mode 100644 pihole/blocklists/build/dead/out/md5.new + create mode 100644 pihole/blocklists/build/dead/out/md5.old + create mode 100644 pihole/blocklists/build/exclude/out/md5.new + create mode 100644 pihole/blocklists/build/exclude/out/md5.old Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main eec44e3] white-dead auto-update + 1 file changed, 6 insertions(+), 1 deletion(-) Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main 2fc64fd] white-dead auto-update + 1 file changed, 5 insertions(+) =========================================== Black ... @@ -210,33 +253,89 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 14403 | domains | local | online | unchanged | black.list - 2 | 64 | domains | local | online | unchanged | black.list.extension - 3 | 378 | domains | local | online | changed | black.list.wl.removed - 4 | 107 | domains | local | online | unchanged | black.list.wc.removed - 5 | 7739 | domains | local | online | unchanged | blocked.list - 6 | 22 | domains | local | online | unchanged | blocked.regex - 7 | 1328 | domains | local | online | unchanged | blocked.upstream + 1 | 14531 | domains | local | online | unchanged | black.list + 2 | 166 | domains | local | online | changed | black.list.extension + 3 | 387 | domains | local | online | changed | black.list.wl.removed + 4 | 104 | domains | local | online | changed | black.list.wc.removed + 5 | 7900 | domains | local | online | unchanged | blocked.list + 6 | 27 | domains | local | online | unchanged | blocked.regex + 7 | 1358 | domains | local | online | unchanged | blocked.upstream # Build black Domainlist ... Stats black: -** Source (raw): 24041 -== Source (unique): 14888 (-9153) --- White: 14510 (-378) --- White(*): 14403 (-107) --- Unblock: 14403 (-0) +** Source (raw): 24473 +== Source (unique): 15022 (-9451) +-- White: 14633 (-389) +-- White(*): 14000 (-633) +-- Unblock: 14000 (-0) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +14000 unique Domains - Version 2021.1022.132504 +MD5 Domains RAW: 3ca912c3ce121aa820fe698c49c7b0fe + +# Push black to local Repositories ... black - Done! Bereits aktuell. -[master e702a4d] black auto-update - 2 files changed, 13 insertions(+), 9 deletions(-) +[master 866f4f1] black auto-update + 12 files changed, 1093 insertions(+), 1090 deletions(-) + create mode 100644 pihole/blocklists/build/black/out/md5.new + create mode 100644 pihole/blocklists/build/black/out/md5.old + +Bereits aktuell. +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert + +Bereits aktuell. +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert + +=========================================== +Rules ... +=========================================== + +### Compile rules Blocklist ### + +Config: + +** Build - 3: + + block + localpush + noheader + +Initialize ... + +# Download and convert Sourcelists ... + + Nr | Count | Format | Source | Status | File | URL/File + 1 | 553 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt + +# Build rules Domainlist ... + +Stats rules: + +** Source (raw): 553 +== Source (unique): 553 (-0) + +553 unique Domains - Version 2021.1022.132517 +MD5 Domains RAW: e9760d148028deeeae62ddb6abe0ab1b + +# Push rules to local Repositories ... + +rules - Done! + +Bereits aktuell. +[master dce68bc] rules auto-update + 3 files changed, 4 insertions(+), 2 deletions(-) + create mode 100644 pihole/blocklists/build/rules/out/md5.new + create mode 100644 pihole/blocklists/build/rules/out/md5.old Bereits aktuell. Auf Branch main @@ -284,45 +383,45 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 6706 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt - 2 | 413 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt - 3 | 8622 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/urlhaus-filter-hosts.txt + 1 | 6706 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt + 2 | 413 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt + 3 | 8622 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/urlhaus-filter-hosts.txt 4 | 3496 | hosts | http | online | unchanged | https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/hosts_browser - 5 | 33523 | hosts | http | online | changed | https://hole.cert.pl/domains/domains_hosts.txt + 5 | 33566 | hosts | http | online | changed | https://hole.cert.pl/domains/domains_hosts.txt 6 | 550 | hosts | http | online | unchanged | https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt - 7 | 5983 | hosts | http | online | unchanged | https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt + 7 | 5997 | hosts | http | online | unchanged | https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt 8 | 2204 | hosts | http | online | unchanged | https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts 9 | 59 | hosts | http | online | unchanged | https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts - 10 | 53 | hosts | http | online | unchanged | https://raw.githubusercontent.com/davidonzo/Threat-Intel/master/lists/latestdomains.piHole.txt - 11 | 1060 | hosts | http | online | unchanged | https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/hosts.txt + 10 | 54 | hosts | http | online | unchanged | https://raw.githubusercontent.com/davidonzo/Threat-Intel/master/lists/latestdomains.piHole.txt + 11 | 1047 | hosts | http | online | unchanged | https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/hosts.txt 12 | 8624 | hosts | http | online | unchanged | https://raw.githubusercontent.com/guardicore/labs_campaigns/master/Autodiscover/autodiscover-tlds.txt 13 | 695 | hosts | http | online | unchanged | https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt 14 | 3622 | hosts | http | online | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/scams-and-phishing.txt 15 | 1072 | hosts | http | online | unchanged | https://raw.githubusercontent.com/metamask/eth-phishing-detect/master/src/hosts.txt 16 | 1386 | hosts | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/Badd-Boyz-Hosts/master/hosts 17 | 13465 | hosts | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts - 18 | 1528 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 18 | 1501 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 19 | 883 | adblock | http | online | unchanged | https://raw.githubusercontent.com/piperun/iploggerfilter/master/filterlist 20 | 914 | domains | http | online | changed | https://azorult-tracker.net/api/list/domain?format=plain 21 | 122584 | domains | http | online | unchanged | https://blocklist.cyberthreatcoalition.org/vetted/domain.txt 22 | 549 | domains | http | online | unchanged | https://feeds.alphasoc.net/ryuk.txt 23 | 9233 | domains | http | online | unchanged | https://gitlab.com/KevinThomas0/cryptoscamdb-lists/-/raw/master/cryptoscamdb-blocklist.txt 24 | 365 | domains | http | online | unchanged | https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt - 25 | 33523 | domains | http | online | changed | https://hole.cert.pl/domains/domains.txt - 26 | 73362 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl-base.txt - 27 | 748 | domains | http | online | changed | https://joewein.net/dl/bl/dom-bl.txt - 28 | 2000 | domains | http | online | changed | https://kriskintel.com/feeds/ktip_covid_domains.txt - 29 | 1998 | domains | http | online | changed | https://kriskintel.com/feeds/ktip_malicious_domains.txt + 25 | 33566 | domains | http | online | changed | https://hole.cert.pl/domains/domains.txt + 26 | 73359 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl-base.txt + 27 | 751 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl.txt + 28 | 2000 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_covid_domains.txt + 29 | 1998 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_malicious_domains.txt 30 | 397 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_ransomware_feeds.txt 31 | 2245 | domains | http | online | unchanged | https://orca.pet/notonmyshift/domains.txt - 32 | 53 | domains | http | online | unchanged | https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt - 33 | 44946 | domains | http | online | changed | https://phishing.army/download/phishing_army_blocklist.txt - 34 | 54639 | domains | http | online | changed | https://phishing.army/download/phishing_army_blocklist_extended.txt + 32 | 54 | domains | http | online | unchanged | https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt + 33 | 44761 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt + 34 | 54398 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist_extended.txt 35 | 1406 | domains | http | online | unchanged | https://raw.githubusercontent.com/AmnestyTech/investigations/master/2021-07-18_nso/domains.txt 36 | 27 | domains | http | online | unchanged | https://raw.githubusercontent.com/DRSDavidSoft/additional-hosts/master/domains/blacklist/fake-domains.txt - 37 | 35258 | domains | http | online | unchanged | https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADomains.txt + 37 | 35322 | domains | http | online | changed | https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADomains.txt 38 | 675 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Cryptocurrency - 39 | 22759 | domains | http | online | changed | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Malware + 39 | 22759 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Malware 40 | 179 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Risk 41 | 3960 | domains | http | online | unchanged | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/MD-ID-Fork.txt 42 | 18454 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/spyware/domains @@ -331,10 +430,10 @@ Initialize ... 45 | 434 | domains | http | online | unchanged | https://raw.githubusercontent.com/hpthreatresearch/iocs/main/CryptBot/domains.txt 46 | 137 | domains | http | online | unchanged | https://raw.githubusercontent.com/hpthreatresearch/iocs/main/IcedID/domains.txt 47 | 644 | domains | http | online | unchanged | https://raw.githubusercontent.com/hpthreatresearch/iocs/main/TA551/domains.txt - 48 | 3227 | domains | http | online | changed | https://raw.githubusercontent.com/iam-py-test/my_filters_001/main/Alternative%20list%20formats/antimalware_domains.txt + 48 | 3227 | domains | http | online | unchanged | https://raw.githubusercontent.com/iam-py-test/my_filters_001/main/Alternative%20list%20formats/antimalware_domains.txt 49 | 2079 | domains | http | online | unchanged | https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt 50 | 71289 | domains | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-ACTIVE.txt - 51 | 388 | domains | http | online | changed | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-NEW-today.txt + 51 | 421 | domains | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-NEW-today.txt 52 | 10000 | domains | http | online | unchanged | https://raw.githubusercontent.com/prodaft/malware-ioc/master/FluBot/v3.7_5000_domain.txt 53 | 10000 | domains | http | online | unchanged | https://raw.githubusercontent.com/prodaft/malware-ioc/master/FluBot/v3.7_germany.txt 54 | 10000 | domains | http | online | unchanged | https://raw.githubusercontent.com/prodaft/malware-ioc/master/FluBot/v3.8_domains.txt @@ -355,28 +454,28 @@ Initialize ... 69 | 23232 | domains | http | online | unchanged | https://raw.githubusercontent.com/scafroglia93/blocklists/master/blocklists-unit42-silverterrier.txt 70 | 3791 | domains | http | online | unchanged | https://raw.githubusercontent.com/scafroglia93/blocklists/master/blocklists-zscaler.txt 71 | 150425 | domains | http | online | unchanged | https://raw.githubusercontent.com/stamparm/aux/master/maltrail-malware-domains.txt - 72 | 16899 | domains | http | online | changed | https://raw.githubusercontent.com/stamparm/blackbook/master/blackbook.txt - 73 | 500 | domains | http | online | changed | https://rescure.me/covid.txt - 74 | 500 | domains | http | online | changed | https://rescure.me/rescure_domain_blacklist.txt + 72 | 16899 | domains | http | online | unchanged | https://raw.githubusercontent.com/stamparm/blackbook/master/blackbook.txt + 73 | 500 | domains | http | online | unchanged | https://rescure.me/covid.txt + 74 | 500 | domains | http | online | unchanged | https://rescure.me/rescure_domain_blacklist.txt 75 | 77 | domains | http | online | unchanged | https://www.botvrij.eu/data/ioclist.domain.raw 76 | 29 | domains | http | online | unchanged | https://www.botvrij.eu/data/ioclist.hostname.raw 77 | 35065 | domains | http | online | unchanged | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt - 78 | 101380 | domains | http | online | changed | https://www.usom.gov.tr/url-list.txt + 78 | 101388 | domains | http | OFFLINE | unchanged | USE LOCAL COPY: usom.gov.tr_url-list.txt 79 | 27 | domains | local | online | unchanged | black.list.threat-intelligence # Build threat-intelligence Domainlist ... Stats threat-intelligence: -** Source (raw): 1187153 -== Source (unique): 859973 (-327180) --- White: 859204 (-769) --- White(*): 857709 (-1495) --- Dead: 367339 (-490370) --- Unblock: 367339 (-0) +** Source (raw): 1186894 +== Source (unique): 859592 (-327302) +-- White: 858815 (-777) +-- White(*): 857289 (-1526) +-- Dead: 366934 (-490355) +-- Unblock: 366934 (-0) -367339 unique Domains - Version 2021.1022.060154 -MD5 Domains RAW: ae2a4626d752b1dbbc71608ae2307ed8 +366934 unique Domains - Version 2021.1022.132521 +MD5 Domains RAW: 896f927e9550bc33409310484b683cf0 # Convert threat-intelligence to Hostlist ... @@ -391,7 +490,13 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "threat-intelligence.adblock.raw", - "type": "adblock" + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] } ], "transformations": [ @@ -399,10 +504,12 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling threat-intelligence.adblock.raw -ℹ Original length is 347274 -ℹ Length after applying transformations is 347274 -ℹ The list was compressed from 347277 to 318917 -ℹ Final length of the list is 318923 +ℹ Original length is 346876 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 2 rules. 346874 rules left. +ℹ Length after applying transformations is 346874 +ℹ The list was compressed from 346877 to 318628 +ℹ Final length of the list is 318634 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/threat-intelligence/out/threat-intelligence.adblock ℹ Finished compiling @@ -413,21 +520,18 @@ Prepare domain list for compiling ... done. threat-intelligence - Done! Bereits aktuell. -[master 7cd7716] threat-intelligence auto-update - 31 files changed, 43644 insertions(+), 42457 deletions(-) - rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_covid_domains.txt (96%) - rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_malicious_domains.txt (97%) - rewrite pihole/blocklists/sources/mitchellkrogza_phishing.database_phishing-domains-new-today.txt (100%) - rewrite pihole/blocklists/sources/rescure.me_covid.txt (98%) - rewrite pihole/blocklists/sources/rescure.me_rescure_domain_blacklist.txt (99%) +[master 0f5b8ba] threat-intelligence auto-update + 14 files changed, 1753 insertions(+), 1926 deletions(-) + create mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.new + create mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.old Bereits aktuell. -[main 337ccfb] threat-intelligence auto-update - 2 files changed, 3895 insertions(+), 3621 deletions(-) +[main 864fea0] threat-intelligence auto-update + 2 files changed, 154 insertions(+), 92 deletions(-) Bereits aktuell. -[main d67cf20] threat-intelligence auto-update - 2 files changed, 3129 insertions(+), 3015 deletions(-) +[main 28db6d5] threat-intelligence auto-update + 2 files changed, 95 insertions(+), 714 deletions(-) =========================================== Personal ... @@ -444,9 +548,10 @@ Config: adblock localpush -++ Prioritized Blocklists - 2: +++ Prioritized Blocklists - 3: ../../data/black.list.block + ../../data/rules.list.block ../../data/black.list.extension -- Deadlists - 1: @@ -466,10 +571,10 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 14403 | domains | local | online | unchanged | black.list + 1 | 14000 | domains | local | online | changed | black.list 2 | 27 | domains | local | online | unchanged | black.list.threat-intelligence 3 | 2 | domains | local | online | unchanged | black.list.affiliatetracking - 4 | 3675 | hosts | http | online | unchanged | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext + 4 | 3672 | hosts | http | online | changed | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext 5 | 1734 | hosts | http | online | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt 6 | 2016 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/TOP_EU_US_Ads_Trackers_ABP 7 | 4924 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/EU_US%2Bmost_used_ad_and_tracking_networks @@ -478,18 +583,18 @@ Initialize ... Stats personal: -** Source (raw): 26781 -== Source (unique): 22944 (-3837) --- White: 21738 (-1206) --- White(*): 21732 (-6) --- Dead: 20903 (-829) -++ Block: 21021 (+118) --- Unblock: 21021 (-0) -++ FLD: 21153 (+132) -++ WWW: 27829 (+6676) +** Source (raw): 26375 +== Source (unique): 22535 (-3840) +-- White: 21336 (-1199) +-- White(*): 21319 (-17) +-- Dead: 20492 (-827) +++ Block: 21190 (+698) +-- Unblock: 21190 (-0) +++ FLD: 21329 (+139) +++ WWW: 28012 (+6683) -27829 unique Domains - Version 2021.1022.060606 -MD5 Domains RAW: 8b6b77944783af74b4e61715afd0bf26 +28012 unique Domains - Version 2021.1022.133113 +MD5 Domains RAW: 8f95cf0241c6490baf92f3f17a6d1f99 # Convert personal to Hostlist ... @@ -504,6 +609,26 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "personal.adblock.raw", + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], "type": "adblock" } ], @@ -512,10 +637,18 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling personal.adblock.raw -ℹ Original length is 20809 -ℹ Length after applying transformations is 20809 -ℹ The list was compressed from 20812 to 13297 -ℹ Final length of the list is 13303 +ℹ Original length is 20916 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 7 rules. 20909 rules left. +ℹ Length after applying transformations is 20908 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 +ℹ The list was compressed from 21666 to 12534 +ℹ Final length of the list is 12540 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/personal/out/personal.adblock ℹ Finished compiling @@ -526,16 +659,19 @@ Prepare domain list for compiling ... done. personal - Done! Bereits aktuell. -[master 5f0351e] personal auto-update - 9 files changed, 42 insertions(+), 39 deletions(-) +[master 086885f] personal auto-update + 14 files changed, 67 insertions(+), 1666 deletions(-) + create mode 100644 pihole/blocklists/build/personal/out/md5.new + create mode 100644 pihole/blocklists/build/personal/out/md5.old + rewrite pihole/blocklists/build/personal/out/personal.domains.wildcard.removed (97%) Bereits aktuell. -[main 853c415] personal auto-update - 2 files changed, 17 insertions(+), 16 deletions(-) +[main c9160e5] personal auto-update + 2 files changed, 21 insertions(+), 24 deletions(-) Bereits aktuell. -[main eccddc6] personal auto-update - 2 files changed, 17 insertions(+), 16 deletions(-) +[main d9448c2] personal auto-update + 2 files changed, 21 insertions(+), 22 deletions(-) =========================================== Fake ... @@ -574,7 +710,7 @@ Initialize ... Nr | Count | Format | Source | Status | File | URL/File 1 | 2197 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/extensions/fakenews/hosts 2 | 252 | domains | http | online | unchanged | https://assets.windscribe.com/custom_blocklists/clickbait.txt - 3 | 16796 | domains | http | online | changed | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Scam + 3 | 16799 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Scam 4 | 1483 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/costtraps/domains 5 | 45 | domains | http | online | unchanged | https://raw.githubusercontent.com/iam-py-test/my_filters_001/main/Alternative%20list%20formats/clickbait_domains.txt 6 | 5650 | domains | http | online | unchanged | https://raw.githubusercontent.com/stonecrusher/filterlists-pihole/master/watchlist-internet-ph.txt @@ -586,17 +722,17 @@ Initialize ... Stats fake: -** Source (raw): 29829 -== Source (unique): 27322 (-2507) --- White: 27234 (-88) --- White(*): 27234 (-0) --- Dead: 23336 (-3898) --- Unblock: 23336 (-0) -++ FLD: 23471 (+135) -++ WWW: 45949 (+22478) +** Source (raw): 29832 +== Source (unique): 27325 (-2507) +-- White: 27237 (-88) +-- White(*): 27237 (-0) +-- Dead: 23339 (-3898) +-- Unblock: 23339 (-0) +++ FLD: 23474 (+135) +++ WWW: 45955 (+22481) -45949 unique Domains - Version 2021.1022.060644 -MD5 Domains RAW: 0e0f1197609d8fcec4af04e8f0045b44 +45955 unique Domains - Version 2021.1022.133153 +MD5 Domains RAW: e5fcee9908d4d7f757d74e0ccea80de6 # Convert fake to Hostlist ... @@ -611,7 +747,13 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "fake.adblock.raw", - "type": "adblock" + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] } ], "transformations": [ @@ -619,10 +761,12 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling fake.adblock.raw -ℹ Original length is 23303 -ℹ Length after applying transformations is 23303 -ℹ The list was compressed from 23306 to 23287 -ℹ Final length of the list is 23293 +ℹ Original length is 23306 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 0 rules. 23306 rules left. +ℹ Length after applying transformations is 23306 +ℹ The list was compressed from 23309 to 23290 +ℹ Final length of the list is 23296 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/fake/out/fake.adblock ℹ Finished compiling @@ -633,16 +777,18 @@ Prepare domain list for compiling ... done. fake - Done! Bereits aktuell. -[master c0e39cf] fake auto-update - 11 files changed, 119 insertions(+), 50 deletions(-) +[master 69f2982] fake auto-update + 8 files changed, 8 insertions(+), 6 deletions(-) + create mode 100644 pihole/blocklists/build/fake/out/md5.new + create mode 100644 pihole/blocklists/build/fake/out/md5.old Bereits aktuell. -[main 5a5662a] fake auto-update - 2 files changed, 19 insertions(+), 21 deletions(-) +[main 9b45343] fake auto-update + 2 files changed, 2 insertions(+), 2 deletions(-) Bereits aktuell. -[main bccfe6d] fake auto-update - 2 files changed, 18 insertions(+), 19 deletions(-) +[main 6a29b48] fake auto-update + 2 files changed, 2 insertions(+), 2 deletions(-) =========================================== Light ... @@ -659,9 +805,10 @@ Config: adblock localpush -++ Prioritized Blocklists - 2: +++ Prioritized Blocklists - 3: ../../data/black.list.block + ../../data/rules.list.block ../../data/black.list.extension -- Excludelists - 1: @@ -686,45 +833,46 @@ Initialize ... Nr | Count | Format | Source | Status | File | URL/File 1 | 1013 | domains | http | online | unchanged | https://raw.githubusercontent.com/jkrejcha/AdmiraList/master/AdmiraList.txt - 2 | 15567 | domains | http | online | changed | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt + 2 | 15649 | domains | http | online | unchanged | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt 3 | 700 | domains | http | online | unchanged | https://raw.githubusercontent.com/DRSDavidSoft/additional-hosts/master/domains/blacklist/adservers-and-trackers.txt 4 | 9922 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/adv/domains 5 | 1486 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/tracker/domains 6 | 3670 | domains | http | OFFLINE | unchanged | USE LOCAL COPY: cbuijs_ut1_ads_domains.txt 7 | 8125 | hosts | http | online | unchanged | https://adaway.org/hosts.txt - 8 | 3675 | hosts | http | online | unchanged | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext + 8 | 3672 | hosts | http | online | unchanged | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext 9 | 1770 | hosts | http | online | unchanged | https://raw.githubusercontent.com/What-Zit-Tooya/Ad-Block/main/Main-Blocklist/Ad-Block-HOSTS.txt 10 | 244 | hosts | http | online | unchanged | https://raw.githubusercontent.com/d3ward/toolz/master/src/d3host.txt 11 | 1734 | hosts | http | online | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt 12 | 335 | hosts | http | online | unchanged | https://raw.githubusercontent.com/shreyasminocha/shady-hosts/main/hosts - 13 | 16963 | hosts | http | online | changed | https://someonewhocares.org/hosts/ - 14 | 1527 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ - 15 | 40566 | adblock | http | online | changed | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt - 16 | 18513 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt - 17 | 16173 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt - 18 | 9314 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt - 19 | 2016 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/TOP_EU_US_Ads_Trackers_ABP - 20 | 4924 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/EU_US%2Bmost_used_ad_and_tracking_networks - 21 | 14403 | domains | local | online | unchanged | black.list - 22 | 27 | domains | local | online | unchanged | black.list.threat-intelligence + 13 | 16963 | hosts | http | online | unchanged | https://someonewhocares.org/hosts/ + 14 | 1503 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 15 | 40570 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 16 | 553 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt + 17 | 18513 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt + 18 | 16173 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt + 19 | 9314 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt + 20 | 2016 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/TOP_EU_US_Ads_Trackers_ABP + 21 | 4924 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/EU_US%2Bmost_used_ad_and_tracking_networks + 22 | 14000 | domains | local | online | unchanged | black.list + 23 | 27 | domains | local | online | unchanged | black.list.threat-intelligence # Build light Domainlist ... Stats light: -** Source (raw): 172667 -== Source (unique): 104429 (-68238) --- Exclude: 104375 (-54) --- White: 102173 (-2202) --- White(*): 102010 (-163) --- Dead: 84628 (-17382) -++ Block: 84736 (+108) --- Unblock: 84736 (-0) -++ FLD: 85462 (+726) -++ WWW: 124153 (+38691) +** Source (raw): 172876 +== Source (unique): 104091 (-68785) +-- Exclude: 104030 (-61) +-- White: 101828 (-2202) +-- White(*): 101141 (-687) +-- Dead: 83998 (-17143) +++ Block: 84344 (+346) +-- Unblock: 84344 (-0) +++ FLD: 85076 (+732) +++ WWW: 123720 (+38644) -124153 unique Domains - Version 2021.1022.060725 -MD5 Domains RAW: bfa688aa80bd987c6ad8e0d3c11a7175 +123720 unique Domains - Version 2021.1022.133238 +MD5 Domains RAW: 7cb1f47d43691d364a1cec22b654cefd # Convert light to Hostlist ... @@ -739,6 +887,26 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "light.adblock.raw", + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], "type": "adblock" } ], @@ -747,10 +915,18 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling light.adblock.raw -ℹ Original length is 83274 -ℹ Length after applying transformations is 83274 -ℹ The list was compressed from 83277 to 69711 -ℹ Final length of the list is 69717 +ℹ Original length is 82818 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 10 rules. 82808 rules left. +ℹ Length after applying transformations is 82807 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 +ℹ The list was compressed from 83565 to 68128 +ℹ Final length of the list is 68134 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/light/out/light.adblock ℹ Finished compiling @@ -761,16 +937,22 @@ Prepare domain list for compiling ... done. light - Done! Bereits aktuell. -[master d38e7c8] light auto-update - 15 files changed, 1796 insertions(+), 2206 deletions(-) +[master eadeb62] light auto-update + 13 files changed, 1212 insertions(+), 31827 deletions(-) + rewrite pihole/blocklists/build/light/out/light.stats (99%) + create mode 100644 pihole/blocklists/build/light/out/md5.new + create mode 100644 pihole/blocklists/build/light/out/md5.old + rewrite pihole/blocklists/light.stats (99%) Bereits aktuell. -[main f67c001] light auto-update - 2 files changed, 430 insertions(+), 533 deletions(-) +[main f353798] light auto-update + 2 files changed, 357 insertions(+), 15267 deletions(-) + rewrite light.stats (99%) Bereits aktuell. -[main b8b38b6] light auto-update - 2 files changed, 263 insertions(+), 316 deletions(-) +[main 16a9ed6] light auto-update + 2 files changed, 278 insertions(+), 15181 deletions(-) + rewrite light.stats (99%) =========================================== Multi ... @@ -787,9 +969,10 @@ Config: adblock localpush -++ Prioritized Blocklists - 2: +++ Prioritized Blocklists - 3: ../../data/black.list.block + ../../data/rules.list.block ../../data/black.list.extension -- Excludelists - 1: @@ -817,22 +1000,22 @@ Initialize ... 2 | 636 | domains | http | online | unchanged | https://v.firebog.net/hosts/Admiral.txt 3 | 15120 | domains | http | online | unchanged | https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt 4 | 13720 | domains | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/combined_disguised_trackers_justdomains.txt - 5 | 15567 | domains | http | online | unchanged | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt + 5 | 15649 | domains | http | online | unchanged | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt 6 | 700 | domains | http | online | unchanged | https://raw.githubusercontent.com/DRSDavidSoft/additional-hosts/master/domains/blacklist/adservers-and-trackers.txt 7 | 9922 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/adv/domains 8 | 1486 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/tracker/domains 9 | 3670 | domains | http | OFFLINE | unchanged | USE LOCAL COPY: cbuijs_ut1_ads_domains.txt 10 | 415 | domains | http | online | unchanged | https://raw.githubusercontent.com/ookangzheng/blahdns/master/hosts/blacklist.txt 11 | 357 | domains | http | online | unchanged | https://v.firebog.net/hosts/static/w3kbl.txt - 12 | 93194 | domains | http | online | unchanged | https://dbl.oisd.nl/basic/ - 13 | 238046 | domains | http | online | changed | https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt - 14 | 44946 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt + 12 | 93193 | domains | http | online | unchanged | https://dbl.oisd.nl/basic/ + 13 | 238046 | domains | http | online | unchanged | https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt + 14 | 44761 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt 15 | 1406 | domains | http | online | unchanged | https://raw.githubusercontent.com/AmnestyTech/investigations/master/2021-07-18_nso/domains.txt 16 | 8125 | hosts | http | online | unchanged | https://adaway.org/hosts.txt - 17 | 3675 | hosts | http | online | unchanged | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext + 17 | 3672 | hosts | http | online | unchanged | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext 18 | 1286 | hosts | http | online | unchanged | https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts 19 | 1770 | hosts | http | online | unchanged | https://raw.githubusercontent.com/What-Zit-Tooya/Ad-Block/main/Main-Blocklist/Ad-Block-HOSTS.txt - 20 | 97082 | hosts | http | online | changed | https://raw.githubusercontent.com/badmojr/1Hosts/master/Lite/hosts.txt + 20 | 97082 | hosts | http | online | unchanged | https://raw.githubusercontent.com/badmojr/1Hosts/master/Lite/hosts.txt 21 | 18120 | hosts | http | online | unchanged | https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts 22 | 1734 | hosts | http | online | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt 23 | 1831 | hosts | http | online | unchanged | https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts @@ -843,78 +1026,79 @@ Initialize ... 28 | 8728 | hosts | http | online | unchanged | https://winhelp2002.mvps.org/hosts.txt 29 | 3496 | hosts | http | online | unchanged | https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/hosts_browser 30 | 93712 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts - 31 | 24887 | hosts | http | online | changed | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/AdditionalSupplementaryHosts.txt + 31 | 24887 | hosts | http | online | unchanged | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/AdditionalSupplementaryHosts.txt 32 | 8624 | hosts | http | online | unchanged | https://raw.githubusercontent.com/guardicore/labs_campaigns/master/Autodiscover/autodiscover-tlds.txt - 33 | 1527 | hosts | http | online | unchanged | https://urlhaus.abuse.ch/downloads/hostfile/ + 33 | 1502 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 34 | 373 | hosts | http | online | unchanged | https://raw.githubusercontent.com/Laicure/hosts/master/shithosts - 35 | 40566 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 35 | 40570 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt 36 | 1019 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_11_Mobile/filter.txt - 37 | 727 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_14_Annoyances/filter.txt + 37 | 728 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_14_Annoyances/filter.txt 38 | 5523 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_16_French/filter.txt 39 | 4649 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_1_Russian/filter.txt - 40 | 6582 | adblock | http | online | changed | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_224_Chinese/filter.txt + 40 | 6583 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_224_Chinese/filter.txt 41 | 22086 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_2_English/filter.txt - 42 | 16798 | adblock | http | online | changed | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_3_Spyware/filter.txt + 42 | 16802 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_3_Spyware/filter.txt 43 | 50 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_4_Social/filter.txt 44 | 403 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_6_German/filter.txt 45 | 334 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_7_Japanese/filter.txt 46 | 25 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_8_Dutch/filter.txt 47 | 219 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_9_Spanish/filter.txt - 48 | 0 | adblock | http | OFFLINE | OFFLINE | https://adblock.gardar.net/is.abp.txt - 49 | 127 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/Liste_AR.txt - 50 | 9621 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/advblock.txt - 51 | 6317 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/easylistchina.txt - 52 | 21 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistdutch.txt - 53 | 364 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistgermany.txt - 54 | 215 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistitaly.txt - 55 | 39 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistpolish.txt - 56 | 110 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistportuguese.txt - 57 | 351 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistspanish.txt - 58 | 18 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/indianlist.txt - 59 | 25 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/koreanlist.txt - 60 | 5516 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/liste_fr.txt - 61 | 18513 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt - 62 | 16173 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt - 63 | 55 | adblock | http | online | unchanged | https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt - 64 | 86 | adblock | http | online | unchanged | https://raw.github.com/tomasko126/easylistczechandslovak/master/filters.txt - 65 | 684 | adblock | http | online | unchanged | https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt - 66 | 32 | adblock | http | online | unchanged | https://raw.githubusercontent.com/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt - 67 | 216 | adblock | http | online | unchanged | https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt - 68 | 162 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist-thailand/easylist-thailand/master/subscription/easylist-thailand.txt - 69 | 302 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt - 70 | 9314 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt - 71 | 0 | adblock | http | OFFLINE | OFFLINE | https://raw.githubusercontent.com/yecarrillo/adblock-colombia/master/adblock_co.txt - 72 | 5 | adblock | http | online | unchanged | https://stanev.org/abp/adblock_bg.txt - 73 | 16 | adblock | http | online | unchanged | https://www.void.gr/kargig/void-gr-filters.txt - 74 | 120 | adblock | http | online | unchanged | https://www.zoso.ro/pages/rolist.txt - 75 | 562 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt - 76 | 99 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt - 77 | 138 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt - 78 | 715 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt - 79 | 45 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt - 80 | 4 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt - 81 | 2016 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/TOP_EU_US_Ads_Trackers_ABP - 82 | 4924 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/EU_US%2Bmost_used_ad_and_tracking_networks - 83 | 14403 | domains | local | online | unchanged | black.list - 84 | 27 | domains | local | online | unchanged | black.list.threat-intelligence + 48 | 553 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt + 49 | 0 | adblock | http | OFFLINE | OFFLINE | https://adblock.gardar.net/is.abp.txt + 50 | 127 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/Liste_AR.txt + 51 | 9622 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/advblock.txt + 52 | 6319 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/easylistchina.txt + 53 | 21 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistdutch.txt + 54 | 364 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistgermany.txt + 55 | 215 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistitaly.txt + 56 | 39 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistpolish.txt + 57 | 110 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistportuguese.txt + 58 | 351 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistspanish.txt + 59 | 18 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/indianlist.txt + 60 | 25 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/koreanlist.txt + 61 | 5516 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/liste_fr.txt + 62 | 18513 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt + 63 | 16173 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt + 64 | 55 | adblock | http | online | unchanged | https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt + 65 | 86 | adblock | http | online | unchanged | https://raw.github.com/tomasko126/easylistczechandslovak/master/filters.txt + 66 | 684 | adblock | http | online | unchanged | https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt + 67 | 32 | adblock | http | online | unchanged | https://raw.githubusercontent.com/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt + 68 | 216 | adblock | http | online | unchanged | https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt + 69 | 162 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist-thailand/easylist-thailand/master/subscription/easylist-thailand.txt + 70 | 302 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt + 71 | 9314 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt + 72 | 0 | adblock | http | OFFLINE | OFFLINE | https://raw.githubusercontent.com/yecarrillo/adblock-colombia/master/adblock_co.txt + 73 | 5 | adblock | http | online | unchanged | https://stanev.org/abp/adblock_bg.txt + 74 | 16 | adblock | http | online | unchanged | https://www.void.gr/kargig/void-gr-filters.txt + 75 | 120 | adblock | http | online | unchanged | https://www.zoso.ro/pages/rolist.txt + 76 | 561 | adblock | http | online | changed | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt + 77 | 99 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt + 78 | 152 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt + 79 | 715 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt + 80 | 45 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt + 81 | 4 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt + 82 | 2016 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/TOP_EU_US_Ads_Trackers_ABP + 83 | 4924 | adblock | http | online | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/EU_US%2Bmost_used_ad_and_tracking_networks + 84 | 14000 | domains | local | online | unchanged | black.list + 85 | 27 | domains | local | online | unchanged | black.list.threat-intelligence # Build multi Domainlist ... Stats multi: -** Source (raw): 930646 -== Source (unique): 457731 (-472915) --- Exclude: 453699 (-4032) --- White: 450261 (-3438) --- White(*): 449920 (-341) --- Dead: 351373 (-98547) -++ Block: 351472 (+99) --- Unblock: 351472 (-0) -++ FLD: 352090 (+618) -++ WWW: 470664 (+118574) +** Source (raw): 930690 +== Source (unique): 457736 (-472954) +-- Exclude: 453698 (-4038) +-- White: 450258 (-3440) +-- White(*): 448738 (-1520) +-- Dead: 350448 (-98290) +++ Block: 350756 (+308) +-- Unblock: 350756 (-0) +++ FLD: 351391 (+635) +++ WWW: 470105 (+118714) -470664 unique Domains - Version 2021.1022.060824 -MD5 Domains RAW: aa02db86e38f054a10ab591da36761b0 +470105 unique Domains - Version 2021.1022.133351 +MD5 Domains RAW: 4c3d579026ff0770922e719de8c27f89 # Convert multi to Hostlist ... @@ -929,6 +1113,26 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "multi.adblock.raw", + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], "type": "adblock" } ], @@ -937,10 +1141,18 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling multi.adblock.raw -ℹ Original length is 307707 -ℹ Length after applying transformations is 307707 -ℹ The list was compressed from 307710 to 256093 -ℹ Final length of the list is 256099 +ℹ Original length is 307038 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 19 rules. 307019 rules left. +ℹ Length after applying transformations is 307017 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 +ℹ The list was compressed from 307775 to 250472 +ℹ Final length of the list is 250478 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/multi/out/multi.adblock ℹ Finished compiling @@ -951,16 +1163,22 @@ Prepare domain list for compiling ... done. multi - Done! Bereits aktuell. -[master 9749f33] multi auto-update - 19 files changed, 27025 insertions(+), 36979 deletions(-) +[master 90af5b7] multi auto-update + 15 files changed, 554 insertions(+), 114902 deletions(-) + create mode 100644 pihole/blocklists/build/multi/out/md5.new + create mode 100644 pihole/blocklists/build/multi/out/md5.old + rewrite pihole/blocklists/build/multi/out/multi.stats (99%) + rewrite pihole/blocklists/multi.stats (99%) Bereits aktuell. -[main 3016799] multi auto-update - 2 files changed, 4721 insertions(+), 5735 deletions(-) +[main 383ae0d] multi auto-update + 2 files changed, 220 insertions(+), 57024 deletions(-) + rewrite multi.stats (99%) Bereits aktuell. -[main 20d7c8f] multi auto-update - 2 files changed, 2564 insertions(+), 3224 deletions(-) +[main 77d7350] multi auto-update + 2 files changed, 217 insertions(+), 57011 deletions(-) + rewrite multi.stats (99%) =========================================== Affiliate & Tracking ... @@ -988,9 +1206,8 @@ Stats d3host: ** Source (raw): 244 == Source (unique): 200 (-44) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +200 unique Domains - Version 2021.1022.133748 +MD5 Domains RAW: d15bf7482272e795a622ad79f67d40b3 d3host - Done! @@ -1006,14 +1223,11 @@ Config: adblock localpush - + Prioritized Block - 3: - - affiliatetracking.block - -++ Prioritized Blocklists - 3: +++ Prioritized Blocklists - 4: ../../data/black.list.block - ../../data/white.list.referral + ../../data/rules.list.block + ../../data/black.list.extension ../d3host/out/d3host.domains -- Excludelists - 2: @@ -1039,34 +1253,37 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 122580 | hosts | http | online | changed | https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt + 1 | 122580 | hosts | http | online | unchanged | https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt 2 | 93712 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts 3 | 244 | hosts | http | online | unchanged | https://raw.githubusercontent.com/d3ward/toolz/master/src/d3host.txt 4 | 1734 | hosts | http | online | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt - 5 | 40566 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 5 | 40570 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt 6 | 13720 | domains | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/combined_disguised_trackers_justdomains.txt 7 | 429 | domains | http | online | unchanged | https://raw.githubusercontent.com/nextdns/metadata/master/privacy/affiliate-tracking-domains - 8 | 2 | domains | local | online | unchanged | black.list.affiliatetracking - 9 | 14403 | domains | local | online | unchanged | black.list - 10 | 27 | domains | local | online | unchanged | black.list.threat-intelligence + 8 | 22 | domains | http | online | unchanged | https://raw.githubusercontent.com/nextdns/cname-cloaking-blocklist/master/domains + 9 | 5 | domains | http | online | unchanged | https://raw.githubusercontent.com/nextdns/metadata/master/security/parked-domains-cname + 10 | 892 | domains | local | online | changed | white.list.referral + 11 | 2 | domains | local | online | unchanged | black.list.affiliatetracking + 12 | 14000 | domains | local | online | unchanged | black.list + 13 | 27 | domains | local | online | unchanged | black.list.threat-intelligence # Build affiliatetracking Domainlist ... Stats affiliatetracking: -** Source (raw): 287417 -== Source (unique): 252942 (-34475) --- Exclude: 178859 (-74083) --- White: 178564 (-295) --- White(*): 178396 (-168) --- Dead: 152593 (-25803) -++ Block: 153801 (+1208) --- Unblock: 153797 (-4) -++ FLD: 154390 (+593) -++ WWW: 156998 (+2608) +** Source (raw): 287937 +== Source (unique): 253114 (-34823) +-- Exclude: 179481 (-73633) +-- White: 179172 (-309) +-- White(*): 178015 (-1157) +-- Dead: 152599 (-25416) +++ Block: 153674 (+1075) +-- Unblock: 153674 (-0) +++ FLD: 154267 (+593) +++ WWW: 157313 (+3046) -156998 unique Domains - Version 2021.1022.061151 -MD5 Domains RAW: c36dba4c2ece68131e60ec9ea8330743 +157313 unique Domains - Version 2021.1022.133749 +MD5 Domains RAW: ba2a3b7e772295f1c8b6ff6736a4227e # Convert affiliatetracking to Hostlist ... @@ -1081,6 +1298,40 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "affiliatetracking.adblock.raw", + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "../rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "../../d3host/out/d3host.domains", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], "type": "adblock" } ], @@ -1089,10 +1340,24 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling affiliatetracking.adblock.raw -ℹ Original length is 137058 -ℹ Length after applying transformations is 137058 -ℹ The list was compressed from 137061 to 105019 -ℹ Final length of the list is 105025 +ℹ Original length is 137298 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 10 rules. 137288 rules left. +ℹ Length after applying transformations is 137287 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 +ℹ Start compiling ../rules.txt +ℹ Original length is 4 +ℹ Length after applying transformations is 4 +ℹ Start compiling ../../d3host/out/d3host.domains +ℹ Original length is 201 +ℹ Length after applying transformations is 201 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 +ℹ The list was compressed from 138256 to 105322 +ℹ Final length of the list is 105328 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.adblock ℹ Finished compiling @@ -1103,16 +1368,20 @@ Prepare domain list for compiling ... done. affiliatetracking - Done! Bereits aktuell. -[master 16f1961] affiliatetracking auto-update - 12 files changed, 2109 insertions(+), 1036 deletions(-) +[master ddfe557] affiliatetracking auto-update + 17 files changed, 1121 insertions(+), 1631 deletions(-) + create mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.new + create mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.old + create mode 100644 pihole/blocklists/build/d3host/out/md5.new + create mode 100644 pihole/blocklists/build/d3host/out/md5.old Bereits aktuell. -[main 8dca55c] affiliatetracking auto-update - 2 files changed, 491 insertions(+), 191 deletions(-) +[main 4b21293] affiliatetracking auto-update + 2 files changed, 242 insertions(+), 176 deletions(-) Bereits aktuell. -[main 5f7b984] affiliatetracking auto-update - 2 files changed, 287 insertions(+), 126 deletions(-) +[main f69e393] affiliatetracking auto-update + 2 files changed, 149 insertions(+), 117 deletions(-) =========================================== Big ... @@ -1152,7 +1421,7 @@ Initialize ... Nr | Count | Format | Source | Status | File | URL/File 1 | 122580 | hosts | http | online | unchanged | https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt 2 | 1734 | hosts | http | online | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt - 3 | 14403 | domains | local | online | unchanged | black.list + 3 | 14000 | domains | local | online | unchanged | black.list 4 | 2 | domains | local | online | unchanged | black.list.affiliatetracking 5 | 27 | domains | local | online | unchanged | black.list.threat-intelligence @@ -1160,18 +1429,18 @@ Initialize ... Stats big_extension: -** Source (raw): 138746 -== Source (unique): 138232 (-514) --- Exclude: 112272 (-25960) --- White: 111516 (-756) --- White(*): 111452 (-64) --- Dead: 109219 (-2233) --- Unblock: 109219 (-0) -++ FLD: 109486 (+267) -++ WWW: 109544 (+58) +** Source (raw): 138343 +== Source (unique): 137832 (-511) +-- Exclude: 112313 (-25519) +-- White: 111571 (-742) +-- White(*): 111411 (-160) +-- Dead: 109213 (-2198) +-- Unblock: 109213 (-0) +++ FLD: 109480 (+267) +++ WWW: 109538 (+58) -109544 unique Domains - Version 2021.1022.061307 -MD5 Domains RAW: 3fcbec26d99de32779a11a124a2450f2 +109538 unique Domains - Version 2021.1022.133921 +MD5 Domains RAW: 30f9ade6299c24ce323b8c67c8e98332 # Convert big_extension to AdBlocklist ... @@ -1184,6 +1453,26 @@ Prepare domain list for compiling ... done. "sources": [ { "source": "big_extension.adblock.raw", + "type": "adblock", + "exclusions_sources": [ + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], + "transformations": [ + "Validate" + ] + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], "type": "adblock" } ], @@ -1192,10 +1481,18 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling big_extension.adblock.raw -ℹ Original length is 106429 -ℹ Length after applying transformations is 106429 -ℹ The list was compressed from 106432 to 104551 -ℹ Final length of the list is 104557 +ℹ Original length is 106423 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 2 rules. 106421 rules left. +ℹ Length after applying transformations is 106421 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 +ℹ The list was compressed from 107179 to 105298 +ℹ Final length of the list is 105304 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big_extension/out/big_extension.adblock ℹ Finished compiling @@ -1206,32 +1503,54 @@ big_extension - Done! Config: -** Build - 4: +** Build - 6: + extendWWWFLD hosts adblock + adblockwhite no_adblock_convert localpush +++ Prioritized Blocklists - 3: + + ../../data/black.list.block + ../../data/rules.list.block + ../../data/black.list.extension + + - White - 29: + + big.white + +-- Whitelists - 1: + + ../../data/white.list.adguard + Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 470664 | domains | local | online | changed | multi.txt - 2 | 45949 | domains | local | online | changed | fake.txt - 3 | 109544 | domains | local | online | changed | big_extension.domains - 4 | 970973 | domains | http | online | unchanged | https://dbl.oisd.nl + 1 | 470105 | domains | local | online | changed | multi.txt + 2 | 45955 | domains | local | online | unchanged | fake.txt + 3 | 109538 | domains | local | online | unchanged | big_extension.domains + 4 | 970972 | domains | http | online | unchanged | https://dbl.oisd.nl + 5 | 40570 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt # Build big Domainlist ... Stats big: -** Source (raw): 1597130 -== Source (unique): 1326530 (-270600) +** Source (raw): 1637140 +== Source (unique): 1330413 (-306727) +-- White: 1330169 (-244) +-- White(*): 1328400 (-1769) +++ Block: 1328413 (+13) +++ FLD: 1328629 (+216) +++ WWW: 1340719 (+12090) -1326530 unique Domains - Version 2021.1022.061401 -MD5 Domains RAW: 253f3e81443514f71e17d7a4d4c83c22 +1340719 unique Domains - Version 2021.1022.134023 +MD5 Domains RAW: 15218411f121eb5a86cba799b98b4718 # Convert big to Hostlist ... @@ -1245,60 +1564,127 @@ MD5 Domains RAW: 253f3e81443514f71e17d7a4d4c83c22 { "source": "/media/nas/git/adguard/multi.adblock", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, { "source": "/media/nas/git/adguard/fake.adblock", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, { "source": "../../big_extension/out/big_extension.adblock", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, { "source": "https://abp.oisd.nl/", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] + }, + { + "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", + "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt" + ], + "transformations": [ + "Validate" + ] + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "../rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "../exceptions.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" } ], "transformations": [ - "RemoveComments", "Compress" ] } ℹ Start compiling /media/nas/git/adguard/multi.adblock -ℹ Original length is 256217 -ℹ Removed 127 comments -ℹ Length after applying transformations is 256088 +ℹ Original length is 250492 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 10 rules. 250482 rules left. +ℹ Length after applying transformations is 250482 ℹ Start compiling /media/nas/git/adguard/fake.adblock -ℹ Original length is 23325 -ℹ Removed 41 comments -ℹ Length after applying transformations is 23284 +ℹ Original length is 23328 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 0 rules. 23328 rules left. +ℹ Length after applying transformations is 23328 ℹ Start compiling ../../big_extension/out/big_extension.adblock -ℹ Original length is 104548 -ℹ Removed 0 comments -ℹ Length after applying transformations is 104548 +ℹ Original length is 105190 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 10 rules. 105180 rules left. +ℹ Length after applying transformations is 105180 ℹ Start compiling https://abp.oisd.nl/ ℹ Original length is 367902 -ℹ Removed 13 comments -ℹ Length after applying transformations is 367888 -ℹ Removed 12 comments -ℹ The list was compressed from 751808 to 576975 -ℹ Final length of the list is 576981 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 316 rules. 367586 rules left. +ℹ Length after applying transformations is 367585 +ℹ Start compiling https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt +ℹ Original length is 41640 +ℹ Length after applying transformations is 41640 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 +ℹ Start compiling ../rules.txt +ℹ Original length is 2 +ℹ Length after applying transformations is 2 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 +ℹ Start compiling ../exceptions.txt +ℹ Original length is 30 +ℹ Length after applying transformations is 30 +ℹ The list was compressed from 789023 to 552034 +ℹ Final length of the list is 552040 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big/out/big.adblock ℹ Finished compiling @@ -1309,16 +1695,21 @@ MD5 Domains RAW: 253f3e81443514f71e17d7a4d4c83c22 big - Done! Bereits aktuell. -[master 40026e7] big auto-update - 20 files changed, 25429 insertions(+), 27104 deletions(-) +[master e26413d] big auto-update + 17 files changed, 240 insertions(+), 1329 deletions(-) + create mode 100644 pihole/blocklists/build/big/out/md5.new + create mode 100644 pihole/blocklists/build/big/out/md5.old + rewrite pihole/blocklists/build/big_extension/out/big_extension.domains.wildcard.removed (81%) + create mode 100644 pihole/blocklists/build/big_extension/out/md5.new + create mode 100644 pihole/blocklists/build/big_extension/out/md5.old Bereits aktuell. -[main 0939009] big auto-update - 2 files changed, 4483 insertions(+), 4718 deletions(-) +[main 228fa6c] big auto-update + 2 files changed, 22 insertions(+), 30 deletions(-) Bereits aktuell. -[main a6353e1] big auto-update - 2 files changed, 2352 insertions(+), 2452 deletions(-) +[main 63a6e25] big auto-update + 2 files changed, 19 insertions(+), 19 deletions(-) =========================================== Steven Black @@ -1371,7 +1762,7 @@ D3 Hosts ℹ Starting @adguard/hostlist-compiler v1.0.12 ℹ Starting the compiler ℹ Configuration: { - "name": "StevenBlack", + "name": "D3Host", "sources": [ { "source": "/media/nas/tmp/work/d3.txt", @@ -1424,37 +1815,44 @@ Config: adblockwhite no_adblock_convert - + Prioritized Block - 66: +++ Prioritized Blocklists - 3: - experimental.block + ../../data/black.list.block + ../../data/rules.list.block + ../../data/black.list.extension - White - 29: experimental.white +-- Whitelists - 1: + + ../../data/white.list.adguard + Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 1326530 | domains | local | online | changed | big.txt - 2 | 156998 | domains | local | online | changed | affiliatetracking.txt - 3 | 367339 | domains | local | online | changed | threat-intelligence.txt - 4 | 40566 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 1 | 1340719 | domains | local | online | changed | big.txt + 2 | 157313 | domains | local | online | changed | affiliatetracking.txt + 3 | 366934 | domains | local | online | changed | threat-intelligence.txt + 4 | 40570 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt # Build experimental Domainlist ... Stats experimental: -** Source (raw): 1891433 -== Source (unique): 1445174 (-446259) --- White: 1445167 (-7) -++ Block: 1445168 (+1) -++ FLD: 1445756 (+588) -++ WWW: 1532255 (+86499) +** Source (raw): 1905536 +== Source (unique): 1456357 (-449179) +-- White: 1456295 (-62) +-- White(*): 1456289 (-6) +++ Block: 1456302 (+13) +++ FLD: 1456734 (+432) +++ WWW: 1533173 (+76439) -1532255 unique Domains - Version 2021.1022.061751 -MD5 Domains RAW: 73c942cb9b2bf112f0b3364d666d7256 +1533173 unique Domains - Version 2021.1022.134718 +MD5 Domains RAW: 3a5be34d620162b11235e8798502b9d1 # Convert experimental to Hostlist ... @@ -1468,35 +1866,53 @@ MD5 Domains RAW: 73c942cb9b2bf112f0b3364d666d7256 { "source": "/media/nas/git/adguard/big.adblock", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, { "source": "/media/nas/git/adguard/affiliatetracking.adblock", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, { "source": "/media/nas/git/adguard/threat-intelligence.adblock", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt", + "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, { "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", "type": "adblock", + "exclusions_sources": [ + "../exclusions.txt" + ], "transformations": [ - "RemoveComments", "Validate" ] }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, { "source": "../rules.txt", "transformations": [ @@ -1504,6 +1920,13 @@ MD5 Domains RAW: 73c942cb9b2bf112f0b3364d666d7256 ], "type": "adblock" }, + { + "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, { "source": "../exceptions.txt", "transformations": [ @@ -1512,47 +1935,54 @@ MD5 Domains RAW: 73c942cb9b2bf112f0b3364d666d7256 "type": "adblock" } ], - "exclusions_sources": [ - "../exclusions.txt" - ], "transformations": [ - "RemoveComments", "Compress" ] } ℹ Start compiling /media/nas/git/adguard/big.adblock -ℹ Original length is 577018 -ℹ Removed 47 comments -ℹ Length after applying transformations is 576971 +ℹ Original length is 550825 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 10 rules. 550815 rules left. +ℹ Length after applying transformations is 550815 ℹ Start compiling /media/nas/git/adguard/affiliatetracking.adblock -ℹ Original length is 105066 -ℹ Removed 50 comments -ℹ Length after applying transformations is 105015 +ℹ Original length is 105259 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 13 rules. 105246 rules left. +ℹ Length after applying transformations is 105246 ℹ Start compiling /media/nas/git/adguard/threat-intelligence.adblock -ℹ Original length is 319035 -ℹ Removed 121 comments -ℹ Length after applying transformations is 318914 +ℹ Original length is 318746 +ℹ Filtering the list of rules using 325 exclusion rules +ℹ Excluded 0 rules. 318746 rules left. +ℹ Length after applying transformations is 318746 ℹ Start compiling https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt -ℹ Original length is 41634 -ℹ Removed 612 comments -ℹ Length after applying transformations is 41022 +ℹ Original length is 41640 +ℹ Length after applying transformations is 41640 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt +ℹ Original length is 576 +ℹ Length after applying transformations is 570 ℹ Start compiling ../rules.txt ℹ Original length is 2 ℹ Length after applying transformations is 2 +ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt +ℹ Original length is 179 +ℹ Length after applying transformations is 179 ℹ Start compiling ../exceptions.txt ℹ Original length is 30 ℹ Length after applying transformations is 30 -ℹ Removed 18 comments -ℹ The list was compressed from 1041954 to 633998 -ℹ Final length of the list is 634004 +ℹ The list was compressed from 1017252 to 637615 +ℹ Final length of the list is 637621 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/experimental/out/experimental.adblock ℹ Finished compiling experimental - Done! Bereits aktuell. -[master c8f44c5] experimental auto-update - 10 files changed, 30473 insertions(+), 41665 deletions(-) +[master c3d4bed] experimental auto-update + 13 files changed, 52541 insertions(+), 23341 deletions(-) + rewrite pihole/blocklists/build/experimental/out/experimental.domains.prioblocklist.added (99%) + create mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.wildcard.removed + create mode 100644 pihole/blocklists/build/experimental/out/md5.new + create mode 100644 pihole/blocklists/build/experimental/out/md5.old Bereits aktuell. Auf Branch main diff --git a/pihole/blocklists/build/buildList.sh b/pihole/blocklists/build/buildList.sh index 59e471de..65df7880 100755 --- a/pihole/blocklists/build/buildList.sh +++ b/pihole/blocklists/build/buildList.sh @@ -295,12 +295,12 @@ convertWhiteToAdblock() { continue fi if [ "${domain:0:2}" == "*." ]; then - echo "@@||$(echo "$domain" | sed 's/^\*\.//')^" >>"$2" + echo "@@||$(echo "$domain" | sed 's/^\*\.//')^|" >>"$2" else if [[ $domain =~ \* ]]; then echo "@@/$domain/" >>"$2" else - echo "@@|$domain^" >>"$2" + echo "@@|$domain^|" >>"$2" fi fi done <"$1" @@ -525,11 +525,8 @@ echo "" # Build Adblock whitelist if inConfig "adblockwhite"; then if [ -s "$white" ]; then - cat <"$white" >>"$domains".whitelist.adblock + convertWhiteToAdblock "$white" "$sourcedir"/exceptions.txt fi - getDomainsFromList "$whitelists" "$domains".whitelist.adblock 0 0 - convertWhiteToAdblock "$domains".whitelist.adblock "$sourcedir"/exceptions.txt - rm -f "$domains".whitelist.adblock fi printDecCount @@ -661,7 +658,11 @@ echo "" fi cd "$outdir" || exit - hostlist-compiler -c "$json" -o "$adblock" + if inConfig "verbose"; then + hostlist-compiler -v -c "$json" -o "$adblock" + else + hostlist-compiler -c "$json" -o "$adblock" + fi rm -f "$adblock".raw cd "$sourcedir" || exit @@ -701,6 +702,8 @@ echo "" if inConfig "white" || inConfig "dead"; then cp "$domains" "$repodata"/"$name".list + elif inConfig "block"; then + cp "$domains" "$repodata"/"$name".list.block elif inConfig "black"; then cp "$domains" "$repodata"/"$name".list cp "$domains".whitelist.removed "$repodata"/"$name".list.wl.removed diff --git a/pihole/blocklists/build/updateWhitelist.sh b/pihole/blocklists/build/updateWhitelist.sh index edf00e57..01332d62 100755 --- a/pihole/blocklists/build/updateWhitelist.sh +++ b/pihole/blocklists/build/updateWhitelist.sh @@ -38,12 +38,12 @@ convertWhiteToAdBlock() { continue fi if [ "${domain:0:2}" == "*." ]; then - echo "@@||$(echo "$domain" | sed 's/^\*\.//')^" >>"$2" + echo "@@||$(echo "$domain" | sed 's/^\*\.//')^|" >>"$2" else if [[ $domain =~ \* ]]; then echo "@@/$domain/" >>"$2" else - echo "@@|$domain^" >>"$2" + echo "@@|$domain^|" >>"$2" fi fi done <"$1" @@ -102,6 +102,9 @@ curl -s -L https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/maste grep -Ev '^\s*$|^#|^!' | sed 's/[\|^]//g' | sed 's/$important//' | grep -P "$regex" >>$tmp +curl -s -L https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt | + grep -Ev '^\s*$|^#|^!|^\||^\/' | grep -P "$regex" | sed -e 's/^/*./' >>$tmp + curl -s -L https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt | grep -P '^\@\@' | sed 's/[\|^\@]//g' | sed 's/$important//' | grep -P "$regex" >>$tmp