build auto-update

pihole/blocklists/build/build.log

@@ -2,12 +2,33 @@
 Initialize ...
 ===========================================
 
+Bereits aktuell.
+[master b8f9f93] auto-update
+ 2 files changed, 585 insertions(+), 1682 deletions(-)
+ create mode 100644 pihole/blocklists/data/tmp
+ delete mode 100644 pihole/blocklists/data/white.list.notracking
+
+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
+
+Bereits aktuell.
+[master 6a1a362] auto-update
+ 2 files changed, 106 insertions(+), 73 deletions(-)
+
 
 ===========================================
 Whitelist ...
 ===========================================
 
-1682 /media/nas/git/rpi/pihole/blocklists/data/white.list.notracking
 893 /media/nas/git/rpi/pihole/blocklists/data/white.list.referral
 43 /media/nas/git/rpi/pihole/blocklists/data/white.list.shc
 3100 /media/nas/git/rpi/pihole/blocklists/data/white.list.oisd
@@ -68,7 +89,7 @@ Initialize ...
   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 |     678 | white   | local  | online  | unchanged | white.list
-  40 |     893 | white   | local  | online  | unchanged | white.list.referral
+  40 |     893 | white   | local  | online  | changed   | white.list.referral
   41 |      15 | white   | local  | online  | unchanged | white.list.important
   42 |     577 | white   | local  | online  | unchanged | white.list.adguard
   43 |    3100 | white   | local  | online  | unchanged | white.list.oisd
@@ -132,6 +153,23 @@ Stats dead:
 
 dead - Done!
 
+Bereits aktuell.
+[master 14c9121] white-dead auto-update
+ 3 files changed, 2 insertions(+), 586 deletions(-)
+ delete mode 100644 pihole/blocklists/data/tmp
+
+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
+
 ===========================================
 Black ...
 ===========================================
@@ -166,9 +204,9 @@ Initialize ...
 # Download and convert Sourcelists ...
 
   Nr |   Count | Format  | Source | Status  | File      | URL/File
-   1 |   14666 | domains | local  | online  | changed   | black.list
+   1 |   14666 | domains | local  | online  | unchanged | black.list
-   2 |     241 | domains | local  | online  | changed   | black.list.wl.removed
+   2 |     241 | domains | local  | online  | unchanged | black.list.wl.removed
-   3 |     630 | domains | local  | online  | changed   | black.list.wc.removed
+   3 |     630 | domains | local  | online  | unchanged | black.list.wc.removed
 
 # Build black Domainlist ...
 
@@ -187,6 +225,22 @@ Stats black:
 
 black - Done!
 
+Bereits aktuell.
+[master 2867940] black auto-update
+ 1 file changed, 3 insertions(+), 3 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
+
 ===========================================
 Rules ...
 ===========================================
@@ -221,6 +275,24 @@ Stats rules:
 
 rules - Done!
 
+Bereits aktuell.
+Auf Branch master
+Ihr Branch ist auf demselben Stand wie 'origin/master'.
+
+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
+
+Bereits aktuell.
+Auf Branch main
+Ihr Branch ist auf demselben Stand wie 'origin/main'.
+
+nichts zu committen, Arbeitsverzeichnis unverändert
+
 ===========================================
 Threat Intelligence Feeds ...
 ===========================================
@@ -255,7 +327,7 @@ Initialize ...
    2 |     407 | hosts   | http   | online  | unchanged | https://curben.gitlab.io/malware-filter/pup-filter-hosts.txt
    3 |    8884 | 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 |   33666 | hosts   | http   | online  | changed   | https://hole.cert.pl/domains/domains_hosts.txt
+   5 |   33669 | 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 |    5997 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt
    8 |    2204 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts
@@ -275,7 +347,7 @@ Initialize ...
   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 |   33666 | domains | http   | online  | changed   | https://hole.cert.pl/domains/domains.txt
+  25 |   33669 | domains | http   | online  | changed   | https://hole.cert.pl/domains/domains.txt
   26 |   73323 | domains | http   | online  | unchanged | https://joewein.net/dl/bl/dom-bl-base.txt
   27 |     767 | domains | http   | online  | unchanged | https://joewein.net/dl/bl/dom-bl.txt
   28 |    2000 | domains | http   | online  | unchanged | https://kriskintel.com/feeds/ktip_covid_domains.txt
@@ -328,21 +400,21 @@ Initialize ...
   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 |   35077 | domains | http   | online  | unchanged | https://www.stopforumspam.com/downloads/toxic_domains_whole.txt
