From bb7dca9f9cba1849a26c6fd415014915da025757 Mon Sep 17 00:00:00 2001 From: Zelo72 Date: Mon, 1 Nov 2021 17:14:11 +0100 Subject: [PATCH] build auto-update --- pihole/blocklists/build/build.log | 603 ++++++++++++++------------- pihole/blocklists/build/buildList.sh | 28 +- 2 files changed, 332 insertions(+), 299 deletions(-) diff --git a/pihole/blocklists/build/build.log b/pihole/blocklists/build/build.log index 69a723c1..79eebb2a 100755 --- a/pihole/blocklists/build/build.log +++ b/pihole/blocklists/build/build.log @@ -3,61 +3,26 @@ Initialize ... =========================================== Bereits aktuell. -[master 91bb763] auto-update - 218 files changed, 9386346 insertions(+), 311524 deletions(-) - create mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unique - create mode 100644 pihole/blocklists/build/big/out/big.domains.unique - create mode 100644 pihole/blocklists/build/black/out/black.domains.unique - create mode 100644 pihole/blocklists/build/d3host/out/d3host.domains.unique - create mode 100644 pihole/blocklists/build/dead/out/dead.domains.unique - create mode 100644 pihole/blocklists/build/doh-vpn-proxy-bypass/out/doh-vpn-proxy-bypass.domains.unique - create mode 100644 pihole/blocklists/build/exclude/out/exclude.domains.unique - rewrite pihole/blocklists/build/experimental/experimental.config.sourcelists (97%) - copy pihole/blocklists/build/experimental/{ => old}/experimental.config.sourcelists (100%) - rewrite pihole/blocklists/build/experimental/out/experimental.domains.sourceurls (100%) - create mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.unique - rewrite pihole/blocklists/build/experimental/out/experimental.stats (91%) - create mode 100644 pihole/blocklists/build/fake/out/fake.domains.unique - rewrite pihole/blocklists/build/gallegonovato/gallegonovato.config.sourcelists (90%) - rewrite pihole/blocklists/build/gallegonovato/out/gallegonovato.domains.sourceurls (99%) - create mode 100644 pihole/blocklists/build/gallegonovato/out/gallegonovato.domains.unique - rewrite pihole/blocklists/build/gallegonovato/out/gallegonovato.stats (94%) - create mode 100644 pihole/blocklists/build/light/out/light.domains.unique - copy pihole/blocklists/build/{gallegonovato/gallegonovato.config.sourcelists => multi/multi.config.sourcelists} (60%) - mode change 100644 => 100755 - rewrite pihole/blocklists/build/multi/out/multi.domains.sourceurls (72%) - create mode 100644 pihole/blocklists/build/multi/out/multi.domains.unique - create mode 100644 pihole/blocklists/build/personal/out/personal.domains.unique - create mode 100644 pihole/blocklists/build/rules/out/rules.domains.unique +[master 92ffbce] auto-update + 9 files changed, 11 insertions(+), 256 deletions(-) + delete mode 100644 pihole/blocklists/build/sourcefiles.todelete.txt delete mode 100644 pihole/blocklists/build/sourcefiles.txt - create mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.unique - rewrite pihole/blocklists/data/dead.list.afftrack (99%) - create mode 100644 pihole/blocklists/data/white.list.egp - create mode 100644 pihole/blocklists/sources/affiliatetracking.domains.unique - create mode 100644 pihole/blocklists/sources/big.domains.unique - create mode 100644 pihole/blocklists/sources/doh-vpn-proxy-bypass.txt - 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/light.domains.unique - rewrite pihole/blocklists/sources/mitchellkrogza_phishing.database_phishing-domains-new-today.txt (99%) - create mode 100644 pihole/blocklists/sources/multi.domains.unique - create mode 100644 pihole/blocklists/sources/personal.txt - rewrite pihole/blocklists/sources/rescure.me_covid.txt (98%) - rewrite pihole/blocklists/sources/rescure.me_rescure_domain_blacklist.txt (98%) - create mode 100644 pihole/blocklists/sources/threat-intelligence.txt - rewrite pihole/blocklists/sources/white/dead.list.afftrack (99%) Bereits aktuell. -[main 1f8cab5] auto-update - 16 files changed, 41751 insertions(+), 24207 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main 1c9f730] auto-update - 16 files changed, 32023 insertions(+), 14377 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[master edd0be7] auto-update - 2 files changed, 8 insertions(+) +[master 4d68f77] auto-update + 1 file changed, 18 insertions(+), 10 deletions(-) =========================================== @@ -71,9 +36,9 @@ Whitelist ... 43 /media/nas/git/rpi/pihole/blocklists/data/white.list.shc 3073 /media/nas/git/rpi/pihole/blocklists/data/white.list.oisd 582 /media/nas/git/rpi/pihole/blocklists/data/white.list.adguard -2475 /media/nas/git/rpi/pihole/blocklists/data/white.list.hl2guide +2480 /media/nas/git/rpi/pihole/blocklists/data/white.list.hl2guide -Start: 2021.11-01-12:04:51 +Start: 2021.11-01-16:10:57 ### Compile exclude Blocklist ### @@ -128,7 +93,7 @@ Initialize ... 35 | 982 | white | http | online | unchanged | https://raw.githubusercontent.com/raghavdua1995/DNSlock-PiHole-whitelist/master/whitelist.list 36 | 739 | white | http | online | unchanged | https://raw.githubusercontent.com/rspamd/maps/master/rspamd/dmarc_whitelist.inc 37 | 79 | white | http | online | unchanged | https://raw.githubusercontent.com/zebpalmer/dns_blocklists/master/whitelist.txt - 38 | 529 | white | local | online | changed | white.list + 38 | 531 | white | local | online | changed | white.list 39 | 890 | white | local | online | unchanged | white.list.referral 40 | 32 | white | local | online | unchanged | white.list.important 41 | 582 | white | local | online | unchanged | white.list.adguard @@ -140,18 +105,18 @@ Initialize ... Stats exclude: -** Source (raw): 100178 -== Source (unique): 59038 (-41140) -++ FLD from SLD: 65406 (+6368) -++ FLD: 65502 (+96) -++ WWW: 93327 (+27825) +** Source (raw): 100180 +== Source (unique): 59039 (-41141) +++ FLD from SLD: 65407 (+6368) +++ FLD: 65503 (+96) +++ WWW: 93328 (+27825) -93327 unique Domains - Version 2021.1101.120451 -MD5 Domains RAW: ba6482a0fcdf5ed2836ab77e9376ab90 +93328 unique Domains - Version 2021.1101.161057 +MD5 Domains RAW: 1c3a93b64663d040d2aecac845eff467 # Push exclude to local Repositories ... -End: 2021.11-01-12:05:12 +End: 2021.11-01-16:11:17 exclude - Done! @@ -159,7 +124,7 @@ exclude - Done! Deadlist ... =========================================== -Start: 2021.11-01-12:05:19 +Start: 2021.11-01-16:11:24 ### Compile dead Blocklist ### @@ -201,23 +166,27 @@ Stats dead: dead - Done! Bereits aktuell. -[master 856a08d] white-dead auto-update - 10 files changed, 82 insertions(+), 16 deletions(-) +[master 3ea8057] white-dead auto-update + 13 files changed, 75 insertions(+), 1190472 deletions(-) + delete mode 100644 pihole/blocklists/build/dead/out/dead.domains.checkfordead + delete mode 100644 pihole/blocklists/build/dead/out/dead.domains.unique + delete mode 100644 pihole/blocklists/build/exclude/out/exclude.domains.checkfordead + delete mode 100644 pihole/blocklists/build/exclude/out/exclude.domains.unique create mode 100644 pihole/blocklists/build/sourcefiles.txt Bereits aktuell. -[main 985897a] white-dead auto-update - 1 file changed, 3 insertions(+), 1 deletion(-) +[main 8fc0069] white-dead auto-update + 1 file changed, 4 insertions(+) Bereits aktuell. -[main 0168da9] white-dead auto-update - 1 file changed, 3 insertions(+), 1 deletion(-) +[main eb11096] white-dead auto-update + 1 file changed, 4 insertions(+) =========================================== Black ... =========================================== -Start: 2021.11-01-12:05:53 +Start: 2021.11-01-16:11:47 ### Compile black Blocklist ### @@ -258,8 +227,13 @@ Stats black: black - Done! Bereits aktuell. -[master 57e529f] black auto-update - 3 files changed, 11 insertions(+), 1 deletion(-) +[master 7ed1a1d] black auto-update + 6 files changed, 3 insertions(+), 30296 deletions(-) + delete mode 100644 pihole/blocklists/build/black/out/black.domains.checkfordead + delete mode 100644 pihole/blocklists/build/black/out/black.domains.unique + delete mode 100644 pihole/blocklists/build/black/out/black.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/black/out/black.domains.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/black/out/black.domains.wildcard.removed Bereits aktuell. Auf Branch main @@ -277,7 +251,7 @@ nichts zu committen, Arbeitsverzeichnis unverändert Rules ... =========================================== -Start: 2021.11-01-12:06:06 +Start: 2021.11-01-16:11:55 ### Compile rules Blocklist ### @@ -310,8 +284,10 @@ Stats rules: rules - Done! Bereits aktuell. -[master e0f8170] rules auto-update - 1 file changed, 1 insertion(+) +[master e234533] rules auto-update + 3 files changed, 1 insertion(+), 1106 deletions(-) + delete mode 100644 pihole/blocklists/build/rules/out/rules.domains.checkfordead + delete mode 100644 pihole/blocklists/build/rules/out/rules.domains.unique Bereits aktuell. Auf Branch main @@ -329,17 +305,18 @@ nichts zu committen, Arbeitsverzeichnis unverändert Threat Intelligence Feeds ... =========================================== -Start: 2021.11-01-12:06:10 +Start: 2021.11-01-16:11:59 ### Compile threat-intelligence Blocklist ### Config: -** Build - 3: +** Build - 4: hosts adblock localpush + checkfordead -- Excludelists - 1: @@ -367,11 +344,11 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 6579 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt - 2 | 423 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt - 3 | 10362 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/urlhaus-filter-hosts.txt + 1 | 6552 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt + 2 | 417 | hosts | http | online | changed | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt + 3 | 10424 | hosts | http | online | changed | 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 | 34500 | hosts | http | online | changed | https://hole.cert.pl/domains/domains_hosts.txt + 5 | 34531 | 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 | 5987 | 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 @@ -384,7 +361,7 @@ 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 | 1139 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 18 | 1169 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 19 | 4465 | hosts | http | online | unchanged | https://threatfox.abuse.ch/downloads/hostfile 20 | 883 | adblock | http | online | unchanged | https://raw.githubusercontent.com/piperun/iploggerfilter/master/filterlist 21 | 915 | domains | http | online | changed | https://azorult-tracker.net/api/list/domain?format=plain @@ -392,19 +369,19 @@ Initialize ... 23 | 549 | domains | http | online | unchanged | https://feeds.alphasoc.net/ryuk.txt 24 | 9233 | domains | http | online | unchanged | https://gitlab.com/KevinThomas0/cryptoscamdb-lists/-/raw/master/cryptoscamdb-blocklist.txt 25 | 357 | domains | http | online | unchanged | https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt - 26 | 34500 | domains | http | online | changed | https://hole.cert.pl/domains/domains.txt - 27 | 73712 | domains | http | online | changed | https://joewein.net/dl/bl/dom-bl-base.txt - 28 | 1194 | domains | http | online | changed | https://joewein.net/dl/bl/dom-bl.txt - 29 | 1999 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_covid_domains.txt - 30 | 1998 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_malicious_domains.txt + 26 | 34531 | domains | http | online | changed | https://hole.cert.pl/domains/domains.txt + 27 | 73712 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl-base.txt + 28 | 1196 | domains | http | online | changed | https://joewein.net/dl/bl/dom-bl.txt + 29 | 1998 | domains | http | online | changed | https://kriskintel.com/feeds/ktip_covid_domains.txt + 30 | 1997 | domains | http | online | changed | https://kriskintel.com/feeds/ktip_malicious_domains.txt 31 | 397 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_ransomware_feeds.txt 32 | 2245 | domains | http | online | unchanged | https://orca.pet/notonmyshift/domains.txt 33 | 147 | domains | http | online | unchanged | https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt - 34 | 46122 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt - 35 | 56039 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist_extended.txt + 34 | 46091 | domains | http | online | changed | https://phishing.army/download/phishing_army_blocklist.txt + 35 | 55970 | domains | http | online | changed | https://phishing.army/download/phishing_army_blocklist_extended.txt 36 | 1406 | domains | http | online | unchanged | https://raw.githubusercontent.com/AmnestyTech/investigations/master/2021-07-18_nso/domains.txt 37 | 27 | domains | http | online | unchanged | https://raw.githubusercontent.com/DRSDavidSoft/additional-hosts/master/domains/blacklist/fake-domains.txt - 38 | 34021 | domains | http | online | unchanged | https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADomains.txt + 38 | 34129 | domains | http | online | changed | https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADomains.txt 39 | 675 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Cryptocurrency 40 | 23171 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Malware 41 | 179 | domains | http | online | unchanged | https://raw.githubusercontent.com/ShadowWhisperer/BlockLists/master/Lists/Risk @@ -415,10 +392,10 @@ Initialize ... 46 | 434 | domains | http | online | unchanged | https://raw.githubusercontent.com/hpthreatresearch/iocs/main/CryptBot/domains.txt 47 | 137 | domains | http | online | unchanged | https://raw.githubusercontent.com/hpthreatresearch/iocs/main/IcedID/domains.txt 48 | 657 | domains | http | online | unchanged | https://raw.githubusercontent.com/hpthreatresearch/iocs/main/TA551/domains.txt - 49 | 3752 | domains | http | online | unchanged | https://raw.githubusercontent.com/iam-py-test/my_filters_001/main/Alternative%20list%20formats/antimalware_domains.txt + 49 | 3765 | domains | http | online | changed | https://raw.githubusercontent.com/iam-py-test/my_filters_001/main/Alternative%20list%20formats/antimalware_domains.txt 50 | 2079 | domains | http | online | unchanged | https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt 51 | 71289 | domains | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-ACTIVE.txt - 52 | 247 | domains | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-NEW-today.txt + 52 | 449 | domains | http | online | changed | https://raw.githubusercontent.com/mitchellkrogza/Phishing.Database/master/phishing-domains-NEW-today.txt 53 | 10000 | domains | http | online | unchanged | https://raw.githubusercontent.com/prodaft/malware-ioc/master/FluBot/v3.7_5000_domain.txt 54 | 10000 | domains | http | online | unchanged | https://raw.githubusercontent.com/prodaft/malware-ioc/master/FluBot/v3.7_germany.txt 55 | 10000 | domains | http | online | unchanged | https://raw.githubusercontent.com/prodaft/malware-ioc/master/FluBot/v3.8_domains.txt @@ -445,22 +422,22 @@ Initialize ... 76 | 508 | domains | http | online | unchanged | https://www.botvrij.eu/data/ioclist.domain.raw 77 | 90 | domains | http | online | unchanged | https://www.botvrij.eu/data/ioclist.hostname.raw 78 | 35117 | domains | http | online | unchanged | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt - 79 | 102453 | domains | http | online | changed | https://www.usom.gov.tr/url-list.txt + 79 | 102497 | domains | http | online | changed | https://www.usom.gov.tr/url-list.txt 80 | 139 | domains | local | online | unchanged | black.list.threat-intelligence # Build threat-intelligence Domainlist ... Stats threat-intelligence: -** Source (raw): 1200067 -== Source (unique): 867350 (-332717) --- Exclude: 867345 (-5) --- White: 866572 (-773) --- White(*): 861213 (-5359) --- Dead: 371816 (-489397) +** Source (raw): 1200455 +== Source (unique): 867634 (-332821) +-- Exclude: 867629 (-5) +-- White: 866854 (-775) +-- White(*): 861490 (-5364) +-- Dead: 372098 (-489392) -371816 unique Domains - Version 2021.1101.120610 -MD5 Domains RAW: 87d58e7024f988e218928791bc7cd582 +372098 unique Domains - Version 2021.1101.161159 +MD5 Domains RAW: 5c3b9c3b1fb7c2e8ffe8fd11746dd49c # Convert threat-intelligence to Hostlist ... @@ -483,10 +460,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling threat-intelligence.adblock.raw -ℹ Original length is 352420 -ℹ Length after applying transformations is 352420 -ℹ The list was compressed from 352423 to 323840 -ℹ Final length of the list is 323846 +ℹ Original length is 352717 +ℹ Length after applying transformations is 352717 +ℹ The list was compressed from 352720 to 324088 +ℹ Final length of the list is 324094 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/threat-intelligence/out/threat-intelligence.adblock ℹ Finished compiling @@ -494,38 +471,47 @@ Prepare domain list for compiling ... done. # Push threat-intelligence to local Repositories ... -End: 2021.11-01-12:13:01 +End: 2021.11-01-16:18:08 threat-intelligence - Done! Bereits aktuell. -[master b6a6ada] threat-intelligence auto-update - 21 files changed, 15327 insertions(+), 12287 deletions(-) +[master ea5a6fb] threat-intelligence auto-update + 32 files changed, 38970 insertions(+), 1401337 deletions(-) + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.excludelist.removed + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.unique + 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.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/threat-intelligence.domains.wildcard.removed + rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_covid_domains.txt (96%) + rewrite pihole/blocklists/sources/kriskintel.com_feeds_ktip_malicious_domains.txt (97%) Bereits aktuell. -[main 6c3d540] threat-intelligence auto-update - 2 files changed, 418 insertions(+), 32 deletions(-) +[main 134f6e6] threat-intelligence auto-update + 2 files changed, 3801 insertions(+), 3518 deletions(-) Bereits aktuell. -[main 3aefcdd] threat-intelligence auto-update - 2 files changed, 388 insertions(+), 28 deletions(-) +[main 6a9fbfc] threat-intelligence auto-update + 2 files changed, 3141 insertions(+), 2892 deletions(-) =========================================== Personal ... =========================================== -Start: 2021.11-01-12:13:37 +Start: 2021.11-01-16:18:43 ### Compile personal Blocklist ### Config: -** Build - 4: +** Build - 5: extendWWWFLD hosts adblock localpush + checkfordead ++ Prioritized Blocklists - 2: @@ -581,8 +567,16 @@ Stats personal: personal - Done! Bereits aktuell. -[master e05c002] personal auto-update - 3 files changed, 12 insertions(+), 2 deletions(-) +[master 946824c] personal auto-update + 10 files changed, 7 insertions(+), 27161 deletions(-) + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.prioblocklist.added + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.unblocklist.removed + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.unblocklist.wildcards.regex + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.unique + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/personal/out/personal.domains.wildcard.removed Bereits aktuell. Auf Branch main @@ -600,18 +594,19 @@ nichts zu committen, Arbeitsverzeichnis unverändert Fake ... =========================================== -Start: 2021.11-01-12:14:35 +Start: 2021.11-01-16:19:47 ### Compile fake Blocklist ### Config: -** Build - 4: +** Build - 5: extendWWWFLD hosts adblock localpush + checkfordead -- Deadlists - 1: @@ -661,8 +656,12 @@ Stats fake: fake - Done! Bereits aktuell. -[master 6a214d2] fake auto-update - 3 files changed, 14 insertions(+), 2 deletions(-) +[master f5ccc69] fake auto-update + 6 files changed, 11 insertions(+), 35669 deletions(-) + delete mode 100644 pihole/blocklists/build/fake/out/fake.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/fake/out/fake.domains.unique + delete mode 100644 pihole/blocklists/build/fake/out/fake.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/fake/out/fake.domains.whitelist.wildcards.regex Bereits aktuell. Auf Branch main @@ -680,7 +679,7 @@ nichts zu committen, Arbeitsverzeichnis unverändert Light ... =========================================== -Start: 2021.11-01-12:15:29 +Start: 2021.11-01-16:20:34 ### Compile light Blocklist ### @@ -723,7 +722,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 | 15508 | domains | http | online | changed | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt + 2 | 15515 | domains | http | online | changed | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt 3 | 9922 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/adv/domains 4 | 1491 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/tracker/domains 5 | 3670 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/ut1/master/ads/domains @@ -733,12 +732,12 @@ Initialize ... 9 | 335 | hosts | http | online | unchanged | https://raw.githubusercontent.com/shreyasminocha/shady-hosts/main/hosts 10 | 16964 | hosts | http | online | unchanged | https://someonewhocares.org/hosts/ 11 | 93173 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts - 12 | 1122 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 12 | 1177 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 13 | 4465 | hosts | http | online | unchanged | https://threatfox.abuse.ch/downloads/hostfile - 14 | 40999 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt - 15 | 14725 | domains | http | online | changed | https://raw.githubusercontent.com/adguardteam/cname-trackers/master/combined_disguised_trackers_justdomains.txt - 16 | 18829 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt - 17 | 16204 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt + 14 | 41027 | adblock | http | online | changed | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + 15 | 14725 | domains | http | online | unchanged | https://raw.githubusercontent.com/adguardteam/cname-trackers/master/combined_disguised_trackers_justdomains.txt + 16 | 18836 | adblock | http | online | changed | https://easylist.to/easylist/easylist.txt + 17 | 16203 | adblock | http | online | changed | https://easylist.to/easylist/easyprivacy.txt 18 | 9322 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt 19 | 14511 | domains | local | online | unchanged | black.list 20 | 139 | domains | local | online | unchanged | black.list.threat-intelligence @@ -747,20 +746,20 @@ Initialize ... Stats light: -** Source (raw): 275923 -== Source (unique): 162232 (-113691) --- Exclude: 162104 (-128) --- White: 159817 (-2287) --- White(*): 156870 (-2947) --- Dead: 129896 (-26974) -++ Block: 130072 (+176) --- Unblock: 130068 (-4) --- Unblock(*): 130062 (-6) -++ FLD: 131236 (+1174) -++ WWW: 173083 (+41847) +** Source (raw): 276019 +== Source (unique): 162302 (-113717) +-- Exclude: 162174 (-128) +-- White: 159887 (-2287) +-- White(*): 156938 (-2949) +-- Dead: 129966 (-26972) +++ Block: 130142 (+176) +-- Unblock: 130138 (-4) +-- Unblock(*): 130132 (-6) +++ FLD: 131306 (+1174) +++ WWW: 173200 (+41894) -173083 unique Domains - Version 2021.1101.121529 -MD5 Domains RAW: 9ccf4af2765f1e078f38892707c46560 +173200 unique Domains - Version 2021.1101.162034 +MD5 Domains RAW: 854666c78ccc504808bcf77e9130a7e1 # Convert light to Hostlist ... @@ -783,10 +782,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling light.adblock.raw -ℹ Original length is 115520 -ℹ Length after applying transformations is 115520 -ℹ The list was compressed from 115523 to 96469 -ℹ Final length of the list is 96475 +ℹ Original length is 115591 +ℹ Length after applying transformations is 115591 +ℹ The list was compressed from 115594 to 96543 +ℹ Final length of the list is 96549 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/light/out/light.adblock ℹ Finished compiling @@ -794,38 +793,50 @@ Prepare domain list for compiling ... done. # Push light to local Repositories ... -End: 2021.11-01-12:17:28 +End: 2021.11-01-16:22:29 light - Done! Bereits aktuell. -[master fab42ec] light auto-update - 18 files changed, 9221 insertions(+), 12554 deletions(-) +[master b6f1e2c] light auto-update + 24 files changed, 801 insertions(+), 358637 deletions(-) + delete mode 100644 pihole/blocklists/build/light/out/light.domains.checkfordead + delete mode 100644 pihole/blocklists/build/light/out/light.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/light/out/light.domains.excludelist.removed + delete mode 100644 pihole/blocklists/build/light/out/light.domains.prioblocklist.added + delete mode 100644 pihole/blocklists/build/light/out/light.domains.unblocklist.removed + delete mode 100644 pihole/blocklists/build/light/out/light.domains.unblocklist.wildcards.regex + delete mode 100644 pihole/blocklists/build/light/out/light.domains.unique + delete mode 100644 pihole/blocklists/build/light/out/light.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/light/out/light.domains.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/light/out/light.domains.wildcard.removed Bereits aktuell. -[main b7bec00] light auto-update - 2 files changed, 1236 insertions(+), 1507 deletions(-) +[main 601e338] light auto-update + 2 files changed, 201 insertions(+), 84 deletions(-) Bereits aktuell. -[main 35be28f] light auto-update - 2 files changed, 854 insertions(+), 1470 deletions(-) +[main 49919d9] light auto-update + 2 files changed, 138 insertions(+), 64 deletions(-) =========================================== Multi ... =========================================== -Start: 2021.11-01-12:17:43 +Start: 2021.11-01-16:22:42 ### Compile multi Blocklist ### Config: -** Build - 4: +** Build - 6: extendWWWFLD hosts adblock localpush + unique + checkfordead ++ Prioritized Blocklists - 2: @@ -860,7 +871,7 @@ Initialize ... 2 | 636 | domains | http | online | unchanged | https://v.firebog.net/hosts/Admiral.txt 3 | 14744 | domains | http | online | unchanged | https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt 4 | 14725 | domains | http | online | unchanged | https://raw.githubusercontent.com/adguardteam/cname-trackers/master/combined_disguised_trackers_justdomains.txt - 5 | 15508 | domains | http | online | unchanged | https://raw.githubusercontent.com/adroitadorkhan/antipopads-re/master/formats/domains.txt + 5 | 15515 | domains | http | online | unchanged | https://raw.githubusercontent.com/adroitadorkhan/antipopads-re/master/formats/domains.txt 6 | 9922 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/adv/domains 7 | 1491 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/shallalist/master/tracker/domains 8 | 3670 | domains | http | online | unchanged | https://raw.githubusercontent.com/cbuijs/ut1/master/ads/domains @@ -872,7 +883,7 @@ Initialize ... 14 | 93670 | domains | http | online | unchanged | https://dbl.oisd.nl/basic/ 15 | 4 | domains | http | online | unchanged | https://raw.githubusercontent.com/badmojr/1Hosts/master/submit_here/include_for_all.txt 16 | 259123 | domains | http | online | unchanged | https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt - 17 | 46122 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt + 17 | 46091 | domains | http | online | unchanged | https://phishing.army/download/phishing_army_blocklist.txt 18 | 1406 | domains | http | online | unchanged | https://raw.githubusercontent.com/AmnestyTech/investigations/master/2021-07-18_nso/domains.txt 19 | 8123 | hosts | http | online | unchanged | https://adaway.org/hosts.txt 20 | 14202 | hosts | http | online | unchanged | https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt @@ -891,10 +902,10 @@ Initialize ... 33 | 3496 | hosts | http | online | unchanged | https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/hosts_browser 34 | 93173 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts 35 | 8624 | hosts | http | online | unchanged | https://raw.githubusercontent.com/guardicore/labs_campaigns/master/Autodiscover/autodiscover-tlds.txt - 36 | 1119 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 36 | 1165 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 37 | 4465 | hosts | http | online | unchanged | https://threatfox.abuse.ch/downloads/hostfile 38 | 374 | hosts | http | online | unchanged | https://raw.githubusercontent.com/Laicure/hosts/master/shithosts - 39 | 40999 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam.github.io_adguardsdnsfilter_filters_filter.txt + 39 | 41027 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam.github.io_adguardsdnsfilter_filters_filter.txt 40 | 553 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam_adguardsdnsfilter_filters_rules.txt 41 | 1023 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam_filtersregistry_filters_filter_11_mobile_filter.txt 42 | 727 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam_filtersregistry_filters_filter_14_annoyances_filter.txt @@ -909,8 +920,8 @@ Initialize ... 51 | 25 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam_filtersregistry_filters_filter_8_dutch_filter.txt 52 | 219 | adblock | http | OFFLINE | unchanged | USE LOCAL COPY: adguardteam_filtersregistry_filters_filter_9_spanish_filter.txt 53 | 14725 | domains | http | online | unchanged | https://raw.githubusercontent.com/adguardteam/cname-trackers/master/combined_disguised_trackers_justdomains.txt - 54 | 9640 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/advblock.txt - 55 | 6423 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/easylistchina.txt + 54 | 9640 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/advblock.txt + 55 | 6426 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/easylistchina.txt 56 | 21 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistdutch.txt 57 | 365 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistgermany.txt 58 | 216 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistitaly.txt @@ -921,8 +932,8 @@ Initialize ... 63 | 25 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/koreanlist.txt 64 | 127 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/liste_ar.txt 65 | 5545 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/liste_fr.txt - 66 | 18829 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt - 67 | 16204 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt + 66 | 18836 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt + 67 | 16203 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt 68 | 55 | adblock | http | online | unchanged | https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt 69 | 88 | adblock | http | online | unchanged | https://raw.github.com/tomasko126/easylistczechandslovak/master/filters.txt 70 | 413 | adblock | http | online | unchanged | https://raw.githubusercontent.com/abpindo/indonesianadblockrules/master/subscriptions/abpindo.txt @@ -936,8 +947,8 @@ Initialize ... 78 | 120 | adblock | http | online | unchanged | https://www.zoso.ro/pages/rolist.txt 79 | 549 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt 80 | 105 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt - 81 | 155 | adblock | http | online | changed | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt - 82 | 721 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt + 81 | 155 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt + 82 | 731 | adblock | http | online | changed | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt 83 | 44 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt 84 | 4 | adblock | http | online | unchanged | https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt 85 | 109 | adblock | http | online | unchanged | https://easylist.to/easylist/fanboy-social.txt @@ -953,20 +964,20 @@ Initialize ... Stats multi: -** Source (raw): 963305 -== Source (unique): 491767 (-471538) --- Exclude: 487660 (-4107) --- White: 484004 (-3656) --- White(*): 479087 (-4917) --- Dead: 369051 (-110036) -++ Block: 369227 (+176) --- Unblock: 369223 (-4) --- Unblock(*): 369217 (-6) -++ FLD: 370101 (+884) -++ WWW: 492258 (+122157) +** Source (raw): 963374 +== Source (unique): 491881 (-471493) +-- Exclude: 487774 (-4107) +-- White: 484118 (-3656) +-- White(*): 479199 (-4919) +-- Dead: 369166 (-110033) +++ Block: 369342 (+176) +-- Unblock: 369338 (-4) +-- Unblock(*): 369332 (-6) +++ FLD: 370216 (+884) +++ WWW: 492438 (+122222) -492258 unique Domains - Version 2021.1101.121743 -MD5 Domains RAW: ef5238d8d14f2dcfbfc105edc2014d77 +492438 unique Domains - Version 2021.1101.162242 +MD5 Domains RAW: 5335d034864bda40269e499655686039 # Convert multi to Hostlist ... @@ -989,10 +1000,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling multi.adblock.raw -ℹ Original length is 325979 -ℹ Length after applying transformations is 325979 -ℹ The list was compressed from 325982 to 271458 -ℹ Final length of the list is 271464 +ℹ Original length is 326103 +ℹ Length after applying transformations is 326103 +ℹ The list was compressed from 326106 to 271597 +ℹ Final length of the list is 271603 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/multi/out/multi.adblock ℹ Finished compiling @@ -1000,27 +1011,35 @@ Prepare domain list for compiling ... done. # Push multi to local Repositories ... -End: 2021.11-01-12:23:10 +End: 2021.11-01-16:28:02 multi - Done! Bereits aktuell. -[master 5298b36] multi auto-update - 19 files changed, 6710 insertions(+), 211 deletions(-) +[master 0711b72] multi auto-update + 22 files changed, 1494 insertions(+), 124887 deletions(-) + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.excludelist.removed + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.prioblocklist.added + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.unblocklist.removed + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.unblocklist.wildcards.regex + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/multi/out/multi.domains.wildcard.removed Bereits aktuell. -[main 426b648] multi auto-update - 2 files changed, 1183 insertions(+), 47 deletions(-) +[main a34a457] multi auto-update + 2 files changed, 290 insertions(+), 108 deletions(-) Bereits aktuell. -[main a3db6e0] multi auto-update - 2 files changed, 802 insertions(+), 41 deletions(-) +[main f8b4f9e] multi auto-update + 2 files changed, 208 insertions(+), 67 deletions(-) =========================================== Affiliate & Tracking ... =========================================== -Start: 2021.11-01-12:23:43 +Start: 2021.11-01-16:28:30 ### Compile d3host Blocklist ### @@ -1051,18 +1070,19 @@ Stats d3host: d3host - Done! -Start: 2021.11-01-12:23:45 +Start: 2021.11-01-16:28:31 ### Compile affiliatetracking Blocklist ### Config: -** Build - 4: +** Build - 5: extendWWWFLD hosts adblock localpush + checkfordead ++ Prioritized Blocklists - 1: @@ -1116,72 +1136,54 @@ Stats affiliatetracking: ++ FLD: 13759 (+4) ++ WWW: 13854 (+95) -13854 unique Domains - Version 2021.1101.122345 -MD5 Domains RAW: 4dccc53ee437f63ac596735d2babe02f - -# Convert affiliatetracking to Hostlist ... - -# Convert affiliatetracking to AdBlocklist ... - -Prepare domain list for compiling ... done. - -ℹ Starting @adguard/hostlist-compiler v1.0.12 -ℹ Starting the compiler -ℹ Configuration: { - "name": "affiliatetracking", - "sources": [ - { - "source": "affiliatetracking.adblock.raw", - "type": "adblock" - } - ], - "transformations": [ - "Compress" - ] -} -ℹ Start compiling affiliatetracking.adblock.raw -ℹ Original length is 13541 -ℹ Length after applying transformations is 13541 -ℹ The list was compressed from 13544 to 11798 -ℹ Final length of the list is 11804 -ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.adblock -ℹ Finished compiling - -# Attach header to affiliatetracking Domainlist ... - -# Push affiliatetracking to local Repositories ... - -End: 2021.11-01-12:24:25 +***************************************************** +* No changes to the previous repo version detected! * +***************************************************** affiliatetracking - Done! Bereits aktuell. -[master eaae913] affiliatetracking auto-update - 13 files changed, 3565 insertions(+), 4089 deletions(-) +[master 2b44ae1] affiliatetracking auto-update + 12 files changed, 5 insertions(+), 49261 deletions(-) + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.excludelist.removed + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.prioblocklist.added + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unblocklist.wildcards.regex + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unique + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.wildcard.removed + delete mode 100644 pihole/blocklists/build/d3host/out/d3host.domains.checkfordead + delete mode 100644 pihole/blocklists/build/d3host/out/d3host.domains.unique Bereits aktuell. -[main 7d7dacb] affiliatetracking auto-update - 2 files changed, 161 insertions(+), 69 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main 1d20e00] affiliatetracking auto-update - 2 files changed, 163 insertions(+), 69 deletions(-) +Auf Branch main +Ihr Branch ist auf demselben Stand wie 'origin/main'. + +nichts zu committen, Arbeitsverzeichnis unverändert =========================================== DoH/VPN/TOR/Proxy ... =========================================== -Start: 2021.11-01-12:24:32 +Start: 2021.11-01-16:29:09 ### Compile doh-vpn-proxy-bypass Blocklist ### Config: -** Build - 3: +** Build - 4: hosts adblock localpush + checkfordead -- Deadlists - 1: @@ -1218,8 +1220,12 @@ Stats doh-vpn-proxy-bypass: doh-vpn-proxy-bypass - Done! Bereits aktuell. -[master 039b935] doh-vpn-proxy-bypass auto-update - 1 file changed, 4 insertions(+) +[master 5565b0f] doh-vpn-proxy-bypass auto-update + 6 files changed, 6 insertions(+), 840 deletions(-) + delete mode 100644 pihole/blocklists/build/doh-vpn-proxy-bypass/out/doh-vpn-proxy-bypass.domains.blacklist.added + delete mode 100644 pihole/blocklists/build/doh-vpn-proxy-bypass/out/doh-vpn-proxy-bypass.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/doh-vpn-proxy-bypass/out/doh-vpn-proxy-bypass.domains.unique + delete mode 100644 pihole/blocklists/build/doh-vpn-proxy-bypass/out/doh-vpn-proxy-bypass.domains.whitelist.removed Bereits aktuell. Auf Branch main @@ -1237,7 +1243,7 @@ nichts zu committen, Arbeitsverzeichnis unverändert Big ... =========================================== -Start: 2021.11-01-12:24:37 +Start: 2021.11-01-16:29:16 ### Compile big Blocklist ### @@ -1270,7 +1276,7 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 492258 | domains | local | online | changed | multi.txt + 1 | 492438 | domains | local | online | changed | multi.txt 2 | 42859 | domains | local | online | unchanged | fake.txt 3 | 1066088 | domains | http | online | unchanged | https://dbl.oisd.nl @@ -1278,17 +1284,17 @@ Initialize ... Stats big: -** Source (raw): 1601205 -== Source (unique): 1344249 (-256956) --- Dead: 1306356 (-37893) -++ Block: 1306500 (+144) --- Unblock: 1306488 (-12) --- Unblock(*): 1304415 (-2073) -++ FLD: 1318639 (+14224) -++ WWW: 1327835 (+9196) +** Source (raw): 1601385 +== Source (unique): 1344433 (-256952) +-- Dead: 1306540 (-37893) +++ Block: 1306684 (+144) +-- Unblock: 1306672 (-12) +-- Unblock(*): 1304599 (-2073) +++ FLD: 1318823 (+14224) +++ WWW: 1328019 (+9196) -1327835 unique Domains - Version 2021.1101.122437 -MD5 Domains RAW: 2cdc94504c173ff31f7ac758e7e35bde +1328019 unique Domains - Version 2021.1101.162916 +MD5 Domains RAW: 4b0c9c23870061dd7df503870bffb9df # Convert big to Hostlist ... @@ -1311,10 +1317,10 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling big.adblock.raw -ℹ Original length is 967388 -ℹ Length after applying transformations is 967388 -ℹ The list was compressed from 967391 to 498049 -ℹ Final length of the list is 498055 +ℹ Original length is 967515 +ℹ Length after applying transformations is 967515 +ℹ The list was compressed from 967518 to 498190 +ℹ Final length of the list is 498196 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big/out/big.adblock ℹ Finished compiling @@ -1322,21 +1328,28 @@ Prepare domain list for compiling ... done. # Push big to local Repositories ... -End: 2021.11-01-12:44:46 +End: 2021.11-01-16:48:20 big - Done! Bereits aktuell. -[master b4ba76d] big auto-update - 13 files changed, 7593 insertions(+), 123 deletions(-) +[master 317fb4f] big auto-update + 17 files changed, 1193 insertions(+), 2729567 deletions(-) + delete mode 100644 pihole/blocklists/build/big/out/big.domains.checkfordead + delete mode 100644 pihole/blocklists/build/big/out/big.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/big/out/big.domains.prioblocklist.added + delete mode 100644 pihole/blocklists/build/big/out/big.domains.unblocklist.removed + delete mode 100644 pihole/blocklists/build/big/out/big.domains.unblocklist.wildcards.regex + delete mode 100644 pihole/blocklists/build/big/out/big.domains.unique + delete mode 100644 pihole/blocklists/build/big/out/big.domains.wildcard.removed Bereits aktuell. -[main 4fc0d6d] big auto-update - 2 files changed, 1144 insertions(+), 29 deletions(-) +[main c664862] big auto-update + 2 files changed, 263 insertions(+), 79 deletions(-) Bereits aktuell. -[main a4be7b7] big auto-update - 2 files changed, 778 insertions(+), 25 deletions(-) +[main ee6af4c] big auto-update + 2 files changed, 181 insertions(+), 40 deletions(-) =========================================== Steven Black @@ -1432,7 +1445,7 @@ nichts zu committen, Arbeitsverzeichnis unverändert Experimental ... =========================================== -Start: 2021.11-01-12:46:13 +Start: 2021.11-01-16:49:34 ### Compile experimental Blocklist ### @@ -1457,9 +1470,10 @@ Config: experimental.white --- Whitelists - 2: +-- Whitelists - 3: ../../data/white.list.bmj + ../../data/white.list.nt ../../data/white.list.referral -- Unblocklists - 1: @@ -1471,9 +1485,9 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 491767 | domains | local | online | changed | multi.domains.unique + 1 | 491881 | domains | local | online | changed | multi.domains.unique 2 | 42859 | domains | local | online | unchanged | fake.txt - 3 | 371816 | domains | local | online | changed | threat-intelligence.txt + 3 | 372098 | domains | local | online | changed | threat-intelligence.txt 4 | 710 | domains | local | online | unchanged | doh-vpn-proxy-bypass.txt 5 | 1066088 | domains | http | online | unchanged | https://dbl.oisd.nl @@ -1481,19 +1495,19 @@ Initialize ... Stats experimental: -** Source (raw): 1973240 -== Source (unique): 1467589 (-505651) --- White: 1467031 (-558) --- White(*): 1465912 (-1119) --- Dead: 1340116 (-125796) -++ Block: 1340121 (+5) --- Unblock: 1340103 (-18) --- Unblock(*): 1340069 (-34) -++ FLD: 1355176 (+15107) -++ WWW: 1531392 (+176216) +** Source (raw): 1973636 +== Source (unique): 1468010 (-505626) +-- White: 1467063 (-947) +-- White(*): 1465881 (-1182) +-- Dead: 1340096 (-125785) +++ Block: 1340101 (+5) +-- Unblock: 1340087 (-14) +-- Unblock(*): 1340053 (-34) +++ FLD: 1355155 (+15102) +++ WWW: 1531369 (+176214) -1531392 unique Domains - Version 2021.1101.124613 -MD5 Domains RAW: 64285c3fb5e5ab12f23312f93fa974dd +1531369 unique Domains - Version 2021.1101.164934 +MD5 Domains RAW: dee8844ddce2fcd1f3b01a37269f18de # Convert experimental to Hostlist ... @@ -1516,20 +1530,29 @@ Prepare domain list for compiling ... done. ] } ℹ Start compiling experimental.adblock.raw -ℹ Original length is 1086579 -ℹ Length after applying transformations is 1086579 -ℹ The list was compressed from 1086582 to 580524 -ℹ Final length of the list is 580530 +ℹ Original length is 1086597 +ℹ Length after applying transformations is 1086597 +ℹ The list was compressed from 1086600 to 581702 +ℹ Final length of the list is 581708 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/experimental/out/experimental.adblock ℹ Finished compiling -End: 2021.11-01-13:08:36 +End: 2021.11-01-17:11:21 experimental - Done! Bereits aktuell. -[master 224a23b] experimental auto-update - 14 files changed, 9342 insertions(+), 99 deletions(-) +[master df91fe6] experimental auto-update + 18 files changed, 20279 insertions(+), 3081889 deletions(-) + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.checkfordead + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.deadlist.removed + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.prioblocklist.added + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.unblocklist.removed + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.unblocklist.wildcards.regex + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.unique + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.whitelist.removed + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.whitelist.wildcards.regex + delete mode 100644 pihole/blocklists/build/experimental/out/experimental.domains.wildcard.removed Bereits aktuell. Auf Branch main @@ -1548,7 +1571,7 @@ nichts zu committen, Arbeitsverzeichnis unverändert Gallegonovato ... =========================================== -Start: 2021.11-01-13:09:28 +Start: 2021.11-01-17:12:06 ### Compile gallegonovato Blocklist ### @@ -1563,9 +1586,9 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 491767 | domains | local | online | unchanged | multi.domains.unique + 1 | 491881 | domains | local | online | unchanged | multi.domains.unique 2 | 42859 | domains | local | online | unchanged | fake.txt - 3 | 371816 | domains | local | online | unchanged | threat-intelligence.txt + 3 | 372098 | domains | local | online | unchanged | threat-intelligence.txt 4 | 710 | domains | local | online | unchanged | doh-vpn-proxy-bypass.txt 5 | 1066088 | domains | http | online | unchanged | https://dbl.oisd.nl 6 | 24879 | hosts | http | online | unchanged | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/AdditionalSupplementaryHosts.txt @@ -1578,23 +1601,25 @@ Initialize ... Stats gallegonovato: -** Source (raw): 2296641 -== Source (unique): 1476833 (-819808) +** Source (raw): 2297037 +== Source (unique): 1477272 (-819765) -1476833 unique Domains - Version 2021.1101.130928 -MD5 Domains RAW: 745cbdf0153abd983963f9dc9fad7bee +1477272 unique Domains - Version 2021.1101.171206 +MD5 Domains RAW: 5feb03cad1ec85a877afcb5e554454b9 # Convert gallegonovato to Hostlist ... # Attach header to gallegonovato Domainlist ... -End: 2021.11-01-13:11:14 +End: 2021.11-01-17:13:30 gallegonovato - Done! Bereits aktuell. -[master 99b741c] @gallegonovato auto-update - 8 files changed, 5987 insertions(+), 18 deletions(-) +[master d92bbf5] @gallegonovato auto-update + 8 files changed, 7306 insertions(+), 2960089 deletions(-) + delete mode 100644 pihole/blocklists/build/gallegonovato/out/gallegonovato.domains.checkfordead + delete mode 100644 pihole/blocklists/build/gallegonovato/out/gallegonovato.domains.unique Bereits aktuell. Auf Branch main diff --git a/pihole/blocklists/build/buildList.sh b/pihole/blocklists/build/buildList.sh index c9f1cccd..2005a3ac 100755 --- a/pihole/blocklists/build/buildList.sh +++ b/pihole/blocklists/build/buildList.sh @@ -127,7 +127,9 @@ getRegexDomainsFromWilcardList() { convertWildcardToRegex "$list" >>"$2" done <"$1" sortList "$2" - cp "$2" "$2".regex + if inConfig "debug"; then + cp "$2" "$2".regex + fi fi } @@ -141,7 +143,6 @@ convertWildcardToRegex() { sort -u tmp rm -f tmp - #cat <"$1" | sed -e 's/^[[:space:]]*//' | grep -Ev '^\s*$|^#|^!' | awk '{print $1}' | grep -E '^\*\.|^\.' | sed 's/^\*//' | sed 's/^.//' | sed 's/\./\\./g' | sed -e 's/^/\(\\.\|\^\)/' | sed -e 's/$/\$/' } extractValidDomains() { @@ -235,8 +236,9 @@ printDecCount() { removeDomains() { if [ -s "$1" ] && [ -s "$2" ]; then comm -13 <(tr '[:upper:]' '[:lower:]' <"$1" | sort) <(tr '[:upper:]' '[:lower:]' <"$2" | sort) | awk '{print $1}' >"$2.tmp" - comm -12 <(tr '[:upper:]' '[:lower:]' <"$1" | sort) <(tr '[:upper:]' '[:lower:]' <"$2" | sort) | awk '{print $1}' >>"$1.removed" - #grep -Fvx -f "$1" "$2" >"$2.tmp" + if inConfig "debug"; then + comm -12 <(tr '[:upper:]' '[:lower:]' <"$1" | sort) <(tr '[:upper:]' '[:lower:]' <"$2" | sort) | awk '{print $1}' >>"$1.removed" + fi mv "$2.tmp" "$2" rm "$1" fi @@ -260,7 +262,9 @@ removeDomainsWildcard() { addDomains() { if [ -s "$1" ]; then - comm -23 <(tr '[:upper:]' '[:lower:]' <"$1" | sort) <(tr '[:upper:]' '[:lower:]' <"$2" | sort) | awk '{print $1}' >"$1.added" + if inConfig "debug"; then + comm -23 <(tr '[:upper:]' '[:lower:]' <"$1" | sort) <(tr '[:upper:]' '[:lower:]' <"$2" | sort) | awk '{print $1}' >"$1.added" + fi cat <"$1" | sed -e 's/^[[:space:]]*//' | grep -Ev '^\s*$|^#|^!' | awk '{print $1}' | grep -P "$regex" >>"$2" sortList "$2" rm "$1" @@ -504,8 +508,10 @@ echo "" sortList "$domains" printDecCount - # Save unique domain list - cp "$domains" "$domains".unique + # Save unique domain list + if inConfig "unique"; then + cp "$domains" "$domains".unique + fi # Add Domains from personal Blacklists if [ -s "$black" ]; then @@ -529,7 +535,9 @@ echo "" fi # Save domain list for later dead domains check - cp "$domains" "$domains".checkfordead + if inConfig "checkfordead"; then + cp "$domains" "$domains".checkfordead + fi # Remove whitelisted Domains if [ -s "$white" ]; then @@ -553,7 +561,7 @@ echo "" # Remove wildcard whitelisted Domains if [ -s "$white" ]; then - cat <"$white" | grep -E '\*' > "$domains".whitelist.wildcards.tmp + cat <"$white" | grep -E '\*' >"$domains".whitelist.wildcards.tmp convertWildcardToRegex "$domains".whitelist.wildcards.tmp >>"$domains".whitelist.wildcards rm -f "$domains".whitelist.wildcards.tmp fi @@ -600,7 +608,7 @@ echo "" # Unblock prioritized wildcard whitelisted Domains if [ -s "$unblock" ]; then - cat <"$unblock" | grep -E '\*' > "$domains".unblocklist.wildcards.tmp + cat <"$unblock" | grep -E '\*' >"$domains".unblocklist.wildcards.tmp convertWildcardToRegex "$domains".unblocklist.wildcards.tmp >>"$domains".unblocklist.wildcards rm -f "$domains".unblocklist.wildcards.tmp fi