diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf index ebe68647..b281fe93 100644 --- a/adblock-for-dnsmasq.conf +++ b/adblock-for-dnsmasq.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210519095138 +#VER=20210521182919 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42371 +#TOTAL_LINES=42373 address=/00-gov.cn/ address=/kwcdn.000dn.com/ address=/kwcscdn.000dn.com/ @@ -19922,6 +19922,8 @@ address=/policy.jd.com/ address=/stat.m.jd.com/ address=/u-x.jd.com/ address=/mercury.jd.com/ +address=/blackhole.m.jd.com/ +address=/firevent.jd.com/ address=/pic.jdbbs.com/ address=/rmw.jdburl.com/ address=/dyb.jdcbuy.com/ diff --git a/anti-ad-adguard.txt b/anti-ad-adguard.txt index 47939e3c..fada6aa2 100644 --- a/anti-ad-adguard.txt +++ b/anti-ad-adguard.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210520182456 +!Version: 20210521182919 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 41691 +!Total lines: 41693 @@||ads.taboola.com^ @@||tracker.eu.org^ @@||stats.uptimerobot.com^ @@ -19674,6 +19674,8 @@ ||stat.m.jd.com^ ||u-x.jd.com^ ||mercury.jd.com^ +||blackhole.m.jd.com^ +||firevent.jd.com^ ||pic.jdbbs.com^ ||rmw.jdburl.com^ ||dyb.jdcbuy.com^ diff --git a/anti-ad-adguard.txt.md5 b/anti-ad-adguard.txt.md5 index a129a30c..f0caf74a 100644 --- a/anti-ad-adguard.txt.md5 +++ b/anti-ad-adguard.txt.md5 @@ -1 +1 @@ -8fc2675842ffb4b10631c708d42b1575 \ No newline at end of file +0f1c24325350e3e076ef3ecb38474b86 \ No newline at end of file diff --git a/anti-ad-clash.yaml b/anti-ad-clash.yaml index a0b57b07..5de61de7 100644 --- a/anti-ad-clash.yaml +++ b/anti-ad-clash.yaml @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210519095139 +#VER=20210521182920 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42371 +#TOTAL_LINES=42373 #RULE-SET,AntiAd,REJECT payload: @@ -19925,6 +19925,8 @@ payload: - '+.stat.m.jd.com' - '+.u-x.jd.com' - '+.mercury.jd.com' + - '+.blackhole.m.jd.com' + - '+.firevent.jd.com' - '+.pic.jdbbs.com' - '+.rmw.jdburl.com' - '+.dyb.jdcbuy.com' diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt index f983a657..c255af79 100644 --- a/anti-ad-domains.txt +++ b/anti-ad-domains.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210519095139 +#VER=20210521182920 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=47980 +#TOTAL_LINES=47982 00-gov.cn kwcdn.000dn.com kwcscdn.000dn.com @@ -22863,6 +22863,8 @@ stat.m.jd.com u-x.jd.com u.x.jd.com mercury.jd.com +blackhole.m.jd.com +firevent.jd.com pic.jdbbs.com rmw.jdburl.com dyb.jdcbuy.com diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 944065e9..97988a24 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210519095139 +!Version: 20210521182919 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 39296 +!Total lines: 39298 @@||ads.taboola.com^ @@||tracker.eu.org^ @@||stats.uptimerobot.com^ @@ -18442,6 +18442,8 @@ ||stat.m.jd.com^ ||u-x.jd.com^ ||mercury.jd.com^ +||blackhole.m.jd.com^ +||firevent.jd.com^ ||pic.jdbbs.com^ ||rmw.jdburl.com^ ||dyb.jdcbuy.com^ diff --git a/anti-ad-easylist.txt.md5 b/anti-ad-easylist.txt.md5 index 64124260..55052937 100644 --- a/anti-ad-easylist.txt.md5 +++ b/anti-ad-easylist.txt.md5 @@ -1 +1 @@ -620074cade26acbbb57f2d3e6d693678 \ No newline at end of file +f09b940d81a125812eeb5634f4e3679b \ No newline at end of file diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf index f9a6b2b6..cce5b7f9 100644 --- a/anti-ad-smartdns.conf +++ b/anti-ad-smartdns.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD for SmartDNS -#VER=20210519095139 +#VER=20210521182920 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42371 +#TOTAL_LINES=42373 address /00-gov.cn/# address /kwcdn.000dn.com/# address /kwcscdn.000dn.com/# @@ -19922,6 +19922,8 @@ address /policy.jd.com/# address /stat.m.jd.com/# address /u-x.jd.com/# address /mercury.jd.com/# +address /blackhole.m.jd.com/# +address /firevent.jd.com/# address /pic.jdbbs.com/# address /rmw.jdburl.com/# address /dyb.jdcbuy.com/# diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt index 29d7ce46..63b56364 100644 --- a/anti-ad-surge.txt +++ b/anti-ad-surge.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210519095139 +#VER=20210521182919 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42371 +#TOTAL_LINES=42373 DOMAIN-SUFFIX,00-gov.cn DOMAIN-SUFFIX,kwcdn.000dn.com DOMAIN-SUFFIX,kwcscdn.000dn.com @@ -19922,6 +19922,8 @@ DOMAIN-SUFFIX,policy.jd.com DOMAIN-SUFFIX,stat.m.jd.com DOMAIN-SUFFIX,u-x.jd.com DOMAIN-SUFFIX,mercury.jd.com +DOMAIN-SUFFIX,blackhole.m.jd.com +DOMAIN-SUFFIX,firevent.jd.com DOMAIN-SUFFIX,pic.jdbbs.com DOMAIN-SUFFIX,rmw.jdburl.com DOMAIN-SUFFIX,dyb.jdcbuy.com diff --git a/anti-ad-surge2.txt b/anti-ad-surge2.txt index f49d8851..c37072ad 100644 --- a/anti-ad-surge2.txt +++ b/anti-ad-surge2.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210519095139 +#VER=20210521182920 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42371 +#TOTAL_LINES=42373 #DOMAIN-SET,https://anti-ad.net/surge2.txt,REJECT .00-gov.cn @@ -19924,6 +19924,8 @@ .stat.m.jd.com .u-x.jd.com .mercury.jd.com +.blackhole.m.jd.com +.firevent.jd.com .pic.jdbbs.com .rmw.jdburl.com .dyb.jdcbuy.com diff --git a/scripts/lib/black_domain_list.php b/scripts/lib/black_domain_list.php index 98810216..28f6c5ac 100644 --- a/scripts/lib/black_domain_list.php +++ b/scripts/lib/black_domain_list.php @@ -262,6 +262,8 @@ return array( 'jd.com' => array( 'mercury.jd.com', //大数据收集,用户行为埋点上报 'wl.jd.com', + 'blackhole.m.jd.com', // #428 + 'firevent.jd.com', // #428 ), 'ixigua.com' => array( 'v3-ad.ixigua.com', //移动广告 diff --git a/scripts/make-all-list.sh b/scripts/make-all-list.sh new file mode 100755 index 00000000..96a77d01 --- /dev/null +++ b/scripts/make-all-list.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +source /etc/profile + +cd $(cd "$(dirname "$0")";pwd) + +php make-addr.php +echo +cp ../anti-ad-easylist.txt ../anti-ad-adguard.txt +php ./tools/adguard-extend.php ../anti-ad-adguard.txt +echo +php ./tools/easylist-extend.php ../anti-ad-easylist.txt