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>

diff --git a/examples/nft-chain-add.c b/examples/nft-chain-add.c
index 13be982324180f4e4e5c4b8664fe1f7cec1528e4..29a5b082455274dad275285f45efc4cddaae4490 100644 (file)
--- a/examples/nft-chain-add.c
+++ b/examples/nft-chain-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-chain-del.c b/examples/nft-chain-del.c
index 3cd483ea6c027b5e05a195b6d4341994bb058219..3d333b777dfe1942e58b6051835f543ea64189b0 100644 (file)
--- a/examples/nft-chain-del.c
+++ b/examples/nft-chain-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-chain-get.c b/examples/nft-chain-get.c
index 612f58be7553ccbd37643869651e1ffffc5ffc8b..764ffc35718c8c69f055b59df3c8af9b346c517e 100644 (file)
--- a/examples/nft-chain-get.c
+++ b/examples/nft-chain-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-compat-get.c b/examples/nft-compat-get.c
index 8f00cbf5b8242b83e5aa5ebb6b980a9762979b06..fd308db9c460007ede3ba8d3def9586c3bc4d89d 100644 (file)
--- a/examples/nft-compat-get.c
+++ b/examples/nft-compat-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-ct-expectation-add.c b/examples/nft-ct-expectation-add.c
index d9b9cdb2f68b831e6609602fdb223543bf1e768a..8608a6bf322e7515abd231b9288e14b460fe027c 100644 (file)
--- a/examples/nft-ct-expectation-add.c
+++ b/examples/nft-ct-expectation-add.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 <time.h>

diff --git a/examples/nft-ct-expectation-del.c b/examples/nft-ct-expectation-del.c
index 67dbd4777ed03b4903e9be771248d3d7649fa1c1..54b6ab6d1686d6f72f835f51b548e4b216108c69 100644 (file)
--- a/examples/nft-ct-expectation-del.c
+++ b/examples/nft-ct-expectation-del.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 <stdlib.h>

diff --git a/examples/nft-ct-expectation-get.c b/examples/nft-ct-expectation-get.c
index 12c1350024c6ab6e2cf8b1fcfc971f773dcfdab7..2ae6003a3047c8d17b1b0adb3974a19d8a5522b0 100644 (file)
--- a/examples/nft-ct-expectation-get.c
+++ b/examples/nft-ct-expectation-get.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 <stdlib.h>

diff --git a/examples/nft-ct-helper-add.c b/examples/nft-ct-helper-add.c
index 397443ba74db3e45b5c828010ed1aa7d2bdef539..4d182798f00f9695397c885c96b45b843417b772 100644 (file)
--- a/examples/nft-ct-helper-add.c
+++ b/examples/nft-ct-helper-add.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 <stdlib.h>

diff --git a/examples/nft-ct-helper-del.c b/examples/nft-ct-helper-del.c
index fda3026cd69b9b4bc1a5d9d51f8778c0bd581491..ce8a2a06ba11e0f1532854d24670c880c731c553 100644 (file)
--- a/examples/nft-ct-helper-del.c
+++ b/examples/nft-ct-helper-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-ct-helper-get.c b/examples/nft-ct-helper-get.c
index 34134af196a83f64bc269f28bd015f6c73c0e4ea..84b2faccdb7bcb2a282ed485046b76a5fa5651a0 100644 (file)
--- a/examples/nft-ct-helper-get.c
+++ b/examples/nft-ct-helper-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-ct-timeout-add.c b/examples/nft-ct-timeout-add.c
index 4c2052ea75cc62a27deb93853761deb6bf115e39..e0e10ee3df8c35b49a9212eefd2bd34897a7b3a0 100644 (file)
--- a/examples/nft-ct-timeout-add.c
+++ b/examples/nft-ct-timeout-add.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 <stdlib.h>

