diff options
| author | Phil Sutter <phil@nwl.cc> | 2024-10-16 18:47:32 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2024-10-30 12:51:17 +0100 |
| commit | e944a0afbc21a6baa73544f74a8c7525fd127c28 (patch) | |
| tree | 15280ba0acbabee152e6cee5762d0de3c85421a3 /src | |
| parent | 0576274ad54a3aae2750e7a49bed1e0f406b61cc (diff) | |
Use SPDX License Identifiers in headers
Replace the copyright notice in header comments by an equivalent
SPDX-License-Identifier string. Drop a following empty line if at the
bottom of the comment. Leave any other header comment content in place.
This also fixes for an incomplete notice in examples/nft-ruleset-get.c
since commit c335442eefcca ("src: incorrect header refers to GPLv2
only").
Signed-off-by: Phil Sutter <phil@nwl.cc>
Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
60 files changed, 60 insertions, 301 deletions
diff --git a/src/batch.c b/src/batch.c index 8a9c6f9..2fca5fc 100644 --- a/src/batch.c +++ b/src/batch.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013-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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "internal.h" diff --git a/src/chain.c b/src/chain.c index c9fbc3a..7287dcd 100644 --- a/src/chain.c +++ b/src/chain.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ #include "internal.h" diff --git a/src/common.c b/src/common.c index ec84fa0..e661227 100644 --- a/src/common.c +++ b/src/common.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdlib.h> @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ #include "internal.h" diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index e99131a..1a945e9 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index 383e80d..903c775 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/cmp.c b/src/expr/cmp.c index d1f0f64..f55a8c0 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c index fcac8bf..02b9ecc 100644 --- a/src/expr/connlimit.c +++ b/src/expr/connlimit.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2018 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/counter.c b/src/expr/counter.c index cef9119..80f21d7 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/ct.c b/src/expr/ct.c index bea0522..b01fbc5 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index d2ccf2e..fd5e0d6 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/dup.c b/src/expr/dup.c index 28d686b..d49cdb7 100644 --- a/src/expr/dup.c +++ b/src/expr/dup.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/dynset.c b/src/expr/dynset.c index 9d2bfe5..40f9136 100644 --- a/src/expr/dynset.c +++ b/src/expr/dynset.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014, 2015 Patrick McHardy <kaber@trash.net> - * - * 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.h" diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c index 453902c..339527d 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/fib.c b/src/expr/fib.c index 20bc125..c378f4f 100644 --- a/src/expr/fib.c +++ b/src/expr/fib.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/fwd.c b/src/expr/fwd.c index 04cb089..d543e22 100644 --- a/src/expr/fwd.c +++ b/src/expr/fwd.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/hash.c b/src/expr/hash.c index eb44b2e..050e4b9 100644 --- a/src/expr/hash.c +++ b/src/expr/hash.c @@ -1,11 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 by Laura Garcia <nevola@gmail.com> - * - * 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> diff --git a/src/expr/immediate.c b/src/expr/immediate.c index ab1276a..f0e0a78 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/inner.c b/src/expr/inner.c index 4f66e94..8a56bb3 100644 --- a/src/expr/inner.c +++ b/src/expr/inner.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2022 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "internal.h" diff --git a/src/expr/last.c b/src/expr/last.c index 8e5b88e..427d4b5 100644 --- a/src/expr/last.c +++ b/src/expr/last.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/limit.c b/src/expr/limit.c index 5b82108..b77b27e 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/log.c b/src/expr/log.c index 18ec2b6..d4b53e6 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/lookup.c b/src/expr/lookup.c index 21a7fce..7f85ecc 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/masq.c b/src/expr/masq.c index e0565db..da4f437 100644 --- a/src/expr/masq.c +++ b/src/expr/masq.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2014 by Arturo Borrero Gonzalez <arturo@debian.org> - * - * 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> diff --git a/src/expr/match.c b/src/expr/match.c index 8c1bc74..2c5bd6b 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/meta.c b/src/expr/meta.c index 136a450..56d3dda 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/nat.c b/src/expr/nat.c index 1235ba4..3ce1aaf 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -1,12 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2014 Pablo Neira Ayuso <pablo@netfilter.org> * (C) 2012 Intel Corporation * - * 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. - * * Authors: * Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> */ diff --git a/src/expr/numgen.c b/src/expr/numgen.c index c015b88..e3af372 100644 --- a/src/expr/numgen.c +++ b/src/expr/numgen.c @@ -1,11 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 by Laura Garcia <nevola@gmail.com> - * - * 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> diff --git a/src/expr/objref.c b/src/expr/objref.c index 0053805..5fe09c2 100644 --- a/src/expr/objref.c +++ b/src/expr/objref.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/payload.c b/src/expr/payload.c index 35cd10c..c3ac0c3 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/queue.c b/src/expr/queue.c index 09220c4..0160d5e 100644 --- a/src/expr/queue.c +++ b/src/expr/queue.c @@ -1,11 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * */ #include <stdio.h> diff --git a/src/expr/quota.c b/src/expr/quota.c index ddf232f..108c87c 100644 --- a/src/expr/quota.c +++ b/src/expr/quota.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/range.c b/src/expr/range.c index 96bb140..b05724f 100644 --- a/src/expr/range.c +++ b/src/expr/range.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "internal.h" diff --git a/src/expr/redir.c b/src/expr/redir.c index 9971306..be38f62 100644 --- a/src/expr/redir.c +++ b/src/expr/redir.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2014 by Arturo Borrero Gonzalez <arturo@debian.org> - * - * 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> diff --git a/src/expr/reject.c b/src/expr/reject.c index 9090db3..5d8763e 100644 --- a/src/expr/reject.c +++ b/src/expr/reject.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/rt.c b/src/expr/rt.c index ff4fd03..633031e 100644 --- a/src/expr/rt.c +++ b/src/expr/rt.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Anders K. Pedersen <akp@cohaesio.com> - * - * 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> diff --git a/src/expr/socket.c b/src/expr/socket.c index 7a25cdf..822ee8b 100644 --- a/src/expr/socket.c +++ b/src/expr/socket.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Máté Eckl <ecklm94@gmail.com> - * - * 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> diff --git a/src/expr/target.c b/src/expr/target.c index 8259a20..3549456 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c index 9391ce8..4cc9125 100644 --- a/src/expr/tproxy.c +++ b/src/expr/tproxy.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Máté Eckl <ecklm94@gmail.com> - * - * 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.h" diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c index 861e56d..b51b6c7 100644 --- a/src/expr/tunnel.c +++ b/src/expr/tunnel.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2018 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c index 2585579..ba2107d 100644 --- a/src/expr/xfrm.c +++ b/src/expr/xfrm.c @@ -1,9 +1,4 @@ -/* - * 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. - */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <stdio.h> #include <string.h> @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2014 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "internal.h" diff --git a/src/obj/counter.c b/src/obj/counter.c index 19e09ed..c9462cd 100644 --- a/src/obj/counter.c +++ b/src/obj/counter.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c index b4d6faa..65c6d08 100644 --- a/src/obj/ct_expect.c +++ b/src/obj/ct_expect.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2019 by Stéphane Veyret <sveyret@gmail.com> - * - * 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 <arpa/inet.h> diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c index 1feccf2..6e16f08 100644 --- a/src/obj/ct_helper.c +++ b/src/obj/ct_helper.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2017 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c index b9b688e..22ce918 100644 --- a/src/obj/ct_timeout.c +++ b/src/obj/ct_timeout.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2018 by Harsha Sharma <harshasharmaiitr@gmail.com> - * - * 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> diff --git a/src/obj/limit.c b/src/obj/limit.c index cbf30b4..fe1a88f 100644 --- a/src/obj/limit.c +++ b/src/obj/limit.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Pablo M. Bermudo Garay <pablombg@gmail.com> - * - * 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> diff --git a/src/obj/quota.c b/src/obj/quota.c index 526db8e..0eda0a5 100644 --- a/src/obj/quota.c +++ b/src/obj/quota.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/obj/secmark.c b/src/obj/secmark.c index eea9664..25b04e2 100644 --- a/src/obj/secmark.c +++ b/src/obj/secmark.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c index 0309410..980bffd 100644 --- a/src/obj/tunnel.c +++ b/src/obj/tunnel.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2018 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include <stdio.h> diff --git a/src/object.c b/src/object.c index 9d15031..bfcceb9 100644 --- a/src/object.c +++ b/src/object.c @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2016 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "internal.h" @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ #include "internal.h" diff --git a/src/ruleset.c b/src/ruleset.c index 185aa48..ac50aa6 100644 --- a/src/ruleset.c +++ b/src/ruleset.c @@ -1,13 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by Pablo Neira Ayuso <pablo@netfilter.org> * (C) 2013 by Arturo Borrero Gonzalez <arturo@debian.org> * (C) 2013 by Alvaro Neira Ayuso <alvaroneay@gmail.com> * - * 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. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ #include "internal.h" diff --git a/src/set_elem.c b/src/set_elem.c index 9207a0d..848adf1 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ #include "internal.h" diff --git a/src/str_array.c b/src/str_array.c index 63471bd..5669c61 100644 --- a/src/str_array.c +++ b/src/str_array.c @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2024 Red Hat GmbH * Author: Phil Sutter <phil@nwl.cc> - * - * SPDX-License-Identifier: GPL-2.0-or-later */ #include <libmnl/libmnl.h> #include <linux/netfilter/nf_tables.h> diff --git a/src/table.c b/src/table.c index b1b164c..9870dca 100644 --- a/src/table.c +++ b/src/table.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * This code has been sponsored by Sophos Astaro <http://www.sophos.com> */ #include "internal.h" diff --git a/src/trace.c b/src/trace.c index f426437..f7eb45e 100644 --- a/src/trace.c +++ b/src/trace.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2015 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 as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #include "internal.h" diff --git a/src/udata.c b/src/udata.c index e9bfc35..a195657 100644 --- a/src/udata.c +++ b/src/udata.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2016 by Pablo Neira Ayuso <pablo@netfilter.org> * (C) 2016 by Carlos Falgueras García <carlosfg@riseup.net> - * - * 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 <libnftnl/udata.h> diff --git a/src/utils.c b/src/utils.c index 2f1ffd6..5f2c5bf 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2012-2013 by Pablo Neira Ayuso <pablo@netfilter.org> * (C) 2013 by Arturo Borrero Gonzalez <arturo@debian.org> - * - * 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.h> |