aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p@janouch.name>2018-06-21 23:57:25 +0200
committerPřemysl Janouch <p@janouch.name>2018-06-21 23:57:25 +0200
commit69800a6afbf96d6240d3c05251221efc56215e82 (patch)
treec91b6ff0476a086f7d3941a5280a542d256074ff
parentfe1035633a1a17febbec6d42d53ab8c9afeddfc1 (diff)
downloadliberty-69800a6afbf96d6240d3c05251221efc56215e82.tar.gz
liberty-69800a6afbf96d6240d3c05251221efc56215e82.tar.xz
liberty-69800a6afbf96d6240d3c05251221efc56215e82.zip
Relicense to 0BSD, update mail address
I've come to the conclusion that copyright mostly just stands in the way of software development. In my jurisdiction I cannot give up my own copyright and 0BSD seems to be the closest thing to public domain. The updated mail address, also used in my author/committer lines, is shorter and looks nicer. People rarely interact anyway.
-rw-r--r--LICENSE5
-rw-r--r--README.adoc9
-rw-r--r--liberty-proto.c5
-rw-r--r--liberty-tui.c5
-rw-r--r--liberty.c5
-rw-r--r--tests/liberty.c5
-rw-r--r--tests/proto.c5
7 files changed, 14 insertions, 25 deletions
diff --git a/LICENSE b/LICENSE
index 1d66b96..a069461 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
-Copyright (c) 2014 - 2017, Přemysl Janouch <p.janouch@gmail.com>
+Copyright (c) 2014 - 2018, Přemysl Janouch <p@janouch.name>
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.
+purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/README.adoc b/README.adoc
index 5e957f1..69bbcb8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -27,10 +27,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
License
-------
-'liberty' is written by Přemysl Janouch <p.janouch@gmail.com>.
-
-You may use the software under the terms of the ISC license, the text of which
-is included within the package, or, at your option, you may relicense the work
-under the MIT or the Modified BSD License, as listed at the following site:
-
-http://www.gnu.org/licenses/license-list.html
+This software is released under the terms of the 0BSD license, the text of which
+is included within the package along with the list of authors.
diff --git a/liberty-proto.c b/liberty-proto.c
index e54cf10..c222b97 100644
--- a/liberty-proto.c
+++ b/liberty-proto.c
@@ -1,11 +1,10 @@
/*
* liberty-proto.c: the ultimate C unlibrary: protocols
*
- * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2016, Přemysl Janouch <p@janouch.name>
*
* 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.
+ * purpose with or without fee is hereby granted.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/liberty-tui.c b/liberty-tui.c
index 3112164..2557b0f 100644
--- a/liberty-tui.c
+++ b/liberty-tui.c
@@ -1,11 +1,10 @@
/*
* liberty-tui.c: the ultimate C unlibrary: TUI
*
- * Copyright (c) 2016 - 2017, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2016 - 2017, Přemysl Janouch <p@janouch.name>
*
* 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.
+ * purpose with or without fee is hereby granted.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/liberty.c b/liberty.c
index 51b7058..df42e4a 100644
--- a/liberty.c
+++ b/liberty.c
@@ -1,11 +1,10 @@
/*
* liberty.c: the ultimate C unlibrary
*
- * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2018, Přemysl Janouch <p@janouch.name>
*
* 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.
+ * purpose with or without fee is hereby granted.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/tests/liberty.c b/tests/liberty.c
index 95531fa..6f39885 100644
--- a/tests/liberty.c
+++ b/tests/liberty.c
@@ -1,11 +1,10 @@
/*
* tests/liberty.c
*
- * Copyright (c) 2015 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2015 - 2016, Přemysl Janouch <p@janouch.name>
*
* 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.
+ * purpose with or without fee is hereby granted.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/tests/proto.c b/tests/proto.c
index 7fe0175..2b69e2f 100644
--- a/tests/proto.c
+++ b/tests/proto.c
@@ -1,11 +1,10 @@
/*
* tests/proto.c
*
- * Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
*
* 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.
+ * purpose with or without fee is hereby granted.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF