Merge branch 'master' of https://github.com/l1m5/hosts into l1m5-master

# By Ben Limmer
# Via Ben Limmer
* 'master' of https://github.com/l1m5/hosts:
  Source update.
  Added query to user for moving the hosts file into place.
  Source update.
  Correcting syntax error with elif.
  Added back instructions for Windows users on where to move their hosts file to. Resolves #5. I'm opening a new issue for adding this for Windows.
  Added support for automatically moving the hosts file into place and flushing the DNS Cache for Mac and Linux. This addresses part of Issue #5, but I still need to do Windows.
  Updated sources.
  Write out how many unique entries were generated in the readme.md file. Resolves #3.
  Print out copy locations on success. Now it's easy to copy/paste where the host file needs to go.
  Updating sources
  Source update.
  Update sources.
  Updated from sources.
  Updated sources.
  Updated hosts files.
  Update sources.
  Updated sources and hosts file.
  Source update.

Conflicts:
	data/malwaredomainlist.com/hosts
	data/mvps.org/hosts
	data/someonewhocares.org/hosts
	hosts
	readme.md
This commit is contained in:
Steven Black 2013-07-30 21:32:38 -04:00
commit d815858cda
7 changed files with 1275 additions and 256 deletions

View File

@ -1,6 +1,10 @@
# MalwareDomainList.com Hosts List #
# http://www.malwaredomainlist.com/hostslist/hosts.txt #
<<<<<<< HEAD
# Last updated: Wed, 05 Jun 13 20:18:18 +0000 #
=======
# Last updated: Tue, 30 Jul 13 13:35:13 +0000 #
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
127.0.0.1 localhost
@ -8,12 +12,14 @@
127.0.0.1 1.michaelwilsonmusic.com
127.0.0.1 11.lamarianella.info
127.0.0.1 125search.com
127.0.0.1 1364ih5d6.ni.net.tr
127.0.0.1 1k.pl
127.0.0.1 1wstdfgh.organiccrap.com
127.0.0.1 2.refiinc.com
127.0.0.1 2.wholesalepbm.com
127.0.0.1 2.zerocostfha.com
127.0.0.1 200mail.com
127.0.0.1 28ytls60.ni.net.tr
127.0.0.1 2wnpf.tld.cc
127.0.0.1 3.bluepointmortgage.com
127.0.0.1 3.coolerpillow.com
@ -160,6 +166,7 @@
127.0.0.1 bbc-world-news.co.uk
127.0.0.1 bbcnews-money.net
127.0.0.1 bbdignite.com
127.0.0.1 bbe.rauzqivu.ru
127.0.0.1 bbs.6858dz.com
127.0.0.1 bbs.bjchun.com
127.0.0.1 bcozindia.com
@ -252,6 +259,7 @@
127.0.0.1 claudia.reinaldo.sites.uol.com.br
127.0.0.1 claudiomaia1969.sites.uol.com.br
127.0.0.1 cleanwaters.sites.uol.com.br
127.0.0.1 client.parallelgeo.com
127.0.0.1 cmbpupin.sites.uol.com.br
127.0.0.1 cntajomar.es
127.0.0.1 com41miss.rr.nu
@ -265,6 +273,10 @@
127.0.0.1 complainpaywall.net
127.0.0.1 conds.ru
127.0.0.1 config.shopperreports.com
<<<<<<< HEAD
=======
127.0.0.1 conqueronline-co.91.com.tqpoint.com
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
127.0.0.1 cookingwithmarijuana.com
127.0.0.1 costcopainlessly.org
127.0.0.1 count.fuckunion.com
@ -288,6 +300,7 @@
127.0.0.1 cznshuya.ivnet.ru
127.0.0.1 dadajozo.sk
127.0.0.1 dadrbacau.ro
127.0.0.1 dajizzum.com
127.0.0.1 damagalko.ru
127.0.0.1 data.sfvolleyball.net
127.0.0.1 davebarry.net
@ -299,6 +312,8 @@
127.0.0.1 deanwallaceplumbing.com.au
127.0.0.1 delavilla.com.ar
127.0.0.1 deletespyware-adware.com
127.0.0.1 deltaboatraces.net
127.0.0.1 deltariverhouse.net
127.0.0.1 demoralization.ru
127.0.0.1 dentalsg.sites.uol.com.br
127.0.0.1 dentbeen.eu
@ -320,6 +335,7 @@
127.0.0.1 djstripe.com
127.0.0.1 dl-library.com
127.0.0.1 dl.heima8.com
127.0.0.1 dl01.faddmr.com
127.0.0.1 dlkqwpjnpj.times.lv
127.0.0.1 dls.nicdls.com
127.0.0.1 dmssmgf.ru
@ -386,10 +402,15 @@
127.0.0.1 expojordan.com.jo
127.0.0.1 expotech-bg.com
127.0.0.1 exsexytop.tk
127.0.0.1 exycepise.pl
127.0.0.1 eyon-neos.eu
127.0.0.1 f-kotek.com
127.0.0.1 facebook.churchblend.com
127.0.0.1 famagatra.ru
<<<<<<< HEAD
=======
127.0.0.1 fanning.homilybbk.in
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
127.0.0.1 faq-candrive.tk
127.0.0.1 farishtech.com
127.0.0.1 fars-rizan.com
@ -413,6 +434,7 @@
127.0.0.1 fontesbueno.sites.uol.com.br
127.0.0.1 foolpython.biz
127.0.0.1 fopc.org.ar
127.0.0.1 forms.rennie.com
127.0.0.1 forrest-lake.info
127.0.0.1 forskarskolan.se
127.0.0.1 forumkianko.ru
@ -473,6 +495,7 @@
127.0.0.1 growingmarijuanaindoors.com
127.0.0.1 growingmarijuanaoutdoors.com
127.0.0.1 gucosilva.sites.uol.com.br
127.0.0.1 guyscards.com
127.0.0.1 hanulsms.com
127.0.0.1 haoma.qq.com
127.0.0.1 hardcorepornparty.com
@ -515,6 +538,7 @@
127.0.0.1 iad4151.co.kr
127.0.0.1 iamagameaddict.com
127.0.0.1 icanquit.co.uk
127.0.0.1 ictsolutions.net.au
127.0.0.1 ieftin-rahat.com
127.0.0.1 ifikangloo.ru
127.0.0.1 ighjaooru.ru
@ -616,6 +640,7 @@
127.0.0.1 lan2wave.com
127.0.0.1 laservice.sites.uol.com.br
127.0.0.1 laurianoalmeida.sites.uol.com.br
127.0.0.1 lcbcad.co.uk
127.0.0.1 lcstudies.ru
127.0.0.1 legalizationofmarijuana.com
127.0.0.1 leonardolnx.webs.com
@ -654,6 +679,8 @@
127.0.0.1 madaboutleisure.wsini.com
127.0.0.1 madereiraxopoto.sites.uol.com.br
127.0.0.1 mahabad-samaschools.ir
127.0.0.1 mailboto.com
127.0.0.1 malest.com
127.0.0.1 manoellucas1975.sites.uol.com.br
127.0.0.1 maplehey.com
127.0.0.1 marco-cerqueira.sites.uol.com.br
@ -672,6 +699,7 @@
127.0.0.1 markbunn.com.au
127.0.0.1 martanbg.com
127.0.0.1 marx-brothers.mhwang.com
127.0.0.1 maskan5.ir
127.0.0.1 master1.biz
127.0.0.1 mbrdot.tk
127.0.0.1 mcmpessa.sites.uol.com.br
@ -755,6 +783,7 @@
127.0.0.1 patel-hospital.com
127.0.0.1 path4life.org
127.0.0.1 patrickhickey.eu
127.0.0.1 paynotice07.net
127.0.0.1 pb-webdesign.net
127.0.0.1 pdf.sudopdx.net
127.0.0.1 pedrogomes1975.sites.uol.com.br
@ -849,6 +878,7 @@
127.0.0.1 sadkajt357.com
127.0.0.1 safenews.5webs.net
127.0.0.1 safety.amw.com
127.0.0.1 sainitravels.in
127.0.0.1 saloongins.net
127.0.0.1 sanadahiroyuki.com
127.0.0.1 sandrahyczy.sites.uol.com.br
@ -887,6 +917,7 @@
127.0.0.1 serraikizimi.gr
127.0.0.1 server.cherryfun.com
127.0.0.1 server.hyper-info.com
127.0.0.1 server1.extra-web.cz
127.0.0.1 server2.ss2.name
127.0.0.1 seventeen.co.za
127.0.0.1 sexyster.tk
@ -905,6 +936,10 @@
127.0.0.1 soberthingingmon.com
127.0.0.1 soberthingingmon.net
127.0.0.1 socks.vpgconsulting.com.br
<<<<<<< HEAD
=======
127.0.0.1 soft245.ru
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
127.0.0.1 softproworld.com
127.0.0.1 softwarea-z.com
127.0.0.1 solonmdr.xpg.com.br
@ -941,6 +976,7 @@
127.0.0.1 suicud.net
127.0.0.1 sundownmarathon.com
127.0.0.1 sunlux.net
127.0.0.1 sunny99.cholerik.cz
127.0.0.1 supertv.co.il
127.0.0.1 sutra2s.info
127.0.0.1 svetyivanrilski.com
@ -950,6 +986,7 @@
127.0.0.1 tabex.sopharma.bg
127.0.0.1 tadeu_borges.sites.uol.com.br
127.0.0.1 taobao.lylwc.com
127.0.0.1 teameda.comcastbiz.net
127.0.0.1 teamscapabilitieswhich.org
127.0.0.1 teamsofts.com
127.0.0.1 tecnocuer.com
@ -1010,6 +1047,8 @@
127.0.0.1 urbanglass.ro
127.0.0.1 url-cameralist.tk
127.0.0.1 utopia-muenchen.de
127.0.0.1 uwsnurse.com
127.0.0.1 v.inigsplan.ru
127.0.0.1 valdeilma.moraes.sites.uol.com.br
127.0.0.1 validatorbasses.net
127.0.0.1 vcardosobonfim.sites.uol.com.br
@ -1039,6 +1078,7 @@
127.0.0.1 wallpapers91.com
127.0.0.1 warco.pl
127.0.0.1 wbappm.com
127.0.0.1 wc0x83ghk.homepage.t-online.de
127.0.0.1 web-domain.tk
127.0.0.1 web-fill.tk
127.0.0.1 web-olymp.ru
@ -1102,6 +1142,7 @@
127.0.0.1 www.chateautelavi.com
127.0.0.1 www.chiangmaihighlands.com
127.0.0.1 www.cislbelluno.it
127.0.0.1 www.coopcento.it
127.0.0.1 www.cridea.es
127.0.0.1 www.daliaprestige.org
127.0.0.1 www.danlevin.net
@ -1140,6 +1181,7 @@
127.0.0.1 www.gamesnovo.xpg.com.br
127.0.0.1 www.gbcorp.xpg.com.br
127.0.0.1 www.gnnet.co.kr
127.0.0.1 www.googlechrome2013.com
127.0.0.1 www.graceandtruthchurch.org
127.0.0.1 www.grandao2000.xpg.com.br
127.0.0.1 www.groolyns.com
@ -1158,6 +1200,7 @@
127.0.0.1 www.iphonedevcamp.nl
127.0.0.1 www.j-vision.co.kr
127.0.0.1 www.kcta.or.kr
127.0.0.1 www.keepsaketributes.com
127.0.0.1 www.keroroworld.com
127.0.0.1 www.kgbarquivos.xpg.com.br
127.0.0.1 www.kiviturizm.com
@ -1172,6 +1215,7 @@
127.0.0.1 www.lotusconcept.com
127.0.0.1 www.lovedacha.com
127.0.0.1 www.lowerinsurancebill.net
127.0.0.1 www.lowes-pianos-and-organs.com
127.0.0.1 www.lsslss.xpg.com.br
127.0.0.1 www.lulu232.xpg.com.br
127.0.0.1 www.lyzgs.com
@ -1179,6 +1223,10 @@
127.0.0.1 www.marlaktuell.de
127.0.0.1 www.marques.pro.br
127.0.0.1 www.masimpex.com.br
<<<<<<< HEAD
=======
127.0.0.1 www.matteplanet.com
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
127.0.0.1 www.molesa.xpg.com.br
127.0.0.1 www.mpsystem.it
127.0.0.1 www.muzeeum.nl
@ -1190,6 +1238,7 @@
127.0.0.1 www.onebigmaine.com
127.0.0.1 www.panazan.ro
127.0.0.1 www.parfumer.by
127.0.0.1 www.pasrokerij.nl
127.0.0.1 www.passificadormirc.xpg.com.br
127.0.0.1 www.paty88.xpg.com.br
127.0.0.1 www.perupuntocom.com
@ -1204,9 +1253,11 @@
127.0.0.1 www.purplehorses.net
127.0.0.1 www.quickcraft.com.br
127.0.0.1 www.realinnovation.com
127.0.0.1 www.rebeccacella.com
127.0.0.1 www.rempko.sk
127.0.0.1 www.riktoetenel.com
127.0.0.1 www.rlproject.xpg.com.br
127.0.0.1 www.rooversadvocatuur.nl
127.0.0.1 www.roxpriv8.xpg.com.br
127.0.0.1 www.rtzdefacer.xpg.com.br
127.0.0.1 www.rtzdefacer2.xpg.com.br

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,11 @@
# Please forward any additions, corrections or comments by email to
# hosts@someonewhocares.org
<<<<<<< HEAD
# Last updated: Jun 3th, 2013 at 11:35
=======
# Last updated: Jul 22nd, 2013 at 12:28
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
# Use this file to prevent your computer from connecting to selected
# internet hosts. This is an easy and effective way to protect you from
@ -83,17 +87,21 @@ fe80::1%lo0 localhost
127.0.0.1 goatse.ru
127.0.0.1 www.goatse.ru
127.0.0.1 1girl1pitcher.com
127.0.0.1 1girl1pitcher.org
127.0.0.1 1guy1cock.com
127.0.0.1 1man1jar.org
127.0.0.1 1man2needles.com
127.0.0.1 1priest1nun.com
127.0.0.1 2girls1cup-free.com
127.0.0.1 2girls1cup.com
127.0.0.1 2girls1cup.nl
127.0.0.1 2girls1cup.ws
127.0.0.1 2girls1finger.com
127.0.0.1 2girls1finger.org
127.0.0.1 2guys1stump.org
127.0.0.1 3guys1hammer.ws
127.0.0.1 4girlsfingerpaint.com
127.0.0.1 4girlsfingerpaint.org
127.0.0.1 bagslap.com
127.0.0.1 ballsack.org
@ -134,6 +142,7 @@ fe80::1%lo0 localhost
127.0.0.1 mudfall.com
127.0.0.1 mudmonster.org
127.0.0.1 nimp.org
127.0.0.1 nobrain.dk
127.0.0.1 nutabuse.com
127.0.0.1 octopusgirl.com
127.0.0.1 on.nimp.org
@ -209,6 +218,7 @@ fe80::1%lo0 localhost
127.0.0.1 www.mudfall.com
127.0.0.1 www.mudmonster.org
127.0.0.1 www.nimp.org
127.0.0.1 www.nobrain.dk
127.0.0.1 www.nutabuse.com
127.0.0.1 www.octopusgirl.com
127.0.0.1 www.on.nimp.org
@ -238,7 +248,9 @@ fe80::1%lo0 localhost
127.0.0.1 www.y8.com
127.0.0.1 www.youaresogay.com
127.0.0.1 www.ypmate.com
127.0.0.1 www.zentastic.com
127.0.0.1 youaresogay.com
127.0.0.1 zentastic.com
#</shock-sites>
#<shortcut-examples>
@ -1578,6 +1590,7 @@ fe80::1%lo0 localhost
127.0.0.1 b.webwise.com
127.0.0.1 b.webwise.net
127.0.0.1 b.webwise.org
127.0.0.1 beloysoff.ru
127.0.0.1 binsservicesonline.info
127.0.0.1 blackhat.be
127.0.0.1 blenz-me.net
@ -1805,6 +1818,7 @@ fe80::1%lo0 localhost
127.0.0.1 www.afantispy.com
127.0.0.1 www.akoneplatit.sk
127.0.0.1 www.allhqpics.com # Facebook trojan
127.0.0.1 www.anatol.com
127.0.0.1 www.antitero.tk
127.0.0.1 www.articlefuns.cn
127.0.0.1 www.articleidea.cn
@ -1854,6 +1868,7 @@ fe80::1%lo0 localhost
127.0.0.1 www.oix.com
127.0.0.1 www.oix.net
127.0.0.1 www.onlyfreeoffersonline.com
127.0.0.1 www.oreidofitilho.com.br
127.0.0.1 www.otsserver.com
127.0.0.1 www.pay-pal.com-cgibin-canada.4mcmeta4v.cn
127.0.0.1 www.picture-uploads.com
@ -2924,6 +2939,7 @@ fe80::1%lo0 localhost
#</maybe-ads>
# ads
#127.0.0.1 adf.ly
127.0.0.1 0101011.com
127.0.0.1 0d79ed.r.axf8.net
127.0.0.1 0pn.ru
@ -2969,6 +2985,7 @@ fe80::1%lo0 localhost
127.0.0.1 9cf9.v.fwmrm.net
127.0.0.1 a.0day.kiev.ua
127.0.0.1 a.admaxserver.com
127.0.0.1 a.adorika.net
127.0.0.1 a.adready.com
127.0.0.1 a.ads1.msn.com
127.0.0.1 a.ads2.msn.com
@ -3031,6 +3048,7 @@ fe80::1%lo0 localhost
127.0.0.1 ad.adlegend.com
127.0.0.1 ad.admarketplace.net
127.0.0.1 ad.adnet.biz
127.0.0.1 ad.adnet.de
127.0.0.1 ad.adnetwork.com.br
127.0.0.1 ad.adnetwork.net
127.0.0.1 ad.adorika.com
@ -3252,7 +3270,6 @@ fe80::1%lo0 localhost
127.0.0.1 adexprt.me
127.0.0.1 adexprts.com
127.0.0.1 adext.inkclub.com
127.0.0.1 adf.ly
127.0.0.1 adfarm.mserve.ca
127.0.0.1 adfarm1.adition.com
127.0.0.1 adfiles.pitchforkmedia.com
@ -3450,6 +3467,7 @@ fe80::1%lo0 localhost
127.0.0.1 ads.adxpose.com
127.0.0.1 ads.adxpose.mpire.akadns.net
127.0.0.1 ads.affiliates.match.com
127.0.0.1 ads.aftonbladet.se
127.0.0.1 ads.ah-ha.com
127.0.0.1 ads.aintitcool.com
127.0.0.1 ads.airamericaradio.com
@ -4196,6 +4214,7 @@ fe80::1%lo0 localhost
127.0.0.1 ads2.virtumundo.com
127.0.0.1 ads2.weblogssl.com
127.0.0.1 ads2.zdnet.com
127.0.0.1 ads2.zeusclicks.com
127.0.0.1 ads20.focalink.com
127.0.0.1 ads21.focalink.com
127.0.0.1 ads22.focalink.com
@ -4758,6 +4777,7 @@ fe80::1%lo0 localhost
127.0.0.1 ak.buyservices.com
127.0.0.1 ak.maxserving.com
127.0.0.1 ak.p.openx.net
127.0.0.1 aka-cdn-ns.adtech.de
127.0.0.1 aka-cdn-ns.adtechus.com
127.0.0.1 akaads-espn.starwave.com
127.0.0.1 akamai.invitemedia.com
@ -4802,6 +4822,7 @@ fe80::1%lo0 localhost
127.0.0.1 art-photo-music-savingblvd.com
127.0.0.1 as.5to1.com
127.0.0.1 as.casalemedia.com
127.0.0.1 as.sexad.net
127.0.0.1 as.vs4entertainment.com
127.0.0.1 as.webmd.com
127.0.0.1 as1.falkag.de
@ -4959,6 +4980,7 @@ fe80::1%lo0 localhost
127.0.0.1 banners.thgimages.co.uk
127.0.0.1 banners.tribute.ca
127.0.0.1 banners.tucson.com
127.0.0.1 banners.unibet.com
127.0.0.1 banners.valuead.com
127.0.0.1 banners.webmasterplan.com
127.0.0.1 banners.wunderground.com
@ -5146,6 +5168,7 @@ fe80::1%lo0 localhost
127.0.0.1 ccas.clearchannel.com
127.0.0.1 cdn.adigniter.org
127.0.0.1 cdn.adnxs.com
127.0.0.1 cdn.ads.ookla.com
127.0.0.1 cdn.amateurmatch.com
127.0.0.1 cdn.amgdgt.com
127.0.0.1 cdn.assets.craveonline.com
@ -5180,10 +5203,15 @@ fe80::1%lo0 localhost
127.0.0.1 cdn1.xlightmedia.com
127.0.0.1 cdn2.adsdk.com
127.0.0.1 cdn2.amateurmatch.com
<<<<<<< HEAD
=======
127.0.0.1 cdn2.emediate.eu
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
127.0.0.1 cdn3.adexprts.com
127.0.0.1 cdn3.telemetryverification.net
127.0.0.1 cdn454.telemetryverification.net
127.0.0.1 cdn5.tribalfusion.com
127.0.0.1 cdn6.emediate.eu
127.0.0.1 cdnads.cam4.com
127.0.0.1 cdns.mydirtyhobby.com
127.0.0.1 cdns.privatamateure.com
@ -5474,6 +5502,7 @@ fe80::1%lo0 localhost
127.0.0.1 e.as-eu.falkag.net
127.0.0.1 e0.extreme-dm.com
127.0.0.1 e1.addthis.com
127.0.0.1 e2.emediate.se
127.0.0.1 ead.sharethis.com
127.0.0.1 eads-adserving.com
127.0.0.1 earnmygift.com
@ -6812,6 +6841,7 @@ fe80::1%lo0 localhost
127.0.0.1 shoptosaveenergy.com
127.0.0.1 showads1000.pubmatic.com
127.0.0.1 showadsak.pubmatic.com
127.0.0.1 si.hit.gemius.pl
127.0.0.1 sifomedia.citypaketet.se
127.0.0.1 signup.advance.net
127.0.0.1 simg.zedo.com
@ -6907,6 +6937,7 @@ fe80::1%lo0 localhost
127.0.0.1 static.groupy.co.nz
127.0.0.1 static.hitfarm.com
127.0.0.1 static.ifa.camads.net
127.0.0.1 static.l3.cdn.adbucks.com
127.0.0.1 static.plista.com
127.0.0.1 static.pulse360.com
127.0.0.1 static.scanscout.com
@ -7732,6 +7763,7 @@ fe80::1%lo0 localhost
127.0.0.1 www.rovion.com
127.0.0.1 www.rscounter10.com
127.0.0.1 www.rtcode.com
127.0.0.1 www.rwpads.net
127.0.0.1 www.sa44.net
127.0.0.1 www.salesonline.ie
127.0.0.1 www.save-plan.com
@ -7793,6 +7825,7 @@ fe80::1%lo0 localhost
127.0.0.1 www.textbanners.net
127.0.0.1 www.textsrv.com
127.0.0.1 www.tgpmanager.com
127.0.0.1 www.thatrendsystem.com
127.0.0.1 www.the-path-gateway.com
127.0.0.1 www.the-smart-stop.com
127.0.0.1 www.theuseful.com
@ -7824,6 +7857,7 @@ fe80::1%lo0 localhost
127.0.0.1 www.travelncs.com
127.0.0.1 www.treeloot.com
127.0.0.1 www.trendnews.com
127.0.0.1 www.trendsonline.biz
127.0.0.1 www.tutop.com
127.0.0.1 www.tuttosessogratis.org
127.0.0.1 www.ukbanners.com
@ -7884,6 +7918,7 @@ fe80::1%lo0 localhost
127.0.0.1 www1.bannerspace.com
127.0.0.1 www1.belboon.de
127.0.0.1 www1.clicktorrent.info
127.0.0.1 www1.mpnrs.com
127.0.0.1 www1.popinads.com
127.0.0.1 www1.safenyplanet.in
127.0.0.1 www10.ad.tomshardware.com

