From 5c172d1a1539a6b901efa758e8d8c83f2b4d78ac Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 29 Feb 2016 17:44:10 +1100 Subject: Rename file that is not a license text. --- COPYING | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 COPYING (limited to 'COPYING') diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..01c99074 --- /dev/null +++ b/COPYING @@ -0,0 +1,13 @@ +ZeroTier One is licensed under the terms of the GNU General Public License +version 3, which are available here: + +http://gplv3.fsf.org/ + +Modification and redistribution of ZeroTier One is permitted in source form. +Binary distribution is permitted provided all copyright notices remain +intact and any modifications to the source code are also distributed. + +ZeroTier One may not be embedded into any closed-source application (e.g. via +linking), nor may closed-source derivatives be created, without a separately +negotiated license from ZeroTier Networks LLC. See the terms of the GPLv3 for +details. -- cgit v1.2.3 From d37e44225f47683a5a8e56a6b6eb8c9f4330ce52 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 29 Feb 2016 17:25:39 +1100 Subject: Add explicit copyright statement in same file as license grant. --- COPYING | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'COPYING') diff --git a/COPYING b/COPYING index 01c99074..e44913fa 100644 --- a/COPYING +++ b/COPYING @@ -1,3 +1,6 @@ +ZeroTier One, an endpoint server for the ZeroTier virtual network layer. +Copyright © 2011–2016 ZeroTier, Inc. + ZeroTier One is licensed under the terms of the GNU General Public License version 3, which are available here: @@ -11,3 +14,10 @@ ZeroTier One may not be embedded into any closed-source application (e.g. via linking), nor may closed-source derivatives be created, without a separately negotiated license from ZeroTier Networks LLC. See the terms of the GPLv3 for details. + +.. + Local variables: + coding: utf-8 + mode: text + End: + vim: fileencoding=utf-8 filetype=text : -- cgit v1.2.3 From f6e98df8da5b1c55cb536df9f6dddc996d64fe73 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 29 Feb 2016 17:37:02 +1100 Subject: Refer directly to the accompanying GPL-3 license document. --- COPYING | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index e44913fa..fd892072 100644 --- a/COPYING +++ b/COPYING @@ -4,7 +4,8 @@ Copyright © 2011–2016 ZeroTier, Inc. ZeroTier One is licensed under the terms of the GNU General Public License version 3, which are available here: -http://gplv3.fsf.org/ +See the file ‘LICENSE.GPL-3’ for the text of the GNU GPL version 3. +If that file is not present, see . Modification and redistribution of ZeroTier One is permitted in source form. Binary distribution is permitted provided all copyright notices remain -- cgit v1.2.3 From 642aa3313d62c292a9bd8f1d85ae05b638403cc2 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 29 Feb 2016 17:39:11 +1100 Subject: Explicitly grant GPLv3-or-later terms to the overall code base. --- COPYING | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index fd892072..f152c402 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,10 @@ ZeroTier One, an endpoint server for the ZeroTier virtual network layer. Copyright © 2011–2016 ZeroTier, Inc. -ZeroTier One is licensed under the terms of the GNU General Public License -version 3, which are available here: +ZeroTier One is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or (at +your option) any later version. See the file ‘LICENSE.GPL-3’ for the text of the GNU GPL version 3. If that file is not present, see . -- cgit v1.2.3 From 667048310d6b6373900607fc67b96cf9ae00b622 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 29 Feb 2016 17:40:10 +1100 Subject: Remove text that paraphrases GPLv3 conditions. --- COPYING | 9 --------- 1 file changed, 9 deletions(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index f152c402..23d42dfa 100644 --- a/COPYING +++ b/COPYING @@ -9,15 +9,6 @@ your option) any later version. See the file ‘LICENSE.GPL-3’ for the text of the GNU GPL version 3. If that file is not present, see . -Modification and redistribution of ZeroTier One is permitted in source form. -Binary distribution is permitted provided all copyright notices remain -intact and any modifications to the source code are also distributed. - -ZeroTier One may not be embedded into any closed-source application (e.g. via -linking), nor may closed-source derivatives be created, without a separately -negotiated license from ZeroTier Networks LLC. See the terms of the GPLv3 for -details. - .. Local variables: coding: utf-8 -- cgit v1.2.3