src: Add GPLv2+ header to .c files of recent creation
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 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 PabloEric 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.
---
I am also Cc'ing the following authors that I did not reach out yet:
src/tcpopt.c Manuel Messner src/socket.c Mate Eckl src/rt.c Anders K. Pedersen src/ipopt.c Stephen Suryaputra
in case they have a chance to acknowledge the update of the license header of their original .c files to GPLv2+.
COPYING | 8 ++++---- 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 +++--- 18 files changed, 77 insertions(+), 29 deletions(-)
COPYING +4 -4
@@ -1,8 +1,8 @@ +Original author of nftables distributed the code under the terms of the +GPL version 2 *only*. New code though is moving to GPL version 2 or any +later which is the preferred license for this project these days. -nftables is distributed under the terms of the GPL version 2. Note that -*only* version 2 of the GPL applies, not "any later version". - -Patrick McHardy <[email protected]> +Pablo Neira Ayuso <[email protected]> -------------------------------------------------------------------------------
src/cmd.c +8 -0
@@ -1,3 +1,11 @@ +/* +* Copyright (c) 2020 Pablo Neira Ayuso <[email protected]> +* +* 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 <erec.h> #include <mnl.h> #include <cmd.h>
src/fib.c +2 -2
@@ -4,8 +4,8 @@* Copyright (c) Red Hat GmbH. Author: Florian Westphal <[email protected]> * * 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 <nftables.h>
src/hash.c +2 -2
@@ -4,8 +4,8 @@* Copyright (c) 2016 Pablo Neira Ayuso <[email protected]> * * 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 <nftables.h>
src/iface.c +2 -2
@@ -2,8 +2,8 @@* Copyright (c) 2015 Pablo Neira Ayuso <[email protected]> * * 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 <stdio.h>
src/json.c +8 -0
@@ -1,3 +1,11 @@ +/* +* Copyright (c) Red Hat GmbH. Author: Phil Sutter <[email protected]> +* +* 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 <stdio.h> #include <string.h>
src/libnftables.c +2 -3
@@ -2,9 +2,8 @@* Copyright (c) 2017 Eric Leblond <[email protected]> * * 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 <nftables/libnftables.h> #include <erec.h>
src/mergesort.c +2 -2
@@ -2,8 +2,8 @@* Copyright (c) 2017 Elise Lennion <[email protected]> * * 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 <stdint.h>
src/misspell.c +8 -0
@@ -1,3 +1,11 @@ +/* +* Copyright (c) 2018 Pablo Neira Ayuso <[email protected]> +* +* 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 <stdlib.h> #include <string.h> #include <limits.h>
src/mnl.c +2 -2
@@ -2,8 +2,8 @@* Copyright (c) 2013-2017 Pablo Neira Ayuso <[email protected]> * * 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/) */
src/monitor.c +2 -2
@@ -2,8 +2,8 @@* Copyright (c) 2015 Arturo Borrero Gonzalez <[email protected]> * * 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 <string.h>
src/numgen.c +2 -2
@@ -4,8 +4,8 @@* Copyright (c) 2016 Pablo Neira Ayuso <[email protected]> * * 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 <nftables.h>
src/osf.c +8 -0
@@ -1,3 +1,11 @@ +/* +* Copyright (c) 2018 Fernando Fernandez Mancera <[email protected]> +* +* 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 <nftables.h> #include <expression.h> #include <utils.h>
src/owner.c +8 -0
@@ -1,3 +1,11 @@ +/* +* Copyright (c) 2021 Pablo Neira Ayuso <[email protected]> +* +* 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 <stdio.h> #include <unistd.h> #include <stdlib.h>
src/parser_json.c +8 -0
@@ -1,3 +1,11 @@ +/* +* Copyright (c) Red Hat GmbH. Author: Phil Sutter <[email protected]> +* +* 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 <errno.h> #include <stdint.h> /* needed by gmputil.h */
src/print.c +2 -3
@@ -2,9 +2,8 @@* Copyright (c) 2017 Phil Sutter <[email protected]> * * 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 <stdarg.h>
src/xfrm.c +4 -2
@@ -1,9 +1,11 @@/* * XFRM (ipsec) expression * +* Copyright (c) Red Hat GmbH. Author: Florian Westphal <[email protected]> +* * 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 <nftables.h>
src/xt.c +3 -3
@@ -2,9 +2,9 @@* Copyright (c) 2013-2015 Pablo Neira Ayuso <[email protected]> * Copyright (c) 2015 Arturo Borrero Gonzalez <[email protected]> * -* 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 <stdlib.h>
Signature · 1 line
2.30.2
PATCH 1/1 src: Update copyright header to GPLv2+ in socket.c
--- src/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
src/socket.c +2 -2
@@ -4,8 +4,8 @@* Copyright (c) 2018 Máté Eckl <[email protected]> * * 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 <nftables.h>
Signature · 1 line
ecklm
Re: [PATCH nft] src: Update copyright header to GPLv2+ in socket.c
Quoted 4 lines · Máté Eckl
Cc Pablo Neira Ayuso <[email protected]>,Cc Balazs Scheidler <[email protected]>,Cc Florian Westphal <[email protected]>,Cc Phil Sutter <[email protected]>
Applied, thanks.
Pablo Neira Ayuso
maintainerOn Wed, Dec 07, 2022 at 04:08:15PM +0100, Pablo Neira Ayuso wrote:
[...]
Quoted 13 lines
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
Quoted 8 lines
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
I have applied this patch.