src: Add GPLv2+ header to .c files of recent creation

commit 77fd4fa2827087dc00615137da78730500823259 upstream.

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 <pablo@netfilter.org>

diff --git a/COPYING b/COPYING
index bf7f06ebabe0a065e34344f7857a146fdbc8c70b..a0dd81b918a23855d80abdc9b7c0f6372ae2fcc0 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -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 <kaber@trash.net>
+Pablo Neira Ayuso <pablo@netfilter.org>
 
 -------------------------------------------------------------------------------
 

diff --git a/src/cmd.c b/src/cmd.c
index 13f95abe69d5173bfd103b3d790e8a8f834e4152..8c0fc37193ede4c5fd93a53b5a4cc159fbaecc98 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2020 Pablo Neira Ayuso <pablo@netfilter.org>
+ *
+ * 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>

diff --git a/src/fib.c b/src/fib.c
index 08d113c18707e7289ef33c1ad57928ca5864e3dd..35f198c5217b0b815fcae7dde9baf635b38723f1 100644 (file)
--- a/src/fib.c
+++ b/src/fib.c
@@ -4,8 +4,8 @@
  * Copyright (c) Red Hat GmbH. Author: Florian Westphal <fw@strlen.de>
  *
  * 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>

diff --git a/src/hash.c b/src/hash.c
index 42c504073ae846c6d8910959930deb89ae7a3b67..a3fd0872c3b9606417836bde1daf218e4476f47c 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -4,8 +4,8 @@
  * Copyright (c) 2016 Pablo Neira Ayuso <pablo@netfilter.org>
  *
  * 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>

diff --git a/src/iface.c b/src/iface.c
index c0642e0cc397551e14e19d708f7c139ff0c76537..3647778c1f0d7d1db025c47d3fb48e24923cf4a8 100644 (file)
--- a/src/iface.c
+++ b/src/iface.c
@@ -2,8 +2,8 @@
  * Copyright (c) 2015 Pablo Neira Ayuso <pablo@netfilter.org>
  *
  * 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>

diff --git a/src/json.c b/src/json.c
index b0053e6f7aa3dfbe3de23912d41c8ef41f44a857..dc6c03b5e857fcf2efb9f3bd4e830473a8347fe3 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) Red Hat GmbH.  Author: Phil Sutter <phil@nwl.cc>
+ *
+ * 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>

diff --git a/src/libnftables.c b/src/libnftables.c
index 93f7b3395b793b5138ac7d428c273804036d191f..fdd18fc99b32fda1c7c8871435e5d273554c99c1 100644 (file)
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -2,9 +2,8 @@
  * Copyright (c) 2017 Eric Leblond <eric@regit.org>
  *
  * 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>

diff --git a/src/mergesort.c b/src/mergesort.c
index 3ed357f5113f1cb89ad07c56891ba6f09c2582f2..957e36e6310de782a938cbb08e3adce4d745dd61 100644 (file)
--- a/src/mergesort.c
+++ b/src/mergesort.c
@@ -2,8 +2,8 @@
  * Copyright (c) 2017 Elise Lennion <elise.lennion@gmail.com>
  *
  * 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>

diff --git a/src/misspell.c b/src/misspell.c
index 6536d7557a445c52f11a6adb3fcbdf20fd984f8b..8992c75e7bc1aa748c02248fa009eaf7c087b1d2 100644 (file)
--- a/src/misspell.c
+++ b/src/misspell.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2018 Pablo Neira Ayuso <pablo@netfilter.org>
+ *
+ * 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>

diff --git a/src/mnl.c b/src/mnl.c
index 64c7ec91dd17f0e4359d1555d584fb5703c86435..2d44a1ca692a68b60ad6d2d8fa530489c7464550 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -2,8 +2,8 @@
  * Copyright (c) 2013-2017 Pablo Neira Ayuso <pablo@netfilter.org>
  *
  * 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 d5986d7cdfe107c21641031dac6d81fdb09c39bd..064d4feca5cbe5724f10e9e148f47af8b6b5a541 100644 (file)
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -2,8 +2,8 @@
  * Copyright (c) 2015 Arturo Borrero Gonzalez <arturo@netfilter.org>
  *
  * 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>

diff --git a/src/numgen.c b/src/numgen.c
index ea2b262605f72109067fe678042ec4d1f2b9fbec..256514d146717b0c97292b4ef9dadfe26f487781 100644 (file)
--- a/src/numgen.c
+++ b/src/numgen.c
@@ -4,8 +4,8 @@
  * Copyright (c) 2016 Pablo Neira Ayuso <pablo@netfilter.org>
  *
  * 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>

diff --git a/src/osf.c b/src/osf.c
index cb58315d714d10119e65c4c80de2854ada53bf57..c611b542206d1549962aa42ef2d9877d72a05599 100644 (file)
--- a/src/osf.c
+++ b/src/osf.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2018 Fernando Fernandez Mancera <ffmancera@riseup.net>
+ *
+ * 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>

diff --git a/src/owner.c b/src/owner.c
index 20bed38b2a09f7742624702c028aed088ca00388..c34b0c1501fa20b4c661d053aac41c544f4136bd 100644 (file)
--- a/src/owner.c
+++ b/src/owner.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2021 Pablo Neira Ayuso <pablo@netfilter.org>
+ *
+ * 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>

diff --git a/src/parser_json.c b/src/parser_json.c
index d5cdc44243623692c858838546126fada4c889d3..10f5a592e532466b8568096f18164fea09e1d376 100644 (file)
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) Red Hat GmbH.  Author: Phil Sutter <phil@nwl.cc>
+ *
+ * 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 */

diff --git a/src/print.c b/src/print.c
index d1b25e8be871a27ce7c2bcf6cf224dfe8d4e130c..4896e13c2ca55a4ffff665f31d8196735bcc083b 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -2,9 +2,8 @@
  * Copyright (c) 2017 Phil Sutter <phil@nwl.cc>
  *
  * 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>

diff --git a/src/xfrm.c b/src/xfrm.c
index 80f0ea03742918d083afb24a0828e763d4b7a557..b27821a922f58a6641af11ae837db23cbd7b9b92 100644 (file)
--- a/src/xfrm.c
+++ b/src/xfrm.c
@@ -1,9 +1,11 @@
 /*
  * XFRM (ipsec) expression
  *
+ * Copyright (c) Red Hat GmbH.  Author: Florian Westphal <fw@strlen.de>
+ *
  * 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>

diff --git a/src/xt.c b/src/xt.c
index 6d5866d4e1d090b3ff69bce80fe4603468906e1d..b0d708559877a9b49030220cd8ab1c70efc4ac92 100644 (file)
--- a/src/xt.c
+++ b/src/xt.c
@@ -2,9 +2,9 @@
  * Copyright (c) 2013-2015 Pablo Neira Ayuso <pablo@netfilter.org>
  * Copyright (c) 2015 Arturo Borrero Gonzalez <arturo@debian.org>
  *
- * 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>