From 27c0b7e4c6b9e3343748cdf21b31b7a931e17cbf Mon Sep 17 00:00:00 2001
From: Zelo72 <zelo72@dismail.de>
Date: Sun, 31 Oct 2021 00:19:24 +0200
Subject: [PATCH] affiliatetracking auto-update

---
 .../out/affiliatetracking.domains             |  49 -----
 ...acking.domains.unblocklist.wildcards.regex |   3 +
 ...tracking.domains.whitelist.wildcards.regex | 200 ++++++++++++++++++
 .../out/affiliatetracking.stats               |  37 +---
 pihole/blocklists/build/sourcefiles.txt       |   5 +
 5 files changed, 211 insertions(+), 83 deletions(-)
 create mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unblocklist.wildcards.regex
 create mode 100644 pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.whitelist.wildcards.regex

diff --git a/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains
index 7619c879..4eda766e 100644
--- a/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains
+++ b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains
@@ -1,52 +1,3 @@
-# --------------------------------------------
-# Zelo*s "Affiliate & Tracking Plus" Blocklist
-# --------------------------------------------
-#
-# Extension list to the multi/big list: 
-#  Blocks additional ads, ad links, tracking, 
-#  metrics and telemetry.
-#
-# Increases privacy.
-#
-# This list does not contain domains that are
-# already on the multi list.
-#
-# An attempt has been made to avoid false 
-# positive domains, but still this list
-# may contain false positive domains.
-# Therefore, an admin should be available
-# to allow falsely blocked domains when
-# you use this list.
-# Please report false positive domains.
-#
-# It is updated daily and is available in
-# the following formats:
-#   domains, hosts and adblock.
-#   See: https://github.com/Zelo72
-#
-# Created for purely personal, private use.
-# Keep the internet clean!
-#
-# --------------------------------------------
-# Support/Report false positive:
-#   GitHub:  https://github.com/Zelo72
-#   Discord: Zelo72#7513
-#   Mail:    zelo72@dismail.de
-# --------------------------------------------
-#
-#   Nr |   Count | Format  | Source | Status  | File      | URL/File
-#    1 |   14013 | hosts   | http   | online  | unchanged | https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt
-#    2 |     244 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/d3ward/toolz/master/src/d3host.txt
-#    3 |    1734 | hosts   | http   | online  | unchanged | https://raw.githubusercontent.com/infinitytec/blocklists/master/ads-and-trackers.txt
-#    4 |    9319 | adblock | http   | online  | unchanged | https://raw.githubusercontent.com/easylist/easylist/master/easyprivacy/easyprivacy_specific_cname.txt
-#    5 |   16106 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/adguardteam/cname-trackers/master/combined_disguised_trackers_justdomains.txt
-#    6 |      22 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/nextdns/cname-cloaking-blocklist/master/domains
-#    7 |     429 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/nextdns/metadata/master/privacy/affiliate-tracking-domains
-#    8 |       5 | domains | http   | online  | unchanged | https://raw.githubusercontent.com/nextdns/metadata/master/security/parked-domains-cname
-#    9 |       2 | domains | local  | online  | unchanged | black.list.affiliatetracking
-#
-# 13679 unique Domains - Version 2021.1030.121818
-#
 01net.eulerian.net
 101230059950694.wt-eu02.net
 106075.genieessp.com
diff --git a/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unblocklist.wildcards.regex b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unblocklist.wildcards.regex
new file mode 100644
index 00000000..b081951c
--- /dev/null
+++ b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.unblocklist.wildcards.regex
@@ -0,0 +1,3 @@
+(\.|^)a2z\.com$
+^avs\-alexa\-.*\-.*\.amazon\.com$
+(\.|^)googlevideo\.com$
diff --git a/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.whitelist.wildcards.regex b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.whitelist.wildcards.regex
new file mode 100644
index 00000000..4d7a9a28
--- /dev/null
+++ b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.domains.whitelist.wildcards.regex
@@ -0,0 +1,200 @@
+(\.|^)00110\.citi\.com$
+(\.|^)1drv\.com$
+(\.|^)a2z\.com$
+^aax\-.*\.amazon\-adsystem\.com$
+^aax\..*\.amazon\.com$
+(\.|^)activity\.windows\.com$
+^admin\-webex\-com\-.*\..*\.elb\.amazonaws\.com$
+(\.|^)aiv\-cdn\.net$
+(\.|^)aiv\-cdn\.net\.c\.footprint\.net$
+(\.|^)aiv\-delivery\.net$
+^akamai\-san.*\.exacttarget\.com\.edgekey\.net$
+(\.|^)amazon\-adsystem\.com$
+(\.|^)amazon\.ae$
+(\.|^)amazonalexa\.com$
+(\.|^)amazon\.com$
+(\.|^)amazon\.com\.br$
+(\.|^)amazon\.com\.mx$
+(\.|^)amazon\.co\.uk$
+(\.|^)amazon\.de$
+(\.|^)amazon\.es$
+(\.|^)amazon\.fr$
+(\.|^)amazon\.in$
+(\.|^)amazon\.it$
+(\.|^)amazon\.nl$
+(\.|^)amazon\.sa$
+(\.|^)amazon\.se$
+(\.|^)amazonsilk\.com$
+(\.|^)amazonvideo\.com$
+^apiproxy\-device\-prod\-nlb\-.*\..*\.amazonaws\.com$
+(\.|^)apptrace\.com$
+(\.|^)atv\-ext\.amazon\.com$
+(\.|^)atv\-ext\-eu\.amazon\.com$
+(\.|^)atv\-ext\-fe\.amazon\.com$
+(\.|^)atv\-ps\.amazon\.com$
+(\.|^)audio4\-.*\-spotify\-com\.akamaized\.net$
+(\.|^)audio\-.*\-spotify\-com\.akamaized\.net$
+^avs\-alexa\-.*\-.*\.amazon\.com$
+(\.|^)braintreegateway\.com$
+(\.|^)bugsnag\.com$
+(\.|^)cdn\.ampproject\.org$
+(\.|^)ciscospark\.com$
+^countess\-prod\-public\-.*\..*\.elb\.amazonaws\.com$
+(\.|^)crashlytics\.com$
+(\.|^)damoh\.n\-tv\.de$
+(\.|^)demdex\.net$
+^device\-metrics\-.*\.amazon\.com$
+(\.|^)discordapp\.com$
+(\.|^)discordapp\.net$
+(\.|^)discord\.com$
+(\.|^)discord\.gg$
+(\.|^)discord\.media$
+(\.|^)discordstatus\.com$
+(\.|^)disneyplus\.com$
+(\.|^)disneyplus\.com\.ssl\.sc\.omtrdc\.net$
+(\.|^)disney\-plus\.net$
+(\.|^)dss\.map\.fastly\.net$
+(\.|^)dssott\.com$
+(\.|^)dssott\.com\.akamaized\.net$
+^dualstack\.apiproxy\-device\-prod\-.*\.elb\..*\.amazonaws\.com$
+^dualstack\.apiproxy\-http1\-.*\..*\.elb\.amazonaws\.com$
+^dualstack\.beaconserver\-ce\-.*\..*\.elb\.amazonaws\.com$
+^dualstack\.ichnaea\-web\-.*\..*\.elb\.amazonaws\.com$
+(\.|^)events\.data\.microsoft\.com$
+(\.|^)ext\-twitch\.tv$
+(\.|^)firebaseio\.com$
+^fls\-.*\.amazon\..*$
+^fls\-.*\.amazon\-adsystem\.com$
+(\.|^)fritz\.box$
+(\.|^)fritz\.nas$
+(\.|^)ghcr\.io$
+(\.|^)githubapp\.com$
+(\.|^)githubassets\.com$
+(\.|^)github\.com$
+(\.|^)github\.map\.fastly\.net$
+(\.|^)githubusercontent\.com$
+(\.|^)googlevideo\.com$
+(\.|^)gtld\-servers\.net$
+(\.|^)gvt1\.com$
+(\.|^)gvt2\.com$
+(\.|^)heads\-.*\-spotify\-com\.akamaized\.net$
+(\.|^)jtvnw\.net$
+^kinesis\..*\.amazonaws\.com$
+(\.|^)lan$
+(\.|^)lencr\.org$
+(\.|^)live\-video\.net$
+(\.|^)local$
+(\.|^)localdomain$
+^mads\-.*\.amazon\.com$
+(\.|^)media\-amazon\.com$
+^mobilesdk\-.*\.kampyle\.com$
+^movable\-ink\-.*\.com$
+(\.|^)msedge\.net$
+^msh\.amazon\..*$
+(\.|^)netflix\.com$
+(\.|^)netflix\.net$
+(\.|^)nflxext\.com$
+(\.|^)nflximg\.com$
+(\.|^)nflximg\.net$
+(\.|^)nflxso\.net$
+(\.|^)nflxvideo\.net$
+(\.|^)nintendo\.com$
+(\.|^)nintendo\.net$
+(\.|^)nintendowifi\.net$
+(\.|^)ntvde\.damoh\.schneevonmorgen\.com$
+^ocsp.*\.apple\.com$
+(\.|^)office\.com$
+(\.|^)onedrive\.com$
+(\.|^)opentelemetry\.io$
+(\.|^)paypal\.ca$
+(\.|^)paypal\.com$
+(\.|^)paypal\.co\.uk$
+(\.|^)paypal\-dynamic\-2\.map\.fastly\.net$
+(\.|^)paypal\.map\.fastly\.net$
+(\.|^)paypalobjects\.com$
+(\.|^)pipe\.aria\.microsoft\.com$
+(\.|^)playstation\.com$
+(\.|^)playstation\.com\.ssl\.d1\.sc\.omtrdc\.net$
+(\.|^)playstation\.net$
+(\.|^)primevideo\.com$
+(\.|^)pscdn\.co$
+(\.|^)pv\-cdn\.net$
+(\.|^)root\-servers\.net$
+^s3\-.*\.amazonaws\.com$
+^s3\..*\.amazonaws\.com$
+(\.|^)scdn\.co$
+^science\-edge\-external\-prod\-.*\..*\.elb\.amazonaws\.com$
+(\.|^)search\-api\-disney\.bamgrid\.com$
+(\.|^)sentry\.io$
+(\.|^)slackb\.com$
+(\.|^)slack\.com$
+(\.|^)sonycoment\.loris\-e\.llnwd\.net$
+(\.|^)sonyentertainmentnetwork\.com$
+(\.|^)sonyjpnpsg\-1\.hs\.llnwd\.net$
+(\.|^)spoti\.fi$
+(\.|^)spotifycdn\.com$
+(\.|^)spotifycdn\.map\.fastly\.net$
+(\.|^)spotifycdn\.net$
+(\.|^)spotifycharts\.com$
+(\.|^)spotifycodes\.com$
+(\.|^)spotify\.com$
+(\.|^)spotify\-com\.akamaized\.net$
+(\.|^)spotify\.com\.edgesuite\.net$
+(\.|^)spotify\.edgekey\.net$
+(\.|^)spotifyjobs\.com$
+(\.|^)spotify\.map\.fastly\.net$
+(\.|^)spotilocal\.com$
+(\.|^)sp\-prod\.net$
+^ssl\..*\.damoh\.n\-tv\.de$
+(\.|^)static\-webarchive\.org$
+(\.|^)s\.team$
+(\.|^)steambroadcast\.akamaized\.net$
+(\.|^)steamcdn\-a\.akamaihd\.net$
+(\.|^)steam\-chat\.com$
+(\.|^)steamchina\.com$
+(\.|^)steamcommunity\-a\.akamaihd\.net$
+(\.|^)steamcommunity\.com$
+(\.|^)steamcontent\.com$
+(\.|^)steamgames\.com$
+(\.|^)steampowered\.com$
+(\.|^)steampowered\.com\.8686c\.com$
+(\.|^)steamstatic\.com$
+(\.|^)steamstatic\.com\.8686c\.com$
+(\.|^)steamstore\-a\.akamaihd\.net$
+(\.|^)steamusercontent\-a\.akamaihd\.net$
+(\.|^)steamusercontent\.com$
+(\.|^)steamuserimages\-a\.akamaihd\.net$
+(\.|^)steamvideo\-a\.akamaihd\.net$
+(\.|^)teams\.microsoft\.com$
+(\.|^)ttvnw\.net$
+(\.|^)twitchcdn\.net$
+(\.|^)twitch\.map\.fastly\.net$
+(\.|^)twitchsvc\.net$
+(\.|^)twitch\.tv$
+(\.|^)valvesoftware\.com$
+(\.|^)video\.a2z\.com$
+(\.|^)video\.google\.com$
+(\.|^)vortex\.data\.microsoft\.com$
+(\.|^)wbx2\.com$
+(\.|^)webex\.com$
+(\.|^)webex\.com\.cn$
+(\.|^)webex\.com\.edgekey\.net$
+(\.|^)webex\.com\.ssl\.sc\.omtrdc\.net$
+(\.|^)wieistmeineip\.de$
+^www\..*\.cloudfront\.net$
+(\.|^)xboxab\.com$
+(\.|^)xboxab\.net$
+(\.|^)xbox\.com$
+(\.|^)xboxlive\.com$
+(\.|^)xboxlive\.com\.akadns\.net$
+(\.|^)xboxlive\.com\.c\.footprint\.net$
+(\.|^)xboxlive\.com\.edgekey\.net$
+(\.|^)xboxservices\.com$
+(\.|^)youtubeeducation\.com$
+(\.|^)youtube\.googleapis\.com$
+(\.|^)youtubei\.googleapis\.com$
+(\.|^)youtube\-ui\.l\.google\.com$
+(\.|^)yt3\.ggpht\.com$
+(\.|^)ytimg\.com$
+(\.|^)zoomgov\.com$
+(\.|^)zoom\.us$
diff --git a/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.stats b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.stats
index a8c1828b..373bbb99 100644
--- a/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.stats
+++ b/pihole/blocklists/build/affiliatetracking/out/affiliatetracking.stats
@@ -61,38 +61,7 @@ Stats affiliatetracking:
 ++ FLD:             13584 (+4)
 ++ WWW:             13679 (+95)
 