702
hosts

File diff suppressed because it is too large Load Diff

View File

@ -2,9 +2,13 @@
This repo consolidates several reputable `hosts` files and consolidates them into a single hosts file that you can use.
<<<<<<< HEAD
Last updated: June 6, 2013
**Currently this hosts file contains 23,073 unique entries.**
=======
**Currently this hosts file contains 22887 unique entries.**
>>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
## Source of host data amalgamated here

77
readme_template.md Normal file
View File

@ -0,0 +1,77 @@
#Amalgamated hosts file
This repo consolidates several reputable `hosts` files and consolidates them into a single hosts file that you can use.
**Currently this hosts file contains @NUM_ENTRIES@ unique entries.**
## Source of host data amalgamated here
Currently the `hosts` files from the following locations are amalgamated:
* MVPs.org Hosts file at [http://winhelp2002.mvps.org/hosts.htm](http://winhelp2002.mvps.org/hosts.htm), updated monthly, or thereabouts.
* Dan Pollock at [http://someonewhocares.org/hosts/](http://someonewhocares.org/hosts/) updated regularly.
* My own small list in raw form [here](https://raw.github.com/StevenBlack/hosts/master/data/StevenBlack/hosts).
You can add any additional sources you'd like under the data/ directory. Provide a copy of the current `hosts` file and a file called
update.info with the URL to the `hosts` file source. This will allow updateHostsFile.py to automatically update your source.
## Using updateHostsFile.py
This Python script will generate a unique hosts file based on the sources provided. You can either have the script go out and fetch an updated version over the web (defined by the update.info text file in the source's directory), or it will use the `hosts` file you already have checked into your source's data folder.
Usage
python updateHostsFile.py
## What is a hosts file?
A hosts file, named `hosts` (with no file extension), is a plain-text file used by all operating systems to map hostnames to IP addresses.
In most operating systems, the `hosts` file is preferential to `DNS`. Therefore if a host name is resolved by the `hosts` file, the request never leaves your computer.
Having a smart `hosts` file goes a long way towards blocking malware, adware, and other irritants.
For example, to nullify requests to some doubleclick.net servers, adding these lines to your hosts file will do it:
# block doubleClick's servers
127.0.0.1 ad.ae.doubleclick.net
127.0.0.1 ad.ar.doubleclick.net
127.0.0.1 ad.at.doubleclick.net
127.0.0.1 ad.au.doubleclick.net
127.0.0.1 ad.be.doubleclick.net
# etc...
## Location of your hosts file
To modify your current `hosts` file, look for it in the following places and modify it with a text editor.
**Mac OS X, iOS, Android, Linux**: `/etc/hosts` folder.
**Windows**: `%SystemRoot%\system32\drivers\etc\hosts` folder.
## Reloading hosts file
Your operating system will cache DNS lookups. You can either reboot or run the following commands to manually flush your DNS cache once the new hosts file is in place.
### Mac OS X
Open a Terminal and run:
`dscacheutil -flushcache`
### Windows
Open a Command Prompt:
**Windows XP**: Start -> Run -> `cmd`
**Windows Vista, 7**: Start Button -> type `cmd` -> right-click Command Prompt -> "Run as Administrator"
**Windows 8**: Start -> Swipe Up -> All Apps -> Windows System -> right-click Command Prompt -> "Run as Administrator"
and run:
`ipconfig /flushdns`
### Linux
Open a Terminal and run:
`/etc/rc.d/init.d/nscd restart`

View File

@ -7,8 +7,10 @@
# as sources into one, unique host file to keep you internet browsing happy.
import os
import platform
import re
import string
import subprocess
import sys
import tempfile
import urllib2
@ -19,6 +21,8 @@ DATA_PATH = BASEDIR_PATH + '/data'
DATA_FILENAMES = 'hosts'
UPDATE_URL_FILENAME = 'update.info'
SOURCES = os.listdir(DATA_PATH)
README_TEMPLATE = BASEDIR_PATH + '/readme_template.md'
README_FILE = BASEDIR_PATH + '/readme.md'
# Exclusions
EXCLUSION_PATTERN = '([a-zA-Z\d-]+\.){0,}' #append domain the end
@ -28,7 +32,7 @@ COMMON_EXCLUSIONS = ['hulu.com']
# Global vars
exclusionRegexs = []
duplicatesRemoved = 0;
numberOfRules = 0
def main():
promptForUpdate()
@ -36,7 +40,9 @@ def main():
mergeFile = createInitialFile()
finalFile = removeDups(mergeFile)
finalizeFile(finalFile)
printSuccess('Success! Your shiny new hosts file has been prepared.')
updateReadme(numberOfRules)
printSuccess('Success! Your shiny new hosts file has been prepared.\nIt contains ' + str(numberOfRules) + ' unique entries.')
promptForMove(finalFile)
# Prompt the User
def promptForUpdate():
@ -61,6 +67,13 @@ def promptForMoreCustomExclusions():
return True
else:
return False
def promptForMove(finalFile):
response = query_yes_no("Do you want to replace your existing hosts file with the newly generated file?")
if (response == "yes"):
moveHostsFileIntoPlace(finalFile)
else:
return False
# End Prompt the User
# Exclusion logic
@ -133,7 +146,8 @@ def createInitialFile():
return mergeFile
def removeDups(mergeFile):
global duplicatesRemoved
global numberOfRules
finalFile = open(BASEDIR_PATH + '/hosts', 'w+b')
mergeFile.seek(0) # reset file pointer
@ -148,12 +162,10 @@ def removeDups(mergeFile):
if strippedRule not in rules_seen:
finalFile.write(line)
rules_seen.add(strippedRule)
else:
duplicatesRemoved += 1
numberOfRules += 1
mergeFile.close()
printSuccess('Removed ' + str(duplicatesRemoved) + ' duplicates from the merged file')
return finalFile
def finalizeFile(finalFile):
@ -171,7 +183,7 @@ def stripRule(line):
return splitLine[0] + ' ' + splitLine[1]
def writeOpeningHeader(finalFile):
global duplicatesRemoved
global numberOfRules
finalFile.seek(0) #reset file pointer
fileContents = finalFile.read(); #save content
finalFile.seek(0) #write at the top
@ -182,10 +194,31 @@ def writeOpeningHeader(finalFile):
for source in SOURCES:
finalFile.write('# ' + source + '\n')
finalFile.write('#\n')
finalFile.write('# Take Note:\n')
finalFile.write('# Merging these sources produced ' + str(duplicatesRemoved) + ' duplicates\n')
finalFile.write('# Merging these sources produced ' + str(numberOfRules) + ' unique entries\n')
finalFile.write('# ===============================================================\n')
finalFile.write(fileContents)
def updateReadme(numberOfRules):
with open(README_FILE, "wt") as out:
for line in open(README_TEMPLATE):
out.write(line.replace('@NUM_ENTRIES@', str(numberOfRules)))
def moveHostsFileIntoPlace(finalFile):
if (os.name == 'posix'):
print 'Moving the file requires administrative privileges. You might need to enter your password.'
if(subprocess.call(["/usr/bin/sudo", "cp", os.path.abspath(finalFile.name), "/etc/hosts"])):
printFailure("Moving the file failed.")
print 'Flushing the DNS Cache to utilize new hosts file...'
if (platform.system() == 'Darwin'):
if(subprocess.call(["/usr/bin/sudo", "killall", "-HUP", "mDNSResponder"])):
printFailure("Flushing the DNS Cache failed.")
else:
if(subprocess.call(["/usr/bin/sudo", "/etc/rc.d/init.d/nscd", "restart"])):
printFailure("Flushing the DNS Cache failed.")
elif (os.name == 'nt'):
print 'Automatically moving the hosts file in place is not yet supported.'
print 'Please move the generated file to %SystemRoot%\system32\drivers\etc\hosts'
# End File Logic
# Helper Functions
@ -252,4 +285,4 @@ def printFailure(text):
# End Helper Functions
if __name__ == "__main__":
main()
main()