diff --git a/examples/nft-ct-timeout-del.c b/examples/nft-ct-timeout-del.c
index 4581c3986fda7976729729865a7ad1c4bc3481bc..9b31d58150aa593ca9b614e5103822015dab2491 100644 (file)
--- a/examples/nft-ct-timeout-del.c
+++ b/examples/nft-ct-timeout-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-ct-timeout-get.c b/examples/nft-ct-timeout-get.c
index 18aed52e987e416573d1706be742cb6f58c61d58..f87efac7f84ee28a0f00a18d5f281914f5d26360 100644 (file)
--- a/examples/nft-ct-timeout-get.c
+++ b/examples/nft-ct-timeout-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-events.c b/examples/nft-events.c
index 8aab90a118242287a4f2c18b5f59c77aeb777976..bd4618da1487efe6db64fb4f1c8240373d435435 100644 (file)
--- a/examples/nft-events.c
+++ b/examples/nft-events.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-map-add.c b/examples/nft-map-add.c
index e5ce664af6b5bc532d5484d76b1327bea034c433..6caf42f2a375bda0a515b471bc4a128602ea87a7 100644 (file)
--- a/examples/nft-map-add.c
+++ b/examples/nft-map-add.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 <stdlib.h>

diff --git a/examples/nft-obj-add.c b/examples/nft-obj-add.c
index f526b3c0857720d5a7b09de37fd3dabde32dbf6b..9b123b9dd6b96bf243b8c6d79c1479c8f57d0bcb 100644 (file)
--- a/examples/nft-obj-add.c
+++ b/examples/nft-obj-add.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 <stdlib.h>

diff --git a/examples/nft-obj-del.c b/examples/nft-obj-del.c
index ae4f703146180dcc8f88eccd69e2bae5d1bf0a3b..a23d5224a14fba570f7ca3e9b3753e5f2cde1c84 100644 (file)
--- a/examples/nft-obj-del.c
+++ b/examples/nft-obj-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-obj-get.c b/examples/nft-obj-get.c
index e560ed008f8485482688d3fa492bf5194e2cb18c..c0ddbed0efcabb92cad2ea5f23a231e726fa61b7 100644 (file)
--- a/examples/nft-obj-get.c
+++ b/examples/nft-obj-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
index 7d13b92f6ef5585199fff9a8a8a26b86ce1c65f0..937b4366a29b86470ceb38e15e3a93b8628b5ad2 100644 (file)
--- a/examples/nft-rule-add.c
+++ b/examples/nft-rule-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-rule-ct-expectation-add.c b/examples/nft-rule-ct-expectation-add.c
index 07c8306d9154c2e52bcdf44abff6348decfa5075..31f674a9d3956e6011207ed7ed8917f86d15b7f4 100644 (file)
--- a/examples/nft-rule-ct-expectation-add.c
+++ b/examples/nft-rule-ct-expectation-add.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 <stdlib.h>

diff --git a/examples/nft-rule-ct-helper-add.c b/examples/nft-rule-ct-helper-add.c
index 594e6ba8e6ddc4720d5cb6d5da9528e08cf9ad00..eceb1cbf5be70ceade6f88b5b98d2519b4fab1b7 100644 (file)
--- a/examples/nft-rule-ct-helper-add.c
+++ b/examples/nft-rule-ct-helper-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-rule-ct-timeout-add.c b/examples/nft-rule-ct-timeout-add.c
index 0953cb4a396f1b7b1730addd42dcfe0bbdf7de3a..4fb4be80535ec73f3fc69b926e6bc0867c8f21c3 100644 (file)
--- a/examples/nft-rule-ct-timeout-add.c
+++ b/examples/nft-rule-ct-timeout-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
index cb085ff10b3bbbbf47a62b8fb97f48c873d928b5..f0e594834f90e8fcd8e62ad01c87ba69063a10ff 100644 (file)
--- a/examples/nft-rule-del.c
+++ b/examples/nft-rule-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-rule-get.c b/examples/nft-rule-get.c
index 8da5b59ae372ca6e75b36b948b1326a0b4a814c5..865bad5789c1f6386fc894286d1b36bbb2683387 100644 (file)
--- a/examples/nft-rule-get.c
+++ b/examples/nft-rule-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-ruleset-get.c b/examples/nft-ruleset-get.c
index 34ebe1fb6155c2cd7f8cf45df05cbca6a202a1cb..c53084704e4815ea5ce0b0a1ab0123724203899c 100644 (file)
--- a/examples/nft-ruleset-get.c
+++ b/examples/nft-ruleset-get.c
@@ -1,14 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (c) 2013 Arturo Borrero Gonzalez <arturo@debian.org>
  *
  * based on previous code from:
  *
  * Copyright (c) 2013 Pablo Neira Ayuso <pablo@netfilter.org>
- *
- * 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>

diff --git a/examples/nft-set-add.c b/examples/nft-set-add.c
index 109e33a75ac0ebe86285ca48717587f334b8e56f..7447b4088d2ed5204ca569844484fda17db4f28d 100644 (file)
--- a/examples/nft-set-add.c
+++ b/examples/nft-set-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-set-del.c b/examples/nft-set-del.c
index 5e8dea975a7395a54e3415c2b066e1ce098c573d..4ff9e040f6df25b22d736b6f91f432b4eef15a1b 100644 (file)
--- a/examples/nft-set-del.c
+++ b/examples/nft-set-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-set-elem-add.c b/examples/nft-set-elem-add.c
index 4b8b37c086a433c418256aef73d3a95913c531f2..09b8f02ec97f60a81d00269384151dd848285913 100644 (file)
--- a/examples/nft-set-elem-add.c
+++ b/examples/nft-set-elem-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-set-elem-del.c b/examples/nft-set-elem-del.c
index 1e6c90df816875518f03f123f395b0c6d2ed1b58..2382f4fb0653c86667e75cd5fb80e32c2f67e0a9 100644 (file)
--- a/examples/nft-set-elem-del.c
+++ b/examples/nft-set-elem-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-set-elem-get.c b/examples/nft-set-elem-get.c
index 7f99a602b0317a0e78de1f7bec06c111bee4e813..1863f72c3ca1d5c0b2758ceef05a0a1d16d27f25 100644 (file)
--- a/examples/nft-set-elem-get.c
+++ b/examples/nft-set-elem-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-set-get.c b/examples/nft-set-get.c
index 48a0699cad2ba3606f733b4b0ad05138106edd75..5848165d77eb403a24754a8080148bad7f365cfd 100644 (file)
--- a/examples/nft-set-get.c
+++ b/examples/nft-set-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-table-add.c b/examples/nft-table-add.c
index 3d54e0e5d5097ceb076302a577c35f23c0b909b8..0079e095e52d14656f18e1d82a5aff5b605db5df 100644 (file)
--- a/examples/nft-table-add.c
+++ b/examples/nft-table-add.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-table-del.c b/examples/nft-table-del.c
index 44f0b1f0e090282df8064c6d3134b1b91fdfb651..b04bd750d1dd5053984b9754396c0c845dc418ea 100644 (file)
--- a/examples/nft-table-del.c
+++ b/examples/nft-table-del.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c
index 58eca9c1f32e2efbedb1295ba75fdbc8cd93e452..3e76747a0fbeac8a4b9a34da6e62b313624158e3 100644 (file)
--- a/examples/nft-table-get.c
+++ b/examples/nft-table-get.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/examples/nft-table-upd.c b/examples/nft-table-upd.c
index 7346636d5d47b1034f435ffaf3dfa122968e3842..247af5d986effa1371f8a6553d2c9ed2706df5cc 100644 (file)
--- a/examples/nft-table-upd.c
+++ b/examples/nft-table-upd.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 software has been sponsored by Sophos Astaro <http://www.sophos.com>
  */
 

diff --git a/src/batch.c b/src/batch.c
index 8a9c6f910f1d5e6dc2cf3f37cc310370a86b7655..2fca5fc698d7f3950b6cbd02c0410688cab6a576 100644 (file)
--- 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 c9fbc3a87314b6fc21d73909c64ed81f2bafeebf..7287dcd98e898680312ed0754656b3ec8d658540 100644 (file)
--- 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 ec84fa0db541f9690d2a795526a537e92cac1700..e661227c6d43fdab023b5a9e7349509b23fac148 100644 (file)
--- 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>