-13679 unique Domains - Version 2021.1030.121818
-MD5 Domains RAW: a392a2413e24a00eb75479a3baadef31
-
-# 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 13366
-ℹ Length after applying transformations is 13366
-ℹ The list was compressed from 13369 to 11652
-ℹ Final length of the list is 11658
-ℹ 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 ...
+*****************************************************
+* No changes to the previous repo version detected! *
+*****************************************************
 
diff --git a/pihole/blocklists/build/sourcefiles.txt b/pihole/blocklists/build/sourcefiles.txt
index dabb4c29..05f6357a 100644
--- a/pihole/blocklists/build/sourcefiles.txt
+++ b/pihole/blocklists/build/sourcefiles.txt
@@ -43,6 +43,7 @@
 /media/nas/git/rpi/pihole/blocklists/sources/curben.io_malware-filter_phishing-filter-hosts.txt
 /media/nas/git/rpi/pihole/blocklists/sources/curben.io_malware-filter_pup-filter-hosts.txt
 /media/nas/git/rpi/pihole/blocklists/sources/curben.io_malware-filter_urlhaus-filter-hosts.txt
+/media/nas/git/rpi/pihole/blocklists/sources/d3ward_toolz_src_d3host.txt
 /media/nas/git/rpi/pihole/blocklists/sources/dandelionsprout_adfilt_alternateversionsanti-malwarelist_antimalwarehosts.txt
 /media/nas/git/rpi/pihole/blocklists/sources/davidonzo_threat-intel_lists_latestdomains.pihole.txt
 /media/nas/git/rpi/pihole/blocklists/sources/dbl.oisd.nl_basic_.txt
