From MAILER-DAEMON Wed Sep 01 03:18:19 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mLKVm-0008CC-Sa
	for mharc-commit-inetutils@gnu.org; Wed, 01 Sep 2021 03:18:18 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59698)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mLKVk-0008BL-W8
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 03:18:17 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:43210)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mLKVk-0004ZQ-3O
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 03:18:16 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 63F16209C6; Wed,  1 Sep 2021 03:18:15 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.1-16-g58cb043
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8586a5b3fe3302320b923ee31f9994e75708566e
X-Git-Newrev: 58cb043b190fd04effdaea7c9403416b436e50dd
Message-Id: <20210901071815.63F16209C6@vcs0.savannah.gnu.org>
Date: Wed,  1 Sep 2021 03:18:15 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2021 07:18:17 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  58cb043b190fd04effdaea7c9403416b436e50dd (commit)
      from  8586a5b3fe3302320b923ee31f9994e75708566e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=58cb043b190fd04effdaea7c9403416b436e50dd


commit 58cb043b190fd04effdaea7c9403416b436e50dd
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 09:09:50 2021 +0200

    ftp: check that PASV/LSPV addresses match.
    
    * NEWS: Mention change.
    * ftp/ftp.c (initconn): Validate returned addresses.

diff --git a/NEWS b/NEWS
index f2ac9ea..9cc42c0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** ftp
+
+The ftp client now validate addresses returned by PASV/LSPV responses,
+to make sure they match the server address.  Reported by ZeddYu Lu in
+<https://lists.gnu.org/archive/html/bug-inetutils/2021-06/msg00002.html>.
+
+Thanks to Luke Mewburn <lukem@netbsd.org> for discussion and fix to
+NetBSD code, we used a similar solution.
+
 ** logger
 ** rlogind
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index d21dbdd..7513539 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1365,6 +1365,13 @@ initconn (void)
 		  uint32_t *pu32 = (uint32_t *) &data_addr_sa4->sin_addr.s_addr;
 		  pu32[0] = htonl ( (h[0] << 24) | (h[1] << 16) | (h[2] << 8) | h[3]);
 		}
+		if (data_addr_sa4->sin_addr.s_addr
+		    != ((struct sockaddr_in *) &hisctladdr)->sin_addr.s_addr)
+		  {
+		    printf ("Passive mode address mismatch.\n");
+		    (void) command ("ABOR");	/* Cancel any open connection.  */
+		    goto bad;
+		  }
 	    } /* LPSV IPv4 */
 	  else /* IPv6 */
 	    {
@@ -1395,6 +1402,13 @@ initconn (void)
 		  pu32[2] = htonl ( (h[8] << 24) | (h[9] << 16) | (h[10] << 8) | h[11]);
 		  pu32[3] = htonl ( (h[12] << 24) | (h[13] << 16) | (h[14] << 8) | h[15]);
 		}
+		if (data_addr_sa6->sin6_addr.s6_addr
+		    != ((struct sockaddr_in6 *) &hisctladdr)->sin6_addr.s6_addr)
+		  {
+		    printf ("Passive mode address mismatch.\n");
+		    (void) command ("ABOR");	/* Cancel any open connection.  */
+		    goto bad;
+		  }
 	    } /* LPSV IPv6 */
 	}
       else /* !EPSV && !LPSV */
@@ -1415,6 +1429,13 @@ initconn (void)
 			 | ((a2 & 0xff) << 8) | (a3 & 0xff) );
 	      data_addr_sa4->sin_port =
 		  htons (((p0 & 0xff) << 8) | (p1 & 0xff));
+	      if (data_addr_sa4->sin_addr.s_addr
+		  != ((struct sockaddr_in *) &hisctladdr)->sin_addr.s_addr)
+		{
+		  printf ("Passive mode address mismatch.\n");
+		  (void) command ("ABOR");	/* Cancel any open connection.  */
+		  goto bad;
+		}
 	    } /* PASV */
 	  else
 	    {

-----------------------------------------------------------------------

Summary of changes:
 NEWS      |  9 +++++++++
 ftp/ftp.c | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Sep 01 15:48:33 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mLWDo-0001if-Ri
	for mharc-commit-inetutils@gnu.org; Wed, 01 Sep 2021 15:48:32 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:47168)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mLWDm-0001ht-Kf
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 15:48:30 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:56068)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mLWDl-00075n-O8
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 15:48:29 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id A6DF2209AC; Wed,  1 Sep 2021 15:48:29 -0400 (EDT)
Authentication-Results: vcs0.savannah.gnu.org; dkim=none
 reason="no signature"; dkim-adsp=fail (unprotected policy);
 dkim-atps=neutral
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  annotated tag, v2.2, created. v2.2
X-Git-Refname: refs/tags/v2.2
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: c8bbc909797973332ed9d6c98aa5525b7a7df618
Message-Id: <20210901194829.A6DF2209AC@vcs0.savannah.gnu.org>
Date: Wed,  1 Sep 2021 15:48:29 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2021 19:48:30 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The annotated tag, v2.2 has been created
        at  c8bbc909797973332ed9d6c98aa5525b7a7df618 (tag)
   tagging  2697f45cc5adf62637c20a854459450c2c5e82c5 (commit)
  replaces  v2.1
 tagged by  Simon Josefsson
        on  Wed Sep 1 21:41:08 2021 +0200

- Log -----------------------------------------------------------------
inetutils 2.2
-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCYS/XVQAKCRBRcisI/kdF
oiukAPwNL8kBGHrpdr9zelAcd4dl2KmiovtIEqtHpnbp9Oe6CwEAvqD/CaPoPmts
novLwIgGlLI0PhRVp65faJmWy3u9Dgk=
=PZwg
-----END PGP SIGNATURE-----

Simon Josefsson (17):
      maint: post-release administrivia
      Refresh some release-related build rules.
      Use gnulib getpeername module.
      Use gnulib errno module.
      Use gnulib environ module.
      Use gnulib modules stdarg, stdlib and string.
      Use gnulib module socklen.
      Drop AC_C_CONST (obsolete).
      Don't check for memcmp, memcpy, memmove, memset and strdup (no gnulib module needed).
      Don't check for getpass, getusershell, and poll (gnulib modules already imported).
      Don't check for getopt_long, no longer used anywhere.
      tests: Don't fail ftp-localhost.sh when sysctl is missing.
      doc: Document recent fixes.
      logger: Code for non-getaddrinfo removed.
      rlogind: Code for non-getaddrinfo removed.
      ftp: check that PASV/LSPV addresses match.
      version 2.2

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Sep 01 15:48:33 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mLWDp-0001j1-38
	for mharc-commit-inetutils@gnu.org; Wed, 01 Sep 2021 15:48:33 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:47166)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mLWDm-0001hs-TU
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 15:48:30 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:56066)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mLWDl-00075k-Nz
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 15:48:29 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 16A4821120; Wed,  1 Sep 2021 15:48:29 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-1-g8780b47
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 58cb043b190fd04effdaea7c9403416b436e50dd
X-Git-Newrev: 8780b47a7fd029c8ffadb54841863964cde00f18
Message-Id: <20210901194829.16A4821120@vcs0.savannah.gnu.org>
Date: Wed,  1 Sep 2021 15:48:28 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2021 19:48:31 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  8780b47a7fd029c8ffadb54841863964cde00f18 (commit)
       via  2697f45cc5adf62637c20a854459450c2c5e82c5 (commit)
      from  58cb043b190fd04effdaea7c9403416b436e50dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8780b47a7fd029c8ffadb54841863964cde00f18


commit 8780b47a7fd029c8ffadb54841863964cde00f18
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 21:46:29 2021 +0200

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 879b416..8bbe6cf 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.1
+2.2
diff --git a/NEWS b/NEWS
index be4e5dd..2077110 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
 ** ftp
diff --git a/cfg.mk b/cfg.mk
index a79240c..a0e234e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -21,7 +21,7 @@ manual_title = GNU Network Utilities
 
 bootstrap-tools = gnulib,autoconf,automake,bison,m4,makeinfo,help2man,make,gzip,tar
 
-old_NEWS_hash = 201ce074704595e403c6614987d484e4
+old_NEWS_hash = 9e58290a292044bd6de634f52f6ed940
 
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2697f45cc5adf62637c20a854459450c2c5e82c5


commit 2697f45cc5adf62637c20a854459450c2c5e82c5
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 21:41:08 2021 +0200

    version 2.2
    
    * NEWS: Record release date.

diff --git a/NEWS b/NEWS
index 9cc42c0..be4e5dd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
-* Noteworthy changes in release ?.? (????-??-??) [?]
+* Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
 ** ftp
 

-----------------------------------------------------------------------

Summary of changes:
 .prev-version | 2 +-
 NEWS          | 3 +++
 cfg.mk        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Sep 01 16:52:03 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mLXDH-0005wz-Ax
	for mharc-commit-inetutils@gnu.org; Wed, 01 Sep 2021 16:52:03 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:58772)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mLXDF-0005wi-MM
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 16:52:01 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:57176)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mLXDE-0008BU-Oh
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 16:52:00 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 9063B20B71; Wed,  1 Sep 2021 16:52:00 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-4-gfc310f0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8780b47a7fd029c8ffadb54841863964cde00f18
X-Git-Newrev: fc310f059c59884a2217606df62b444887c86f84
Message-Id: <20210901205200.9063B20B71@vcs0.savannah.gnu.org>
Date: Wed,  1 Sep 2021 16:51:59 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2021 20:52:01 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  fc310f059c59884a2217606df62b444887c86f84 (commit)
       via  0ceee232623b2ed93bdf96bad6e0f4e4834f31aa (commit)
       via  0e4832e73a93ecd3f3365b540242839ac99343dc (commit)
      from  8780b47a7fd029c8ffadb54841863964cde00f18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=fc310f059c59884a2217606df62b444887c86f84


commit fc310f059c59884a2217606df62b444887c86f84
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 22:51:24 2021 +0200

    Don't use obsolete AC_TYPE_SIGNAL.
    
    * configure.ac: Remove call to AC_TYPE_SIGNAL.

diff --git a/configure.ac b/configure.ac
index 5e16c3a..dd1d762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,9 +650,6 @@ fi
 
 ### Checks for types.
 
-# Checks return type of signal handlers
-AC_TYPE_SIGNAL
-
 AC_CHECK_TYPES(struct if_nameindex, , ,
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <sys/socket.h>

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0ceee232623b2ed93bdf96bad6e0f4e4834f31aa


commit 0ceee232623b2ed93bdf96bad6e0f4e4834f31aa
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 22:49:18 2021 +0200

    Use gnulib module 'attribute' instead of obsolete 'snippets/unused-parameters'.
    
    * */*.c: Use MAYBE_UNUSED instead of _GL_UNUSED_PARAMETER.
    * */*.c: Include attribute.h instead of unused-parameters.h.

diff --git a/bootstrap.conf b/bootstrap.conf
index ed51c93..f347d47 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -40,6 +40,7 @@ alloca
 alloca-opt
 argp
 argp-version-etc
+attribute
 autobuild
 dirfd
 dirname-lgpl
@@ -84,7 +85,6 @@ setenv
 sethostname
 signal
 size_max
-snippet/unused-parameter
 snprintf
 socklen
 stdarg
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 780abc8..559a121 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -91,7 +91,7 @@
 #endif
 
 #include "ftp_var.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 #include "xalloc.h"
 #include "xgetcwd.h"
 
@@ -481,7 +481,7 @@ char *stype[] = {
  * Set binary transfer type.
  */
 void
-setbinary (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setbinary (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   stype[1] = "binary";
@@ -492,7 +492,7 @@ setbinary (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Set ascii transfer type.
  */
 void
-setascii (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setascii (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   stype[1] = "ascii";
@@ -503,7 +503,7 @@ setascii (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Set tenex transfer type.
  */
 void
-settenex (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+settenex (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   stype[1] = "tenex";
@@ -514,7 +514,7 @@ settenex (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Set file transfer mode.
  */
 void
-setftmode (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setftmode (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   printf ("We only support %s mode, sorry.\n", modename);
@@ -525,7 +525,7 @@ setftmode (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Set file transfer format.
  */
 void
-setform (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setform (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   printf ("We only support %s format, sorry.\n", formname);
@@ -536,7 +536,7 @@ setform (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Set file transfer structure.
  */
 void
-setstruct (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setstruct (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   printf ("We only support %s structure, sorry.\n", structname);
@@ -914,7 +914,7 @@ getit (int argc, char **argv, int restartit, char *mode)
 }
 
 void
-mabort (int signo _GL_UNUSED_PARAMETER)
+mabort (int signo MAYBE_UNUSED)
 {
   int ointer;
 
@@ -1127,7 +1127,7 @@ onoff (int bool)
  * Show status.
  */
 void
-status (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+status (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   int i;
 
@@ -1192,7 +1192,7 @@ status (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Set beep on cmd completed mode.
  */
 void
-setbell (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setbell (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   bell = !bell;
@@ -1204,7 +1204,7 @@ setbell (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Turn on packet tracing.
  */
 void
-settrace (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+settrace (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   trace = !trace;
@@ -1223,7 +1223,7 @@ settrace (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Toggle state only in absence of an argument.
  */
 void
-sethash (int argc _GL_UNUSED_PARAMETER, char **argv)
+sethash (int argc MAYBE_UNUSED, char **argv)
 {
   char *p = argv[1];
 
@@ -1273,7 +1273,7 @@ sethash (int argc _GL_UNUSED_PARAMETER, char **argv)
  * Turn on printing of server echo's.
  */
 void
-setverbose (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setverbose (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   verbose = !verbose;
@@ -1285,7 +1285,7 @@ setverbose (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Allow any address family.
  */
 void
-setipany (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setipany (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   usefamily = AF_UNSPEC;
   printf ("Selecting addresses: %s.\n", "any");
@@ -1296,7 +1296,7 @@ setipany (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Restrict to IPv4 addresses.
  */
 void
-setipv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setipv4 (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   usefamily = AF_INET;
   printf ("Selecting addresses: %s.\n", "IPv4");
@@ -1307,7 +1307,7 @@ setipv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Restrict to IPv6 addresses.
  */
 void
-setipv6 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setipv6 (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   usefamily = AF_INET6;
   printf ("Selecting addresses: %s.\n", "IPv6");
@@ -1318,7 +1318,7 @@ setipv6 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Toggle use of EPRT/EPRT for IPv4.
  */
 void
-setepsv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setepsv4 (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   doepsv4 = !doepsv4;
@@ -1330,7 +1330,7 @@ setepsv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Toggle PORT cmd use before each data connection.
  */
 void
-setport (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setport (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   sendport = !sendport;
@@ -1343,7 +1343,7 @@ setport (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * during mget, mput, and mdelete.
  */
 void
-setprompt (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setprompt (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   interactive = !interactive;
@@ -1356,7 +1356,7 @@ setprompt (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * on local file names.
  */
 void
-setglob (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setglob (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   doglob = !doglob;
@@ -1659,7 +1659,7 @@ mls (int argc, char **argv)
  * Do a shell escape
  */
 void
-shell (int argc, char **argv _GL_UNUSED_PARAMETER)
+shell (int argc, char **argv MAYBE_UNUSED)
 {
   pid_t pid;
   sighandler_t old1, old2;
@@ -1790,7 +1790,7 @@ user (int argc, char **argv)
  * Print working directory.
  */
 void
-pwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+pwd (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   int oldverbose = verbose;
 
@@ -1810,7 +1810,7 @@ pwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Print local working directory.
  */
 void
-lpwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+lpwd (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   char *dir = xgetcwd ();
 
@@ -1982,7 +1982,7 @@ rmthelp (int argc, char **argv)
  * Terminate session and exit.
  */
 void
-quit (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+quit (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   if (connected)
@@ -1999,7 +1999,7 @@ quit (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
  * Terminate session, but don't exit.
  */
 void
-disconnect (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+disconnect (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   if (!connected)
@@ -2107,7 +2107,7 @@ account (int argc, char **argv)
 jmp_buf abortprox;
 
 void
-proxabort (int sig _GL_UNUSED_PARAMETER)
+proxabort (int sig MAYBE_UNUSED)
 {
 
   if (!proxy)
@@ -2190,7 +2190,7 @@ doproxy (int argc, char **argv)
 }
 
 void
-setcase (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setcase (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   mcase = !mcase;
@@ -2199,7 +2199,7 @@ setcase (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 }
 
 void
-setcr (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setcr (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   crflag = !crflag;
@@ -2267,7 +2267,7 @@ dotrans (char *name)
 }
 
 void
-setpassive (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setpassive (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   passivemode = !passivemode;
@@ -2526,7 +2526,7 @@ domap (char *name)
 }
 
 void
-setsunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setsunique (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   sunique = !sunique;
@@ -2535,7 +2535,7 @@ setsunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 }
 
 void
-setrunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setrunique (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   runique = !runique;
@@ -2545,7 +2545,7 @@ setrunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 
 /* change directory to parent directory */
 void
-cdup (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+cdup (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   if (command ("CDUP") == ERROR && code == 500)
@@ -2573,7 +2573,7 @@ restart (int argc, char **argv)
 
 /* show remote system type */
 void
-syst (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+syst (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   command ("SYST");
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 7513539..730a855 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -91,7 +91,7 @@
 #endif
 
 #include "ftp_var.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 
 #if !HAVE_DECL_FCLOSE
 /* Some systems don't declare fclose in <stdio.h>, so do it ourselves.  */
@@ -410,7 +410,7 @@ login (char *host)
 }
 
 void
-cmdabort (int sig _GL_UNUSED_PARAMETER)
+cmdabort (int sig MAYBE_UNUSED)
 {
 
   printf ("\n");
@@ -597,7 +597,7 @@ empty (fd_set *mask, int sec)
 jmp_buf sendabort;
 
 void
-abortsend (int sig _GL_UNUSED_PARAMETER)
+abortsend (int sig MAYBE_UNUSED)
 {
 
   mflag = 0;
@@ -902,7 +902,7 @@ abort:
 jmp_buf recvabort;
 
 void
-abortrecv (int sig _GL_UNUSED_PARAMETER)
+abortrecv (int sig MAYBE_UNUSED)
 {
 
   mflag = 0;
@@ -1669,7 +1669,7 @@ tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
 }
 
 void
-psabort (int sig _GL_UNUSED_PARAMETER)
+psabort (int sig MAYBE_UNUSED)
 {
 
   abrtflag++;
@@ -1782,7 +1782,7 @@ pswitch (int flag)
 }
 
 void
-abortpt (int sig _GL_UNUSED_PARAMETER)
+abortpt (int sig MAYBE_UNUSED)
 {
 
   printf ("\n");
@@ -1924,7 +1924,7 @@ abort:
 }
 
 void
-reset (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+reset (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   fd_set mask;
   int nfnd = 1;
diff --git a/ftp/main.c b/ftp/main.c
index b6b6c27..666c866 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -81,7 +81,7 @@
 #include "ftp_var.h"
 
 #include "libinetutils.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
@@ -142,7 +142,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -316,13 +316,13 @@ main (int argc, char *argv[])
 }
 
 void
-intr (int sig _GL_UNUSED_PARAMETER)
+intr (int sig MAYBE_UNUSED)
 {
   longjmp (toplevel, 1);
 }
 
 void
-lostpeer (int sig _GL_UNUSED_PARAMETER)
+lostpeer (int sig MAYBE_UNUSED)
 {
   if (connected)
     {
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 68d41fd..f4b29d5 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -104,7 +104,7 @@
 #include <progname.h>
 #include <libinetutils.h>
 #include "extern.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 
 #ifndef LINE_MAX
 # define LINE_MAX 2048
@@ -634,7 +634,7 @@ sigquit (int signo)
 
 
 static void
-lostconn (int signo _GL_UNUSED_PARAMETER)
+lostconn (int signo MAYBE_UNUSED)
 {
   if (debug)
     syslog (LOG_DEBUG, "lost connection");
@@ -1919,7 +1919,7 @@ dologout (int status)
 }
 
 static void
-myoob (int signo _GL_UNUSED_PARAMETER)
+myoob (int signo MAYBE_UNUSED)
 {
   char *cp;
 
diff --git a/ftpd/pam.c b/ftpd/pam.c
index e1075d6..8c7a361 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <syslog.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include "extern.h"
 
 #ifdef HAVE_SECURITY_PAM_APPL_H
@@ -314,7 +314,7 @@ pam_pass (const char *passwd, struct credentials *pcred)
 }
 
 void
-pam_end_login (struct credentials * pcred _GL_UNUSED_PARAMETER)
+pam_end_login (struct credentials * pcred MAYBE_UNUSED)
 {
   int error;
 
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index f9dfe8f..dbcec59 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -39,7 +39,7 @@
 #endif
 
 #include <libinetutils.h>
-#include "unused-parameter.h"
+#include "attribute.h"
 
 int usefamily = AF_UNSPEC;	/* Address family for daemon.  */
 
@@ -97,7 +97,7 @@ check_host (struct sockaddr *sa, socklen_t len)
 #endif /* WITH_WRAP */
 
 static void
-reapchild (int signo _GL_UNUSED_PARAMETER)
+reapchild (int signo MAYBE_UNUSED)
 {
   int save_errno = errno;
 
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 10bf4be..c6721ba 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -39,7 +39,7 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include "ifconfig.h"
 
@@ -380,7 +380,7 @@ void parse_opt_set_af (struct ifconfig *ifp, char *af)
 }
 
 void
-parse_opt_set_flag (struct ifconfig *ifp _GL_UNUSED_PARAMETER,
+parse_opt_set_flag (struct ifconfig *ifp MAYBE_UNUSED,
 		    int flag, int rev)
 {
   if (ifp)
@@ -614,7 +614,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 static char *
 default_help_filter (int key, const char *text,
-		     void *input _GL_UNUSED_PARAMETER)
+		     void *input MAYBE_UNUSED)
 {
   char *s;
 
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 60c26ea..17667a8 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -48,7 +48,7 @@
 #include <arpa/inet.h>
 #include "ifconfig.h"
 #include "xalloc.h"
-#include <unused-parameter.h>
+#include <attribute.h>
 
 FILE *ostream;			/* Either stdout or stderror.  */
 int column_stdout;		/* The column position of the cursor on stdout.  */
@@ -120,7 +120,7 @@ struct format_handle format_handles[] = {
 /* Various helper functions to get the job done.  */
 
 void
-put_char (format_data_t form _GL_UNUSED_PARAMETER, char c)
+put_char (format_data_t form MAYBE_UNUSED, char c)
 {
   switch (c)
     {
@@ -148,7 +148,7 @@ put_string (format_data_t form, const char *s)
 }
 
 void
-put_int (format_data_t form _GL_UNUSED_PARAMETER,
+put_int (format_data_t form MAYBE_UNUSED,
 	 int argc, char *argv[], int nr)
 {
   char *fmt;
@@ -205,7 +205,7 @@ put_int (format_data_t form _GL_UNUSED_PARAMETER,
 }
 
 void
-put_ulong (format_data_t form _GL_UNUSED_PARAMETER,
+put_ulong (format_data_t form MAYBE_UNUSED,
 	   int argc, char *argv[], unsigned long value)
 {
   char *fmt;
@@ -346,8 +346,8 @@ put_flags (format_data_t form, int argc, char *argv[], int flags)
 }
 
 void
-put_flags_short (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		 char *argv[] _GL_UNUSED_PARAMETER, int flags)
+put_flags_short (format_data_t form, int argc MAYBE_UNUSED,
+		 char *argv[] MAYBE_UNUSED, int flags)
 {
   char buf[IF_FORMAT_FLAGS_BUFSIZE];
   if_format_flags (flags, buf, sizeof buf);
@@ -378,9 +378,9 @@ format_handler (const char *name, format_data_t form, int argc, char *argv[])
 }
 
 void
-fh_nothing (format_data_t form _GL_UNUSED_PARAMETER,
-	    int argc _GL_UNUSED_PARAMETER,
-	    char *argv[] _GL_UNUSED_PARAMETER)
+fh_nothing (format_data_t form MAYBE_UNUSED,
+	    int argc MAYBE_UNUSED,
+	    char *argv[] MAYBE_UNUSED)
 {
 }
 
@@ -439,15 +439,15 @@ fh_foreachformat (format_data_t form, int argc, char *argv[])
 }
 
 void
-fh_newline (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	    char *argv[] _GL_UNUSED_PARAMETER)
+fh_newline (format_data_t form, int argc MAYBE_UNUSED,
+	    char *argv[] MAYBE_UNUSED)
 {
   put_char (form, '\n');
 }
 
 void
-fh_tabulator (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	      char *argv[] _GL_UNUSED_PARAMETER)
+fh_tabulator (format_data_t form, int argc MAYBE_UNUSED,
+	      char *argv[] MAYBE_UNUSED)
 {
   put_char (form, '\t');
 }
@@ -614,14 +614,14 @@ fh_error (format_data_t form, int argc, char *argv[])
 }
 
 void
-fh_progname (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	     char *argv[] _GL_UNUSED_PARAMETER)
+fh_progname (format_data_t form, int argc MAYBE_UNUSED,
+	     char *argv[] MAYBE_UNUSED)
 {
   put_string (form, program_name);
 }
 
 void
-fh_exit (format_data_t form _GL_UNUSED_PARAMETER,
+fh_exit (format_data_t form MAYBE_UNUSED,
 	 int argc, char *argv[])
 {
   int err = 0;
@@ -633,8 +633,8 @@ fh_exit (format_data_t form _GL_UNUSED_PARAMETER,
 }
 
 void
-fh_name (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	 char *argv[] _GL_UNUSED_PARAMETER)
+fh_name (format_data_t form, int argc MAYBE_UNUSED,
+	 char *argv[] MAYBE_UNUSED)
 {
   put_string (form, form->name);
 }
@@ -646,8 +646,8 @@ fh_index_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-fh_index (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	  char *argv[] _GL_UNUSED_PARAMETER)
+fh_index (format_data_t form, int argc MAYBE_UNUSED,
+	  char *argv[] MAYBE_UNUSED)
 {
   int indx = if_nametoindex (form->name);
 
@@ -930,8 +930,8 @@ fh_media_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-fh_media (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	  char *argv[] _GL_UNUSED_PARAMETER)
+fh_media (format_data_t form, int argc MAYBE_UNUSED,
+	  char *argv[] MAYBE_UNUSED)
 {
   /* Must be overridden by a system dependent implementation.  */
   put_string (form, "(not known)");
@@ -947,8 +947,8 @@ fh_status_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-fh_status (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-	   char *argv[] _GL_UNUSED_PARAMETER)
+fh_status (format_data_t form, int argc MAYBE_UNUSED,
+	   char *argv[] MAYBE_UNUSED)
 {
   /* Must be overridden by a system dependent implementation.  */
   put_string (form, "(not known)");
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index d69a14a..21a9129 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -34,7 +34,7 @@
 #include <netinet/if_ether.h>
 #include <ifaddrs.h>
 
-#include <unused-parameter.h>
+#include <attribute.h>
 
 
 /* Output format stuff.  */
@@ -51,9 +51,9 @@ NAME [ADDR [DSTADDR]] [broadcast BRDADDR] [netmask MASK] "
 struct argp_child system_argp_child;
 
 int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
-		  char option _GL_UNUSED_PARAMETER,
-		  char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+		  char option MAYBE_UNUSED,
+		  char *optarg MAYBE_UNUSED)
 {
   return 0;
 }
@@ -180,9 +180,9 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
 }
 
 int
-system_configure (int sfd _GL_UNUSED_PARAMETER,
-		  struct ifreq *ifr _GL_UNUSED_PARAMETER,
-		  struct system_ifconfig *ifs _GL_UNUSED_PARAMETER)
+system_configure (int sfd MAYBE_UNUSED,
+		  struct ifreq *ifr MAYBE_UNUSED,
+		  struct system_ifconfig *ifs MAYBE_UNUSED)
 {
   return 0;
 }
@@ -370,8 +370,8 @@ system_fh_hwaddr_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		  char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwaddr (format_data_t form, int argc MAYBE_UNUSED,
+		  char *argv[] MAYBE_UNUSED)
 {
   ESTABLISH_IFADDRS
   if (!ifp)
@@ -441,8 +441,8 @@ system_fh_hwtype_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		  char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwtype (format_data_t form, int argc MAYBE_UNUSED,
+		  char *argv[] MAYBE_UNUSED)
 {
   int found = 0;
 
@@ -530,8 +530,8 @@ system_fh_media_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_media (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		 char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_media (format_data_t form, int argc MAYBE_UNUSED,
+		 char *argv[] MAYBE_UNUSED)
 {
 #ifdef SIOCGIFMEDIA
   memset (&ifm, 0, sizeof (ifm));
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index d6db42a..47bdb43 100644
--- a/ifconfig/system/generic.c
+++ b/ifconfig/system/generic.c
@@ -24,7 +24,7 @@
 
 #include "../ifconfig.h"
 
-#include <unused-parameter.h>
+#include <attribute.h>
 
 
 /* Output format stuff.  */
@@ -39,25 +39,25 @@ const char *system_help;
 struct argp_child system_argp_child;
 
 int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
-		  char option _GL_UNUSED_PARAMETER,
-		  char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+		  char option MAYBE_UNUSED,
+		  char *optarg MAYBE_UNUSED)
 {
   return 0;
 }
 
 int
-system_parse_opt_rest (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
-		       int argc _GL_UNUSED_PARAMETER,
-		       char *argv[] _GL_UNUSED_PARAMETER)
+system_parse_opt_rest (struct ifconfig **ifp MAYBE_UNUSED,
+		       int argc MAYBE_UNUSED,
+		       char *argv[] MAYBE_UNUSED)
 {
   return 0;
 }
 
 int
-system_configure (int sfd _GL_UNUSED_PARAMETER,
-		  struct ifreq *ifr _GL_UNUSED_PARAMETER,
-		  struct system_ifconfig *ifs _GL_UNUSED_PARAMETER)
+system_configure (int sfd MAYBE_UNUSED,
+		  struct ifreq *ifr MAYBE_UNUSED,
+		  struct system_ifconfig *ifs MAYBE_UNUSED)
 {
   return 0;
 }
diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
index 590cb13..ff85d72 100644
--- a/ifconfig/system/hurd.c
+++ b/ifconfig/system/hurd.c
@@ -27,7 +27,7 @@
 #include <net/if_arp.h>
 #include "../ifconfig.h"
 
-#include <unused-parameter.h>
+#include <attribute.h>
 
 
 /* Output format stuff.  */
@@ -44,9 +44,9 @@ const char *system_help = "NAME [ADDR]\
 struct argp_child system_argp_child;
 
 int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
-		  char option _GL_UNUSED_PARAMETER,
-		  char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+		  char option MAYBE_UNUSED,
+		  char *optarg MAYBE_UNUSED)
 {
   return 0;
 }
@@ -158,9 +158,9 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
 }
 
 int
-system_configure (int sfd _GL_UNUSED_PARAMETER,
-		  struct ifreq *ifr _GL_UNUSED_PARAMETER,
-		  struct system_ifconfig *ifs _GL_UNUSED_PARAMETER)
+system_configure (int sfd MAYBE_UNUSED,
+		  struct ifreq *ifr MAYBE_UNUSED,
+		  struct system_ifconfig *ifs MAYBE_UNUSED)
 {
   return 0;
 }
@@ -168,7 +168,7 @@ system_configure (int sfd _GL_UNUSED_PARAMETER,
 struct if_nameindex* (*system_if_nameindex) (void) = if_nameindex;
 
 static void
-print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_ether (format_data_t form MAYBE_UNUSED,
 		    unsigned char *data)
 {
   *column += printf ("%02X:%02X:%02X:%02X:%02X:%02X",
@@ -236,8 +236,8 @@ system_fh_hwaddr_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		  char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwaddr (format_data_t form, int argc MAYBE_UNUSED,
+		  char *argv[] MAYBE_UNUSED)
 {
 #ifdef SIOCGIFHWADDR
   if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
@@ -273,8 +273,8 @@ system_fh_hwtype_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		  char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwtype (format_data_t form, int argc MAYBE_UNUSED,
+		  char *argv[] MAYBE_UNUSED)
 {
 #ifdef SIOCGIFHWADDR
   if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index e453b46..f1bbc06 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -48,7 +48,7 @@
 #endif
 
 #include <read-file.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include "../ifconfig.h"
 
@@ -56,7 +56,7 @@
 /* ARPHRD stuff.  */
 
 static void
-print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_ether (format_data_t form MAYBE_UNUSED,
 		    unsigned char *data)
 {
   *column += printf ("%02X:%02X:%02X:%02X:%02X:%02X",
@@ -65,7 +65,7 @@ print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER,
 }
 
 static void
-print_hwaddr_arcnet (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_arcnet (format_data_t form MAYBE_UNUSED,
 		     unsigned char *data)
 {
   *column += printf ("%02X", data[0]);
@@ -73,7 +73,7 @@ print_hwaddr_arcnet (format_data_t form _GL_UNUSED_PARAMETER,
 }
 
 static void
-print_hwaddr_dlci (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_dlci (format_data_t form MAYBE_UNUSED,
 		   unsigned char *data)
 {
   *column += printf ("%i", *((short *) data));
@@ -99,7 +99,7 @@ print_hwaddr_ax25 (format_data_t form, unsigned char *data)
 }
 
 static void
-print_hwaddr_irda (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_irda (format_data_t form MAYBE_UNUSED,
 		   unsigned char *data)
 {
   *column += printf ("%02X:%02X:%02X:%02X",
@@ -108,7 +108,7 @@ print_hwaddr_irda (format_data_t form _GL_UNUSED_PARAMETER,
 }
 
 static void
-print_hwaddr_rose (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_rose (format_data_t form MAYBE_UNUSED,
 		   unsigned char *data)
 {
   *column += printf ("%02X%02X%02X%02X%02X",
@@ -552,8 +552,8 @@ system_fh_hwaddr_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		  char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwaddr (format_data_t form, int argc MAYBE_UNUSED,
+		  char *argv[] MAYBE_UNUSED)
 {
 #ifdef SIOCGIFHWADDR
   if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
@@ -589,8 +589,8 @@ system_fh_hwtype_query (format_data_t form, int argc, char *argv[])
 }
 
 void
-system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER,
-		  char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwtype (format_data_t form, int argc MAYBE_UNUSED,
+		  char *argv[] MAYBE_UNUSED)
 {
 #ifdef SIOCGIFHWADDR
   if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index ad0e970..ccce464 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -46,7 +46,7 @@
 #include <net/if_arp.h>
 #include <netinet/if_ether.h>
 
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include "../ifconfig.h"
 
@@ -65,9 +65,9 @@ NAME [ADDR [DSTADDR]] [broadcast BRDADDR] [netmask MASK] "
 struct argp_child system_argp_child;
 
 int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
-		  char option _GL_UNUSED_PARAMETER,
-		  char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+		  char option MAYBE_UNUSED,
+		  char *optarg MAYBE_UNUSED)
 {
   return 0;
 }
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index d8fe75b..4f5a1da 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -55,7 +55,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 /*
   According to Unix-FAQ maintained by Andrew Gierth:
@@ -104,7 +104,7 @@
 #define MAXFD 64
 
 void
-waitdaemon_timeout (int signo _GL_UNUSED_PARAMETER)
+waitdaemon_timeout (int signo MAYBE_UNUSED)
 {
   int left;
 
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 310d30d..eb4ae23 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -70,7 +70,7 @@
 
 #include <config.h>
 
-#include "unused-parameter.h"
+#include "attribute.h"
 
 #if defined AUTHENTICATION
 # include <stdio.h>
@@ -665,7 +665,7 @@ auth_finished (TN_Authenticator * ap, int result)
 }
 
 static void
-auth_intr (int sig _GL_UNUSED_PARAMETER)
+auth_intr (int sig MAYBE_UNUSED)
 {
   auth_finished (0, AUTH_REJECT);
 }
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index fdef43e..4973b00 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -82,7 +82,7 @@
 # include <string.h>
 
 # include <stdio.h>
-# include <unused-parameter.h>
+# include <attribute.h>
 # include "genget.h"
 
 /* String representation of our capabilities.
@@ -669,8 +669,8 @@ encrypt_reply (unsigned char *data, int cnt)
  * Called when a ENCRYPT START command is received.
  */
 void
-encrypt_start (unsigned char *data _GL_UNUSED_PARAMETER,
-	       int cnt _GL_UNUSED_PARAMETER)
+encrypt_start (unsigned char *data MAYBE_UNUSED,
+	       int cnt MAYBE_UNUSED)
 {
   Encryptions *ep;
 
@@ -752,8 +752,8 @@ encrypt_request_end (void)
  * can.
  */
 void
-encrypt_request_start (unsigned char *data _GL_UNUSED_PARAMETER,
-		       int cnt _GL_UNUSED_PARAMETER)
+encrypt_request_start (unsigned char *data MAYBE_UNUSED,
+		       int cnt MAYBE_UNUSED)
 {
   if (encrypt_mode == 0)
     {
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 19e4fb5..77d4023 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -37,7 +37,7 @@
 # include <ctype.h>
 # include <syslog.h>
 # include <string.h>
-# include <unused-parameter.h>
+# include <attribute.h>
 
 # include "auth.h"
 # include "misc.h"
@@ -121,7 +121,7 @@ Data (TN_Authenticator * ap, int type, krb5_pointer d, int c)
 
 /* FIXME: Reverse return code! */
 int
-kerberos5_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER, int server)
+kerberos5_init (TN_Authenticator * ap MAYBE_UNUSED, int server)
 {
   str_data[3] = server ? TELQUAL_REPLY : TELQUAL_IS;
   if (telnet_context == 0 && krb5_init_context (&telnet_context))
@@ -428,7 +428,7 @@ kerberos5_reply (TN_Authenticator * ap, unsigned char *data, int cnt)
 }
 
 int
-kerberos5_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+kerberos5_status (TN_Authenticator * ap MAYBE_UNUSED,
 		  char *name, size_t len, int level)
 {
   if (level < AUTH_USER)
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index deacb7e..a6bafbc 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -33,7 +33,7 @@
 # include <ctype.h>
 # include <syslog.h>
 # include <string.h>
-# include <unused-parameter.h>
+# include <attribute.h>
 
 # include "auth.h"
 # include "misc.h"
@@ -102,7 +102,7 @@ Shishi *shishi_telnet = NULL;
 
 /* FIXME: Reverse return code! */
 int
-krb5shishi_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+krb5shishi_init (TN_Authenticator * ap MAYBE_UNUSED,
 		 int server)
 {
   if (server)
@@ -137,7 +137,7 @@ delayed_shishi_init (void)
 }
 
 void
-krb5shishi_cleanup (TN_Authenticator * ap _GL_UNUSED_PARAMETER)
+krb5shishi_cleanup (TN_Authenticator * ap MAYBE_UNUSED)
 {
   if (shishi_handle == NULL)
     return;
@@ -396,7 +396,7 @@ krb5shishi_reply (TN_Authenticator * ap, unsigned char *data, int cnt)
 }
 
 int
-krb5shishi_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+krb5shishi_status (TN_Authenticator * ap MAYBE_UNUSED,
 		   char *name, size_t len, int level)
 {
   int status;
diff --git a/ping/ping.c b/ping/ping.c
index 149df74..49ee2a4 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -48,7 +48,7 @@
 #endif
 
 #include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <ping.h>
 #include "ping_impl.h"
 #include "libinetutils.h"
@@ -377,7 +377,7 @@ decode_ip_timestamp (char *arg)
 int volatile stop = 0;
 
 void
-sig_int (int signal _GL_UNUSED_PARAMETER)
+sig_int (int signal MAYBE_UNUSED)
 {
   stop = 1;
 }
diff --git a/ping/ping6.c b/ping/ping6.c
index ffa85b3..8d97541 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -52,7 +52,7 @@
 # include <idna.h>
 #endif
 
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <xalloc.h>
 #include "ping6.h"
 #include "libinetutils.h"
@@ -310,7 +310,7 @@ main (int argc, char **argv)
 static volatile int stop = 0;
 
 static void
-sig_int (int signal _GL_UNUSED_PARAMETER)
+sig_int (int signal MAYBE_UNUSED)
 {
   stop = 1;
 }
@@ -546,7 +546,7 @@ ping_reset (PING * p)
 
 static int
 print_echo (int dupflag, int hops, struct ping_stat *ping_stat,
-	    struct sockaddr_in6 *dest _GL_UNUSED_PARAMETER,
+	    struct sockaddr_in6 *dest MAYBE_UNUSED,
 	    struct sockaddr_in6 *from,
 	    struct icmp6_hdr *icmp6, int datalen)
 {
@@ -823,7 +823,7 @@ echo_finish (void)
 }
 
 static PING *
-ping_init (int type _GL_UNUSED_PARAMETER, int ident)
+ping_init (int type MAYBE_UNUSED, int ident)
 {
   int fd, err;
   const int on = 1;
diff --git a/ping/ping_address.c b/ping/ping_address.c
index 7163ddd..7817c98 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include <ping.h>
 #include <ping_impl.h>
@@ -91,10 +91,10 @@ recv_address (int code, void *closure,
 }
 
 void
-print_address (int dupflag, void *closure _GL_UNUSED_PARAMETER,
-	       struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+print_address (int dupflag, void *closure MAYBE_UNUSED,
+	       struct sockaddr_in *dest MAYBE_UNUSED,
 	       struct sockaddr_in *from,
-	       struct ip *ip _GL_UNUSED_PARAMETER,
+	       struct ip *ip MAYBE_UNUSED,
 	       icmphdr_t * icmp, int datalen)
 {
   struct in_addr addr;
diff --git a/ping/ping_common.c b/ping/ping_common.c
index ce07451..2fcae92 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <xalloc.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include "ping_common.h"
 
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 2976830..3ab116f 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -41,7 +41,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include <ping.h>
 #include "ping_impl.h"
@@ -174,7 +174,7 @@ handler (int code, void *closure,
 
 int
 print_echo (int dupflag, struct ping_stat *ping_stat,
-	    struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+	    struct sockaddr_in *dest MAYBE_UNUSED,
 	    struct sockaddr_in *from,
 	    struct ip *ip, icmphdr_t * icmp, int datalen)
 {
@@ -339,7 +339,7 @@ print_ip_header (struct ip *ip)
 }
 
 void
-print_ip_data (icmphdr_t * icmp, void *data _GL_UNUSED_PARAMETER)
+print_ip_data (icmphdr_t * icmp, void *data MAYBE_UNUSED)
 {
   int hlen;
   unsigned char *cp;
diff --git a/ping/ping_router.c b/ping/ping_router.c
index 0a6d48d..125d8d3 100644
--- a/ping/ping_router.c
+++ b/ping/ping_router.c
@@ -40,13 +40,13 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include <ping.h>
 #include <ping_impl.h>
 
 int
-ping_router (char *hostname _GL_UNUSED_PARAMETER)
+ping_router (char *hostname MAYBE_UNUSED)
 {
   return 0;
 }
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index b32c36f..17f51d1 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include <ping.h>
 #include <ping_impl.h>
@@ -91,10 +91,10 @@ recv_timestamp (int code, void *closure,
 
 
 void
-print_timestamp (int dupflag, void *closure _GL_UNUSED_PARAMETER,
-		 struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+print_timestamp (int dupflag, void *closure MAYBE_UNUSED,
+		 struct sockaddr_in *dest MAYBE_UNUSED,
 		 struct sockaddr_in *from,
-		 struct ip *ip _GL_UNUSED_PARAMETER,
+		 struct ip *ip MAYBE_UNUSED,
 		 icmphdr_t * icmp, int datalen)
 {
   char timestr[16];
diff --git a/src/inetd.c b/src/inetd.c
index d3d8281..04d3361 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -137,7 +137,7 @@
 #include "libinetutils.h"
 #include "argcv.h"
 #include "version-etc.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 
 #ifndef EAI_ADDRFAMILY
 # define EAI_ADDRFAMILY 1
@@ -203,7 +203,7 @@ static struct argp_option argp_options[] = {
 
 static error_t
 parse_opt (int key, char *arg,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+	   struct argp_state *state MAYBE_UNUSED)
 {
   char *p;
   int number;
@@ -490,7 +490,7 @@ run_service (int ctrl, struct servtab *sep)
 }
 
 void
-reapchild (int signo _GL_UNUSED_PARAMETER)
+reapchild (int signo MAYBE_UNUSED)
 {
   int status;
   pid_t pid;
@@ -692,7 +692,7 @@ servent_setup (struct servtab *sep)
 }
 
 void
-retry (int signo _GL_UNUSED_PARAMETER)
+retry (int signo MAYBE_UNUSED)
 {
   struct servtab *sep;
 
@@ -1525,7 +1525,7 @@ echo_stream (int s, struct servtab *sep)
 
 /* Echo service -- echo data back */
 void
-echo_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+echo_dg (int s, struct servtab *sep MAYBE_UNUSED)
 {
   char buffer[BUFSIZE];
   int i;
@@ -1563,7 +1563,7 @@ discard_stream (int s, struct servtab *sep)
 
 void
 /* Discard service -- ignore data */
-discard_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+discard_dg (int s, struct servtab *sep MAYBE_UNUSED)
 {
   char buffer[BUFSIZE];
 
@@ -1624,7 +1624,7 @@ chargen_stream (int s, struct servtab *sep)
 
 /* Character generator */
 void
-chargen_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+chargen_dg (int s, struct servtab *sep MAYBE_UNUSED)
 {
 #ifdef IPV6
   struct sockaddr_storage sa;
@@ -1686,7 +1686,7 @@ machtime (void)
 }
 
 void
-machtime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+machtime_stream (int s, struct servtab *sep MAYBE_UNUSED)
 {
   long result;
 
@@ -1695,7 +1695,7 @@ machtime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
 }
 
 void
-machtime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+machtime_dg (int s, struct servtab *sep MAYBE_UNUSED)
 {
   long result;
 #ifdef IPV6
@@ -1716,7 +1716,7 @@ machtime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
 
 void
 /* Return human-readable time of day */
-daytime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+daytime_stream (int s, struct servtab *sep MAYBE_UNUSED)
 {
   char buffer[256];
   time_t lclock;
@@ -1729,7 +1729,7 @@ daytime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
 
 /* Return human-readable time of day */
 void
-daytime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+daytime_dg (int s, struct servtab *sep MAYBE_UNUSED)
 {
   char buffer[256];
   time_t lclock;
diff --git a/src/logger.c b/src/logger.c
index 1228a1e..25b6e2b 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -41,7 +41,7 @@
 #include <error.h>
 #include <xalloc.h>
 #include <inttostr.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #define SYSLOG_NAMES
 #include <syslog.h>
@@ -374,7 +374,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
diff --git a/src/rcp.c b/src/rcp.c
index 476cbaa..743930c 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -84,7 +84,7 @@
 # include <utime.h>		/* If we don't have utimes(), use utime(). */
 #endif
 #include <progname.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 #include <argp.h>
 #include <error.h>
@@ -202,7 +202,7 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -1489,7 +1489,7 @@ allocbuf (BUF * bp, int fd, int blksize)
 }
 
 void
-lostconn (int signo _GL_UNUSED_PARAMETER)
+lostconn (int signo MAYBE_UNUSED)
 {
   if (!iamremote)
     error (0, 0, "lost connection");
diff --git a/src/rexecd.c b/src/rexecd.c
index f3c5092..4777a6d 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -112,7 +112,7 @@
 #include <progname.h>
 #include <argp.h>
 #include <error.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include "libinetutils.h"
 
 void die (int code, const char *fmt, ...);
@@ -137,8 +137,8 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg _GL_UNUSED_PARAMETER,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg MAYBE_UNUSED,
+	   struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -730,7 +730,7 @@ getstr (const char *err)
 static int
 rexec_conv (int num, const struct pam_message **pam_msg,
 	    struct pam_response **pam_resp,
-	    void *data _GL_UNUSED_PARAMETER)
+	    void *data MAYBE_UNUSED)
 {
   struct pam_response *resp;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index bdfcfa6..2abb2d2 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -103,7 +103,7 @@
 
 #include <progname.h>
 #include "libinetutils.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 #include "xalloc.h"
 
 #ifdef KERBEROS
@@ -927,7 +927,7 @@ int dosigwinch;
  * FIXME: Race condition due to sendwindow() in signal handler?
  */
 void
-writeroob (int signo _GL_UNUSED_PARAMETER)
+writeroob (int signo MAYBE_UNUSED)
 {
   if (dosigwinch == 0)
     {
@@ -946,7 +946,7 @@ writeroob (int signo _GL_UNUSED_PARAMETER)
 /* FIXME: System dependent race condition due to done().
  */
 void
-catch_child (int signo _GL_UNUSED_PARAMETER)
+catch_child (int signo MAYBE_UNUSED)
 {
   int status;
   pid_t pid;
@@ -1113,7 +1113,7 @@ stop (char cmdc)
 }
 
 void
-sigwinch (int signo _GL_UNUSED_PARAMETER)
+sigwinch (int signo MAYBE_UNUSED)
 {
   struct winsize ws;
 
@@ -1172,7 +1172,7 @@ int rcvcnt, rcvstate;
 char rcvbuf[8 * 1024];
 
 void
-oob (int signo _GL_UNUSED_PARAMETER)
+oob (int signo MAYBE_UNUSED)
 {
   char mark;
   struct termios tt;
diff --git a/src/rlogind.c b/src/rlogind.c
index 345b9b6..3be3b45 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -117,7 +117,7 @@
 #include <progname.h>
 #include <argp.h>
 #include <libinetutils.h>
-#include "unused-parameter.h"
+#include "attribute.h"
 #include "xalloc.h"
 
 /*
@@ -309,7 +309,7 @@ void prevent_routing (int fd, struct auth_data *ap);
 #endif
 
 void
-rlogind_sigchld (int signo _GL_UNUSED_PARAMETER)
+rlogind_sigchld (int signo MAYBE_UNUSED)
 {
   pid_t pid;
   int status;
@@ -488,7 +488,7 @@ static struct argp_option options[] = {
 
 static error_t
 parse_opt (int key, char *arg,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+	   struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -2230,7 +2230,7 @@ do_pam_check (int infd, struct auth_data *ap, const char *service)
 static int
 rlogin_conv (int num, const struct pam_message **pam_msg,
 	     struct pam_response **pam_resp,
-	     void *data _GL_UNUSED_PARAMETER)
+	     void *data MAYBE_UNUSED)
 {
   struct pam_response *resp;
 
diff --git a/src/rsh.c b/src/rsh.c
index fa97e2a..79bfbc2 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -78,7 +78,7 @@
 #include <xalloc.h>
 #include <argp.h>
 #include <libinetutils.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #ifdef KRB5
 # ifdef HAVE_KRB5_H
@@ -173,7 +173,7 @@ static struct argp_option options[] = {
 
 static error_t
 parse_opt (int key, char *arg,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+	   struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -784,7 +784,7 @@ sendsig (int sig)
 }
 
 void
-sigpipe (int sig _GL_UNUSED_PARAMETER)
+sigpipe (int sig MAYBE_UNUSED)
 {
   ++end_of_pipe;
 }
diff --git a/src/rshd.c b/src/rshd.c
index fed6f39..e83fbab 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -146,7 +146,7 @@
 #include <error.h>
 #include <progname.h>
 #include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 #include "xalloc.h"
 
@@ -271,7 +271,7 @@ extern int iruserok (uint32_t raddr, int superuser,
 #endif /* WITH_PAM */
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -2093,7 +2093,7 @@ topdomain (const char *h)
 static int
 rsh_conv (int num, const struct pam_message **pam_msg,
 	    struct pam_response **pam_resp,
-	    void *data _GL_UNUSED_PARAMETER)
+	    void *data MAYBE_UNUSED)
 {
   struct pam_response *resp;
 
diff --git a/src/syslogd.c b/src/syslogd.c
index 4528d7e..fb71e4c 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -137,7 +137,7 @@
 #include <progname.h>
 #include <libinetutils.h>
 #include <readutmp.h>		/* May define UTMP_NAME_FUNCTION.  */
-#include "unused-parameter.h"
+#include "attribute.h"
 #include "xalloc.h"
 
 /* A mask of all facilities mentioned explicitly in the configuration file
@@ -1744,7 +1744,7 @@ cvthname (struct sockaddr *f, socklen_t len)
 }
 
 void
-domark (int signo _GL_UNUSED_PARAMETER)
+domark (int signo MAYBE_UNUSED)
 {
   struct filed *f;
 
@@ -1793,7 +1793,7 @@ logerror (const char *type)
 }
 
 void
-doexit (int signo _GL_UNUSED_PARAMETER)
+doexit (int signo MAYBE_UNUSED)
 {
   _exit (EXIT_SUCCESS);
 }
@@ -2090,7 +2090,7 @@ load_confdir (const char *dirname, struct filed **nextp)
 
 /* INIT -- Initialize syslogd from configuration table.  */
 void
-init (int signo _GL_UNUSED_PARAMETER)
+init (int signo MAYBE_UNUSED)
 {
   int rc, ret;
   struct filed *f, *next, **nextp;
@@ -2487,7 +2487,7 @@ decode (const char *name, CODE * codetab)
 }
 
 void
-dbg_toggle (int signo _GL_UNUSED_PARAMETER)
+dbg_toggle (int signo MAYBE_UNUSED)
 {
   int dbg_save = dbg_output;
 
@@ -2523,7 +2523,7 @@ dbg_printf (const char *fmt, ...)
    set a flag variable which will tell the main loop to go through a
    restart.  */
 void
-trigger_restart (int signo _GL_UNUSED_PARAMETER)
+trigger_restart (int signo MAYBE_UNUSED)
 {
   restart = 1;
 #ifndef HAVE_SIGACTION
diff --git a/src/tftp.c b/src/tftp.c
index 1143e74..75ef663 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -83,7 +83,7 @@
 #endif
 
 #include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include <libinetutils.h>
 
@@ -516,13 +516,13 @@ modecmd (int argc, char *argv[])
 }
 
 void
-setbinary (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+setbinary (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
 {
   settftpmode ("octet");
 }
 
 void
-setascii (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+setascii (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
 {
   settftpmode ("netascii");
 }
@@ -792,7 +792,7 @@ settimeout (int argc, char *argv[])
 }
 
 void
-status (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+status (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
 {
   if (connected)
     printf ("Connected to %s.\n", hostname);
@@ -805,7 +805,7 @@ status (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
 }
 
 void
-intr (int signo _GL_UNUSED_PARAMETER)
+intr (int signo MAYBE_UNUSED)
 {
   signal (SIGALRM, SIG_IGN);
   alarm (0);
@@ -929,7 +929,7 @@ makeargv (void)
 }
 
 void
-quit (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+quit (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
 {
   exit (EXIT_SUCCESS);
 }
@@ -966,14 +966,14 @@ help (int argc, char *argv[])
 }
 
 void
-settrace (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+settrace (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
 {
   trace = !trace;
   printf ("Packet tracing %s.\n", trace ? "on" : "off");
 }
 
 void
-setverbose (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+setverbose (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
 {
   verbose = !verbose;
   printf ("Verbose mode %s.\n", verbose ? "on" : "off");
@@ -1378,7 +1378,7 @@ printstats (const char *direction, unsigned long amount)
 }
 
 static void
-timer (int sig _GL_UNUSED_PARAMETER)
+timer (int sig MAYBE_UNUSED)
 {
   timeout += rexmtval;
   if (timeout >= maxtimeout)
diff --git a/src/tftpd.c b/src/tftpd.c
index cc1b703..8906591 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -85,7 +85,7 @@
 
 #include "tftpsubs.h"
 
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <xalloc.h>
 #include <argp.h>
 #include <progname.h>
@@ -165,7 +165,7 @@ static struct argp_option options[] = {
 
 static error_t
 parse_opt (int key, char *arg,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+	   struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -636,7 +636,7 @@ int timeout;
 sigjmp_buf timeoutbuf;
 
 void
-timer (int sig _GL_UNUSED_PARAMETER)
+timer (int sig MAYBE_UNUSED)
 {
 
   timeout += rexmtval;
@@ -716,7 +716,7 @@ abort:
 }
 
 void
-justquit (int sig _GL_UNUSED_PARAMETER)
+justquit (int sig MAYBE_UNUSED)
 {
   exit (EXIT_SUCCESS);
 }
diff --git a/src/traceroute.c b/src/traceroute.c
index de7db4b..c9620d6 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -49,7 +49,7 @@
 #include <limits.h>
 #include <assert.h>
 #include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <icmp.h>
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
@@ -354,7 +354,7 @@ main (int argc, char **argv)
 
 void
 do_try (trace_t * trace, const int hop,
-	const int max_hops _GL_UNUSED_PARAMETER,
+	const int max_hops MAYBE_UNUSED,
 	const int max_tries)
 {
   fd_set readset;
diff --git a/src/uucpd.c b/src/uucpd.c
index c8bb460..072c222 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -88,7 +88,7 @@
 
 #include <argp.h>
 #include <progname.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 
 void dologin (struct passwd *pw, struct sockaddr *sap, socklen_t salen);
@@ -119,7 +119,7 @@ static struct argp_option argp_options[] = {
 
 static error_t
 parse_opt (int key, char *arg,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+	   struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 99e6b60..d5e0c25 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -62,10 +62,10 @@
 #include <signal.h>
 #include <error.h>
 #include "talk.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 
 static void
-sig_sent (int sig _GL_UNUSED_PARAMETER)
+sig_sent (int sig MAYBE_UNUSED)
 {
 
   message ("Connection closing. Exiting");
diff --git a/talk/invite.c b/talk/invite.c
index 84b1976..ce1d083 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -62,7 +62,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <setjmp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include "talk_ctl.h"
 #include "talk.h"
 
@@ -117,7 +117,7 @@ announce_invite (void)
  * Routine called on interupt to re-invite the callee
  */
 void
-re_invite (int sig _GL_UNUSED_PARAMETER)
+re_invite (int sig MAYBE_UNUSED)
 {
 
   message ("Ringing your party again");
diff --git a/talk/msgs.c b/talk/msgs.c
index d555e21..8c01b54 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -59,7 +59,7 @@
 #include <time.h>
 #include <signal.h>
 #include <stdio.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include "talk.h"
 
 #define MSG_INTERVAL 4
@@ -68,7 +68,7 @@ char *current_state;
 int current_line = 0;
 
 static void
-disp_msg (int sig _GL_UNUSED_PARAMETER)
+disp_msg (int sig MAYBE_UNUSED)
 {
   message (current_state);
 }
diff --git a/talkd/table.c b/talkd/table.c
index 76b1137..ffe0306 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <intalkd.h>
-#include "unused-parameter.h"
+#include "attribute.h"
 
 typedef struct request_table table_t;
 
@@ -93,7 +93,7 @@ lookup_request (CTL_MSG * request,
 
 static int
 fuzzy_comp (table_t * ptr, CTL_MSG * request,
-	    time_t * unused _GL_UNUSED_PARAMETER)
+	    time_t * unused MAYBE_UNUSED)
 {
   if (ptr->request.type == LEAVE_INVITE
       && strcmp (request->l_name, ptr->request.r_name) == 0
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 452d3f1..08e3a5b 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <libinetutils.h>
 #include <progname.h>
-#include "unused-parameter.h"
+#include "attribute.h"
 
 #ifndef LOG_FACILITY
 # define LOG_FACILITY LOG_DAEMON
@@ -67,7 +67,7 @@ static struct argp_option argp_options[] = {
 
 static error_t
 parse_opt (int key, char *arg,
-	   struct argp_state *state _GL_UNUSED_PARAMETER)
+	   struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -138,7 +138,7 @@ talkd_init (void)
 time_t last_msg_time;
 
 static void
-alarm_handler (int err _GL_UNUSED_PARAMETER)
+alarm_handler (int err MAYBE_UNUSED)
 {
   int oerrno = errno;
 
diff --git a/telnet/commands.c b/telnet/commands.c
index 5cc9b4d..26cedba 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -81,7 +81,7 @@
 # include <idna.h>
 #endif
 
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 
 #include "general.h"
@@ -1567,7 +1567,7 @@ suspend (void)
 
 #if !defined TN3270
 int
-shell (int argc, char *argv[] _GL_UNUSED_PARAMETER)
+shell (int argc, char *argv[] MAYBE_UNUSED)
 {
   long oldrows, oldcols, newrows, newcols, err;
 
diff --git a/telnet/main.c b/telnet/main.c
index c790d6e..1a96d35 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -64,7 +64,7 @@
 #include <progname.h>
 #include <error.h>
 #include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 
 #include <arpa/telnet.h>
@@ -201,7 +201,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 6a4b655..9dd2ec4 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -64,7 +64,7 @@
 #include <errno.h>
 #include <arpa/telnet.h>
 #include <sys/select.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 #include "ring.h"
 
@@ -942,7 +942,7 @@ NetSetPgrp (int fd)
  */
 
 void
-deadpeer (int sig _GL_UNUSED_PARAMETER)
+deadpeer (int sig MAYBE_UNUSED)
 {
   setcommandmode ();
   longjmp (peerdied, -1);
@@ -950,7 +950,7 @@ deadpeer (int sig _GL_UNUSED_PARAMETER)
 
 
 void
-intr (int sig _GL_UNUSED_PARAMETER)
+intr (int sig MAYBE_UNUSED)
 {
   if (localchars)
     {
@@ -963,7 +963,7 @@ intr (int sig _GL_UNUSED_PARAMETER)
 
 
 void
-intr2 (int sig _GL_UNUSED_PARAMETER)
+intr2 (int sig MAYBE_UNUSED)
 {
   if (localchars)
     {
@@ -979,7 +979,7 @@ intr2 (int sig _GL_UNUSED_PARAMETER)
 
 #ifdef	SIGTSTP
 void
-susp (int sig _GL_UNUSED_PARAMETER)
+susp (int sig MAYBE_UNUSED)
 {
   if ((rlogin != _POSIX_VDISABLE) && rlogin_susp ())
     return;
@@ -990,7 +990,7 @@ susp (int sig _GL_UNUSED_PARAMETER)
 
 #ifdef	SIGWINCH
 void
-sendwin (int sig _GL_UNUSED_PARAMETER)
+sendwin (int sig MAYBE_UNUSED)
 {
   if (connected)
     {
@@ -1001,7 +1001,7 @@ sendwin (int sig _GL_UNUSED_PARAMETER)
 
 #ifdef	SIGINFO
 void
-ayt (int sig _GL_UNUSED_PARAMETER)
+ayt (int sig MAYBE_UNUSED)
 {
   if (connected)
     sendayt ();
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index c0d3ba0..db5d212 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -27,7 +27,7 @@
 #include <argp.h>
 #include <progname.h>
 #include <error.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 
 #if defined AUTHENTICATION || defined ENCRYPTION
@@ -145,7 +145,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
 {
   switch (key)
     {
@@ -796,7 +796,7 @@ print_hostinfo (void)
 }
 
 static void
-chld_is_done (int sig _GL_UNUSED_PARAMETER)
+chld_is_done (int sig MAYBE_UNUSED)
 {
   pending_sigchld = 1;
 }
diff --git a/tests/localhost.c b/tests/localhost.c
index 8b7a745..019b238 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -23,11 +23,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <progname.h>
 
 int
-main (int argc _GL_UNUSED_PARAMETER, char **argv)
+main (int argc MAYBE_UNUSED, char **argv)
 {
   char *p = localhost ();
   set_program_name (argv[0]);
diff --git a/tests/waitdaemon.c b/tests/waitdaemon.c
index 95bf2ee..66af6ca 100644
--- a/tests/waitdaemon.c
+++ b/tests/waitdaemon.c
@@ -34,18 +34,18 @@
 #include <error.h>
 #include <progname.h>
 #include <libinetutils.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 
 extern int waitdaemon (int nochdir, int noclose, int maxwait);
 
 void
-doexit (int signo _GL_UNUSED_PARAMETER)
+doexit (int signo MAYBE_UNUSED)
 {
   _exit (EXIT_SUCCESS);
 }
 
 int
-main (int argc _GL_UNUSED_PARAMETER, char *argv[])
+main (int argc MAYBE_UNUSED, char *argv[])
 {
   pid_t ppid;
 
diff --git a/whois/whois.c b/whois/whois.c
index a62f5ca..3e4f192 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -41,7 +41,7 @@
 #define obstack_chunk_free free
 #include <obstack.h>
 #include <error.h>
-#include <unused-parameter.h>
+#include <attribute.h>
 #include <libinetutils.h>
 
 /* Application-specific */
@@ -103,7 +103,7 @@ static struct argp_option ripe_argp_options[] = {
 
 static error_t
 ripe_argp_parser (int key, char *arg,
-		  struct argp_state *state _GL_UNUSED_PARAMETER)
+		  struct argp_state *state MAYBE_UNUSED)
 {
   if (key > 0 && (unsigned) key < 128)
     {
@@ -142,7 +142,7 @@ static struct argp_option gwhois_argp_options[] = {
 
 static error_t
 gwhois_argp_parser (int key, char *arg,
-		    struct argp_state *state _GL_UNUSED_PARAMETER)
+		    struct argp_state *state MAYBE_UNUSED)
 {
   char *p, *q;
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0e4832e73a93ecd3f3365b540242839ac99343dc


commit 0e4832e73a93ecd3f3365b540242839ac99343dc
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 22:09:22 2021 +0200

    maint: Don't cc release announcement to translators.
    
    * maint.mk (translation_project_): Set to empty.

diff --git a/cfg.mk b/cfg.mk
index a0e234e..62e47e8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -23,6 +23,8 @@ bootstrap-tools = gnulib,autoconf,automake,bison,m4,makeinfo,help2man,make,gzip,
 
 old_NEWS_hash = 9e58290a292044bd6de634f52f6ed940
 
+translation_project_ =
+
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 
 local-checks-to-skip = \

-----------------------------------------------------------------------

Summary of changes:
 bootstrap.conf            |  2 +-
 cfg.mk                    |  2 ++
 configure.ac              |  3 ---
 ftp/cmds.c                | 66 +++++++++++++++++++++++------------------------
 ftp/ftp.c                 | 14 +++++-----
 ftp/main.c                |  8 +++---
 ftpd/ftpd.c               |  6 ++---
 ftpd/pam.c                |  4 +--
 ftpd/server_mode.c        |  4 +--
 ifconfig/options.c        |  6 ++---
 ifconfig/printif.c        | 48 +++++++++++++++++-----------------
 ifconfig/system/bsd.c     | 26 +++++++++----------
 ifconfig/system/generic.c | 20 +++++++-------
 ifconfig/system/hurd.c    | 24 ++++++++---------
 ifconfig/system/linux.c   | 20 +++++++-------
 ifconfig/system/solaris.c |  8 +++---
 libinetutils/daemon.c     |  4 +--
 libtelnet/auth.c          |  4 +--
 libtelnet/encrypt.c       | 10 +++----
 libtelnet/kerberos5.c     |  6 ++---
 libtelnet/shishi.c        |  8 +++---
 ping/ping.c               |  4 +--
 ping/ping6.c              |  8 +++---
 ping/ping_address.c       |  8 +++---
 ping/ping_common.c        |  2 +-
 ping/ping_echo.c          |  6 ++---
 ping/ping_router.c        |  4 +--
 ping/ping_timestamp.c     |  8 +++---
 src/inetd.c               | 22 ++++++++--------
 src/logger.c              |  4 +--
 src/rcp.c                 |  6 ++---
 src/rexecd.c              |  8 +++---
 src/rlogin.c              | 10 +++----
 src/rlogind.c             |  8 +++---
 src/rsh.c                 |  6 ++---
 src/rshd.c                |  6 ++---
 src/syslogd.c             | 12 ++++-----
 src/tftp.c                | 18 ++++++-------
 src/tftpd.c               |  8 +++---
 src/traceroute.c          |  4 +--
 src/uucpd.c               |  4 +--
 talk/init_disp.c          |  4 +--
 talk/invite.c             |  4 +--
 talk/msgs.c               |  4 +--
 talkd/table.c             |  4 +--
 talkd/talkd.c             |  6 ++---
 telnet/commands.c         |  4 +--
 telnet/main.c             |  4 +--
 telnet/sys_bsd.c          | 14 +++++-----
 telnetd/telnetd.c         |  6 ++---
 tests/localhost.c         |  4 +--
 tests/waitdaemon.c        |  6 ++---
 whois/whois.c             |  6 ++---
 53 files changed, 257 insertions(+), 258 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Sep 01 17:50:44 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mLY84-0001QB-Hs
	for mharc-commit-inetutils@gnu.org; Wed, 01 Sep 2021 17:50:44 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:42144)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mLY81-0001Pj-NJ
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 17:50:42 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:58256)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mLY80-0005mt-Uk
 for commit-inetutils@gnu.org; Wed, 01 Sep 2021 17:50:40 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id CD87020B71; Wed,  1 Sep 2021 17:50:40 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-6-g880dbcf
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fc310f059c59884a2217606df62b444887c86f84
X-Git-Newrev: 880dbcf7effb86373b011108f6cf9d250342420b
Message-Id: <20210901215040.CD87020B71@vcs0.savannah.gnu.org>
Date: Wed,  1 Sep 2021 17:50:40 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2021 21:50:42 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  880dbcf7effb86373b011108f6cf9d250342420b (commit)
       via  a23230a6ff0eb0c2bc1158e154a6ee68afc5d1ed (commit)
      from  fc310f059c59884a2217606df62b444887c86f84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=880dbcf7effb86373b011108f6cf9d250342420b


commit 880dbcf7effb86373b011108f6cf9d250342420b
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 23:31:44 2021 +0200

    Drop obsolete/unused AC_HEADER_DIRENT, AC_FUNC_CLOSEDIR_VOID and AC_FUNC_STRCOLL.
    
    * configure.ac: Remove calls.

diff --git a/configure.ac b/configure.ac
index 81783e8..692858e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,9 +611,6 @@ AC_CHECK_FUNCS([setlocale])
 IU_CHECK_LIBIDN([$with_libidn_prefix], [$with_idn])
 
 ### Checks for header files.
-
-AC_HEADER_DIRENT
-
 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h features.h \
 		  glob.h memory.h netinet/ether.h netinet/in_systm.h \
 		  netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
@@ -746,9 +743,7 @@ IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
 		  #include <arpa/tftp.h>])
 
 ### Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_FORK
-AC_FUNC_STRCOLL
 AC_FUNC_MMAP
 
 AC_CHECK_FUNCS(cfsetspeed cgetent dirfd flock \

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a23230a6ff0eb0c2bc1158e154a6ee68afc5d1ed


commit a23230a6ff0eb0c2bc1158e154a6ee68afc5d1ed
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Sep 1 23:11:52 2021 +0200

    Drop unused IU_CHECK_WEAK_REFS.
    
    * configure.ac: Remove IU_CHECK_WEAK_REFS.
    * am/check_weak_refs.m4: Remove file.

diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
deleted file mode 100644
index 6256acd..0000000
--- a/am/check_weak_refs.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Inetutils.
-dnl
-dnl GNU Inetutils is free software: you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation, either version 3 of the License, or (at
-dnl your option) any later version.
-dnl
-dnl GNU Inetutils is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-dnl Written by Miles Bader.
-
-dnl IU_CHECK_WEAK_REFS -- See if any of a variety of `weak reference'
-dnl mechanisms works.  If so, this defines HAVE_WEAK_REFS, and one of
-dnl HAVE_ATTR_WEAK_REFS, HAVE_PRAGMA_WEAK_REFS, or HAVE_ASM_WEAK_REFS to
-dnl indicate which sort.
-dnl
-dnl This can't just be a compile-check, as gcc somtimes accepts the syntax even
-dnl feature isn't actually supported.
-dnl
-AC_DEFUN([IU_CHECK_WEAK_REFS], [
-  AH_TEMPLATE(HAVE_WEAK_REFS, 1, [Define if you have weak references])
-  AC_CACHE_CHECK(whether gcc weak references work,
-		 inetutils_cv_attr_weak_refs,
-    AC_TRY_LINK([],
-      [extern char *not_defined (char *, char *) __attribute__ ((weak));
-	if (not_defined) puts ("yes"); ],
-      [inetutils_cv_attr_weak_refs=yes],
-      [inetutils_cv_attr_weak_refs=no]))
-  if test "$inetutils_cv_weak_refs" = yes; then
-    AC_DEFINE([HAVE_WEAK_REFS])
-    AC_DEFINE([HAVE_ATTR_WEAK_REFS], 1,
-              [Define if you have weak "attribute" references])
-  else
-    AC_CACHE_CHECK(whether pragma weak references work,
-		   inetutils_cv_pragma_weak_refs,
-      AC_TRY_LINK([],
-	[extern char *not_defined (char *, char *);
-#pragma weak not_defined
-	 if (not_defined) puts ("yes"); ],
-	[inetutils_cv_pragma_weak_refs=yes],
-	[inetutils_cv_pragma_weak_refs=no]))
-    if test "$inetutils_cv_pragma_weak_refs" = yes; then
-      AC_DEFINE([HAVE_WEAK_REFS])
-      AC_DEFINE([HAVE_PRAGMA_WEAK_REFS], 1,
-                [Define if you have weak "pragma" references])
-    else
-      AC_CACHE_CHECK(whether asm weak references work,
-		     inetutils_cv_asm_weak_refs,
-	AC_TRY_LINK([],
-	  [extern char *not_defined (char *, char *);
-	   asm (".weak not_defined");
-	   if (not_defined) puts ("yes"); ],
-	  [inetutils_cv_asm_weak_refs=yes],
-	  [inetutils_cv_asm_weak_refs=no]))
-      if test "$inetutils_cv_asm_weak_refs" = yes; then
-	AC_DEFINE([HAVE_WEAK_REFS])
-	AC_DEFINE([HAVE_ASM_WEAK_REFS], 1,
-	          [Define if you have weak "assembler" references])
-      fi
-    fi
-  fi])dnl
diff --git a/configure.ac b/configure.ac
index dd1d762..81783e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -745,15 +745,6 @@ IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
 		  #include <sys/socket.h>
 		  #include <arpa/tftp.h>])
 
-### Checks for compiler characteristics.
-
-# See if `weak refs' are possible; these make it possible (with shared
-# libraries) to check for the existance of a standard function at
-# run-time instead of compile time, which is very handy for
-# distributing binary version programs that automatically adapt -- in
-# inetutils case, to whether or not crypt is available.
-IU_CHECK_WEAK_REFS
-
 ### Checks for library functions.
 AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_FORK

-----------------------------------------------------------------------

Summary of changes:
 am/check_weak_refs.m4 | 72 ---------------------------------------------------
 configure.ac          | 14 ----------
 2 files changed, 86 deletions(-)
 delete mode 100644 am/check_weak_refs.m4


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Sep 03 10:08:53 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mM9sD-0008Gw-Ln
	for mharc-commit-inetutils@gnu.org; Fri, 03 Sep 2021 10:08:53 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59642)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mM9sC-0008FT-7U
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 10:08:52 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:48008)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mM9sA-0004ac-UE
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 10:08:50 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 5803320B71; Fri,  3 Sep 2021 10:08:50 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-10-g09a2242
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 880dbcf7effb86373b011108f6cf9d250342420b
X-Git-Newrev: 09a2242bb5c70d956bf8d13547210d83e0d98bcd
Message-Id: <20210903140850.5803320B71@vcs0.savannah.gnu.org>
Date: Fri,  3 Sep 2021 10:08:49 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Sep 2021 14:08:52 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  09a2242bb5c70d956bf8d13547210d83e0d98bcd (commit)
       via  3fcebb9b38b8b01e528d158656af863f98a3c751 (commit)
       via  215de12d09eb6c0bf5de9d16a4a601e1da768b33 (commit)
       via  0412baa8d4ce84c4f9fe9df056731291f3521c95 (commit)
      from  880dbcf7effb86373b011108f6cf9d250342420b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=09a2242bb5c70d956bf8d13547210d83e0d98bcd


commit 09a2242bb5c70d956bf8d13547210d83e0d98bcd
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 16:08:06 2021 +0200

    doc: Mention maintenance fixes.
    
    * NEWS: Add.

diff --git a/NEWS b/NEWS
index 0187d49..db6c069 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,11 @@ GNU inetutils NEWS -- history of user-visible changes.
 Don't infloop when (malicious) server sends too large terminal value,
 see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945861
 
+** Various bugs fixes, internal improvements and clean ups.
+
+Further cleanup of configure.ac, updates to modern autoconf releases,
+and improved gnulib usage.
+
 * Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
 ** ftp

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3fcebb9b38b8b01e528d158656af863f98a3c751


commit 3fcebb9b38b8b01e528d158656af863f98a3c751
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 15:59:45 2021 +0200

    telnet: Don't infloop for malicious server.
    
    See https://bugs.debian.org/945861 and the tiny patch used by NetBSD:
    https://github.com/NetBSD/src/commit/36b8cfb2e28f691beae12da0c207086e1df0c8c4#diff-38b7213f9c6c21245fbeb4fad9520a27239d712a6dd0fea20dd6b77203b5737c
    
    * NEWS: Mention fix.
    * telnet/utilities.c (ExitString): Don't call SetForExit().

diff --git a/NEWS b/NEWS
index 2077110..0187d49 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** telnet
+
+Don't infloop when (malicious) server sends too large terminal value,
+see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945861
 
 * Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 85fd476..08571cd 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1063,7 +1063,6 @@ Exit (int returnCode)
 void
 ExitString (char *string, int returnCode)
 {
-  SetForExit ();
   fwrite (string, 1, strlen (string), stderr);
   exit (returnCode);
 }

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=215de12d09eb6c0bf5de9d16a4a601e1da768b33


commit 215de12d09eb6c0bf5de9d16a4a601e1da768b33
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Sep 2 10:33:19 2021 +0200

    maint: Include license text FDL as suggested by bootstrap.
    
    * doc/fdl-1.3.texi: New file, from gnulib.
    * bootstrap.conf (gnulib_modules): Remove fdl-1.3.

diff --git a/bootstrap.conf b/bootstrap.conf
index f347d47..d04facc 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -49,7 +49,6 @@ errno
 error
 exitfail
 extensions
-fdl-1.3
 filemode
 forkpty
 fts
diff --git a/doc/.gitignore b/doc/.gitignore
index 6bf83eb..b9a0e41 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,7 +1,5 @@
-/fdl-1.3.texi
 /gendocs_template
 /gendocs_template_min
-fdl-1.3.texi
 gendocs_template
 inetutils.info*
 stamp-vti
diff --git a/doc/fdl-1.3.texi b/doc/fdl-1.3.texi
new file mode 100644
index 0000000..eaf3da0
--- /dev/null
+++ b/doc/fdl-1.3.texi
@@ -0,0 +1,505 @@
+@c The GNU Free Documentation License.
+@center Version 1.3, 3 November 2008
+
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
+
+@display
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+@uref{https://fsf.org/}
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@end display
+
+@enumerate 0
+@item
+PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document @dfn{free} in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of ``copyleft'', which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+@item
+APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The ``Document'', below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as ``you''.  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A ``Modified Version'' of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A ``Secondary Section'' is a named appendix or a front-matter section
+of the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The ``Invariant Sections'' are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The ``Cover Texts'' are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A ``Transparent'' copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not ``Transparent'' is called ``Opaque''.
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, La@TeX{} input
+format, SGML or XML using a publicly available
+DTD, and standard-conforming simple HTML,
+PostScript or PDF designed for human modification.  Examples
+of transparent image formats include PNG, XCF and
+JPG@.  Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, SGML or
+XML for which the DTD and/or processing tools are
+not generally available, and the machine-generated HTML,
+PostScript or PDF produced by some word processors for
+output purposes only.
+
+The ``Title Page'' means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, ``Title Page'' means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The ``publisher'' means any person or entity that distributes copies
+of the Document to the public.
+
+A section ``Entitled XYZ'' means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as ``Acknowledgements'',
+``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
+of such a section when you modify the Document means that it remains a
+section ``Entitled XYZ'' according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+@item
+VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+@item
+COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+@item
+MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+@enumerate A
+@item
+Use in the Title Page (and on the covers, if any) a title distinct
+from that of the Document, and from those of previous versions
+(which should, if there were any, be listed in the History section
+of the Document).  You may use the same title as a previous version
+if the original publisher of that version gives permission.
+
+@item
+List on the Title Page, as authors, one or more persons or entities
+responsible for authorship of the modifications in the Modified
+Version, together with at least five of the principal authors of the
+Document (all of its principal authors, if it has fewer than five),
+unless they release you from this requirement.
+
+@item
+State on the Title page the name of the publisher of the
+Modified Version, as the publisher.
+
+@item
+Preserve all the copyright notices of the Document.
+
+@item
+Add an appropriate copyright notice for your modifications
+adjacent to the other copyright notices.
+
+@item
+Include, immediately after the copyright notices, a license notice
+giving the public permission to use the Modified Version under the
+terms of this License, in the form shown in the Addendum below.
+
+@item
+Preserve in that license notice the full lists of Invariant Sections
+and required Cover Texts given in the Document's license notice.
+
+@item
+Include an unaltered copy of this License.
+
+@item
+Preserve the section Entitled ``History'', Preserve its Title, and add
+to it an item stating at least the title, year, new authors, and
+publisher of the Modified Version as given on the Title Page.  If
+there is no section Entitled ``History'' in the Document, create one
+stating the title, year, authors, and publisher of the Document as
+given on its Title Page, then add an item describing the Modified
+Version as stated in the previous sentence.
+
+@item
+Preserve the network location, if any, given in the Document for
+public access to a Transparent copy of the Document, and likewise
+the network locations given in the Document for previous versions
+it was based on.  These may be placed in the ``History'' section.
+You may omit a network location for a work that was published at
+least four years before the Document itself, or if the original
+publisher of the version it refers to gives permission.
+
+@item
+For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
+the Title of the section, and preserve in the section all the
+substance and tone of each of the contributor acknowledgements and/or
+dedications given therein.
+
+@item
+Preserve all the Invariant Sections of the Document,
+unaltered in their text and in their titles.  Section numbers
+or the equivalent are not considered part of the section titles.
+
+@item
+Delete any section Entitled ``Endorsements''.  Such a section
+may not be included in the Modified Version.
+
+@item
+Do not retitle any existing section to be Entitled ``Endorsements'' or
+to conflict in title with any Invariant Section.
+
+@item
+Preserve any Warranty Disclaimers.
+@end enumerate
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled ``Endorsements'', provided it contains
+nothing but endorsements of your Modified Version by various
+parties---for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+@item
+COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled ``History''
+in the various original documents, forming one section Entitled
+``History''; likewise combine any sections Entitled ``Acknowledgements'',
+and any sections Entitled ``Dedications''.  You must delete all
+sections Entitled ``Endorsements.''
+
+@item
+COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+@item
+AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an ``aggregate'' if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+@item
+TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled ``Acknowledgements'',
+``Dedications'', or ``History'', the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+@item
+TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+@item
+FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+@uref{https://www.gnu.org/licenses/}.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.  If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+@item
+RELICENSING
+
+``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works.  A
+public wiki that anybody can edit is an example of such a server.  A
+``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
+site means any set of copyrightable works thus published on the MMC
+site.
+
+``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+``Incorporate'' means to publish or republish a Document, in whole or
+in part, as part of another Document.
+
+An MMC is ``eligible for relicensing'' if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole
+or in part into the MMC, (1) had no cover texts or invariant sections,
+and (2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+@end enumerate
+
+@page
+@heading ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+@smallexample
+@group
+  Copyright (C)  @var{year}  @var{your name}.
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.3
+  or any later version published by the Free Software Foundation;
+  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+  Texts.  A copy of the license is included in the section entitled ``GNU
+  Free Documentation License''.
+@end group
+@end smallexample
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the ``with@dots{}Texts.''@: line with this:
+
+@smallexample
+@group
+    with the Invariant Sections being @var{list their titles}, with
+    the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
+    being @var{list}.
+@end group
+@end smallexample
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+@c Local Variables:
+@c ispell-local-pdict: "ispell-dict"
+@c End:

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0412baa8d4ce84c4f9fe9df056731291f3521c95


commit 0412baa8d4ce84c4f9fe9df056731291f3521c95
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Sep 2 10:18:49 2021 +0200

    doc: Use 'networkING utilities' consistently.
    
    * cfg.mk (manual_title): Fix.
    * doc/inetutils.texi (Introduction): Fix.

diff --git a/cfg.mk b/cfg.mk
index 62e47e8..0a3b168 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-manual_title = GNU Network Utilities
+manual_title = GNU Networking Utilities
 
 bootstrap-tools = gnulib,autoconf,automake,bison,m4,makeinfo,help2man,make,gzip,tar
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 1d6df30..cc2d91a 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -143,7 +143,7 @@ Appendix
 @chapter Introduction
 @cindex introduction
 
-The GNU Network Utilities is a distribution of common networking
+The GNU Networking Utilities is a distribution of common networking
 utilities and servers, including for example ping, traceroute and ftp.
 
 This manual is a work in progress: many sections make no attempt to

-----------------------------------------------------------------------

Summary of changes:
 NEWS               |   9 +
 bootstrap.conf     |   1 -
 cfg.mk             |   2 +-
 doc/.gitignore     |   2 -
 doc/fdl-1.3.texi   | 505 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/inetutils.texi |   2 +-
 telnet/utilities.c |   1 -
 7 files changed, 516 insertions(+), 6 deletions(-)
 create mode 100644 doc/fdl-1.3.texi


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Sep 03 11:23:17 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mMB2C-0003bb-9g
	for mharc-commit-inetutils@gnu.org; Fri, 03 Sep 2021 11:23:17 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:48902)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mMB29-0003Xm-QK
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 11:23:13 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:49249)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mMB28-00064g-Uu
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 11:23:13 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 901E420B71; Fri,  3 Sep 2021 11:23:12 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-12-g040efca
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 09a2242bb5c70d956bf8d13547210d83e0d98bcd
X-Git-Newrev: 040efca40e5e252ba861ede88ae0896eeec84465
Message-Id: <20210903152312.901E420B71@vcs0.savannah.gnu.org>
Date: Fri,  3 Sep 2021 11:23:12 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Sep 2021 15:23:14 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  040efca40e5e252ba861ede88ae0896eeec84465 (commit)
       via  035fc188a35ac56bcc6551368db970d3f527c945 (commit)
      from  09a2242bb5c70d956bf8d13547210d83e0d98bcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=040efca40e5e252ba861ede88ae0896eeec84465


commit 040efca40e5e252ba861ede88ae0896eeec84465
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 17:23:04 2021 +0200

    doc: Update TODO.

diff --git a/TODO b/TODO
index 7a61a2e..f1168f1 100644
--- a/TODO
+++ b/TODO
@@ -118,20 +118,17 @@ Add more utilities:
 Add internationalization, read: gettext support, and provide
 translations, especially for the clients.
 
-3.0 will be a release that tries to put as much as possible into
-libraries (startup code, etc).  We would also like to try and write
-(or convince someone else to write) a gopher and gopherd pair.
+Try to put as much as possible into libraries (startup code, etc).
+
+gopher and gopherd?
 
 Make src/hostname.c handle missing 'sethostname' functions on
 platforms that doesn't have them (it could just print an error
 message).
 
-Fix all warnings with autoconf 2.71+
-
 enhance man pages so they fully supersede NetKit and BSD man pages
 
 generally use gnulib for portability more than we use today:
-  - gnulib has fts.c that we have a custom libls/ for
   - getaddrinfo/getnameinfo with IDN support to simplify IDN complexity
   - more system header files replacements
   - ruserok/wtmp stuff

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=035fc188a35ac56bcc6551368db970d3f527c945


commit 035fc188a35ac56bcc6551368db970d3f527c945
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 17:08:07 2021 +0200

    maint: Autoupdate for autoconf 2.71.
    
    * configure.ac: Don't use AC_TRY_LINK or AC_TRY_COMPILE.
    * am/libcurses.m4: Ditto.
    * am/krb5.m4: Ditto.

diff --git a/am/krb5.m4 b/am/krb5.m4
index 676ffec..76c0893 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -67,17 +67,15 @@ AC_DEFUN([IU_CHECK_KRB5],
 
     ## Check for new MIT kerberos V support
     LIBS="$saved_LIBS -lkrb5 -lk5crypto -lcom_err"
-    AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-      [KRB5_IMPL="MIT"
-       KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lk5crypto -lcom_err"], )
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void *) 0); ]])],[KRB5_IMPL="MIT"
+       KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lk5crypto -lcom_err"],[])
 
     ## Heimdal kerberos V support
     if test "$KRB5_IMPL" = "none"; then
       LIBS="$saved_LIBS -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err"
-      AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-        [KRB5_IMPL="Heimdal"
-         KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err"]
-         , )
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void *) 0); ]])],[KRB5_IMPL="Heimdal"
+         KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err"
+         ],[])
     fi
 
     ### FIXME: Implement a robust distinction between
@@ -88,10 +86,9 @@ AC_DEFUN([IU_CHECK_KRB5],
     ## OpenBSD variant of Heimdal
     if test "$KRB5_IMPL" = "none"; then
       LIBS="$saved_LIBS -lkrb5 -lcrypto"
-      AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-        [KRB5_IMPL="OpenBSD-Heimdal"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void *) 0); ]])],[KRB5_IMPL="OpenBSD-Heimdal"
 	 KRB5_CFLAGS="-I/usr/include/kerberosV"
-         KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lcrypto -lasn1 -ldes"], )
+         KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lcrypto -lasn1 -ldes"],[])
     fi
 
     ## Old MIT Kerberos V
@@ -99,9 +96,8 @@ AC_DEFUN([IU_CHECK_KRB5],
     ## -lk5crypto. This may conflict with OpenSSL.
     if test "$KRB5_IMPL" = "none"; then
       LIBS="$saved_LIBS -lkrb5 -lcrypto -lcom_err"
-      AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-        [KRB5_IMPL="OldMIT"
-         KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lcrypto -lcom_err"], )
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void *) 0); ]])],[KRB5_IMPL="OldMIT"
+         KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lcrypto -lcom_err"],[])
     fi
 
     LDFLAGS="$saved_LDFLAGS"
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 05f5412..1774270 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -175,9 +175,7 @@ AC_DEFUN([IU_LIB_CURSES], [
       AC_CACHE_CHECK(whether curses needs $LIBTERMCAP,
 		     inetutils_cv_curses_needs_termcap,
 	LIBS="$LIBCURSES"
-	AC_TRY_LINK([#include <curses.h>], [initscr ();],
-		    [inetutils_cv_curses_needs_termcap=no],
-		    [inetutils_cv_curses_needs_termcap=yes]))
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[initscr ();]])],[inetutils_cv_curses_needs_termcap=no],[inetutils_cv_curses_needs_termcap=yes]))
       if test $inetutils_cv_curses_needs_termcap = yes; then
 	  LIBCURSES="$LIBCURSES $LIBTERMCAP"
       fi
diff --git a/configure.ac b/configure.ac
index 692858e..49995a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -591,9 +591,10 @@ if test "$with_wrap" = yes; then
   AC_MSG_CHECKING(hosts_ctl in -lwrap);
   save_LIBS=$LIBS
   LIBS="$save_LIBS -lwrap"
-  AC_TRY_LINK([int allow_severity = 1; int deny_severity = 1;],
-              hosts_ctl(), eval "ac_cv_lib_wrap_hosts_ctl=yes",
-              eval "ac_cv_lib_wrap_hosts_ctl=no")
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[int allow_severity = 1; int deny_severity = 1;]],
+                                  [[hosts_ctl()]])],
+                 [eval "ac_cv_lib_wrap_hosts_ctl=yes"],
+		 [eval "ac_cv_lib_wrap_hosts_ctl=no"])
   LIBS=$save_LIBS
   if test "$ac_cv_lib_wrap_hosts_ctl" = yes \
       && test "$ac_cv_header_tcpd_h" = yes; then
@@ -880,9 +881,7 @@ AC_CHECK_DECLS(htons, , ,
 # See if we have h_errno (the test is here so we can use -lresolv if
 # necessary).
 AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
-  AC_TRY_COMPILE([#include <netdb.h>],
-    [ extern int h_errno; int iu_x = h_errno; ],
-    inetutils_cv_var_h_errno=yes, inetutils_cv_var_h_errno=no))
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[ extern int h_errno; int iu_x = h_errno; ]])],[inetutils_cv_var_h_errno=yes],[inetutils_cv_var_h_errno=no]))
 if test "$inetutils_cv_var_h_errno" = yes; then
   # FIXME: Isn't this wrong? Shouldn't the declaration check define
   #        this if we find h_errno?

-----------------------------------------------------------------------

Summary of changes:
 TODO            |  9 +++------
 am/krb5.m4      | 22 +++++++++-------------
 am/libcurses.m4 |  4 +---
 configure.ac    | 11 +++++------
 4 files changed, 18 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Sep 03 11:43:34 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mMBLq-00020l-NA
	for mharc-commit-inetutils@gnu.org; Fri, 03 Sep 2021 11:43:34 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:54228)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mMBLo-0001z3-UD
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 11:43:32 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:49606)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mMBLo-0006eK-2U
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 11:43:32 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id DC25F20B71; Fri,  3 Sep 2021 11:43:31 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-13-ga1b4cb8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 040efca40e5e252ba861ede88ae0896eeec84465
X-Git-Newrev: a1b4cb859f13d0fce6bc0221c5a28a279be28850
Message-Id: <20210903154331.DC25F20B71@vcs0.savannah.gnu.org>
Date: Fri,  3 Sep 2021 11:43:31 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Sep 2021 15:43:33 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  a1b4cb859f13d0fce6bc0221c5a28a279be28850 (commit)
      from  040efca40e5e252ba861ede88ae0896eeec84465 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a1b4cb859f13d0fce6bc0221c5a28a279be28850


commit a1b4cb859f13d0fce6bc0221c5a28a279be28850
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 17:43:26 2021 +0200

    doc: Fix typos, inspired by tiny BSD patches.

diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 5e0167e..8066055 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -48,7 +48,7 @@
 
 /* Return the name corresponding to the interface flag FLAG.
    If FLAG is unknown, return NULL.
-   AVOID contains a ':' surrounded and seperated list of flag names
+   AVOID contains a ':' surrounded and separated list of flag names
    that should be avoided if alternative names with the same flag value
    exists.  The first unavoided match is returned, or the first avoided
    match if no better is available.  */
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index c9d0c31..54518fc 100644
--- a/ifconfig/system/generic.h
+++ b/ifconfig/system/generic.h
@@ -37,7 +37,7 @@ struct system_ifconfig
 
 /* Output format support.  */
 
-/* Set this to a comma seperated, comma terminated list of struct
+/* Set this to a comma separated, comma terminated list of struct
    format_handler entries.  They are inserted at the beginning of the
    default list, so they override generic implementations if they have
    the same name.  For example:
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 9dd2ec4..157e038 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1274,7 +1274,7 @@ process_rings (int netin, int netout, int netex, int ttyin, int ttyout,
 		  /*
 		   * Bogosity.  We have to do the read
 		   * to clear the atmark to get out of
-		   * an infinate loop.
+		   * an infinite loop.
 		   */
 		  i = read (net, netiring.supply + c, canread - c);
 		  if (i > 0)
diff --git a/telnet/telnet.c b/telnet/telnet.c
index a1633bb..afeeb99 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -2113,12 +2113,12 @@ telrcv (void)
 		  /*
 		   * This is an error.  We only expect to get
 		   * "IAC IAC" or "IAC SE".  Several things may
-		   * have happend.  An IAC was not doubled, the
+		   * have happened.  An IAC was not doubled, the
 		   * IAC SE was left off, or another option got
 		   * inserted into the suboption are all possibilities.
 		   * If we assume that the IAC was not doubled,
 		   * and really the IAC SE was left off, we could
-		   * get into an infinate loop here.  So, instead,
+		   * get into an infinite loop here.  So, instead,
 		   * we terminate the suboption, and process the
 		   * partial suboption if we can.
 		   */
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 4d5876c..bf8cce6 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -164,7 +164,7 @@ typedef struct
 /*
  * Tricky code here.  What we want to know is if the MY_STATE_WILL
  * and MY_WANT_STATE_WILL bits have the same value.  Since the two
- * bits are adjacent, a little arithmatic will show that by adding
+ * bits are adjacent, a little arithmetic will show that by adding
  * in the lower bit, the upper bit will be set if the two bits were
  * different, and clear if they were the same.
  */
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 753b0c7..aaf9ef6 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -628,7 +628,7 @@ clientstat (register int code, register int parm1, register int parm2)
 	/*
 	 * Change terminal speed as requested by client.
 	 * We set the receive speed first, so that if we can't
-	 * store seperate receive and transmit speeds, the transmit
+	 * store separate receive and transmit speeds, the transmit
 	 * speed will take precedence.
 	 */
 	tty_rspeed (parm2);

-----------------------------------------------------------------------

Summary of changes:
 ifconfig/flags.h          | 2 +-
 ifconfig/system/generic.h | 2 +-
 telnet/sys_bsd.c          | 2 +-
 telnet/telnet.c           | 4 ++--
 telnetd/telnetd.h         | 2 +-
 telnetd/termstat.c        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Sep 03 16:43:57 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mMG2X-0002XY-9k
	for mharc-commit-inetutils@gnu.org; Fri, 03 Sep 2021 16:43:57 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:54512)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mMG2V-0002NG-Fx
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 16:43:55 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:55547)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mMG2U-000381-UA
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 16:43:54 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 9203220A0A; Fri,  3 Sep 2021 16:43:54 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-14-g1d5c923
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a1b4cb859f13d0fce6bc0221c5a28a279be28850
X-Git-Newrev: 1d5c9235286db76a2e41e62636e831945a848fa1
Message-Id: <20210903204354.9203220A0A@vcs0.savannah.gnu.org>
Date: Fri,  3 Sep 2021 16:43:53 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Sep 2021 20:43:55 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  1d5c9235286db76a2e41e62636e831945a848fa1 (commit)
      from  a1b4cb859f13d0fce6bc0221c5a28a279be28850 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=1d5c9235286db76a2e41e62636e831945a848fa1


commit 1d5c9235286db76a2e41e62636e831945a848fa1
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 18:30:42 2021 +0200

    maint: Use copyright year ranges for readability.
    
    * cfg.mk (update-copyright-env): Add, from coreutils.
    (VC_LIST_ALWAYS_EXCLUDE_REGEX): Add, for update-copyright exceptions.
    * README: Add info about copyright year ranges.
    * *: Update copyright notices.

diff --git a/ChangeLog.0 b/ChangeLog.0
index 35ec144..bb06850 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -2021,10 +2021,7 @@ Sat Dec 30 06:36:41 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 	* ftpd/ftpcmd.y: Allow `SITE IDLE 0' for non-anonymous user to
 	disable idle timer.
 
-    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-    2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-    2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-    Inc.
+    Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ChangeLog.1 b/ChangeLog.1
index ad515b1..3fee98d 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -17058,9 +17058,7 @@ russion letters.  Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>.
 	* syslogd/syslogd/syslogd.c: Include <version.h>.
 	(main): Add option -V (version).
 
-    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-    2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
-    2019, 2020, 2021 Free Software Foundation, Inc.
+    Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/Makefile.am b/Makefile.am
index c299364..617c27b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/NEWS b/NEWS
index db6c069..c975c46 100644
--- a/NEWS
+++ b/NEWS
@@ -732,9 +732,7 @@ Version 1.1:
  systems where weak refs are supported).
 
 ----------------------------------------------------------------------
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
 Permission is granted to anyone to make or distribute verbatim copies
 of this document as received, in any medium, provided that the
diff --git a/README b/README
index e51f4d5..70c93ab 100644
--- a/README
+++ b/README
@@ -130,13 +130,14 @@ Some known deficiencies:
 
 See the file INSTALL for installation instructions.
 
+For any copyright year range specified as YYYY-ZZZZ in this package
+note that the range specifies every single year in that closed interval.
+
 Please send all bug reports to <bug-inetutils@gnu.org>.
 
 ========================================================================
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/README-alpha b/README-alpha
index 67fad89..0bcaca0 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,7 +1,5 @@
 This is the GNU Inetutils package.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-2020, 2021 Free Software Foundation, Inc.
+Copyright (C) 1999-2021 Free Software Foundation, Inc.
 See end of file for copying conditions.
 
 This document describes the actions needed to build GNU inetutils from
diff --git a/THANKS b/THANKS
index 98d70d4..dfe39d5 100644
--- a/THANKS
+++ b/THANKS
@@ -37,9 +37,7 @@ Todd R. Eigenschink <todd@tekinteractive.com>
 
 ========================================================================
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/am/check_macro.m4 b/am/check_macro.m4
index 8883ffd..3413ae1 100644
--- a/am/check_macro.m4
+++ b/am/check_macro.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/check_member.m4 b/am/check_member.m4
index 0f4b095..d6a6a0c 100644
--- a/am/check_member.m4
+++ b/am/check_member.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 27c0ca8..18d9131 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/enable.m4 b/am/enable.m4
index 90326af..4c836ec 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/flushleft.m4 b/am/flushleft.m4
index 8bfeb4c..42a37f8 100644
--- a/am/flushleft.m4
+++ b/am/flushleft.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/krb5.m4 b/am/krb5.m4
index 76c0893..eb5afa7 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 1774270..b862280 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/libidn.m4 b/am/libidn.m4
index a7bcf8b..03b2bfa 100644
--- a/am/libidn.m4
+++ b/am/libidn.m4
@@ -1,6 +1,5 @@
 # libidn.m4 serial 2
-dnl Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-dnl Free Software Foundation, Inc.
+dnl Copyright (C) 2013-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/result.m4 b/am/result.m4
index e69179a..292f20f 100644
--- a/am/result.m4
+++ b/am/result.m4
@@ -1,7 +1,5 @@
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/bootstrap.conf b/bootstrap.conf
index d04facc..cdd1f57 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,5 @@
 # bootstrap.conf - Bootstrap configuration.
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/cfg.mk b/cfg.mk
index 0a3b168..0ae4b4f 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
@@ -27,6 +26,12 @@ translation_project_ =
 
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^doc/fdl-1.3.texi$$
+update-copyright-env = \
+  UPDATE_COPYRIGHT_FORCE=1 \
+  UPDATE_COPYRIGHT_USE_INTERVALS=2 \
+  UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
+
 local-checks-to-skip = \
 	sc_cast_of_x_alloc_return_value \
 	sc_copyright_check \
diff --git a/configure.ac b/configure.ac
index 49995a9..b3bce9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,5 @@
 # configure.ac - Configuration for inetutils
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8606956..3b68b6b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index cc2d91a..8f8f4e3 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -59,9 +59,7 @@
 This manual documents version @value{VERSION} of the @sc{gnu} networking
 utilities.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-2020, 2021 Free Software Foundation, Inc.
+Copyright @copyright{} 2000--2021 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index 0d30987..e8155cb 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 559a121..957cb27 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index fe1cf39..190b4be 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/domacro.c b/ftp/domacro.c
index 931e9ee..eb6daf4 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/extern.h b/ftp/extern.h
index b77a483..9f4781e 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 730a855..ca4fe6d 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index 4c81cf7..69d313b 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/main.c b/ftp/main.c
index 666c866..1726498 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 2578be1..dd09bb7 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index 5efabf4..dfe388b 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftpd/auth.c b/ftpd/auth.c
index 82f6142..2a01be4 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/conf.c b/ftpd/conf.c
index e67e8a0..479de42 100644
--- a/ftpd/conf.c
+++ b/ftpd/conf.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/extern.h b/ftpd/extern.h
index 8075f27..bb8b23e 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index 1072004..9f8cc1a 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index f4b29d5..6849f7d 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/logwtmp.c b/ftpd/logwtmp.c
index 45cd550..48ce83f 100644
--- a/ftpd/logwtmp.c
+++ b/ftpd/logwtmp.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/pam.c b/ftpd/pam.c
index 8c7a361..c3f344d 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/popen.c b/ftpd/popen.c
index 54fe130..75ab9c8 100644
--- a/ftpd/popen.c
+++ b/ftpd/popen.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index dbcec59..0b20c3c 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index 7b1f953..a790d06 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index 4a22701..4e4af46 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -1,7 +1,5 @@
 /* changeif.c -- change the configuration of a network interface
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 6298d05..2cb8819 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -1,7 +1,5 @@
 /* flags.c -- network interface flag handling
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 8066055..ad40a46 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index a0edf96..2a0c6b3 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -1,7 +1,5 @@
 /* ifconfig.c -- network interface configuration utility
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.h b/ifconfig/ifconfig.h
index d79e044..e6495b7 100644
--- a/ifconfig/ifconfig.h
+++ b/ifconfig/ifconfig.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.c b/ifconfig/options.c
index c6721ba..bdb424f 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -1,7 +1,5 @@
 /* options.c -- process the command line options
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.h b/ifconfig/options.h
index fd8f6c7..486cc84 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 17667a8..d2301a3 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -1,7 +1,5 @@
 /* printif.c -- print an interface configuration
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index b0fd535..2cbface 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.c b/ifconfig/system.c
index c60eaea..a3ecf84 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.h b/ifconfig/system.h
index 235ceee..aaf10c7 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am
index bbb3152..a6d51e0 100644
--- a/ifconfig/system/Makefile.am
+++ b/ifconfig/system/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index 21a9129..d81dba2 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -1,7 +1,5 @@
 /* bsd.c -- BSD specific code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/bsd.h b/ifconfig/system/bsd.h
index c8022ab..5645eca 100644
--- a/ifconfig/system/bsd.h
+++ b/ifconfig/system/bsd.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index 47bdb43..3d6ad69 100644
--- a/ifconfig/system/generic.c
+++ b/ifconfig/system/generic.c
@@ -1,7 +1,5 @@
 /* generic.c -- generic system code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index 54518fc..ec3c396 100644
--- a/ifconfig/system/generic.h
+++ b/ifconfig/system/generic.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
index ff85d72..9d868d9 100644
--- a/ifconfig/system/hurd.c
+++ b/ifconfig/system/hurd.c
@@ -1,6 +1,5 @@
 /* hurd.c -- Code for ifconfig specific to GNU/Hurd.
-  Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2015-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/hurd.h b/ifconfig/system/hurd.h
index 3549fa5..7ae5783 100644
--- a/ifconfig/system/hurd.h
+++ b/ifconfig/system/hurd.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2015-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index f1bbc06..f5522dc 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -1,7 +1,5 @@
 /* linux.c -- Linux specific code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index c2eb936..8af4c98 100644
--- a/ifconfig/system/linux.h
+++ b/ifconfig/system/linux.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index df6088d..2f994ca 100644
--- a/ifconfig/system/qnx.c
+++ b/ifconfig/system/qnx.c
@@ -1,7 +1,5 @@
 /* qnx.c -- QNX specific code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.h b/ifconfig/system/qnx.h
index 1b08e07..12e65d8 100644
--- a/ifconfig/system/qnx.h
+++ b/ifconfig/system/qnx.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index ccce464..bb2b3b9 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -1,7 +1,5 @@
 /* solaris.c -- Solaris specific code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.h b/ifconfig/system/solaris.h
index e9cc8cd..24aa6aa 100644
--- a/ifconfig/system/solaris.h
+++ b/ifconfig/system/solaris.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/Makefile.am b/libicmp/Makefile.am
index 22e2388..13030ad 100644
--- a/libicmp/Makefile.am
+++ b/libicmp/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index be46dfc..989ab82 100644
--- a/libicmp/icmp.h
+++ b/libicmp/icmp.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index c968019..2272336 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index 83bcbb3..f55fc50 100644
--- a/libicmp/icmp_cksum.c
+++ b/libicmp/icmp_cksum.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index f363c28..0ef5db6 100644
--- a/libicmp/icmp_echo.c
+++ b/libicmp/icmp_echo.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 82e62ba..96853f5 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 1559a8f..3c5f131 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index 6957295..0c9f388 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -1,7 +1,5 @@
 /* argcv.c - simple functions for parsing input based on whitespace
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/argcv.h b/libinetutils/argcv.h
index 9857beb..efec58f 100644
--- a/libinetutils/argcv.h
+++ b/libinetutils/argcv.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index 73ff733..4c8ca49 100644
--- a/libinetutils/cleansess.c
+++ b/libinetutils/cleansess.c
@@ -1,7 +1,5 @@
 /* cleansess.c - Clean up the pty and frob utmp/wtmp accordingly after logout
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 4f5a1da..33fe5bd 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index 4379e88..4bb1da5 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2009-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index b1011b3..1129f4d 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/if_index.c b/libinetutils/if_index.c
index a4eb95a..e91ff36 100644
--- a/libinetutils/if_index.c
+++ b/libinetutils/if_index.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index bc16aa9..f80d2ee 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kerberos5.c b/libinetutils/kerberos5.c
index aca0309..10684f5 100644
--- a/libinetutils/kerberos5.c
+++ b/libinetutils/kerberos5.c
@@ -1,6 +1,5 @@
 /* kerberos5.c -- functions to use Heimdal's and MIT's Kerberos V
-  Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-  Software Foundation, Inc.
+  Copyright (C) 2014-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kerberos5_def.h b/libinetutils/kerberos5_def.h
index 753ca6f..1bac5b6 100644
--- a/libinetutils/kerberos5_def.h
+++ b/libinetutils/kerberos5_def.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-  Software Foundation, Inc.
+  Copyright (C) 2014-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index ef3d28c..9a3e9ab 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index 0926718..33452d9 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 2006-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index a1b676f..e8f479a 100644
--- a/libinetutils/localhost.c
+++ b/libinetutils/localhost.c
@@ -1,7 +1,5 @@
 /* localhost.c - A slightly more convenient wrapper for gethostname
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index 5396ff4..da8738a 100644
--- a/libinetutils/logwtmp.c
+++ b/libinetutils/logwtmp.c
@@ -1,7 +1,5 @@
 /* logwtmp.c - A version of BSDs `logwtmp' that should be widely portable
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index ef01f6d..23b4bf0 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index cc03912..948d693 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -1,7 +1,5 @@
 /* setsig.c - Set a signal handler, trying to turning on the SA_RESTART bit
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index 2e53560..ff0aec4 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -1,7 +1,5 @@
 /* shishi.c -- functions to use kerberos V with shishi
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2005-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index c094cba..916284c 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2005-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index b41e9f8..ff82d32 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.h b/libinetutils/tftpsubs.h
index 5455c5c..6a9b96c 100644
--- a/libinetutils/tftpsubs.h
+++ b/libinetutils/tftpsubs.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 3e7e70b..1353e50 100644
--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 3044a31..86223cc 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2107, 2018,
-  2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index 04f35ee..578b107 100644
--- a/libinetutils/utmp_logout.c
+++ b/libinetutils/utmp_logout.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
-  2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/Makefile.am b/libls/Makefile.am
index c7dd4f1..3511d68 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libls/cmp.c b/libls/cmp.c
index 65fe9e4..8a0d2f3 100644
--- a/libls/cmp.c
+++ b/libls/cmp.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/extern.h b/libls/extern.h
index 5c6076a..70f6737 100644
--- a/libls/extern.h
+++ b/libls/extern.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.c b/libls/ls.c
index ee779c3..78a2d5a 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.h b/libls/ls.h
index edd91ee..a865756 100644
--- a/libls/ls.h
+++ b/libls/ls.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/print.c b/libls/print.c
index f28e827..060b50b 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index ad14435..c72c2e1 100644
--- a/libls/stat_flags.c
+++ b/libls/stat_flags.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/util.c b/libls/util.c
index ae7bc3f..abf0071 100644
--- a/libls/util.c
+++ b/libls/util.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index d01e482..f20fca1 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index f49f46a..b39f15f 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index eb4ae23..0ba0b27 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index ce91a2f..5fdfe5c 100644
--- a/libtelnet/auth.h
+++ b/libtelnet/auth.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index ab0782d..3042d1f 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 4cf716a..bb8ebd2 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 4973b00..c62f68a 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index a7fbdaa..6f30762 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index e565a08..f45225e 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index d9e04df..296e439 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index 3bb3bae..c1a0ee6 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2009-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index 27a1767..a55d4ab 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index 4074909..8b5e2db 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 77d4023..e4023b8 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/key-proto.h b/libtelnet/key-proto.h
index b5e8d23..c8c6fb7 100644
--- a/libtelnet/key-proto.h
+++ b/libtelnet/key-proto.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index c24abf9..babed9b 100644
--- a/libtelnet/misc-proto.h
+++ b/libtelnet/misc-proto.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 6a06dec..b1730e9 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc.h b/libtelnet/misc.h
index b6d058a..4cdd1d4 100644
--- a/libtelnet/misc.h
+++ b/libtelnet/misc.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index 60315c8..fe9fcaf 100644
--- a/libtelnet/read_passwd.c
+++ b/libtelnet/read_passwd.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index a6bafbc..4f900c8 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-  2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-  Software Foundation, Inc.
+  Copyright (C) 2003-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 134db1c..c020534 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/paths b/paths
index f3e7d9f..c5ecbaf 100644
--- a/paths
+++ b/paths
@@ -1,7 +1,5 @@
 # paths - Paths for inetutils
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/Makefile.am b/ping/Makefile.am
index 68748f2..e246957 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/libping.c b/ping/libping.c
index 5ee33b9..a25fd31 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2008-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.c b/ping/ping.c
index 49ee2a4..70235ae 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.h b/ping/ping.h
index 87cdfca..f9c6d56 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2008-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.c b/ping/ping6.c
index 8d97541..35356e8 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2005-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.h b/ping/ping6.h
index 741d607..27c2126 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2005-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_address.c b/ping/ping_address.c
index 7817c98..18d09bc 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 2fcae92..6e3ace0 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2005-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.h b/ping/ping_common.h
index 65e3e60..12a7f4c 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 2005-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 3ab116f..81794b5 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index 5c9f5cc..fc764e0 100644
--- a/ping/ping_impl.h
+++ b/ping/ping_impl.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_router.c b/ping/ping_router.c
index 125d8d3..fdbdc29 100644
--- a/ping/ping_router.c
+++ b/ping/ping_router.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index 17f51d1..7e510b0 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 635842a..6b0264e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
index 9687a28..6a160d8 100644
--- a/src/dnsdomainname.c
+++ b/src/dnsdomainname.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
-  2021 Free Software Foundation, Inc.
+  Copyright (C) 2012-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/hostname.c b/src/hostname.c
index e37fe81..eeed3dc 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2008-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/inetd.c b/src/inetd.c
index 04d3361..43dea05 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/logger.c b/src/logger.c
index 25b6e2b..c2306e0 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2009-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/logprio.h b/src/logprio.h
index 57cb30f..fc24b0a 100644
--- a/src/logprio.h
+++ b/src/logprio.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2011-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rcp.c b/src/rcp.c
index 743930c..d7047b0 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rexec.c b/src/rexec.c
index a1c2bd4..5862e04 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2009-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rexecd.c b/src/rexecd.c
index 4777a6d..f4425d2 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 2abb2d2..694a18a 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rlogind.c b/src/rlogind.c
index 3be3b45..ccd32b4 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rsh.c b/src/rsh.c
index 79bfbc2..2649097 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rshd.c b/src/rshd.c
index e83fbab..12369ac 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/syslogd.c b/src/syslogd.c
index fb71e4c..fef056d 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1,7 +1,5 @@
 /* syslogd - log system messages
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-  2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/tftp.c b/src/tftp.c
index 75ef663..1382a08 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/tftpd.c b/src/tftpd.c
index 8906591..4f0d2bd 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/traceroute.c b/src/traceroute.c
index c9620d6..0ac71bb 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2007-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/uucpd.c b/src/uucpd.c
index 072c222..baaa3b5 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/summary.sh.in b/summary.sh.in
index 407bc5b..b5510a4 100644
--- a/summary.sh.in
+++ b/summary.sh.in
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-# Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 9b3d4a1..c64f960 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talk/ctl.c b/talk/ctl.c
index 7facf7d..c43053f 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index cbb733f..ed0dc44 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/display.c b/talk/display.c
index 08908fe..13c93a0 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index b6e61df..a950c2c 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_names.c b/talk/get_names.c
index ac21209..065c1dc 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/init_disp.c b/talk/init_disp.c
index d5e0c25..f7d8ba4 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/invite.c b/talk/invite.c
index ce1d083..5072527 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/io.c b/talk/io.c
index 17ea593..768394a 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/look_up.c b/talk/look_up.c
index 1167597..70e6c30 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/msgs.c b/talk/msgs.c
index 8c01b54..d653fbd 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.c b/talk/talk.c
index af55227..38cce77 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.h b/talk/talk.h
index d830e64..7172b71 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index 739ecf7..8d7bb20 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index 7a37394..0efda2c 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talkd/acl.c b/talkd/acl.c
index a55e8b0..5175ac1 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/announce.c b/talkd/announce.c
index 7d10d72..690f5d7 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index e48d93c..ad43dda 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/print.c b/talkd/print.c
index af61d0a..1d34b6d 100644
--- a/talkd/print.c
+++ b/talkd/print.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/process.c b/talkd/process.c
index 32cfe8d..fe6b8d4 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/table.c b/talkd/table.c
index ffe0306..a34bd77 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 08e3a5b..8b62a96 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 2ccce31..539ff76 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnet/authenc.c b/telnet/authenc.c
index 6cc4d2a..eb518d6 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/commands.c b/telnet/commands.c
index 26cedba..f1fba3c 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/defines.h b/telnet/defines.h
index 8f87d50..e12431f 100644
--- a/telnet/defines.h
+++ b/telnet/defines.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/externs.h b/telnet/externs.h
index 8d10549..f63ff42 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/general.h b/telnet/general.h
index 691a3b0..4cc6b05 100644
--- a/telnet/general.h
+++ b/telnet/general.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index 10afa7e..9cef32b 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/main.c b/telnet/main.c
index 1a96d35..ef3ca88 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/network.c b/telnet/network.c
index 546d06c..825d413 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.c b/telnet/ring.c
index 42e6464..43b50db 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.h b/telnet/ring.h
index a2c7655..f2b209f 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 157e038..8e578eb 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/telnet.c b/telnet/telnet.c
index afeeb99..1640a50 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/terminal.c b/telnet/terminal.c
index d65428a..966ef79 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index e8ae7a4..2b906ee 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/types.h b/telnet/types.h
index f322792..5b5d27e 100644
--- a/telnet/types.h
+++ b/telnet/types.h
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 08571cd..c130c50 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation,
-  Inc.
+  Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 520d168..cc68e14 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-# 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnetd/pty.c b/telnetd/pty.c
index afaf7fd..efbb549 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-  Software Foundation, Inc.
+  Copyright (C) 2002-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/slc.c b/telnetd/slc.c
index 8cdd5e5..44a2a40 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/state.c b/telnetd/state.c
index aba3bec..87a430c 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index db5d212..3d3db24 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index bf8cce6..ad9eb8d 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/term.c b/telnetd/term.c
index b490a8e..58c0a9a 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-  Software Foundation, Inc.
+  Copyright (C) 2002-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index aaf9ef6..febe6b3 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/utility.c b/telnetd/utility.c
index fc82cf3..e72df5e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1,8 +1,5 @@
 /*
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-  Foundation, Inc.
+  Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 82235b0..f5215dd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index 347a48a..663339e 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -1,6 +1,5 @@
 /* addrpeek - testing service for Inetd: remote address, environment vars
-  Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
-  2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2010-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
index e7a9e87..60828ed 100755
--- a/tests/dnsdomainname.sh
+++ b/tests/dnsdomainname.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
-# 2021 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 974e948..442f9c1 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index e08fa24..9ca487a 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-# Software Foundation, Inc.
+# Copyright (C) 2014-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/hostname.sh b/tests/hostname.sh
index f009135..0d3be69 100755
--- a/tests/hostname.sh
+++ b/tests/hostname.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/identify.c b/tests/identify.c
index f556a62..9a67910 100644
--- a/tests/identify.c
+++ b/tests/identify.c
@@ -1,6 +1,5 @@
 /* identify -- Probe system and report characteristica.
-  Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2013-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 418e390..13ebeb3 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ifconfig_modes.sh b/tests/ifconfig_modes.sh
index 85a7497..e6bfd9e 100644
--- a/tests/ifconfig_modes.sh
+++ b/tests/ifconfig_modes.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-# Software Foundation, Inc.
+# Copyright (C) 2014-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/inetd.sh b/tests/inetd.sh
index 65bcc02..947c242 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-# Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/libls.sh b/tests/libls.sh
index 7edf728..c4e0474 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-# Software Foundation, Inc.
+# Copyright (C) 2014-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/localhost.c b/tests/localhost.c
index 019b238..c250224 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2007-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ls.c b/tests/ls.c
index abb2c49..8992eb5 100644
--- a/tests/ls.c
+++ b/tests/ls.c
@@ -1,6 +1,5 @@
 /* ls - program buildable from libls
-  Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free
-  Software Foundation, Inc.
+  Copyright (C) 2014-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index f59ca86..f608927 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/readutmp.c b/tests/readutmp.c
index 26ec915..d6ec8e2 100644
--- a/tests/readutmp.c
+++ b/tests/readutmp.c
@@ -1,6 +1,5 @@
 /* readutmp - Basic test of existing utmp/utmpx access.
-  Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
-  2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2010-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/runtime-ipv6.c b/tests/runtime-ipv6.c
index b0fd30b..1d0bac4 100644
--- a/tests/runtime-ipv6.c
+++ b/tests/runtime-ipv6.c
@@ -1,5 +1,5 @@
 /* runtime-ipv6 - Check that system is able to set IPv6 address.
-  Copyright (C) 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2020-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 5733e1b..a6215b9 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tcpget.c b/tests/tcpget.c
index 29de726..1103abb 100644
--- a/tests/tcpget.c
+++ b/tests/tcpget.c
@@ -1,6 +1,5 @@
 /* tcpget - get single response from a TCP port.
-  Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-  Free Software Foundation, Inc.
+  Copyright (C) 2013-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index 518fe55..e40a9c3 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/test-snprintf.c b/tests/test-snprintf.c
index 9affcbe..352d1de 100644
--- a/tests/test-snprintf.c
+++ b/tests/test-snprintf.c
@@ -1,5 +1,5 @@
 /* test-snprintf - Check whether snprintf allows doubly used strings.
-  Copyright (C) 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2020-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/tftp.sh b/tests/tftp.sh
index ded4fa0..862e94f 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
-# 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 7e91748..7e33db6 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -1,5 +1,4 @@
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
-# 2021 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index e500957..2fafb29 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/utmp.sh b/tests/utmp.sh
index a8b78c0..320ac65 100755
--- a/tests/utmp.sh
+++ b/tests/utmp.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
-# 2021 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/waitdaemon.c b/tests/waitdaemon.c
index 66af6ca..9373824 100644
--- a/tests/waitdaemon.c
+++ b/tests/waitdaemon.c
@@ -1,6 +1,5 @@
 /* waitdaemon -- Verify that waitdaemon() is functional.
-  Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
-  2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2010-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/Makefile.am b/whois/Makefile.am
index d7104ad..1f606ae 100644
--- a/whois/Makefile.am
+++ b/whois/Makefile.am
@@ -1,7 +1,5 @@
 #
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/as_del_list b/whois/as_del_list
index 7e44a78..e72fa5a 100644
--- a/whois/as_del_list
+++ b/whois/as_del_list
@@ -1,6 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/data.h b/whois/data.h
index 82e22b6..458e424 100644
--- a/whois/data.h
+++ b/whois/data.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 2009-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/ip6_del_list b/whois/ip6_del_list
index 7f01882..ceaf3da 100644
--- a/whois/ip6_del_list
+++ b/whois/ip6_del_list
@@ -1,4 +1,4 @@
-# Copyright (C) 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2020-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/ip_del_list b/whois/ip_del_list
index b640024..79017e1 100644
--- a/whois/ip_del_list
+++ b/whois/ip_del_list
@@ -1,6 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_as_del.pl b/whois/make_as_del.pl
index d6c5781..4d1a1c3 100755
--- a/whois/make_as_del.pl
+++ b/whois/make_as_del.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_ip6_del.pl b/whois/make_ip6_del.pl
index 09fd504..97d1df2 100755
--- a/whois/make_ip6_del.pl
+++ b/whois/make_ip6_del.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2020-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_ip_del.pl b/whois/make_ip_del.pl
index c86e52b..a4338db 100755
--- a/whois/make_ip_del.pl
+++ b/whois/make_ip_del.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_tld_serv.pl b/whois/make_tld_serv.pl
index b77b917..487031f 100755
--- a/whois/make_tld_serv.pl
+++ b/whois/make_tld_serv.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index 41083c1..5b1f0d1 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -1,6 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-# 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/whois.c b/whois/whois.c
index 3e4f192..14be10f 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/whois.h b/whois/whois.h
index 095d71f..c39fd99 100644
--- a/whois/whois.h
+++ b/whois/whois.h
@@ -1,7 +1,5 @@
 /*
-  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-  2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+  Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.0                   | 5 +----
 ChangeLog.1                   | 4 +---
 Makefile.am                   | 4 +---
 NEWS                          | 4 +---
 README                        | 7 ++++---
 README-alpha                  | 4 +---
 THANKS                        | 4 +---
 am/check_macro.m4             | 4 +---
 am/check_member.m4            | 4 +---
 am/config_paths.m4            | 4 +---
 am/enable.m4                  | 4 +---
 am/flushleft.m4               | 4 +---
 am/krb5.m4                    | 4 +---
 am/libcurses.m4               | 4 +---
 am/libidn.m4                  | 3 +--
 am/result.m4                  | 4 +---
 bootstrap.conf                | 3 +--
 cfg.mk                        | 9 +++++++--
 configure.ac                  | 4 +---
 doc/Makefile.am               | 4 +---
 doc/inetutils.texi            | 4 +---
 ftp/Makefile.am               | 4 +---
 ftp/cmds.c                    | 5 +----
 ftp/cmdtab.c                  | 5 +----
 ftp/domacro.c                 | 5 +----
 ftp/extern.h                  | 5 +----
 ftp/ftp.c                     | 5 +----
 ftp/ftp_var.h                 | 5 +----
 ftp/main.c                    | 5 +----
 ftp/ruserpass.c               | 5 +----
 ftpd/Makefile.am              | 4 +---
 ftpd/auth.c                   | 4 +---
 ftpd/conf.c                   | 4 +---
 ftpd/extern.h                 | 5 +----
 ftpd/ftpcmd.y                 | 5 +----
 ftpd/ftpd.c                   | 5 +----
 ftpd/logwtmp.c                | 4 +---
 ftpd/pam.c                    | 4 +---
 ftpd/popen.c                  | 5 +----
 ftpd/server_mode.c            | 4 +---
 ifconfig/Makefile.am          | 4 +---
 ifconfig/changeif.c           | 4 +---
 ifconfig/flags.c              | 4 +---
 ifconfig/flags.h              | 4 +---
 ifconfig/ifconfig.c           | 4 +---
 ifconfig/ifconfig.h           | 4 +---
 ifconfig/options.c            | 4 +---
 ifconfig/options.h            | 4 +---
 ifconfig/printif.c            | 4 +---
 ifconfig/printif.h            | 4 +---
 ifconfig/system.c             | 4 +---
 ifconfig/system.h             | 4 +---
 ifconfig/system/Makefile.am   | 4 +---
 ifconfig/system/bsd.c         | 4 +---
 ifconfig/system/bsd.h         | 4 +---
 ifconfig/system/generic.c     | 4 +---
 ifconfig/system/generic.h     | 4 +---
 ifconfig/system/hurd.c        | 3 +--
 ifconfig/system/hurd.h        | 3 +--
 ifconfig/system/linux.c       | 4 +---
 ifconfig/system/linux.h       | 4 +---
 ifconfig/system/qnx.c         | 4 +---
 ifconfig/system/qnx.h         | 4 +---
 ifconfig/system/solaris.c     | 4 +---
 ifconfig/system/solaris.h     | 4 +---
 libicmp/Makefile.am           | 4 +---
 libicmp/icmp.h                | 4 +---
 libicmp/icmp_address.c        | 4 +---
 libicmp/icmp_cksum.c          | 4 +---
 libicmp/icmp_echo.c           | 4 +---
 libicmp/icmp_timestamp.c      | 4 +---
 libinetutils/Makefile.am      | 4 +---
 libinetutils/argcv.c          | 4 +---
 libinetutils/argcv.h          | 4 +---
 libinetutils/cleansess.c      | 4 +---
 libinetutils/daemon.c         | 4 +---
 libinetutils/defauthors.c     | 3 +--
 libinetutils/des_rw.c         | 4 +---
 libinetutils/if_index.c       | 4 +---
 libinetutils/kcmd.c           | 4 +---
 libinetutils/kerberos5.c      | 3 +--
 libinetutils/kerberos5_def.h  | 3 +--
 libinetutils/krcmd.c          | 4 +---
 libinetutils/libinetutils.h   | 4 +---
 libinetutils/localhost.c      | 4 +---
 libinetutils/logwtmp.c        | 4 +---
 libinetutils/logwtmpko.c      | 4 +---
 libinetutils/setsig.c         | 4 +---
 libinetutils/shishi.c         | 4 +---
 libinetutils/shishi_def.h     | 4 +---
 libinetutils/tftpsubs.c       | 4 +---
 libinetutils/tftpsubs.h       | 4 +---
 libinetutils/ttymsg.c         | 4 +---
 libinetutils/utmp_init.c      | 4 +---
 libinetutils/utmp_logout.c    | 4 +---
 libls/Makefile.am             | 4 +---
 libls/cmp.c                   | 4 +---
 libls/extern.h                | 4 +---
 libls/ls.c                    | 4 +---
 libls/ls.h                    | 4 +---
 libls/print.c                 | 4 +---
 libls/stat_flags.c            | 4 +---
 libls/util.c                  | 4 +---
 libtelnet/Makefile.am         | 4 +---
 libtelnet/auth-proto.h        | 4 +---
 libtelnet/auth.c              | 5 +----
 libtelnet/auth.h              | 4 +---
 libtelnet/enc-proto.h         | 4 +---
 libtelnet/enc_des.c           | 5 +----
 libtelnet/encrypt.c           | 5 +----
 libtelnet/encrypt.h           | 4 +---
 libtelnet/forward.c           | 4 +---
 libtelnet/genget.c            | 5 +----
 libtelnet/genget.h            | 3 +--
 libtelnet/getent.c            | 5 +----
 libtelnet/kerberos.c          | 5 +----
 libtelnet/kerberos5.c         | 5 +----
 libtelnet/key-proto.h         | 4 +---
 libtelnet/misc-proto.h        | 4 +---
 libtelnet/misc.c              | 4 +---
 libtelnet/misc.h              | 4 +---
 libtelnet/read_passwd.c       | 4 +---
 libtelnet/shishi.c            | 4 +---
 man/Makefile.am               | 3 +--
 paths                         | 4 +---
 ping/Makefile.am              | 4 +---
 ping/libping.c                | 3 +--
 ping/ping.c                   | 4 +---
 ping/ping.h                   | 3 +--
 ping/ping6.c                  | 4 +---
 ping/ping6.h                  | 4 +---
 ping/ping_address.c           | 4 +---
 ping/ping_common.c            | 4 +---
 ping/ping_common.h            | 4 +---
 ping/ping_echo.c              | 4 +---
 ping/ping_impl.h              | 4 +---
 ping/ping_router.c            | 4 +---
 ping/ping_timestamp.c         | 4 +---
 src/Makefile.am               | 4 +---
 src/dnsdomainname.c           | 3 +--
 src/hostname.c                | 3 +--
 src/inetd.c                   | 5 +----
 src/logger.c                  | 3 +--
 src/logprio.h                 | 3 +--
 src/rcp.c                     | 5 +----
 src/rexec.c                   | 3 +--
 src/rexecd.c                  | 5 +----
 src/rlogin.c                  | 5 +----
 src/rlogind.c                 | 5 +----
 src/rsh.c                     | 5 +----
 src/rshd.c                    | 5 +----
 src/syslogd.c                 | 4 +---
 src/tftp.c                    | 5 +----
 src/tftpd.c                   | 5 +----
 src/traceroute.c              | 3 +--
 src/uucpd.c                   | 5 +----
 summary.sh.in                 | 3 +--
 talk/Makefile.am              | 4 +---
 talk/ctl.c                    | 5 +----
 talk/ctl_transact.c           | 5 +----
 talk/display.c                | 5 +----
 talk/get_addrs.c              | 5 +----
 talk/get_names.c              | 5 +----
 talk/init_disp.c              | 5 +----
 talk/invite.c                 | 5 +----
 talk/io.c                     | 5 +----
 talk/look_up.c                | 5 +----
 talk/msgs.c                   | 5 +----
 talk/talk.c                   | 5 +----
 talk/talk.h                   | 5 +----
 talk/talk_ctl.h               | 5 +----
 talkd/Makefile.am             | 4 +---
 talkd/acl.c                   | 4 +---
 talkd/announce.c              | 5 +----
 talkd/intalkd.h               | 4 +---
 talkd/print.c                 | 4 +---
 talkd/process.c               | 4 +---
 talkd/table.c                 | 4 +---
 talkd/talkd.c                 | 4 +---
 telnet/Makefile.am            | 4 +---
 telnet/authenc.c              | 5 +----
 telnet/commands.c             | 5 +----
 telnet/defines.h              | 5 +----
 telnet/externs.h              | 5 +----
 telnet/general.h              | 5 +----
 telnet/krb4-proto.h           | 5 +----
 telnet/main.c                 | 5 +----
 telnet/network.c              | 5 +----
 telnet/ring.c                 | 5 +----
 telnet/ring.h                 | 5 +----
 telnet/sys_bsd.c              | 5 +----
 telnet/telnet.c               | 5 +----
 telnet/terminal.c             | 5 +----
 telnet/tn3270.c               | 5 +----
 telnet/types.h                | 5 +----
 telnet/utilities.c            | 5 +----
 telnetd/Makefile.am           | 4 +---
 telnetd/pty.c                 | 4 +---
 telnetd/slc.c                 | 5 +----
 telnetd/state.c               | 5 +----
 telnetd/telnetd.c             | 5 +----
 telnetd/telnetd.h             | 4 +---
 telnetd/term.c                | 4 +---
 telnetd/termstat.c            | 5 +----
 telnetd/utility.c             | 5 +----
 tests/Makefile.am             | 3 +--
 tests/addrpeek.c              | 3 +--
 tests/dnsdomainname.sh        | 3 +--
 tests/ftp-localhost.sh        | 3 +--
 tests/ftp-parser.sh           | 3 +--
 tests/hostname.sh             | 3 +--
 tests/identify.c              | 3 +--
 tests/ifconfig.sh             | 3 +--
 tests/ifconfig_modes.sh       | 3 +--
 tests/inetd.sh                | 3 +--
 tests/libls.sh                | 3 +--
 tests/localhost.c             | 3 +--
 tests/ls.c                    | 3 +--
 tests/ping-localhost.sh       | 3 +--
 tests/readutmp.c              | 3 +--
 tests/runtime-ipv6.c          | 2 +-
 tests/syslogd.sh              | 3 +--
 tests/tcpget.c                | 3 +--
 tests/telnet-localhost.sh     | 3 +--
 tests/test-snprintf.c         | 2 +-
 tests/tftp.sh                 | 3 +--
 tests/tools.sh.in             | 3 +--
 tests/traceroute-localhost.sh | 3 +--
 tests/utmp.sh                 | 3 +--
 tests/waitdaemon.c            | 3 +--
 whois/Makefile.am             | 4 +---
 whois/as_del_list             | 4 +---
 whois/data.h                  | 3 +--
 whois/ip6_del_list            | 2 +-
 whois/ip_del_list             | 4 +---
 whois/make_as_del.pl          | 4 +---
 whois/make_ip6_del.pl         | 2 +-
 whois/make_ip_del.pl          | 4 +---
 whois/make_tld_serv.pl        | 4 +---
 whois/tld_serv_list           | 4 +---
 whois/whois.c                 | 4 +---
 whois/whois.h                 | 4 +---
 242 files changed, 251 insertions(+), 740 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Sep 03 16:58:57 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mMGH2-0000Ye-RO
	for mharc-commit-inetutils@gnu.org; Fri, 03 Sep 2021 16:58:56 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:56938)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mMGH0-0000Qh-VY
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 16:58:54 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:55817)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mMGH0-00078K-Ax
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 16:58:54 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 3551620A0A; Fri,  3 Sep 2021 16:58:53 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-15-ga30199f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1d5c9235286db76a2e41e62636e831945a848fa1
X-Git-Newrev: a30199f8fb5a4e836a4a10f23ad23509255cee69
Message-Id: <20210903205853.3551620A0A@vcs0.savannah.gnu.org>
Date: Fri,  3 Sep 2021 16:58:52 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Sep 2021 20:58:55 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  a30199f8fb5a4e836a4a10f23ad23509255cee69 (commit)
      from  1d5c9235286db76a2e41e62636e831945a848fa1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a30199f8fb5a4e836a4a10f23ad23509255cee69


commit a30199f8fb5a4e836a4a10f23ad23509255cee69
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 22:58:34 2021 +0200

    doc: Improve README-release.
    
    * gl/top/README-release.diff: Update.

diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
index 9547441..2380372 100644
--- a/gl/top/README-release.diff
+++ b/gl/top/README-release.diff
@@ -1,11 +1,11 @@
---- README-release.orig	2021-07-24 15:01:40.637006120 +0200
-+++ README-release	2021-07-24 15:05:35.687402132 +0200
+--- README-release.orig	2021-09-03 22:57:19.292207913 +0200
++++ README-release	2021-09-03 22:57:45.732425524 +0200
 @@ -21,7 +21,7 @@
  
  * Check that the NixOS/Hydra autobuilder is reporting all is well:
  
 -    https://hydra.nixos.org/project/gnu/@PACKAGE@-master
-+    https://hydra.nixos.org/project/gnu/inetutils-master
++    https://hydra.nixos.org/jobset/gnu/inetutils-master
  
  * Run the following command to download any new translations:
  
@@ -28,34 +28,36 @@
    that was just created by that "make" command.
  
  Once all the builds and tests have passed,
-@@ -73,22 +72,22 @@
- 
-   Go to the news-submission form:
- 
+@@ -68,28 +67,6 @@
+     v=$(cat .prev-version)
+     git push origin master tag v$v
+ 
+-* Announce it on Savannah first, so you can include the savannah.org
+-  announcement link in the email message.
+-
+-  Go to the news-submission form:
+-
 -    https://savannah.gnu.org/news/submit.php?group=@PACKAGE@
-+    https://savannah.gnu.org/news/submit.php?group=inetutils
- 
-   If it does not work, then enable "News" for the project via this link:
- 
+-
+-  If it does not work, then enable "News" for the project via this link:
+-
 -    https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=@PACKAGE@
-+    https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=inetutils
- 
-   Write something like the following:
- 
+-
+-  Write something like the following:
+-
 -    Subject: @PACKAGE@-X.Y released [stable]
-+    Subject: inetutils-X.Y released [stable]
-     +verbatim+
-     ...paste the announcement here...
-     -verbatim-
- 
-   Then go here to approve it:
- 
+-    +verbatim+
+-    ...paste the announcement here...
+-    -verbatim-
+-
+-  Then go here to approve it:
+-
 -    https://savannah.gnu.org/news/approve.php?group=@PACKAGE@
-+    https://savannah.gnu.org/news/approve.php?group=inetutils
- 
+-
  * Send the announcement email message.
  
-@@ -98,4 +97,4 @@
+ * After each non-alpha release, run
+@@ -98,4 +75,4 @@
  
    to update the on-line manual accessible at
  

-----------------------------------------------------------------------

Summary of changes:
 gl/top/README-release.diff | 52 ++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Sep 03 17:08:42 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1mMGQU-0001t1-KV
	for mharc-commit-inetutils@gnu.org; Fri, 03 Sep 2021 17:08:42 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:58626)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1mMGQT-0001pi-N9
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 17:08:41 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:56003)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1mMGQS-0006rg-W6
 for commit-inetutils@gnu.org; Fri, 03 Sep 2021 17:08:41 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 96D8320A0A; Fri,  3 Sep 2021 17:08:40 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.2-16-gcf09130
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a30199f8fb5a4e836a4a10f23ad23509255cee69
X-Git-Newrev: cf091304a3218efa3bc267b483cad71b6f65c24e
Message-Id: <20210903210840.96D8320A0A@vcs0.savannah.gnu.org>
Date: Fri,  3 Sep 2021 17:08:40 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Sep 2021 21:08:42 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  cf091304a3218efa3bc267b483cad71b6f65c24e (commit)
      from  a30199f8fb5a4e836a4a10f23ad23509255cee69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=cf091304a3218efa3bc267b483cad71b6f65c24e


commit cf091304a3218efa3bc267b483cad71b6f65c24e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Sep 3 23:07:30 2021 +0200

    maint: Improve syntax-checks.
    
    * cfg.mk (local-checks-to-skip): Enable sc_immutable_NEWS.  Disable sc_indent.

diff --git a/cfg.mk b/cfg.mk
index 0ae4b4f..550063b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -47,7 +47,7 @@ local-checks-to-skip = \
 	sc_prohibit_xalloc_without_use \
 	sc_error_message_period \
 	sc_error_message_uppercase \
-	sc_immutable_NEWS \
+	sc_indent \
 	sc_m4_quote_check \
 	sc_prohibit_atoi_atof \
 	sc_prohibit_stat_st_blocks \

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