diff --git a/src/expr.c b/src/expr.c
index 4e32189c6e8d0cb9c86acbdadf3155b55c46285d..65180d6849cd83abb8ebd935c58a19dfa4134bfd 100644 (file)
--- a/src/expr.c
+++ b/src/expr.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>
  */
 #include "internal.h"

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index e99131a090ed7fbaf1bc5b0d58c00860c9eb1c3b..1a945e9167c61288c4c00db07ff9d9b05becc1be 100644 (file)
--- 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 383e80d57b44261c650f12a16c5ec31159e7af54..903c775bf19639b62c082ee8ae1bc51923870244 100644 (file)
--- 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 d1f0f64a56b3b9dc36bf93fe61484698a293a378..f55a8c0299e131889ac5242e4a601fd89f1268ab 100644 (file)
--- 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 fcac8bf170ac4121cc5b1800ad1eb725463e08b1..02b9ecc87d25863bf4e467249d75e19bee510a4b 100644 (file)
--- 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 cef911908981c5dbd14deb7ca7dbffe8a85b87b7..80f21d7a177ea6ea0ba24d75ad521dd724b5cca9 100644 (file)
--- 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 bea0522d89372ee8ab1c8336277fbedd0af6bb49..b01fbc58bd2854989b13ef2f6e733b45bb0078e4 100644 (file)
--- 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 d2ccf2e8dc682c85104748412c7d318b49a95dfc..fd5e0d6e749e17a37dfca81c9b504e94f79b8c0f 100644 (file)
--- 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 28d686b1351b8be0918dc09bb7be1a38a727251d..d49cdb77c1081118457d3f54446a73be9bbc7ab7 100644 (file)
--- 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 9d2bfe5e206b1c5490bf24904675641516825f8e..40f9136ab73a291b8c3642f8dfbfe0862d633c03 100644 (file)
--- 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 453902c230173912d3e40432ac44a3b99b0b27e3..339527dcd193c6465b6372131b49f3b27ba1bc0d 100644 (file)
--- 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 20bc125aa3adf464e57a7c35de300d1e2a290407..c378f4f51bb11196a1d0ee171441c50b0bc4402d 100644 (file)
--- 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 04cb089a7146ed76520fe37bf207b98f97426c4e..d543e2239af207047666ad8faeea9f170afec140 100644 (file)
--- 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 eb44b2ea9bb69d0267d3250305f6885891c6ac00..050e4b9b1c5993841ec1e0b4d04c65fc54f07807 100644 (file)
--- 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 ab1276a1772cc6718bc44a422c8dbcf554fcb216..f0e0a78d6b794eee53bddc351acac5c0f49ecd98 100644 (file)
--- 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 4f66e944ec91ae3b5ddafd9f4c874ad7b5616d4e..8a56bb336cff52053f4094c9c8f446456e94fb99 100644 (file)
--- 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 8e5b88ebb96be6ffd3d2c38809eb21cb8738659e..427d4b52a1aec163086c49fbc5e661d7a752667f 100644 (file)
--- 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 5b821081eb20d83c58a5047f7c2f4c37333c5f9b..b77b27e024acb0550fc2c7ef6d2ddcba67de02ac 100644 (file)
--- 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 18ec2b64a5b936d8b99948354be7d713be08ee9a..d4b53e6c744dee25d12eafae2bcefac027f1e01c 100644 (file)
--- 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 21a7fcef40413e765fa2c761fb780f45f9b5f10f..7f85ecca008f5fd395f1ae58b463a0a9cb6d2078 100644 (file)
--- 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 e0565db66fe1601ebbd32e022219d06aba214216..da4f437f136c0472a5630bfbe9da0d0a9f210360 100644 (file)
--- 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 8c1bc74a1ce1947e032b1adcdaabdf143281da90..2c5bd6bb74d19da40371de0ffa8a0fcbacff99db 100644 (file)
--- 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 136a450b6e976e5cbffb040d2639509beed4273c..56d3ddaffa226635a0c237244b700023cb784644 100644 (file)
--- 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 1235ba45b694df7ea27a7d79c0a9c9038524072c..3ce1aafda55e40bf71d92fc2ad1c3c16ad9ae687 100644 (file)
--- 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 c015b8847aa483b9f7d3f10d4fd176e34c51fde7..e3af37241072056a87e7c082856dcc99ab0cd047 100644 (file)
--- 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 00538057222b562a6c03e8898c6e613e9ffb79c6..5fe09c242ef480b4fe2c95d8cde4b11bd883b4ce 100644 (file)
--- 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 35cd10c31b98a0ed76dd5ad219b6c1612a25eee4..c3ac0c345aec6e237a61f623385f9fb726628563 100644 (file)
--- 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 09220c4a1138c66cc6c1b73ee27ead303b49982b..0160d5e25f83612bef500a3bdc60b7512192f257 100644 (file)
--- 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 ddf232f9f3acdb2511a361524a8dc864b0c7de45..108c87c04530d9b175f09f8888e3c459d4e7624a 100644 (file)
--- 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 96bb140119b66cb14dcc7775c4f60dacfdb08789..b05724fc5fa4f04d3af120b5119607a112ff5367 100644 (file)
--- 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 9971306130fb0b36f6d3776ba822ba947faf19be..be38f6257a8f131323e67a3852f37eef3dd4a1dc 100644 (file)
--- 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 9090db3f697a701693f84752fa33ef98173555b7..5d8763ebb5ef0f8ab7c1be42b08849c09f01c513 100644 (file)
--- 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 ff4fd03c8f1b1cf706474856e8b035ee64293c83..633031e1427c3dd2082748712f8333b984bb58e6 100644 (file)
--- 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 7a25cdf806d12a21616c700d22f0c65491d3bfde..822ee8b9b832e0a6ab6ec02b132b1dba84feb35b 100644 (file)
--- 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 8259a20a66cb51b5bb024d2244b5566bf61bf272..3549456b430ffde7c9ccf3e7fc29def9e1212bf3 100644 (file)
--- 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 9391ce880cd3bca4e92cffee165923e1350c2a3b..4cc9125f1de65c8f76a0776f04d973353785ff4e 100644 (file)
--- 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 861e56dd64c27404a0a8ef8736e17a3dca12a50e..b51b6c75130869a38974e70c4322ba64ed4927b1 100644 (file)
--- 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 2585579c3b549958880c461ffe9121cf84b1db35..ba2107d63c0822e58d7c130705d7f390c48f41dd 100644 (file)
--- 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>

