From ea2cf26753a5aff9e3da66da427b808e57d80a7e Mon Sep 17 00:00:00 2001
From: gently <1243610+gentlyxu@users.noreply.github.com>
Date: Thu, 9 Jan 2020 13:17:34 +0800
Subject: [PATCH] Optimized list

---
 adblock-for-dnsmasq.conf  | 28 ++++++---------------
 anti-ad-easylist.txt      | 51 ++++++++-------------------------------
 anti-ad-surge.txt         | 28 ++++++---------------
 lib/black_domain_list.php | 18 ++++++++++++++
 tools/easylist-extend.php |  5 +++-
 5 files changed, 46 insertions(+), 84 deletions(-)

diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf
index f7ac0fab..2d6b6e2f 100644
--- a/adblock-for-dnsmasq.conf
+++ b/adblock-for-dnsmasq.conf
@@ -1,4 +1,4 @@
-#TIME=20200109035425
+#TIME=20200109051527
 #URL=https://github.com/privacy-protection-tools/anti-AD
 address=/0024aaaa.com/
 address=/0026645142c89aeb1.com/
@@ -1345,10 +1345,7 @@ address=/a1.sumiaowang.com/
 address=/a1.twtym.com/
 address=/a1.vdolady.com/
 address=/a1.yuuedu.com/
-address=/a1.zhanzhang.net/
-address=/a2.zhanzhang.net/
-address=/a3.zhanzhang.net/
-address=/a4.zhanzhang.net/
+address=/zhanzhang.net/
 address=/a.20minutes.fr/
 address=/a22f0d8201ade09fa3.com/
 address=/a258c3523a5c4a47bda.com/
@@ -1445,11 +1442,7 @@ address=/aabku.cn/
 address=/aabmxezph.com/
 address=/aaddcount.com/
 address=/aaddzz.com/
-address=/a.adroll.com/
-address=/c.adroll.com/
-address=/d.adroll.com/
-address=/data.adroll.com/
-address=/s.adroll.com/
+address=/adroll.com/
 address=/a-ads.com/
 address=/aagmbroxruno.com/
 address=/aa.gushiwen.org/
@@ -1508,8 +1501,7 @@ address=/abc.hkepc.com/
 address=/abc.hkepc.net/
 address=/abcj.dooccn.com/
 address=/abc.dooccn.com/
-address=/ab.cnbanbao.com/
-address=/dm.cnbanbao.com/
+address=/cnbanbao.com/
 address=/abcompteur.com/
 address=/abcounter.de/
 address=/abc.pema.cl/
@@ -2517,8 +2509,7 @@ address=/pr.ybp.yahoo.com/
 address=/yap.yahoo.com/
 address=/adstargeting.com/
 address=/adstarget.net/
-address=/adstat.4u.pl/
-address=/stat.4u.pl/
+address=/4u.pl/
 address=/adstatic.com/
 address=/adsterra.com/
 address=/ad-stir.com/
@@ -7187,9 +7178,7 @@ address=/stats.media.onet.pl/
 address=/clkpback3.com/
 address=/clkrev.com/
 address=/clks003-glaze.online/
-address=/clkstat.qihoo.com/
-address=/haostat.qihoo.com/
-address=/s.sh.qihoo.com/
+address=/qihoo.com/
 address=/clmbtech.com/
 address=/clmcom.com/
 address=/clmmw.com/
@@ -10438,10 +10427,7 @@ address=/events.medio.com/
 address=/events.ocdn.eu/
 address=/privy.com/
 address=/events.realgravity.com/
-address=/events.redditmedia.com/
-address=/pixel.redditmedia.com/
-address=/stats.redditmedia.com/
-address=/tracker.redditmedia.com/
+address=/redditmedia.com/
 address=/events.secureserver.net/
 address=/events.tubecup.org/
 address=/events.turbosquid.com/
diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt
index 34009431..4d1c926d 100644
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
@@ -1,4 +1,4 @@
-#TIME=20200109035426
+#TIME=20200109051527
 #URL=https://github.com/privacy-protection-tools/anti-AD
 ||0024aaaa.com^
 ||0026645142c89aeb1.com^
@@ -1345,10 +1345,7 @@
 ||a1.twtym.com^
 ||a1.vdolady.com^
 ||a1.yuuedu.com^
-||a1.zhanzhang.net^
-||a2.zhanzhang.net^
-||a3.zhanzhang.net^
-||a4.zhanzhang.net^
+||zhanzhang.net^
 ||a.20minutes.fr^
 ||a22f0d8201ade09fa3.com^
 ||a258c3523a5c4a47bda.com^
@@ -1445,11 +1442,7 @@
 ||aabmxezph.com^
 ||aaddcount.com^
 ||aaddzz.com^
-||a.adroll.com^
-||c.adroll.com^
-||d.adroll.com^
-||data.adroll.com^
-||s.adroll.com^
+||adroll.com^
 ||a-ads.com^
 ||aagmbroxruno.com^
 ||aa.gushiwen.org^
@@ -1508,8 +1501,7 @@
 ||abc.hkepc.net^
 ||abcj.dooccn.com^
 ||abc.dooccn.com^
-||ab.cnbanbao.com^
-||dm.cnbanbao.com^
+||cnbanbao.com^
 ||abcompteur.com^
 ||abcounter.de^
 ||abc.pema.cl^
@@ -2289,15 +2281,12 @@
 ||adrta.com^
 ||adrunnr.com^
 ||ads01.com^
-||ads1-adnow.com^
-||ads2-adnow.com^
+||ads*-adnow.com^
 ||ads2ads.net^
 ||ads2srv.com^
-||ads3-adnow.com^
 ||ads4cheap.com^
 ||ads-4u.com^
 ||ads4xxx.com^
-||ads5-adnow.com^
 ||ads80.com^
 ||adsafeprotected.com^
 ||adsafety.net^
@@ -2516,8 +2505,7 @@
 ||yap.yahoo.com^
 ||adstargeting.com^
 ||adstarget.net^
-||adstat.4u.pl^
-||stat.4u.pl^
+||4u.pl^
 ||adstatic.com^
 ||adsterra.com^
 ||ad-stir.com^
@@ -2853,18 +2841,7 @@
 ||b.epinv.com^
 ||aepwtbusoofzw.com^
 ||aercxy.com^
-||aeros01.tk^
-||aeros02.tk^
-||aeros03.tk^
-||aeros04.tk^
-||aeros05.tk^
-||aeros06.tk^
-||aeros07.tk^
-||aeros08.tk^
-||aeros09.tk^
-||aeros10.tk^
-||aeros11.tk^
-||aeros12.tk^
+||aeros*.tk^
 ||aestldhxdqlo.com^
 ||izooto.com^
 ||aew9eigieng.info^
@@ -3971,10 +3948,7 @@
 ||analytk.com^
 ||analy.tuniu.cn^
 ||analyze.full-marke.com^
-||analyzer2.fc2.com^
-||analyzer51.fc2.com^
-||analyzer52.fc2.com^
-||analyzer.fc2.com^
+||analyzer*.fc2.com^
 ||ruleclaim.web.fc2.com^
 ||analyzer.qmerce.com^
 ||stats.qmerce.com^
@@ -7130,9 +7104,7 @@
 ||clkpback3.com^
 ||clkrev.com^
 ||clks003-glaze.online^
-||clkstat.qihoo.com^
-||haostat.qihoo.com^
-||s.sh.qihoo.com^
+||qihoo.com^
 ||clmbtech.com^
 ||clmcom.com^
 ||clmmw.com^
@@ -10380,10 +10352,7 @@
 ||events.ocdn.eu^
 ||privy.com^
 ||events.realgravity.com^
-||events.redditmedia.com^
-||pixel.redditmedia.com^
-||stats.redditmedia.com^
-||tracker.redditmedia.com^
+||redditmedia.com^
 ||events.secureserver.net^
 ||events.tubecup.org^
 ||events.turbosquid.com^
diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt
index 78b5ac94..8054a7c9 100644
--- a/anti-ad-surge.txt
+++ b/anti-ad-surge.txt
@@ -1,4 +1,4 @@
-#TIME=20200109035426
+#TIME=20200109051527
 #URL=https://github.com/privacy-protection-tools/anti-AD
 [RULE]
 DOMAIN-SUFFIX,0024aaaa.com,REJECT
@@ -1346,10 +1346,7 @@ DOMAIN-SUFFIX,a1.sumiaowang.com,REJECT
 DOMAIN-SUFFIX,a1.twtym.com,REJECT
 DOMAIN-SUFFIX,a1.vdolady.com,REJECT
 DOMAIN-SUFFIX,a1.yuuedu.com,REJECT
-DOMAIN-SUFFIX,a1.zhanzhang.net,REJECT
-DOMAIN-SUFFIX,a2.zhanzhang.net,REJECT
-DOMAIN-SUFFIX,a3.zhanzhang.net,REJECT
-DOMAIN-SUFFIX,a4.zhanzhang.net,REJECT
+DOMAIN-SUFFIX,zhanzhang.net,REJECT
 DOMAIN-SUFFIX,a.20minutes.fr,REJECT
 DOMAIN-SUFFIX,a22f0d8201ade09fa3.com,REJECT
 DOMAIN-SUFFIX,a258c3523a5c4a47bda.com,REJECT
@@ -1446,11 +1443,7 @@ DOMAIN-SUFFIX,aabku.cn,REJECT
 DOMAIN-SUFFIX,aabmxezph.com,REJECT
 DOMAIN-SUFFIX,aaddcount.com,REJECT
 DOMAIN-SUFFIX,aaddzz.com,REJECT
-DOMAIN-SUFFIX,a.adroll.com,REJECT
-DOMAIN-SUFFIX,c.adroll.com,REJECT
-DOMAIN-SUFFIX,d.adroll.com,REJECT
-DOMAIN-SUFFIX,data.adroll.com,REJECT
-DOMAIN-SUFFIX,s.adroll.com,REJECT
+DOMAIN-SUFFIX,adroll.com,REJECT
 DOMAIN-SUFFIX,a-ads.com,REJECT
 DOMAIN-SUFFIX,aagmbroxruno.com,REJECT
 DOMAIN-SUFFIX,aa.gushiwen.org,REJECT
@@ -1509,8 +1502,7 @@ DOMAIN-SUFFIX,abc.hkepc.com,REJECT
 DOMAIN-SUFFIX,abc.hkepc.net,REJECT
 DOMAIN-SUFFIX,abcj.dooccn.com,REJECT
 DOMAIN-SUFFIX,abc.dooccn.com,REJECT
-DOMAIN-SUFFIX,ab.cnbanbao.com,REJECT
-DOMAIN-SUFFIX,dm.cnbanbao.com,REJECT
+DOMAIN-SUFFIX,cnbanbao.com,REJECT
 DOMAIN-SUFFIX,abcompteur.com,REJECT
 DOMAIN-SUFFIX,abcounter.de,REJECT
 DOMAIN-SUFFIX,abc.pema.cl,REJECT
@@ -2518,8 +2510,7 @@ DOMAIN-SUFFIX,pr.ybp.yahoo.com,REJECT
 DOMAIN-SUFFIX,yap.yahoo.com,REJECT
 DOMAIN-SUFFIX,adstargeting.com,REJECT
 DOMAIN-SUFFIX,adstarget.net,REJECT
-DOMAIN-SUFFIX,adstat.4u.pl,REJECT
-DOMAIN-SUFFIX,stat.4u.pl,REJECT
+DOMAIN-SUFFIX,4u.pl,REJECT
 DOMAIN-SUFFIX,adstatic.com,REJECT
 DOMAIN-SUFFIX,adsterra.com,REJECT
 DOMAIN-SUFFIX,ad-stir.com,REJECT
