From 77fd4fa2827087dc00615137da78730500823259 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 7 Dec 2022 16:08:15 +0100 Subject: src: Add GPLv2+ header to .c files of recent creation This patch comes after a proposal of mine at NFWS 2022 that resulted in agreement to license recent .c files under GPLv2+ by the attendees at this meeting: - Stefano Brivio - Fernando F. Mancera - Phil Sutter - Jozsef Kadlecsik - Florian Westphal - Laura Garcia - Arturo Borrero - Pablo Neira It has already happened that one of the external library dependencies was moved to GPLv3+ (libreadline), resulting in a change to libedit by default in b4dded0ca78d ("configure: default to libedit for cli"). I have added the GPLv2+ header to the following files: Authors ------- src/cmd.c Pablo src/fib.c Florian src/hash.c Pablo src/iface.c Pablo src/json.c Phil + fixes from occasional contributors src/libnftables.c Eric Leblond and Phil src/mergesort.c Elise Lenion src/misspell.c Pablo src/mnl.c Pablo + fixes from occasional contributors src/monitor.c Arturo src/numgen.c Pablo src/osf.c Fernando src/owner.c Pablo src/parser_json.c Phil + fixes from occasional contributors src/print.c Phil src/xfrm.c Florian src/xt.c Pablo Eric Leblond and Elise Lennion did not attend NFWS 2022, but they acknowledged this license update already in the past when I proposed this to them in private emails. Update COPYING file too to refer that we are now moving towards GPLv2 or any later. Signed-off-by: Pablo Neira Ayuso --- src/cmd.c | 8 ++++++++ src/fib.c | 4 ++-- src/hash.c | 4 ++-- src/iface.c | 4 ++-- src/json.c | 8 ++++++++ src/libnftables.c | 5 ++--- src/mergesort.c | 4 ++-- src/misspell.c | 8 ++++++++ src/mnl.c | 4 ++-- src/monitor.c | 4 ++-- src/numgen.c | 4 ++-- src/osf.c | 8 ++++++++ src/owner.c | 8 ++++++++ src/parser_json.c | 8 ++++++++ src/print.c | 5 ++--- src/xfrm.c | 6 ++++-- src/xt.c | 6 +++--- 17 files changed, 73 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/cmd.c b/src/cmd.c index 63692422..9e375078 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2020 Pablo Neira Ayuso + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. + */ + #include #include #include diff --git a/src/fib.c b/src/fib.c index c6ad0f9c..98c57868 100644 --- a/src/fib.c +++ b/src/fib.c @@ -4,8 +4,8 @@ * Copyright (c) Red Hat GmbH. Author: Florian Westphal * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/hash.c b/src/hash.c index 42c50407..a3fd0872 100644 --- a/src/hash.c +++ b/src/hash.c @@ -4,8 +4,8 @@ * Copyright (c) 2016 Pablo Neira Ayuso * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/iface.c b/src/iface.c index c0642e0c..3647778c 100644 --- a/src/iface.c +++ b/src/iface.c @@ -2,8 +2,8 @@ * Copyright (c) 2015 Pablo Neira Ayuso * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/json.c b/src/json.c index 89ff8a34..f57f2f77 100644 --- a/src/json.c +++ b/src/json.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) Red Hat GmbH. Author: Phil Sutter + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. + */ + #define _GNU_SOURCE #include #include diff --git a/src/libnftables.c b/src/libnftables.c index a376825d..ec01a427 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -2,9 +2,8 @@ * Copyright (c) 2017 Eric Leblond * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include #include diff --git a/src/mergesort.c b/src/mergesort.c index dca71422..a3a9d605 100644 --- a/src/mergesort.c +++ b/src/mergesort.c @@ -2,8 +2,8 @@ * Copyright (c) 2017 Elise Lennion * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/misspell.c b/src/misspell.c index 6536d755..8992c75e 100644 --- a/src/misspell.c +++ b/src/misspell.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2018 Pablo Neira Ayuso + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. + */ + #include #include #include diff --git a/src/mnl.c b/src/mnl.c index e87b0338..62b0b59c 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -2,8 +2,8 @@ * Copyright (c) 2013-2017 Pablo Neira Ayuso * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. * * Development of this code funded by Astaro AG (http://www.astaro.com/) */ diff --git a/src/monitor.c b/src/monitor.c index 4b55872b..9692b859 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -2,8 +2,8 @@ * Copyright (c) 2015 Arturo Borrero Gonzalez * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/numgen.c b/src/numgen.c index ea2b2626..256514d1 100644 --- a/src/numgen.c +++ b/src/numgen.c @@ -4,8 +4,8 @@ * Copyright (c) 2016 Pablo Neira Ayuso * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/osf.c b/src/osf.c index cb58315d..c611b542 100644 --- a/src/osf.c +++ b/src/osf.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2018 Fernando Fernandez Mancera + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. + */ + #include #include #include diff --git a/src/owner.c b/src/owner.c index 20bed38b..c34b0c15 100644 --- a/src/owner.c +++ b/src/owner.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2021 Pablo Neira Ayuso + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. + */ + #include #include #include diff --git a/src/parser_json.c b/src/parser_json.c index 762e779d..ae683314 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) Red Hat GmbH. Author: Phil Sutter + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. + */ + #define _GNU_SOURCE #include #include /* needed by gmputil.h */ diff --git a/src/print.c b/src/print.c index d1b25e8b..4896e13c 100644 --- a/src/print.c +++ b/src/print.c @@ -2,9 +2,8 @@ * Copyright (c) 2017 Phil Sutter * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/xfrm.c b/src/xfrm.c index 80f0ea03..b27821a9 100644 --- a/src/xfrm.c +++ b/src/xfrm.c @@ -1,9 +1,11 @@ /* * XFRM (ipsec) expression * + * Copyright (c) Red Hat GmbH. Author: Florian Westphal + * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include diff --git a/src/xt.c b/src/xt.c index b75c94e8..9bfd8a2f 100644 --- a/src/xt.c +++ b/src/xt.c @@ -2,9 +2,9 @@ * Copyright (c) 2013-2015 Pablo Neira Ayuso * Copyright (c) 2015 Arturo Borrero Gonzalez * - * This program is free software; you can redistribute it and/or modifyi - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 (or any + * later) as published by the Free Software Foundation. */ #include -- cgit v1.2.3