diff --git a/src/gen.c b/src/gen.c
index 88efbaaba9accdbe232c05881152f037db49869d..45349bc8fedcf02fba4c902852a4f4e1aceda690 100644 (file)
--- a/src/gen.c
+++ b/src/gen.c
@@ -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 19e09ed41a94aaa7b23e49fa7e1f28848e9f8f86..c9462cd3225c61acebc04f5b38a9e180f7094723 100644 (file)
--- 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 b4d6faa810eab66e914e975b8cfdd6cf53859445..65c6d08623df4355558e7106252ff0377ef6545d 100644 (file)
--- 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 1feccf20b01b2813aec27e9736d99d7c4dcc7695..6e16f083f2f2b1c95125d5bbe90a29147c5298ca 100644 (file)
--- 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 b9b688ec7c4bce445349c0b53585c082130da2f6..22ce9181a2e306b4e8d34a395b9d357b2bd4f481 100644 (file)
--- 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 cbf30b480b8faa447995cd937f68e20bd1201426..fe1a88f07d0bf64f1c9434cc73baba294e5c1295 100644 (file)
--- 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 526db8e42caa8f16264b9344e7f7a05c48ab29d7..0eda0a506322802d34e15229004028bef3d97067 100644 (file)
--- 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 eea96647cff72252fe20f8051d9470aec346e3ab..25b04e206eef01affbe247877df0061546790e00 100644 (file)
--- 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 03094109db442e690384a7b969916f18b5a8610e..980bffdb91916755f4f6e067488f9af745e58963 100644 (file)
--- 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 9d150315d487d08f5a42f0ed76b6d884e662dc12..bfcceb9df5e159ce270dac3b08f1274eb22f8d58 100644 (file)
--- 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"
 

