Merge pull request #9 from aguegu/master

refine hosts sections
huhamhire · Feb 5, 2013 · e402785 · e402785
2 parents d17f6f5 + 9425f69
commit e402785
Show file tree

Hide file tree

Showing 25 changed files with 94 additions and 59 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,8 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+downloads/raw/ipv4_win_ansi/hosts text eol=crlf
+downloads/raw/ipv6_win_ansi/hosts text eol=crlf
+
+
+hosts text eol=lf
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+downloads/tmp
+*.tmp
diff --git a/fetch-hosts.sh b/fetch-hosts.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+newhost=/tmp/hosts.$$
+
+echo "1. Download ipv6 host for unix:"
+wget https://raw.github.com/aguegu/huhamhire-hosts/master/downloads/zip/ipv6_unix_utf8.zip -O $newhost.zip
+
+echo "2. Extract & Implant hostname:"
+if [ $? -eq 0 ]
+then
+	unzip $newhost.zip
+	mv hosts $newhost
+	sed -i $newhost -e "s/#Replace Your Device Name Here!/$(hostname)/g"
+	echo "Done. hostname: " $(hostname)
+else
+	echo "Download failed."
+	rm -r $newhost
+	rm -r $newhost.zip
+	exit 1
+fi
+
+echo "3. Copy new hosts to /etc/hosts:"
+if [ $(whoami) = "root" ]
+then
+	cp $newhost /etc/hosts
+	rm $newhost
+else
+	echo "Update Failed. script needs to be processed by root"
+	exit 2
+fi
+
+echo "Host updates successfully."
+exit 0
diff --git a/modules/adblock_mods/hostsx.hosts b/modules/adblock_mods/hostsx.hosts
@@ -11122,3 +11122,4 @@
 127.0.0.1 pic.tameili.net
 
 ######## HostsX END ########
+
diff --git a/modules/adblock_mods/mvps.hosts b/modules/adblock_mods/mvps.hosts
@@ -16094,4 +16094,5 @@
 127.0.0.1  www.stickylogic.com
 127.0.0.1  www.winadiscount.com #[Dr.Web.Adware.Xbarre]
 127.0.0.1  www.winaproduct.com
-# [end of entries generated by WinHelp2002]
+# [end of entries generated by WinHelp2002]
+
diff --git a/modules/adblock_mods/mwsl.hosts b/modules/adblock_mods/mwsl.hosts
@@ -1,12 +1,12 @@
-***************************************
-恶意网站实验室(MWSL)
-恶意网站HOSTS屏蔽文件-2012.9.17
----------------------------------------
-注意：115.47.219.95为MWSL的拦截警示页面
-警告：不得将此数据用于违法犯罪行为！
----------------------------------------
-All Rights Reserved 2007-2012
-***************************************
+# ***************************************
+# 恶意网站实验室(MWSL)
+# 恶意网站HOSTS屏蔽文件-2012.9.17
+# ---------------------------------------
+# 注意：115.47.219.95为MWSL的拦截警示页面
+# 警告：不得将此数据用于违法犯罪行为！
+# ---------------------------------------
+# All Rights Reserved 2007-2012
+# ***************************************
 115.47.219.95 c.bbslc.com
 115.47.219.95 www.baiduduyou5.cn
 115.47.219.95 baiduduyou5.cn
@@ -16512,4 +16512,5 @@ All Rights Reserved 2007-2012
 115.47.219.95 www.7daygwj.com
 115.47.219.95 www.bettercopartner.com
 115.47.219.95 dgal.cdwzt.com
-115.47.219.95 www.yihuajixie.com
+115.47.219.95 www.yihuajixie.com
+
diff --git a/modules/adblock_mods/yoyo.hosts b/modules/adblock_mods/yoyo.hosts
@@ -2351,38 +2351,9 @@
 127.0.0.1 searchportal.information.com
 127.0.0.1 searchramp.com
 127.0.0.1 secure.webconnect.net
-
-
-
-
-
-
-
-
 127.0.0.1 servedbyopenx.com
-
 127.0.0.1 service1.adten.de
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 127.0.0.1 shorttail.net
-
-
-
-
 127.0.0.1 sitebrand.geeks.com
 127.0.0.1 sitemerkezi.net
 127.0.0.1 sitemeter.com
@@ -2769,4 +2740,5 @@
 127.0.0.1 zeus.developershed.com
 127.0.0.1 zeusclicks.com
 127.0.0.1 zintext.com
-127.0.0.1 zmedia.com
+127.0.0.1 zmedia.com
+
diff --git a/modules/combine.py b/modules/combine.py
@@ -148,4 +148,4 @@ def delTmpDir(self):
 if __name__ == '__main__':
     ops = combineHosts('./')
     ops.run()
-    print('Done!')
+    print('Done!')
diff --git a/modules/info.hosts b/modules/info.hosts
@@ -33,4 +33,5 @@
 #	::1             localhost
 #
 # Special thanks to: smarthosts, hostsx, ipv6-hosts, mwsl, yoyo, 
-#                    mvps, ATGFW and hpHosts
+#                    mvps, ATGFW and hpHosts
+
diff --git a/modules/ipv4_mods/facebook.hosts b/modules/ipv4_mods/facebook.hosts
@@ -57,4 +57,5 @@
 69.171.246.17 channel-staging-ecmp-05-ash3.facebook.com
 69.171.246.18 channel-testing-ecmp-05-ash3.facebook.com
 
-# endregion
+# endregion
+
diff --git a/modules/ipv4_mods/google.hosts b/modules/ipv4_mods/google.hosts
@@ -508,4 +508,5 @@
 
 74.125.128.141 www.panoramio.com
 
-# endregion
+# endregion
+
diff --git a/modules/ipv4_mods/other.hosts b/modules/ipv4_mods/other.hosts
@@ -194,4 +194,5 @@
 
 ######## IPv4 HOSTS END ########
 
-# endregion
+# endregion
+
diff --git a/modules/ipv4_mods/twitter.hosts b/modules/ipv4_mods/twitter.hosts
@@ -29,4 +29,5 @@
 199.59.149.213 upload.twitter.com 
 199.59.149.210 t.co
 
-# endregion
+# endregion
+
diff --git a/modules/ipv4_mods/wikipedia.hosts b/modules/ipv4_mods/wikipedia.hosts
@@ -50,4 +50,5 @@
 208.80.152.201 mediawiki.org
 208.80.152.201 www.mediawiki.org
 
-# endregion
+# endregion
+
diff --git a/modules/ipv4_mods/youtube.hosts b/modules/ipv4_mods/youtube.hosts
@@ -622,4 +622,5 @@
 173.194.38.166 v23.lscache8.c.youtube.com
 173.194.38.166 v24.lscache8.c.youtube.com
 
-# endregion
+# endregion
+
diff --git a/modules/ipv6_mods/facebook.hosts b/modules/ipv6_mods/facebook.hosts
@@ -162,4 +162,5 @@
 69.171.246.17 channel-staging-ecmp-05-ash3.facebook.com
 69.171.246.18 channel-testing-ecmp-05-ash3.facebook.com
 
-# endregion
+# endregion
+
diff --git a/modules/ipv6_mods/google.hosts b/modules/ipv6_mods/google.hosts
@@ -3519,4 +3519,5 @@
 #Google Plus
 2001:778:0:ffff:64:0:1faa:a606 plus.url.google.com.hk #非官方，有错误请汇报
 
-# endregion
+# endregion
+
diff --git a/modules/ipv6_mods/other.hosts b/modules/ipv6_mods/other.hosts
@@ -401,4 +401,5 @@
 
 ######## IPv6 HOSTS END ########
 
-# endregion
+# endregion
+
diff --git a/modules/ipv6_mods/twitter.hosts b/modules/ipv6_mods/twitter.hosts
@@ -59,4 +59,5 @@
 2001:778:0:ffff:64:0:5f64:4f90 si5.twimg.com #e3826.g.akamaiedge.net
 2001:778:0:ffff:64:0:b8a9:4f21 widgets.twimg.com #orig-10012.twitter.cotcdn.net
 
-# endregion
+# endregion
+
diff --git a/modules/ipv6_mods/wikipedia.hosts b/modules/ipv6_mods/wikipedia.hosts
@@ -844,4 +844,5 @@
 2001:778:0:ffff:64:0:4a78:bc7d uncyclopedia.wikia.com
 2001:778:0:ffff:64:0:4a78:bc7d cn.uncyclopedia.wikia.com
 
-# endregion
+# endregion
+
diff --git a/modules/ipv6_mods/youtube.hosts b/modules/ipv6_mods/youtube.hosts
@@ -1054,4 +1054,5 @@
 2404:6800:4005::19 r20.maa03s08.c.youtube.com
 2404:6800:4005:1::19 r20.maa03s09.c.youtube.com
 
-# endregion
+# endregion
+
diff --git a/modules/localhost.hosts b/modules/localhost.hosts
@@ -18,4 +18,5 @@ ff02::3 ip6-allhosts
 fe80::1 lo0	localhost
 255.255.255.255	broadcasthost
 
-######## Localhost END ########
+######## Localhost END ########
+
diff --git a/modules/share_mods/activation.hosts b/modules/share_mods/activation.hosts
@@ -27,4 +27,5 @@
 127.0.0.1 parallels.com
 127.0.0.1 update.parallels.com
 
-# endregion
+# endregion
+
diff --git a/modules/share_mods/apple.hosts b/modules/share_mods/apple.hosts
@@ -2025,4 +2025,5 @@
 63.141.192.105 a1999.phobos.apple.com
 63.141.192.105 a2000.phobos.apple.com
 
-# endregion
+# endregion
+
diff --git a/modules/timestamp.hosts b/modules/timestamp.hosts
@@ -1,4 +1,5 @@
 #
 # HostsVer Timestamp : 1359561600
 # Creation Timestamp : 1359561600
-#
+#
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11122,3 +11122,4 @@
		127.0.0.1 pic.tameili.net

		######## HostsX END ########
Original file line number	Diff line number	Diff line change
Expand Up		@@ -508,4 +508,5 @@

		74.125.128.141 www.panoramio.com

		# endregion
		# endregion
Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,4 +194,5 @@

		######## IPv4 HOSTS END ########

		# endregion
		# endregion
Original file line number	Diff line number	Diff line change
Expand Up		@@ -401,4 +401,5 @@

		######## IPv6 HOSTS END ########

		# endregion
		# endregion