diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-30 00:49:35 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-30 00:49:35 +0100 |
commit | 3c5b8711a83caad7d6e4525a823002cac0f593a4 (patch) | |
tree | f827b82eb84920a708306acde5bb4052b5c6af9a /src/expect | |
parent | e429d0b35f7e505b814c61786bb2df9eff51ab05 (diff) |
src: clarify licensing terms of library (GPLv2+)
This patch is *not* changing the licensing terms of this library (which
was initially released under GPLv2 and later on extended to GPLv2+ after
contacting all the contributors who kindly agreed to extend it to any
later GPL version).
Jan says: "In libnetfilter_conntrack, there are many .c files declaring
GNU GPL incorporated herein by reference without telling which version(s)
exactly apply. Given src/main.c for example is actually GPL-2.0+,
the reference made is ambiguous."
This patch should definitely clarify this.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expect')
-rw-r--r-- | src/expect/api.c | 8 | ||||
-rw-r--r-- | src/expect/build.c | 8 | ||||
-rw-r--r-- | src/expect/getter.c | 8 | ||||
-rw-r--r-- | src/expect/parse.c | 8 | ||||
-rw-r--r-- | src/expect/setter.c | 8 | ||||
-rw-r--r-- | src/expect/snprintf.c | 8 | ||||
-rw-r--r-- | src/expect/snprintf_default.c | 8 |
7 files changed, 35 insertions, 21 deletions
diff --git a/src/expect/api.c b/src/expect/api.c index 863f4c0..cf45091 100644 --- a/src/expect/api.c +++ b/src/expect/api.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include <stdlib.h> diff --git a/src/expect/build.c b/src/expect/build.c index 82aa852..175698a 100644 --- a/src/expect/build.c +++ b/src/expect/build.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include "internal/internal.h" diff --git a/src/expect/getter.c b/src/expect/getter.c index 69453c5..2f8df76 100644 --- a/src/expect/getter.c +++ b/src/expect/getter.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include "internal/internal.h" diff --git a/src/expect/parse.c b/src/expect/parse.c index 4d9852d..22d28ed 100644 --- a/src/expect/parse.c +++ b/src/expect/parse.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include "internal/internal.h" diff --git a/src/expect/setter.c b/src/expect/setter.c index 08b3547..40e06f3 100644 --- a/src/expect/setter.c +++ b/src/expect/setter.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include "internal/internal.h" diff --git a/src/expect/snprintf.c b/src/expect/snprintf.c index 9eccfa4..69ec8b6 100644 --- a/src/expect/snprintf.c +++ b/src/expect/snprintf.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include "internal/internal.h" diff --git a/src/expect/snprintf_default.c b/src/expect/snprintf_default.c index 6958552..7af9d15 100644 --- a/src/expect/snprintf_default.c +++ b/src/expect/snprintf_default.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org> * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. */ #include "internal/internal.h" |