From 89760a9f71063b74ca390e60e9671aa000f8fbac Mon Sep 17 00:00:00 2001 From: Zelo72 Date: Thu, 21 Oct 2021 22:44:12 +0200 Subject: [PATCH] build auto-update --- pihole/blocklists/build/build.log | 687 ++++++++++++++++----------- pihole/blocklists/build/buildList.sh | 20 +- 2 files changed, 432 insertions(+), 275 deletions(-) diff --git a/pihole/blocklists/build/build.log b/pihole/blocklists/build/build.log index cd09b693..aef6b797 100755 --- a/pihole/blocklists/build/build.log +++ b/pihole/blocklists/build/build.log @@ -3,8 +3,19 @@ Initialize ... =========================================== Bereits aktuell. -[master b4b592c] auto-update - 1 file changed, 3 insertions(+), 2 deletions(-) +[master 2782df9] auto-update + 17 files changed, 419876 insertions(+), 1331914 deletions(-) + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.new + rename pihole/blocklists/build/threat-intelligence/out/{threat-intelligence.domains.deadlist.removed => threat-intelligence.domains} (69%) + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.checkfordead + rewrite pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.sourceurls (60%) + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.wildcard.removed + rewrite pihole/blocklists/build/threat-intelligence/out/threat-intelligence.stats (68%) + create mode 100644 pihole/blocklists/build/threat-intelligence/threat-intelligence.header.ext + rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_covid_domains.txt (96%) + rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_malicious_domains.txt (97%) + create mode 100644 pihole/blocklists/sources/phishing.army_download_phishing_army_blocklist_extended.txt.domains Bereits aktuell. Auf Branch main @@ -34,7 +45,7 @@ Whitelist ... 893 /media/nas/git/rpi/pihole/blocklists/data/white.list.referral 43 /media/nas/git/rpi/pihole/blocklists/data/white.list.shc 3094 /media/nas/git/rpi/pihole/blocklists/data/white.list.oisd -477 /media/nas/git/rpi/pihole/blocklists/data/white.list.adguard +481 /media/nas/git/rpi/pihole/blocklists/data/white.list.adguard ### Compile exclude Blocklist ### @@ -53,7 +64,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 | 45148 | white | http | online | changed | https://github.com/T145/black-mirror/releases/download/latest/white_domain.txt + 2 | 45148 | 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 @@ -68,7 +79,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 | 25567 | white | http | online | changed | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Whitelists/Filter + 17 | 25567 | 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 @@ -90,10 +101,10 @@ 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 | 697 | white | local | online | changed | white.list + 39 | 690 | white | local | online | unchanged | white.list 40 | 893 | white | local | online | unchanged | white.list.referral - 41 | 13 | white | local | online | changed | white.list.important - 42 | 477 | white | local | online | unchanged | white.list.adguard + 41 | 12 | white | local | online | unchanged | white.list.important + 42 | 481 | white | local | online | unchanged | white.list.adguard 43 | 3094 | white | local | online | unchanged | white.list.oisd 44 | 43 | white | local | online | unchanged | white.list.shc @@ -101,16 +112,15 @@ Initialize ... Stats exclude: -** Source (raw): 110362 -== Source (unique): 58349 (-52013) +** Source (raw): 110358 +== Source (unique): 58349 (-52009) ++ FLD from SLD: 64687 (+6338) ++ FLD: 64779 (+92) -++ WWW: 92505 (+27726) +++ WWW: 92506 (+27727) -92505 unique Domains - Version 2021.1021.180025 -MD5 Domains RAW: a7b9c00496350dc270c1619d3f7c6f61 - -# Push exclude to local Repositories ... +***************************************************** +* No changes to the previous repo version detected! * +***************************************************** exclude - Done! @@ -157,16 +167,20 @@ Stats dead: dead - Done! Bereits aktuell. -[master 5d41c03] white-dead auto-update - 10 files changed, 31 insertions(+), 13 deletions(-) +[master 6025a5a] white-dead auto-update + 1 file changed, 6 insertions(+), 7 deletions(-) Bereits aktuell. -[main 63ed096] white-dead auto-update - 1 file changed, 4 insertions(+), 1 deletion(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main e7ff249] white-dead auto-update - 1 file changed, 4 insertions(+), 1 deletion(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert =========================================== Black ... @@ -199,33 +213,35 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 14241 | domains | local | online | unchanged | black.list - 2 | 373 | domains | local | online | unchanged | black.list.wl.removed - 3 | 111 | domains | local | online | unchanged | black.list.wc.removed - 4 | 7739 | domains | local | online | unchanged | blocked.list - 5 | 22 | domains | local | online | unchanged | blocked.regex - 6 | 1328 | domains | local | online | unchanged | blocked.upstream + 1 | 14385 | domains | local | online | changed | black.list + 2 | 22 | domains | local | online | changed | black.list.extension + 3 | 373 | domains | local | online | changed | black.list.wl.removed + 4 | 107 | domains | local | online | changed | 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 # Build black Domainlist ... Stats black: -** Source (raw): 23814 -== Source (unique): 14725 (-9089) --- White: 14352 (-373) --- White(*): 14240 (-112) --- Unblock: 14240 (-0) +** Source (raw): 23976 +== Source (unique): 14871 (-9105) +-- White: 14498 (-373) +-- White(*): 14391 (-107) +-- Unblock: 14391 (-0) -14240 unique Domains - Version 2021.1021.180106 -MD5 Domains RAW: 341ef7ce5b5dcb9b1f38e49a7d4be433 +14391 unique Domains - Version 2021.1021.222310 +MD5 Domains RAW: f0a5a18d81c59f46fc890f3df6712283 # Push black to local Repositories ... black - Done! Bereits aktuell. -[master a1be0fc] black auto-update - 7 files changed, 10 insertions(+), 9 deletions(-) +[master efe8f7f] black auto-update + 11 files changed, 67 insertions(+), 27 deletions(-) + create mode 100644 pihole/blocklists/sources/black.list.extension Bereits aktuell. Auf Branch main @@ -273,11 +289,11 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 6641 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt - 2 | 404 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt - 3 | 8554 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/urlhaus-filter-hosts.txt + 1 | 6641 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt + 2 | 404 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt + 3 | 8554 | 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 | 33491 | hosts | http | online | changed | https://hole.cert.pl/domains/domains_hosts.txt + 5 | 33514 | hosts | http | online | unchanged | 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 8 | 2204 | hosts | http | online | unchanged | https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts @@ -290,28 +306,28 @@ Initialize ... 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 | 1533 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 18 | 1566 | hosts | http | online | unchanged | 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 + 20 | 914 | domains | http | online | unchanged | 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 | 33491 | domains | http | online | changed | https://hole.cert.pl/domains/domains.txt - 26 | 73362 | domains | http | online | changed | https://joewein.net/dl/bl/dom-bl-base.txt - 27 | 745 | 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 | 1997 | domains | http | online | changed | https://kriskintel.com/feeds/ktip_malicious_domains.txt + 25 | 33514 | domains | http | online | unchanged | https://hole.cert.pl/domains/domains.txt + 26 | 73362 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl-base.txt + 27 | 745 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl.txt + 28 | 1999 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_covid_domains.txt + 29 | 1999 | 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 | 45242 | domains | http | online | changed | https://phishing.army/download/phishing_army_blocklist.txt - 34 | 55142 | domains | http | online | changed | https://phishing.army/download/phishing_army_blocklist_extended.txt + 33 | 44929 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt + 34 | 54621 | domains | http | online | changed | 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 | 35664 | domains | http | online | changed | https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADomains.txt + 37 | 35258 | 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 | 22742 | domains | http | online | changed | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Malware + 39 | 22745 | domains | http | online | changed | 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 @@ -323,7 +339,7 @@ Initialize ... 48 | 3043 | 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 | 713 | domains | http | online | changed | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-NEW-today.txt + 51 | 822 | domains | http | online | changed | 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 @@ -349,23 +365,23 @@ Initialize ... 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 | 35064 | domains | http | online | unchanged | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt - 78 | 101331 | domains | http | online | changed | https://www.usom.gov.tr/url-list.txt + 77 | 35065 | domains | http | online | changed | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt + 78 | 101353 | domains | http | online | changed | https://www.usom.gov.tr/url-list.txt 79 | 24 | domains | local | online | unchanged | black.list.threat-intelligence # Build threat-intelligence Domainlist ... Stats threat-intelligence: -** Source (raw): 1188221 -== Source (unique): 860353 (-327868) --- White: 859582 (-771) --- White(*): 858101 (-1481) --- Unblock: 858101 (-0) --- Dead: 367661 (-490440) +** Source (raw): 1187196 +== Source (unique): 859652 (-327544) +-- White: 858886 (-766) +-- White(*): 857395 (-1491) +-- Dead: 367050 (-490345) +-- Unblock: 367050 (-0) -367661 unique Domains - Version 2021.1021.180117 -MD5 Domains RAW: 6832ab02aa085e3ad603881907b47ea6 +367050 unique Domains - Version 2021.1021.222321 +MD5 Domains RAW: 57641f6c08b2c1f909636b3836a22db9 # Convert threat-intelligence to Hostlist ... @@ -388,10 +404,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling threat-intelligence.adblock.raw -ℹ Original length is 347548 -ℹ Length after applying transformations is 347548 -ℹ The list was compressed from 347551 to 319189 -ℹ Final length of the list is 319195 +ℹ Original length is 346979 +ℹ Length after applying transformations is 346979 +ℹ The list was compressed from 346982 to 318781 +ℹ Final length of the list is 318787 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/threat-intelligence/out/threat-intelligence.adblock ℹ Finished compiling @@ -402,18 +418,23 @@ Prepare domain list for compiling ... done. threat-intelligence - Done! Bereits aktuell. -[master c597e15] threat-intelligence auto-update - 29 files changed, 51927 insertions(+), 44299 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%) +[master 240c5c5] threat-intelligence auto-update + 21 files changed, 1721689 insertions(+), 445921 deletions(-) + create mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.new + create mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.checkfordead + create mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.deadlist.removed + create mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.whitelist.removed + create mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.wildcard.removed + delete mode 100644 pihole/blocklists/build/threat-intelligence/threat-intelligence.header.ext + delete mode 100644 pihole/blocklists/sources/phishing.army_download_phishing_army_blocklist_extended.txt.domains Bereits aktuell. -[main 3bb1a50] threat-intelligence auto-update - 2 files changed, 4724 insertions(+), 3471 deletions(-) +[main 6f8d864] threat-intelligence auto-update + 2 files changed, 3563 insertions(+), 4174 deletions(-) Bereits aktuell. -[main 36dd456] threat-intelligence auto-update - 2 files changed, 3756 insertions(+), 2960 deletions(-) +[main d14f2fb] threat-intelligence auto-update + 2 files changed, 2977 insertions(+), 3385 deletions(-) =========================================== Personal ... @@ -451,7 +472,7 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 14240 | domains | local | online | changed | black.list + 1 | 14391 | domains | local | online | changed | black.list 2 | 24 | 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 @@ -463,18 +484,18 @@ Initialize ... Stats personal: -** Source (raw): 26615 -== Source (unique): 22786 (-3829) --- White: 21584 (-1202) --- White(*): 21578 (-6) -++ Block: 21632 (+54) --- Unblock: 21632 (-0) --- Dead: 20807 (-825) -++ FLD: 20938 (+131) -++ WWW: 27621 (+6683) +** Source (raw): 26766 +== Source (unique): 22935 (-3831) +-- White: 21729 (-1206) +-- White(*): 21723 (-6) +-- Dead: 20894 (-829) +++ Block: 20949 (+55) +-- Unblock: 20949 (-0) +++ FLD: 21081 (+132) +++ WWW: 27767 (+6686) -27621 unique Domains - Version 2021.1021.180539 -MD5 Domains RAW: 743f8e27c788a48dca6601b721d3101b +27767 unique Domains - Version 2021.1021.222747 +MD5 Domains RAW: ddbc94c53df7552f95714f1321487213 # Convert personal to Hostlist ... @@ -497,10 +518,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling personal.adblock.raw -ℹ Original length is 20621 -ℹ Length after applying transformations is 20621 -ℹ The list was compressed from 20624 to 13403 -ℹ Final length of the list is 13409 +ℹ Original length is 20761 +ℹ Length after applying transformations is 20761 +ℹ The list was compressed from 20764 to 13500 +ℹ Final length of the list is 13506 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/personal/out/personal.adblock ℹ Finished compiling @@ -511,16 +532,16 @@ Prepare domain list for compiling ... done. personal - Done! Bereits aktuell. -[master 8912341] personal auto-update - 10 files changed, 117 insertions(+), 44 deletions(-) +[master 687dc34] personal auto-update + 14 files changed, 751 insertions(+), 51 deletions(-) Bereits aktuell. -[main 98a552b] personal auto-update - 2 files changed, 18 insertions(+), 19 deletions(-) +[main 11dbedf] personal auto-update + 2 files changed, 166 insertions(+), 20 deletions(-) Bereits aktuell. -[main 2127b91] personal auto-update - 2 files changed, 18 insertions(+), 19 deletions(-) +[main f4ebc7f] personal auto-update + 2 files changed, 116 insertions(+), 19 deletions(-) =========================================== Fake ... @@ -559,7 +580,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 | 16795 | domains | http | online | changed | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Scam + 3 | 16795 | 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 @@ -575,59 +596,32 @@ Stats fake: == Source (unique): 27321 (-2507) -- White: 27233 (-88) -- White(*): 27233 (-0) --- Unblock: 27233 (-0) -- Dead: 23337 (-3896) +-- Unblock: 23337 (-0) ++ FLD: 23472 (+135) ++ WWW: 45951 (+22479) -45951 unique Domains - Version 2021.1021.180613 -MD5 Domains RAW: aa7f52fa20bd2a31f2590ec37a7632f2 - -# Convert fake to Hostlist ... - -# Convert fake to AdBlocklist ... - -Prepare domain list for compiling ... done. - -ℹ Starting @adguard/hostlist-compiler v1.0.12 -ℹ Starting the compiler -ℹ Configuration: { - "name": "fake", - "sources": [ - { - "source": "fake.adblock.raw", - "type": "adblock" - } - ], - "transformations": [ - "Compress" - ] -} -ℹ Start compiling fake.adblock.raw -ℹ Original length is 23304 -ℹ Length after applying transformations is 23304 -ℹ The list was compressed from 23307 to 23288 -ℹ Final length of the list is 23294 -ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/fake/out/fake.adblock -ℹ Finished compiling - -# Attach header to fake Domainlist ... - -# Push fake to local Repositories ... +***************************************************** +* No changes to the previous repo version detected! * +***************************************************** fake - Done! Bereits aktuell. -[master a50cc2e] fake auto-update - 10 files changed, 117 insertions(+), 36 deletions(-) +[master e8fae17] fake auto-update + 2 files changed, 5 insertions(+), 77 deletions(-) Bereits aktuell. -[main b792065] fake auto-update - 2 files changed, 19 insertions(+), 17 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main 9d03ba2] fake auto-update - 2 files changed, 18 insertions(+), 17 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert =========================================== Light ... @@ -670,7 +664,7 @@ 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 | 15560 | domains | http | online | changed | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt + 2 | 15561 | domains | http | online | changed | 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 @@ -678,37 +672,37 @@ Initialize ... 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 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 | changed | https://raw.githubusercontent.com/d3ward/toolz/master/src/d3host.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 | 16961 | hosts | http | online | unchanged | https://someonewhocares.org/hosts/ - 14 | 1533 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ - 15 | 40559 | adblock | http | online | changed | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt - 16 | 18513 | adblock | http | online | changed | https://easylist.to/easylist/easylist.txt + 14 | 1565 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 15 | 40565 | adblock | http | online | unchanged | 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 | 14240 | domains | local | online | unchanged | black.list + 21 | 14391 | domains | local | online | unchanged | black.list 22 | 24 | domains | local | online | unchanged | black.list.threat-intelligence # Build light Domainlist ... Stats light: -** Source (raw): 172491 -== Source (unique): 104313 (-68178) --- Exclude: 104260 (-53) --- White: 102058 (-2202) --- White(*): 101893 (-165) -++ Block: 101937 (+44) --- Unblock: 101937 (-0) --- Dead: 84561 (-17376) -++ FLD: 85283 (+722) -++ WWW: 124009 (+38726) +** Source (raw): 172681 +== Source (unique): 104452 (-68229) +-- Exclude: 104398 (-54) +-- White: 102194 (-2204) +-- White(*): 102031 (-163) +-- Dead: 84650 (-17381) +++ Block: 84695 (+45) +-- Unblock: 84695 (-0) +++ FLD: 85419 (+724) +++ WWW: 124148 (+38729) -124009 unique Domains - Version 2021.1021.180657 -MD5 Domains RAW: 074e5157ecb96cfd28375b13f5a65473 +124148 unique Domains - Version 2021.1021.222857 +MD5 Domains RAW: d951f284af7f79ea298583cf6591d6ba # Convert light to Hostlist ... @@ -731,10 +725,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling light.adblock.raw -ℹ Original length is 83124 -ℹ Length after applying transformations is 83124 -ℹ The list was compressed from 83127 to 69875 -ℹ Final length of the list is 69881 +ℹ Original length is 83257 +ℹ Length after applying transformations is 83257 +ℹ The list was compressed from 83260 to 69962 +ℹ Final length of the list is 69968 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/light/out/light.adblock ℹ Finished compiling @@ -745,16 +739,16 @@ Prepare domain list for compiling ... done. light - Done! Bereits aktuell. -[master 2e4c7e0] light auto-update - 17 files changed, 1443 insertions(+), 1224 deletions(-) +[master e7bc6fd] light auto-update + 16 files changed, 1848 insertions(+), 1199 deletions(-) Bereits aktuell. -[main 4d6bd5c] light auto-update - 2 files changed, 337 insertions(+), 289 deletions(-) +[main 47bbc0f] light auto-update + 2 files changed, 424 insertions(+), 285 deletions(-) Bereits aktuell. -[main e1feb48] light auto-update - 2 files changed, 206 insertions(+), 192 deletions(-) +[main 36d1edb] light auto-update + 2 files changed, 261 insertions(+), 174 deletions(-) =========================================== Multi ... @@ -771,9 +765,10 @@ Config: adblock localpush -++ Prioritized Blocklists - 1: +++ Prioritized Blocklists - 2: ../../data/black.list.block + ../../data/black.list.extension -- Excludelists - 1: @@ -800,7 +795,7 @@ 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 | 15560 | domains | http | online | unchanged | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt + 5 | 15561 | 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 @@ -809,13 +804,13 @@ Initialize ... 11 | 357 | domains | http | online | unchanged | https://v.firebog.net/hosts/static/w3kbl.txt 12 | 93193 | domains | http | online | unchanged | https://dbl.oisd.nl/basic/ 13 | 239832 | domains | http | online | unchanged | https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt - 14 | 45242 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt + 14 | 44929 | 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 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 | 97607 | hosts | http | online | changed | https://raw.githubusercontent.com/badmojr/1Hosts/master/Lite/hosts.txt + 20 | 97607 | 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 @@ -828,25 +823,25 @@ Initialize ... 30 | 93712 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts 31 | 24884 | 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 | 1528 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 33 | 1566 | 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 | 40559 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 35 | 40565 | 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 38 | 5523 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_16_French/filter.txt - 39 | 4649 | adblock | http | online | changed | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_1_Russian/filter.txt - 40 | 6578 | adblock | http | online | changed | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_224_Chinese/filter.txt - 41 | 22086 | adblock | http | online | changed | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_2_English/filter.txt - 42 | 16796 | adblock | http | online | changed | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_3_Spyware/filter.txt + 39 | 4649 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_1_Russian/filter.txt + 40 | 6581 | adblock | http | online | changed | 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 | 16797 | adblock | http | online | changed | 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 | 335 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_7_Japanese/filter.txt + 45 | 334 | adblock | http | online | changed | 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 | 6316 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/easylistchina.txt + 51 | 6316 | adblock | http | online | unchanged | 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 @@ -872,32 +867,32 @@ Initialize ... 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 | 136 | adblock | http | online | changed | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt + 77 | 138 | adblock | http | online | changed | 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 | 14240 | domains | local | online | unchanged | black.list + 83 | 14391 | domains | local | online | unchanged | black.list 84 | 24 | domains | local | online | unchanged | black.list.threat-intelligence # Build multi Domainlist ... Stats multi: -** Source (raw): 933060 -== Source (unique): 460250 (-472810) --- Exclude: 456218 (-4032) --- White: 452779 (-3439) --- White(*): 452429 (-350) -++ Block: 452472 (+43) --- Unblock: 452472 (-0) --- Dead: 352311 (-100161) -++ FLD: 353012 (+701) -++ WWW: 471947 (+118935) +** Source (raw): 932948 +== Source (unique): 460043 (-472905) +-- Exclude: 456011 (-4032) +-- White: 452572 (-3439) +-- White(*): 452235 (-337) +-- Dead: 352071 (-100164) +++ Block: 352130 (+59) +-- Unblock: 352130 (-0) +++ FLD: 352778 (+648) +++ WWW: 471610 (+118832) -471947 unique Domains - Version 2021.1021.180804 -MD5 Domains RAW: 64dae861cbaa33775300e676f0f02c80 +471610 unique Domains - Version 2021.1021.222959 +MD5 Domains RAW: 2d672616d8b1abfa0da818027d167c08 # Convert multi to Hostlist ... @@ -920,10 +915,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling multi.adblock.raw -ℹ Original length is 308595 -ℹ Length after applying transformations is 308595 -ℹ The list was compressed from 308598 to 257749 -ℹ Final length of the list is 257755 +ℹ Original length is 308403 +ℹ Length after applying transformations is 308403 +ℹ The list was compressed from 308406 to 257568 +ℹ Final length of the list is 257574 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/multi/out/multi.adblock ℹ Finished compiling @@ -934,16 +929,16 @@ Prepare domain list for compiling ... done. multi - Done! Bereits aktuell. -[master f8d8a11] multi auto-update - 21 files changed, 12685 insertions(+), 5888 deletions(-) +[master 70c1dd9] multi auto-update + 19 files changed, 2970 insertions(+), 4355 deletions(-) Bereits aktuell. -[main e41f121] multi auto-update - 2 files changed, 2526 insertions(+), 1082 deletions(-) +[main 175472c] multi auto-update + 2 files changed, 689 insertions(+), 1025 deletions(-) Bereits aktuell. -[main 1814d26] multi auto-update - 2 files changed, 1271 insertions(+), 476 deletions(-) +[main 371a765] multi auto-update + 2 files changed, 448 insertions(+), 628 deletions(-) =========================================== Affiliate & Tracking ... @@ -971,8 +966,9 @@ Stats d3host: ** Source (raw): 244 == Source (unique): 200 (-44) -200 unique Domains - Version 2021.1021.181134 -MD5 Domains RAW: d15bf7482272e795a622ad79f67d40b3 +***************************************************** +* No changes to the previous repo version detected! * +***************************************************** d3host - Done! @@ -1025,30 +1021,30 @@ Initialize ... 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 | 40559 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 5 | 40565 | 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 | 14240 | domains | local | online | unchanged | black.list + 9 | 14391 | domains | local | online | unchanged | black.list 10 | 24 | domains | local | online | unchanged | black.list.threat-intelligence # Build affiliatetracking Domainlist ... Stats affiliatetracking: -** Source (raw): 287243 -== Source (unique): 252832 (-34411) --- Exclude: 178756 (-74076) --- White: 178448 (-308) --- White(*): 178277 (-171) -++ Block: 179477 (+1200) --- Unblock: 179473 (-4) --- Dead: 153661 (-25812) -++ FLD: 154244 (+583) -++ WWW: 156739 (+2495) +** Source (raw): 287400 +== Source (unique): 252933 (-34467) +-- Exclude: 178737 (-74196) +-- White: 178433 (-304) +-- White(*): 178265 (-168) +-- Dead: 152453 (-25812) +++ Block: 153660 (+1207) +-- Unblock: 153656 (-4) +++ FLD: 154237 (+581) +++ WWW: 156735 (+2498) -156739 unique Domains - Version 2021.1021.181134 -MD5 Domains RAW: 2a69872a4221883be6a42730b01921a1 +156735 unique Domains - Version 2021.1021.223319 +MD5 Domains RAW: 166b648f163c30b30bcfa5055461ade1 # Convert affiliatetracking to Hostlist ... @@ -1071,10 +1067,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling affiliatetracking.adblock.raw -ℹ Original length is 136925 -ℹ Length after applying transformations is 136925 -ℹ The list was compressed from 136928 to 104886 -ℹ Final length of the list is 104892 +ℹ Original length is 136914 +ℹ Length after applying transformations is 136914 +ℹ The list was compressed from 136917 to 104873 +ℹ Final length of the list is 104879 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.adblock ℹ Finished compiling @@ -1085,16 +1081,16 @@ Prepare domain list for compiling ... done. affiliatetracking - Done! Bereits aktuell. -[master 7d34d5e] affiliatetracking auto-update - 18 files changed, 1045 insertions(+), 928 deletions(-) +[master f492d0a] affiliatetracking auto-update + 15 files changed, 1167 insertions(+), 1090 deletions(-) Bereits aktuell. -[main 3410b64] affiliatetracking auto-update - 2 files changed, 227 insertions(+), 193 deletions(-) +[main 3a2dbdd] affiliatetracking auto-update + 2 files changed, 229 insertions(+), 233 deletions(-) Bereits aktuell. -[main e1d4e63] affiliatetracking auto-update - 2 files changed, 151 insertions(+), 131 deletions(-) +[main 5427253] affiliatetracking auto-update + 2 files changed, 139 insertions(+), 152 deletions(-) =========================================== Big ... @@ -1134,7 +1130,7 @@ Initialize ... Nr | Count | Format | Source | Status | File | URL/File 1 | 122579 | 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 | 14240 | domains | local | online | unchanged | black.list + 3 | 14391 | domains | local | online | unchanged | black.list 4 | 2 | domains | local | online | unchanged | black.list.affiliatetracking 5 | 24 | domains | local | online | unchanged | black.list.threat-intelligence @@ -1142,18 +1138,18 @@ Initialize ... Stats big_extension: -** Source (raw): 138579 -== Source (unique): 138074 (-505) --- Exclude: 112173 (-25901) --- White: 111414 (-759) --- White(*): 111350 (-64) --- Unblock: 111350 (-0) --- Dead: 109103 (-2247) -++ FLD: 109369 (+266) -++ WWW: 109427 (+58) +** Source (raw): 138730 +== Source (unique): 138219 (-511) +-- Exclude: 112169 (-26050) +-- White: 111408 (-761) +-- White(*): 111344 (-64) +-- Dead: 109101 (-2243) +-- Unblock: 109101 (-0) +++ FLD: 109367 (+266) +++ WWW: 109425 (+58) -109427 unique Domains - Version 2021.1021.181247 -MD5 Domains RAW: 795e78d0f23c637685af91530c86c172 +109425 unique Domains - Version 2021.1021.223438 +MD5 Domains RAW: 7d0e469649f99f3c1eee6930e2d36dbb # Convert big_extension to AdBlocklist ... @@ -1174,10 +1170,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling big_extension.adblock.raw -ℹ Original length is 106313 -ℹ Length after applying transformations is 106313 -ℹ The list was compressed from 106316 to 104435 -ℹ Final length of the list is 104441 +ℹ Original length is 106311 +ℹ Length after applying transformations is 106311 +ℹ The list was compressed from 106314 to 104433 +ℹ Final length of the list is 104439 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big_extension/out/big_extension.adblock ℹ Finished compiling @@ -1200,20 +1196,20 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 471947 | domains | local | online | changed | multi.txt - 2 | 45951 | domains | local | online | changed | fake.txt - 3 | 109427 | domains | local | online | changed | big_extension.domains + 1 | 471610 | domains | local | online | changed | multi.txt + 2 | 45951 | domains | local | online | unchanged | fake.txt + 3 | 109425 | domains | local | online | changed | big_extension.domains 4 | 970971 | domains | http | online | unchanged | https://dbl.oisd.nl # Build big Domainlist ... Stats big: -** Source (raw): 1598296 -== Source (unique): 1327020 (-271276) +** Source (raw): 1597957 +== Source (unique): 1326702 (-271255) -1327020 unique Domains - Version 2021.1021.181339 -MD5 Domains RAW: 18620c4b3d62767a80ac8ac5adeb0960 +1326702 unique Domains - Version 2021.1021.223535 +MD5 Domains RAW: 61f7e0769650c43f65eb6c297d89e351 # Convert big to Hostlist ... @@ -1263,24 +1259,24 @@ MD5 Domains RAW: 18620c4b3d62767a80ac8ac5adeb0960 ] } ℹ Start compiling /media/nas/git/adguard/multi.adblock -ℹ Original length is 257873 +ℹ Original length is 257692 ℹ Removed 127 comments -ℹ Length after applying transformations is 257744 +ℹ Length after applying transformations is 257563 ℹ Start compiling /media/nas/git/adguard/fake.adblock ℹ Original length is 23326 ℹ Removed 41 comments ℹ Length after applying transformations is 23285 ℹ Start compiling ../../big_extension/out/big_extension.adblock -ℹ Original length is 104432 +ℹ Original length is 104430 ℹ Removed 0 comments -ℹ Length after applying transformations is 104432 +ℹ Length after applying transformations is 104430 ℹ Start compiling https://abp.oisd.nl/ ℹ Original length is 367900 ℹ Removed 13 comments ℹ Length after applying transformations is 367886 ℹ Removed 12 comments -ℹ The list was compressed from 753347 to 578079 -ℹ Final length of the list is 578085 +ℹ The list was compressed from 753164 to 577905 +ℹ Final length of the list is 577911 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big/out/big.adblock ℹ Finished compiling @@ -1291,16 +1287,16 @@ MD5 Domains RAW: 18620c4b3d62767a80ac8ac5adeb0960 big - Done! Bereits aktuell. -[master 75bec2e] big auto-update - 19 files changed, 10910 insertions(+), 3990 deletions(-) +[master ce04bda] big auto-update + 20 files changed, 3722 insertions(+), 5368 deletions(-) Bereits aktuell. -[main 620376f] big auto-update - 2 files changed, 1851 insertions(+), 577 deletions(-) +[main 4c56d3f] big auto-update + 2 files changed, 638 insertions(+), 956 deletions(-) Bereits aktuell. -[main 13ad2de] big auto-update - 2 files changed, 893 insertions(+), 192 deletions(-) +[main 744b9fb] big auto-update + 2 files changed, 387 insertions(+), 561 deletions(-) =========================================== Steven Black @@ -1384,6 +1380,167 @@ Ihr Branch ist auf demselben Stand wie 'origin/main'. nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main 5af3aa7] d3host auto-update - 1 file changed, 2 insertions(+), 6 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert + +=========================================== +Experimental ... +=========================================== + +### Compile experimental Blocklist ### + +Config: + +** Build - 6: + + extendWWWFLD + hosts + adblock + noheader + adblockwhite + no_adblock_convert + + + Prioritized Block - 23: + + experimental.block + + - White - 29: + + experimental.white + +Initialize ... + +# Download and convert Sourcelists ... + + Nr | Count | Format | Source | Status | File | URL/File + 1 | 1326702 | domains | local | online | changed | big.txt + 2 | 156735 | domains | local | online | changed | affiliatetracking.txt + 3 | 367050 | domains | local | online | changed | threat-intelligence.txt + 4 | 40565 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + +# Build experimental Domainlist ... + +Stats experimental: + +** Source (raw): 1891052 +== Source (unique): 1447086 (-443966) +-- White: 1447079 (-7) +++ Block: 1447080 (+1) +++ FLD: 1447667 (+587) +++ WWW: 1535976 (+88309) + +1535976 unique Domains - Version 2021.1021.223918 +MD5 Domains RAW: cd80eda9d814d3c6a7a4c0b0c0a6483a + +# Convert experimental to Hostlist ... + +# Convert experimental to AdBlocklist ... + +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "Experimental", + "sources": [ + { + "source": "/media/nas/git/adguard/big.adblock", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "/media/nas/git/adguard/affiliatetracking.adblock", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "/media/nas/git/adguard/threat-intelligence.adblock", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "../rules.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + }, + { + "source": "../exceptions.txt", + "transformations": [ + "Validate" + ], + "type": "adblock" + } + ], + "exclusions_sources": [ + "../exclusions.txt" + ], + "transformations": [ + "RemoveComments", + "Compress" + ] +} +ℹ Start compiling /media/nas/git/adguard/big.adblock +ℹ Original length is 577948 +ℹ Removed 47 comments +ℹ Length after applying transformations is 577901 +ℹ Start compiling /media/nas/git/adguard/affiliatetracking.adblock +ℹ Original length is 104920 +ℹ Removed 50 comments +ℹ Length after applying transformations is 104869 +ℹ Start compiling /media/nas/git/adguard/threat-intelligence.adblock +ℹ Original length is 318899 +ℹ Removed 121 comments +ℹ Length after applying transformations is 318778 +ℹ Start compiling https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt +ℹ Original length is 41633 +ℹ Removed 612 comments +ℹ Length after applying transformations is 41021 +ℹ Start compiling ../rules.txt +ℹ Original length is 4 +ℹ Length after applying transformations is 4 +ℹ Start compiling ../exceptions.txt +ℹ Original length is 30 +ℹ Length after applying transformations is 30 +ℹ Removed 18 comments +ℹ The list was compressed from 1042603 to 635966 +ℹ Final length of the list is 635972 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/experimental/out/experimental.adblock +ℹ Finished compiling + +experimental - Done! + +Bereits aktuell. +[master 162316b] experimental auto-update + 13 files changed, 22615 insertions(+), 26216 deletions(-) + +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 diff --git a/pihole/blocklists/build/buildList.sh b/pihole/blocklists/build/buildList.sh index 1530f90e..59e471de 100755 --- a/pihole/blocklists/build/buildList.sh +++ b/pihole/blocklists/build/buildList.sh @@ -528,7 +528,7 @@ echo "" cat <"$white" >>"$domains".whitelist.adblock fi getDomainsFromList "$whitelists" "$domains".whitelist.adblock 0 0 - convertWhiteToAdblock "$domains".whitelist.adblock "$outdir"/"$name".white.adblock + convertWhiteToAdblock "$domains".whitelist.adblock "$sourcedir"/exceptions.txt rm -f "$domains".whitelist.adblock fi @@ -544,6 +544,15 @@ echo "" printDecCount fi + # Remove dead Domains + getDomainsFromList "$deadlists" "$domains".deadlist 0 0 + + if [ -s "$domains".deadlist ]; then + echo -n "-- Dead: " + removeDomains "$domains".deadlist "$domains" + printDecCount + fi + # Add prioritized blocked Domains if [ -s "$block" ]; then cat <"$block" >>"$domains".prioblocklist @@ -579,15 +588,6 @@ echo "" printDecCount fi - # Remove dead Domains - getDomainsFromList "$deadlists" "$domains".deadlist 0 0 - - if [ -s "$domains".deadlist ]; then - echo -n "-- Dead: " - removeDomains "$domains".deadlist "$domains" - printDecCount - fi - # Extend by missing WWW/FLD Domains if inConfig "extendWWWFLD"; then if inConfig "white"; then