@@ -77,6 +78,7 @@
 /media/nas/git/rpi/pihole/blocklists/sources/hole.cert.pl_domains_domains_hosts.txt
 /media/nas/git/rpi/pihole/blocklists/sources/hole.cert.pl_domains_domains.txt
 /media/nas/git/rpi/pihole/blocklists/sources/hoshsadiq_adblock-nocoin-list_hosts.txt
+/media/nas/git/rpi/pihole/blocklists/sources/hostfiles.frogeye.fr_firstparty-trackers-hosts.txt
 /media/nas/git/rpi/pihole/blocklists/sources/hpthreatresearch_iocs_cryptbot_domains.txt
 /media/nas/git/rpi/pihole/blocklists/sources/hpthreatresearch_iocs_icedid_domains.txt
 /media/nas/git/rpi/pihole/blocklists/sources/hpthreatresearch_iocs_ta551_domains.txt
@@ -101,6 +103,9 @@
 /media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_phishing.database_phishing-domains-active.txt
 /media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_phishing.database_phishing-domains-new-today.txt
 /media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_the-big-list-of-hacked-malware-web-sites_hosts.txt
+/media/nas/git/rpi/pihole/blocklists/sources/nextdns_cname-cloaking-blocklist_domains.txt
+/media/nas/git/rpi/pihole/blocklists/sources/nextdns_metadata_privacy_affiliate-tracking-domains.txt
+/media/nas/git/rpi/pihole/blocklists/sources/nextdns_metadata_security_parked-domains-cname.txt
 /media/nas/git/rpi/pihole/blocklists/sources/notabug.org_latvian-list_adblock-latvian_master_lists_latvian-list.txt
 /media/nas/git/rpi/pihole/blocklists/sources/notracking_hosts-blocklists_dnscrypt-proxy_dnscrypt-proxy.blacklist.txt
 /media/nas/git/rpi/pihole/blocklists/sources/ookangzheng_blahdns_hosts_blacklist.txt