summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-11-01 15:37:41 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-11-01 15:38:12 +1030
commit516c47790828cfb892fecdbe03a6928c345d29b2 (patch)
tree88f2c2e37a602887fbff8ecadd63f872bfe4812d
parent919b97d6e573eb794d7819f1af8da29023d6b193 (diff)
Relicense all public domain modules to CC0.
I wrote all of most of them, for the others, here's the CCAN mailing list thread authorizing it: From: Timothy B. Terriberry <tterribe@xiph.org> Subject: Re: [ccan] Changing from Public Domain to CC0 To: Rusty Russell <rusty@rustcorp.com.au> Cc: ccan@ozlabs.org Date: Wed, 31 Oct 2012 02:53:50 -0400 Rusty Russell <rusty@rustcorp.com.au> wrote: > I want to change the License string (and add a symlink) to the following > trivial modules. Please Ack. > isaac Ack. From: Alessandro Guido <ag@alessandroguido.name> Subject: Re: Changing from Public Domain to CC0 To: Rusty Russell <rusty@rustcorp.com.au> Date: Wed, 31 Oct 2012 10:59:53 +0100 Acked-by: Alessandro Guido <ag@alessandroguido.name> From: Brad Hards <bradh@frogmouth.net> Subject: Re: Changing from Public Domain to CC0 To: Rusty Russell <rusty@rustcorp.com.au> Cc: Joey Adams <joeyadams3.14159@gmail.com>, Alessandro Guido <ag@alessandroguido.name>, Andreas Schlick <schlick@lavabit.com>, ccan@ozlabs.org Date: Wed, 31 Oct 2012 23:43:24 +1100 On 31/10/12 17:43, Rusty Russell wrote: > Damn lawyers! > > Since Public Domain is a slippery concept outside certain countries, it > has been suggested that I formalize it to Creative Commons Zero. > > I want to change the License string (and add a symlink) to the following > trivial modules. Please Ack. Ack. More generally, anything I've put into CCAN is so trivial that you can relicense it (to any Free / Open Source license) as part of any relicensing you can otherwise get agreement to. Brad [Sorry if this comes out in HTML - I'm stuck with unsat tools while travelling]. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
l---------ccan/alignof/LICENSE1
-rw-r--r--ccan/alignof/_info2
-rw-r--r--ccan/alignof/alignof.h1
l---------ccan/array_size/LICENSE1
-rw-r--r--ccan/array_size/_info2
-rw-r--r--ccan/array_size/array_size.h1
l---------ccan/build_assert/LICENSE1
-rw-r--r--ccan/build_assert/_info2
-rw-r--r--ccan/build_assert/build_assert.h1
l---------ccan/check_type/LICENSE1
-rw-r--r--ccan/check_type/_info2
-rw-r--r--ccan/check_type/check_type.h1
l---------ccan/compiler/LICENSE1
-rw-r--r--ccan/compiler/_info2
-rw-r--r--ccan/compiler/compiler.h1
l---------ccan/container_of/LICENSE1
-rw-r--r--ccan/container_of/_info2
-rw-r--r--ccan/container_of/container_of.h1
l---------ccan/err/LICENSE1
-rw-r--r--ccan/err/_info2
-rw-r--r--ccan/err/err.c1
-rw-r--r--ccan/err/err.h1
-rw-r--r--ccan/hash/_info2
-rw-r--r--ccan/hash/hash.h1
l---------ccan/isaac/LICENSE1
-rw-r--r--ccan/isaac/_info2
-rw-r--r--ccan/isaac/isaac.c3
-rw-r--r--ccan/isaac/isaac.h1
-rw-r--r--ccan/isaac/isaac64.c3
-rw-r--r--ccan/isaac/isaac64.h1
l---------ccan/noerr/LICENSE1
-rw-r--r--ccan/noerr/_info2
-rw-r--r--ccan/noerr/noerr.c1
-rw-r--r--ccan/noerr/noerr.h1
l---------ccan/short_types/LICENSE1
-rw-r--r--ccan/short_types/_info2
-rw-r--r--ccan/short_types/short_types.h1
l---------ccan/str/LICENSE1
-rw-r--r--ccan/str/_info2
-rw-r--r--ccan/str/debug.c1
-rw-r--r--ccan/str/str.c1
-rw-r--r--ccan/str/str.h2
-rw-r--r--ccan/str/str_debug.h1
-rw-r--r--ccan/strmap/_info2
-rw-r--r--ccan/strset/_info2
l---------ccan/tcon/LICENSE1
-rw-r--r--ccan/tcon/_info2
-rw-r--r--ccan/tcon/tcon.h2
48 files changed, 50 insertions, 19 deletions
diff --git a/ccan/alignof/LICENSE b/ccan/alignof/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/alignof/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/alignof/_info b/ccan/alignof/_info
index 069929f9..85cf810c 100644
--- a/ccan/alignof/_info
+++ b/ccan/alignof/_info
@@ -35,7 +35,7 @@
* }
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/alignof/alignof.h b/ccan/alignof/alignof.h
index d146e4cd..9a02f188 100644
--- a/ccan/alignof/alignof.h
+++ b/ccan/alignof/alignof.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_ALIGNOF_H
#define CCAN_ALIGNOF_H
#include "config.h"
diff --git a/ccan/array_size/LICENSE b/ccan/array_size/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/array_size/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/array_size/_info b/ccan/array_size/_info
index 0ecb45df..d670042d 100644
--- a/ccan/array_size/_info
+++ b/ccan/array_size/_info
@@ -29,7 +29,7 @@
* return 0;
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/array_size/array_size.h b/ccan/array_size/array_size.h
index 0876945c..0ca422a2 100644
--- a/ccan/array_size/array_size.h
+++ b/ccan/array_size/array_size.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_ARRAY_SIZE_H
#define CCAN_ARRAY_SIZE_H
#include "config.h"
diff --git a/ccan/build_assert/LICENSE b/ccan/build_assert/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/build_assert/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/build_assert/_info b/ccan/build_assert/_info
index 284c6cf5..bce92b7e 100644
--- a/ccan/build_assert/_info
+++ b/ccan/build_assert/_info
@@ -33,7 +33,7 @@
* return (char *)foo;
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/build_assert/build_assert.h b/ccan/build_assert/build_assert.h
index 24e59c44..b9ecd840 100644
--- a/ccan/build_assert/build_assert.h
+++ b/ccan/build_assert/build_assert.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_BUILD_ASSERT_H
#define CCAN_BUILD_ASSERT_H
diff --git a/ccan/check_type/LICENSE b/ccan/check_type/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/check_type/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/check_type/_info b/ccan/check_type/_info
index 33448b4f..cb19e202 100644
--- a/ccan/check_type/_info
+++ b/ccan/check_type/_info
@@ -14,7 +14,7 @@
* since they have to use sizeof() which can only distiguish between types of
* different size.
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/check_type/check_type.h b/ccan/check_type/check_type.h
index b1993471..77501a95 100644
--- a/ccan/check_type/check_type.h
+++ b/ccan/check_type/check_type.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_CHECK_TYPE_H
#define CCAN_CHECK_TYPE_H
#include "config.h"
diff --git a/ccan/compiler/LICENSE b/ccan/compiler/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/compiler/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/compiler/_info b/ccan/compiler/_info
index 9f394539..fc9318f6 100644
--- a/ccan/compiler/_info
+++ b/ccan/compiler/_info
@@ -21,7 +21,7 @@
* - IS_COMPILE_CONSTANT()
* For using different tradeoffs for compiletime vs runtime evaluation.
*
- * License: Public Domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*
* Example:
diff --git a/ccan/compiler/compiler.h b/ccan/compiler/compiler.h
index fcb89c8f..651b47ce 100644
--- a/ccan/compiler/compiler.h
+++ b/ccan/compiler/compiler.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_COMPILER_H
#define CCAN_COMPILER_H
#include "config.h"
diff --git a/ccan/container_of/LICENSE b/ccan/container_of/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/container_of/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/container_of/_info b/ccan/container_of/_info
index 2f45ca7c..77b3bd15 100644
--- a/ccan/container_of/_info
+++ b/ccan/container_of/_info
@@ -46,7 +46,7 @@
* return 0;
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h
index 1c9d147a..2943b8f0 100644
--- a/ccan/container_of/container_of.h
+++ b/ccan/container_of/container_of.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_CONTAINER_OF_H
#define CCAN_CONTAINER_OF_H
#include <stddef.h>
diff --git a/ccan/err/LICENSE b/ccan/err/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/err/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/err/_info b/ccan/err/_info
index 97bc0f9e..64cc2cef 100644
--- a/ccan/err/_info
+++ b/ccan/err/_info
@@ -22,7 +22,7 @@
* exit(0);
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/err/err.c b/ccan/err/err.c
index 9e0e20c8..33dd108a 100644
--- a/ccan/err/err.c
+++ b/ccan/err/err.c
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#include "err.h"
#if !HAVE_ERR_H
diff --git a/ccan/err/err.h b/ccan/err/err.h
index 58ad91c7..23e7f0c4 100644
--- a/ccan/err/err.h
+++ b/ccan/err/err.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_ERR_H
#define CCAN_ERR_H
#include "config.h"
diff --git a/ccan/hash/_info b/ccan/hash/_info
index 5aeb9121..4b425d39 100644
--- a/ccan/hash/_info
+++ b/ccan/hash/_info
@@ -13,7 +13,7 @@
* The stable ones will always give the same results on any computer,
* and on any version of this package.
*
- * License: Public Domain
+ * License: Public domain
* Maintainer: Rusty Russell <rusty@rustcorp.com.au>
* Author: Bob Jenkins <bob_jenkins@burtleburtle.net>
*/
diff --git a/ccan/hash/hash.h b/ccan/hash/hash.h
index f838e562..21706840 100644
--- a/ccan/hash/hash.h
+++ b/ccan/hash/hash.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_HASH_H
#define CCAN_HASH_H
#include "config.h"
diff --git a/ccan/isaac/LICENSE b/ccan/isaac/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/isaac/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/isaac/_info b/ccan/isaac/_info
index 6b46e041..81c6ff23 100644
--- a/ccan/isaac/_info
+++ b/ccan/isaac/_info
@@ -99,7 +99,7 @@
* return 0;
* }
*
- * License: Public Domain
+ * License: CC0 (Public domain)
* Ccanlint:
* // We actually depend on the LGPL ilog routines, so not PD :(
* license_depends_compat FAIL
diff --git a/ccan/isaac/isaac.c b/ccan/isaac/isaac.c
index b35ac417..e27a1890 100644
--- a/ccan/isaac/isaac.c
+++ b/ccan/isaac/isaac.c
@@ -1,4 +1,5 @@
-/*Written by Timothy B. Terriberry (tterribe@xiph.org) 1999-2009 public domain.
+/*Written by Timothy B. Terriberry (tterribe@xiph.org) 1999-2009.
+ CC0 (Public domain) - see LICENSE file for details
Based on the public domain implementation by Robert J. Jenkins Jr.*/
#include <float.h>
#include <math.h>
diff --git a/ccan/isaac/isaac.h b/ccan/isaac/isaac.h
index a254712b..fc874e5b 100644
--- a/ccan/isaac/isaac.h
+++ b/ccan/isaac/isaac.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#if !defined(_isaac_H)
# define _isaac_H (1)
# include <stdint.h>
diff --git a/ccan/isaac/isaac64.c b/ccan/isaac/isaac64.c
index 43ab0e6e..3a392fc9 100644
--- a/ccan/isaac/isaac64.c
+++ b/ccan/isaac/isaac64.c
@@ -1,4 +1,5 @@
-/*Written by Timothy B. Terriberry (tterribe@xiph.org) 1999-2009 public domain.
+/*Written by Timothy B. Terriberry (tterribe@xiph.org) 1999-2009
+ CC0 (Public domain) - see LICENSE file for details
Based on the public domain ISAAC implementation by Robert J. Jenkins Jr.*/
#include <float.h>
#include <math.h>
diff --git a/ccan/isaac/isaac64.h b/ccan/isaac/isaac64.h
index f4d4cd64..5c22253b 100644
--- a/ccan/isaac/isaac64.h
+++ b/ccan/isaac/isaac64.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#if !defined(_isaac64_H)
# define _isaac64_H (1)
# include <stdint.h>
diff --git a/ccan/noerr/LICENSE b/ccan/noerr/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/noerr/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/noerr/_info b/ccan/noerr/_info
index 7310e1bd..ebc407d8 100644
--- a/ccan/noerr/_info
+++ b/ccan/noerr/_info
@@ -45,7 +45,7 @@
* return true;
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/noerr/noerr.c b/ccan/noerr/noerr.c
index 439ac7e8..4368a5e7 100644
--- a/ccan/noerr/noerr.c
+++ b/ccan/noerr/noerr.c
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#include "noerr.h"
#include <unistd.h>
#include <errno.h>
diff --git a/ccan/noerr/noerr.h b/ccan/noerr/noerr.h
index 191b3d3c..99b0f690 100644
--- a/ccan/noerr/noerr.h
+++ b/ccan/noerr/noerr.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef NOERR_H
#define NOERR_H
#include <stdio.h>
diff --git a/ccan/short_types/LICENSE b/ccan/short_types/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/short_types/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/short_types/_info b/ccan/short_types/_info
index 333d84ef..cfd439e6 100644
--- a/ccan/short_types/_info
+++ b/ccan/short_types/_info
@@ -65,7 +65,7 @@
* return 0;
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/short_types/short_types.h b/ccan/short_types/short_types.h
index e34efe0e..f94ec098 100644
--- a/ccan/short_types/short_types.h
+++ b/ccan/short_types/short_types.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_SHORT_TYPES_H
#define CCAN_SHORT_TYPES_H
#include <stdint.h>
diff --git a/ccan/str/LICENSE b/ccan/str/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/str/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/str/_info b/ccan/str/_info
index a6858c3c..548f059d 100644
--- a/ccan/str/_info
+++ b/ccan/str/_info
@@ -35,7 +35,7 @@
* return 0;
* }
*
- * License: Public domain
+ * License: CC0 (Public domain)
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
int main(int argc, char *argv[])
diff --git a/ccan/str/debug.c b/ccan/str/debug.c
index 027915bc..8c519442 100644
--- a/ccan/str/debug.c
+++ b/ccan/str/debug.c
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#include "config.h"
#include <ccan/str/str_debug.h>
#include <assert.h>
diff --git a/ccan/str/str.c b/ccan/str/str.c
index fa9809fb..a9245c17 100644
--- a/ccan/str/str.c
+++ b/ccan/str/str.c
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#include <ccan/str/str.h>
size_t strcount(const char *haystack, const char *needle)
diff --git a/ccan/str/str.h b/ccan/str/str.h
index f9326085..85491bc7 100644
--- a/ccan/str/str.h
+++ b/ccan/str/str.h
@@ -1,4 +1,4 @@
-/* Placed into the public domain. */
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_STR_H
#define CCAN_STR_H
#include "config.h"
diff --git a/ccan/str/str_debug.h b/ccan/str/str_debug.h
index 6b564776..92c10c41 100644
--- a/ccan/str/str_debug.h
+++ b/ccan/str/str_debug.h
@@ -1,3 +1,4 @@
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_STR_DEBUG_H
#define CCAN_STR_DEBUG_H
diff --git a/ccan/strmap/_info b/ccan/strmap/_info
index 82f20d13..6d03b0ca 100644
--- a/ccan/strmap/_info
+++ b/ccan/strmap/_info
@@ -9,7 +9,7 @@
* http://cr.yp.to/critbit.html
* http://github.com/agl/critbit (which this code is based on)
*
- * License: Public domain (but some dependencies are LGPL!)
+ * License: CC0 (but some dependencies are LGPL!)
* Author: Rusty Russell <rusty@rustcorp.com.au>
* Ccanlint:
* license_depends_compat FAIL
diff --git a/ccan/strset/_info b/ccan/strset/_info
index b5df9dfa..1c7426e6 100644
--- a/ccan/strset/_info
+++ b/ccan/strset/_info
@@ -47,7 +47,7 @@
* // Given "foo bar" outputs "bar foo "
* // Given "foo foo bar" outputs "bar foo "
*
- * License: Public domain (but some dependencies are LGPL!)
+ * License: CC0 (but some dependencies are LGPL!)
* Author: Rusty Russell <rusty@rustcorp.com.au>
* Ccanlint:
* license_depends_compat FAIL
diff --git a/ccan/tcon/LICENSE b/ccan/tcon/LICENSE
new file mode 120000
index 00000000..b7951dab
--- /dev/null
+++ b/ccan/tcon/LICENSE
@@ -0,0 +1 @@
+../../licenses/CC0 \ No newline at end of file
diff --git a/ccan/tcon/_info b/ccan/tcon/_info
index 02c0dd8a..895da9e1 100644
--- a/ccan/tcon/_info
+++ b/ccan/tcon/_info
@@ -56,7 +56,7 @@
* // Given "foo" outputs "Last arg is foo of 1 arguments"
* // Given "foo bar" outputs "Last arg is bar of 2 arguments"
*
- * License: Public domain
+ * License: CC0 (Public domain)
*
* Author: Rusty Russell <rusty@rustcorp.com.au>
*/
diff --git a/ccan/tcon/tcon.h b/ccan/tcon/tcon.h
index 93c3ea6b..cf82f3e7 100644
--- a/ccan/tcon/tcon.h
+++ b/ccan/tcon/tcon.h
@@ -1,4 +1,4 @@
-/* Placed into the public domain */
+/* CC0 (Public domain) - see LICENSE file for details */
#ifndef CCAN_TCON_H
#define CCAN_TCON_H
#include "config.h"