starred/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2026-10-02 22:05:54 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
2,138 Commits 2 Branches 891 Tags
ef6cff070266178f9be563b1d3f3ea01e649d2d9
Commit Graph
2138 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Black ef6cff0702 Merge pull request #1236 from adherzog/fix-default-whitelist 
Fix default whitelist argument.
 2020-04-23 21:38:58 -04:00
Steven Black e7c0ef495e Merge pull request #1243 from XhmikosR/typo 
Join a few short lines and fixes a few typos
 2020-04-23 21:37:39 -04:00
XhmikosR f5358fd0b4 Join a few short lines and fixes a few typos 2020-04-23 09:02:38 +03:00
Steven Black e2ce21ba3e Issue #1239: add maper.info. 2020-04-22 18:58:15 -04:00
Steven Black 68419f063d Issue #1240: adding domains listed in this issue, 2020-04-22 18:56:05 -04:00
Steven Black 8d00a38425 Release 2.6.7 2.6.7 2020-04-22 10:29:23 -04:00
Steven Black 15e433e5c3 Updates from clefspeare13, yoyo.org, URLHaus, KADhosts, hostsVN, Badd-Boyz, and AdAway. 2020-04-22 10:28:54 -04:00
Steven Black 564141c3a5 Merge pull request #1238 from ScriptTiger/correct-sorting 
Unification of the sorting of the sources.
 2020-04-22 01:47:36 -04:00
funilrys dd7904dcc8 Add forgotten sorting. 
Indeed, I forgot to sort the content of the hosts file.
 2020-04-21 23:54:01 +02:00
funilrys 665dc98191 Unification of the sorting of the sources. 
Before this patch, there was no proper sorting and the sources.

As @XhmikosR mentioned in StevenBlack/hosts#1166, without this patch,
the output is totally different in Windows. But let's be honest, if it
is like that under Windows, chances are that the same behavior happens
across different OSes or machines around the globe.

Another reason behind this patch is that - desperate the fact that we
certainly trust @StevenBlack - the integrity of the generated files
could not be guarenteed because of the sorting which may be completely
different from an OS to another and a machine to another.

For those reasons, this patch introduces a unification of the sorting of
all sources.

The idea behind this patch is to have @StevenBlack's ad-hoc hosts
file always on top (1st) and the rest of the sources sorted
alphabetically based on the name of the folder inside the `data`
or `extensions` directory.

This will ensure that we get the same result everywhere.

Concretely speaking, I just added the function (`sort_sources`) which
sorts a given list of sources files. And later on, call the new function
everywhere it was necessary. Tests of the newly introduced function
are also included.

Contributors:
  * @ScriptTiger
  * @XhmikosR

Notes:
  * This patch fix (completely ?) ScriptTiger/hosts#1
  * This patch fix https://github.com/StevenBlack/hosts/issues/1166#issuecomment-590511086
 2020-04-21 22:54:25 +02:00
Steven Black 6548b1af25 Add domains from Issue #1237. 2020-04-20 23:43:38 -04:00
Steven Black 0c9ec0732d Add domains from Issue #1226. 2020-04-20 23:40:22 -04:00
Steven Black 546a6587cb Merge pull request #1230 from XhmikosR/patch-1 
Update KADhosts homeurl
 2020-04-20 14:39:49 -04:00
Steven Black 2e9fb614d5 Merge pull request #1231 from XhmikosR/patch-2 
Fix FadeMind's lists license
 2020-04-20 14:13:41 -04:00
Adam Herzog 2a742e7f99 Fix default whitelist argument. 2020-04-20 10:22:13 -04:00
XhmikosR cd426b4d8e Update KADhosts homeurl 2020-04-20 09:27:42 +03:00
XhmikosR 7b00af4d07 Fix FadeMind's lists license 2020-04-20 09:27:23 +03:00
Steven Black 5b25845933 Release 2.6.6 2.6.6 2020-04-18 22:39:31 -04:00
Steven Black ee37f38580 Fix error I introduced in commit daf16c7eba. 2020-04-18 22:39:13 -04:00
Steven Black 7cb8c82481 Release 2.6.5 2.6.5 2020-04-18 20:41:20 -04:00
Steven Black 58d1cfc3b3 Updates from ypyo.org, URLHaus, StevenBlack, KADHosts, and hostsVN. 2020-04-18 20:40:44 -04:00
Steven Black daf16c7eba Adding domains related to xHelper. 2020-04-18 20:32:12 -04:00
Steven Black 05d4b42737 Issue #1232: fix - adding ikezijik.ga. 2020-04-18 20:23:01 -04:00
Steven Black c34d990cf1 Issue #1234: fix - adding Github phishing domains. 2020-04-18 20:19:36 -04:00
Steven Black 6004c65c41 Release 2.6.4 2.6.4 2020-04-16 21:52:02 -04:00
Steven Black 6e71030b58 Updates from sinfonietta, yoyo.org, URLHaaus, KADhosts, Badd-Boyz, and AdAway. 2020-04-16 21:51:42 -04:00
Steven Black e84761d17d Add domains from Issue #1229. 2020-04-16 14:10:17 -04:00
Steven Black dcb32b0b1e Release 2.6.3 2.6.3 2020-04-13 21:52:11 -04:00
Steven Black a63fa1291b Updates from sinfonietta, yoyo.org, URLHaus, ADhosts, hostsVN, Badd-Boyz, and AdAway. 2020-04-13 21:51:51 -04:00
Steven Black 1a2e8765cc Merge pull request #1227 from djnym/add-wlbl 
Allow whitelist/blacklist files to be passed via command line
 2020-04-13 20:23:33 -04:00
Anthony Molinaro 4aa8b65cc2 provide defaults for args 2020-04-13 16:20:22 -07:00
Anthony Molinaro dd2d878e95 Allow whitelist/blacklist files to be passed via command line 2020-04-13 12:14:34 -07:00
Steven Black a2ab99d9b1 Sort my ad-hoc list. 2020-04-12 18:14:51 -04:00
Steven Black b655a57e76 Release 2.6.2 2.6.2 2020-04-11 16:37:39 -04:00
Steven Black 6cc5d83fed Updates from sinfonietta, URLHaus, KADhosts, hostsVN, Badd-Boyz, and AdAway. 2020-04-11 16:37:19 -04:00
Steven Black 832138b4bc New domain. 2020-04-11 15:31:23 -04:00
Steven Black 3ea9dc7ca9 Release 2.6.1 2.6.1 2020-04-10 22:54:17 -04:00
Steven Black b91104aa64 Updates from sinfonietta, yoyo.org, URLHaus, KADhosts, and Badd-Boyz. 2020-04-10 22:53:54 -04:00
Steven Black f058719a56 Issue #1220 - add www.traffclick.ru. 2020-04-10 21:20:44 -04:00
Steven Black 3b7c7caa52 Issue #1221: added three domains raised in this issue. 2020-04-10 21:19:15 -04:00
Steven Black f5c028779c Issue #1222: Add globalpagee-prod-webex.com. 2020-04-10 21:17:45 -04:00
Steven Black d281b49b9f Resolving FadeMind/hosts.extras/issues/32. 2020-04-10 13:35:34 -04:00
Steven Black de2de429c8 Release 2.6.0 2.6.0 2020-04-09 15:09:05 -04:00
Steven Black 3e749f1f37 Updates from URLHaus, KADhosts, hostsVN, and add.Risk. 2020-04-09 15:07:59 -04:00
Steven Black e091bcc185 Merge pull request #1216 from djnym/clean-checkout-fixes 
Keep checkout unmodified when adding outputpath.
 2020-04-08 16:23:58 -04:00
Anthony Molinaro b87c81f796 update template not readme 2020-04-08 11:56:50 -07:00
Steven Black da2c5f86f2 Merge pull request #1217 from XhmikosR/patch-1 
Fix typo
 2020-04-08 14:54:56 -04:00
Steven Black 8801e184d5 Merge pull request #1218 from PerfectSlayer/patch-1 
Update AdAdawy hosts issue report link
 2020-04-08 11:44:05 -04:00
PerfectSlayer f3464b98bf Fix adaway metadata according code review 2020-04-08 15:22:35 +02:00
PerfectSlayer 3768103c1e Revert "Update AdAdawy hosts issue report link" 
This reverts commit 0581b133b1.
 2020-04-08 15:20:52 +02:00