diff --git a/pihole/blocklists/build/build.log b/pihole/blocklists/build/build.log index 0c062f7e..e63c07ab 100755 --- a/pihole/blocklists/build/build.log +++ b/pihole/blocklists/build/build.log @@ -4,9 +4,30 @@ Initialize ... Bereits aktuell. -[master 2a3b339] auto-update - 1 file changed, 6 insertions(+), 1156 deletions(-) - rewrite pihole/blocklists/build/build.log (99%) +[master 046b65b] auto-update + 22 files changed, 22 deletions(-) + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.new + delete mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.old + delete mode 100644 pihole/blocklists/build/big/out/md5.new + delete mode 100644 pihole/blocklists/build/big/out/md5.old + delete mode 100644 pihole/blocklists/build/big_extension/out/md5.new + delete mode 100644 pihole/blocklists/build/big_extension/out/md5.old + delete mode 100644 pihole/blocklists/build/black/out/md5.new + delete mode 100644 pihole/blocklists/build/black/out/md5.old + delete mode 100644 pihole/blocklists/build/dead/out/md5.new + delete mode 100644 pihole/blocklists/build/dead/out/md5.old + delete mode 100644 pihole/blocklists/build/exclude/out/md5.new + delete mode 100644 pihole/blocklists/build/exclude/out/md5.old + delete mode 100644 pihole/blocklists/build/fake/out/md5.new + delete mode 100644 pihole/blocklists/build/fake/out/md5.old + delete mode 100644 pihole/blocklists/build/light/out/md5.new + delete mode 100644 pihole/blocklists/build/light/out/md5.old + delete mode 100644 pihole/blocklists/build/multi/out/md5.new + delete mode 100644 pihole/blocklists/build/multi/out/md5.old + delete mode 100644 pihole/blocklists/build/personal/out/md5.new + delete mode 100644 pihole/blocklists/build/personal/out/md5.old + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.new + delete mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.old Bereits aktuell. Auf Branch main @@ -21,8 +42,12 @@ Ihr Branch ist auf demselben Stand wie 'origin/main'. nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[master 9081088] 2021.10.20-07:12:05 - 2 files changed, 36 insertions(+), 3 deletions(-) +[master 23a220a] 2021.10.20-07:49:05 + 5 files changed, 4 insertions(+), 6 deletions(-) + delete mode 100644 shell/blocklist/archiv/black.list.block.md5 + delete mode 100644 shell/blocklist/archiv/black.list.md5 + delete mode 100644 shell/blocklist/archiv/fake.txt.blacklist.md5 + delete mode 100644 shell/blocklist/archiv/privacy.txt.md5 =========================================== @@ -75,7 +100,7 @@ Initialize ... 21 | 142 | white | http | online | unchanged | https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt 22 | 75 | white | http | online | unchanged | https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/referral-sites.txt 23 | 191 | white | http | online | unchanged | https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt - 24 | 63 | white | http | online | unchanged | https://raw.githubusercontent.com/badmojr/1Hosts/master/submit_here/exclude_for_all.txt + 24 | 70 | white | http | online | changed | https://raw.githubusercontent.com/badmojr/1Hosts/master/submit_here/exclude_for_all.txt 25 | 18 | white | http | online | unchanged | https://raw.githubusercontent.com/blokadaorg/landing-github-pages/master/scripts/whitelist 26 | 624 | white | http | online | unchanged | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/WhitelistedDomains.txt 27 | 419 | white | http | online | unchanged | https://raw.githubusercontent.com/boutetnico/url-shorteners/master/list.txt @@ -101,15 +126,13 @@ Initialize ... Stats exclude: -** Source (raw): 110312 -== Source (unique): 58329 (-51983) -++ FLD from SLD: 64656 (+6327) -++ FLD: 64746 (+90) -++ WWW: 92462 (+27716) +** Source (raw): 110319 +== Source (unique): 58336 (-51983) +++ FLD from SLD: 64668 (+6332) +++ FLD: 64760 (+92) +++ WWW: 92478 (+27718) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +# Push exclude to local Repositories ... exclude - Done! @@ -149,16 +172,18 @@ Stats dead: ** Source (raw): 757485 == Source (unique): 534639 (-222846) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +# Push dead to local Repositories ... dead - Done! Bereits aktuell. -[master 9c8494e] white auto-update - 3 files changed, 163 insertions(+), 6 deletions(-) +[master 2c4190f] white auto-update + 10 files changed, 58 insertions(+), 12 deletions(-) + create mode 100644 pihole/blocklists/build/dead/out/md5.new + create mode 100644 pihole/blocklists/build/dead/out/md5.old + create mode 100644 pihole/blocklists/build/exclude/out/md5.new + create mode 100644 pihole/blocklists/build/exclude/out/md5.old Bereits aktuell. Auf Branch main @@ -220,16 +245,16 @@ Stats black: -- White(*): 14242 (-111) -- Unblock: 14242 (-0) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +# Push black to local Repositories ... black - Done! Bereits aktuell. -[master efeac27] black auto-update - 2 files changed, 74 insertions(+), 1 deletion(-) +[master 1aba07e] black auto-update + 3 files changed, 3 insertions(+), 3 deletions(-) + create mode 100644 pihole/blocklists/build/black/out/md5.new + create mode 100644 pihole/blocklists/build/black/out/md5.old Bereits aktuell. Auf Branch main @@ -281,7 +306,7 @@ Initialize ... 2 | 402 | hosts | http | online | unchanged | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt 3 | 8170 | 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 | 33317 | hosts | http | online | changed | https://hole.cert.pl/domains/domains_hosts.txt + 5 | 33317 | 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 | 54 | hosts | http | online | unchanged | https://raw.githubusercontent.com/davidonzo/Threat-Intel/master/lists/latestdomains.piHole.txt @@ -292,16 +317,16 @@ Initialize ... 13 | 1072 | hosts | http | online | unchanged | https://raw.githubusercontent.com/metamask/eth-phishing-detect/master/src/hosts.txt 14 | 1386 | hosts | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/Badd-Boyz-Hosts/master/hosts 15 | 13465 | hosts | http | online | unchanged | https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts - 16 | 1485 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 16 | 1471 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 17 | 883 | adblock | http | online | unchanged | https://raw.githubusercontent.com/piperun/iploggerfilter/master/filterlist - 18 | 914 | domains | http | online | unchanged | https://azorult-tracker.net/api/list/domain?format=plain + 18 | 914 | domains | http | online | changed | https://azorult-tracker.net/api/list/domain?format=plain 19 | 122584 | domains | http | online | unchanged | https://blocklist.cyberthreatcoalition.org/vetted/domain.txt 20 | 549 | domains | http | online | unchanged | https://feeds.alphasoc.net/ryuk.txt 21 | 9233 | domains | http | online | unchanged | https://gitlab.com/KevinThomas0/cryptoscamdb-lists/-/raw/master/cryptoscamdb-blocklist.txt 22 | 365 | domains | http | online | unchanged | https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt - 23 | 33317 | domains | http | online | changed | https://hole.cert.pl/domains/domains.txt + 23 | 33317 | domains | http | online | unchanged | https://hole.cert.pl/domains/domains.txt 24 | 73079 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl-base.txt - 25 | 777 | domains | http | online | changed | https://joewein.net/dl/bl/dom-bl.txt + 25 | 777 | domains | http | online | unchanged | https://joewein.net/dl/bl/dom-bl.txt 26 | 1998 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_covid_domains.txt 27 | 1998 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_malicious_domains.txt 28 | 397 | domains | http | online | unchanged | https://kriskintel.com/feeds/ktip_ransomware_feeds.txt @@ -351,20 +376,20 @@ Initialize ... 72 | 500 | domains | http | online | unchanged | https://rescure.me/rescure_domain_blacklist.txt 73 | 77 | domains | http | online | unchanged | https://www.botvrij.eu/data/ioclist.domain.raw 74 | 29 | domains | http | online | unchanged | https://www.botvrij.eu/data/ioclist.hostname.raw - 75 | 35049 | domains | http | online | changed | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt - 76 | 101161 | domains | http | online | changed | https://www.usom.gov.tr/url-list.txt + 75 | 35049 | domains | http | online | unchanged | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt + 76 | 101161 | domains | http | online | unchanged | https://www.usom.gov.tr/url-list.txt 77 | 24 | domains | local | online | unchanged | black.list.threat-intelligence # Build threat-intelligence Domainlist ... Stats threat-intelligence: -** Source (raw): 1183905 -== Source (unique): 857101 (-326804) --- White: 856351 (-750) --- White(*): 854961 (-1390) --- Unblock: 854961 (-0) --- Dead: 364565 (-490396) +** Source (raw): 1183891 +== Source (unique): 857097 (-326794) +-- White: 856347 (-750) +-- White(*): 854957 (-1390) +-- Unblock: 854957 (-0) +-- Dead: 364561 (-490396) # Convert threat-intelligence to Hostlist ... @@ -372,6 +397,27 @@ Stats threat-intelligence: Prepare domain list for compiling ... done. +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "threat-intelligence", + "sources": [ + { + "source": "threat-intelligence.adblock.raw", + "type": "adblock" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling threat-intelligence.adblock.raw +ℹ Original length is 345284 +ℹ Length after applying transformations is 345284 +ℹ The list was compressed from 345287 to 317083 +ℹ Final length of the list is 317089 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/threat-intelligence/out/threat-intelligence.adblock +ℹ Finished compiling # Attach header to threat-intelligence Domainlist ... @@ -381,18 +427,18 @@ threat-intelligence - Done! Bereits aktuell. -[master f6d574a] threat-intelligence auto-update - 16 files changed, 6726 insertions(+), 323617 deletions(-) - rewrite pihole/blocklists/build/threat-intelligence/out/threat-intelligence.adblock (99%) +[master 1296710] threat-intelligence auto-update + 11 files changed, 318193 insertions(+), 1101 deletions(-) + create mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.new + create mode 100644 pihole/blocklists/build/threat-intelligence/out/md5.old Bereits aktuell. -[main c016ad5] threat-intelligence auto-update - 2 files changed, 52 insertions(+), 58 deletions(-) +[main 5546105] threat-intelligence auto-update + 2 files changed, 54 insertions(+), 37 deletions(-) Bereits aktuell. -[main 798e89a] threat-intelligence auto-update - 2 files changed, 136 insertions(+), 317230 deletions(-) - rewrite threat-intelligence.adblock (99%) +[main c272695] threat-intelligence auto-update + 2 files changed, 317121 insertions(+), 21 deletions(-) =========================================== Personal ... @@ -452,28 +498,54 @@ Stats personal: ++ FLD: 20938 (+130) ++ WWW: 27622 (+6684) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +# Convert personal to Hostlist ... + +# Convert personal to AdBlocklist ... + +Prepare domain list for compiling ... done. + +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "personal", + "sources": [ + { + "source": "personal.adblock.raw", + "type": "adblock" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling personal.adblock.raw +ℹ Original length is 20622 +ℹ Length after applying transformations is 20622 +ℹ The list was compressed from 20625 to 13403 +ℹ Final length of the list is 13409 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/personal/out/personal.adblock +ℹ Finished compiling + +# Attach header to personal Domainlist ... + +# Push personal to local Repositories ... personal - Done! Bereits aktuell. -[master b602317] personal auto-update - 3 files changed, 82 insertions(+), 79 deletions(-) +[master c6a11b6] personal auto-update + 7 files changed, 84 insertions(+), 6 deletions(-) + create mode 100644 pihole/blocklists/build/personal/out/md5.new + create mode 100644 pihole/blocklists/build/personal/out/md5.old Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main c05ca60] personal auto-update + 1 file changed, 1 insertion(+), 1 deletion(-) Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main 1dff61c] personal auto-update + 1 file changed, 1 insertion(+), 1 deletion(-) =========================================== Fake ... @@ -533,28 +605,54 @@ Stats fake: ++ FLD: 23303 (+135) ++ WWW: 45616 (+22313) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +# 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 23135 +ℹ Length after applying transformations is 23135 +ℹ The list was compressed from 23138 to 23119 +ℹ Final length of the list is 23125 +ℹ 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 ... fake - Done! Bereits aktuell. -[master 0ca4d6a] fake auto-update - 3 files changed, 84 insertions(+), 72 deletions(-) +[master 3e5ebca] fake auto-update + 7 files changed, 77 insertions(+), 6 deletions(-) + create mode 100644 pihole/blocklists/build/fake/out/md5.new + create mode 100644 pihole/blocklists/build/fake/out/md5.old Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main 0e7b156] fake auto-update + 1 file changed, 1 insertion(+), 1 deletion(-) Bereits aktuell. -Auf Branch main -Ihr Branch ist auf demselben Stand wie 'origin/main'. - -nichts zu committen, Arbeitsverzeichnis unverändert +[main 7dceb25] fake auto-update + 1 file changed, 1 insertion(+), 1 deletion(-) =========================================== Light ... @@ -609,7 +707,7 @@ Initialize ... 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 | 1486 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ + 14 | 1478 | hosts | http | online | changed | https://urlhaus.abuse.ch/downloads/hostfile/ 15 | 40503 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt 16 | 18493 | adblock | http | online | unchanged | https://easylist.to/easylist/easylist.txt 17 | 16168 | adblock | http | online | unchanged | https://easylist.to/easylist/easyprivacy.txt @@ -623,16 +721,16 @@ Initialize ... Stats light: -** Source (raw): 172258 -== Source (unique): 104134 (-68124) --- Exclude: 104080 (-54) --- White: 101880 (-2200) --- White(*): 101717 (-163) -++ Block: 101761 (+44) --- Unblock: 101761 (-0) --- Dead: 84389 (-17372) -++ FLD: 85110 (+721) -++ WWW: 123625 (+38515) +** Source (raw): 172250 +== Source (unique): 104126 (-68124) +-- Exclude: 104073 (-53) +-- White: 101873 (-2200) +-- White(*): 101710 (-163) +++ Block: 101754 (+44) +-- Unblock: 101754 (-0) +-- Dead: 84382 (-17372) +++ FLD: 85097 (+715) +++ WWW: 123614 (+38517) # Convert light to Hostlist ... @@ -640,6 +738,27 @@ Stats light: Prepare domain list for compiling ... done. +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "light", + "sources": [ + { + "source": "light.adblock.raw", + "type": "adblock" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling light.adblock.raw +ℹ Original length is 82938 +ℹ Length after applying transformations is 82938 +ℹ The list was compressed from 82941 to 69689 +ℹ Final length of the list is 69695 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/light/out/light.adblock +ℹ Finished compiling # Attach header to light Domainlist ... @@ -649,18 +768,18 @@ light - Done! Bereits aktuell. -[master 53e49dd] light auto-update - 11 files changed, 868 insertions(+), 70558 deletions(-) - rewrite pihole/blocklists/build/light/out/light.adblock (99%) +[master 04ec855] light auto-update + 11 files changed, 70515 insertions(+), 820 deletions(-) + create mode 100644 pihole/blocklists/build/light/out/md5.new + create mode 100644 pihole/blocklists/build/light/out/md5.old Bereits aktuell. -[main 07b8cde] light auto-update - 2 files changed, 196 insertions(+), 231 deletions(-) +[main dd951c3] light auto-update + 2 files changed, 227 insertions(+), 217 deletions(-) Bereits aktuell. -[main bbfb076] light auto-update - 2 files changed, 77 insertions(+), 69804 deletions(-) - rewrite light.adblock (99%) +[main d48a6c7] light auto-update + 2 files changed, 69719 insertions(+), 13 deletions(-) =========================================== Multi ... @@ -732,7 +851,7 @@ Initialize ... 28 | 93712 | hosts | http | online | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts 29 | 24884 | hosts | http | online | unchanged | https://raw.githubusercontent.com/bongochong/CombinedPrivacyBlockLists/master/NoFormatting/AdditionalSupplementaryHosts.txt 30 | 8624 | hosts | http | online | unchanged | https://raw.githubusercontent.com/guardicore/labs_campaigns/master/Autodiscover/autodiscover-tlds.txt - 31 | 1486 | hosts | http | online | unchanged | https://urlhaus.abuse.ch/downloads/hostfile/ + 31 | 1478 | hosts | http | online | unchanged | https://urlhaus.abuse.ch/downloads/hostfile/ 32 | 373 | hosts | http | online | unchanged | https://raw.githubusercontent.com/Laicure/hosts/master/shithosts 33 | 40503 | adblock | http | online | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt 34 | 1019 | adblock | http | online | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_11_Mobile/filter.txt @@ -750,7 +869,7 @@ Initialize ... 46 | 0 | adblock | http | OFFLINE | OFFLINE | https://adblock.gardar.net/is.abp.txt 47 | 127 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/Liste_AR.txt 48 | 9620 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/advblock.txt - 49 | 6294 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistchina.txt + 49 | 6297 | adblock | http | online | changed | https://easylist-downloads.adblockplus.org/easylistchina.txt 50 | 21 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistdutch.txt 51 | 364 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistgermany.txt 52 | 215 | adblock | http | online | unchanged | https://easylist-downloads.adblockplus.org/easylistitaly.txt @@ -766,7 +885,7 @@ Initialize ... 62 | 86 | adblock | http | online | unchanged | https://raw.github.com/tomasko126/easylistczechandslovak/master/filters.txt 63 | 684 | adblock | http | online | unchanged | https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt 64 | 32 | adblock | http | online | unchanged | https://raw.githubusercontent.com/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt - 65 | 215 | adblock | http | online | unchanged | https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt + 65 | 216 | adblock | http | online | changed | https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt 66 | 162 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist-thailand/easylist-thailand/master/subscription/easylist-thailand.txt 67 | 302 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt 68 | 9314 | adblock | http | online | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt @@ -789,16 +908,16 @@ Initialize ... Stats multi: -** Source (raw): 916574 -== Source (unique): 460783 (-455791) --- Exclude: 456748 (-4035) --- White: 453396 (-3352) --- White(*): 453056 (-340) -++ Block: 453099 (+43) --- Unblock: 453099 (-0) --- Dead: 349689 (-103410) -++ FLD: 350285 (+596) -++ WWW: 468512 (+118227) +** Source (raw): 916570 +== Source (unique): 460787 (-455783) +-- Exclude: 456752 (-4035) +-- White: 453400 (-3352) +-- White(*): 453060 (-340) +++ Block: 453103 (+43) +-- Unblock: 453103 (-0) +-- Dead: 349693 (-103410) +++ FLD: 350289 (+596) +++ WWW: 468521 (+118232) # Convert multi to Hostlist ... @@ -806,6 +925,27 @@ Stats multi: Prepare domain list for compiling ... done. +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "multi", + "sources": [ + { + "source": "multi.adblock.raw", + "type": "adblock" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling multi.adblock.raw +ℹ Original length is 305735 +ℹ Length after applying transformations is 305735 +ℹ The list was compressed from 305738 to 256412 +ℹ Final length of the list is 256418 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/multi/out/multi.adblock +ℹ Finished compiling # Attach header to multi Domainlist ... @@ -815,18 +955,18 @@ multi - Done! Bereits aktuell. -[master 82d0d9c] multi auto-update - 10 files changed, 369 insertions(+), 256636 deletions(-) - rewrite pihole/blocklists/build/multi/out/multi.adblock (99%) +[master 01096cf] multi auto-update + 11 files changed, 256533 insertions(+), 46 deletions(-) + create mode 100644 pihole/blocklists/build/multi/out/md5.new + create mode 100644 pihole/blocklists/build/multi/out/md5.old Bereits aktuell. -[main 7a8b219] multi auto-update - 2 files changed, 30 insertions(+), 48 deletions(-) +[main f4e3c50] multi auto-update + 2 files changed, 48 insertions(+), 18 deletions(-) Bereits aktuell. -[main c8829f6] multi auto-update - 2 files changed, 142 insertions(+), 256565 deletions(-) - rewrite multi.adblock (99%) +[main 3711c5d] multi auto-update + 2 files changed, 256446 insertions(+), 17 deletions(-) =========================================== Affiliate & Tracking ... @@ -886,14 +1026,14 @@ Stats affiliatetracking: ** Source (raw): 273446 == Source (unique): 252762 (-20684) --- Exclude: 178488 (-74274) --- White: 176193 (-2295) --- White(*): 176046 (-147) -++ Block: 177510 (+1464) --- Unblock: 177507 (-3) --- Dead: 151732 (-25775) -++ FLD: 152277 (+545) -++ WWW: 154191 (+1914) +-- Exclude: 178501 (-74261) +-- White: 176206 (-2295) +-- White(*): 176059 (-147) +++ Block: 177523 (+1464) +-- Unblock: 177520 (-3) +-- Dead: 151745 (-25775) +++ FLD: 152295 (+550) +++ WWW: 154210 (+1915) # Convert affiliatetracking to Hostlist ... @@ -901,6 +1041,27 @@ Stats affiliatetracking: 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 135121 +ℹ Length after applying transformations is 135121 +ℹ The list was compressed from 135124 to 131499 +ℹ Final length of the list is 131505 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.adblock +ℹ Finished compiling # Attach header to affiliatetracking Domainlist ... @@ -910,18 +1071,18 @@ affiliatetracking - Done! Bereits aktuell. -[master 01a2cae] affiliatetracking auto-update - 11 files changed, 828 insertions(+), 132222 deletions(-) - rewrite pihole/blocklists/build/affiliatetracking/out/affiliatetracking.adblock (99%) +[master 9a4c942] affiliatetracking auto-update + 10 files changed, 132303 insertions(+), 707 deletions(-) + create mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.new + create mode 100644 pihole/blocklists/build/affiliatetracking/out/md5.old Bereits aktuell. -[main e1b235c] affiliatetracking auto-update - 2 files changed, 165 insertions(+), 178 deletions(-) +[main c42f634] affiliatetracking auto-update + 2 files changed, 207 insertions(+), 167 deletions(-) Bereits aktuell. -[main 361d6ce] affiliatetracking auto-update - 2 files changed, 57 insertions(+), 131549 deletions(-) - rewrite affiliatetracking.adblock (99%) +[main fc7a16e] affiliatetracking auto-update + 2 files changed, 131525 insertions(+), 9 deletions(-) =========================================== Big ... @@ -979,9 +1140,31 @@ Stats big_extension: ++ FLD: 109466 (+267) ++ WWW: 109524 (+58) -***************************************************** -* No changes to the previous repo version detected! * -***************************************************** +# Convert big_extension to AdBlocklist ... + +Prepare domain list for compiling ... done. + +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "big_extension", + "sources": [ + { + "source": "big_extension.adblock.raw", + "type": "adblock" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling big_extension.adblock.raw +ℹ Original length is 106409 +ℹ Length after applying transformations is 106409 +ℹ The list was compressed from 106412 to 104531 +ℹ Final length of the list is 104537 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big_extension/out/big_extension.adblock +ℹ Finished compiling big_extension - Done! @@ -1002,7 +1185,7 @@ Initialize ... # Download and convert Sourcelists ... Nr | Count | Format | Source | Status | File | URL/File - 1 | 468512 | domains | local | online | changed | multi.txt + 1 | 468521 | domains | local | online | changed | multi.txt 2 | 45616 | domains | local | online | unchanged | fake.txt 3 | 109524 | domains | local | online | unchanged | big_extension.domains 4 | 974591 | domains | http | online | unchanged | https://dbl.oisd.nl @@ -1011,13 +1194,77 @@ Initialize ... Stats big: -** Source (raw): 1598243 -== Source (unique): 1327741 (-270502) +** Source (raw): 1598252 +== Source (unique): 1327749 (-270503) # Convert big to Hostlist ... # Convert big to AdBlocklist ... +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "Big", + "sources": [ + { + "source": "/media/nas/git/adguard/multi.adblock", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "/media/nas/git/adguard/fake.adblock", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "../../big_extension/out/big_extension.adblock", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + }, + { + "source": "https://abp.oisd.nl/", + "type": "adblock", + "transformations": [ + "RemoveComments", + "Validate" + ] + } + ], + "transformations": [ + "RemoveComments", + "Compress" + ] +} +ℹ Start compiling /media/nas/git/adguard/multi.adblock +ℹ Original length is 256534 +ℹ Removed 125 comments +ℹ Length after applying transformations is 256407 +ℹ Start compiling /media/nas/git/adguard/fake.adblock +ℹ Original length is 23157 +ℹ Removed 41 comments +ℹ Length after applying transformations is 23116 +ℹ Start compiling ../../big_extension/out/big_extension.adblock +ℹ Original length is 104528 +ℹ Removed 0 comments +ℹ Length after applying transformations is 104528 +ℹ Start compiling https://abp.oisd.nl/ +ℹ Original length is 369448 +ℹ Removed 13 comments +ℹ Length after applying transformations is 369434 +ℹ Removed 12 comments +ℹ The list was compressed from 753485 to 578716 +ℹ Final length of the list is 578722 +ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big/out/big.adblock +ℹ Finished compiling # Attach header to big Domainlist ... @@ -1027,31 +1274,52 @@ big - Done! Bereits aktuell. -[master 8d24ef8] big auto-update - 12 files changed, 268 insertions(+), 578996 deletions(-) - rewrite pihole/blocklists/big.stats (80%) - rewrite pihole/blocklists/build/big/out/big.adblock (99%) - rewrite pihole/blocklists/build/big/out/big.stats (80%) +[master bbb91aa] big auto-update + 13 files changed, 578924 insertions(+), 18 deletions(-) + create mode 100644 pihole/blocklists/build/big/out/md5.new + create mode 100644 pihole/blocklists/build/big/out/md5.old + create mode 100644 pihole/blocklists/build/big_extension/out/md5.new + create mode 100644 pihole/blocklists/build/big_extension/out/md5.old Bereits aktuell. -[main f6433ba] big auto-update - 2 files changed, 43 insertions(+), 105 deletions(-) - rewrite big.stats (80%) +[main 10231a6] big auto-update + 2 files changed, 77 insertions(+), 5 deletions(-) Bereits aktuell. -[main 08939e6] big auto-update - 2 files changed, 84 insertions(+), 578854 deletions(-) - rewrite big.adblock (99%) - rewrite big.stats (80%) +[main 7552b27] big auto-update + 2 files changed, 578780 insertions(+), 5 deletions(-) =========================================== Steven Black =========================================== +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "StevenBlack", + "sources": [ + { + "source": "/media/nas/tmp/work/sb.txt", + "type": "hosts" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling /media/nas/tmp/work/sb.txt +ℹ Original length is 100648 +ℹ Length after applying transformations is 100648 +ℹ The list was compressed from 100651 to 65171 +ℹ Final length of the list is 65177 +ℹ Writing output to /media/nas/git/adguard/stevenblack.adblock +ℹ Finished compiling Bereits aktuell. -[master 757be00] stevenblack auto-update - 1 file changed, 23 insertions(+) +Auf Branch master +Ihr Branch ist auf demselben Stand wie 'origin/master'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. Auf Branch main @@ -1060,18 +1328,41 @@ Ihr Branch ist auf demselben Stand wie 'origin/main'. nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main e3886eb] stevenblack auto-update - 1 file changed, 9 deletions(-) +[main 7b0a546] stevenblack auto-update + 1 file changed, 9 insertions(+) =========================================== D3 Hosts =========================================== +ℹ Starting @adguard/hostlist-compiler v1.0.12 +ℹ Starting the compiler +ℹ Configuration: { + "name": "StevenBlack", + "sources": [ + { + "source": "/media/nas/tmp/work/d3.txt", + "type": "hosts" + } + ], + "transformations": [ + "Compress" + ] +} +ℹ Start compiling /media/nas/tmp/work/d3.txt +ℹ Original length is 317 +ℹ Length after applying transformations is 317 +ℹ The list was compressed from 320 to 237 +ℹ Final length of the list is 243 +ℹ Writing output to /media/nas/git/adguard/d3host.adblock +ℹ Finished compiling Bereits aktuell. -[master 0ad2303] d3host auto-update - 1 file changed, 20 insertions(+) +Auf Branch master +Ihr Branch ist auf demselben Stand wie 'origin/master'. + +nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. Auf Branch main @@ -1080,6 +1371,6 @@ Ihr Branch ist auf demselben Stand wie 'origin/main'. nichts zu committen, Arbeitsverzeichnis unverändert Bereits aktuell. -[main de7224a] d3host auto-update - 1 file changed, 9 deletions(-) +[main dbff76e] d3host auto-update + 1 file changed, 9 insertions(+) diff --git a/pihole/blocklists/build/buildList.sh b/pihole/blocklists/build/buildList.sh index 3b20196a..2563d6ca 100755 --- a/pihole/blocklists/build/buildList.sh +++ b/pihole/blocklists/build/buildList.sh @@ -616,11 +616,14 @@ echo "" exit 0 fi getMd5 "$domains" >"$outdir"/md5.old - - # Cleanup - rm -f "$hosts" "$adblock" - rm -f "$hosts".* "$adblock".* + # Cleanup + rm -f "$hosts" "$adblock" + rm -f "$hosts".* "$adblock".* + + # Version + echo "" + echo "# $cdo unique Domains - Version $version" echo "" # Convert to Hostlist