diff --git a/src/rule.c b/src/rule.c
index c22918a8f35271228aed856665c8689fb3737616..3948a74098fe74170ff3cc6e4e00030afcb5d23f 100644 (file)
--- a/src/rule.c
+++ b/src/rule.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/ruleset.c b/src/ruleset.c
index 185aa48737e5075a526fd4f7da81a84533da117b..ac50aa604f9858543e77257f077e9fe8a95166de 100644 (file)
--- 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>
  */
 

diff --git a/src/set.c b/src/set.c
index 75ad64e0385027b5b012edde820dff0559666643..d2f6a944c68412df13ad38efaa275e6977139c89 100644 (file)
--- a/src/set.c
+++ b/src/set.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/set_elem.c b/src/set_elem.c
index 9207a0dbd6899d77f002605055be334f83ecac50..848adf1d179bf75f6bc6fa4ed641a8c1d1671676 100644 (file)
--- 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 63471bd08aaca4bc6a4b88781f2f2fcdb6d1b32a..5669c6154d394c2836097f54885313ed61dc951e 100644 (file)
--- 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 b1b164cbbcedc25dfb6d1156708d1a1cdf875144..9870dcafb4ef65134b3b69913a772eca29671659 100644 (file)
--- 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 f4264377508e8c08480440850fac6217a7ad6b97..f7eb45ed6704d7418a10c04b6e6c818c261e4232 100644 (file)
--- 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 e9bfc35e624c657c29b0f87cb64442c8a952f03e..a1956571ef5fd6046995c25859eb28e2ac6ab9d5 100644 (file)
--- 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 2f1ffd62275834c8fcf07ac575f01725398d9295..5f2c5bff7c6506f975a8408b833155a91201b485 100644 (file)
--- 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>

diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c
index 64c506eb62a1506b246e9ba67f1f53d498409768..0d0544a8173a95454adaa3276c4483b18d050151 100644 (file)
--- a/tests/nft-chain-test.c
+++ b/tests/nft-chain-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c
index 44c4bf06f041072893d9245e0f2a7d1cca37156e..d98569ce4a8fd2b956cf70010b1899c09ba1bc0d 100644 (file)
--- a/tests/nft-expr_bitwise-test.c
+++ b/tests/nft-expr_bitwise-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_byteorder-test.c b/tests/nft-expr_byteorder-test.c
index 30e64c0eb61005dc2358c5864d79693b3edf0759..dfd697321652dc4c756a066d7673a668a71c9442 100644 (file)
--- a/tests/nft-expr_byteorder-test.c
+++ b/tests/nft-expr_byteorder-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c
index 0bab67b851a814490b81f97f3eca2f018d73f3a0..e5f5c9bcdd084adfcab0cb13332a6bc732945018 100644 (file)
--- a/tests/nft-expr_cmp-test.c
+++ b/tests/nft-expr_cmp-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_counter-test.c b/tests/nft-expr_counter-test.c
index 81c3fe10d74b33cdda45e9e5856711ec7f81e9ac..b9b5501202f836a84f38cf46a04eb79ec8866e66 100644 (file)
--- a/tests/nft-expr_counter-test.c
+++ b/tests/nft-expr_counter-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_ct-test.c b/tests/nft-expr_ct-test.c
index 548a426dd84649a1d32337e6a35633d7a9924df3..b6b192e6057a0016c1bc5c3d90651603604eed1f 100644 (file)
--- a/tests/nft-expr_ct-test.c
+++ b/tests/nft-expr_ct-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_dup-test.c b/tests/nft-expr_dup-test.c
index 0c5df9a9b7d446aba1a576d56b7419e61e35e26a..1865d499b0ba682ed47be3a98ddb842a6be6a473 100644 (file)
--- a/tests/nft-expr_dup-test.c
+++ b/tests/nft-expr_dup-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_exthdr-test.c b/tests/nft-expr_exthdr-test.c
index b2c72b7357c6afdb2d9645515fbd1d6216675b00..514eebeba705d678f0317cca45dd587ec93dcf57 100644 (file)
--- a/tests/nft-expr_exthdr-test.c
+++ b/tests/nft-expr_exthdr-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_fwd-test.c b/tests/nft-expr_fwd-test.c
index 825dad3a456bd50e4a4dc7aad542a750453be5a6..a52caa9f1ef1a1ed960a1178aa7bd83a0f62e8c7 100644 (file)
--- a/tests/nft-expr_fwd-test.c
+++ b/tests/nft-expr_fwd-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_hash-test.c b/tests/nft-expr_hash-test.c
index 6644bb7f3ac0d0df195fe9693804d569e6168616..e2e59e958cc8d277d76c74320847f5d6ce8bf3df 100644 (file)
--- a/tests/nft-expr_hash-test.c
+++ b/tests/nft-expr_hash-test.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/tests/nft-expr_immediate-test.c b/tests/nft-expr_immediate-test.c
index 5027813626b1dcf9ceb8d7701f13623d2de1e006..e054c23bc6007ebc488286633d81efea4e60dbea 100644 (file)
--- a/tests/nft-expr_immediate-test.c
+++ b/tests/nft-expr_immediate-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_limit-test.c b/tests/nft-expr_limit-test.c
index 38aaf56551e97fb583a0f8530b88c056ab521a75..4347f9c79dccd641148f3755c63ecfe98da4400e 100644 (file)
--- a/tests/nft-expr_limit-test.c
+++ b/tests/nft-expr_limit-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c
index 275ffaefc377222bfaf38b90ba8e7d29fb3e2848..2fc5ad6050aa55dca39cc3d3a51a22e6a01355ac 100644 (file)
--- a/tests/nft-expr_log-test.c
+++ b/tests/nft-expr_log-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c
index 9b7052565d6e99a4a885bbf9741192b354c60651..de84ea8c04a6ca2e7f366f186e76f5ee12c7915c 100644 (file)
--- a/tests/nft-expr_lookup-test.c
+++ b/tests/nft-expr_lookup-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_masq-test.c b/tests/nft-expr_masq-test.c
index 09179149421e24d54806c6f67056801ba1afec51..1705dc02ccc5aad0b07febbea9dd8f5bcb349d43 100644 (file)
--- a/tests/nft-expr_masq-test.c
+++ b/tests/nft-expr_masq-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c
index fdeacc488e2886620131d01a9ce24e6c11ec9169..53a8b849c484722b705ff3030249bd935d07c23a 100644 (file)
--- a/tests/nft-expr_match-test.c
+++ b/tests/nft-expr_match-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_meta-test.c b/tests/nft-expr_meta-test.c
index 2f03fb16f7b809f1795326e7a533a9c7c88b93f3..43c665f0325ed7afdc241369be9d32111c2c22f1 100644 (file)
--- a/tests/nft-expr_meta-test.c
+++ b/tests/nft-expr_meta-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_nat-test.c b/tests/nft-expr_nat-test.c
index 3a365dd307c26bc2cd3694695978bfa362fb6c8f..983e1afc8ce9cd194cb648bacd9d375f610db860 100644 (file)
--- a/tests/nft-expr_nat-test.c
+++ b/tests/nft-expr_nat-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_numgen-test.c b/tests/nft-expr_numgen-test.c
index 94df50f6e40c5a6d5d8cce048994fbdfa4fe221b..666043e0732e5d14798d54edf4c3a138d75dc983 100644 (file)
--- a/tests/nft-expr_numgen-test.c
+++ b/tests/nft-expr_numgen-test.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/tests/nft-expr_objref-test.c b/tests/nft-expr_objref-test.c
index 9e698df38e255d6c84c4906d013eee292eedf68a..36c869eb281b7eea31e0271e35b7d6050572b133 100644 (file)
--- a/tests/nft-expr_objref-test.c
+++ b/tests/nft-expr_objref-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_payload-test.c b/tests/nft-expr_payload-test.c
index aec17106ef0faf909195294302fa09bba0859f49..8c41bab71b287f150c00f90ba3a92c34a762daf4 100644 (file)
--- a/tests/nft-expr_payload-test.c
+++ b/tests/nft-expr_payload-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_queue-test.c b/tests/nft-expr_queue-test.c
index d007b98a71391ab7ee1028c5831c14680fd3639a..b114cea066cb36ee03436ad47245a46fe295efab 100644 (file)
--- a/tests/nft-expr_queue-test.c
+++ b/tests/nft-expr_queue-test.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Eric Leblond <eric@regit.org>
  *
  * Based on test framework by Ana Rey Botello <anarey@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/tests/nft-expr_quota-test.c b/tests/nft-expr_quota-test.c