@@ -7188,9 +7179,7 @@ DOMAIN-SUFFIX,stats.media.onet.pl,REJECT
 DOMAIN-SUFFIX,clkpback3.com,REJECT
 DOMAIN-SUFFIX,clkrev.com,REJECT
 DOMAIN-SUFFIX,clks003-glaze.online,REJECT
-DOMAIN-SUFFIX,clkstat.qihoo.com,REJECT
-DOMAIN-SUFFIX,haostat.qihoo.com,REJECT
-DOMAIN-SUFFIX,s.sh.qihoo.com,REJECT
+DOMAIN-SUFFIX,qihoo.com,REJECT
 DOMAIN-SUFFIX,clmbtech.com,REJECT
 DOMAIN-SUFFIX,clmcom.com,REJECT
 DOMAIN-SUFFIX,clmmw.com,REJECT
@@ -10439,10 +10428,7 @@ DOMAIN-SUFFIX,events.medio.com,REJECT
 DOMAIN-SUFFIX,events.ocdn.eu,REJECT
 DOMAIN-SUFFIX,privy.com,REJECT
 DOMAIN-SUFFIX,events.realgravity.com,REJECT
-DOMAIN-SUFFIX,events.redditmedia.com,REJECT
-DOMAIN-SUFFIX,pixel.redditmedia.com,REJECT
-DOMAIN-SUFFIX,stats.redditmedia.com,REJECT
-DOMAIN-SUFFIX,tracker.redditmedia.com,REJECT
+DOMAIN-SUFFIX,redditmedia.com,REJECT
 DOMAIN-SUFFIX,events.secureserver.net,REJECT
 DOMAIN-SUFFIX,events.tubecup.org,REJECT
 DOMAIN-SUFFIX,events.turbosquid.com,REJECT
diff --git a/lib/black_domain_list.php b/lib/black_domain_list.php
index 232cec7d..4c84062a 100644
--- a/lib/black_domain_list.php
+++ b/lib/black_domain_list.php
@@ -219,6 +219,24 @@ return array(
     'rambler.ru' => array(
         'rambler.ru'
     ),
+    'zhanzhang.net' => array(
+        'zhanzhang.net', //网络推广
+    ),
+    'adroll.com' => array(
+        'adroll.com', //广告商
+    ),
+    'cnbanbao.com' => array(
+        'cnbanbao.com', //网络推广
+    ),
+    '4u.pl' => array(
+        '4u.pl', //访问统计
+    ),
+    'qihoo.com' => array(
+        'qihoo.com', //广告联盟
+    ),
+    'redditmedia.com' => array(
+        'redditmedia.com', //用户追踪
+    ),
 
     'miui.com' => array('hot.browser.intl.miui.com', 'adv.sec.intl.miui.com'),
     'amap.com' => array('logs.amap.com'),
diff --git a/tools/easylist-extend.php b/tools/easylist-extend.php
index 973481e3..42a1a209 100644
--- a/tools/easylist-extend.php
+++ b/tools/easylist-extend.php
@@ -50,6 +50,9 @@ $ARR_MERGED_WILD_LIST = array(
     'appcloud*.zhihu.com' => null,
     'sf*-ttcdn-tos.pstatp.com' => null,
     'ad*.molitv.cn' => null,
+    'ads*-adnow.com' => null,
+    'aeros*.tk' => null,
+    'analyzer*.fc2.com' => null,
 );
 
 if(PHP_SAPI != 'cli'){
@@ -149,5 +152,5 @@ while(!feof($whiterule_fp)){
 fclose($src_fp);
 fclose($new_fp);
 fclose($whiterule_fp);
-var_dump(rename($src_file . '.txt', $src_file));
+rename($src_file . '.txt', $src_file);
 echo 'Time cost:', microtime(true) - START_TIME, "s, at ", date('m-d H:i:s'), "\n";