-  78 |  101556 | domains | http   | online  | unchanged | https://www.usom.gov.tr/url-list.txt
+  78 |  101569 | domains | http   | online  | changed   | https://www.usom.gov.tr/url-list.txt
-  79 |      29 | domains | local  | online  | changed   | black.list.threat-intelligence
+  79 |      29 | domains | local  | online  | unchanged | black.list.threat-intelligence
 
 # Build threat-intelligence Domainlist ...
 
 Stats threat-intelligence:
 
-** Source (raw):    1187871
+** Source (raw):    1187890
-== Source (unique): 860251 (-327620)
+== Source (unique): 860267 (-327623)
--- White:           859483 (-768)
+-- White:           859499 (-768)
--- White(*):        857963 (-1520)
+-- White(*):        857979 (-1520)
--- Dead:            367687 (-490276)
+-- Dead:            367703 (-490276)
 
-367687 unique Domains - Version 2021.1023.191145
+367703 unique Domains - Version 2021.1023.194013
-MD5 Domains RAW: a8b1aaf6715acbb57b314f830f3ced02
+MD5 Domains RAW: dfd2b5701be1ee3069e201d9a817fe78
 
 # Convert threat-intelligence to Hostlist ... 
 
@@ -368,10 +440,10 @@ Prepare domain list for compiling ... done.
     ]
 }
 ℹ Start compiling threat-intelligence.adblock.raw
-ℹ Original length is 347527
+ℹ Original length is 347542
-ℹ Length after applying transformations is 347527
+ℹ Length after applying transformations is 347542
-ℹ The list was compressed from 347530 to 319593
+ℹ The list was compressed from 347545 to 319608
-ℹ Final length of the list is 319599
+ℹ Final length of the list is 319614
 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/threat-intelligence/out/threat-intelligence.adblock
 ℹ Finished compiling
 
@@ -381,6 +453,18 @@ Prepare domain list for compiling ... done.
 
 threat-intelligence - Done!
 
+Bereits aktuell.
+[master 2f5b722] threat-intelligence auto-update
+ 13 files changed, 11070 insertions(+), 10972 deletions(-)
+
+Bereits aktuell.
+[main 484a6d8] threat-intelligence auto-update
+ 2 files changed, 36 insertions(+), 20 deletions(-)
+
+Bereits aktuell.
+[main 036791a] threat-intelligence auto-update
+ 2 files changed, 35 insertions(+), 20 deletions(-)
+
 ===========================================
 Personal ...
 ===========================================
@@ -421,7 +505,7 @@ Initialize ...
   Nr |   Count | Format  | Source | Status  | File      | URL/File
    1 |   14666 | domains | local  | online  | unchanged | black.list
    2 |      29 | domains | local  | online  | unchanged | black.list.threat-intelligence
-   3 |       2 | domains | local  | online  | changed   | black.list.affiliatetracking
+   3 |       2 | domains | local  | online  | unchanged | black.list.affiliatetracking
    4 |    3672 | hosts   | http   | online  | unchanged | https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext
    5 |    1734 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt
    6 |    2016 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/Kees1958/W3C_annual_most_used_survey_blocklist/master/TOP_EU_US_Ads_Trackers_ABP
@@ -441,46 +525,28 @@ Stats personal:
 ++ FLD:             21220 (+140)
 ++ WWW:             27904 (+6684)
 
-27904 unique Domains - Version 2021.1023.191528
+*****************************************************
-MD5 Domains RAW: bade576bf5f3055f04b1edc698c90d7b
+* 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": [
-                "Validate"
-            ]
-        }
-    ],
-    "transformations": [
-        "Compress"
-    ]
-}
-ℹ Start compiling personal.adblock.raw
-ℹ Original length is 20828
-ℹ Length after applying transformations is 20827
-ℹ The list was compressed from 20830 to 13605
-ℹ Final length of the list is 13611
-ℹ 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 0694621] personal auto-update
+ 2 files changed, 4 insertions(+), 86 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
+
 ===========================================
 Fake ...
 ===========================================
@@ -521,9 +587,9 @@ Initialize ...
    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
-   7 |    6877 | domains | local  | online  | changed   | black.list.fake
+   7 |    6877 | domains | local  | online  | unchanged | black.list.fake
-   8 |    1421 | domains | local  | online  | changed   | fake.ts.black.list
+   8 |    1421 | domains | local  | online  | unchanged | fake.ts.black.list
-   9 |     491 | domains | local  | online  | changed   | fake.vzni.black.list
+   9 |     491 | domains | local  | online  | unchanged | fake.vzni.black.list
 
 # Build fake Domainlist ...
 
@@ -544,6 +610,22 @@ Stats fake:
 
 fake - Done!
 
+Bereits aktuell.
+[master c8a6cd5] fake auto-update
+ 1 file changed, 3 insertions(+), 3 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
+
 ===========================================
 Light ...
 ===========================================
@@ -587,7 +669,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 |   15702 | domains | http   | online  | changed   | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt
+   2 |   15702 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt
    3 |     701 | 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
@@ -598,7 +680,7 @@ Initialize ...
   10 |     244 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/d3ward/toolz/master/src/d3host.txt
   11 |    1734 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt
   12 |     335 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/shreyasminocha/shady-hosts/main/hosts
-  13 |   16963 | hosts   | http   | online  | unchanged | https://someonewhocares.org/hosts/
+  13 |   16962 | hosts   | http   | online  | changed   | https://someonewhocares.org/hosts/
   14 |    1555 | hosts   | http   | OFFLINE | unchanged | USE LOCAL COPY: urlhaus.abuse.ch_downloads_hostfile_.txt
   15 |   40653 | adblock | http   | online  | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
   16 |   13720 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/adguardteam/cname-trackers/master/combined_disguised_trackers_justdomains.txt
@@ -614,10 +696,10 @@ Initialize ...
 
 Stats light:
 
-** Source (raw):    186961
+** Source (raw):    186960
-== Source (unique): 108117 (-78844)
+== Source (unique): 108116 (-78844)
--- Exclude:         108055 (-62)
+-- Exclude:         108054 (-62)
--- White:           105806 (-2249)
+-- White:           105806 (-2248)
 -- White(*):        104938 (-868)
 -- Dead:            87788 (-17150)
 ++ Block:           87958 (+170)
@@ -625,46 +707,28 @@ Stats light:
 ++ FLD:             88722 (+766)
 ++ WWW:             127384 (+38662)
 
-127384 unique Domains - Version 2021.1023.191633
+*****************************************************
-MD5 Domains RAW: c322f4c2bc193bcf7f33427ca988087d
+* No changes to the previous repo version detected! *
-
+*****************************************************
-# Convert light to Hostlist ... 
-
-# Convert light to AdBlocklist ...
-
-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": [
-                "Validate"
-            ]
-        }
-    ],
-    "transformations": [
-        "Compress"
-    ]
-}
-ℹ Start compiling light.adblock.raw
-ℹ Original length is 86424
-ℹ Length after applying transformations is 86423
-ℹ The list was compressed from 86426 to 73014
-ℹ Final length of the list is 73020
-ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/light/out/light.adblock
-ℹ Finished compiling
-
-# Attach header to light Domainlist ...
-
-# Push light to local Repositories ...
 
 light - Done!
 
+Bereits aktuell.
+[master 1a9d9df] light auto-update
+ 5 files changed, 9 insertions(+), 111 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
+
 ===========================================
 Multi ...
 ===========================================
@@ -718,7 +782,7 @@ Initialize ...
    9 |    3670 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/cbuijs/ut1/master/ads/domains
   10 |     415 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/ookangzheng/blahdns/master/hosts/blacklist.txt
   11 |     357 | domains | http   | online  | unchanged | https://v.firebog.net/hosts/static/w3kbl.txt
-  12 |   93412 | domains | http   | online  | changed   | https://dbl.oisd.nl/basic/
+  12 |   93412 | domains | http   | online  | unchanged | https://dbl.oisd.nl/basic/
   13 |  238528 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt
   14 |   44826 | 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
@@ -733,7 +797,7 @@ Initialize ...
   24 |     335 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/shreyasminocha/shady-hosts/main/hosts
   25 |    1730 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/tiuxo/hosts/master/ads
   26 |    6134 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/velesila/yhosts/master/hosts
-  27 |   16963 | hosts   | http   | online  | unchanged | https://someonewhocares.org/hosts/
+  27 |   16962 | hosts   | http   | online  | unchanged | https://someonewhocares.org/hosts/
   28 |    8728 | hosts   | http   | online  | unchanged | https://winhelp2002.mvps.org/hosts.txt
   29 |    3496 | hosts   | http   | online  | unchanged | https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/hosts_browser
   30 |   93712 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
