From 6761f803953d5d2914586a5769e405498a701aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 29 Jun 2023 15:12:18 +0200
Subject: [PATCH] Add SPDX license identifiers to code files

Change manual pages word to recognize it by licensecheck tool.
---
 Makefile                | 1 +
 config.h                | 1 +
 make_as32_del.pl        | 1 +
 make_as_del.pl          | 1 +
 make_ip_del.pl          | 1 +
 make_new_gtlds.pl       | 1 +
 make_nic_handles.pl     | 1 +
 make_servers_charset.pl | 1 +
 make_tld_serv.pl        | 1 +
 make_version_h.pl       | 1 +
 mkpasswd.1              | 3 ++-
 mkpasswd.c              | 2 ++
 utils.h                 | 1 +
 whois.1                 | 4 ++--
 whois.c                 | 2 ++
 whois.conf.5            | 1 +
 whois.h                 | 1 +
 17 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4843c16..8f3f38d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 prefix = /usr
 
 ifdef DESTDIR
diff --git a/config.h b/config.h
index 82ec4f6..4cbadb0 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,5 @@
 /* Configurable features */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /* Always hide legal disclaimers */
 #undef ALWAYS_HIDE_DISCL
diff --git a/make_as32_del.pl b/make_as32_del.pl
index 6382679..51fdc00 100755
--- a/make_as32_del.pl
+++ b/make_as32_del.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_as_del.pl b/make_as_del.pl
index 10ab071..d27da63 100755
--- a/make_as_del.pl
+++ b/make_as_del.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_ip_del.pl b/make_ip_del.pl
index 7ed5c93..6475918 100755
--- a/make_ip_del.pl
+++ b/make_ip_del.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_new_gtlds.pl b/make_new_gtlds.pl
index dc7110e..ae8b9ac 100755
--- a/make_new_gtlds.pl
+++ b/make_new_gtlds.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_nic_handles.pl b/make_nic_handles.pl
index 6b031c2..7c7fb68 100755
--- a/make_nic_handles.pl
+++ b/make_nic_handles.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_servers_charset.pl b/make_servers_charset.pl
index 2f83a09..bddba8b 100755
--- a/make_servers_charset.pl
+++ b/make_servers_charset.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_tld_serv.pl b/make_tld_serv.pl
index 66af45c..e538c53 100755
--- a/make_tld_serv.pl
+++ b/make_tld_serv.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/make_version_h.pl b/make_version_h.pl
index ae4a69b..705d8a8 100755
--- a/make_version_h.pl
+++ b/make_version_h.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
diff --git a/mkpasswd.1 b/mkpasswd.1
index f5e5775..121cc5a 100644
--- a/mkpasswd.1
+++ b/mkpasswd.1
@@ -90,4 +90,5 @@ This program suffers of a bad case of featuritis.
 and this man page were written by Marco d'Itri
 .RI < md@linux.it >
 and are licensed under the terms of the GNU General Public License,
-version 2 or higher.
+version 2 or later.
+\" SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/mkpasswd.c b/mkpasswd.c
index 1d35329..081ce54 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -14,6 +14,8 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /* for crypt, snprintf and strcasecmp */
diff --git a/utils.h b/utils.h
index 32055b3..c733bdf 100644
--- a/utils.h
+++ b/utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef WHOIS_UTILS_H
 #define WHOIS_UTILS_H
 
diff --git a/whois.1 b/whois.1
index 47119b8..23a7322 100644
--- a/whois.1
+++ b/whois.1
@@ -304,5 +304,5 @@ original BSD client.
 and this man page were written by Marco d'Itri
 .RI < md@linux.it >
 and are licensed under the terms of the GNU General Public License,
-version 2 or higher.
-
+version 2 or later.
+\" SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/whois.c b/whois.c
index cb9d4d0..611d623 100644
--- a/whois.c
+++ b/whois.c
@@ -5,6 +5,8 @@
  * 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
  */
 
 /* for AI_IDN */
diff --git a/whois.conf.5 b/whois.conf.5
index 7ec1b50..dd13bca 100644
--- a/whois.conf.5
+++ b/whois.conf.5
@@ -47,3 +47,4 @@ This manual page was written by Petr Písař
 .RI < ppisar@redhat.com >
 and is licensed under the terms of the GNU General Public License,
 version 2 or higher.
+\" SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/whois.h b/whois.h
index bb910e5..1cdba36 100644
--- a/whois.h
+++ b/whois.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #include "utils.h"
 
 /* 6bone referto: extension */