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/conntrack | |
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/conntrack')
-rw-r--r-- | src/conntrack/api.c | 8 | ||||
-rw-r--r-- | src/conntrack/bsf.c | 8 | ||||
-rw-r--r-- | src/conntrack/build.c | 8 | ||||
-rw-r--r-- | src/conntrack/compare.c | 8 | ||||
-rw-r--r-- | src/conntrack/copy.c | 8 | ||||
-rw-r--r-- | src/conntrack/filter.c | 8 | ||||
-rw-r--r-- | src/conntrack/getter.c | 8 | ||||
-rw-r--r-- | src/conntrack/grp.c | 8 | ||||
-rw-r--r-- | src/conntrack/grp_getter.c | 8 | ||||
-rw-r--r-- | src/conntrack/grp_setter.c | 8 | ||||
-rw-r--r-- | src/conntrack/objopt.c | 8 | ||||
-rw-r--r-- | src/conntrack/parse.c | 8 | ||||
-rw-r--r-- | src/conntrack/setter.c | 8 | ||||
-rw-r--r-- | src/conntrack/snprintf.c | 8 | ||||
-rw-r--r-- | src/conntrack/snprintf_default.c | 8 | ||||
-rw-r--r-- | src/conntrack/snprintf_xml.c | 8 | ||||
-rw-r--r-- | src/conntrack/stack.c | 8 |
17 files changed, 85 insertions, 51 deletions
diff --git a/src/conntrack/api.c b/src/conntrack/api.c index a13bfc0..738aa51 100644 --- a/src/conntrack/api.c +++ b/src/conntrack/api.c @@ -1,8 +1,10 @@ /* - * (C) 2006 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/conntrack/bsf.c b/src/conntrack/bsf.c index 3e2ac98..dddeccb 100644 --- a/src/conntrack/bsf.c +++ b/src/conntrack/bsf.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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/conntrack/build.c b/src/conntrack/build.c index f80089a..484f4d3 100644 --- a/src/conntrack/build.c +++ b/src/conntrack/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/conntrack/compare.c b/src/conntrack/compare.c index 1cdad1c..cc0afc9 100644 --- a/src/conntrack/compare.c +++ b/src/conntrack/compare.c @@ -1,8 +1,10 @@ /* - * (C) 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/conntrack/copy.c b/src/conntrack/copy.c index cdce0de..459741b 100644 --- a/src/conntrack/copy.c +++ b/src/conntrack/copy.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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/conntrack/filter.c b/src/conntrack/filter.c index 6af4fe8..026545a 100644 --- a/src/conntrack/filter.c +++ b/src/conntrack/filter.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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/conntrack/getter.c b/src/conntrack/getter.c index 0b56468..c94fe2e 100644 --- a/src/conntrack/getter.c +++ b/src/conntrack/getter.c @@ -1,8 +1,10 @@ /* - * (C) 2006 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/conntrack/grp.c b/src/conntrack/grp.c index 3034011..295444d 100644 --- a/src/conntrack/grp.c +++ b/src/conntrack/grp.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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/conntrack/grp_getter.c b/src/conntrack/grp_getter.c index 943e065..db5b67d 100644 --- a/src/conntrack/grp_getter.c +++ b/src/conntrack/grp_getter.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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/conntrack/grp_setter.c b/src/conntrack/grp_setter.c index 70b5fef..324aa4c 100644 --- a/src/conntrack/grp_setter.c +++ b/src/conntrack/grp_setter.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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/conntrack/objopt.c b/src/conntrack/objopt.c index 6180663..d2035fb 100644 --- a/src/conntrack/objopt.c +++ b/src/conntrack/objopt.c @@ -1,8 +1,10 @@ /* - * (C) 2006 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/conntrack/parse.c b/src/conntrack/parse.c index ee3074d..416573f 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -1,8 +1,10 @@ /* - * (C) 2006 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/conntrack/setter.c b/src/conntrack/setter.c index df06b04..3969859 100644 --- a/src/conntrack/setter.c +++ b/src/conntrack/setter.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2008 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/conntrack/snprintf.c b/src/conntrack/snprintf.c index 5e45073..9a9017d 100644 --- a/src/conntrack/snprintf.c +++ b/src/conntrack/snprintf.c @@ -1,8 +1,10 @@ /* - * (C) 2006 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/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c index beb1991..158e404 100644 --- a/src/conntrack/snprintf_default.c +++ b/src/conntrack/snprintf_default.c @@ -1,8 +1,10 @@ /* - * (C) 2006-2008 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/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c index 12dd686..72e2787 100644 --- a/src/conntrack/snprintf_xml.c +++ b/src/conntrack/snprintf_xml.c @@ -1,8 +1,10 @@ /* - * (C) 2006 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/conntrack/stack.c b/src/conntrack/stack.c index 404e38b..ac3f437 100644 --- a/src/conntrack/stack.c +++ b/src/conntrack/stack.c @@ -1,8 +1,10 @@ /* - * (C) 2008 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 <stdio.h> |