index a3eb2e3c45f3caaae61ae5cb10ff2ce788e67759..193afc8b8d6df0b1143845e149e85a428f0a7502 100644 (file)
--- a/tests/nft-expr_quota-test.c
+++ b/tests/nft-expr_quota-test.c
@@ -1,11 +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/tests/nft-expr_range-test.c b/tests/nft-expr_range-test.c
index 6ef896beb08a898b2f32d56c4f3096ba04fa9e02..c441a2eb5df80adafa45bcd271c1da8c79cd39a3 100644 (file)
--- a/tests/nft-expr_range-test.c
+++ b/tests/nft-expr_range-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_redir-test.c b/tests/nft-expr_redir-test.c
index 8e1f30c43332567d313f138473f3b84343f4d739..d2de222427e76e3e22fd05f488d5a6c04c0a321c 100644 (file)
--- a/tests/nft-expr_redir-test.c
+++ b/tests/nft-expr_redir-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_reject-test.c b/tests/nft-expr_reject-test.c
index 049401da1565cb7b46486c74c5f795b4d0008304..cadd322d2a5e2002d210997eff294dbeed25e80a 100644 (file)
--- a/tests/nft-expr_reject-test.c
+++ b/tests/nft-expr_reject-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
index a5172064c13b2e61a4444a42a13d2bde8810dfd0..89de945e58348ee684ebc2cd75af5ca55eb6e5c9 100644 (file)
--- a/tests/nft-expr_target-test.c
+++ b/tests/nft-expr_target-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-object-test.c b/tests/nft-object-test.c
index d2ca444153419beaf463c9d7cae0afbafe7de75c..77300e62ae47e3107143f0d96af574b763b45656 100644 (file)
--- a/tests/nft-object-test.c
+++ b/tests/nft-object-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-rule-test.c b/tests/nft-rule-test.c
index 3a92223f0e910747c34ff1d5d4d1614cc8048799..d865d267366e35884d01431e7f638c5ba84bc2e5 100644 (file)
--- a/tests/nft-rule-test.c
+++ b/tests/nft-rule-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-set-test.c b/tests/nft-set-test.c
index 66916fe0d523828e9dff4e3e274b2e1ff75abce1..e264c735a2de66d05d54075c29899337c321298d 100644 (file)
--- a/tests/nft-set-test.c
+++ b/tests/nft-set-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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/tests/nft-table-test.c b/tests/nft-table-test.c
index 53cf3d198a16a52b56917dfa44d838ef8be9822a..79e10ef81a730e242ee5f9db3217830674db9499 100644 (file)
--- a/tests/nft-table-test.c
+++ b/tests/nft-table-test.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) 2013 by Ana Rey Botello <anarey@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>