From 69a09a3e66da44f981bf3975b158fbf1c51e7f07 Mon Sep 17 00:00:00 2001 From: joshua stein Date: Tue, 4 Oct 2016 14:28:24 -0500 Subject: [PATCH] LICENSE: add binary redistribution exemptions --- Endless/Resources/credits.html | 11 +++++++++-- LICENSE | 8 ++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Endless/Resources/credits.html b/Endless/Resources/credits.html index e2ef34c..1ecb34e 100644 --- a/Endless/Resources/credits.html +++ b/Endless/Resources/credits.html @@ -17,9 +17,16 @@ 
 Endless
-Copyright © 2014, 2015, joshua stein <jcs@jcs.org>
+Copyright © 2014-2015 joshua stein <jcs@jcs.org>
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Redistribution and use in source form, with or without modification, and use in binary form, is permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+Redistribution in binary form, with or without modification, is not permitted except by Superblock, LLC and Psiphon, Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE b/LICENSE index c0250e1..73d37c4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,3 @@ -Endless -Copyright (c) 2014-2015 joshua stein - (NOTE: This is not a BSD/ISC/MIT license. You are permitted to use this source code, with or without modification, in source or binary form, on your devices however you see fit. You are not permitted to redistribute @@ -9,6 +6,9 @@ words, you cannot put this application or any application derived from it, on the Apple App Store, Cydia, or any other binary-only distribution channel.) +Endless +Copyright (c) 2014-2015 joshua stein + Redistribution and use in source form, with or without modification, and use in binary form, is permitted provided that the following conditions are met: @@ -19,7 +19,7 @@ are met: derived from this software without specific prior written permission. Redistribution in binary form, with or without modification, is not -permitted. +permitted except by Superblock, LLC and Psiphon, Inc. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES