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 /include | |
| 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 'include')
| -rw-r--r-- | include/internal/internal.h | 5 | ||||
| -rw-r--r-- | include/libnetfilter_conntrack/libnetfilter_conntrack.h | 8 | ||||
| -rw-r--r-- | include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h | 7 |
3 files changed, 5 insertions, 15 deletions
diff --git a/include/internal/internal.h b/include/internal/internal.h index a984e6b..7dce03c 100644 --- a/include/internal/internal.h +++ b/include/internal/internal.h @@ -1,9 +1,4 @@ /* - * (C) 2006 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. - * * WARNING: Do *NOT* ever include this file, only for internal use! * Use the set/get API in order to set/get the conntrack attributes */ diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index f5add1a..89d07ad 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -1,8 +1,10 @@ /* - * (C) 2005-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. */ #ifndef _LIBNETFILTER_CONNTRACK_H_ diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h index 89e957b..dc13e1e 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h @@ -1,10 +1,3 @@ -/* - * (C) 2009 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. - */ - #ifndef _LIBNETFILTER_CONNTRACK_DCCP_H_ #define _LIBNETFILTER_CONNTRACK_DCCP_H_ |