From f205d51b10dfd56aa8019180af4258b0a5e22e73 Mon Sep 17 00:00:00 2001 From: gently <1243610+gentlyxu@users.noreply.github.com> Date: Sun, 25 Apr 2021 00:27:27 +0800 Subject: [PATCH] update. block other tracking from https://github.com/bigdargon/hostsVN/blob/master/source/hosts.txt --- adblock-for-dnsmasq.conf | 5 +++-- anti-ad-clash.yaml | 5 +++-- anti-ad-domains.txt | 5 +++-- anti-ad-easylist.txt | 15 ++++----------- anti-ad-easylist.txt.md5 | 2 +- anti-ad-smartdns.conf | 5 +++-- anti-ad-surge.txt | 5 +++-- anti-ad-surge2.txt | 5 +++-- scripts/lib/black_domain_list.php | 2 +- scripts/tools/easylist-extend.php | 2 +- 10 files changed, 25 insertions(+), 26 deletions(-) diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf index 6181e7bb..778e4f77 100644 --- a/adblock-for-dnsmasq.conf +++ b/adblock-for-dnsmasq.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210424180744 +#VER=20210425002630 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=43443 +#TOTAL_LINES=43444 address=/00-gov.cn/ address=/kwcdn.000dn.com/ address=/kwcscdn.000dn.com/ @@ -4516,6 +4516,7 @@ address=/analytics.amakings.com/ address=/amao.mobi/ address=/logs.amap.com/ address=/optimus-ads.amap.com/ +address=/dualstack-logs.amap.com/ address=/amarceusan.com/ address=/amarfa.ir/ address=/cpm.amateurcommunity.de/ diff --git a/anti-ad-clash.yaml b/anti-ad-clash.yaml index 9fc1b48a..addadcf6 100644 --- a/anti-ad-clash.yaml +++ b/anti-ad-clash.yaml @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210424180745 +#VER=20210425002630 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=43443 +#TOTAL_LINES=43444 #RULE-SET,AntiAd,REJECT payload: @@ -4519,6 +4519,7 @@ payload: - '+.amao.mobi' - '+.logs.amap.com' - '+.optimus-ads.amap.com' + - '+.dualstack-logs.amap.com' - '+.amarceusan.com' - '+.amarfa.ir' - '+.cpm.amateurcommunity.de' diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt index ec56f1d0..d16f35d4 100644 --- a/anti-ad-domains.txt +++ b/anti-ad-domains.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210424180745 +#VER=20210425002630 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=48644 +#TOTAL_LINES=48645 00-gov.cn kwcdn.000dn.com kwcscdn.000dn.com @@ -5355,6 +5355,7 @@ analytics.amakings.com amao.mobi logs.amap.com optimus-ads.amap.com +dualstack-logs.amap.com amarceusan.com amarfa.ir cpm.amateurcommunity.de diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 01b60cb8..3cf16ee4 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210424181942 +!Version: 20210425002630 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 41547 +!Total lines: 41540 ||*.wap.xsbiquge.com^ ||*serror*.wo.com.cn^ ||201*.myhard.com^ @@ -417,7 +417,7 @@ ||1221dhb.xyz^ ||12291.com^ ||123-counter.de^ -/^(\S+\.)?ad([\d]+|m|s)?\./ +/^(\S+\.)?ad(s?[\d]+|m|s)?\./ ||12306media.com^ ||12322app.com^ ||fzz.cloud.1234507.com^ @@ -3229,14 +3229,10 @@ ||ads-for-free.com^ ||ads-pixiv.net^ ||ads-twitter.com^ -||ads01.com^ ||ads2ads.net^ ||ads2srv.com^ -||ads360.cn^ ||ads4cheap.com^ ||ads4xxx.com^ -||ads8.com^ -||ads80.com^ ||adsafeprotected.com^ ||adsafety.net^ ||adsagony.com^ @@ -4343,6 +4339,7 @@ ||amao.mobi^ ||logs.amap.com^ ||optimus-ads.amap.com^ +||dualstack-logs.amap.com^ ||amarceusan.com^ ||amarfa.ir^ ||cpm.amateurcommunity.de^ @@ -21629,7 +21626,6 @@ ||go.lfde.com^ ||lfdydk.com^ ||lfendascra.club^ -||ads1.lfengmobile.com^ ||lfg5jnbi.com^ ||lfhgumhsrjjgrt.com^ ||kim.lfhnkp.com^ @@ -24337,8 +24333,6 @@ ||rad.msn.com^ ||rel.msn.com^ ||srtb.msn.com^ -||ads1.msn.com^ -||ads2.msn.com^ ||ac3.msn.com^ ||adsyndication.msn.com^ ||c.msn.com^ @@ -26437,7 +26431,6 @@ ||smetrics.opensource.com^ ||go.openspacetrust.org^ ||openstat.net^ -||ads2.opensubtitles.org^ ||contents.opensurvey.co.kr^ ||o.opentable.com^ ||resources.opentext.com^ diff --git a/anti-ad-easylist.txt.md5 b/anti-ad-easylist.txt.md5 index 973c56f2..e52baa1e 100644 --- a/anti-ad-easylist.txt.md5 +++ b/anti-ad-easylist.txt.md5 @@ -1 +1 @@ -c4ef62048148b4d1485775fac1c4ca89 \ No newline at end of file +1740ce63cb8f00910d2e69f685ca304d \ No newline at end of file diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf index a4fecd62..28aa974d 100644 --- a/anti-ad-smartdns.conf +++ b/anti-ad-smartdns.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD for SmartDNS -#VER=20210424180745 +#VER=20210425002630 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=43443 +#TOTAL_LINES=43444 address /00-gov.cn/# address /kwcdn.000dn.com/# address /kwcscdn.000dn.com/# @@ -4516,6 +4516,7 @@ address /analytics.amakings.com/# address /amao.mobi/# address /logs.amap.com/# address /optimus-ads.amap.com/# +address /dualstack-logs.amap.com/# address /amarceusan.com/# address /amarfa.ir/# address /cpm.amateurcommunity.de/# diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt index 88015229..272ceb39 100644 --- a/anti-ad-surge.txt +++ b/anti-ad-surge.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210424180744 +#VER=20210425002630 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=43443 +#TOTAL_LINES=43444 DOMAIN-SUFFIX,00-gov.cn DOMAIN-SUFFIX,kwcdn.000dn.com DOMAIN-SUFFIX,kwcscdn.000dn.com @@ -4516,6 +4516,7 @@ DOMAIN-SUFFIX,analytics.amakings.com DOMAIN-SUFFIX,amao.mobi DOMAIN-SUFFIX,logs.amap.com DOMAIN-SUFFIX,optimus-ads.amap.com +DOMAIN-SUFFIX,dualstack-logs.amap.com DOMAIN-SUFFIX,amarceusan.com DOMAIN-SUFFIX,amarfa.ir DOMAIN-SUFFIX,cpm.amateurcommunity.de diff --git a/anti-ad-surge2.txt b/anti-ad-surge2.txt index 2a6ba029..a6e4da5b 100644 --- a/anti-ad-surge2.txt +++ b/anti-ad-surge2.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210424180744 +#VER=20210425002630 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=43443 +#TOTAL_LINES=43444 #DOMAIN-SET,https://anti-ad.net/surge2.txt,REJECT .00-gov.cn @@ -4518,6 +4518,7 @@ .amao.mobi .logs.amap.com .optimus-ads.amap.com +.dualstack-logs.amap.com .amarceusan.com .amarfa.ir .cpm.amateurcommunity.de diff --git a/scripts/lib/black_domain_list.php b/scripts/lib/black_domain_list.php index a03ca257..38c62aa7 100644 --- a/scripts/lib/black_domain_list.php +++ b/scripts/lib/black_domain_list.php @@ -273,7 +273,7 @@ return array( 'kingsoft-office-service.com' => array( 'abroad-ad.kingsoft-office-service.com', ), - 'amap.com' => array('logs.amap.com'), + 'amap.com' => array('logs.amap.com','dualstack-logs.amap.com'), 'tt114.net' => array('tt114.net'), //例如http://www.tt114.net/html/tlink.html 'taobao.com' => array( 'ip.taobao.com', diff --git a/scripts/tools/easylist-extend.php b/scripts/tools/easylist-extend.php index 9dca254d..83c415b3 100644 --- a/scripts/tools/easylist-extend.php +++ b/scripts/tools/easylist-extend.php @@ -126,7 +126,7 @@ $ARR_MERGED_WILD_LIST = array( $ARR_REGEX_LIST = array( '/9377[a-z]{2}\.com$/' => null, - '/^(\S+\.)?ad([\d]+|m|s)?\./' => null, + '/^(\S+\.)?ad(s?[\d]+|m|s)?\./' => null, '/^(\S+\.)?affiliat(es|ion|e)\./' => null, '/afgr[\d]{1,2}\.com$/' => null, '/^(\S+\.)?analytics(\-|\.)/' => null,