From 8fc7a90a8db345c4276419d11f8731afc63f65f5 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 19 Jul 2011 17:32:40 +0930 Subject: [PATCH] various: make the _info License: wording uniform for GPL variants. GPL versions 2 and 3 both specifically mention "any later version" as the phrase which allows the user to choose to upgrade the license. Make sure we use that phrase, and make the format consistent across modules. --- ccan/alignof/_info | 2 +- ccan/alloc/_info | 2 +- ccan/antithread/_info | 2 +- ccan/array_size/_info | 2 +- ccan/build_assert/_info | 2 +- ccan/check_type/_info | 2 +- ccan/compiler/_info | 2 +- ccan/container_of/_info | 2 +- ccan/crcsync/_info | 2 +- ccan/endian/_info | 2 +- ccan/foreach/_info | 2 +- ccan/grab_file/_info | 2 +- ccan/htable/_info | 2 +- ccan/idtree/_info | 2 +- ccan/ilog/_info | 2 +- ccan/iscsi/_info | 2 +- ccan/jbitset/_info | 2 +- ccan/jmap/_info | 2 +- ccan/likely/_info | 2 +- ccan/list/_info | 2 +- ccan/md4/_info | 2 +- ccan/noerr/_info | 2 +- ccan/ogg_to_pcm/_info | 2 +- ccan/opt/_info | 2 +- ccan/rbtree/_info | 2 +- ccan/read_write_all/_info | 2 +- ccan/short_types/_info | 2 +- ccan/sparse_bsearch/_info | 2 +- ccan/str/_info | 2 +- ccan/str_talloc/_info | 2 +- ccan/talloc/_info | 2 +- ccan/talloc_link/_info | 2 +- ccan/tally/_info | 2 +- ccan/tdb/_info | 2 +- ccan/tdb2/_info | 2 +- ccan/typesafe_cb/_info | 2 +- ccan/wwviaudio/_info | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ccan/alignof/_info b/ccan/alignof/_info index bfec824d..04a7a789 100644 --- a/ccan/alignof/_info +++ b/ccan/alignof/_info @@ -35,7 +35,7 @@ * } * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/alloc/_info b/ccan/alloc/_info index 6b0fef92..e4a47bac 100644 --- a/ccan/alloc/_info +++ b/ccan/alloc/_info @@ -93,7 +93,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/antithread/_info b/ccan/antithread/_info index a6899c43..9caff0e4 100644 --- a/ccan/antithread/_info +++ b/ccan/antithread/_info @@ -81,7 +81,7 @@ * return 0; * } * - * License: GPL (3 or any later version) + * License: GPL (v3 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/array_size/_info b/ccan/array_size/_info index af7ef1cf..56ba7998 100644 --- a/ccan/array_size/_info +++ b/ccan/array_size/_info @@ -29,7 +29,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/build_assert/_info b/ccan/build_assert/_info index 0906af07..97451a8e 100644 --- a/ccan/build_assert/_info +++ b/ccan/build_assert/_info @@ -33,7 +33,7 @@ * return (char *)foo; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/check_type/_info b/ccan/check_type/_info index 4cb3ff17..1c141fad 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: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/compiler/_info b/ccan/compiler/_info index c55ba22f..b51d93a6 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: LGPL (3 or any later version) + * License: LGPL (v3 or any later version) * Author: Rusty Russell * * Example: diff --git a/ccan/container_of/_info b/ccan/container_of/_info index cc912320..8db29d80 100644 --- a/ccan/container_of/_info +++ b/ccan/container_of/_info @@ -46,7 +46,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/crcsync/_info b/ccan/crcsync/_info index 55d92d96..de60af4b 100644 --- a/ccan/crcsync/_info +++ b/ccan/crcsync/_info @@ -67,7 +67,7 @@ * return 0; * } * - * License: LGPL (v2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/endian/_info b/ccan/endian/_info index a239d253..84e9597f 100644 --- a/ccan/endian/_info +++ b/ccan/endian/_info @@ -37,7 +37,7 @@ * exit(0); * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/foreach/_info b/ccan/foreach/_info index 11f1b732..f1a3c01d 100644 --- a/ccan/foreach/_info +++ b/ccan/foreach/_info @@ -10,7 +10,7 @@ * (ie. gcc), and not too bad (ie. a few compares and mallocs) for * other compilers. * - * License: LGPL (3 or any later version) + * License: LGPL (v3 or any later version) * Author: Rusty Russell * * Example: diff --git a/ccan/grab_file/_info b/ccan/grab_file/_info index 83d911fe..5bae7a56 100644 --- a/ccan/grab_file/_info +++ b/ccan/grab_file/_info @@ -35,7 +35,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/htable/_info b/ccan/htable/_info index 8dabe46a..6c889d06 100644 --- a/ccan/htable/_info +++ b/ccan/htable/_info @@ -98,7 +98,7 @@ * return 0; * } * - * License: GPLv2 (or later) + * License: GPL (v2 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/idtree/_info b/ccan/idtree/_info index 36df6fd6..f04e00ef 100644 --- a/ccan/idtree/_info +++ b/ccan/idtree/_info @@ -36,7 +36,7 @@ * return 0; * } * - * License: GPL (2 or any later version) + * License: GPL (v2 or any later version) * Maintainer: Rusty Russell * Author: Jim Houston */ diff --git a/ccan/ilog/_info b/ccan/ilog/_info index 56de50d6..9a92f4e7 100644 --- a/ccan/ilog/_info +++ b/ccan/ilog/_info @@ -29,7 +29,7 @@ * return 0; * } * - * License: LGPL (v2 or later) + * License: LGPL (v2.1 or any later version) * Author: Timothy B. Terriberry */ #include diff --git a/ccan/iscsi/_info b/ccan/iscsi/_info index 33ae4e46..f75f2c25 100644 --- a/ccan/iscsi/_info +++ b/ccan/iscsi/_info @@ -11,7 +11,7 @@ * session, as well as a low level scsi library to create scsi cdb's * and parse/unmarshall data-in structures. * - * License: GPL (3 or any later version) + * License: GPL (v3 or any later version) * Author: Ronnie Sahlberg */ int main(int argc, char *argv[]) diff --git a/ccan/jbitset/_info b/ccan/jbitset/_info index 4fa4dd98..52f7f127 100644 --- a/ccan/jbitset/_info +++ b/ccan/jbitset/_info @@ -58,7 +58,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/jmap/_info b/ccan/jmap/_info index b7347f73..cad473bf 100644 --- a/ccan/jmap/_info +++ b/ccan/jmap/_info @@ -73,7 +73,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/likely/_info b/ccan/likely/_info index 471c1ffc..252169b3 100644 --- a/ccan/likely/_info +++ b/ccan/likely/_info @@ -9,7 +9,7 @@ * help you annotate rare paths in your code for the convenience of the * compiler and the reader. * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell * * Example: diff --git a/ccan/list/_info b/ccan/list/_info index a7daa133..8b5bd9b5 100644 --- a/ccan/list/_info +++ b/ccan/list/_info @@ -52,7 +52,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/md4/_info b/ccan/md4/_info index 1fb9d003..1d1a74e2 100644 --- a/ccan/md4/_info +++ b/ccan/md4/_info @@ -31,7 +31,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) */ int main(int argc, char *argv[]) { diff --git a/ccan/noerr/_info b/ccan/noerr/_info index 899e36c3..8749f877 100644 --- a/ccan/noerr/_info +++ b/ccan/noerr/_info @@ -45,7 +45,7 @@ * return true; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/ogg_to_pcm/_info b/ccan/ogg_to_pcm/_info index e9e03d68..7ae6594a 100644 --- a/ccan/ogg_to_pcm/_info +++ b/ccan/ogg_to_pcm/_info @@ -24,7 +24,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * */ int main(int argc, char *argv[]) diff --git a/ccan/opt/_info b/ccan/opt/_info index a464e951..9bcf5393 100644 --- a/ccan/opt/_info +++ b/ccan/opt/_info @@ -49,7 +49,7 @@ * return 0; * } * - * License: GPL (3 or any later version) + * License: GPL (v3 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/rbtree/_info b/ccan/rbtree/_info index 81ed5171..58afa05d 100644 --- a/ccan/rbtree/_info +++ b/ccan/rbtree/_info @@ -27,7 +27,7 @@ * This code originates from ctdb, where talloc based trees keyed are * used in several places. * - * License: GPL (3 or any later version) + * License: GPL (v3 or any later version) * Author: Ronnie Sahlberg * * Example: diff --git a/ccan/read_write_all/_info b/ccan/read_write_all/_info index 0f65fe59..d70cbd1d 100644 --- a/ccan/read_write_all/_info +++ b/ccan/read_write_all/_info @@ -28,7 +28,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/short_types/_info b/ccan/short_types/_info index e4f3d42c..8beb4495 100644 --- a/ccan/short_types/_info +++ b/ccan/short_types/_info @@ -65,7 +65,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/sparse_bsearch/_info b/ccan/sparse_bsearch/_info index 13d24197..a2b77c10 100644 --- a/ccan/sparse_bsearch/_info +++ b/ccan/sparse_bsearch/_info @@ -50,7 +50,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/str/_info b/ccan/str/_info index ea314dbf..2d52291a 100644 --- a/ccan/str/_info +++ b/ccan/str/_info @@ -35,7 +35,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/str_talloc/_info b/ccan/str_talloc/_info index 4edee27b..b29a4879 100644 --- a/ccan/str_talloc/_info +++ b/ccan/str_talloc/_info @@ -35,7 +35,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/talloc/_info b/ccan/talloc/_info index 46173d96..9a189455 100644 --- a/ccan/talloc/_info +++ b/ccan/talloc/_info @@ -89,7 +89,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) */ int main(int argc, char *argv[]) { diff --git a/ccan/talloc_link/_info b/ccan/talloc_link/_info index 9f2bb146..d1cdb24b 100644 --- a/ccan/talloc_link/_info +++ b/ccan/talloc_link/_info @@ -129,7 +129,7 @@ * return 0; * } * - * License: GPL (2 or any later version) + * License: GPL (v2 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/tally/_info b/ccan/tally/_info index 1d67274f..6dab9b7d 100644 --- a/ccan/tally/_info +++ b/ccan/tally/_info @@ -40,7 +40,7 @@ * return 0; * } * - * License: LGPL (3 or any later version) + * License: LGPL (v3 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/tdb/_info b/ccan/tdb/_info index 53ac6059..a20ef98a 100644 --- a/ccan/tdb/_info +++ b/ccan/tdb/_info @@ -63,7 +63,7 @@ * * Author: Andrew Tridgell, Jeremy Allison, Rusty Russell * - * License: LGPLv3 (or later) + * License: LGPL (v3 or any later version) * * Ccanlint: * // valgrind breaks fcntl locks. diff --git a/ccan/tdb2/_info b/ccan/tdb2/_info index 884916ab..b849b0f0 100644 --- a/ccan/tdb2/_info +++ b/ccan/tdb2/_info @@ -64,7 +64,7 @@ * * Author: Rusty Russell * - * License: LGPLv3 (or later) + * License: LGPL (v3 or any later version) */ int main(int argc, char *argv[]) { diff --git a/ccan/typesafe_cb/_info b/ccan/typesafe_cb/_info index 2fe4fec0..a3cdeab5 100644 --- a/ccan/typesafe_cb/_info +++ b/ccan/typesafe_cb/_info @@ -135,7 +135,7 @@ * return 0; * } * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell */ int main(int argc, char *argv[]) diff --git a/ccan/wwviaudio/_info b/ccan/wwviaudio/_info index d7e9f3c5..9bb15d84 100644 --- a/ccan/wwviaudio/_info +++ b/ccan/wwviaudio/_info @@ -37,7 +37,7 @@ * wwviaudio_cancel_all_sounds(); * wwviaduio_stop_portaudio(); * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * */ int main(int argc, char *argv[]) -- 2.39.2