Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-02 18:45:52 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,976 Commits 2 Branches 656 Tags 1.6 GiB
df0ea73da2
Commit Graph

1976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Black
d606989252 Updated the hosts file from all sources. 2013-11-02 11:01:25 -04:00
Steven Black
3234765b8c Updated all hosts, and the combined merged hosts file 2013-09-02 16:01:37 -04:00
Steven Black
a4241efdf8 Whoops, corrected an section that somehow went unresolved. 2013-07-30 21:36:14 -04:00
Steven Black
d815858cda 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
 2013-07-30 21:32:38 -04:00
Ben Limmer
3d234cab9c Source update. 2013-07-30 11:00:14 -06:00
Ben Limmer
16e922cdd6 Added query to user for moving the hosts file into place. 2013-07-30 10:59:31 -06:00
Ben Limmer
84b63f0619 Source update. 2013-07-24 09:37:50 -06:00
Ben Limmer
3e6a5c42c8 Correcting syntax error with elif. 2013-07-13 16:24:06 -06:00
Ben Limmer
4b8995a9af 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.
 2013-07-13 16:08:31 -06:00
Ben Limmer
f2f3e29e3f 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.
 2013-07-13 15:57:11 -06:00
Ben Limmer
3e45e745f4 Updated sources. 2013-07-13 15:02:49 -06:00
Ben Limmer
1e180e78be Write out how many unique entries were generated in the readme.md file. 
Resolves #3.
 2013-07-13 14:59:29 -06:00
Steven Black
246b13d307 Updated the read me -- now it has 23,073 host entries. 2013-06-07 17:21:33 -04:00
Steven Black
8d4f2a2798 Updates from all sources, and a new merge. 2013-06-06 15:46:48 -04:00
Ben Limmer
02efc707f1 Print out copy locations on success. 
Now it's easy to copy/paste where the host file needs to go.
 2013-05-29 21:28:49 -06:00
Ben Limmer
c446819b64 Updating sources 2013-05-29 21:28:35 -06:00
Ben Limmer
4d4ff6bff8 Source update. 2013-05-07 21:44:22 -06:00
Ben Limmer
54b99d577b Update sources. 2013-04-14 20:41:08 -06:00
Ben Limmer
c38917832c Updated from sources. 2013-04-04 10:35:15 -06:00
Steven Black
3ccfa90a1c Other data, not included in the processing, but under consideration for the future. 2013-03-18 10:19:29 -04:00
Steven Black
ae6821c74b Updated with the latest from the Maleware Domain List and Someone Who Cares. 2013-03-18 10:16:16 -04:00
Ben Limmer
2d402933a0 Updated sources. 2013-03-17 11:35:18 -06:00
Ben Limmer
18ed7848fd Updated hosts files. 2013-03-10 14:39:03 -06:00
Ben Limmer
33c0d37171 Update sources. 2013-03-03 18:36:34 -07:00
Ben Limmer
86e45efc22 Updated sources and hosts file. 2013-02-27 10:01:19 -07:00
Steven Black
889311a04a Updated readme file: 22,690 entries. 2013-02-25 17:55:04 -05:00
Steven Black
de8a6abb01 Updated amalgamated hosts file 2013-02-25 17:50:35 -05:00
Steven Black
3b9ddbe80c Latest hosts file from mvps.org 2013-02-25 17:50:11 -05:00
Steven Black
493cfb5ca0 Latest hosts file from malwaredomainlist.com 2013-02-25 17:49:50 -05:00
Steven Black
b102fd1015 Fresh hosts file from someonewhocares.org 2013-02-25 17:49:02 -05:00
Ben Limmer
50bd5e6219 Source update. 2013-02-23 18:32:19 -07:00
Steven Black
65674554a4 Updated the readme to include a reference to malwaredomainlist.com. 2013-02-22 11:23:41 -05:00
Steven Black
4f9db5274c Merge pull request #2 from l1m5/master 
Added simple python script to handle automatic updates and merges
 2013-02-20 20:18:52 -08:00
Ben Limmer
ddca2396b6 Updated README to include info on flushing DNS cache. 2013-02-17 15:10:27 -07:00
Ben Limmer
36f26c897e Updating with new entries from sources. 2013-02-17 14:50:21 -07:00
Ben Limmer
9e1b5505c2 Colorized prompts for readability. 
This commit closes #2.
 2013-02-17 14:49:16 -07:00
Ben Limmer
0f942662cf Resolves infinite loop error introduced in 997606b. 
Whether you entered yes or no to the "more entries" dialog, you'd still be in the loop. Also, we now check to see if the custom domain is blank
 2013-02-17 14:39:40 -07:00
Ben Limmer
c722160a9c Woops, left debug logic in last commit. 2013-02-17 13:55:46 -07:00
Ben Limmer
997606b3f0 Added ability to exclude domains. 
This commit closes #1. I always hated that Hulu would freak out when I generated a new hosts file. It checks to make sure that it can access its ad servers before it will start streaming. I'm assuming people have other sites similar to this, so the script now can be extended with common and custom domains to exclude.
 2013-02-17 13:51:49 -07:00
Ben Limmer
fd55ea88fc Added new source malwaredomainlist.com. 
This source does not add much in the way of ad-blocking, but it a trusted source of malware domains.
 2013-02-10 09:10:41 -07:00
Ben Limmer
023d1174a4 New hosts file generated using script. 
This commit is the first merged hosts file to utilize the updateHostsFile.py script.
The only working difference is that it pulled in a new someonewhocares.org hosts file.
 2013-02-09 19:56:54 -07:00
Ben Limmer
47f8f40b92 Added script to handle updates to hosts sources. 
updateHostsFile.py can handle either simply combining local hosts files you have checked in, or it can
go out to the Internet to update your source files. It also handles automatically generating a header
and removing duplicates from the list.
 2013-02-09 19:55:04 -07:00
Steven Black
68a566a932 New merge without duplicates -- these were commented-out previously 2013-02-01 13:29:34 -05:00
Steven Black
1f22655221 Latest merged hosts file. 2013-02-01 12:56:58 -05:00
Steven Black
976ba15bfb Google analytics handled by someonewhocares.org host file 2013-02-01 12:52:53 -05:00
Steven Black
6bb0e292c1 Jan 30th, 2013 hosts file from someonewhocares.org 2013-02-01 12:35:52 -05:00
Steven Black
323413d1cb January 2018 2013 hosts file from MVPs.org 2013-02-01 12:35:28 -05:00
Steven Black
bb72eaa4de Hosts file, Dec 26 2012 version, by Dan Pollock at http://someonewhocares.org/hosts/ 2012-12-31 00:29:07 -05:00
Steven Black
7795e629c1 Updated Readme. Now with 24,245 hosts listed. 2012-12-08 20:23:49 -05:00
Steven Black
c92883456c Latest merged hosts file. 2012-12-08 20:02:47 -05:00