diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-25 18:18:27 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-25 12:03:40 +0200 |
| commit | 6e72370fd7d55950820a6a8332cd4364e97ba28a (patch) | |
| tree | c1ad34d155faed92d0fbb6b3eb9f511103d9bc21 /lib/ccan/str | |
| parent | 91bc5a0d75c94285093cd43b2d7ba3bf5c4b4085 (diff) | |
| download | samba-6e72370fd7d55950820a6a8332cd4364e97ba28a.tar.gz samba-6e72370fd7d55950820a6a8332cd4364e97ba28a.tar.bz2 samba-6e72370fd7d55950820a6a8332cd4364e97ba28a.zip | |
lib/ccan: update to init-1192-gdd04041
This imports licensing clarifications and updates as discussed on
samba-technical ("Subject: Re: ccan code breaks older build farm
systems").
In particular, the recent version have per-file license markers, and
some modules are relicenced more liberally: in particular Simo pointed
out that htable was GPL, and indirectly included by libtdb2, which
would have made that GPL as well.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Mon Jul 25 12:03:40 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/ccan/str')
| -rw-r--r-- | lib/ccan/str/_info | 2 | ||||
| -rw-r--r-- | lib/ccan/str/debug.c | 1 | ||||
| -rw-r--r-- | lib/ccan/str/str.c | 1 | ||||
| -rw-r--r-- | lib/ccan/str/str.h | 1 | ||||
| -rw-r--r-- | lib/ccan/str/str_debug.h | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/lib/ccan/str/_info b/lib/ccan/str/_info index ea314dbf79..2d52291a6c 100644 --- a/lib/ccan/str/_info +++ b/lib/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 <rusty@rustcorp.com.au> */ int main(int argc, char *argv[]) diff --git a/lib/ccan/str/debug.c b/lib/ccan/str/debug.c index 9ef756766a..42d19f8197 100644 --- a/lib/ccan/str/debug.c +++ b/lib/ccan/str/debug.c @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #include "config.h" #include <ccan/str/str_debug.h> #include <assert.h> diff --git a/lib/ccan/str/str.c b/lib/ccan/str/str.c index fa9809fbd9..0271a59885 100644 --- a/lib/ccan/str/str.c +++ b/lib/ccan/str/str.c @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #include <ccan/str/str.h> size_t strcount(const char *haystack, const char *needle) diff --git a/lib/ccan/str/str.h b/lib/ccan/str/str.h index ae51cdcc99..7392e30fba 100644 --- a/lib/ccan/str/str.h +++ b/lib/ccan/str/str.h @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #ifndef CCAN_STR_H #define CCAN_STR_H #include "config.h" diff --git a/lib/ccan/str/str_debug.h b/lib/ccan/str/str_debug.h index 6b56477689..f029e8ef90 100644 --- a/lib/ccan/str/str_debug.h +++ b/lib/ccan/str/str_debug.h @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #ifndef CCAN_STR_DEBUG_H #define CCAN_STR_DEBUG_H |