opt: relicense to GPLv2+ (from GPLv3+)

Acked by contributors:
Luke-Jr <luke@dashjr.org>:
	 I don't have any objections
Douglas Bagnall <douglas@halo.gen.nz>:
	Fine by me.
Joel Stanley <joel@jms.id.au>:
	Fine with me.
Brad Hards <bradh@frogmouth.net>:
	Ack.

No response from Joey (trivial warning patch) or Andreas Schlick (one
trivial patch, but he also wrote opt_free() (which was a 2 line function).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/ccan/opt/LICENSE b/ccan/opt/LICENSE
index 190cfd5ed15e145962c5847eb3477c4f13805268..9961ca9d9cffb40daa53a8a43ceb8e4b68c267aa 120000 (symlink)
--- a/ccan/opt/LICENSE
+++ b/ccan/opt/LICENSE
@@ -1 +1 @@
-../../licenses/GPL-3
\ No newline at end of file
+../../licenses/GPL-2
\ No newline at end of file

diff --git a/ccan/opt/_info b/ccan/opt/_info
index 9595a168f7e90b6ae5936029c630941721cff21e..9d47c48f62abaf2933130d031fbd07bbdc7d7304 100644 (file)
--- a/ccan/opt/_info
+++ b/ccan/opt/_info
@@ -52,7 +52,7 @@
  *     return 0;
  * }
  *
- * License: GPL (v3 or any later version)
+ * License: GPL (v2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])

diff --git a/ccan/opt/helpers.c b/ccan/opt/helpers.c
index 48f4fa45991ed1809438f55ae4f840485b0d3946..2c771bc3309062aa7cfea03423f719128f3c9686 100644 (file)
--- a/ccan/opt/helpers.c
+++ b/ccan/opt/helpers.c
@@ -1,4 +1,4 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 #include <ccan/cast/cast.h>
 #include <inttypes.h>

diff --git a/ccan/opt/opt.c b/ccan/opt/opt.c
index 85de935a7d3b77fc2591b1435b1b38e79ff741cf..09b29bcaf669e0768cb48866b8dc696f3ffc1c72 100644 (file)
--- a/ccan/opt/opt.c
+++ b/ccan/opt/opt.c
@@ -1,4 +1,4 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 #include <string.h>
 #include <errno.h>

diff --git a/ccan/opt/opt.h b/ccan/opt/opt.h
index 2aee409589b5ecf97a4da7d8b65a206a917c5954..3dd4edc640b268fd4ad8fa76eff578d6f941807b 100644 (file)
--- a/ccan/opt/opt.h
+++ b/ccan/opt/opt.h
@@ -1,4 +1,4 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #ifndef CCAN_OPT_H
 #define CCAN_OPT_H
 #include <ccan/compiler/compiler.h>

diff --git a/ccan/opt/parse.c b/ccan/opt/parse.c
index 14c7afbb083b3a0cc9eb5e5f88d46ba105464ebd..94d75ad1fbe02ee77cd522f8615b7dff36998056 100644 (file)
--- a/ccan/opt/parse.c
+++ b/ccan/opt/parse.c
@@ -1,4 +1,4 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 /* Actual code to parse commandline. */
 #include <ccan/opt/opt.h>
 #include <string.h>

diff --git a/ccan/opt/private.h b/ccan/opt/private.h
index 8d7815c86b8a90da32c87807f0424b17291d42ae..47b8c4e056eead80956103965c1324033da9b05a 100644 (file)
--- a/ccan/opt/private.h
+++ b/ccan/opt/private.h
@@ -1,4 +1,4 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #ifndef CCAN_OPT_PRIVATE_H
 #define CCAN_OPT_PRIVATE_H
 

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 3edc4cf87ade8c8158eed5f01f9500944ae7c264..b71fb334627f174fbc8bfd2022e87c0304d43fd8 100644 (file)
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -1,4 +1,4 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 #if HAVE_SYS_TERMIOS_H
 #include <sys/ioctl.h>