@@ -747,8 +811,8 @@ Initialize ...
   38 |    5523 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_16_French/filter.txt
   39 |    4649 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_1_Russian/filter.txt
   40 |    6551 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_224_Chinese/filter.txt
-  41 |   22149 | adblock | http   | online  | changed   | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_2_English/filter.txt
+  41 |   22148 | adblock | http   | online  | changed   | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_2_English/filter.txt
-  42 |   16807 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_3_Spyware/filter.txt
+  42 |   16808 | 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 |     336 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_7_Japanese/filter.txt
@@ -762,7 +826,7 @@ Initialize ...
   53 |    6286 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistchina.txt
   54 |      21 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistdutch.txt
   55 |     364 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistgermany.txt
-  56 |     216 | adblock | http   | online  | changed   | https://easylist-downloads.adblockplus.org/easylistitaly.txt
+  56 |     216 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistitaly.txt
   57 |      39 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistpolish.txt
   58 |     110 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistportuguese.txt
   59 |     351 | adblock | http   | online  | unchanged | https://easylist-downloads.adblockplus.org/easylistspanish.txt
@@ -798,8 +862,8 @@ Initialize ...
 
 Stats multi:
 
-** Source (raw):    946279
+** Source (raw):    946278
-== Source (unique): 459073 (-487206)
+== Source (unique): 459073 (-487205)
 -- Exclude:         455033 (-4040)
 -- White:           451579 (-3454)
 -- White(*):        450047 (-1532)
@@ -809,46 +873,28 @@ Stats multi:
 ++ FLD:             352574 (+675)
 ++ WWW:             471817 (+119243)
 
-471817 unique Domains - Version 2021.1023.191725
+*****************************************************
-MD5 Domains RAW: 4ab6a341a8d4edf01446b1bfa575da12
+* No changes to the previous repo version detected! *
-
+*****************************************************
-# Convert multi to Hostlist ... 
-
-# Convert multi to AdBlocklist ...
-
-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": [
-                "Validate"
-            ]
-        }
-    ],
-    "transformations": [
-        "Compress"
-    ]
-}
-ℹ Start compiling multi.adblock.raw
-ℹ Original length is 308031
-ℹ Length after applying transformations is 308029
-ℹ The list was compressed from 308032 to 257329
-ℹ Final length of the list is 257335
-ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/multi/out/multi.adblock
-ℹ Finished compiling
-
-# Attach header to multi Domainlist ...
-
-# Push multi to local Repositories ...
 
 multi - Done!
 
+Bereits aktuell.
+[master 0d0dc30] multi auto-update
+ 4 files changed, 11 insertions(+), 174 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
+
 ===========================================
 Affiliate & Tracking ...
 ===========================================
@@ -946,46 +992,28 @@ Stats affiliatetracking:
 ++ FLD:             111706 (+286)
 ++ WWW:             112186 (+480)
 
-112186 unique Domains - Version 2021.1023.192030
+*****************************************************
-MD5 Domains RAW: 0917ef94a7aab0fbb8d48e9506c58237
+* No changes to the previous repo version detected! *
-
+*****************************************************
-# 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": [
-                "Validate"
-            ]
-        }
-    ],
-    "transformations": [
-        "Compress"
-    ]
-}
-ℹ Start compiling affiliatetracking.adblock.raw
-ℹ Original length is 108580
-ℹ Length after applying transformations is 108579
-ℹ The list was compressed from 108582 to 80789
-ℹ Final length of the list is 80795
-ℹ 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 ...
 
 affiliatetracking - Done!
 
+Bereits aktuell.
+[master 745d5a3] affiliatetracking auto-update
+ 3 files changed, 3 insertions(+), 88 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
+
 ===========================================
 Big ...
 ===========================================
@@ -1026,9 +1054,9 @@ Initialize ...
 # Download and convert Sourcelists ...
 
   Nr |   Count | Format  | Source | Status  | File      | URL/File
-   1 |  471817 | domains | local  | online  | changed   | multi.txt
+   1 |  471817 | domains | local  | online  | unchanged | multi.txt
-   2 |   46559 | domains | local  | online  | changed   | fake.txt
+   2 |   46559 | domains | local  | online  | unchanged | fake.txt
-   3 |  971566 | domains | http   | online  | changed   | https://dbl.oisd.nl
+   3 |  971566 | domains | http   | online  | unchanged | https://dbl.oisd.nl
    4 |   40653 | adblock | http   | online  | unchanged | https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
 
 # Build big Domainlist ...
@@ -1044,145 +1072,29 @@ Stats big:
 ++ FLD:             1240554 (+216)
 ++ WWW:             1252608 (+12054)
 
-1252608 unique Domains - Version 2021.1023.192124
+*****************************************************
-MD5 Domains RAW: 9438b2f5ac278ff8e4c663434206389a
+* No changes to the previous repo version detected! *
-
+*****************************************************
-# 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": [
-                "Validate"
-            ]
-        },
-        {
-            "source": "/media/nas/git/adguard/fake.adblock",
-            "type": "adblock",
-            "transformations": [
-                "Validate"
-            ]
-        },
-        {
-            "source": "https://abp.oisd.nl/",
-            "type": "adblock",
-            "exclusions_sources": [
-                "../exclusions.txt",
-                "../../../data/adblock.exclusions.referral",
-                "../../../data/adblock.exclusions.list",
-                "../../../data/adblock.exclusions.important",
-                "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt"
-            ],
-            "transformations": [
-                "Validate"
-            ]
-        },
-        {
-            "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
-            "type": "adblock",
-            "exclusions_sources": [
-                "../exclusions.txt",
-                "../../../data/adblock.exclusions.referral",
-                "../../../data/adblock.exclusions.list",
-                "../../../data/adblock.exclusions.important"
-            ],
-            "transformations": [
-                "Validate"
-            ]
-        },
-        {
-            "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt",
-            "exclusions_sources": [
-                "../exclusions.txt",
-                "../../../data/adblock.exclusions.referral",
-                "../../../data/adblock.exclusions.important"
-            ],
-            "transformations": [
-                "Validate"
-            ],
-            "type": "adblock"
-        },
-        {
-            "source": "../rules.txt",
-            "exclusions_sources": [
-                "../exclusions.txt",
-                "../../../data/adblock.exclusions.referral",
-                "../../../data/adblock.exclusions.important"
-            ],
-            "transformations": [
-                "Validate"
-            ],
-            "type": "adblock"
-        },
-        {
-            "source": "https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt",
-            "transformations": [
-                "Validate"
-            ],
-            "type": "adblock"
-        },
-        {
-            "source": "../exceptions.txt",
-            "transformations": [
-                "Validate"
-            ],
-            "type": "adblock"
-        }
-    ],
-    "transformations": [
-        "Compress"
-    ]
-}
-ℹ Start compiling /media/nas/git/adguard/multi.adblock
-ℹ Original length is 257455
-ℹ Length after applying transformations is 257455
-ℹ Start compiling /media/nas/git/adguard/fake.adblock
-ℹ Original length is 23682
-ℹ Length after applying transformations is 23682
-ℹ Start compiling https://abp.oisd.nl/
-ℹ Original length is 368342
-ℹ Filtering the list of rules using 1867 exclusion rules
-ℹ Excluded 318 rules. 368024 rules left.
-ℹ Length after applying transformations is 368023
-ℹ Start compiling https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
-ℹ Original length is 41724
-ℹ Filtering the list of rules using 1542 exclusion rules
-ℹ Excluded 59 rules. 41665 rules left.
-ℹ Length after applying transformations is 41665
-ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/rules.txt
-ℹ Original length is 576
-ℹ Filtering the list of rules using 906 exclusion rules
-ℹ Excluded 1 rules. 575 rules left.
-ℹ Length after applying transformations is 569
-ℹ Start compiling ../rules.txt
-ℹ Original length is 2
-ℹ Filtering the list of rules using 906 exclusion rules
-ℹ Excluded 0 rules. 2 rules left.
-ℹ Length after applying transformations is 2
-ℹ Start compiling https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt
-ℹ Original length is 179
-ℹ Length after applying transformations is 179
-ℹ Start compiling ../exceptions.txt
-ℹ Original length is 30
-ℹ Length after applying transformations is 30
-ℹ The list was compressed from 691629 to 491787
-ℹ Final length of the list is 491793
-ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/big/out/big.adblock
-ℹ Finished compiling
-
-# Attach header to big Domainlist ...
-
-# Push big to local Repositories ...
 
 big - Done!
 
+Bereits aktuell.
+[master 31a478f] big auto-update
+ 2 files changed, 58 insertions(+), 238 deletions(-)
+ rewrite pihole/blocklists/build/big/out/big.stats (83%)
+
+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
+
 ===========================================
 Steven Black
 ===========================================
@@ -1209,6 +1121,25 @@ Steven Black
 ℹ Writing output to /media/nas/git/adguard/stevenblack.adblock
 ℹ Finished compiling
 
+Bereits aktuell.
+Auf Branch master
+Ihr Branch ist auf demselben Stand wie 'origin/master'.
+
+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
+
+Bereits aktuell.
+Auf Branch main
+Ihr Branch ist auf demselben Stand wie 'origin/main'.
+
+nichts zu committen, Arbeitsverzeichnis unverändert
+
+
 ===========================================
 D3 Hosts
 ===========================================
@@ -1234,6 +1165,26 @@ D3 Hosts
 ℹ Final length of the list is 257
 ℹ Writing output to /media/nas/git/adguard/d3host.adblock
 ℹ Finished compiling
+
+Bereits aktuell.
+Auf Branch master
+Ihr Branch ist auf demselben Stand wie 'origin/master'.
+
+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
+
+Bereits aktuell.
+Auf Branch main
+Ihr Branch ist auf demselben Stand wie 'origin/main'.
+
+nichts zu committen, Arbeitsverzeichnis unverändert
+
+
 ===========================================
 Experimental ...
 ===========================================
@@ -1253,19 +1204,19 @@ Initialize ...
 # Download and convert Sourcelists ...
 
   Nr |   Count | Format  | Source | Status  | File      | URL/File
-   1 | 1252608 | domains | local  | online  | changed   | big.txt
+   1 | 1252608 | domains | local  | online  | unchanged | big.txt
-   2 |  112186 | domains | local  | online  | changed   | affiliatetracking.txt
+   2 |  112186 | domains | local  | online  | unchanged | affiliatetracking.txt
-   3 |  367687 | domains | local  | online  | changed   | threat-intelligence.txt
+   3 |  367703 | domains | local  | online  | changed   | threat-intelligence.txt
 
 # Build experimental Domainlist ...
 
 Stats experimental:
 
-** Source (raw):    1732481
+** Source (raw):    1732497
-== Source (unique): 1458005 (-274476)
+== Source (unique): 1458021 (-274476)
 
-1458005 unique Domains - Version 2021.1023.192740
+1458021 unique Domains - Version 2021.1023.195241
-MD5 Domains RAW: a841a36b1db7ea670ef25101fb0b3542
+MD5 Domains RAW: cf7e71a365c0fc609ca374e750b9ef9e
 
 # Convert experimental to Hostlist ... 
 
@@ -1331,16 +1282,16 @@ MD5 Domains RAW: a841a36b1db7ea670ef25101fb0b3542
 ℹ Original length is 80836
 ℹ Length after applying transformations is 80836
 ℹ Start compiling /media/nas/git/adguard/threat-intelligence.adblock
-ℹ Original length is 319711
+ℹ Original length is 319726
-ℹ Length after applying transformations is 319711
+ℹ Length after applying transformations is 319726
 ℹ Start compiling ../rules.txt
 ℹ Original length is 1
 ℹ Length after applying transformations is 1
 ℹ Start compiling ../exceptions.txt
 ℹ Original length is 1
 ℹ Length after applying transformations is 1
-ℹ The list was compressed from 891340 to 638939
+ℹ The list was compressed from 891355 to 638954
-ℹ Final length of the list is 638945
+ℹ Final length of the list is 638960
 ℹ Writing output to /media/nas/git/rpi/pihole/blocklists/build/experimental/out/experimental.adblock
 ℹ Finished compiling
 
@@ -1348,3 +1299,19 @@ MD5 Domains RAW: a841a36b1db7ea670ef25101fb0b3542
 
 experimental - Done!
 
+Bereits aktuell.
+[master e7657bb] experimental auto-update
+ 8 files changed, 104 insertions(+), 25 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
+

pihole/blocklists/build/updateWhitelist.sh

@@ -60,11 +60,6 @@ regex='(?=^.{4,253}$)(^(?:[a-zA-Z0-9](?:(?:[a-zA-Z0-9\-]){0,61}[a-zA-Z0-9])?\.)+
 data=/media/nas/git/rpi/pihole/blocklists/data
 tmp=$data/tmp
 
-# notracking
-curl -s -L https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/hostnames.whitelist.txt >$tmp
-generateWhitelist $tmp $data/white.list.notracking
-wc -l $data/white.list.notracking
-
 # Referral
 curl -s -L https://raw.githubusercontent.com/nextdns/metadata/master/privacy/affiliate-tracking-domains >$tmp
 curl -s -L https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/referral-sites.txt >>$tmp