沉痛悼念酷安下架adaway，怒更一波！

ZenixYang · May 22, 2017 · e220904 · e220904
1 parent 00bd890
commit e220904
Show file tree

Hide file tree

Showing 13 changed files with 3,422 additions and 3,420 deletions.
diff --git a/ADFQ b/ADFQ
diff --git a/FQ b/FQ
diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
-## hosts/dnsmasq订阅搭配方案推荐：
+## hosts/dnsmasq订阅搭配方案：
 
 ### [两个hosts订阅方案](https://github.com/sy618/hosts/blob/master/md/hosts%E8%AE%A2%E9%98%85%E6%96%B9%E6%A1%88.md)
 
-### [路由器dnsmasq规则](https://github.com/sy618/hosts/tree/master/dnsmasq)
+### [路由器dnsmasq规则（支持汤不热网页视频播放）](https://github.com/sy618/hosts/tree/master/dnsmasq)
 
 
-### 自动更新hosts/dnsmasq
-* [安卓手机自动更新hosts脚本与教程](https://github.com/sy618/hosts/tree/master/%E5%AE%89%E5%8D%93%E8%87%AA%E5%8A%A8%E6%9B%B4%E6%96%B0hosts)
-* [路由器自动更新dnsmasq规则与脚本](https://github.com/sy618/hosts/blob/master/dnsmasq/dnsmasq%E8%AF%B4%E6%98%8E.md)
+## 自动更新hosts/dnsmasq
+* [安卓手机自动更新hosts tasker脚本与教程](https://github.com/sy618/hosts/tree/master/%E5%AE%89%E5%8D%93%E8%87%AA%E5%8A%A8%E6%9B%B4%E6%96%B0hosts)
+* [路由器自动更新dnsmasq脚本与教程](https://github.com/sy618/hosts/blob/master/dnsmasq/dnsmasq%E8%AF%B4%E6%98%8E.md)
 * [PC端自动更新hosts软件uphosts.exe，作者：阿起](https://raw.githubusercontent.com/vokins/yhosts/master/sxq/uphosts.exe)
-
+* [【新】安卓免root使用DNS/hosts/dnsmasq规则软件，作者iTXTech](https://github.com/iTXTech/Daedalus/releases)
 
 ### China AD hosts，by vokins
 * 有广告或误杀问题请集中到以下地址反馈！

diff --git a/dnsmasq/dnsad b/dnsmasq/dnsad
@@ -122,7 +122,6 @@ address=/.irs01.net/0.0.0.0
 address=/.irs09.com/0.0.0.0
 address=/.jesgoo.com/0.0.0.0
 address=/.jiathis.com/0.0.0.0
-address=/.jifen.2345.com/0.0.0.0
 address=/.jiguang.cn/0.0.0.0
 address=/.jimdo.com/0.0.0.0
 address=/.jointreport-switch.com/0.0.0.0
@@ -343,12 +342,31 @@ address=/.viglink.com/0.0.0.0
 address=/.webterren.com/0.0.0.0
 address=/.yengo.com/0.0.0.0
 address=/.zedo.com/0.0.0.0
-#
+#other
 address=/.googleadservices.com/0.0.0.0
 address=/.googletagservices.com/0.0.0.0
 address=/.nxrhs.com/0.0.0.0
 address=/.yunos.com/0.0.0.0
 address=/.mxmrt.com/0.0.0.0
 address=/.fastclick.net/0.0.0.0
 address=/.baidustatic.com/0.0.0.0
-
+address=/.yongkang6.com/0.0.0.0
+address=/.cnzz.kld666.com/0.0.0.0
+address=/.2345.com/0.0.0.0
+address=/.hao123.com/0.0.0.0
+address=/.tongqing2015.com/0.0.0.0
+address=/.0594003.com/0.0.0.0
+address=/.mlt01.com/0.0.0.0
+address=/.yzh360.com/0.0.0.0
+address=/.95558000.com/0.0.0.0
+address=/.appjiagu.com/0.0.0.0
+address=/.3ygww.com/0.0.0.0
+address=/.tanx.com/0.0.0.0
+address=/.zhudiaosz.com/0.0.0.0
+address=/.2345.cn/0.0.0.0
+address=/.minisplat.cn/0.0.0.0
+address=/.ad.cmvideo.cn/0.0.0.0
+address=/.ra.icast.cn/0.0.0.0
+address=/.houyi.baofeng.net/0.0.0.0
+address=/.xlmc.sandai.net/0.0.0.0
+address=/.supfast.net/0.0.0.0
diff --git a/dnsmasq/dnsfq b/dnsmasq/dnsfq
@@ -1,4 +1,4 @@
-## 2017-05-14 20:43:22
+## 2017-05-22 21:46:42
 ## by sy618
 ## https://github.com/sy618/hosts
 # This work is licensed under a CC BY-NC 4.0 International License.
@@ -78,7 +78,7 @@ address=/flipboard.com/34.192.27.249
 address=/fbprod.flipboard.com/52.206.64.125
 address=/flipboard.helpshift.com/54.215.4.184
 
-## Google home
+## Google family
 address=/admob.com/219.76.4.70
 address=/agoogleaday.com/219.76.4.70
 address=/android.com/219.76.4.70
@@ -178,11 +178,13 @@ address=/rec.api.nytimes.com/54.209.158.74
 address=/samizdat.nytimes.com/151.101.77.164
 address=/sso.nytcn.me/54.64.135.49
 address=/static.sxzhchina.com/54.230.213.29
-address=/tagx.nytimes.com/23.23.119.219
+address=/tagx.nytimes.com/50.16.209.123
 address=/vp.nyt.com/23.219.132.99
 
 ## Onedrive
-address=/skyapi.onedrive.live.com/157.55.109.232
+address=/api.onedrive.live.com/2.17.58.51
+address=/api.onedrive.com/204.79.197.213
+address=/skyapi.onedrive.live.com/157.55.109.228
 address=/onedrive.live.com/204.79.197.217
 
 ## Pinterest               
@@ -205,26 +207,17 @@ address=/vimeo.com/23.235.37.217
 #address=/vimeocdn.com/151.101.78.109
 address=/click.email.vimeo.com/198.245.92.39
 
+## voa
+address=/www.voachinese.com/23.66.247.93
+address=/voanews.com/23.66.247.93
+
 ## Wikipedia
 address=/upload.wikimedia.org/198.35.26.112
 address=/wikipedia.org/198.35.26.96
 
 ## Yahoo/flickr/tumblr
 address=/tumblr.com/66.6.33.149
-address=/31.media.tumblr.com/119.161.8.100
-address=/32.media.tumblr.com/54.239.176.79
-address=/33.media.tumblr.com/119.161.8.100
-address=/36.media.tumblr.com/54.239.176.79
-address=/37.media.tumblr.com/119.161.8.100
-address=/38.media.tumblr.com/119.161.8.100
-address=/40.media.tumblr.com/192.229.237.98
-address=/46.media.tumblr.com/192.229.237.98
-address=/65.media.tumblr.com/54.239.176.79
-address=/66.media.tumblr.com/192.229.237.98
-address=/68.media.tumblr.com/119.161.8.100
-address=/92.media.tumblr.com/119.161.8.100
 address=/97.media.tumblr.com/192.229.237.98
-address=/99.media.tumblr.com/209.197.3.20
 address=/api.tumblr.com/119.161.8.100
 address=/android.imap.mail.yahoo.com/27.123.207.149
 address=/android.smtp.mail.yahoo.com/106.10.150.156
@@ -235,23 +228,20 @@ address=/flickr.com/119.161.14.18
 address=/geo.query.yahoo.com/119.160.242.41
 address=/info.yahoo.com/119.161.14.18
 address=/lh.secure.yahoo.com/119.161.14.18
-address=/ls.srvcs.tumblr.com/66.6.32.162
 address=/mg.mail.yahoo.com/119.161.14.18
-address=/media.tumblr.com/54.239.176.79
+address=/media.tumblr.com/119.161.8.100
 address=/mx.tumblr.com/192.229.237.97
 address=/msb-mobile.m.yahoo.com/119.161.14.18
 address=/news.yahoo.com/106.10.199.10
 address=/overview.mail.yahoo.com/216.39.54.12
 address=/policies.yahoo.com/119.161.14.18
-address=/px.srvcs.tumblr.com/66.6.32.162
-address=/saber.srvcs.tumblr.com/66.6.32.162
 address=/secure.flickr.com/68.142.240.50
-address=/secure.static.tumblr.com/52.222.211.243
+address=/srvcs.tumblr.com/66.6.32.162
+address=/static.tumblr.com/119.161.8.100
 address=/static.flickr.com/106.10.137.23
 address=/t.umblr.com/66.6.32.162
 address=/vt.tumblr.com/119.161.8.100
 address=/vtt.tumblr.com/119.161.9.100
-address=/vt.media.tumblr.com/119.161.8.100
 address=/www.tumblr.com/119.161.8.100
 address=/www.yahoo.com/106.10.138.240
 address=/yahoo.co.jp/182.22.24.252

diff --git a/dnsmasq/dnsip b/dnsmasq/dnsip
@@ -1,12 +1,15 @@
-#运营商劫持
-bogus-nxdomain=60.19.29.21
-bogus-nxdomain=60.19.29.24
+
+# hijack
+bogus-nxdomain=120.197.89.239
 bogus-nxdomain=211.139.178.49
 bogus-nxdomain=221.179.46.190
 bogus-nxdomain=221.179.46.193
 bogus-nxdomain=221.179.46.194
+bogus-nxdomain=60.19.29.21
+bogus-nxdomain=60.19.29.24
+
 
-#广告IP
+# AD IP
 bogus-nxdomain=47.89.59.182
 bogus-nxdomain=106.75.65.90
 bogus-nxdomain=114.55.123.44

diff --git a/dnsmasq/dnsmasq说明.md b/dnsmasq/dnsmasq说明.md
@@ -1,26 +1,23 @@
 ## dnsmasq规则文件说明：
+* dnsfq：GFW翻墙专用。这个需要大家共同努力完善。（已支持汤不热网页视频播放）
+* dnsip：屏蔽运营商劫持IP与一些广告IP（如何查看是否被劫持，使用nslookup命令测试一个不存在的域名，若返回IP就是劫持）
 * dnsad：屏蔽广告家族
-* dnsfq：翻墙专用，这个需要大家共同努力完善。
-* dnsip：屏蔽运营商劫持与一些广告IP（如何查看是否被劫持，输入nslookup baiduiiii.com，若返回IP就是劫持，请把那个IP发给我）
-* hosts：默认使用的是vokins的完整AD hosts，删除了与dnsad重复的域名，需要配合dnsad一起使用。
+* hosts：默认使用的是vokins的完整AD hosts，并删除了与dnsad重复的域名，需要配合dnsad一起使用。
 （如PC需看视频的，请自行更换为不带屏蔽视频广告的hosts.txt规则，https://raw.githubusercontent.com/vokins/yhosts/master/hosts.txt）
 
+## sh文件夹 是[【华硕老毛子固件】全自动脚本](https://github.com/sy618/hosts/tree/master/dnsmasq/sh)
+* start.sh：立刻更新规则的脚本
+* setting.sh：初次运行的脚本，全自动修改配置与启用dnsmasq，只需要运行一次。
+* del.sh：删除所有更改，出问题了只需要运行一下即可还原
 
 ## 手动修改教程：
 此方法适用于openwrt类的路由器，来自机友https://www.mylede.cf/?p=125 
-
 使用脚本前请检查dnsmasq.conf的配置。/etc/dnsmasq.conf 看是否有conf-dir 配置参数，默认貌似是没有的。添加conf-dir=/etc/dnsmasq.d.会自动加载目录下的配置文件。
-
 ### 然后执行以下命令即可：
 * wget -q https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq -O /etc/dnsmasq.d/gfw.conf –no-check-certificate ; /etc/init.d/dnsmasq restart
-
 ### 如果想定时执行，请在网页配置端的计划任务添加以下脚本：
 * 01 06 * * * wget -q https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq -O /etc/dnsmasq.d/gfw.conf –no-check-certificate ; /etc/init.d/dnsmasq restart
+
 ```javascript
-* 注：不同路由器固件可能文件位置不一样
+* 注：不同路由器固件可能文件路径位置不一样
 ```
-
-
-## sh文件夹 是[【华硕老毛子固件】全自动脚本](https://github.com/sy618/hosts/tree/master/dnsmasq/sh)
-
-