From MAILER-DAEMON Wed Jan 01 06:41:52 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1imcNs-0004H0-4u
	for mharc-commit-inetutils@gnu.org; Wed, 01 Jan 2020 06:41:52 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:34118)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1imcNq-0004Gm-3e
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 06:41:51 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:45640)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <simon@josefsson.org>) id 1imcNp-0000lj-8J
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 06:41:49 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 2550720B7D; Wed,  1 Jan 2020 06:41:49 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-43-g69196f8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a4a331b7eea141b13c04f79feff3fe7d8f4e0507
X-Git-Newrev: 69196f8b6c02d6b5f7857db69f628c04e4b4bb58
Message-Id: <20200101114149.2550720B7D@vcs0.savannah.gnu.org>
Date: Wed,  1 Jan 2020 06:41:48 -0500 (EST)
From: simon@josefsson.org (Simon Josefsson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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 Jan 2020 11:41:51 -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  69196f8b6c02d6b5f7857db69f628c04e4b4bb58 (commit)
      from  a4a331b7eea141b13c04f79feff3fe7d8f4e0507 (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=69196f8b6c02d6b5f7857db69f628c04e4b4bb58


commit 69196f8b6c02d6b5f7857db69f628c04e4b4bb58
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 12:38:52 2020 +0100

    telnet: Telnet -E(no escape) is treating _POSIX_VDISABLE char as escape.
    
    Reported by Mikhail Bychek <mikhail.bychek@sputnix.ru>.
    
    See also:
    https://github.com/freebsd/freebsd/commit/c3694d985891efb8a156e933600d23132577a053
    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=6317

diff --git a/telnet/telnet.c b/telnet/telnet.c
index fe2bd71..46b9cde 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -2223,7 +2223,7 @@ telsnd (void)
 	  if ((sc == '\n') || (sc == '\r'))
 	    bol = 1;
 	}
-      else if (sc == escape)
+      else if (escape != _POSIX_VDISABLE && sc == escape)
 	{
 	  /*
 	   * Double escape is a pass through of a single escape character.

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

Summary of changes:
 telnet/telnet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 01 06:53:13 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1imcYq-0006Fp-SU
	for mharc-commit-inetutils@gnu.org; Wed, 01 Jan 2020 06:53:12 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:56376)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1imcYo-0006Fj-5M
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 06:53:11 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:45813)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <simon@josefsson.org>) id 1imcYn-00087G-VI
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 06:53:10 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id D9E8420B7D; Wed,  1 Jan 2020 06:53:09 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-45-g3857a7d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 69196f8b6c02d6b5f7857db69f628c04e4b4bb58
X-Git-Newrev: 3857a7dc1d13927bb5280c18d324f60317ab40af
Message-Id: <20200101115309.D9E8420B7D@vcs0.savannah.gnu.org>
Date: Wed,  1 Jan 2020 06:53:09 -0500 (EST)
From: simon@josefsson.org (Simon Josefsson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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 Jan 2020 11:53:11 -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  3857a7dc1d13927bb5280c18d324f60317ab40af (commit)
       via  f8d4a55d7ce9d56269daec618c33b8db7e495416 (commit)
      from  69196f8b6c02d6b5f7857db69f628c04e4b4bb58 (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=3857a7dc1d13927bb5280c18d324f60317ab40af


commit 3857a7dc1d13927bb5280c18d324f60317ab40af
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 12:53:05 2020 +0100

    bootstrap: Updated from gnulib.

diff --git a/ChangeLog b/ChangeLog
index 1f1bbd7..3a6f264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
 
+	* bootstrap: Updated from gnulib.
+
+2020-01-01  Simon Josefsson  <simon@josefsson.org>
+
 	* telnet/telnet.c (telsnd): Telnet -E(no escape) is treating
 	_POSIX_VDISABLE char as escape.
 	Reported by Mikhail Bychek <mikhail.bychek@sputnix.ru>.
diff --git a/bootstrap b/bootstrap
index 5264d9f..70fd73c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2018-10-13.05; # UTC
+scriptversion=2019-01-04.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -166,7 +166,7 @@ bootstrap_epilogue() { :; }
 # specified directory.  Fill in the first %s with the destination
 # directory and the second with the domain name.
 po_download_command_format=\
-"wget --mirror --level=1 -nd -q -A.po -P '%s' \
+"wget --mirror --level=1 -nd -nv -A.po -P '%s' \
  https://translationproject.org/latest/%s/"
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
@@ -963,6 +963,16 @@ fi
 bootstrap_post_import_hook \
   || die "bootstrap_post_import_hook failed"
 
+# Don't proceed if there are uninitialized submodules.  In particular,
+# the next step will remove dangling links, which might be links into
+# uninitialized submodules.
+#
+# Uninitialized submodules are listed with an initial dash.
+if $use_git && git submodule | grep '^-' >/dev/null; then
+  die "some git submodules are not initialized. "     \
+      "Run 'git submodule init' and bootstrap again."
+fi
+
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
 # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
 # The following requires GNU find 4.2.3 or newer.  Considering the usual

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


commit f8d4a55d7ce9d56269daec618c33b8db7e495416
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 12:51:03 2020 +0100

    telnet: Telnet -E(no escape) is treating _POSIX_VDISABLE char as escape.
    
    Reported by Mikhail Bychek <mikhail.bychek@sputnix.ru>.
    
    See also:
    https://github.com/freebsd/freebsd/commit/c3694d985891efb8a156e933600d23132577a053
    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=6317

diff --git a/ChangeLog b/ChangeLog
index ec0224d..1f1bbd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-01  Simon Josefsson  <simon@josefsson.org>
+
+	* telnet/telnet.c (telsnd): Telnet -E(no escape) is treating
+	_POSIX_VDISABLE char as escape.
+	Reported by Mikhail Bychek <mikhail.bychek@sputnix.ru>.
+
 2018-11-12  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* src/tftpd.c (main): Add LOG_NDELAY to openlog().  The file

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

Summary of changes:
 ChangeLog | 10 ++++++++++
 bootstrap | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 01 08:05:37 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1imdgv-0002kL-Kw
	for mharc-commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:05:37 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:36804)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1imdgj-0002hw-7x
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:05:35 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:46719)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <simon@josefsson.org>) id 1imdgg-0002MK-O5
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:05:23 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 9D41220B7D; Wed,  1 Jan 2020 08:05:22 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-49-g5b48963
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3857a7dc1d13927bb5280c18d324f60317ab40af
X-Git-Newrev: 5b48963f67cb1b959287ede030970830e883b7f5
Message-Id: <20200101130522.9D41220B7D@vcs0.savannah.gnu.org>
Date: Wed,  1 Jan 2020 08:05:21 -0500 (EST)
From: simon@josefsson.org (Simon Josefsson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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 Jan 2020 13:05:35 -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  5b48963f67cb1b959287ede030970830e883b7f5 (commit)
       via  82fcf84b242cd5d9400193ccd0199bf9a471113b (commit)
       via  d8de4587f20edbd5ecf017aeb6f115eacbddd43f (commit)
       via  330e19d681e73edd22c248853ba5e5f18b2f8a9e (commit)
      from  3857a7dc1d13927bb5280c18d324f60317ab40af (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=5b48963f67cb1b959287ede030970830e883b7f5


commit 5b48963f67cb1b959287ede030970830e883b7f5
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 14:05:11 2020 +0100

    NEWS: Document user-visible changes since last release.

diff --git a/ChangeLog b/ChangeLog
index fb802a3..1a31dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
 
+	* NEWS: Document user-visible changes since last release.
+
+2020-01-01  Simon Josefsson  <simon@josefsson.org>
+
 	* THANKS: Credit Mats.
 
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
diff --git a/NEWS b/NEWS
index 539a10e..96cc87c 100644
--- a/NEWS
+++ b/NEWS
@@ -4,10 +4,168 @@ See the end of this file for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 
+Version 1.9.5:
+
+* ping
+
+** Implement subprivileged echo method.
+
+Add fallback code usable by GNU/Linux to create a datagram socket for
+sending ICMP ECHOREQUEST.  The change is related to issue #37252.
+
+* ifconfig
+
+**  Support changing of hardware address.
+
+Implement the setting of link level addresses for systems running
+GNU/Linux.
+
+** Statistics for BSD systems.
+
+** A work-around specific to GNU/Hurd.
+
+This system uses a mixture of BSD definitions and GNU/Linux
+interfaces.  In particular, some care is needed to check interface
+hardware type.
+
+**  Improve the support for GNU/Hurd.
+
+Add system specific abilities, including parsing of command line and
+hardware addresses.
+
+** More info on tunnel interfaces.
+
+** Implement a hardware list for BSD systems.
+
+Patterned on the hardware recognition already in use by GNU/Linux, use
+a similar mechanism for all of BSD.
+
+** Sporadically appearing regression.
+
+Device flags are sometimes calculated before their query using
+SIOCGIFFLAGS.  First observed on GNU/Hurd.
+
+** Apply flags correctly.
+
+When finalizing actions, some flags could be forgotten.  In
+particular, the flag 'up' was ignored whenever an address was assigned
+at the same time.  This is related to the fact that an invocation only
+effecting interface flags, still resulted in a full printout if
+interface status.  This latter behaviour differs from all other
+implementations and is rather annoying.  The issue was detected and
+reported by Hans-Peter Budek in
+http://lists.gnu.org/archive/html/bug-inetutils/2015-07/msg00000.html
+
+** Verbose report on changed flags.
+
+** Symbolic name as peer address.
+
 * ftp
 
-Allow invocation, as well as command `open', to accept an explicit
-remote user name as extended host argument: `user@host'.
+** Allow invocation, as well as command `open', to accept an explicit
+** remote user name as extended host argument: `user@host'.
+
+** Portability to Android.
+
+Without a check for HAVE_DECL_GETPASS and without making a local
+function declaration, the implicit declaration causes crashes on
+64-bit systems lacking declared getpass(), such as Android.  See
+http://lists.gnu.org/archive/html/bug-inetutils/2016-10/msg00000.html
+
+* ftpd
+
+** Mention mandatory argument for <max-timeout>.
+
+* rcp
+
+** Integer overflow.
+
+During transmission of large files, size exceeding 2GB, a long integer
+variable overflows.  Issue reported and identified by Wenlin Kang in
+http://lists.gnu.org/archive/html/bug-inetutils/2015-07/msg00004.html
+
+* hostname
+
+** Avoid a trailing space.
+
+Suppress the space character after the last presented IP number.
+Problem reported by Terje Strand in
+http://lists.gnu.org/archive/html/bug-inetutils/2016-04/msg00001.html
+
+** Make -F handle comment-only input files without trailing newline.
+Problem reported by Omer Anson <oaanson@gmail.com> in
+https://lists.gnu.org/archive/html/bug-inetutils/2017-06/msg00010.html
+
+* syslogd
+
+** Redefine faulty macro LOG_MAKEPRI whenever needed.
+
+Systems with Glibc header file <syslog.h> prior to 2.17, are not
+correctly defining the helper macro LOG_MAKEPRI.  This effects our
+syslog service whenever it receives kernel messages from a remote
+host.  The issue was mentioned in Debian's BTS as report #729666.
+
+* tftpd
+
+** AIX portability
+
+** Add LOG_NDELAY to openlog().  The file descriptor for logging must
+** be active before chrooting happens.
+
+* traceroute
+
+** Subprivileged use case.
+
+A fallback for ICMP tracing relevant to GNU/Linux is implemented,
+allowing a rudimentary but suid-less use case.  The ability to
+identify intermediary hosts is missing, due to the crippled capability
+of receiving ICMP packets other than ICMP_ECHOREPLY.
+
+* telnet
+
+Telnet -E(no escape) is treating _POSIX_VDISABLE char as escape.
+Causes problems when sending binary data through telnet connections.
+
+* telnetd
+
+** Use tty, not pty on Solaris.
+
+Setting of terminal attributes as well setting of window size must be
+done via the slave descriptor, not the master descriptor.
+
+** Scrub USER from environment.
+
+Discard the environment variable USER.  It will later be set properly
+for autologin, but at least one BSD system passes a preset value when
+telnetd starts, a value which will cause rejected login when autologin
+is not in effect.
+
+** Portability of TTY termcap to Solaris systems.
+
+** Portable option debugging.
+
+BSD systems assign IAC and _POSIX_VDISABLE the common decimal value
+255. Hence the NVT enforces value duplication more often during their
+transmission, than GNU and Solaris systems do.
+
+** Premature connection closure.
+
+When many connections are attempted in quick succession, a substantial
+number of them are cancelled.  This does not appear for manual use
+cases, but for contrived automated set-ups.  The cause seems to be a
+change in the evaluation of pty_read(), which was done to coincide
+with the condition in use by the original BSD implementation.  Issue
+reported and suggested by Chris Severance in
+http://lists.gnu.org/archive/html/bug-inetutils/2015-07/msg00006.html
+
+* whois
+
+** Update Canadian TLD server.
+
+Old host name no longer exists.  Reported by Neil Mayhem:
+http://lists.gnu.org/archive/html/bug-inetutils/2017-01/msg00000.html
+
+* Improved documentation, self-tests and build environment.
 
 June 9, 2015
 Version 1.9.4:

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


commit 82fcf84b242cd5d9400193ccd0199bf9a471113b
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 13:27:57 2020 +0100

    THANKS: Credit Mats.

diff --git a/ChangeLog b/ChangeLog
index 24594b6..fb802a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
 
+	* THANKS: Credit Mats.
+
+2020-01-01  Simon Josefsson  <simon@josefsson.org>
+
 	* cfg.mk: Silence 'make syntax-check'.
 
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
diff --git a/THANKS b/THANKS
index 0872d81..350ce2c 100644
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ Jeff Bailey        <jbailey@nisa.net>
 Jeff Smith         <jeff@dcs.warwick.ac.uk>
 Joachim Gabler     <joga@sun.com>
 Marcus Brinkmann   <Marcus.Brinkmann@ruhr-uni-bochum.de>
+Mats Erik Andersson <gnu@gisladisker.se>
 Matt Roberds       <mroberds@worldnet.att.net>
 Michael Deutschmann <michael@talamasca.ocis.net>
 Michael Vogt       <mvogt@acm.org>

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


commit d8de4587f20edbd5ecf017aeb6f115eacbddd43f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 13:21:37 2020 +0100

    Update copyright years to use intervals up to 2020.

diff --git a/ChangeLog b/ChangeLog
index c31425d..24594b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16209,9 +16209,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 Free
-    Software Foundation, Inc.
+    Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ChangeLog.0 b/ChangeLog.0
index af9eb7f..5fda61c 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -2021,9 +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 Free Software Foundation, Inc.
+    Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/Makefile.am b/Makefile.am
index 2333b6d..3553b8e 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/NEWS b/NEWS
index f1a8b49..539a10e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
 GNU inetutils NEWS -- history of user-visible changes.
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-2017 Free Software Foundation, Inc.
+Copyright (C) 1997-2020 Free Software Foundation, Inc.
 See the end of this file for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
diff --git a/README b/README
index 5d0eead..3194198 100644
--- a/README
+++ b/README
@@ -102,9 +102,7 @@ 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 Free Software Foundation, Inc.
+Copyright (C) 1997-2020 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 fe15437..dd3baa3 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 Free
-Software Foundation, Inc.
+Copyright (C) 1999-2020 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 0a7c86c..0872d81 100644
--- a/THANKS
+++ b/THANKS
@@ -36,9 +36,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 Free Software Foundation, Inc.
+Copyright (C) 1997-2020 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 99aea53..39bc44e 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 d3ee9b0..463df47 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index a0136a8..9675b39 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 fbc0e16..7de9f16 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 edc154c..05b864e 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 3ffc7a7..34e6b6a 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 6e2d823..0681954 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 2f65b4b..73e9fc2 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 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 40e7ada..ab2121c 100644
--- a/am/libidn.m4
+++ b/am/libidn.m4
@@ -1,5 +1,5 @@
 # libidn.m4 serial 1
-dnl Copyright (C) 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2013-2020 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/readline.m4 b/am/readline.m4
index 4e1b958..ce9e0a5 100644
--- a/am/readline.m4
+++ b/am/readline.m4
@@ -1,6 +1,5 @@
 # readline.m4 serial 9
-dnl Copyright (C) 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/am/result.m4 b/am/result.m4
index b48e543..3fc870a 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 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2020 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/bootstrap b/bootstrap
index 70fd73c..8abc6b2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,8 @@ scriptversion=2019-01-04.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018, 2020, 2020, 2020, 2020, 2019, 2019-2020, 2018
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/bootstrap.conf b/bootstrap.conf
index eefcaf4..3cd52ed 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 Free Software Foundation, Inc.
+# Copyright (C) 2007-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/cfg.mk b/cfg.mk
index 35ad9dd..d4440b8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-# Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/configure.ac b/configure.ac
index f825943..e92c816 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 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9760bf7..f9d336a 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 7637fcd..a1e0db3 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 Free Software
-Foundation, Inc.
+Copyright @copyright{} 2000--2020 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 696e858..bfb0add 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftp/cmds.c b/ftp/cmds.c
index c90180e..9e734a7 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 8fb2af0..20ceea2 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/domacro.c b/ftp/domacro.c
index d65a8e3..0ffe002 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/extern.h b/ftp/extern.h
index 7aa8377..08d62c4 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 5eff2d7..e003a9b 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index 823e3be..d23bd8e 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/main.c b/ftp/main.c
index 7d4918f..febdbeb 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 71ae56b..aa3eaa3 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index d25b43d..75708b2 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftpd/auth.c b/ftpd/auth.c
index cee3bd9..01fca02 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/conf.c b/ftpd/conf.c
index abe45a7..e46b223 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/extern.h b/ftpd/extern.h
index 4435e73..50e16ed 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index 3a16e3e..1827774 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index b88abcb..b5b786c 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/logwtmp.c b/ftpd/logwtmp.c
index 96f1ab1..861e00e 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/pam.c b/ftpd/pam.c
index a16767c..d51dfe5 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/popen.c b/ftpd/popen.c
index 44ab234..d00a6fb 100644
--- a/ftpd/popen.c
+++ b/ftpd/popen.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index 85218f1..302fa0d 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index c5b2b09..a71dea5 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index d2e02e5..fbe73dc 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 491efc7..252d335 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 4a14778..97375cf 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index b4de481..1d2bf14 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.h b/ifconfig/ifconfig.h
index 72760be..3311248 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.c b/ifconfig/options.c
index dcd26f5..0319d96 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.h b/ifconfig/options.h
index be4e43c..7353b80 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 68d64c3..63928bb 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index 5bb393d..75f1aac 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.c b/ifconfig/system.c
index bdc2b6f..a73977a 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.h b/ifconfig/system.h
index 0765b1b..83cb722 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am
index 75baaff..dc5f033 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index abfc25c..d2f4f5d 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/bsd.h b/ifconfig/system/bsd.h
index cf2a6d5..2ae2a6b 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index 51a3a19..c8c7be6 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index 3c12564..7010ab8 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
index 63737a2..099e97e 100644
--- a/ifconfig/system/hurd.c
+++ b/ifconfig/system/hurd.c
@@ -1,5 +1,5 @@
 /* hurd.c -- Code for ifconfig specific to GNU/Hurd.
-  Copyright (C) 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2015-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/hurd.h b/ifconfig/system/hurd.h
index 7a643de..72972d8 100644
--- a/ifconfig/system/hurd.h
+++ b/ifconfig/system/hurd.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2015-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index bd6148e..9aa087a 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index c8a2e4f..2476656 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index 5e00835..474ec8d 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.h b/ifconfig/system/qnx.h
index 3784f7d..2bed6db 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index 3393bf3..8e00d66 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.h b/ifconfig/system/solaris.h
index 2b67391..73f9475 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/Makefile.am b/libicmp/Makefile.am
index d2f66b5..4e7a912 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index ed371ba..8a1deba 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index e06a7a4..a37f3a8 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index 17f9469..f7b80b8 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index bb0fd23..dd6d8ef 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 53bf24f..8f70dc0 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 39a5594..8edd8f8 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index 52b562c..ad00073 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/argcv.h b/libinetutils/argcv.h
index b45a187..1999210 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index 81605c0..308c942 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 851fcbe..5cd8eb8 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index 3cab38c..f10f9d4 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-  Free Software Foundation, Inc.
+  Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index d9468c5..518e56d 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/if_index.c b/libinetutils/if_index.c
index 3f90dae..1a03ab1 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 4838ab4..37dabb3 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kerberos5.c b/libinetutils/kerberos5.c
index d8d7fd2..7f8bc1c 100644
--- a/libinetutils/kerberos5.c
+++ b/libinetutils/kerberos5.c
@@ -1,5 +1,5 @@
 /* kerberos5.c -- functions to use Heimdal's and MIT's Kerberos V
-  Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2014-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kerberos5_def.h b/libinetutils/kerberos5_def.h
index fd803a8..f47f350 100644
--- a/libinetutils/kerberos5_def.h
+++ b/libinetutils/kerberos5_def.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2014-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 5b3d08a..d9e006a 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index 5c940c3..259e342 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2006-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index 844ab38..50e0a4a 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index ea86d5b..4759a29 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index 2abf4e8..b98e070 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 2a9773a..dfbba29 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index c709790..0999d2b 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -1,6 +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 Free Software Foundation, Inc.
+  Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index 455c5e2..f616cf1 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-  2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 42b0afc..e7ba2f1 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
-  Free Software Foundation, Inc.
+  Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.h b/libinetutils/tftpsubs.h
index 415fd75..a22748b 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
-  Free Software Foundation, Inc.
+  Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 47d7df8..0ca83b1 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index f7d7ae6..8e97c3a 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -1,7 +1,6 @@
 /*
-  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2107 Free Software
-  Foundation, Inc.
+  Copyright (C) 1999-2016, 2107, 2018-2020 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index 406ee23..5bc0ce0 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 2f817e0..5481c1a 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libls/cmp.c b/libls/cmp.c
index 3711fc0..1bd64dc 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/extern.h b/libls/extern.h
index 009c0f8..93041f6 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/fts.c b/libls/fts.c
index b6dde06..c085813 100644
--- a/libls/fts.c
+++ b/libls/fts.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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/fts.h b/libls/fts.h
index 7450054..77f0df0 100644
--- a/libls/fts.h
+++ b/libls/fts.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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.c b/libls/ls.c
index a3adfc0..1af03be 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.h b/libls/ls.h
index 41e3607..fbbfeff 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/print.c b/libls/print.c
index 9d43731..d277051 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index 549e2ed..23ab824 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/util.c b/libls/util.c
index 1f955dd..d0b0a1e 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index 7f02a11..7b9ab6b 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index eb788e9..76c02dd 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 44bedc0..e93079a 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index 8679aea..6253ded 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index 92336b1..d5217bb 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 41d4b08..1c7e932 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 1b0b404..70fae53 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index 2e8ff97..01dff93 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index 243a7a3..1b75ddb 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index 2870789..cab60c4 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index abba8d2..516bad7 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-  Free Software Foundation, Inc.
+  Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index d9819db..c4fb22d 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index 3b07491..4a094a2 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 61ae940..d66160e 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/key-proto.h b/libtelnet/key-proto.h
index de787ca..c67b1e1 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index 187fe4c..083d973 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 0522fbd..8099168 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc.h b/libtelnet/misc.h
index c8c22ba..0af0def 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index e952292..319d772 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index e55df9d..363830e 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-  2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 6f98cde..9d3952b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-# Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/paths b/paths
index ee07a2a..e849e1b 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 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/Makefile.am b/ping/Makefile.am
index ab324d1..c2a1771 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/libping.c b/ping/libping.c
index 6b4ab18..00d0652 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 Free Software Foundation, Inc.
+  Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.c b/ping/ping.c
index a0ffc46..f98f87e 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
-  Free Software Foundation, Inc.
+  Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.h b/ping/ping.h
index a053219..c6aafab 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 Free Software Foundation, Inc.
+  Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.c b/ping/ping6.c
index 4bd4e0e..1ae5e44 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.h b/ping/ping6.h
index 5a5bb6c..c0606f8 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_address.c b/ping/ping_address.c
index d5a83b9..91af367 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.c b/ping/ping_common.c
index a55dc9d..e29b562 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.h b/ping/ping_common.h
index 72c0802..33a2b5e 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-  2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index f06a09d..3a7cc8f 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index 90f4787..b689341 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_router.c b/ping/ping_router.c
index dccc98e..53a7144 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index 86d3172..3bf726b 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 68caef6..962dae4 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
index c6d48f1..f337c09 100644
--- a/src/dnsdomainname.c
+++ b/src/dnsdomainname.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-  Foundation, Inc.
+  Copyright (C) 2012-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/hostname.c b/src/hostname.c
index f53bb20..e0c24db 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 Free Software Foundation, Inc.
+  Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/inetd.c b/src/inetd.c
index 8e21d38..6bd5365 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/logger.c b/src/logger.c
index 6caa264..cce6b3a 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-  Free Software Foundation, Inc.
+  Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/logprio.h b/src/logprio.h
index 15b0208..625769b 100644
--- a/src/logprio.h
+++ b/src/logprio.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-  Foundation, Inc.
+  Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rcp.c b/src/rcp.c
index f1a12f0..415e3f0 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rexec.c b/src/rexec.c
index e8a9e71..8df25ec 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-  Free Software Foundation, Inc.
+  Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rexecd.c b/src/rexecd.c
index dfd574b..ad23703 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rlogin.c b/src/rlogin.c
index e5f1f89..b622793 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rlogind.c b/src/rlogind.c
index 2d24303..0380b4a 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rsh.c b/src/rsh.c
index 7fc61e0..779c4d3 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rshd.c b/src/rshd.c
index 8d5ba6b..11322d3 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/syslogd.c b/src/syslogd.c
index 14de681..e7ab9d8 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 Free Software Foundation, Inc.
+  Copyright (C) 1997-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/tftp.c b/src/tftp.c
index cdf7c92..d9a0f9e 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/tftpd.c b/src/tftpd.c
index 2f53ae8..ba51f24 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/traceroute.c b/src/traceroute.c
index 90a176d..7d59f00 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 Free Software Foundation, Inc.
+  Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/uucpd.c b/src/uucpd.c
index bec1c8f..407bab1 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/summary.sh.in b/summary.sh.in
index 62371ae..f734076 100644
--- a/summary.sh.in
+++ b/summary.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2013-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 6ef6483..5bbc56e 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talk/ctl.c b/talk/ctl.c
index 0f9c814..c827a97 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index ec8920e..6e539ad 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/display.c b/talk/display.c
index 3705949..fd5f90c 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 1af3ded..e97f0b5 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_names.c b/talk/get_names.c
index ffa9187..23b1980 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/init_disp.c b/talk/init_disp.c
index a5e03ac..131ca3c 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/invite.c b/talk/invite.c
index 5ac7ab0..0058ec9 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/io.c b/talk/io.c
index a513ca7..15859c8 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/look_up.c b/talk/look_up.c
index 76213e8..b00248d 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/msgs.c b/talk/msgs.c
index 8a02e01..1cadedf 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.c b/talk/talk.c
index 3d55577..dcd6d50 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.h b/talk/talk.h
index 8eabb17..e323f86 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index ba618d0..47f384d 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index 0f0237c..4eda4d4 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talkd/acl.c b/talkd/acl.c
index 4876e67..62c5666 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/announce.c b/talkd/announce.c
index 0849dc8..6b48556 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index 16ccfab..7eb30db 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/print.c b/talkd/print.c
index b8e5b1f..3349ea9 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/process.c b/talkd/process.c
index 7b7f625..415a609 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/table.c b/talkd/table.c
index 0aa7849..1f07b68 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 56ad6a7..f708f29 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 1ad51e8..82c1e83 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnet/authenc.c b/telnet/authenc.c
index 63b1515..185eb32 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/commands.c b/telnet/commands.c
index 6520893..a0e1566 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/defines.h b/telnet/defines.h
index 0f0d7e7..1f25d03 100644
--- a/telnet/defines.h
+++ b/telnet/defines.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/externs.h b/telnet/externs.h
index 70a3ec0..2a420e6 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/general.h b/telnet/general.h
index de0fb20..ab6e2f1 100644
--- a/telnet/general.h
+++ b/telnet/general.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index 5ec2a82..6104df2 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/main.c b/telnet/main.c
index 0c85619..dca7847 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/network.c b/telnet/network.c
index d6299c5..0938502 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.c b/telnet/ring.c
index f7c58fa..31824fe 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.h b/telnet/ring.h
index 6144d28..fb34db6 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 0bfcca1..5475d08 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 46b9cde..a1a3fc4 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/terminal.c b/telnet/terminal.c
index 0bf5c5a..fbed34d 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index e98bc5f..331183d 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/types.h b/telnet/types.h
index 0353dc1..07f62f6 100644
--- a/telnet/types.h
+++ b/telnet/types.h
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index c7e1199..fb00cc5 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index e1a9f45..0047c62 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 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnetd/pty.c b/telnetd/pty.c
index b24cd2b..033022e 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/slc.c b/telnetd/slc.c
index 3f83f12..fba90bd 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/state.c b/telnetd/state.c
index 859f124..2e18798 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 5e13e23..a3badbe 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 3a80a31..2578cc6 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 Free Software Foundation, Inc.
+  Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/term.c b/telnetd/term.c
index 7ddbe46..206e0c8 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index a3e37d0..daeea00 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 35b19f7..5bd879d 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1,7 +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 Free Software Foundation, Inc.
+  Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ce98fc3..8dd6324 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 Free Software Foundation, Inc.
+# Copyright (C) 2007-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index c7809de..25cd1da 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2010-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
index 54afed4..b6fb9cd 100755
--- a/tests/dnsdomainname.sh
+++ b/tests/dnsdomainname.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-# Foundation, Inc.
+# Copyright (C) 2012-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 580f7be..a73b426 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index d2267a0..eec6c2c 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/hostname.sh b/tests/hostname.sh
index a229ede..572f0e7 100755
--- a/tests/hostname.sh
+++ b/tests/hostname.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-# Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/identify.c b/tests/identify.c
index c0faf40..e3671fc 100644
--- a/tests/identify.c
+++ b/tests/identify.c
@@ -1,5 +1,5 @@
 /* identify -- Probe system and report characteristica.
-  Copyright (C) 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2013-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 87c872c..034b03c 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-# Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ifconfig_modes.sh b/tests/ifconfig_modes.sh
index 40e8e8b..3ea8dcf 100644
--- a/tests/ifconfig_modes.sh
+++ b/tests/ifconfig_modes.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/inetd.sh b/tests/inetd.sh
index 373b394..fe39360 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2013-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/libls.sh b/tests/libls.sh
index 522975c..64902cb 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/localhost.c b/tests/localhost.c
index fcd1b71..11c367a 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 Free Software Foundation, Inc.
+  Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ls.c b/tests/ls.c
index 9fe8f35..9dc8ddc 100644
--- a/tests/ls.c
+++ b/tests/ls.c
@@ -1,5 +1,5 @@
 /* ls - program buildable from libls
-  Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+  Copyright (C) 2014-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 88f0b8e..793c754 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
-# Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/readutmp.c b/tests/readutmp.c
index 3e914b6..3c5158f 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2010-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 6a1bf5f..8a1e964 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-# Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tcpget.c b/tests/tcpget.c
index 25254c3..cc6b312 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 Free Software
-  Foundation, Inc.
+  Copyright (C) 2013-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index 2fb78cf..a5e356d 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tftp.sh b/tests/tftp.sh
index c356f4d..c449312 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
-# Free Software Foundation, Inc.
+# Copyright (C) 2010-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index c105ea1..258d4eb 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -1,5 +1,4 @@
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-# Foundation, Inc.
+# Copyright (C) 2012-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index fe6e451..32467b2 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
-# Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/utmp.sh b/tests/utmp.sh
index 95e53e9..5f348f9 100755
--- a/tests/utmp.sh
+++ b/tests/utmp.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Free Software
-# Foundation, Inc.
+# Copyright (C) 2012-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/waitdaemon.c b/tests/waitdaemon.c
index 0ebc82a..ea4fe6d 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2010-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/Makefile.am b/whois/Makefile.am
index c2233ae..c5265d6 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/as_del_list b/whois/as_del_list
index a189143..773babe 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/data.h b/whois/data.h
index 232351f..3046647 100644
--- a/whois/data.h
+++ b/whois/data.h
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-  Free Software Foundation, Inc.
+  Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/ip_del_list b/whois/ip_del_list
index 34f3e55..25cbf26 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 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 fc89087..5d19805 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 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 8f20a2d..16339e1 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 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 6bec722..cd3a6d6 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index 91697b8..79ca3c7 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/whois.c b/whois/whois.c
index 58711b0..eaee3ba 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
-  Free Software Foundation, Inc.
+  Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/whois.h b/whois/whois.h
index e6ad429..6126bdf 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
-  Free Software Foundation, Inc.
+  Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 

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


commit 330e19d681e73edd22c248853ba5e5f18b2f8a9e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 13:08:59 2020 +0100

    cfg.mk: Silence 'make syntax-check'.

diff --git a/ChangeLog b/ChangeLog
index 3a6f264..c31425d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
 
+	* cfg.mk: Silence 'make syntax-check'.
+
+2020-01-01  Simon Josefsson  <simon@josefsson.org>
+
 	* bootstrap: Updated from gnulib.
 
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
diff --git a/cfg.mk b/cfg.mk
index c335c0d..35ad9dd 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -47,11 +47,15 @@ local-checks-to-skip = \
 	sc_prohibit_strcmp \
 	sc_unmarked_diagnostics \
 	sc_bindtextdomain \
-	sc_assignment_in_if
+	sc_assignment_in_if \
+	sc_prohibit_gnu_make_extensions
 
 exclude_file_name_regexp--sc_prohibit_have_config_h = \
 	^libinetutils/libinetutils.h$$
 
+exclude_file_name_regexp--sc_obsolete_symbols = \
+	^tests/identify.c$$
+
 htmldir = ../www-$(PACKAGE)
 
 manual_title = GNU network utilities

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

Summary of changes:
 ChangeLog                     |  16 +++-
 ChangeLog.0                   |   4 +-
 Makefile.am                   |   4 +-
 NEWS                          | 166 ++++++++++++++++++++++++++++++++++++++++--
 README                        |   4 +-
 README-alpha                  |   4 +-
 THANKS                        |   5 +-
 am/check_macro.m4             |   4 +-
 am/check_member.m4            |   4 +-
 am/check_weak_refs.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                  |   2 +-
 am/readline.m4                |   3 +-
 am/result.m4                  |   4 +-
 bootstrap                     |   3 +-
 bootstrap.conf                |   3 +-
 cfg.mk                        |   9 ++-
 configure.ac                  |   4 +-
 doc/Makefile.am               |   4 +-
 doc/inetutils.texi            |   4 +-
 ftp/Makefile.am               |   4 +-
 ftp/cmds.c                    |   4 +-
 ftp/cmdtab.c                  |   4 +-
 ftp/domacro.c                 |   4 +-
 ftp/extern.h                  |   4 +-
 ftp/ftp.c                     |   4 +-
 ftp/ftp_var.h                 |   4 +-
 ftp/main.c                    |   4 +-
 ftp/ruserpass.c               |   4 +-
 ftpd/Makefile.am              |   4 +-
 ftpd/auth.c                   |   4 +-
 ftpd/conf.c                   |   4 +-
 ftpd/extern.h                 |   4 +-
 ftpd/ftpcmd.y                 |   4 +-
 ftpd/ftpd.c                   |   4 +-
 ftpd/logwtmp.c                |   4 +-
 ftpd/pam.c                    |   4 +-
 ftpd/popen.c                  |   4 +-
 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        |   2 +-
 ifconfig/system/hurd.h        |   2 +-
 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      |   2 +-
 libinetutils/kerberos5_def.h  |   2 +-
 libinetutils/krcmd.c          |   4 +-
 libinetutils/libinetutils.h   |   3 +-
 libinetutils/localhost.c      |   4 +-
 libinetutils/logwtmp.c        |   4 +-
 libinetutils/logwtmpko.c      |   4 +-
 libinetutils/setsig.c         |   4 +-
 libinetutils/shishi.c         |   3 +-
 libinetutils/shishi_def.h     |   3 +-
 libinetutils/tftpsubs.c       |   4 +-
 libinetutils/tftpsubs.h       |   4 +-
 libinetutils/ttymsg.c         |   4 +-
 libinetutils/utmp_init.c      |   5 +-
 libinetutils/utmp_logout.c    |   4 +-
 libls/Makefile.am             |   4 +-
 libls/cmp.c                   |   4 +-
 libls/extern.h                |   4 +-
 libls/fts.c                   |   4 +-
 libls/fts.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              |   4 +-
 libtelnet/auth.h              |   4 +-
 libtelnet/enc-proto.h         |   4 +-
 libtelnet/enc_des.c           |   4 +-
 libtelnet/encrypt.c           |   4 +-
 libtelnet/encrypt.h           |   4 +-
 libtelnet/forward.c           |   4 +-
 libtelnet/genget.c            |   4 +-
 libtelnet/genget.h            |   3 +-
 libtelnet/getent.c            |   4 +-
 libtelnet/kerberos.c          |   4 +-
 libtelnet/kerberos5.c         |   4 +-
 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            |   3 +-
 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                  |   3 +-
 ping/ping6.h                  |   3 +-
 ping/ping_address.c           |   4 +-
 ping/ping_common.c            |   3 +-
 ping/ping_common.h            |   3 +-
 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                   |   4 +-
 src/logger.c                  |   3 +-
 src/logprio.h                 |   3 +-
 src/rcp.c                     |   4 +-
 src/rexec.c                   |   3 +-
 src/rexecd.c                  |   4 +-
 src/rlogin.c                  |   4 +-
 src/rlogind.c                 |   4 +-
 src/rsh.c                     |   4 +-
 src/rshd.c                    |   4 +-
 src/syslogd.c                 |   4 +-
 src/tftp.c                    |   4 +-
 src/tftpd.c                   |   4 +-
 src/traceroute.c              |   3 +-
 src/uucpd.c                   |   4 +-
 summary.sh.in                 |   2 +-
 talk/Makefile.am              |   4 +-
 talk/ctl.c                    |   4 +-
 talk/ctl_transact.c           |   4 +-
 talk/display.c                |   4 +-
 talk/get_addrs.c              |   4 +-
 talk/get_names.c              |   4 +-
 talk/init_disp.c              |   4 +-
 talk/invite.c                 |   4 +-
 talk/io.c                     |   4 +-
 talk/look_up.c                |   4 +-
 talk/msgs.c                   |   4 +-
 talk/talk.c                   |   4 +-
 talk/talk.h                   |   4 +-
 talk/talk_ctl.h               |   4 +-
 talkd/Makefile.am             |   4 +-
 talkd/acl.c                   |   4 +-
 talkd/announce.c              |   4 +-
 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              |   4 +-
 telnet/commands.c             |   4 +-
 telnet/defines.h              |   4 +-
 telnet/externs.h              |   4 +-
 telnet/general.h              |   4 +-
 telnet/krb4-proto.h           |   4 +-
 telnet/main.c                 |   4 +-
 telnet/network.c              |   4 +-
 telnet/ring.c                 |   4 +-
 telnet/ring.h                 |   4 +-
 telnet/sys_bsd.c              |   4 +-
 telnet/telnet.c               |   4 +-
 telnet/terminal.c             |   4 +-
 telnet/tn3270.c               |   4 +-
 telnet/types.h                |   4 +-
 telnet/utilities.c            |   4 +-
 telnetd/Makefile.am           |   4 +-
 telnetd/pty.c                 |   3 +-
 telnetd/slc.c                 |   4 +-
 telnetd/state.c               |   4 +-
 telnetd/telnetd.c             |   4 +-
 telnetd/telnetd.h             |   4 +-
 telnetd/term.c                |   3 +-
 telnetd/termstat.c            |   4 +-
 telnetd/utility.c             |   4 +-
 tests/Makefile.am             |   3 +-
 tests/addrpeek.c              |   3 +-
 tests/dnsdomainname.sh        |   3 +-
 tests/ftp-localhost.sh        |   3 +-
 tests/ftp-parser.sh           |   2 +-
 tests/hostname.sh             |   3 +-
 tests/identify.c              |   2 +-
 tests/ifconfig.sh             |   3 +-
 tests/ifconfig_modes.sh       |   2 +-
 tests/inetd.sh                |   2 +-
 tests/libls.sh                |   2 +-
 tests/localhost.c             |   3 +-
 tests/ls.c                    |   2 +-
 tests/ping-localhost.sh       |   3 +-
 tests/readutmp.c              |   3 +-
 tests/syslogd.sh              |   3 +-
 tests/tcpget.c                |   3 +-
 tests/telnet-localhost.sh     |   3 +-
 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/ip_del_list             |   4 +-
 whois/make_as_del.pl          |   4 +-
 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 +-
 243 files changed, 423 insertions(+), 664 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 01 08:26:02 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1ime0g-0004LZ-85
	for mharc-commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:26:02 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:44516)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1ime0d-0004L9-Lv
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:26:00 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:46967)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <simon@josefsson.org>) id 1ime0d-0004ef-IM
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:25:59 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 77C6920B7D; Wed,  1 Jan 2020 08:25:59 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-50-g9410c4d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5b48963f67cb1b959287ede030970830e883b7f5
X-Git-Newrev: 9410c4d1fd6cf46c87892bb295645bc7ba675470
Message-Id: <20200101132559.77C6920B7D@vcs0.savannah.gnu.org>
Date: Wed,  1 Jan 2020 08:25:59 -0500 (EST)
From: simon@josefsson.org (Simon Josefsson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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 Jan 2020 13:26:00 -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  9410c4d1fd6cf46c87892bb295645bc7ba675470 (commit)
      from  5b48963f67cb1b959287ede030970830e883b7f5 (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=9410c4d1fd6cf46c87892bb295645bc7ba675470


commit 9410c4d1fd6cf46c87892bb295645bc7ba675470
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 14:25:36 2020 +0100

    bootstrap: Updated from gnulib.

diff --git a/bootstrap b/bootstrap
index 8abc6b2..70fd73c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,8 +4,7 @@ scriptversion=2019-01-04.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2018, 2020, 2020, 2020, 2020, 2019, 2019-2020, 2018
-# Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

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

Summary of changes:
 bootstrap | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 01 09:00:00 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1imeXY-0000hW-RV
	for mharc-commit-inetutils@gnu.org; Wed, 01 Jan 2020 09:00:00 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:55351)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1imeXT-0000hK-BF
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:59:56 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:47327)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <simon@josefsson.org>) id 1imeXT-0005Li-6b
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 08:59:55 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 1B5EB20B7D; Wed,  1 Jan 2020 08:59:55 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-51-ge1e70c8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9410c4d1fd6cf46c87892bb295645bc7ba675470
X-Git-Newrev: e1e70c849b5285419e445f6e049ef8e204a03491
Message-Id: <20200101135955.1B5EB20B7D@vcs0.savannah.gnu.org>
Date: Wed,  1 Jan 2020 08:59:54 -0500 (EST)
From: simon@josefsson.org (Simon Josefsson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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 Jan 2020 13:59:56 -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  e1e70c849b5285419e445f6e049ef8e204a03491 (commit)
      from  9410c4d1fd6cf46c87892bb295645bc7ba675470 (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=e1e70c849b5285419e445f6e049ef8e204a03491


commit e1e70c849b5285419e445f6e049ef8e204a03491
Author: Guillem Jover <guillem@hadrons.org>
Date:   Fri Aug 16 00:33:07 2019 +0200

    ping: Fix typo in output
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

diff --git a/ChangeLog b/ChangeLog
index 1a31dc3..9c83aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-01  Guillem Jover  <guillem@hadrons.org>  (tiny change)
+
+	* ping/ping_echo.c (struct icmp_diag): Fix typo.
+
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
 
 	* NEWS: Document user-visible changes since last release.
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 3a7cc8f..8098562 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -390,7 +390,7 @@ struct icmp_diag icmp_diag[] = {
   {ICMP_SOURCE_QUENCH, "Source Quench", print_ip_data, NULL},
   {ICMP_REDIRECT, NULL, print_icmp, "Redirect"},
   {ICMP_ECHO, "Echo Request", NULL, NULL},
-  {ICMP_ROUTERADV, "Router Advertisment", NULL, NULL},
+  {ICMP_ROUTERADV, "Router Advertisement", NULL, NULL},
   {ICMP_ROUTERDISCOVERY, "Router Discovery", NULL, NULL},
   {ICMP_TIME_EXCEEDED, NULL, print_icmp, "Time exceeded"},
   {ICMP_PARAMETERPROB, NULL, print_parameterprob, NULL},

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

Summary of changes:
 ChangeLog        | 4 ++++
 ping/ping_echo.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 01 09:29:26 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1imf02-0004Mq-H9
	for mharc-commit-inetutils@gnu.org; Wed, 01 Jan 2020 09:29:26 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:56894)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1imezz-0004Kv-FU
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 09:29:24 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:47729)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <simon@josefsson.org>) id 1imezv-00008z-K6
 for commit-inetutils@gnu.org; Wed, 01 Jan 2020 09:29:22 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 90EB420B7D; Wed,  1 Jan 2020 09:29:19 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-53-g1480573
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e1e70c849b5285419e445f6e049ef8e204a03491
X-Git-Newrev: 1480573a908254662074865406ac6fbde4694e5d
Message-Id: <20200101142919.90EB420B7D@vcs0.savannah.gnu.org>
Date: Wed,  1 Jan 2020 09:29:19 -0500 (EST)
From: simon@josefsson.org (Simon Josefsson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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 Jan 2020 14:29:24 -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  1480573a908254662074865406ac6fbde4694e5d (commit)
       via  8ac94f742ed9f3f84a311c004c27ad12597fc146 (commit)
      from  e1e70c849b5285419e445f6e049ef8e204a03491 (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=1480573a908254662074865406ac6fbde4694e5d


commit 1480573a908254662074865406ac6fbde4694e5d
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 15:28:54 2020 +0100

    telnet: Validate supplied environment variables. CVE-2019-0053
    
    telnet/telnet.c (suboption): Use snprintf instead of sprintf.
    telnet/utilities.c (printsub): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9c83aae..18f4c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-01  Simon Josefsson  <simon@josefsson.org>
+
+	telnet: Validate supplied environment variables. CVE-2019-0053
+	* telnet/telnet.c (suboption): Use snprintf instead of sprintf.
+	* telnet/utilities.c (printsub): Likewise.
+
 2020-01-01  Guillem Jover  <guillem@hadrons.org>  (tiny change)
 
 	* ping/ping_echo.c (struct icmp_diag): Fix typo.
diff --git a/NEWS b/NEWS
index e22b36a..634ee41 100644
--- a/NEWS
+++ b/NEWS
@@ -127,6 +127,8 @@ of receiving ICMP packets other than ICMP_ECHOREPLY.
 
 Causes problems when sending binary data through telnet connections.
 
+** Validate supplied environment variables. CVE-2019-0053
+
 * telnetd
 
 ** Use tty, not pty on Solaris.
diff --git a/telnet/telnet.c b/telnet/telnet.c
index a1a3fc4..c42bef1 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -859,7 +859,7 @@ suboption (void)
 	  len = strlen (name) + 4 + 2;
 	  if (len < NETROOM ())
 	    {
-	      sprintf ((char *) temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
+	      snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
 		       TELQUAL_IS, name, IAC, SE);
 	      ring_supply_data (&netoring, temp, len);
 	      printsub ('>', &temp[2], len - 2);
@@ -883,7 +883,7 @@ suboption (void)
 
 	  TerminalSpeeds (&ispeed, &ospeed);
 
-	  sprintf ((char *) temp, "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED,
+	  snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED,
 		   TELQUAL_IS, (int) ospeed, (int) ispeed, IAC, SE);
 	  len = strlen ((char *) temp + 4) + 4;	/* temp[3] is 0 ... */
 
@@ -997,7 +997,7 @@ suboption (void)
 	      send_wont (TELOPT_XDISPLOC, 1);
 	      break;
 	    }
-	  sprintf ((char *) temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
+	  snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
 		   TELQUAL_IS, dp, IAC, SE);
 	  len = strlen ((char *) temp + 4) + 4;	/* temp[3] is 0 ... */
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index fb00cc5..44b66d2 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -730,7 +730,7 @@ printsub (char direction, unsigned char *pointer, int length)
 	      {
 		char tbuf[64];
 
-		sprintf (tbuf, "%s%s%s%s%s",
+		snprintf (tbuf, sizeof (tbuf), "%s%s%s%s%s",
 			 pointer[2] & MODE_EDIT ? "|EDIT" : "",
 			 pointer[2] & MODE_TRAPSIG ? "|TRAPSIG" : "",
 			 pointer[2] & MODE_SOFT_TAB ? "|SOFT_TAB" : "",

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


commit 8ac94f742ed9f3f84a311c004c27ad12597fc146
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 1 15:26:47 2020 +0100

    NEWS: Fix markup (silent change).

diff --git a/NEWS b/NEWS
index 96cc87c..e22b36a 100644
--- a/NEWS
+++ b/NEWS
@@ -123,7 +123,8 @@ of receiving ICMP packets other than ICMP_ECHOREPLY.
 
 * telnet
 
-Telnet -E(no escape) is treating _POSIX_VDISABLE char as escape.
+** Telnet -E(no escape) is treating _POSIX_VDISABLE char as escape.
+
 Causes problems when sending binary data through telnet connections.
 
 * telnetd

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

Summary of changes:
 ChangeLog          | 6 ++++++
 NEWS               | 5 ++++-
 telnet/telnet.c    | 6 +++---
 telnet/utilities.c | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jan 11 06:05:14 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iqEZu-0005LD-40
	for mharc-commit-inetutils@gnu.org; Sat, 11 Jan 2020 06:05:14 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:47092)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iqEZp-0005Jn-3i
 for commit-inetutils@gnu.org; Sat, 11 Jan 2020 06:05:12 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:60225)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iqEZo-0003YI-Nm
 for commit-inetutils@gnu.org; Sat, 11 Jan 2020 06:05:08 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 9D16E212AE; Sat, 11 Jan 2020 06:05:08 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-54-g522101f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1480573a908254662074865406ac6fbde4694e5d
X-Git-Newrev: 522101f499c0262d702e6aaf2f1165b1616bc45e
Message-Id: <20200111110508.9D16E212AE@vcs0.savannah.gnu.org>
Date: Sat, 11 Jan 2020 06:05:08 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Sat, 11 Jan 2020 11:05:12 -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  522101f499c0262d702e6aaf2f1165b1616bc45e (commit)
      from  1480573a908254662074865406ac6fbde4694e5d (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=522101f499c0262d702e6aaf2f1165b1616bc45e


commit 522101f499c0262d702e6aaf2f1165b1616bc45e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jan 11 12:01:02 2020 +0100

    Consistent use of grep tools in scripts.
    
    Lack of consistency surfaced as a portability issue for Solaris 11.
    Reported by Bruno Haible for release candidate.

diff --git a/ChangeLog b/ChangeLog
index 18f4c04..d1e49ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2020-01-11  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Consistent use of `grep' tools in scripts.
+
+	* configure.ac (EGREP, FGREP): New and precious variables.
+	* tests/Makefile.am (tools_subst): Replace @EGREP@ and @FGREP@.
+	* tests/ftp-parser.sh (reply): Use $EGREP to detect size in answer,
+	and apply a single, alternating regex.
+	* tests/ifconfig_modes.sh: Replace all `grep' by $GREP.
+	* tests/inetd.sh: Likewise.
+	* tests/libls.sh: Likewise.  Drop unused `-e' flag.
+	* tests/syslogd.sh: Likewise.  Use `$FGREP -f' instead of
+	non-portable `$GREP -f'.  In two cases where `grep' needed
+	multiple regexes, use $EGREP and alternating regexes.
+	* tests/tools.sh.in (EGREP, FGREP): New variables.
+
 2020-01-01  Simon Josefsson  <simon@josefsson.org>
 
 	telnet: Validate supplied environment variables. CVE-2019-0053
diff --git a/configure.ac b/configure.ac
index e92c816..0a45381 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,8 @@ AC_PATH_PROG(MKTEMP, mktemp, mktemp)
 AC_PATH_PROG(NETSTAT, netstat, netstat)
 AC_PATH_PROG(RM, rm, rm)
 AC_PROG_CPP
+AC_PROG_EGREP
+AC_PROG_FGREP
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
@@ -143,6 +145,8 @@ AC_PROG_LN_S
 AC_PROG_SED
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 AC_ARG_VAR(GREP, [Location of preferred 'grep' utility.])
+AC_ARG_VAR(EGREP, [Location of preferred 'egrep' utility.])
+AC_ARG_VAR(FGREP, [Location of preferred 'fgrep' utility.])
 AC_ARG_VAR(SED, [Location of preferred 'sed' utility.])
 AC_ARG_VAR(DD, [Location of 'dd'.])
 AC_ARG_VAR(MKTEMP, [Location of 'mktemp'.])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8dd6324..817a808 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -97,6 +97,8 @@ BUILT_SOURCES = tools.sh
 CLEANFILES = tools.sh
 
 tools_subst = sed -e 's,[@]GREP[@],$(GREP),g' \
+	      -e 's,[@]EGREP[@],$(EGREP),g' \
+	      -e 's,[@]FGREP[@],$(FGREP),g' \
 	      -e 's,[@]SED[@],$(SED),g' \
 	      -e 's,[@]DD[@],$(DD),g' \
 	      -e 's,[@]MKTEMP[@],$(MKTEMP),g' \
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index eec6c2c..e95bc5d 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -77,7 +77,7 @@ test $reply -eq 0 || { errno=1
 #
 tell='hash 7M
 hash 12k'
-reply=`echo "$tell" | $FTP -v | $GREP -c -e 12288 -e 7340032`
+reply=`echo "$tell" | $FTP -v | $EGREP -c '12288|7340032'`
 
 test $reply -eq 2 || { errno=1
   echo >&2 'Failed to parse step sizes for hash printing.'; }
diff --git a/tests/ifconfig_modes.sh b/tests/ifconfig_modes.sh
index 3ea8dcf..cbd8521 100644
--- a/tests/ifconfig_modes.sh
+++ b/tests/ifconfig_modes.sh
@@ -127,7 +127,7 @@ make_setup () {
 
   # Change setup whenever the address is in use.
   get_gnu_output |
-    grep "inet address  $ADDRESS1_PATTERN" >/dev/null 2>&1 &&
+    $GREP "inet address  $ADDRESS1_PATTERN" >/dev/null 2>&1 &&
       ADDRESS=$ADDRESS2 ADDRESS_PATTERN=$ADDRESS2_PATTERN \
       BRDADDR=$BRDADDR2 BRDADDR_PATTERN=$BRDADDR2_PATTERN \
       NETMASK=$NETMASK2 NETMASK_HEX=$NETMASK2_HEX \
@@ -148,7 +148,7 @@ increase_status () {
 
 check_output () {
   echo "$OUTPUT" |
-  grep "$1" > /dev/null || { echo >&2 "$2"; increase_status; }
+  $GREP "$1" > /dev/null || { echo >&2 "$2"; increase_status; }
 }
 
 #
@@ -162,8 +162,8 @@ $silence cat <<-HERE
 $IFCONFIG -i $IFACE --down >/dev/null
 OUTPUT=`get_gnu_output`
 
-echo "$OUTPUT" | grep flags |
-  grep -v "flags         UP" >/dev/null ||
+echo "$OUTPUT" | $GREP flags |
+  $GREP -v "flags         UP" >/dev/null ||
     { echo >&2 'Failed to bring interface down with switch.'
       increase_status
     }
@@ -197,7 +197,7 @@ check_output	"flags         UP" \
 # Diagnose a failure to implicitly bring the interface up.
 #
 echo "$OUTPUT" |
-  grep "flags         UP" >/dev/null 2>&1 ||
+  $GREP "flags         UP" >/dev/null 2>&1 ||
     {
       $silence cat <<-HERE
 	** Set only address and explicit 'up' switches:
@@ -212,7 +212,7 @@ echo "$OUTPUT" |
 
       # As a last resort, try a single imperative 'up'.
       echo "$OUTPUT" |
-	grep "flags         UP" >/dev/null 2>&1 ||
+	$GREP "flags         UP" >/dev/null 2>&1 ||
 	  {
 	    $silence cat <<-HERE
 		** Apply a single switch:
@@ -222,7 +222,7 @@ echo "$OUTPUT" |
 	    $IFCONFIG --interface=$IFACE --up >/dev/null
 	    OUTPUT=`get_gnu_output`
 
-	    if echo "$OUTPUT" | grep "flags         UP" >/dev/null 2>&1
+	    if echo "$OUTPUT" | $GREP "flags         UP" >/dev/null 2>&1
 	    then
 	      echo >&2 '!!! This platform needs "--up" in splendid isolation.'
 	    else
@@ -263,8 +263,8 @@ $IFCONFIG --interface=$IFACE --down >/dev/null
 OUTPUT=`get_gnu_output`
 
 # The absence of the flag UP indicates success.
-echo "$OUTPUT" | grep flags |
-  grep -v "flags         UP" >/dev/null ||
+echo "$OUTPUT" | $GREP flags |
+  $GREP -v "flags         UP" >/dev/null ||
     { echo >&2 'Failed to bring interface down with "--down".'
       increase_status
     }
@@ -293,8 +293,8 @@ $silence cat <<-HERE
 $IFCONFIG $IFACE down >/dev/null
 OUTPUT=`get_gnu_output`
 
-echo "$OUTPUT" | grep flags |
-  grep -v "flags         UP" >/dev/null ||
+echo "$OUTPUT" | $GREP flags |
+  $GREP -v "flags         UP" >/dev/null ||
     { echo >&2 'Failed to bring interface down with directive.'
       increase_status
     }
@@ -327,7 +327,7 @@ check_output	"flags         UP" \
 # Diagnose this last failure.
 #
 echo "$OUTPUT" |
-  grep "flags         UP" >/dev/null 2>&1 ||
+  $GREP "flags         UP" >/dev/null 2>&1 ||
     {
       $silence cat <<-HERE
 	** Set only address and explicit 'up' switches:
@@ -342,7 +342,7 @@ echo "$OUTPUT" |
 
       # As a last resort, try a single imperative 'up'.
       echo "$OUTPUT" |
-	grep "flags         UP" >/dev/null 2>&1 ||
+	$GREP "flags         UP" >/dev/null 2>&1 ||
 	  {
 	    $silence cat <<-HERE
 		** Apply a single switch:
@@ -352,7 +352,7 @@ echo "$OUTPUT" |
 	    $IFCONFIG $IFACE up >/dev/null
 	    OUTPUT=`get_gnu_output`
 
-	    if echo "$OUTPUT" | grep "flags         UP" >/dev/null 2>&1
+	    if echo "$OUTPUT" | $GREP "flags         UP" >/dev/null 2>&1
 	    then
 	      echo >&2 '!!! This platform needs specific "ifconfig '$IFACE' up".'
 	    else
diff --git a/tests/inetd.sh b/tests/inetd.sh
index fe39360..e1d78ba 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -170,7 +170,7 @@ else
     for nn in 1 2 3 4 5; do
 	# Check for response at chosen port.
 	$TCPGET $TARGET $PORT 2>/dev/null |
-	    grep "Your address is $TARGET." >/dev/null 2>&1 || errno=1
+	    $GREP "Your address is $TARGET." >/dev/null 2>&1 || errno=1
 
 	test $errno -eq 0 ||
 	    { cat >&2 <<-EOT
diff --git a/tests/libls.sh b/tests/libls.sh
index 64902cb..d379cdb 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -85,7 +85,7 @@ errno=0
 diff=`{ echo "$REPLY_a1"; echo "$REPLY_A1"; } | sort | uniq -u`
 
 test `echo "$diff" | wc -l` -eq 2 &&
-test `echo "$diff" | grep -c -v -e '^\.\{1,2\}$'` -eq 0 ||
+test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 ||
   { errno=1; echo >&2 'Failed to tell switch -a apart from -A.'
     # Attempt a diagnosis.
     if test -z "$diff"; then
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 8a1e964..563b516 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -591,7 +591,7 @@ COUNT=`$GREP -c "$TAG" "$OUT"`
 # All notices in $OUT_NOTICE should be present also in $OUT.
 # Assign value 1 to full outcome.
 COUNT_NOTICE=`$SED -n '$=' "$OUT_NOTICE"`
-wrapped=`$GREP -c -f "$OUT_NOTICE" "$OUT"`
+wrapped=`$FGREP -c -f "$OUT_NOTICE" "$OUT"`
 
 COUNT_WRAP=0
 if $do_unix_socket || $do_inet_socket; then
@@ -601,9 +601,7 @@ fi
 # Second set-up after SIGHUP.
 COUNT2=`$GREP -c "$TAG2" "$OUT_USER"`
 COUNT3=`$GREP -c "$TAG2" "$OUT_DEBUG"`
-COUNT4=`$GREP -c -e "$TAG2.*Default facility" \
-		 -e "$TAG2.*Fake kern facility" \
-		 -e "$TAG2.*Illegal facility" \
+COUNT4=`$EGREP -c "$TAG2.*(Default|Fake kern|Illegal) facility" \
 	"$OUT_UNOTICE"`
 COUNT5=`$GREP -c "$TAG2" "$OUT_LOCAL0"`
 
@@ -614,7 +612,7 @@ COUNT2_debug=`$GREP -c "$TAG2.*user.debug" "$OUT_USER"`
 COUNT3_info=`$GREP -c "$TAG2.*user.info" "$OUT_DEBUG"`
 
 # No info or debug message should enter with selector 'user.=notice'.
-COUNT4_notice=`$GREP -c -e "$TAG2.*user.info" -e "$TAG2.*user.debug" \
+COUNT4_notice=`$EGREP -c "$TAG2.*user.(info|debug)" \
 		"$OUT_UNOTICE"`
 # Undefined facility should overwrite also the priority.
 COUNT4_illegal=`$GREP -c "$TAG2.*Illegal facility" "$OUT_USER"`
@@ -670,12 +668,12 @@ else
 
     # local socket transport
     if $do_unix_socket; then
-	if grep "$TAG2.*info.*BSD" "$OUT_USER" >/dev/null 2>&1; then
+	if $GREP "$TAG2.*info.*BSD" "$OUT_USER" >/dev/null 2>&1; then
 	    :
 	else
 	    echo >&2 '** UDP socket did not convey info msg after HUP.'
 	fi
-	if grep "$TAG2.*debug.*BSD" "$OUT_DEBUG" >/dev/null 2>&1; then
+	if $GREP "$TAG2.*debug.*BSD" "$OUT_DEBUG" >/dev/null 2>&1; then
 	    :
 	else
 	    echo >&2 '** UDP socket did not convey debug msg after HUP.'
@@ -684,12 +682,12 @@ else
 
     # UDP transport
     if $do_inet_socket; then
-	if grep "$TAG2.*info.*IPv" "$OUT_USER" >/dev/null 2>&1; then
+	if $GREP "$TAG2.*info.*IPv" "$OUT_USER" >/dev/null 2>&1; then
 	    :
 	else
 	    echo >&2 '** IP socket did not convey info msg after HUP.'
 	fi
-	if grep "$TAG2.*debug.*IPv" "$OUT_DEBUG" >/dev/null 2>&1; then
+	if $GREP "$TAG2.*debug.*IPv" "$OUT_DEBUG" >/dev/null 2>&1; then
 	    :
 	else
 	    echo >&2 '** IP socket did not convey debug msg after HUP.'
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 258d4eb..9d4217a 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -18,6 +18,8 @@
 # Helpers and supporting functionality for test scripts.
 
 GREP=${GREP:-@GREP@}
+EGREP=${EGREP:-@EGREP@}
+FGREP=${FGREP:-@FGREP@}
 SED=${SED:-@SED@}
 DD=${DD:-@DD@}
 MKTEMP=${MKTEMP:-@MKTEMP@}

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

Summary of changes:
 ChangeLog               | 16 ++++++++++++++++
 configure.ac            |  4 ++++
 tests/Makefile.am       |  2 ++
 tests/ftp-parser.sh     |  2 +-
 tests/ifconfig_modes.sh | 28 ++++++++++++++--------------
 tests/inetd.sh          |  2 +-
 tests/libls.sh          |  2 +-
 tests/syslogd.sh        | 16 +++++++---------
 tests/tools.sh.in       |  2 ++
 9 files changed, 48 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jan 11 19:20:45 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iqQzl-0000iB-DO
	for mharc-commit-inetutils@gnu.org; Sat, 11 Jan 2020 19:20:45 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:44387)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iqQzg-0000fx-2G
 for commit-inetutils@gnu.org; Sat, 11 Jan 2020 19:20:43 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:43072)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iqQzf-0004KW-G6
 for commit-inetutils@gnu.org; Sat, 11 Jan 2020 19:20:39 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 549D22128E; Sat, 11 Jan 2020 19:20:39 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-56-g1a12dcb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 522101f499c0262d702e6aaf2f1165b1616bc45e
X-Git-Newrev: 1a12dcb381d7e64439e95d47938b6a427b10d5b8
Message-Id: <20200112002039.549D22128E@vcs0.savannah.gnu.org>
Date: Sat, 11 Jan 2020 19:20:38 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Sun, 12 Jan 2020 00:20:43 -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  1a12dcb381d7e64439e95d47938b6a427b10d5b8 (commit)
       via  ef0361c6474f16f244433af3385542a3765ceec1 (commit)
      from  522101f499c0262d702e6aaf2f1165b1616bc45e (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=1a12dcb381d7e64439e95d47938b6a427b10d5b8


commit 1a12dcb381d7e64439e95d47938b6a427b10d5b8
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Jan 12 01:15:44 2020 +0100

    Confirm that rcmd functionality is present at all.
    
    Imbedded systems like Alpine Linux with musl libc see no reason
    to offer any rcmd variant.  Adapt to this fact, as reported by
    Assaf Gordon and by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 4171ce2..dbae841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2020-01-12  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Suppress building of remote execution commands on systems that
+	offer no rcmd functionality.  This happens with embedded systems
+	like Alpine Linux and musl libc, as reported by Assaf Gordon and
+	Bruno Haible.
+
+	* configure.ac: Check for function rcmd().  Disable building
+	of `rcp', `rlogin', and `rsh' when no rcmd variant is present.
+	(WITH_RCMD): New precompiler macro.
+
 2020-01-11  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	The glibc manual page for ether address specifies <netinet/ether.h>.
diff --git a/configure.ac b/configure.ac
index 0a45381..d6c4410 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,6 +255,15 @@ else
   IU_DISABLE_TARGET(talk)
 fi
 
+# The function rcmd() is crucial for remote shells, but is not
+# always implemented in libraries intended for embedded systems.
+# Check for its availability in order to later disable our rcp,
+# rlogin, and rsh when no alternative is present.
+AC_CHECK_FUNC(rcmd, , , [#include <netdb.h>])
+if test "$ac_cv_func_rcmd" = yes; then
+  AC_DEFINE([WITH_RCMD], 1, [Define to one if you can use rcmd.])
+fi
+
 # NetBSD offers orcmd() and orcmd_af() for getting
 # exactly the functionality that rcmd() and rcmd_af()
 # offer on all other targetted systems.
@@ -310,6 +319,16 @@ else
   fi
 fi
 
+# Disable targets rcp, rlogin, and rsh when no rcmd variant is available.
+if test "$ac_cv_func_rcmd" != yes \
+   && test "$ac_cv_func_orcmd" != yes \
+   && test "$ac_cv_func_rcmd_af" != yes \
+   && "$ac_cv_func_orcmd_af" != yes
+then
+  IU_DISABLE_TARGET(rcp)
+  IU_DISABLE_TARGET(rlogin)
+  IU_DISABLE_TARGET(rsh)
+fi
 
 # FIXME: Make this test case a bit more robust.  Remove KRB4
 LIBAUTH=

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


commit ef0361c6474f16f244433af3385542a3765ceec1
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jan 11 23:17:15 2020 +0100

    Change header inclusion for ifconfig on GNU/Linux.
    
    Conform to manual page recipe for ether_hostton(), attempting
    to succeed on systems with musl libc.  Reported by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index d1e49ad..4171ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2020-01-11  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	The glibc manual page for ether address specifies <netinet/ether.h>.
+	Use this for GNU/Linux in the hope of resolving also musl libc, as
+	used with Alpine Linux.  Reported by Bruno Haible.
+
+	* ifconfig/system/linux.c [HAVE_NETINET_ETHER_H]: Include the
+	library header <netinet/ether.h> instead of the system specific
+	header <linux/if_ether.h>.
+
+2020-01-11  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Consistent use of `grep' tools in scripts.
 
 	* configure.ac (EGREP, FGREP): New and precious variables.
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index 9aa087a..058374c 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -41,7 +41,9 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-#include <linux/if_ether.h>
+#ifdef HAVE_NETINET_ETHER_H
+# include <netinet/ether.h>
+#endif
 
 #include <read-file.h>
 #include <unused-parameter.h>

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

Summary of changes:
 ChangeLog               | 21 +++++++++++++++++++++
 configure.ac            | 19 +++++++++++++++++++
 ifconfig/system/linux.c |  4 +++-
 3 files changed, 43 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jan 13 14:37:22 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1ir5Wc-0002VI-RE
	for mharc-commit-inetutils@gnu.org; Mon, 13 Jan 2020 14:37:22 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:39310)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1ir5WX-0002V2-Gj
 for commit-inetutils@gnu.org; Mon, 13 Jan 2020 14:37:20 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:54761)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1ir5WX-0008SO-5G
 for commit-inetutils@gnu.org; Mon, 13 Jan 2020 14:37:17 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 101C0212AE; Mon, 13 Jan 2020 14:37:17 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-57-g0f16be1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1a12dcb381d7e64439e95d47938b6a427b10d5b8
X-Git-Newrev: 0f16be18bae91af41a2ae538e0066f2c9ee7d907
Message-Id: <20200113193717.101C0212AE@vcs0.savannah.gnu.org>
Date: Mon, 13 Jan 2020 14:37:16 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Mon, 13 Jan 2020 19:37:20 -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  0f16be18bae91af41a2ae538e0066f2c9ee7d907 (commit)
      from  1a12dcb381d7e64439e95d47938b6a427b10d5b8 (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=0f16be18bae91af41a2ae538e0066f2c9ee7d907


commit 0f16be18bae91af41a2ae538e0066f2c9ee7d907
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jan 13 20:33:58 2020 +0100

    Attempt to build correctly on Cygwin.
    
    Solution suggested by Bruno Haible for release candidate 1.9.5 rc1.

diff --git a/ChangeLog b/ChangeLog
index dbae841..89dcb86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-01-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Attempt to build correctly on Cygwin, new and old. Reported
+	and suggested by Bruno Haible in
+	https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00013.html
+
+	* configure.ac: Check for header <arpa/tftp.h>.  When it is
+	missing disable the targets `tftp', and `tftpd'.
+	* am/enable.m4 (IU_ENABLE_FOO): Append $EXEEXT to `target_BUILD'.
+
 2020-01-12  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Suppress building of remote execution commands on systems that
diff --git a/am/enable.m4 b/am/enable.m4
index 05b864e..8158f82 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -22,7 +22,7 @@ AC_DEFUN([IU_ENABLE_FOO],
  [AC_ARG_ENABLE($1, AS_HELP_STRING([--disable-$1], [don't compile $1]), ,
                 [enable_]$1[=$enable_]$2)
 [if test "$enable_$1" = yes; then
-   $1_BUILD=$1
+   $1_BUILD=$1$EXEEXT
    $1_INSTALL_HOOK="install-$1-hook"
 else
    $1_BUILD=''
diff --git a/configure.ac b/configure.ac
index d6c4410..671e175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -615,7 +615,7 @@ AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_DIRENT
 
-AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \
+AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.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 \
 		  security/pam_appl.h shadow.h \
@@ -639,9 +639,16 @@ AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \
 # include <sys/param.h>
 #endif
 ]
-
 )
 
+# Recent Cygwin 2.9 has dropped <arpa/tftp.h>.  Other systems
+# might take similar steps.
+if test "$ac_cv_header_arpa_tftp_h" = no; then
+  AC_MSG_WARN([arpa/tftp.h is not available: not building tftp, nor tftpd])
+  IU_DISABLE_TARGET(tftp)
+  IU_DISABLE_TARGET(tftpd)
+fi
+
 ### Checks for types.
 
 # Checks return type of signal handlers

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

Summary of changes:
 ChangeLog    | 10 ++++++++++
 am/enable.m4 |  2 +-
 configure.ac | 11 +++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jan 13 15:18:51 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1ir6Al-0001Mh-8m
	for mharc-commit-inetutils@gnu.org; Mon, 13 Jan 2020 15:18:51 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:48050)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1ir6Ai-0001ML-9J
 for commit-inetutils@gnu.org; Mon, 13 Jan 2020 15:18:49 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:55337)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1ir6Ah-0002v2-Uj
 for commit-inetutils@gnu.org; Mon, 13 Jan 2020 15:18:47 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id CB64A212AE; Mon, 13 Jan 2020 15:18:47 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-58-gfbf995f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0f16be18bae91af41a2ae538e0066f2c9ee7d907
X-Git-Newrev: fbf995f5233506addac7a430580227e185416638
Message-Id: <20200113201847.CB64A212AE@vcs0.savannah.gnu.org>
Date: Mon, 13 Jan 2020 15:18:47 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Mon, 13 Jan 2020 20:18:49 -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  fbf995f5233506addac7a430580227e185416638 (commit)
      from  0f16be18bae91af41a2ae538e0066f2c9ee7d907 (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=fbf995f5233506addac7a430580227e185416638


commit fbf995f5233506addac7a430580227e185416638
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jan 13 21:15:24 2020 +0100

    Insufficient linking for talkd.
    
    Bruno Haible discovered incomplete linking for the Gnulib module `regex'.

diff --git a/ChangeLog b/ChangeLog
index 89dcb86..e5b6651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2020-01-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	The Gnulib module `regex' requires linking that was not made
+	explicit in our source.  Discovered by Bruno Haible with AIX 7.2.
+	https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00012.html
+
+	* talkd/Makefile.am (LD_ADD): Add $(LIBTHREAD) and $(LIB_MBRTOWC).
+
+2020-01-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Attempt to build correctly on Cygwin, new and old. Reported
 	and suggested by Bruno Haible in
 	https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00013.html
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index 4eda4d4..2dd6d96 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
 	$(PATHDEF_DEV) \
 	$(PATHDEF_TTY_PFX) $(PATHDEF_UTMP) $(PATHDEF_UTMPX)
 
-LDADD = $(iu_LIBRARIES)
+LDADD = $(iu_LIBRARIES) $(LIBTHREAD) $(LIB_MBRTOWC)
 
 inetdaemondir = @inetdaemondir@
 

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

Summary of changes:
 ChangeLog         | 8 ++++++++
 talkd/Makefile.am | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Jan 14 09:05:37 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1irMp7-0007W0-7c
	for mharc-commit-inetutils@gnu.org; Tue, 14 Jan 2020 09:05:37 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:54076)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1irMp3-0007SB-2G
 for commit-inetutils@gnu.org; Tue, 14 Jan 2020 09:05:34 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:44005)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1irMp1-0004Ue-Fo
 for commit-inetutils@gnu.org; Tue, 14 Jan 2020 09:05:32 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 670C720E57; Tue, 14 Jan 2020 09:05:31 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-59-g0c86f00
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fbf995f5233506addac7a430580227e185416638
X-Git-Newrev: 0c86f004feb5fb21ab871dff983ec390d78a2f7b
Message-Id: <20200114140531.670C720E57@vcs0.savannah.gnu.org>
Date: Tue, 14 Jan 2020 09:05:31 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Tue, 14 Jan 2020 14:05:34 -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  0c86f004feb5fb21ab871dff983ec390d78a2f7b (commit)
      from  fbf995f5233506addac7a430580227e185416638 (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=0c86f004feb5fb21ab871dff983ec390d78a2f7b


commit 0c86f004feb5fb21ab871dff983ec390d78a2f7b
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Jan 14 15:02:01 2020 +0100

    Test running ftp-parser checks enhanced path.
    
    On Darwin systems the local directory is prepended with a path,
    independent of user wish.  Reported by Assaf Gordon.

diff --git a/ChangeLog b/ChangeLog
index e5b6651..e0438ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-01-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Make test of ftp-parser slightly more forgiving.  Darwin systems
+	might prepend a path stem to local directory.  Assaf Gordon reported
+	https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00005.html
+
+	* tests/ftp-parser.sh: Check number of responses to mixed command
+	list, and extract any prepended path resulting from `lcd'.
+	(DIR_STEM): New variable.  This modifies matching test after `lpwd'.
+
 2020-01-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	The Gnulib module `regex' requires linking that was not made
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index e95bc5d..f7491b7 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -97,7 +97,15 @@ reply=`echo "$tell" | $FTP`
 
 test `echo "$reply" | $SED -n '$='` \
      -eq `echo "$tell" | $SED -n '$='` \
-&& test `echo "$reply" | $GREP -c 'Local directory is /tmp'` -eq 1 \
+|| { errno=1; echo >&2 'Some command in mixed list produced no response.'; }
+
+# At least Darwin has been known to prepend a directory stem.
+DIR_STEM=`echo "$reply" | $SED -n 's,Local directory now \([^ ]*\)/tmp$,\1,p'`
+
+test -z "$DIR_STEM" \
+|| $silence echo "This system prepends a directory stem: $DIR_STEM"
+
+test `echo "$reply" | $GREP -c "Local directory is $DIR_STEM/tmp"` -eq 1 \
 || { errno=1; echo >&2 'Failed to set local directory.'; }
 
 # Summary of work.

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

Summary of changes:
 ChangeLog           | 10 ++++++++++
 tests/ftp-parser.sh | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jan 18 11:48:26 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1isrGr-0003jr-4z
	for mharc-commit-inetutils@gnu.org; Sat, 18 Jan 2020 11:48:26 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:36884)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1isrGm-0003h7-Cj
 for commit-inetutils@gnu.org; Sat, 18 Jan 2020 11:48:22 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:53965)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1isrGm-0006mh-0Y
 for commit-inetutils@gnu.org; Sat, 18 Jan 2020 11:48:20 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id D594620CCC; Sat, 18 Jan 2020 11:48:19 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-60-g71ece60
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0c86f004feb5fb21ab871dff983ec390d78a2f7b
X-Git-Newrev: 71ece60ff8e8542f1dab59456f63edf1a0a371fd
Message-Id: <20200118164819.D594620CCC@vcs0.savannah.gnu.org>
Date: Sat, 18 Jan 2020 11:48:19 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Sat, 18 Jan 2020 16:48:22 -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  71ece60ff8e8542f1dab59456f63edf1a0a371fd (commit)
      from  0c86f004feb5fb21ab871dff983ec390d78a2f7b (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=71ece60ff8e8542f1dab59456f63edf1a0a371fd


commit 71ece60ff8e8542f1dab59456f63edf1a0a371fd
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jan 18 17:47:05 2020 +0100

    Minor portability glitches in Solaris and in AIX.

diff --git a/ChangeLog b/ChangeLog
index e0438ee..0bad4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-01-18  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Minor portability glitches in Solaris and in AIX.
+
+	* am/libcurses.m4 (IU_LIB_TERMCAP) [!_XOPEN_CURSES]: Conditionally
+	include the header <term.h>.
+	* telnet/telnet.c [HAVE_CURSES_TGETENT & !_XOPEN_CURSES]: Likewise.
+	* telnetd/utility.c [HAVE_CURSES_TGETENT & !_XOPEN_CURSES]: Likewise.
+
+	* ftp/ftp.c (h_errno): Delete declaration, not in use.
+	* ftpd/ftpd.c (FTP_NAMES): Assign a value to this macro.
+
 2020-01-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Make test of ftp-parser slightly more forgiving.  Darwin systems
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 73e9fc2..54d2b41 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -81,8 +81,11 @@ dnl including ncurses (unless --disable ncurses is specified), curses (which
 dnl does so on some systems), termcap, and termlib.  If termcap is found, then
 dnl LIBTERMCAP is defined with the appropriate linker specification.
 dnl
-dnl Solaris is known to use libtermcap for tgetent, but to declare tgetent
-dnl in <term.h>!
+dnl Solaris is known to offer tgetent encapsulated in libtermcap, but to
+dnl declare tgetent also in <term.h>!  When X/Open Curses is present as
+dnl primary implementation, the header file <term.h> is included already
+dnl in <curses.h>, and the first available <term.h> may in fact cause
+dnl contradictions.
 dnl
 AC_DEFUN([IU_LIB_TERMCAP], [
   AC_REQUIRE([IU_LIB_NCURSES])
@@ -106,7 +109,9 @@ AC_DEFUN([IU_LIB_TERMCAP], [
        location_tgetent=termcap.h],
       [AC_LINK_IFELSE(
 	[AC_LANG_PROGRAM([[#include <curses.h>
-#include <term.h>]],
+#ifndef _XOPEN_CURSES
+# include <term.h>
+#endif]],
 	  [[(void) tgetent((char *) 0, (char *) 0);]])],
 	[AC_DEFINE([HAVE_CURSES_TGETENT], 1,
 	  [Define to 1 if tgetent() exists in <term.h>.])
@@ -122,7 +127,9 @@ AC_DEFUN([IU_LIB_TERMCAP], [
     else
       AC_CHECK_LIB(curses, tgetent, LIBTERMCAP=-lcurses)
       AC_CHECK_DECLS([tgetent], , , [[#include <curses.h>
-#include <term.h>]])
+#ifndef _XOPEN_CURSES
+# include <term.h>
+#endif]])
       if test "$ac_cv_lib_curses_tgetent" = yes \
 	  && test "$ac_cv_have_decl_tgetent" = yes; then
 	AC_DEFINE([HAVE_CURSES_TGETENT], 1)
diff --git a/ftp/ftp.c b/ftp/ftp.c
index e003a9b..0dd19b3 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -98,8 +98,6 @@ extern int fclose (FILE *);
 extern int pclose (FILE *);
 #endif
 
-extern int h_errno;
-
 int data = -1;
 int abrtflag = 0;
 jmp_buf ptabort;
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index b5b786c..08ff522 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -66,7 +66,7 @@
 # include <netinet/ip.h>
 #endif
 
-#define FTP_NAMES
+#define FTP_NAMES 1
 #include <arpa/ftp.h>
 #include <arpa/inet.h>
 #include <arpa/telnet.h>
diff --git a/telnet/telnet.c b/telnet/telnet.c
index c42bef1..f42957e 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -75,7 +75,9 @@
 # include <termcap.h>
 #elif defined HAVE_CURSES_TGETENT
 # include <curses.h>
-# include <term.h>
+# ifndef _XOPEN_CURSES
+#  include <term.h>
+# endif
 #endif
 
 #ifdef AUTHENTICATION
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 5bd879d..dc87e9a 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -39,7 +39,9 @@
 # include <termcap.h>
 #elif defined HAVE_CURSES_TGETENT
 # include <curses.h>
-# include <term.h>
+# ifndef _XOPEN_CURSES
+#  include <term.h>
+# endif
 #endif
 
 #if defined HAVE_STREAMSPTY && defined HAVE_GETMSG	\

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

Summary of changes:
 ChangeLog         | 12 ++++++++++++
 am/libcurses.m4   | 15 +++++++++++----
 ftp/ftp.c         |  2 --
 ftpd/ftpd.c       |  2 +-
 telnet/telnet.c   |  4 +++-
 telnetd/utility.c |  4 +++-
 6 files changed, 30 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jan 20 10:48:54 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1itZIK-0005y1-BR
	for mharc-commit-inetutils@gnu.org; Mon, 20 Jan 2020 10:48:53 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:52546)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1itZI8-0005uu-IT
 for commit-inetutils@gnu.org; Mon, 20 Jan 2020 10:48:46 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:39552)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1itZI8-0001EQ-5g
 for commit-inetutils@gnu.org; Mon, 20 Jan 2020 10:48:40 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 0CAC921148; Mon, 20 Jan 2020 10:48:40 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-61-g3c908f3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 71ece60ff8e8542f1dab59456f63edf1a0a371fd
X-Git-Newrev: 3c908f3420ac0e29edcf7511fbc5665960cc7124
Message-Id: <20200120154840.0CAC921148@vcs0.savannah.gnu.org>
Date: Mon, 20 Jan 2020 10:48:39 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Mon, 20 Jan 2020 15:48:49 -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  3c908f3420ac0e29edcf7511fbc5665960cc7124 (commit)
      from  71ece60ff8e8542f1dab59456f63edf1a0a371fd (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=3c908f3420ac0e29edcf7511fbc5665960cc7124


commit 3c908f3420ac0e29edcf7511fbc5665960cc7124
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jan 20 16:38:05 2020 +0100

    Test robustly in absence of IPv6.
    
    A system like Raspbian can be configured without IPv6 at runtime.
    Suppress IPv6 addresses in test scripts, whenever IPv6 is auto-inserted
    and a check at test execution time fails for `::1'.  Issue was reported
    by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 0bad4f7..6eaeecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2020-01-20  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Test robustly in absence of IPv6.
+	For systems without functional IPv6 addressing at runtime,
+	suppress this address family in our tests, whenever IPv6 was
+	configured as autodetected.  Helpful answer by Bruno Haible
+	originating from effects in a Raspbian system:
+	https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00021.html
+
+	* tests/Makefile.am (check_PROGRAMS): Add `runtime-ipv6'.
+	* tests/ftp-localhost.sh (RUNTIME_IPV6): New variable.
+	[TEST_IPV6 == auto]: Set TEST_IPV6 to `no' when runtime presence
+	of IPv6 is in the negative.  Thus effectively inhibiting all use
+	within this script of IPv6 addresses.
+	* tests/ping-localhost.sh: Likewise.
+	* tests/syslogd.sh: Likewise.
+	* tests/telnet-localhost.sh: Likewise.
+	* tests/tftp.sh: Likewise.
+	* tests/runtime-ipv6.c: New file.
+
+	* configure.ac (AC_ISC_POSIX): Delete obsolete test.
+
 2020-01-18  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Minor portability glitches in Solaris and in AIX.
diff --git a/configure.ac b/configure.ac
index 671e175..d5fdea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,8 +123,6 @@ IU_ENABLE_CLIENT(traceroute)
 
 AM_SILENT_RULES([yes])
 
-AC_ISC_POSIX
-
 ### Checks for programs.
 AC_PROG_CC
 gl_EARLY
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 817a808..8d87bc7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ LDADD = $(iu_LIBRARIES)
 noinst_PROGRAMS = identify
 identify_LDADD = $(top_builddir)/lib/libgnu.a $(LIBUTIL)
 
-check_PROGRAMS = localhost readutmp waitdaemon
+check_PROGRAMS = localhost readutmp runtime-ipv6 waitdaemon
 
 dist_check_SCRIPTS = utmp.sh
 
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index a73b426..90acd74 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -51,6 +51,8 @@ set -e
 
 . ./tools.sh
 
+RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+
 FTP=${FTP:-../ftp/ftp$EXEEXT}
 FTPD=${FTPD:-../ftpd/ftpd$EXEEXT}
 INETD=${INETD:-../src/inetd$EXEEXT}
@@ -222,6 +224,12 @@ locate_port () {
     fi
 }
 
+# Avoid IPv6 when not functional.
+if test "$TEST_IPV6" = "auto"; then
+    $RUNTIME_IPV6 || { TEST_IPV6="no"
+	echo "Suppressing non-supported IPv6."; }
+fi
+
 # Files used in transmission tests.
 GETME=`$MKTEMP $TMPDIR/file.XXXXXXXX` || do_transfer=false
 
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 793c754..e091cbc 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -25,6 +25,8 @@
 
 . ./tools.sh
 
+RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+
 PING=${PING:-../ping/ping$EXEEXT}
 TARGET=${TARGET:-127.0.0.1}
 
@@ -46,6 +48,12 @@ if [ `func_id_uid` != 0 ]; then
     exit 77
 fi
 
+# Avoid IPv6 when not functional.
+if test "$TEST_IPV6" = "auto"; then
+    $RUNTIME_IPV6 || { TEST_IPV6="no"
+	echo "Suppressing non-supported IPv6."; }
+fi
+
 errno=0
 errno2=0
 
diff --git a/tests/runtime-ipv6.c b/tests/runtime-ipv6.c
new file mode 100644
index 0000000..17d399a
--- /dev/null
+++ b/tests/runtime-ipv6.c
@@ -0,0 +1,81 @@
+/* runtime-ipv6 - Check that system is able to set IPv6 address.
+  Copyright (C) 2020 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Mats Erik Andersson.  */
+
+/* Runtime-ipv6 determines whether IPv6 address ::1 can be selected.
+ *
+ * Invocation:
+ *
+ *   runtime-ipv6
+ *
+ * Return value is 0 (zero) when successful, otherwise -1.
+ * On failure a message is printed to stderr: `IPv6 disabled in system'.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <netdb.h>
+
+#include <progname.h>
+
+#define RESOLVE_OK            0
+#define RESOLVE_FAIL         -1
+
+int
+main (int argc, char *argv[])
+{
+  int err;
+  struct sockaddr_storage ss;
+  struct addrinfo hints, *aiptr;
+
+  set_program_name (argv[0]);
+
+  memset (&hints, 0, sizeof (hints));
+  hints.ai_family = PF_INET6;
+  hints.ai_socktype = SOCK_DGRAM;
+  hints.ai_flags = AI_NUMERICHOST;
+
+  err = getaddrinfo ("::1", "tftp", &hints, &aiptr);
+  if (!err)
+    {
+      /* Should not really happen.  */
+      if (aiptr == NULL)
+	err = 1;
+
+      freeaddrinfo (aiptr);
+    }
+
+  if (err)
+    {
+      /* Not able to select localhost as IPv6.  */
+      fprintf (stderr, "IPv6 is disabled in this running system!");
+
+      return RESOLVE_FAIL;
+    }
+
+  return RESOLVE_OK;
+}
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 563b516..107b520 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -96,6 +96,8 @@ if test "$IU_OS" = "Linux" || test "$IU_OS" = "SunOS"; then
     iu_socklen_max=108
 fi
 
+RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+
 # The executables under test.
 #
 SYSLOGD=${SYSLOGD:-../src/syslogd$EXEEXT}
@@ -188,6 +190,12 @@ clean_testdir () {
 #
 trap clean_testdir EXIT HUP INT QUIT TERM
 
+# Avoid IPv6 when not functional.
+if test "$TEST_IPV6" = "auto"; then
+    $RUNTIME_IPV6 || { TEST_IPV6="no"
+	$silence echo "Suppressing non-supported IPv6."; }
+fi
+
 # Test at this port.
 # Standard is syslog at 514/udp.
 PROTO=udp
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index a5e356d..f975c0f 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -53,6 +53,8 @@ fi
 
 $need_mktemp || exit_no_mktemp
 
+RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+
 # The executables under test.
 #
 INETD=${INETD:-../src/inetd$EXEEXT}
@@ -132,6 +134,12 @@ trap posttesting EXIT HUP INT QUIT TERM
 
 PORT=`expr 4973 + ${RANDOM:-$$} % 973`
 
+# Avoid IPv6 when not functional.
+if test "$TEST_IPV6" = "auto"; then
+    $RUNTIME_IPV6 || { TEST_IPV6="no"
+	echo "Suppressing non-supported IPv6."; }
+fi
+
 cat > "$INETD_CONF" <<-EOF ||
 	$TARGET:$PORT stream tcp4 nowait $USER $ADDRPEEK addrpeek addr
 EOF
diff --git a/tests/tftp.sh b/tests/tftp.sh
index c449312..2f6366a 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -68,6 +68,8 @@ fi
 # Portability fix for SVR4
 PWD="${PWD:-`pwd`}"
 
+RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+
 TFTP="${TFTP:-../src/tftp$EXEEXT}"
 TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
 INETD="${INETD:-../src/inetd$EXEEXT}"
@@ -156,6 +158,12 @@ if test "$ADDRESSES" = "sense"; then
 	-e "s/^.*$AF \([:.0-9]\{1,\}\) .*$/\1/g"`
 fi
 
+# Avoid IPv6 when not functional.
+if test "$TEST_IPV6" = "auto"; then
+    $RUNTIME_IPV6 || { TEST_IPV6="no"
+	$silence echo "Suppressing non-supported IPv6."; }
+fi
+
 if test -z "$ADDRESSES"; then
     ADDRESSES="${TARGET:-127.0.0.1}"
     test "$TEST_IPV6" = "no" || ADDRESSES="$ADDRESSES ${TARGET6:-::1}"

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

Summary of changes:
 ChangeLog                 | 22 +++++++++++++
 configure.ac              |  2 --
 tests/Makefile.am         |  2 +-
 tests/ftp-localhost.sh    |  8 +++++
 tests/ping-localhost.sh   |  8 +++++
 tests/runtime-ipv6.c      | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/syslogd.sh          |  8 +++++
 tests/telnet-localhost.sh |  8 +++++
 tests/tftp.sh             |  8 +++++
 9 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 tests/runtime-ipv6.c


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 22 10:46:55 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iuIDX-0000UD-K8
	for mharc-commit-inetutils@gnu.org; Wed, 22 Jan 2020 10:46:55 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:40536)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iuIDU-0000Sk-Sl
 for commit-inetutils@gnu.org; Wed, 22 Jan 2020 10:46:54 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:52745)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iuIDU-0005UR-HE
 for commit-inetutils@gnu.org; Wed, 22 Jan 2020 10:46:52 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 6831821148; Wed, 22 Jan 2020 10:46:52 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-62-ga055c4b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3c908f3420ac0e29edcf7511fbc5665960cc7124
X-Git-Newrev: a055c4b83cd22914c4d5e2d8c1aa4ba57fa9fdf9
Message-Id: <20200122154652.6831821148@vcs0.savannah.gnu.org>
Date: Wed, 22 Jan 2020 10:46:52 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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, 22 Jan 2020 15:46:54 -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  a055c4b83cd22914c4d5e2d8c1aa4ba57fa9fdf9 (commit)
      from  3c908f3420ac0e29edcf7511fbc5665960cc7124 (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=a055c4b83cd22914c4d5e2d8c1aa4ba57fa9fdf9


commit a055c4b83cd22914c4d5e2d8c1aa4ba57fa9fdf9
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jan 22 16:45:10 2020 +0100

    Correctly detect presence of IPv6.

diff --git a/ChangeLog b/ChangeLog
index 6eaeecb..8a9223d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-22  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Correctly detect presence of IPv6.
+
+	* tests/runtime-ipv6.c [AI_ADDRCONFIG] (hints.ai_flags):
+	Add AI_ADDRCONFIG for better selectivity.
+
 2020-01-20  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Test robustly in absence of IPv6.
diff --git a/tests/runtime-ipv6.c b/tests/runtime-ipv6.c
index 17d399a..58a2fb3 100644
--- a/tests/runtime-ipv6.c
+++ b/tests/runtime-ipv6.c
@@ -55,9 +55,12 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
 
   memset (&hints, 0, sizeof (hints));
-  hints.ai_family = PF_INET6;
+  hints.ai_family = AF_INET6;
   hints.ai_socktype = SOCK_DGRAM;
   hints.ai_flags = AI_NUMERICHOST;
+#ifdef AI_ADDRCONFIG
+  hints.ai_flags |= AI_ADDRCONFIG;
+#endif
 
   err = getaddrinfo ("::1", "tftp", &hints, &aiptr);
   if (!err)

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

Summary of changes:
 ChangeLog            | 7 +++++++
 tests/runtime-ipv6.c | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jan 24 11:39:18 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iv1zJ-00087P-Vb
	for mharc-commit-inetutils@gnu.org; Fri, 24 Jan 2020 11:39:17 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:41200)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iv1z9-0007zC-Dk
 for commit-inetutils@gnu.org; Fri, 24 Jan 2020 11:39:11 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:52039)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iv1z9-0006nT-1y
 for commit-inetutils@gnu.org; Fri, 24 Jan 2020 11:39:07 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id EA0FE21148; Fri, 24 Jan 2020 11:39:06 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-63-g44e30cc
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a055c4b83cd22914c4d5e2d8c1aa4ba57fa9fdf9
X-Git-Newrev: 44e30cc781291c81cd8fff88fb629383f7a49385
Message-Id: <20200124163906.EA0FE21148@vcs0.savannah.gnu.org>
Date: Fri, 24 Jan 2020 11:39:06 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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, 24 Jan 2020 16:39:11 -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  44e30cc781291c81cd8fff88fb629383f7a49385 (commit)
      from  a055c4b83cd22914c4d5e2d8c1aa4ba57fa9fdf9 (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=44e30cc781291c81cd8fff88fb629383f7a49385


commit 44e30cc781291c81cd8fff88fb629383f7a49385
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jan 24 17:21:24 2020 +0100

    Separation of test cases as IPv4 and IPv6.
    
    Existing tests are now made available as separate collections/tasks
    for the two address families, selectable at testing time.

diff --git a/ChangeLog b/ChangeLog
index 8a9223d..a7f5f2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2020-01-24  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Separation of test cases according to IPv4, and to IPv6.
+	The two precious macros TEST_IPV4 and TEST_IPV6 are controlling
+	whether the indicated address family is checked in our tests.
+	Test coverage is left unequal.
+
+	* configure.ac (TEST_IPV4): New macro.  The new switch
+	`--disable-ipv4' suppresses IPv4 during target `check'.
+	* tests/Makefile.am (tools_subst): Replace @TEST_IPV4@.
+	* tests/tools.sh.in (TEST_IPV4, RUNTIME_IPV4, RUNTIME_IPV6):
+	New variables.
+	(TEST_IPV4, TEST_IPV6): If either is `auto', make a runtime check
+	for availability, and set to `no' in case of failure.
+
+	* tests/runtime-ipv6.c: Implement switches `-4' and `-6', making
+	it possible to test for either address family at runtime.
+	[EAI_NODATA]: Return this error in a corner case, or else EAI_FAIL.
+
+	* tests/ftp-localhost.sh: Remove code now existing in tools.sh.in.
+	Separate existing test cases according to IPv4 and IPv6, by means
+	of conditionals with TEST_IPV4 and TARGET, or TEST_IPV6 and TARGET6.
+	[TEST_IPV4 = TEST_IPV6 = no]: Skip test.
+	* tests/ping-localhost.sh: Likewise.
+	* tests/syslogd.sh: Likewise.
+	* tests/telnet-localhost.sh: Likewise.
+	* tests/tftp.sh: Likewise.
+
+	* tests/ifconfig.sh [TEST_IPV4 = no]: Skip test.
+	* tests/inetd.sh (TARGET6): New variable.
+	[TEST_IPV4 = TEST_IPV6 = no]: Skip test.
+	Implement subcases for IPv6, and condition old cases on TEST_IPV4.
+	* tests/traceroute-localhost.sh [TEST_IPV4 = no]: Skip test.
+	[TEST_IPV4 && TARGET]: Condition each case completely.
+
 2020-01-22  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Correctly detect presence of IPv6.
diff --git a/configure.ac b/configure.ac
index d5fdea4..5852746 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,6 +426,23 @@ if test ".$LIBAUTH" != .; then
                    [Define to one if you want encryption.])
 fi
 
+# Make IPv4 tests configurable in testing stage.
+
+AC_ARG_ENABLE([ipv4],
+  AS_HELP_STRING([--disable-ipv4], [disable IPv4 testing]),
+  [case "${enable_ipv4}" in
+  no)
+    AC_MSG_NOTICE([Disabling IPv4 tests at user request])
+    ipv4=no
+    ;;
+  *)
+    ipv4=yes
+    ;;
+  esac],
+  [ipv4=auto]
+)
+AC_SUBST(TEST_IPV4, [$ipv4])
+
 # Checks for IPv6 support.
 
 AC_ARG_ENABLE([ipv6],
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8d87bc7..ab2d2dc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -102,9 +102,10 @@ tools_subst = sed -e 's,[@]GREP[@],$(GREP),g' \
 	      -e 's,[@]SED[@],$(SED),g' \
 	      -e 's,[@]DD[@],$(DD),g' \
 	      -e 's,[@]MKTEMP[@],$(MKTEMP),g' \
-	      -e 's,[@]NETSTAT[@],$(NETSTAT),g'\
-	      -e 's,[@]TARGET[@],$(TARGET),g'\
-	      -e 's,[@]TARGET6[@],$(TARGET6),g'\
+	      -e 's,[@]NETSTAT[@],$(NETSTAT),g' \
+	      -e 's,[@]TARGET[@],$(TARGET),g' \
+	      -e 's,[@]TARGET6[@],$(TARGET6),g' \
+	      -e 's,[@]TEST_IPV4[@],$(TEST_IPV4),g' \
 	      -e 's,[@]TEST_IPV6[@],$(TEST_IPV6),g'
 
 tools.sh: tools.sh.in Makefile
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 90acd74..1b9a082 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -51,8 +51,6 @@ set -e
 
 . ./tools.sh
 
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
-
 FTP=${FTP:-../ftp/ftp$EXEEXT}
 FTPD=${FTPD:-../ftpd/ftpd$EXEEXT}
 INETD=${INETD:-../src/inetd$EXEEXT}
@@ -116,7 +114,12 @@ if [ $VERBOSE ]; then
     $INETD --version | $SED '1q'
 fi
 
-if [ `func_id_uid` != 0 ]; then
+if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"; then
+    echo >&2 "Inet socket testing is disabled.  Skipping test."
+    exit 77
+fi
+
+if test $(func_id_uid) != 0; then
     echo "ftpd needs to run as root" >&2
     exit 77
 fi
@@ -224,12 +227,6 @@ locate_port () {
     fi
 }
 
-# Avoid IPv6 when not functional.
-if test "$TEST_IPV6" = "auto"; then
-    $RUNTIME_IPV6 || { TEST_IPV6="no"
-	echo "Suppressing non-supported IPv6."; }
-fi
-
 # Files used in transmission tests.
 GETME=`$MKTEMP $TMPDIR/file.XXXXXXXX` || do_transfer=false
 
@@ -256,7 +253,15 @@ if test -z "$PORT"; then
     fi
 fi
 
-cat <<EOT > "$TMPDIR/inetd.conf"
+# Create an empty configuration file for inetd.
+: > "$TMPDIR/inetd.conf" 2>/dev/null ||
+    {
+	echo 'Failed at writing configuration for Inetd.  Skipping test.' >&2
+	exit 77
+    }
+
+test "$TEST_IPV4" = "no" ||
+    cat <<EOT > "$TMPDIR/inetd.conf"
 $PORT stream tcp4 nowait $USER $PWD/$FTPD ftpd -A -l
 EOT
 
@@ -265,26 +270,30 @@ test "$TEST_IPV6" = "no" ||
 $PORT stream tcp6 nowait $USER $PWD/$FTPD ftpd -A -l
 EOT
 
-if test $? -ne 0; then
-    echo 'Failed at writing configuration for Inetd.  Skipping test.' >&2
-    exit 77
-fi
-
-cat <<EOT > "$TMPDIR/.netrc"
-machine $TARGET login $FTPUSER password foobar
-EOT
+: > "$TMPDIR/.netrc" 2>/dev/null ||
+    {
+	echo 'Failed at writing access file ".netrc".  Skipping test.' >&2
+	exit 77
+    }
 
-if test $? -ne 0; then
-    echo 'Failed at writing access file ".netrc".  Skipping test.' >&2
-    exit 77
-fi
+if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+    cat <<-EOT >> "$TMPDIR/.netrc"
+	machine $TARGET login $FTPUSER password foobar
+	EOT
+fi # TEST_IPV4 && TARGET
 
-if test "$TEST_IPV6" != "no"; then
+if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
     cat <<-EOT >> "$TMPDIR/.netrc"
 	machine $TARGET6 login $FTPUSER password foobar
+	EOT
+fi # TEST_IPV6 && TARGET6
+
+if test "$TEST_IPV4" != "no" && test "$TEST_IPV6" != "no" &&
+   test -n "$TARGET46"; then
+    cat <<-EOT >> "$TMPDIR/.netrc"
 	machine $TARGET46 login $FTPUSER password foobar
 	EOT
-fi
+fi # TEST_IPV4 && TEST_IPV6 && TARGET46
 
 chmod 600 "$TMPDIR/.netrc"
 
@@ -346,6 +355,9 @@ test_report () {
     fi
 }
 
+if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+### TODO: Fix indentation within this conditional.
+
 # Test a passive connection: PASV and IPv4.
 #
 echo "PASV to $TARGET (IPv4) using inetd."
@@ -483,6 +495,8 @@ $FTP "$TARGET" $PORT -N"$TMPDIR/.netrc" -4 -v -t >$TMPDIR/ftp.stdout 2>&1
 
 test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET"
 
+fi # TEST_IPV4 && TARGET
+
 if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
     # Test a passive connection: EPSV and IPv6.
     #
@@ -520,7 +534,7 @@ put $GETME $PUTME"`
 	echo >&2 'Binary transfer failed.'
 	exit 1
     fi
-fi # TEST_IPV6
+fi # TEST_IPV6 && TARGET6
 
 # Availability of IPv4-mapped IPv6 addresses.
 #
@@ -579,8 +593,8 @@ fi
 
 # Test functionality of IPv4-mapped IPv6 addresses.
 #
-if $have_address_mapping && test -n "$TARGET46" &&
-   test "$TEST_IPV6" != "no"; then
+if test "$TEST_IPV4" != "no" &&test "$TEST_IPV6" != "no" &&
+   test -n "$TARGET46" && $have_address_mapping ; then
     # Test a passive connection: EPSV and IPv4-mapped-IPv6.
     #
     echo "EPSV to $TARGET46 (IPv4-as-IPv6) using inetd."
@@ -631,15 +645,15 @@ put $GETME $PUTME"`
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
-else
+elif test "$TEST_IPV4" != "no" || test "$TEST_IPV6" != "no"; then
     # The IPv4-as-IPv6 tests were not performed.
     echo 'Skipping two tests of IPv4 mapped as IPv6.'
-fi # have_address_mapping && TEST_IPV6
+fi # TEST_IPV4 && TEST_IPV6 && TARGET46 && have_address_mapping
 
 # Test name mapping with PASV and IPv4.
 # Needs a writable destination!
 #
-if $do_transfer; then
+if test "$TEST_IPV4" != "no" && test -n "$TARGET" && $do_transfer; then
     echo "Name mapping test at $TARGET (IPv4) using inetd."
 
     cat <<-STOP |
@@ -674,6 +688,6 @@ if $do_transfer; then
 	rm -f $FTPHOME$DLDIR/$2.$1 $FTPHOME$DLDIR/copy.$GETME
 	exit 1
     fi
-fi
+fi # TEST_IPV4 && TARGET && do_transfer
 
 exit 0
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 034b03c..26523c7 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -60,6 +60,11 @@ if test ! -x "$IFCONFIG"; then
     exit 77
 fi
 
+if test "$TEST_IPV4" = "no"; then
+    echo >&2 "Disabled IPv4 testing.  Skipping test."
+    exit 77
+fi
+
 if test -z "${VERBOSE+set}"; then
     silence=:
     bucket='>/dev/null'
diff --git a/tests/inetd.sh b/tests/inetd.sh
index e1d78ba..cf76ab7 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -65,8 +65,9 @@ fi
 #
 do_cleandir=false
 
-# Select numerical target address, only IPv4.
+# Select numerical target addresses.
 TARGET=${TARGET:-127.0.0.1}
+TARGET6=${TARGET6:-::1}
 
 # Executable under test and helper functionality.
 #
@@ -89,6 +90,11 @@ if test ! -x $TCPGET; then
     exit 77
 fi
 
+if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"; then
+    echo >&2 "Inet socket testing is disabled.  Skipping test."
+    exit 77
+fi
+
 if test -n "$VERBOSE"; then
     set -x
     $INETD --version | $SED '1q'
@@ -145,8 +151,14 @@ clean_testdir () {
 # Write a fresh configuration file.  Port is input parameter.
 write_conf () {
     # First argument is port number.  Node is fixed.
-    echo "$TARGET:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
-	> $CONF
+    : > $CONF
+
+    test "$TEST_IPV4" = "no" ||
+	echo "$TARGET:$1 stream tcp4 nowait $USER $ADDRPEEK addrpeek addr" \
+	    >> $CONF
+    test "$TEST_IPV6" = "no" ||
+	echo "$TARGET6:$1 stream tcp6 nowait $USER $ADDRPEEK addrpeek addr" \
+	    >> $CONF
 }
 
 errno=0
@@ -168,13 +180,25 @@ if test ! -f $PID; then
 else
     # Repeated SIGHUP testing, with modified port.
     for nn in 1 2 3 4 5; do
+        family=
+
 	# Check for response at chosen port.
-	$TCPGET $TARGET $PORT 2>/dev/null |
-	    $GREP "Your address is $TARGET." >/dev/null 2>&1 || errno=1
+	if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+	    $TCPGET $TARGET $PORT 2>/dev/null |
+		$GREP "Your address is $TARGET." >/dev/null 2>&1 \
+	    || { errno=`expr $errno + 1`; family=IPv4; }
+	fi # TEST_IPV4 && TARGET
+
+	if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
+	    $TCPGET $TARGET6 $PORT 2>/dev/null |
+		$GREP "Your address is $TARGET6." >/dev/null 2>&1 \
+	    || { errno=`expr $errno + 1`; family="${family:+$family }IPv6"; }
+	fi # TEST_IPV6 && TARGET6
 
 	test $errno -eq 0 ||
 	    { cat >&2 <<-EOT
 		*** Repetition $nn of SIGHUP test has failed. ***
+		*** Offending socket family: $family ***
 		Configuration file:
 		##### $CONF
 		`cat $CONF`
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index e091cbc..ad99fd0 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -25,8 +25,6 @@
 
 . ./tools.sh
 
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
-
 PING=${PING:-../ping/ping$EXEEXT}
 TARGET=${TARGET:-127.0.0.1}
 
@@ -43,21 +41,22 @@ if [ $VERBOSE ]; then
     $PING --version
 fi
 
-if [ `func_id_uid` != 0 ]; then
-    echo "ping needs to run as root"
+if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"; then
+    echo >&2 "Inet socket testing is disabled.  Skipping test."
     exit 77
 fi
 
-# Avoid IPv6 when not functional.
-if test "$TEST_IPV6" = "auto"; then
-    $RUNTIME_IPV6 || { TEST_IPV6="no"
-	echo "Suppressing non-supported IPv6."; }
+if test $(func_id_uid) != 0; then
+    echo "ping needs to run as root"
+    exit 77
 fi
 
 errno=0
 errno2=0
 
-$PING -n -c 1 $TARGET || errno=$?
+test "$TEST_IPV4" != "no" && test -x $PING &&
+    { $PING -n -c 1 $TARGET || errno=$?; }
+
 test $errno -eq 0 || echo "Failed at pinging $TARGET." >&2
 
 # Host might not have been built with IPv6 support.
diff --git a/tests/runtime-ipv6.c b/tests/runtime-ipv6.c
index 58a2fb3..3852556 100644
--- a/tests/runtime-ipv6.c
+++ b/tests/runtime-ipv6.c
@@ -40,11 +40,58 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#include <argp.h>
 #include <progname.h>
+#include <unused-parameter.h>
+#include "libinetutils.h"
 
 #define RESOLVE_OK            0
 #define RESOLVE_FAIL         -1
 
+/* The default action is to investigate localhost as IPv6.  */
+int tested_family = AF_INET6;
+char *tested_family_name = "IPv6";
+char *tested_localhost = "::1";
+
+const char doc[] = "Detect presence of address family";
+
+const char *program_authors[] = { "Mats Erik Andersson", NULL };
+
+static struct argp_option argp_options[] = {
+#define GRP 1
+  {"ipv4", '4', NULL, 0, "test for IPv4", GRP },
+  {"ipv6", '6', NULL, 0, "test for IPv6 (default)", GRP },
+#undef GRP
+  {NULL, 0, NULL, 0, NULL, 0}
+};
+
+static error_t
+parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+{
+  switch (key)
+    {
+    case '4':
+      tested_family = AF_INET;
+      tested_family_name = "IPv4";
+      tested_localhost = "127.0.0.1";
+      break;
+
+    case '6':
+      tested_family = AF_INET6;
+      tested_family_name = "IPv6";
+      tested_localhost = "::1";
+      break;
+
+    default:
+      return ARGP_ERR_UNKNOWN;
+    }
+
+  return 0;
+}
+
+static struct argp argp =
+  {argp_options, parse_opt, NULL, doc, NULL, NULL, NULL};
+
 int
 main (int argc, char *argv[])
 {
@@ -53,21 +100,27 @@ main (int argc, char *argv[])
   struct addrinfo hints, *aiptr;
 
   set_program_name (argv[0]);
+  iu_argp_init ("runtime-ipv6", program_authors);
+  argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
   memset (&hints, 0, sizeof (hints));
-  hints.ai_family = AF_INET6;
+  hints.ai_family = tested_family;
   hints.ai_socktype = SOCK_DGRAM;
   hints.ai_flags = AI_NUMERICHOST;
 #ifdef AI_ADDRCONFIG
   hints.ai_flags |= AI_ADDRCONFIG;
 #endif
 
-  err = getaddrinfo ("::1", "tftp", &hints, &aiptr);
+  err = getaddrinfo (tested_localhost, "tftp", &hints, &aiptr);
   if (!err)
     {
       /* Should not really happen.  */
       if (aiptr == NULL)
-	err = 1;
+#ifdef EAI_NODATA
+	err = EAI_NODATA;
+#else
+	err = EAI_FAIL;
+#endif
 
       freeaddrinfo (aiptr);
     }
@@ -75,7 +128,8 @@ main (int argc, char *argv[])
   if (err)
     {
       /* Not able to select localhost as IPv6.  */
-      fprintf (stderr, "IPv6 is disabled in this running system!");
+      fprintf (stderr, "%s is disabled in this running system: \"%s\" %s\n",
+	       tested_family_name, tested_localhost, gai_strerror (err));
 
       return RESOLVE_FAIL;
     }
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 107b520..e46b170 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -96,8 +96,6 @@ if test "$IU_OS" = "Linux" || test "$IU_OS" = "SunOS"; then
     iu_socklen_max=108
 fi
 
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
-
 # The executables under test.
 #
 SYSLOGD=${SYSLOGD:-../src/syslogd$EXEEXT}
@@ -190,12 +188,6 @@ clean_testdir () {
 #
 trap clean_testdir EXIT HUP INT QUIT TERM
 
-# Avoid IPv6 when not functional.
-if test "$TEST_IPV6" = "auto"; then
-    $RUNTIME_IPV6 || { TEST_IPV6="no"
-	$silence echo "Suppressing non-supported IPv6."; }
-fi
-
 # Test at this port.
 # Standard is syslog at 514/udp.
 PROTO=udp
@@ -441,15 +433,18 @@ if $do_socket_length; then
 fi
 
 if $do_inet_socket; then
-    TESTCASES=`expr $TESTCASES + 1`
-    $LOGGER -4 -h "$TARGET:$PORT" -p user.info -t "$TAG" \
-	"Sending IPv4 message. (pid $$)"
-    if test "$TEST_IPV6" != "no"; then
+    if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+	TESTCASES=`expr $TESTCASES + 1`
+	$LOGGER -4 -h "$TARGET:$PORT" -p user.info -t "$TAG" \
+	    "Sending IPv4 message. (pid $$)"
+    fi # TEST_IPV4 && TARGET
+
+    if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
 	TESTCASES=`expr $TESTCASES + 1`
 	$LOGGER -6 -h "[$TARGET6]:$PORT" -p user.info -t "$TAG" \
 	    "Sending IPv6 message. (pid $$)"
-    fi
-fi
+    fi # TEST_IPV6 && TARGET
+fi # do_inet_socket
 
 # Send message of priority notice, either via local socket or IPv4,
 # but not both.  The presence is checked in $OUT and in $OUT_NOTICE,
@@ -459,10 +454,12 @@ if $do_unix_socket; then
     $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
 	"Attemping to locate wrapped configuration. (pid $$)"
 elif $do_inet_socket; then
-    TESTCASES=`expr $TESTCASES + 2`
-    $LOGGER -4 -h "$TARGET:$PORT" -p daemon.notice -t "$TAG" \
-	"Attemping to locate wrapped configuration. (pid $$)"
-fi
+    if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+	TESTCASES=`expr $TESTCASES + 2`
+	$LOGGER -4 -h "$TARGET:$PORT" -p daemon.notice -t "$TAG" \
+	    "Attemping to locate wrapped configuration. (pid $$)"
+    fi # TEST_IPV4 && TARGET
+fi # do_inet_socket
 
 # Generate a more elaborate message routing, aimed at confirming
 # discrimination of severity and facility.  This is made active
@@ -541,17 +538,19 @@ if $do_unix_socket; then
     TESTCASES=`expr $TESTCASES + 2`
     $LOGGER -h "$SOCKET" -p 512.info -t "$TAG2" \
 	"Illegal facility in BSD message. (pid $$)"
-fi
+fi # do_unix_socket
 
 if $do_inet_socket; then
     # Two messages of weight 2, ensuring that missing
     # and misplaced messages are not yielding negatives.
-    TESTCASES=`expr $TESTCASES + 4`
-    $LOGGER -4 -h "$TARGET:$PORT" -p user.info -t "$TAG2" \
-	"user.info as IPv4 message. (pid $$)"
-    $LOGGER -4 -h "$TARGET:$PORT" -p user.debug -t "$TAG2" \
-	"user.debug as IPv4 message. (pid $$)"
-fi
+    if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+	TESTCASES=`expr $TESTCASES + 4`
+	$LOGGER -4 -h "$TARGET:$PORT" -p user.info -t "$TAG2" \
+	    "user.info as IPv4 message. (pid $$)"
+	$LOGGER -4 -h "$TARGET:$PORT" -p user.debug -t "$TAG2" \
+	    "user.debug as IPv4 message. (pid $$)"
+    fi # TEST_IPV4 && TARGET
+fi # do_inet_socket
 
 # Remove previous SYSLOG daemon.
 test -r "$PID" && kill -0 "`cat "$PID"`" >/dev/null 2>&1 &&
@@ -577,16 +576,18 @@ if $do_standard_port; then
 	--inet --ipany $OPTIONS
     sleep 1
 
-    TESTCASES=`expr $TESTCASES + 1`
-    $LOGGER -4 -h "$TARGET" -p user.info -t "$TAG" \
-	"IPv4 to standard port. (pid $$)"
+    if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+	TESTCASES=`expr $TESTCASES + 1`
+	$LOGGER -4 -h "$TARGET" -p user.info -t "$TAG" \
+	    "IPv4 to standard port. (pid $$)"
+    fi # TEST_IPV4 && TARGET
 
-    if test "$TEST_IPV6" != "no"; then
+    if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
 	TESTCASES=`expr $TESTCASES + 1`
 	$LOGGER -6 -h "[$TARGET6]" -p user.info -t "$TAG" \
 	    "IPv6 to standard port. (pid $$)"
-    fi
-fi
+    fi # TEST_IPV6 && TARGET6
+fi # do_standard_port
 
 # Delay detection due to observed race condition.
 sleep 3
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index f975c0f..40aecd6 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -53,8 +53,6 @@ fi
 
 $need_mktemp || exit_no_mktemp
 
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
-
 # The executables under test.
 #
 INETD=${INETD:-../src/inetd$EXEEXT}
@@ -100,6 +98,11 @@ if test ! -x $ADDRPEEK; then
     exit 77
 fi
 
+if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"; then
+    echo >&2 "Inet socket testing is disabled.  Skipping test."
+    exit 77
+fi
+
 # Portability fix for SVR4
 PWD="${PWD:-`pwd`}"
 
@@ -134,20 +137,20 @@ trap posttesting EXIT HUP INT QUIT TERM
 
 PORT=`expr 4973 + ${RANDOM:-$$} % 973`
 
-# Avoid IPv6 when not functional.
-if test "$TEST_IPV6" = "auto"; then
-    $RUNTIME_IPV6 || { TEST_IPV6="no"
-	echo "Suppressing non-supported IPv6."; }
-fi
-
-cat > "$INETD_CONF" <<-EOF ||
-	$TARGET:$PORT stream tcp4 nowait $USER $ADDRPEEK addrpeek addr
-EOF
+# Create an empty configuration file for inetd.
+: > "$INETD_CONF" 2>/dev/null ||
     {
 	echo 'Could not create configuration file for Inetd.  Aborting.' >&2
 	exit 1
     }
 
+# This target is used for plain IPv4 and for IPv4-mapped addressing.
+if test "$TEST_IPV4" != "no"; then
+    cat >> "$INETD_CONF" <<-EOF
+	$TARGET:$PORT stream tcp4 nowait $USER $ADDRPEEK addrpeek addr
+EOF
+fi
+
 if test "$TEST_IPV6" != "no"; then
     cat >> "$INETD_CONF" <<-EOF
 	$TARGET6:$PORT stream tcp6 nowait $USER $ADDRPEEK addrpeek addr
@@ -188,14 +191,14 @@ telnet_opts="--no-rc --no-escape --no-login"
 
 errno=0
 
-if test -n "$TARGET"; then
+if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
     output=`$TELNET $telnet_opts $TARGET $PORT 2>/dev/null`
     echo "$output" | eval "$GREP 'Your address is $TARGET.' $display"
     if test $? -ne 0; then
 	errno=1
 	echo "Failed at '$TARGET'." >&2
     fi
-fi
+fi # TEST_IPV4 && TARGET
 
 if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
     output=`$TELNET $telnet_opts $TARGET6 $PORT 2>/dev/null`
@@ -204,14 +207,15 @@ if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
 	errno=1
 	echo "Failed at '$TARGET6'." >&2
     fi
-fi
+fi # TEST_IPV6 && TARGET6
 
-if test "$TEST_IPV6" != "no" && test -n "$TARGET46"; then
+if test "$TEST_IPV4" != "no" && test "$TEST_IPV6" != "no" \
+   && test -n "$TARGET46"; then
     output=`$TELNET $telnet_opts $TARGET46 $PORT 2>/dev/null`
     echo "$output" | eval "$GREP 'Your address is .*$TARGET.' $display"
     if test $? -ne 0; then
 	echo "Informational: Unsuccessful with mapped address '$TARGET46'." >&2
     fi
-fi
+fi # TEST_IPV4 && TEST_IPV6 && TARGET46
 
 exit $errno
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 2f6366a..e2fdf60 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -68,8 +68,6 @@ fi
 # Portability fix for SVR4
 PWD="${PWD:-`pwd`}"
 
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
-
 TFTP="${TFTP:-../src/tftp$EXEEXT}"
 TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
 INETD="${INETD:-../src/inetd$EXEEXT}"
@@ -158,15 +156,10 @@ if test "$ADDRESSES" = "sense"; then
 	-e "s/^.*$AF \([:.0-9]\{1,\}\) .*$/\1/g"`
 fi
 
-# Avoid IPv6 when not functional.
-if test "$TEST_IPV6" = "auto"; then
-    $RUNTIME_IPV6 || { TEST_IPV6="no"
-	$silence echo "Suppressing non-supported IPv6."; }
-fi
-
 if test -z "$ADDRESSES"; then
-    ADDRESSES="${TARGET:-127.0.0.1}"
-    test "$TEST_IPV6" = "no" || ADDRESSES="$ADDRESSES ${TARGET6:-::1}"
+    test "$TEST_IPV4" = "no" || ADDRESSES="${TARGET:-127.0.0.1}"
+    test "$TEST_IPV6" = "no" ||
+	ADDRESSES="${ADDRESSES:+$ADDRESSES }${TARGET6:-::1}"
 fi
 
 # Work around the peculiar output of netstat(1m,solaris).
@@ -214,7 +207,10 @@ fi
 # $INETD_CONF.  Thus the dependency on file locations will be
 # identical in daemon-mode and in debug-mode.
 write_conf () {
-    cat > "$INETD_CONF" <<-EOF
+    : > "$INETD_CONF" 2>/dev/null
+
+    test "$TEST_IPV4" = "no" ||
+	cat >> "$INETD_CONF" <<-EOF
 	$PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
 	EOF
 
@@ -224,6 +220,12 @@ write_conf () {
 	EOF
 }
 
+if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"
+then
+    echo >&2 "Inet socket test is switched off.  Skipping test."
+    exit 77
+fi
+
 write_conf ||
     {
 	echo 'Could not create configuration file for Inetd.  Aborting.' >&2
@@ -429,7 +431,10 @@ if $do_secure_setting; then
     # Allow an underprivileged process owner to read files.
     chmod g=rx,o=rx $TMPDIR
 
-    cat > "$INETD_CONF" <<-EOF
+    : > "$INETD_CONF"
+
+    test "$TEST_IPV4" = "no" ||
+	cat >> "$INETD_CONF" <<-EOF
 	$PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l -s $TMPDIR /tftp-test
 	EOF
 
@@ -443,7 +448,7 @@ if $do_secure_setting; then
 
     # Test two files: file-small and asciifile.txt
     #
-    addr=`echo "$ADDRESSES" | $SED 's/ .*//'`
+    addr=`echo $ADDRESSES | $SED 's/ .*//'`
     name=`echo "$FILELIST" | $SED 's/ .*//'`
     rm -f "$name" "$ASCIIFILE"
     EFFORTS=`expr $EFFORTS + 2`
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 9d4217a..403ffca 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -26,8 +26,24 @@ MKTEMP=${MKTEMP:-@MKTEMP@}
 NETSTAT=${NETSTAT:-@NETSTAT@}
 TARGET=${TARGET:-@TARGET@}
 TARGET6=${TARGET6:-@TARGET6@}
+TEST_IPV4=${TEST_IPV4:-@TEST_IPV4@}
 TEST_IPV6=${TEST_IPV6:-@TEST_IPV6@}
 
+RUNTIME_IPV4="${RUNTIME_IPV4:-./runtime-ipv6$EXEEXT -4}"
+RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+
+# Avoid IPv4 when not functional.
+if test "$TEST_IPV4" = "auto"; then
+    $RUNTIME_IPV4 || { TEST_IPV4="no"
+	echo "Suppressing non-supported IPv4."; }
+fi
+
+# Avoid IPv6 when not functional.
+if test "$TEST_IPV6" = "auto"; then
+    $RUNTIME_IPV6 || { TEST_IPV6="no"
+	echo "Suppressing non-supported IPv6."; }
+fi
+
 # Variables for signalling presence of a utility:
 #
 #   need_toolname      Set to `false' if `toolname' is missing,
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index 32467b2..df98ffe 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -38,7 +38,12 @@ if [ $VERBOSE ]; then
     $TRACEROUTE --version
 fi
 
-if [ `func_id_uid` != 0 ]; then
+if test "$TEST_IPV4" = "no"; then
+    echo >&2 "Disabled IPv4 testing.  Skipping test."
+    exit 77
+fi
+
+if test $(func_id_uid) != 0; then
     echo "traceroute needs to run as root"
     exit 77
 fi
@@ -46,11 +51,13 @@ fi
 errno=0
 errno2=0
 
-$TRACEROUTE --type=udp $TARGET || errno=$?
-test $errno -eq 0 || echo "Failed at UDP tracing." >&2
+if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
+    $TRACEROUTE --type=udp $TARGET || errno=$?
+    test $errno -eq 0 || echo "Failed at UDP tracing." >&2
 
-$TRACEROUTE --type=icmp $TARGET || errno2=$?
-test $errno2 -eq 0 || echo "Failed at ICMP tracing." >&2
+    $TRACEROUTE --type=icmp $TARGET || errno2=$?
+    test $errno2 -eq 0 || echo "Failed at ICMP tracing." >&2
+fi
 
 test $errno -eq 0 || exit $errno
 

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

Summary of changes:
 ChangeLog                     | 35 ++++++++++++++++++++
 configure.ac                  | 17 ++++++++++
 tests/Makefile.am             |  7 ++--
 tests/ftp-localhost.sh        | 76 +++++++++++++++++++++++++------------------
 tests/ifconfig.sh             |  5 +++
 tests/inetd.sh                | 34 ++++++++++++++++---
 tests/ping-localhost.sh       | 17 +++++-----
 tests/runtime-ipv6.c          | 62 ++++++++++++++++++++++++++++++++---
 tests/syslogd.sh              | 63 +++++++++++++++++------------------
 tests/telnet-localhost.sh     | 36 +++++++++++---------
 tests/tftp.sh                 | 31 ++++++++++--------
 tests/tools.sh.in             | 16 +++++++++
 tests/traceroute-localhost.sh | 17 +++++++---
 13 files changed, 299 insertions(+), 117 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jan 24 17:26:48 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iv7Pc-0005gB-Cz
	for mharc-commit-inetutils@gnu.org; Fri, 24 Jan 2020 17:26:48 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:43411)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iv7PY-0005eC-V8
 for commit-inetutils@gnu.org; Fri, 24 Jan 2020 17:26:46 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:33430)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iv7PX-0007RG-Lh
 for commit-inetutils@gnu.org; Fri, 24 Jan 2020 17:26:44 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 8C64521148; Fri, 24 Jan 2020 17:26:43 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-64-g4b709d0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 44e30cc781291c81cd8fff88fb629383f7a49385
X-Git-Newrev: 4b709d0ab1dc39e1f11026dfb6d5ef8c94188383
Message-Id: <20200124222643.8C64521148@vcs0.savannah.gnu.org>
Date: Fri, 24 Jan 2020 17:26:43 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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, 24 Jan 2020 22:26:46 -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  4b709d0ab1dc39e1f11026dfb6d5ef8c94188383 (commit)
      from  44e30cc781291c81cd8fff88fb629383f7a49385 (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=4b709d0ab1dc39e1f11026dfb6d5ef8c94188383


commit 4b709d0ab1dc39e1f11026dfb6d5ef8c94188383
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jan 24 23:25:12 2020 +0100

    runtime-ipv6: Implicit dependency on services file.
    
    Use numerical port for less dependency in chrooted situations.

diff --git a/ChangeLog b/ChangeLog
index a7f5f2b..e772da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2020-01-24  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	runtime-ipv6: Implicit dependency on services file.
+	In a chrooted test environment, access to a particular
+	resource like /etc/services, need not be granted.
+
+	* tests/runtime-ipv6.c: Replace symbolic service name `tftp'
+	by a numerical and harmless port string.
+
+2020-01-24  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Separation of test cases according to IPv4, and to IPv6.
 	The two precious macros TEST_IPV4 and TEST_IPV6 are controlling
 	whether the indicated address family is checked in our tests.
diff --git a/tests/runtime-ipv6.c b/tests/runtime-ipv6.c
index 3852556..2f4e128 100644
--- a/tests/runtime-ipv6.c
+++ b/tests/runtime-ipv6.c
@@ -18,14 +18,16 @@
 
 /* Written by Mats Erik Andersson.  */
 
-/* Runtime-ipv6 determines whether IPv6 address ::1 can be selected.
+/* Runtime-ipv6 determines by default whether IPv6 address ::1 can
+ * be selected.  The switch `-6' is identical, whereas `-4' probes
+ * for 127.0.0.1.
  *
  * Invocation:
  *
- *   runtime-ipv6
+ *   runtime-ipv6 [-4] [-6]
  *
  * Return value is 0 (zero) when successful, otherwise -1.
- * On failure a message is printed to stderr: `IPv6 disabled in system'.
+ * On failure a message is printed to stderr: `IPv# disabled in system'.
  */
 
 #include <config.h>
@@ -111,7 +113,7 @@ main (int argc, char *argv[])
   hints.ai_flags |= AI_ADDRCONFIG;
 #endif
 
-  err = getaddrinfo (tested_localhost, "tftp", &hints, &aiptr);
+  err = getaddrinfo (tested_localhost, "1237", &hints, &aiptr);
   if (!err)
     {
       /* Should not really happen.  */

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

Summary of changes:
 ChangeLog            |  9 +++++++++
 tests/runtime-ipv6.c | 10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Jan 26 09:46:35 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1ivjBL-0003SN-Bk
	for mharc-commit-inetutils@gnu.org; Sun, 26 Jan 2020 09:46:35 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:45504)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1ivjBH-0003SF-4W
 for commit-inetutils@gnu.org; Sun, 26 Jan 2020 09:46:33 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:46102)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1ivjBG-00021s-P6
 for commit-inetutils@gnu.org; Sun, 26 Jan 2020 09:46:30 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 9EE2121148; Sun, 26 Jan 2020 09:46:30 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-65-gcf037d7
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4b709d0ab1dc39e1f11026dfb6d5ef8c94188383
X-Git-Newrev: cf037d79f05ad4e6b713b44f53ae86f5dd1eac62
Message-Id: <20200126144630.9EE2121148@vcs0.savannah.gnu.org>
Date: Sun, 26 Jan 2020 09:46:30 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Sun, 26 Jan 2020 14:46: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  cf037d79f05ad4e6b713b44f53ae86f5dd1eac62 (commit)
      from  4b709d0ab1dc39e1f11026dfb6d5ef8c94188383 (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=cf037d79f05ad4e6b713b44f53ae86f5dd1eac62


commit cf037d79f05ad4e6b713b44f53ae86f5dd1eac62
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Jan 26 15:11:40 2020 +0100

    Examination of testing scripts.
    
    Mainly a large case of new indentation.  Some small fixes.

diff --git a/ChangeLog b/ChangeLog
index e772da4..767b8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2020-01-26  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Examination of testing scripts.
+
+	* tests/ftp-localhost.sh [TEST_IPV4 && TARGET]: Implement one
+	additional level of indentation in this large text block.
+	Some additional fixes of indentation and improved readability.
+
+	* tests/inetd.sh: Improve regex when refusing test directories.
+	* tests/syslogd.sh: Likewise.
+	* tests/ping-localhost.sh: Use back quotes for portability.
+	* tests/traceroute-localhost.sh: Likewise.
+
 2020-01-24  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	runtime-ipv6: Implicit dependency on services file.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 1b9a082..94029cc 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -119,7 +119,7 @@ if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"; then
     exit 77
 fi
 
-if test $(func_id_uid) != 0; then
+if test `func_id_uid` != 0; then
     echo "ftpd needs to run as root" >&2
     exit 77
 fi
@@ -356,144 +356,136 @@ test_report () {
 }
 
 if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
-### TODO: Fix indentation within this conditional.
+    # Test a passive connection: PASV and IPv4.
+    #
+    echo "PASV to $TARGET (IPv4) using inetd."
+    cat <<-STOP |
+	rstatus
+	dir
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
+	STOP
+    HOME=$TMPDIR \
+	$FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
 
-# Test a passive connection: PASV and IPv4.
-#
-echo "PASV to $TARGET (IPv4) using inetd."
-cat <<STOP |
-rstatus
-dir
-`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
-STOP
-HOME=$TMPDIR $FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
-
-test_report $? "$TMPDIR/ftp.stdout" "PASV/$TARGET"
-
-$do_transfer && \
-    if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
-	test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
-	date "+%s" >> "$TMPDIR/$GETME"
-    else
-	echo >&2 'Binary transfer failed.'
-	exit 1
-    fi
+    test_report $? "$TMPDIR/ftp.stdout" "PASV/$TARGET"
 
-# Test an active connection: PORT and IPv4.
-#
-echo "PORT to $TARGET (IPv4) using inetd."
-cat <<STOP |
-rstatus
-dir
-`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
-STOP
-HOME=$TMPDIR $FTP "$TARGET" $PORT -4 -v -t >$TMPDIR/ftp.stdout 2>&1
-
-test_report $? "$TMPDIR/ftp.stdout" "PORT/$TARGET"
-
-$do_transfer && \
-    if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
-	test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
-	date "+%s" >> "$TMPDIR/$GETME"
-    else
-	echo >&2 'Binary transfer failed.'
-	exit 1
-    fi
+    $do_transfer && \
+	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
+	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
+	    date "+%s" >> "$TMPDIR/$GETME"
+	else
+	    echo >&2 'Binary transfer failed.'
+	    exit 1
+	fi
 
-# Test a passive connection: EPSV and IPv4.
-#
-echo "EPSV to $TARGET (IPv4) using inetd."
-cat <<STOP |
-rstatus
-epsv4
-dir
-STOP
-HOME=$TMPDIR $FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+    # Test an active connection: PORT and IPv4.
+    #
+    echo "PORT to $TARGET (IPv4) using inetd."
+    cat <<-STOP |
+	rstatus
+	dir
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
+	STOP
+    HOME=$TMPDIR \
+	$FTP "$TARGET" $PORT -4 -v -t >$TMPDIR/ftp.stdout 2>&1
 
-test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET"
+    test_report $? "$TMPDIR/ftp.stdout" "PORT/$TARGET"
 
-# Test a passive connection: EPSV and IPv4.
-#
-# Set NETRC in environment to regulate login.
-#
-echo "EPSV to $TARGET (IPv4) using inetd, setting NETRC."
-cat <<STOP |
-rstatus
-epsv4
-dir
-`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
-STOP
-
-NETRC=$TMPDIR/.netrc \
-  $FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
-
-test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET with NETRC"
-
-$do_transfer && \
-    if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
-	test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
-	date "+%s" >> "$TMPDIR/$GETME"
-    else
-	echo >&2 'Binary transfer failed.'
-	exit 1
-    fi
+    $do_transfer && \
+	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
+	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
+	    date "+%s" >> "$TMPDIR/$GETME"
+	else
+	    echo >&2 'Binary transfer failed.'
+	    exit 1
+	fi
 
-# Test an active connection: EPRT and IPv4.
-#
-echo "EPRT to $TARGET (IPv4) using inetd."
-cat <<STOP |
-rstatus
-epsv4
-dir
-`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
-STOP
-HOME=$TMPDIR $FTP "$TARGET" $PORT -4 -v -t >$TMPDIR/ftp.stdout 2>&1
-
-test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET"
-
-$do_transfer && \
-    if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
-	test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
-	date "+%s" >> "$TMPDIR/$GETME"
-    else
-	echo >&2 'Binary transfer failed.'
-	exit 1
-    fi
+    # Test a passive connection: EPSV and IPv4.
+    #
+    echo "EPSV to $TARGET (IPv4) using inetd."
+    cat <<-STOP |
+	rstatus
+	epsv4
+	dir
+	STOP
+    HOME=$TMPDIR \
+	$FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
 
-# Test an active connection: EPRT and IPv4.
-#
-# Use `-N' to set location of .netrc file.
-#
-echo "EPRT to $TARGET (IPv4) using inetd, apply the switch -N."
-cat <<STOP |
-rstatus
-epsv4
-dir
-STOP
+    test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET"
+
+    # Test a passive connection: EPSV and IPv4.
+    #
+    # Set NETRC in environment to regulate login.
+    #
+    echo "EPSV to $TARGET (IPv4) using inetd, setting NETRC."
+    cat <<-STOP |
+	rstatus
+	epsv4
+	dir
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
+	STOP
+    NETRC=$TMPDIR/.netrc \
+	$FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+
+    test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET with NETRC"
+
+    $do_transfer && \
+	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
+	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
+	    date "+%s" >> "$TMPDIR/$GETME"
+	else
+	    echo >&2 'Binary transfer failed.'
+	    exit 1
+	fi
+
+    # Test an active connection: EPRT and IPv4.
+    #
+    echo "EPRT to $TARGET (IPv4) using inetd."
+    cat <<-STOP |
+	rstatus
+	epsv4
+	dir
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
+	STOP
+    HOME=$TMPDIR \
+	$FTP "$TARGET" $PORT -4 -v -t >$TMPDIR/ftp.stdout 2>&1
+
+    test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET"
+
+    $do_transfer && \
+	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
+	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
+	    date "+%s" >> "$TMPDIR/$GETME"
+	else
+	    echo >&2 'Binary transfer failed.'
+	    exit 1
+	fi
 
-$FTP "$TARGET" $PORT -N"$TMPDIR/.netrc" -4 -v -t >$TMPDIR/ftp.stdout 2>&1
+    # Test an active connection: EPRT and IPv4.
+    #
+    # Use `-N' to set location of .netrc file.
+    #
+    echo "EPRT to $TARGET (IPv4) using inetd, apply the switch -N."
+    cat <<-STOP |
+	rstatus
+	epsv4
+	dir
+	STOP
+    $FTP "$TARGET" $PORT -N"$TMPDIR/.netrc" -4 -v -t >$TMPDIR/ftp.stdout 2>&1
 
-test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET"
+    test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET"
 
 fi # TEST_IPV4 && TARGET
 
@@ -505,7 +497,8 @@ if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
 	rstatus
 	dir
 	STOP
-    HOME=$TMPDIR $FTP "$TARGET6" $PORT -6 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+    HOME=$TMPDIR \
+	$FTP "$TARGET6" $PORT -6 -v -p -t >$TMPDIR/ftp.stdout 2>&1
 
     test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET6"
 
@@ -515,14 +508,13 @@ if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
     cat <<-STOP |
 	rstatus
 	dir
-	`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-	`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
 	STOP
-    HOME=$TMPDIR $FTP "$TARGET6" $PORT -6 -v -t >$TMPDIR/ftp.stdout 2>&1
+    HOME=$TMPDIR \
+	$FTP "$TARGET6" $PORT -6 -v -t >$TMPDIR/ftp.stdout 2>&1
 
     test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET6"
 
@@ -601,14 +593,13 @@ if test "$TEST_IPV4" != "no" &&test "$TEST_IPV6" != "no" &&
     cat <<-STOP |
 	rstatus
 	dir
-	`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-	`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
 	STOP
-    HOME=$TMPDIR $FTP "$TARGET46" $PORT -6 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+    HOME=$TMPDIR \
+	$FTP "$TARGET46" $PORT -6 -v -p -t >$TMPDIR/ftp.stdout 2>&1
 
     test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET46"
 
@@ -627,14 +618,13 @@ put $GETME $PUTME"`
     cat <<-STOP |
 	rstatus
 	dir
-	`$do_transfer && test -n "$DLDIR" && echo "\
-cd $DLDIR"`
-	`$do_transfer && echo "\
-lcd $TMPDIR
-image
-put $GETME $PUTME"`
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
 	STOP
-    HOME=$TMPDIR $FTP "$TARGET46" $PORT -6 -v -t >$TMPDIR/ftp.stdout 2>&1
+    HOME=$TMPDIR \
+	$FTP "$TARGET46" $PORT -6 -v -t >$TMPDIR/ftp.stdout 2>&1
 
     test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET46"
 
@@ -665,7 +655,8 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET" && $do_transfer; then
 	nmap \$1.\$2.\$3 [\$3,copy].\$1.\$2
 	put $GETME
 	STOP
-    HOME=$TMPDIR $FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+    HOME=$TMPDIR \
+	$FTP "$TARGET" $PORT -4 -v -p -t >$TMPDIR/ftp.stdout 2>&1
 
     sIFS=$IFS
     IFS=.
diff --git a/tests/inetd.sh b/tests/inetd.sh
index cf76ab7..188c31c 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -118,8 +118,8 @@ if [ ! -d "$IU_TESTDIR" ]; then
 	    echo 'Failed at creating test directory.  Aborting.' >&2
 	    exit 77
 	}
-elif expr X"$IU_TESTDIR" : X"\.\{1,2\}/\{0,1\}$" >/dev/null; then
-    # Eliminating directories: . ./ .. ../
+elif expr X"$IU_TESTDIR" : X'[./]\{1,\}$' >/dev/null; then
+    # Eliminating directories: all mixtures of . and / only.
     echo 'Dangerous input for test directory.  Aborting.' >&2
     exit 77
 fi
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index ad99fd0..97d647e 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -46,7 +46,7 @@ if test "$TEST_IPV4" = "no" && test "$TEST_IPV6" = "no"; then
     exit 77
 fi
 
-if test $(func_id_uid) != 0; then
+if test `func_id_uid` != 0; then
     echo "ping needs to run as root"
     exit 77
 fi
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index e46b170..8083a11 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -132,8 +132,8 @@ if [ ! -d "$IU_TESTDIR" ]; then
 	    echo 'Failed at creating test directory.  Aborting.' >&2
 	    exit 77
 	}
-elif expr X"$IU_TESTDIR" : X'\.\{1,2\}/\{0,1\}$' >/dev/null; then
-    # Eliminating directories: . ./ .. ../
+elif expr X"$IU_TESTDIR" : X'[./]\{1,\}$' >/dev/null; then
+    # Eliminating directories: all mixtures of . and / only.
     echo 'Dangerous input for test directory.  Aborting.' >&2
     exit 77
 fi
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index df98ffe..7965384 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -43,7 +43,7 @@ if test "$TEST_IPV4" = "no"; then
     exit 77
 fi
 
-if test $(func_id_uid) != 0; then
+if test `func_id_uid` != 0; then
     echo "traceroute needs to run as root"
     exit 77
 fi

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

Summary of changes:
 ChangeLog                     |  13 ++
 tests/ftp-localhost.sh        | 297 ++++++++++++++++++++----------------------
 tests/inetd.sh                |   4 +-
 tests/ping-localhost.sh       |   2 +-
 tests/syslogd.sh              |   4 +-
 tests/traceroute-localhost.sh |   2 +-
 6 files changed, 163 insertions(+), 159 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jan 27 06:50:20 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iw2uK-0005vm-6e
	for mharc-commit-inetutils@gnu.org; Mon, 27 Jan 2020 06:50:20 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:57330)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iw2uG-0005vW-Jo
 for commit-inetutils@gnu.org; Mon, 27 Jan 2020 06:50:18 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:35751)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iw2uG-0004nl-9q
 for commit-inetutils@gnu.org; Mon, 27 Jan 2020 06:50:16 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 2EB9220957; Mon, 27 Jan 2020 06:50:16 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-66-g186074c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cf037d79f05ad4e6b713b44f53ae86f5dd1eac62
X-Git-Newrev: 186074c449d606dc8149af8071d9b9eaff0e9d9d
Message-Id: <20200127115016.2EB9220957@vcs0.savannah.gnu.org>
Date: Mon, 27 Jan 2020 06:50:15 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Mon, 27 Jan 2020 11:50:18 -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  186074c449d606dc8149af8071d9b9eaff0e9d9d (commit)
      from  cf037d79f05ad4e6b713b44f53ae86f5dd1eac62 (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=186074c449d606dc8149af8071d9b9eaff0e9d9d


commit 186074c449d606dc8149af8071d9b9eaff0e9d9d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Jan 27 12:46:13 2020 +0100

    Portability to an old Bourne shell.

diff --git a/ChangeLog b/ChangeLog
index 767b8a4..5f38929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2020-01-27  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Portability to an old Solaris shell.
+
+	* tests/tools.sh.in (EGREP, FGREP, RUNTIME_IPV4, RUNTIME_IPV6):
+	Inside parameter substitution, put value between quotes, since
+	some old shells stumble on non-quoted space characters.
+	* tests/ifconfig.sh (evaluation of FORMAT): Likewise.
+
+	Make sure that scripts are individually executable.
+
+	* tests/ftp-parser.sh (EXEEXT): Test empty before reading tools.sh.
+	* tests/libls.sh (EXEEXT): Likewise.
+	* tests/ifconfig_modes.sh: Read tools.sh.
+
 2020-01-26  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Examination of testing scripts.
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index f7491b7..1be8319 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -23,9 +23,10 @@
 
 set -u
 
+: ${EXEEXT:=}
+
 . ./tools.sh
 
-: ${EXEEXT:=}
 silence=
 bucket=
 
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 26523c7..2fdbcd5 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -104,7 +104,7 @@ errno=0
 # Check for loopback address in all formats displaying the
 # standard address $TARGET, commonly 127.0.0.1.
 #
-for fmt in ${FORMAT:-gnu gnu-one-entry net-tools osf unix}; do
+for fmt in ${FORMAT:-"gnu gnu-one-entry net-tools osf unix"}; do
     $silence echo "Checking format $fmt."
     find_lo_addr $fmt || { errno=1; echo >&2 "Failed with format '$fmt'."; }
 done
diff --git a/tests/ifconfig_modes.sh b/tests/ifconfig_modes.sh
index cbd8521..3c1a81e 100644
--- a/tests/ifconfig_modes.sh
+++ b/tests/ifconfig_modes.sh
@@ -49,6 +49,8 @@ set -u
 
 : ${EXEEXT:=}
 
+. ./tools.sh
+
 silence=
 if test -z "${VERBOSE+set}"; then
   silence=:
diff --git a/tests/libls.sh b/tests/libls.sh
index d379cdb..b8d048d 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -22,9 +22,10 @@
 
 set -u
 
+: ${EXEEXT:=}
+
 . ./tools.sh
 
-: ${EXEEXT:=}
 silence=
 bucket=
 
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 403ffca..44b47c9 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -18,8 +18,8 @@
 # Helpers and supporting functionality for test scripts.
 
 GREP=${GREP:-@GREP@}
-EGREP=${EGREP:-@EGREP@}
-FGREP=${FGREP:-@FGREP@}
+EGREP=${EGREP:-"@EGREP@"}
+FGREP=${FGREP:-"@FGREP@"}
 SED=${SED:-@SED@}
 DD=${DD:-@DD@}
 MKTEMP=${MKTEMP:-@MKTEMP@}
@@ -29,8 +29,8 @@ TARGET6=${TARGET6:-@TARGET6@}
 TEST_IPV4=${TEST_IPV4:-@TEST_IPV4@}
 TEST_IPV6=${TEST_IPV6:-@TEST_IPV6@}
 
-RUNTIME_IPV4="${RUNTIME_IPV4:-./runtime-ipv6$EXEEXT -4}"
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+RUNTIME_IPV4=${RUNTIME_IPV4:-"./runtime-ipv6$EXEEXT -4"}
+RUNTIME_IPV6=${RUNTIME_IPV6:-"./runtime-ipv6$EXEEXT -6"}
 
 # Avoid IPv4 when not functional.
 if test "$TEST_IPV4" = "auto"; then

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

Summary of changes:
 ChangeLog               | 15 +++++++++++++++
 tests/ftp-parser.sh     |  3 ++-
 tests/ifconfig.sh       |  2 +-
 tests/ifconfig_modes.sh |  2 ++
 tests/libls.sh          |  3 ++-
 tests/tools.sh.in       |  8 ++++----
 6 files changed, 26 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Jan 28 11:03:10 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iwTKY-0003su-Lm
	for mharc-commit-inetutils@gnu.org; Tue, 28 Jan 2020 11:03:10 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:44105)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iwTKU-0003rm-Iv
 for commit-inetutils@gnu.org; Tue, 28 Jan 2020 11:03:08 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:36882)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iwTKU-0003H0-69
 for commit-inetutils@gnu.org; Tue, 28 Jan 2020 11:03:06 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 0B71920997; Tue, 28 Jan 2020 11:03:06 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-67-g45f0ab0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 186074c449d606dc8149af8071d9b9eaff0e9d9d
X-Git-Newrev: 45f0ab0a8f6db70c01b38918c6a7e51bd0ca7935
Message-Id: <20200128160306.0B71920997@vcs0.savannah.gnu.org>
Date: Tue, 28 Jan 2020 11:03:05 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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: Tue, 28 Jan 2020 16:03:09 -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  45f0ab0a8f6db70c01b38918c6a7e51bd0ca7935 (commit)
      from  186074c449d606dc8149af8071d9b9eaff0e9d9d (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=45f0ab0a8f6db70c01b38918c6a7e51bd0ca7935


commit 45f0ab0a8f6db70c01b38918c6a7e51bd0ca7935
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Jan 28 16:59:34 2020 +0100

    Better test coverage, mostly IPv6.
    
    Test IPv6 equally much as is IPv4, whenever possible.

diff --git a/ChangeLog b/ChangeLog
index 5f38929..843fbf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2020-01-28  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Better test coverage, mostly IPv6.
+
+	* tests/ftp-localhost.sh [TEST_IPV6 && TARGET6]: Add the possible
+	test cases that existed for IPv4, but did not for IPv6.
+	[do_transfer]: Explicitly remove copied $PUTME for reliability.
+	[TEST_IPV6 && TARGET6 && do_transfer]: New test for name mapping.
+	* tests/syslogd.sh [do_unix_socket || do_inet_socket]: Do priority
+	`notice' for each of local socket, IPv4 socket, and IPv6 socket,
+	as is applicable.
+	(COUNT_WRAP): Reworked calculation on grounds as above.
+	[do_inet_socket && TEST_IPV6 && TARGET6]: Test facilities `user.info'
+	and `user.debug' with IPv6.
+	* tests/tftp.sh (do_secure_setting): Test all of $ADDRESSES.
+
+	* tests/.gitignore: Add runtime-ipv6 to list.
+
 2020-01-27  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Portability to an old Solaris shell.
diff --git a/tests/.gitignore b/tests/.gitignore
index bb8b2f6..fca2178 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -3,6 +3,7 @@ identify
 localhost
 ls
 readutmp
+runtime-ipv6
 tcpget
 tools.sh
 waitdaemon
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 94029cc..8f6d5de 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -372,7 +372,7 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 
     test_report $? "$TMPDIR/ftp.stdout" "PASV/$TARGET"
 
-    $do_transfer && \
+    $do_transfer && {
 	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
 	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
 	    date "+%s" >> "$TMPDIR/$GETME"
@@ -380,6 +380,8 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
 
     # Test an active connection: PORT and IPv4.
     #
@@ -397,7 +399,7 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 
     test_report $? "$TMPDIR/ftp.stdout" "PORT/$TARGET"
 
-    $do_transfer && \
+    $do_transfer && {
 	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
 	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
 	    date "+%s" >> "$TMPDIR/$GETME"
@@ -405,6 +407,8 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
 
     # Test a passive connection: EPSV and IPv4.
     #
@@ -438,7 +442,7 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 
     test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET with NETRC"
 
-    $do_transfer && \
+    $do_transfer && {
 	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
 	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
 	    date "+%s" >> "$TMPDIR/$GETME"
@@ -446,6 +450,8 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
 
     # Test an active connection: EPRT and IPv4.
     #
@@ -464,7 +470,7 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 
     test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET"
 
-    $do_transfer && \
+    $do_transfer && {
 	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
 	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
 	    date "+%s" >> "$TMPDIR/$GETME"
@@ -472,6 +478,8 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
 
     # Test an active connection: EPRT and IPv4.
     #
@@ -502,6 +510,35 @@ if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
 
     test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET6"
 
+    # Test a passive connection: EPSV and IPv6.
+    #
+    # Set NETRC in environment to regulate login.
+    #
+    echo "EPSV to $TARGET6 (IPv6) using inetd, setting NETRC."
+    cat <<-STOP |
+	rstatus
+	dir
+	`$do_transfer && test -n "$DLDIR" && echo "cd $DLDIR"`
+	`$do_transfer && echo "lcd $TMPDIR
+	image
+	put $GETME $PUTME"`
+	STOP
+    NETRC=$TMPDIR/.netrc \
+	$FTP "$TARGET6" $PORT -6 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+
+    test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET6 with NETRC"
+
+    $do_transfer && {
+	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
+	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
+	    date "+%s" >> "$TMPDIR/$GETME"
+	else
+	    echo >&2 'Binary transfer failed.'
+	    exit 1
+	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
+
     # Test an active connection: EPRT and IPv6.
     #
     echo "EPRT to $TARGET6 (IPv6) using inetd."
@@ -518,14 +555,30 @@ if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
 
     test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET6"
 
-    $do_transfer && \
-    if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
-	test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
-	date "+%s" >> "$TMPDIR/$GETME"
-    else
-	echo >&2 'Binary transfer failed.'
-	exit 1
-    fi
+    $do_transfer && {
+	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
+	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
+	    date "+%s" >> "$TMPDIR/$GETME"
+	else
+	    echo >&2 'Binary transfer failed.'
+	    exit 1
+	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
+
+    # Test an active connection: EPRT and IPv6.
+    #
+    # Use `-N' to set location of .netrc file.
+    #
+    echo "EPRT to $TARGET6 (IPv6) using inetd, apply the switch -N."
+    cat <<-STOP |
+	rstatus
+	dir
+	STOP
+    $FTP "$TARGET6" $PORT -N"$TMPDIR/.netrc" -6 -v -t >$TMPDIR/ftp.stdout 2>&1
+
+    test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET6"
+
 fi # TEST_IPV6 && TARGET6
 
 # Availability of IPv4-mapped IPv6 addresses.
@@ -603,7 +656,7 @@ if test "$TEST_IPV4" != "no" &&test "$TEST_IPV6" != "no" &&
 
     test_report $? "$TMPDIR/ftp.stdout" "EPSV/$TARGET46"
 
-    $do_transfer && \
+    $do_transfer && {
 	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
 	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
 	    date "+%s" >> "$TMPDIR/$GETME"
@@ -611,8 +664,10 @@ if test "$TEST_IPV4" != "no" &&test "$TEST_IPV6" != "no" &&
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
 
-    # Test an active connection: EPRT and IPvIPv6.
+    # Test an active connection: EPRT and IPv4-mapped-IPv6.
     #
     echo "EPRT to $TARGET46 (IPv4-as-IPv6) using inetd."
     cat <<-STOP |
@@ -628,13 +683,15 @@ if test "$TEST_IPV4" != "no" &&test "$TEST_IPV6" != "no" &&
 
     test_report $? "$TMPDIR/ftp.stdout" "EPRT/$TARGET46"
 
-    $do_transfer && \
+    $do_transfer && {
 	if cmp -s "$TMPDIR/$GETME" "$FTPHOME$DLDIR/$PUTME"; then
 	    test "${VERBOSE+yes}" && echo >&2 'Binary transfer succeeded.'
 	else
 	    echo >&2 'Binary transfer failed.'
 	    exit 1
 	fi
+	rm -f "$FTPHOME$DLDIR/$PUTME"
+    }
 elif test "$TEST_IPV4" != "no" || test "$TEST_IPV6" != "no"; then
     # The IPv4-as-IPv6 tests were not performed.
     echo 'Skipping two tests of IPv4 mapped as IPv6.'
@@ -681,4 +738,45 @@ if test "$TEST_IPV4" != "no" && test -n "$TARGET" && $do_transfer; then
     fi
 fi # TEST_IPV4 && TARGET && do_transfer
 
+# Test name mapping with EPSV and IPv6.
+# Needs a writable destination!
+#
+if test "$TEST_IPV6" != "no" && test -n "$TARGET6" && $do_transfer; then
+    echo "Name mapping test at $TARGET6 (IPv6) using inetd."
+
+    cat <<-STOP |
+	`test -z "$DLDIR" || echo "cd $DLDIR"`
+	lcd $TMPDIR
+	image
+	nmap \$1.\$2 \$2.\$1
+	put $GETME
+	nmap \$1.\$2.\$3 [\$3,decoy].\$1.\$2
+	put $GETME
+	STOP
+    HOME=$TMPDIR \
+	$FTP "$TARGET6" $PORT -6 -v -p -t >$TMPDIR/ftp.stdout 2>&1
+
+    sIFS=$IFS
+    IFS=.
+    set -- $GETME
+    IFS=$sIFS
+
+    # Are the expected file copies present?
+
+    if test -s $FTPHOME$DLDIR/$2.$1 && \
+	test -s $FTPHOME$DLDIR/decoy.$GETME
+    then
+	test "${VERBOSE+yes}" && echo >&2 'Name mapping succeeded.'
+	rm -f $FTPHOME$DLDIR/$2.$1 $FTPHOME$DLDIR/decoy.$GETME
+    else
+	echo >&2 'Binary transfer failed.'
+	test -s $FTPHOME$DLDIR/$2.$1 || \
+	    echo >&2 'Mapping "nmap $1.$2 $2.$1" failed.'
+	test -s $FTPHOME$DLDIR/copy.$GETME || \
+	    echo >&2 'Mapping "nmap $1.$2.$3 [$3,decoy].$1.$2" failed.'
+	rm -f $FTPHOME$DLDIR/$2.$1 $FTPHOME$DLDIR/decoy.$GETME
+	exit 1
+    fi
+fi # TEST_IPV6 && TARGET6 && do_transfer
+
 exit 0
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 8083a11..19e5209 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -443,22 +443,35 @@ if $do_inet_socket; then
 	TESTCASES=`expr $TESTCASES + 1`
 	$LOGGER -6 -h "[$TARGET6]:$PORT" -p user.info -t "$TAG" \
 	    "Sending IPv6 message. (pid $$)"
-    fi # TEST_IPV6 && TARGET
+    fi # TEST_IPV6 && TARGET6
 fi # do_inet_socket
 
-# Send message of priority notice, either via local socket or IPv4,
-# but not both.  The presence is checked in $OUT and in $OUT_NOTICE,
-# so merit value is 2.
+# Send message of priority notice, via local socket, IPv4, or IPv6,
+# whatever is there.  The presence is checked in $OUT and in $OUT_NOTICE,
+# so merit value is 2 for each placed message.
+COUNT_WRAP=0
+
 if $do_unix_socket; then
     TESTCASES=`expr $TESTCASES + 2`
+    COUNT_WRAP=`expr $COUNT_WRAP + 1`
     $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
-	"Attemping to locate wrapped configuration. (pid $$)"
-elif $do_inet_socket; then
+	"Attempting to locate wrapped unix configuration. (pid $$)"
+fi # do_unix_socket
+
+if $do_inet_socket; then
     if test "$TEST_IPV4" != "no" && test -n "$TARGET"; then
 	TESTCASES=`expr $TESTCASES + 2`
+	COUNT_WRAP=`expr $COUNT_WRAP + 1`
 	$LOGGER -4 -h "$TARGET:$PORT" -p daemon.notice -t "$TAG" \
-	    "Attemping to locate wrapped configuration. (pid $$)"
+	    "Attempting to locate wrapped IPv4 configuration. (pid $$)"
     fi # TEST_IPV4 && TARGET
+
+    if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
+	TESTCASES=`expr $TESTCASES + 2`
+	COUNT_WRAP=`expr $COUNT_WRAP + 1`
+	$LOGGER -6 -h "[$TARGET6]:$PORT" -p daemon.notice -t "$TAG" \
+	    "Attempting to locate wrapped IPv6 configuration. (pid $$)"
+    fi # TEST_IPV6 && TARGET6
 fi # do_inet_socket
 
 # Generate a more elaborate message routing, aimed at confirming
@@ -550,6 +563,14 @@ if $do_inet_socket; then
 	$LOGGER -4 -h "$TARGET:$PORT" -p user.debug -t "$TAG2" \
 	    "user.debug as IPv4 message. (pid $$)"
     fi # TEST_IPV4 && TARGET
+
+    if test "$TEST_IPV6" != "no" && test -n "$TARGET6"; then
+	TESTCASES=`expr $TESTCASES + 4`
+	$LOGGER -6 -h "[$TARGET6]:$PORT" -p user.info -t "$TAG2" \
+	    "user.info as IPv6 message. (pid $$)"
+	$LOGGER -6 -h "[$TARGET6]:$PORT" -p user.debug -t "$TAG2" \
+	    "user.debug as IPv6 message. (pid $$)"
+    fi # TEST_IPV6 && TARGET6
 fi # do_inet_socket
 
 # Remove previous SYSLOG daemon.
@@ -602,9 +623,10 @@ COUNT=`$GREP -c "$TAG" "$OUT"`
 COUNT_NOTICE=`$SED -n '$=' "$OUT_NOTICE"`
 wrapped=`$FGREP -c -f "$OUT_NOTICE" "$OUT"`
 
-COUNT_WRAP=0
+# Provoke a later total miscount, if message counts do not match now.
 if $do_unix_socket || $do_inet_socket; then
-    test $COUNT_NOTICE -ne $wrapped || COUNT_WRAP=1
+    test $COUNT_NOTICE -eq $wrapped ||
+	COUNT_WRAP=`expr $COUNT_WRAP - $COUNT_NOTICE + $wrapped`
 fi
 
 # Second set-up after SIGHUP.
diff --git a/tests/tftp.sh b/tests/tftp.sh
index e2fdf60..d7d016c 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -446,37 +446,46 @@ if $do_secure_setting; then
     # Let inetd reload configuration.
     kill -HUP $inetd_pid
 
-    # Test two files: file-small and asciifile.txt
+    # Test two files for each address: file-small and asciifile.txt
     #
-    addr=`echo $ADDRESSES | $SED 's/ .*//'`
-    name=`echo "$FILELIST" | $SED 's/ .*//'`
-    rm -f "$name" "$ASCIIFILE"
-    EFFORTS=`expr $EFFORTS + 2`
-
-    echo "binary
-get $name
-ascii
-get /tftp-test/$ASCIIFILE" | \
-    eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
-
-    cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
-    result=$?
-    if test $? -ne 0; then
-	$silence echo >&2 "Failed chrooted access to $name."
-	RESULT=$result
-    else
-	$silence echo >&2 "Success with chrooted access to $name."
-	SUCCESSES=`expr $SUCCESSES + 1`
-    fi
-    cmp "$TMPDIR/tftp-test/$ASCIIFILE" "$ASCIIFILE" 2>/dev/null
-    result=$?
-    if test $? -ne 0; then
-	$silence echo >&2 "Failed chrooted access to /tftp-test/$ASCIIFILE."
-	RESULT=$result
-    else
-	$silence echo >&2 "Success with chrooted /tftp-test/$ASCIIFILE."
-	SUCCESSES=`expr $SUCCESSES + 1`
-    fi
+    name=`echo $FILELIST | $SED 's/ .*//'`
+
+    for addr in $ADDRESSES; do
+	rm -f "$name" "$ASCIIFILE"
+	EFFORTS=`expr $EFFORTS + 2`
+
+	cat <<-EOT |
+		binary
+		get $name
+		ascii
+		get /tftp-test/$ASCIIFILE
+	EOT
+	eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
+
+	cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
+	result=$?
+
+	if test $? -ne 0; then
+	    $silence echo >&2 "Failed chrooted access to $addr:$name."
+	    RESULT=$result
+	else
+	    $silence echo >&2 "Success with chrooted access to $addr:$name."
+	    SUCCESSES=`expr $SUCCESSES + 1`
+	fi
+
+	cmp "$TMPDIR/tftp-test/$ASCIIFILE" "$ASCIIFILE" 2>/dev/null
+	result=$?
+
+	if test $? -ne 0; then
+	    $silence echo >&2 \
+		"Failed chrooted access to $addr:/tftp-test/$ASCIIFILE."
+	    RESULT=$result
+	else
+	    $silence echo >&2 \
+	    "Success with chrooted $addr:/tftp-test/$ASCIIFILE."
+	    SUCCESSES=`expr $SUCCESSES + 1`
+	fi
+    done # addr in ADDRESSES
 else
     $silence echo >&2 'Informational: Inhibiting chroot test.'
 fi

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

Summary of changes:
 ChangeLog              |  18 +++++++
 tests/.gitignore       |   1 +
 tests/ftp-localhost.sh | 128 +++++++++++++++++++++++++++++++++++++++++++------
 tests/syslogd.sh       |  40 ++++++++++++----
 tests/tftp.sh          |  69 ++++++++++++++------------
 5 files changed, 202 insertions(+), 54 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jan 29 15:13:45 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1iwtib-0003DU-IR
	for mharc-commit-inetutils@gnu.org; Wed, 29 Jan 2020 15:13:45 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:37540)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1iwtiY-0003BA-9o
 for commit-inetutils@gnu.org; Wed, 29 Jan 2020 15:13:44 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:46430)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1iwtiX-0002xz-Vc
 for commit-inetutils@gnu.org; Wed, 29 Jan 2020 15:13:42 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id D875A21627; Wed, 29 Jan 2020 15:13:41 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-68-g07fdb42
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 45f0ab0a8f6db70c01b38918c6a7e51bd0ca7935
X-Git-Newrev: 07fdb4201a3a5e6df92c0929c65671ce4ba8af5a
Message-Id: <20200129201341.D875A21627@vcs0.savannah.gnu.org>
Date: Wed, 29 Jan 2020 15:13:41 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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, 29 Jan 2020 20:13:44 -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  07fdb4201a3a5e6df92c0929c65671ce4ba8af5a (commit)
      from  45f0ab0a8f6db70c01b38918c6a7e51bd0ca7935 (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=07fdb4201a3a5e6df92c0929c65671ce4ba8af5a


commit 07fdb4201a3a5e6df92c0929c65671ce4ba8af5a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jan 29 21:07:10 2020 +0100

    More work on CVE-2019-0053.
    
    Telnet protocol messages must remain sane at all costs, instead of
    being truncated because indata was oversized.  Some additional cases
    of insufficient buffer declaration are corrected.

diff --git a/ChangeLog b/ChangeLog
index 843fbf6..6dbb150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2020-01-29  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	More work on CVE-2019-0053.
+	Telnet protocol messages must not be corrupted when buffer
+	overflows are detected, but should be reported as errors.
+
+	* telnet/telnet.c (suboption): Check that prepared protocol
+	message in fact fits in intermediary buffer without truncation.
+	Tweak indentation for visibility of protocol elements in snprintf.
+
+	Allocate space also for final NUL-character.
+
+	* telnetd/telnetd.c (telnetdrun): Increase DATA string size by one.
+	* telnetd/termstat.c (localstat, flowstat, clientstat): Likewise.
+
+	Insufficiently declared length of string variable.
+
+	* telnetd/utility.c (printsub): Declare TBUF with maximal extent.
+
 2020-01-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Better test coverage, mostly IPv6.
diff --git a/telnet/telnet.c b/telnet/telnet.c
index f42957e..297ae0e 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -859,10 +859,13 @@ suboption (void)
 #endif /* defined(TN3270) */
 	  name = gettermname ();
 	  len = strlen (name) + 4 + 2;
-	  if (len < NETROOM ())
+
+	  if ((len < NETROOM ()) && (len <= sizeof (temp)))
 	    {
-	      snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
-		       TELQUAL_IS, name, IAC, SE);
+	      snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%s%c%c",
+			IAC, SB, TELOPT_TTYPE, TELQUAL_IS,
+			name,
+			IAC, SE);
 	      ring_supply_data (&netoring, temp, len);
 	      printsub ('>', &temp[2], len - 2);
 	    }
@@ -880,13 +883,15 @@ suboption (void)
       if (SB_GET () == TELQUAL_SEND)
 	{
 	  long ospeed, ispeed;
-	  unsigned char temp[50];
+	  unsigned char temp[50];	/* Two six-digit integers plus 7.  */
 	  int len;
 
 	  TerminalSpeeds (&ispeed, &ospeed);
 
-	  snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED,
-		   TELQUAL_IS, (int) ospeed, (int) ispeed, IAC, SE);
+	  snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%d,%d%c%c",
+		    IAC, SB, TELOPT_TSPEED, TELQUAL_IS,
+		    (int) ospeed, (int) ispeed,
+		    IAC, SE);
 	  len = strlen ((char *) temp + 4) + 4;	/* temp[3] is 0 ... */
 
 	  if (len < NETROOM ())
@@ -999,8 +1004,23 @@ suboption (void)
 	      send_wont (TELOPT_XDISPLOC, 1);
 	      break;
 	    }
-	  snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
-		   TELQUAL_IS, dp, IAC, SE);
+
+	  /* Remote host, and display server must not be corrupted
+	   * by truncation.  In addition, every character of telnet
+	   * protocol must remain unsevered.  Check that DP fits in
+	   * full within TEMP.  Otherwise report buffer error.
+	   */
+	  if (strlen (dp) > sizeof (temp) - 4 - 2)
+	    {
+	      printf ("lm_will: not enough room in buffer\n");
+	      break;
+	    }
+
+	  /* Go ahead safely.  */
+	  snprintf ((char *) temp, sizeof (temp), "%c%c%c%c%s%c%c",
+		    IAC, SB, TELOPT_XDISPLOC, TELQUAL_IS,
+		    dp,
+		    IAC, SE);
 	  len = strlen ((char *) temp + 4) + 4;	/* temp[3] is 0 ... */
 
 	  if (len < NETROOM ())
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index a3badbe..048ed13 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -704,7 +704,7 @@ telnetd_run (void)
 	      int newflow = (c & TIOCPKT_DOSTOP) ? 1 : 0;
 	      if (newflow != flowmode)
 		{
-		  char data[6];
+		  char data[7];
 
 		  sprintf (data, "%c%c%c%c%c%c",
 			   IAC, SB, TELOPT_LFLOW,
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index daeea00..6f94da0 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -304,7 +304,7 @@ localstat (void)
 	}
       else if (lmodetype == REAL_LINEMODE)
 	{
-	  char data[7];
+	  char data[8];
 
 	  send_do (TELOPT_LINEMODE, 1);
 	  /* send along edit modes */
@@ -339,7 +339,7 @@ localstat (void)
 	  /*
 	   * Send along appropriate edit mode mask.
 	   */
-	  char data[7];
+	  char data[8];
 
 	  sprintf (data, "%c%c%c%c%c%c%c",
 		   IAC, SB, TELOPT_LINEMODE,
@@ -391,7 +391,7 @@ flowstat (void)
 {
   if (his_state_is_will (TELOPT_LFLOW))
     {
-      char data[6];
+      char data[7];
 
       if (tty_flowmode () != flowmode)
 	{
@@ -476,7 +476,7 @@ clientstat (register int code, register int parm1, register int parm2)
 	  if (lmodetype == REAL_LINEMODE && uselinemode)
 	    if (uselinemode)
 	      {
-		char data[7];
+		char data[8];
 
 		useeditmode = 0;
 		if (tty_isediting ())
@@ -553,7 +553,7 @@ clientstat (register int code, register int parm1, register int parm2)
 
 	    if (!ack)
 	      {
-		char data[7];
+		char data[8];
 
 		sprintf (data, "%c%c%c%c%c%c%c",
 			 IAC, SB, TELOPT_LINEMODE,
diff --git a/telnetd/utility.c b/telnetd/utility.c
index dc87e9a..42f624e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1225,7 +1225,8 @@ printsub (int direction, unsigned char *pointer, int length)
 	      break;
 	    }
 	  {
-	    char tbuf[32];
+	    char tbuf[sizeof ("|EDIT|TRAPSIG|SOFT_TAB|LIT_ECHO|ACK")];
+
 	    snprintf (tbuf, sizeof (tbuf), "%s%s%s%s%s",
 		      pointer[2] & MODE_EDIT ? "|EDIT" : "",
 		      pointer[2] & MODE_TRAPSIG ? "|TRAPSIG" : "",

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

Summary of changes:
 ChangeLog          | 19 +++++++++++++++++++
 telnet/telnet.c    | 36 ++++++++++++++++++++++++++++--------
 telnetd/telnetd.c  |  2 +-
 telnetd/termstat.c | 10 +++++-----
 telnetd/utility.c  |  3 ++-
 5 files changed, 55 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jan 31 11:08:37 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1ixYqT-0002Fx-8Z
	for mharc-commit-inetutils@gnu.org; Fri, 31 Jan 2020 11:08:37 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:34505)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1ixYqN-00020o-UH
 for commit-inetutils@gnu.org; Fri, 31 Jan 2020 11:08:35 -0500
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:41187)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1ixYqN-0003f7-IB
 for commit-inetutils@gnu.org; Fri, 31 Jan 2020 11:08:31 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 7D25B2039F; Fri, 31 Jan 2020 11:08:31 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-70-g0fac847
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 07fdb4201a3a5e6df92c0929c65671ce4ba8af5a
X-Git-Newrev: 0fac847c6de53bf925c3778ea1ad65e76d0e5480
Message-Id: <20200131160831.7D25B2039F@vcs0.savannah.gnu.org>
Date: Fri, 31 Jan 2020 11:08:30 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
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, 31 Jan 2020 16:08:35 -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  0fac847c6de53bf925c3778ea1ad65e76d0e5480 (commit)
       via  140dc2217cc687f9eabffabbeb67703f30933675 (commit)
      from  07fdb4201a3a5e6df92c0929c65671ce4ba8af5a (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=0fac847c6de53bf925c3778ea1ad65e76d0e5480


commit 0fac847c6de53bf925c3778ea1ad65e76d0e5480
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jan 31 17:05:42 2020 +0100

    whois: IP delegation update.

diff --git a/ChangeLog b/ChangeLog
index a73c140..59b1950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2020-01-31  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	whois: IP delegation update.
+
+	* whois/ip_del_list: Update with entries as stated by IANA
+	with publication date 2019-12-27.
+
+2020-01-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	whois: Failure of service name.
 	The IANA has made badly founded changes to the list of port names,
 	promoting `nicname' and introducing the aliases list `Who Is',
diff --git a/whois/ip_del_list b/whois/ip_del_list
index 25cbf26..06d3509 100644
--- a/whois/ip_del_list
+++ b/whois/ip_del_list
@@ -15,13 +15,55 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
+#
+# Collected from
+#
+# IANA IPv4 Address Space Registry: 2019-12-27
+#
+
+1.0.0.0/8	apnic
+2.0.0.0/8	ripe
+5.0.0.0/8	ripe
+14.0.0.0/8	apnic
 24.192.0.0/14	apnic
 24.132.0.0/14	ripe
-61.0.0.0/8	apnic
+25.0.0.0/8	ripe	# administered
+27.0.0.0/8	apnic
+31.0.0.0/8	ripe
+36.0.0.0/8	apnic
+37.0.0.0/8	ripe
+39.0.0.0/8	apnic
+41.0.0.0/8	afrinic
+42.0.0.0/7	apnic
+46.0.0.0/8	ripe
+49.0.0.0/8	apnic
+51.0.0.0/8	ripe	# administered
+53.0.0.0/8	ripe	# Daimler AG
+57.0.0.0/8	ripe	# administered
+58.0.0.0/7	apnic
+60.0.0.0/7	apnic
 62.0.0.0/8	ripe
 63.208.0.0/13	rr.level3.net
+77.0.0.0/8	ripe
+78.0.0.0/7	ripe
+80.0.0.0/4	ripe
+101.0.0.0/8	apnic
+102.0.0.0/8	afrinic
+103.0.0.0/8	apnic
+105.0.0.0/8	afrinic
+106.0.0.0/8	apnic
+109.0.0.0/8	ripe
+110.0.0.0/7	apnic
+112.0.0.0/6	apnic
+116.0.0.0/6	apnic
+120.0.0.0/6	apnic
+124.0.0.0/6	apnic
 0.0.0.0/2	arin	# all other A classes are managed by ARIN
+
 ## The B class space is a mess :-( - something could still be missing
+# Ranges administered by ARIN are caught by default.
+#
+133.0.0.0/8	apnic	# administered
 139.20.0.0/14	ripe
 139.24.0.0/14	ripe
 139.28.0.0/15	ripe
@@ -29,11 +71,13 @@
 141.64.0.0/12	ripe
 141.80.0.0/14	ripe
 141.84.0.0/15	ripe
+141.0.0.0/8	ripe	# administered
 145.224.0.0/12	ripe
 145.240.0.0/13	ripe
 145.248.0.0/14	ripe
 145.252.0.0/15	ripe
 145.254.0.0/16	ripe
+145.0.0.0/8	ripe	# administered
 149.202.0.0/15	ripe
 149.204.0.0/16	ripe
 149.206.0.0/15	ripe
@@ -42,6 +86,7 @@
 149.240.0.0/13	ripe
 149.248.0.0/14	ripe
 150.254.0.0/16	ripe
+150.0.0.0/8	apnic	# administered
 151.13.0.0/16	ripe
 151.14.0.0/15	ripe
 151.16.0.0/12	ripe
@@ -55,12 +100,16 @@
 151.92.0.0/15	ripe
 151.95.0.0/16	ripe
 151.99.0.0/16	ripe	# interbusiness
+151.0.0.0/8	ripe	# administered
+153.0.0.0/8	apnic	# administered
+154.0.0.0/8	afrinic	# administered
 160.216.0.0/14	ripe
 160.220.0.0/16	ripe
 160.44.0.0/14	ripe
 160.48.0.0/12	ripe
 163.156.0.0/14	ripe
 163.160.0.0/12	ripe
+163.0.0.0/8	apnic	# administered
 164.0.0.0/11	ripe
 164.32.0.0/13	ripe
 164.40.0.0/16	ripe
@@ -68,6 +117,25 @@
 169.208.0.0/12	apnic
 171.16.0.0/12	ripe
 171.32.0.0/15	ripe
+171.0.0.0/8	apnic	# administered
+173.0.0.0/8	arin
+174.0.0.0/8	arin
+175.0.0.0/8	apnic
+176.0.0.0/8	ripe
+177.0.0.0/8	lacnic
+178.0.0.0/8	ripe
+179.0.0.0/8	lacnic
+180.0.0.0/8	apnic
+181.0.0.0/8	lacnic
+182.0.0.0/7	apnic
+184.0.0.0/8	arin
+185.0.0.0/8	ripe
+186.0.0.0/7	lacnic
+188.0.0.0/8	ripe	# administered
+189.0.0.0/8	lacnic
+190.0.0.0/8	lacnic
+191.0.0.0/8	lacnic	# administered
+
 ## The C class space is cleanly delegated and the data here should be complete
 192.71.0.0/16	ripe
 192.72.0.0/16	whois.seed.net.tw	# NETBLK-SEED-NETS
@@ -78,10 +146,9 @@
 192.0.0.0/8	arin	# the swamp
 193.0.0.0/8	ripe
 194.0.0.0/7	ripe
-198.17.117.0/24	ripe
-196.0.0.0/6	arin
-200.0.0.0/7	arin
-203.0.0.0/10	aunic
+196.0.0.0/7	afrinic	# administered
+198.0.0.0/7	arin	# administered
+200.0.0.0/7	lacnic
 202.0.0.0/7	apnic
 204.0.0.0/6	arin
 208.0.0.0/7	arin
@@ -89,3 +156,6 @@
 212.0.0.0/7	ripe
 214.0.0.0/7	arin	# DoD
 216.0.0.0/8	arin
+217.0.0.0/8	ripe
+218.0.0.0/7	apnic
+220.0.0.0/6	apnic

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


commit 140dc2217cc687f9eabffabbeb67703f30933675
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jan 31 16:54:01 2020 +0100

    whois: Failure of service name.
    
    Some systems have been lured by IANA to remove the service
    name `whois', replacing it with `nicname' and new aliases
    `Who' and `Is'!  Reported by Shahab Vahedi.

diff --git a/ChangeLog b/ChangeLog
index 6dbb150..a73c140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2020-01-31  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	whois: Failure of service name.
+	The IANA has made badly founded changes to the list of port names,
+	promoting `nicname' and introducing the aliases list `Who Is',
+	thus making `Who' and `Is' into functional services, and also
+	loosing `whois'.  Some systems were careless enough to adopt
+	this badly wrought change.  Reported by Shahab Vahedi in:
+	https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00023.html
+
+	* whois/whois.c (openconn): Fall back to service `nicname',
+	should `whois' fail.
+
 2020-01-29  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	More work on CVE-2019-0053.
diff --git a/whois/whois.c b/whois/whois.c
index eaee3ba..785209f 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -574,8 +574,13 @@ openconn (const char *server, const char *port)
   hints.ai_family = AF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
 
+  /* The well-known service name is no longer universally acknowledged,
+   * because IANA has tampered with aliasing, making `Who' and `Is'
+   * into legal and functional aliases.
+   */
   if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0)
-    err_quit ("getaddrinfo: %s", gai_strerror (i));
+    if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0)
+      err_quit ("getaddrinfo: %s", gai_strerror (i));
 
   for (ressave = res; res; res = res->ai_next)
     {

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

Summary of changes:
 ChangeLog         | 20 ++++++++++++++
 whois/ip_del_list | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 whois/whois.c     |  7 ++++-
 3 files changed, 101 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


