summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFRIGN <dev@frign.de>2016-07-14 13:05:37 +0200
committerMarkus Teich <markus.teich@stusta.mhn.de>2016-07-18 16:09:23 +0200
commitcd10166b5eccac1b8cf510a7c97544d1697fbd09 (patch)
tree994d86f104176a01e8920d3bd77b8185664a9d21
parente75676d9a4dd6dc275d3a233cc60f7624c62f189 (diff)
Simplify LICENSE wording
Now, before you call your lawyers, here is some explanation: The MIT/X Consortium-License and ISC-License are equivalent according to the Berne-convention. This means that a court of law presented with either licenses will act the same. The advantage of the ISC license is that it has a simpler wording and is recommended by the OpenBSD-project for new projects[0]. And as we at suckless.org love removing cruft, this also includes removing legal cruft wording that is not needed any more. [0]: http://www.openbsd.org/policy.html
-rw-r--r--LICENSE41
-rw-r--r--sent.c2
2 files changed, 25 insertions, 18 deletions
diff --git a/LICENSE b/LICENSE
index 8d5665e..699b2fd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,28 @@
-The MIT License (MIT)
+ISC-License
-Copyright (c) 2014-2015 Markus Teich
+(c) 2014-2016 Markus Teich <markus.teich@stusta.mhn.de>
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+(c) 2015 Jonas Jelten <jj@sft.mx>
+(c) 2015 Szabolcs Nagy <nsz@port70.net>
+(c) 2015 Tony Lainson <t.lainson@gmail.com>
+(c) 2015 Jan Christoph Ebersbach <jceb@e-jc.de>
+(c) 2015 Ivan Tham <pickfire@riseup.net>
+(c) 2015 Quentin Rameau <quinq@fifth.space>
+(c) 2015 Alexis <surryhill@gmail.com>
+(c) 2015 Dimitris Papastamos <sin@2f30.org>
+(c) 2015 Grant Mathews <grant.m.mathews@gmail.com>
+(c) 2015 David Phillips <dbphillipsnz@gmail.com>
+(c) 2016 Laslo Hunhold <dev@frign.de>
+(c) 2016 Hiltjo Posthuma <hiltjo@codemadness.org>
diff --git a/sent.c b/sent.c
index da75439..f6c57fb 100644
--- a/sent.c
+++ b/sent.c
@@ -1,4 +1,4 @@
-/* See LICENSE for licence details. */
+/* See LICENSE file for copyright and license details. */
#include <sys/types.h>
#include <arpa/inet.h>