From f3abddcdbcb72902eaf2477757c099334f714a78 Mon Sep 17 00:00:00 2001 From: gently <1243610+gentlyxu@users.noreply.github.com> Date: Tue, 2 Feb 2021 11:00:16 +0800 Subject: [PATCH] update. fixed #327 , fixed #326 --- adblock-for-dnsmasq.conf | 4 ++-- anti-ad-clash.yaml | 4 ++-- anti-ad-domains.txt | 5 ++--- anti-ad-easylist.txt | 7 ++++--- anti-ad-smartdns.conf | 4 ++-- anti-ad-surge.txt | 4 ++-- anti-ad-surge2.txt | 4 ++-- scripts/lib/white_domain_list.php | 1 + scripts/tools/easylist-extend.php | 1 + 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf index d370a39f..013842f0 100644 --- a/adblock-for-dnsmasq.conf +++ b/adblock-for-dnsmasq.conf @@ -1,5 +1,5 @@ #TITLE=anti-AD -#VER=20210201101502 +#VER=20210202105844 #URL=https://github.com/privacy-protection-tools/anti-AD #TOTAL_LINES=37819 address=/00-gov.cn/ @@ -1069,7 +1069,7 @@ address=/3917.com/ address=/39330.bet/ address=/394b8b41ac5305d.com/ address=/395e27cfc83ea88f.com/ -address=/3975.com/ +address=/data.3975.com/ address=/3975lm.com/ address=/m.3987.com/ address=/39d1d397c97730.com/ diff --git a/anti-ad-clash.yaml b/anti-ad-clash.yaml index 1b0ad492..8307c279 100644 --- a/anti-ad-clash.yaml +++ b/anti-ad-clash.yaml @@ -1,5 +1,5 @@ #TITLE=anti-AD -#VER=20210201101503 +#VER=20210202105844 #URL=https://github.com/privacy-protection-tools/anti-AD #TOTAL_LINES=37819 @@ -1072,7 +1072,7 @@ payload: - '+.39330.bet' - '+.394b8b41ac5305d.com' - '+.395e27cfc83ea88f.com' - - '+.3975.com' + - '+.data.3975.com' - '+.3975lm.com' - '+.m.3987.com' - '+.39d1d397c97730.com' diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt index 1dba710a..eaa35fcd 100644 --- a/anti-ad-domains.txt +++ b/anti-ad-domains.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210201101502 +#VER=20210202105844 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=43134 +#TOTAL_LINES=43133 00-gov.cn kwcdn.000dn.com kwcscdn.000dn.com @@ -1239,7 +1239,6 @@ recommend.union.39.net www.39330.bet 394b8b41ac5305d.com 395e27cfc83ea88f.com -3975.com data.3975.com 3975lm.com m.3987.com diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 35ee8cce..bc00f0ba 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210201101502 +!Version: 20210202105844 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 35935 +!Total lines: 35936 ||*.wap.xsbiquge.com^ ||*serror*.wo.com.cn^ ||201*.myhard.com^ @@ -1156,7 +1156,7 @@ ||recommend.union.39.net^ ||3917.com^ ||39330.bet^ -||3975.com^ +||data.3975.com^ ||3975lm.com^ ||m.3987.com^ ||39d1d397c97730.com^ @@ -35937,3 +35937,4 @@ @@||stat.jseea.cn^ @@||widget.intercom.io^ @@||track.toggl.com^ +@@||www.msftconnecttest.com^ diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf index a2786f98..9b39ce2c 100644 --- a/anti-ad-smartdns.conf +++ b/anti-ad-smartdns.conf @@ -1,5 +1,5 @@ #TITLE=anti-AD for SmartDNS -#VER=20210201101503 +#VER=20210202105844 #URL=https://github.com/privacy-protection-tools/anti-AD #TOTAL_LINES=37819 address /00-gov.cn/# @@ -1069,7 +1069,7 @@ address /3917.com/# address /39330.bet/# address /394b8b41ac5305d.com/# address /395e27cfc83ea88f.com/# -address /3975.com/# +address /data.3975.com/# address /3975lm.com/# address /m.3987.com/# address /39d1d397c97730.com/# diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt index 50aa28ca..426a1357 100644 --- a/anti-ad-surge.txt +++ b/anti-ad-surge.txt @@ -1,5 +1,5 @@ #TITLE=anti-AD -#VER=20210201101502 +#VER=20210202105844 #URL=https://github.com/privacy-protection-tools/anti-AD #TOTAL_LINES=37819 DOMAIN-SUFFIX,00-gov.cn @@ -1069,7 +1069,7 @@ DOMAIN-SUFFIX,3917.com DOMAIN-SUFFIX,39330.bet DOMAIN-SUFFIX,394b8b41ac5305d.com DOMAIN-SUFFIX,395e27cfc83ea88f.com -DOMAIN-SUFFIX,3975.com +DOMAIN-SUFFIX,data.3975.com DOMAIN-SUFFIX,3975lm.com DOMAIN-SUFFIX,m.3987.com DOMAIN-SUFFIX,39d1d397c97730.com diff --git a/anti-ad-surge2.txt b/anti-ad-surge2.txt index b801bbdf..7fda28bd 100644 --- a/anti-ad-surge2.txt +++ b/anti-ad-surge2.txt @@ -1,5 +1,5 @@ #TITLE=anti-AD -#VER=20210201101502 +#VER=20210202105844 #URL=https://github.com/privacy-protection-tools/anti-AD #TOTAL_LINES=37819 @@ -1071,7 +1071,7 @@ .39330.bet .394b8b41ac5305d.com .395e27cfc83ea88f.com -.3975.com +.data.3975.com .3975lm.com .m.3987.com .39d1d397c97730.com diff --git a/scripts/lib/white_domain_list.php b/scripts/lib/white_domain_list.php index 9abba946..3a510660 100644 --- a/scripts/lib/white_domain_list.php +++ b/scripts/lib/white_domain_list.php @@ -203,6 +203,7 @@ return array( 'mix.sina.com.cn' => 0, // #320 'jwpcdn.com' => 0, // #322 'retcode.taobao.com' => 0, // #312 + '3975.com' => 0, // #326 diff --git a/scripts/tools/easylist-extend.php b/scripts/tools/easylist-extend.php index 87aa7c04..d9610873 100644 --- a/scripts/tools/easylist-extend.php +++ b/scripts/tools/easylist-extend.php @@ -194,6 +194,7 @@ $ARR_WHITE_RULE_LIST = array( '@@||stat.jseea.cn^' => 1, // #279 '@@||widget.intercom.io^' => 1, // #280 '@@||track.toggl.com^' => 1, // #307 + '@@||www.msftconnecttest.com^' => 1, // #327 ); //针对上游赦免规则anti-AD不予赦免的规则,即赦免名单的黑名单