From MAILER-DAEMON Tue Jul 20 04:33:12 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m5lBg-0001t9-8V
	for mharc-commit-inetutils@gnu.org; Tue, 20 Jul 2021 04:33:12 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:57234)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m5lBe-0001rG-Q9
 for commit-inetutils@gnu.org; Tue, 20 Jul 2021 04:33:10 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:48713)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m5lBd-0001g0-S0
 for commit-inetutils@gnu.org; Tue, 20 Jul 2021 04:33:09 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 771FC21144; Tue, 20 Jul 2021 04:33:09 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.0-14-g08f9b29
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 42f436e0d6e81a099e8b04e93af75c6e623d9730
X-Git-Newrev: 08f9b29654e935b43eac9984df40ed8c9f69f005
Message-Id: <20210720083309.771FC21144@vcs0.savannah.gnu.org>
Date: Tue, 20 Jul 2021 04:33:09 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jul 2021 08:33: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  08f9b29654e935b43eac9984df40ed8c9f69f005 (commit)
      from  42f436e0d6e81a099e8b04e93af75c6e623d9730 (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=08f9b29654e935b43eac9984df40ed8c9f69f005


commit 08f9b29654e935b43eac9984df40ed8c9f69f005
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jul 20 10:33:05 2021 +0200

    doc: Remove completed TODO item.

diff --git a/TODO b/TODO
index e616e17..7a61a2e 100644
--- a/TODO
+++ b/TODO
@@ -128,8 +128,6 @@ message).
 
 Fix all warnings with autoconf 2.71+
 
-use gitlog-to-changelog instead of manual ChangeLog entries
-
 enhance man pages so they fully supersede NetKit and BSD man pages
 
 generally use gnulib for portability more than we use today:

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

Summary of changes:
 TODO | 2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 09:20:37 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7Ha1-0004VX-Fn
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 09:20:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:34164)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7HZw-0004Sc-VR
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 09:20:32 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:59522)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7HZw-0003tE-8a
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 09:20:32 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id D155F20D0A; Sat, 24 Jul 2021 09:20:31 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.0-18-g23065b1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 08f9b29654e935b43eac9984df40ed8c9f69f005
X-Git-Newrev: 23065b1faf77a10957574d78b6321d875e60304d
Message-Id: <20210724132031.D155F20D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 09:20:31 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 13:20:36 -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  23065b1faf77a10957574d78b6321d875e60304d (commit)
       via  bd972a39953e1a3e090174431e37fa45aa9824de (commit)
       via  01047ced3acb4930997102b8d695848ca0b447b1 (commit)
       via  686b1c287f38a3956acb4bd8d134554ff32101ee (commit)
      from  08f9b29654e935b43eac9984df40ed8c9f69f005 (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=23065b1faf77a10957574d78b6321d875e60304d


commit 23065b1faf77a10957574d78b6321d875e60304d
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 15:14:27 2021 +0200

    Drop old or unnecessary build rules.
    
    * Makefile.am (DISTCLEANFILES): Remove inetutils*.tar*.
    (snapshot): Remove rule.
    * bootstrap.conf (bootstrap_sync): Remove, causes unnecessary *-dirty
    version number if bootstrap changes in gnulib.
    (.bootstrap): Remove custom code.
    * configure.ac: Remove no-op comments about old systems.

diff --git a/Makefile.am b/Makefile.am
index a9d9889..c299364 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,7 @@ SUBDIRS = lib \
 	doc man \
 	tests
 
-DISTCLEANFILES = pathdefs.make paths.defs \
-	$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION).tar.xz
+DISTCLEANFILES = pathdefs.make paths.defs
 
 # git-version-gen
 EXTRA_DIST += $(top_srcdir)/.version
@@ -39,9 +38,6 @@ $(top_srcdir)/.version:
 dist-hook: gen-ChangeLog
 	echo $(VERSION) > $(distdir)/.tarball-version
 
-snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
-
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	$(AM_V_GEN)if test -d .git; then				\
diff --git a/bootstrap.conf b/bootstrap.conf
index 54acf87..b6d1382 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -29,9 +29,6 @@ gzip	   -
 xz	   -
 "
 
-# Sync. bootstrap from checked out gnulib sources.
-bootstrap_sync=true
-
 ACLOCAL_FLAGS="-I am -I m4"
 
 # gnulib library name
@@ -108,12 +105,6 @@ xsize
 xvasprintf
 "
 
-# Read local configuration file
-if [ -r .bootstrap ]; then
-  echo "$0: Reading configuration file .bootstrap"
-  eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
-fi
-
 bootstrap_post_import_hook ()
 {
   # Automake requires that ChangeLog exist.
diff --git a/configure.ac b/configure.ac
index 43ce616..07a02ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1014,16 +1014,6 @@ AH_BOTTOM(
 # entry in utmpx.  Also for some OS they are better handled with
 # STREAMS.
 case "$host" in
-*-freebsd9* | *-freebsd10* )
-  # FreeBSD 9.0 has implemented a non-standard and singular
-  # UTMPX interface.  The readutmp module from GNUlib does
-  # not support it, but we can fall back to getutxuser() for
-  # use in syslogd and talkd.  For ftpd, rlogind, telnetd,
-  # and uucpd the use of pututxent() should suffice, but
-  # this needs continued observations.
-  #
-  # Other issues?
-  ;;
 *olaris* )
   case "$host" in
   *olaris*10 | *olaris*11 )
@@ -1037,9 +1027,6 @@ case "$host" in
   AC_DEFINE([HAVE_STREAMSPTY], 1,
     [Define to 1 for a system using streams for ptys])
   ;;
-*irix* | *hpux* )
-  # Known and needed work-arounds?
-  ;;
 esac
 
 # Typically the loopback addresses, but can be set otherwise.

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


commit bd972a39953e1a3e090174431e37fa45aa9824de
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 15:06:24 2021 +0200

    doc: Improve README-release.
    
    * bootstrap.conf (bootstrap_epilogue): Remove.
    * gl/top/README-release.diff: Update.

diff --git a/bootstrap.conf b/bootstrap.conf
index 6f480a8..54acf87 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -119,8 +119,3 @@ bootstrap_post_import_hook ()
   # Automake requires that ChangeLog exist.
   touch ChangeLog || return 1
 }
-
-bootstrap_epilogue() {
-  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
-  perl -pi -e "s/X.Y/X.Y.Z/g" README-release
-}
diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
index 234a696..9547441 100644
--- a/gl/top/README-release.diff
+++ b/gl/top/README-release.diff
@@ -1,13 +1,63 @@
---- README-release.orig	2021-01-25 14:53:16.617112508 +0100
-+++ README-release	2021-01-25 14:53:48.201386387 +0100
-@@ -19,10 +19,6 @@
+--- README-release.orig	2021-07-24 15:01:40.637006120 +0200
++++ README-release	2021-07-24 15:05:35.687402132 +0200
+@@ -21,7 +21,7 @@
  
-     git push origin master
+ * Check that the NixOS/Hydra autobuilder is reporting all is well:
  
--* Check that the NixOS/Hydra autobuilder is reporting all is well:
--
 -    https://hydra.nixos.org/project/gnu/@PACKAGE@-master
--
++    https://hydra.nixos.org/project/gnu/inetutils-master
+ 
  * Run the following command to download any new translations:
  
-     ./bootstrap && ./configure
+@@ -29,8 +29,7 @@
+ 
+ * Pre-release testing: ensure that the following commands succeed:
+ 
+-    c=check ve=check-very-expensive; git grep -q "^$ve:\$" && c=$ve
+-    make $c syntax-check distcheck
++    make check syntax-check distcheck
+ 
+ * To (i) set the date, version number, and release TYPE on line 3 of
+   NEWS, (ii) commit that, and (iii) tag the release, run
+@@ -49,7 +48,7 @@
+   it builds and passes all tests.
+ 
+ * While that's happening, write the release announcement that you will
+-  soon post.  Start with the template, $HOME/announce-@PACKAGE@-X.Y
++  soon post.  Start with the template, $HOME/announce-inetutils-X.Y
+   that was just created by that "make" command.
+ 
+ Once all the builds and tests have passed,
+@@ -73,22 +72,22 @@
+ 
+   Go to the news-submission form:
+ 
+-    https://savannah.gnu.org/news/submit.php?group=@PACKAGE@
++    https://savannah.gnu.org/news/submit.php?group=inetutils
+ 
+   If it does not work, then enable "News" for the project via this link:
+ 
+-    https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=@PACKAGE@
++    https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=inetutils
+ 
+   Write something like the following:
+ 
+-    Subject: @PACKAGE@-X.Y released [stable]
++    Subject: inetutils-X.Y released [stable]
+     +verbatim+
+     ...paste the announcement here...
+     -verbatim-
+ 
+   Then go here to approve it:
+ 
+-    https://savannah.gnu.org/news/approve.php?group=@PACKAGE@
++    https://savannah.gnu.org/news/approve.php?group=inetutils
+ 
+ * Send the announcement email message.
+ 
+@@ -98,4 +97,4 @@
+ 
+   to update the on-line manual accessible at
+ 
+-    https://www.gnu.org/software/@PACKAGE@/manual/
++    https://www.gnu.org/software/inetutils/manual/

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


commit 01047ced3acb4930997102b8d695848ca0b447b1
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 15:00:17 2021 +0200

    Depend on .version instead of configure.ac (for version number changes).
    
    man/Makefile.am: Fix *.1 dependencies.

diff --git a/man/Makefile.am b/man/Makefile.am
index 6721dc7..134db1c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -132,57 +132,57 @@ EXTRA_DIST = $(all) $(all:.1=.h2m) $(all:.8=.h2m)
 
 MAINTAINERCLEANFILES = $(all)
 
-ftp.1: ftp.h2m $(top_srcdir)/ftp/main.c $(top_srcdir)/configure.ac
+ftp.1: ftp.h2m $(top_srcdir)/ftp/main.c $(top_srcdir)/.version
 
-ftpd.8: ftpd.h2m $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/configure.ac
+ftpd.8: ftpd.h2m $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/.version
 
-hostname.1: hostname.h2m $(top_srcdir)/src/hostname.c $(top_srcdir)/configure.ac
+hostname.1: hostname.h2m $(top_srcdir)/src/hostname.c $(top_srcdir)/.version
 
-dnsdomainname.1: dnsdomainname.h2m $(top_srcdir)/src/dnsdomainname.c $(top_srcdir)/configure.ac
+dnsdomainname.1: dnsdomainname.h2m $(top_srcdir)/src/dnsdomainname.c $(top_srcdir)/.version
 
-ifconfig.1: ifconfig.h2m $(top_srcdir)/ifconfig/options.c $(top_srcdir)/configure.ac
+ifconfig.1: ifconfig.h2m $(top_srcdir)/ifconfig/options.c $(top_srcdir)/.version
 
-inetd.8: inetd.h2m $(top_srcdir)/src/inetd.c $(top_srcdir)/configure.ac
+inetd.8: inetd.h2m $(top_srcdir)/src/inetd.c $(top_srcdir)/.version
 
-logger.1: logger.h2m $(top_srcdir)/src/logger.c $(top_srcdir)/configure.ac
+logger.1: logger.h2m $(top_srcdir)/src/logger.c $(top_srcdir)/.version
 
-ping.1: ping.h2m $(top_srcdir)/ping/ping.c $(top_srcdir)/configure.ac
+ping.1: ping.h2m $(top_srcdir)/ping/ping.c $(top_srcdir)/.version
 
-ping6.1: ping6.h2m $(top_srcdir)/ping/ping6.c $(top_srcdir)/configure.ac
+ping6.1: ping6.h2m $(top_srcdir)/ping/ping6.c $(top_srcdir)/.version
 
-rcp.1: rcp.h2m $(top_srcdir)/src/rcp.c $(top_srcdir)/configure.ac
+rcp.1: rcp.h2m $(top_srcdir)/src/rcp.c $(top_srcdir)/.version
 
-rexec.1: rexec.h2m $(top_srcdir)/src/rexec.c $(top_srcdir)/configure.ac
+rexec.1: rexec.h2m $(top_srcdir)/src/rexec.c $(top_srcdir)/.version
 
-rexecd.8: rexecd.h2m $(top_srcdir)/src/rexecd.c $(top_srcdir)/configure.ac
+rexecd.8: rexecd.h2m $(top_srcdir)/src/rexecd.c $(top_srcdir)/.version
 
-rlogin.1: rlogin.h2m $(top_srcdir)/src/rlogin.c $(top_srcdir)/configure.ac
+rlogin.1: rlogin.h2m $(top_srcdir)/src/rlogin.c $(top_srcdir)/.version
 
-rlogind.8: rlogind.h2m $(top_srcdir)/src/rlogind.c $(top_srcdir)/configure.ac
+rlogind.8: rlogind.h2m $(top_srcdir)/src/rlogind.c $(top_srcdir)/.version
 
-rsh.1: rsh.h2m $(top_srcdir)/src/rsh.c $(top_srcdir)/configure.ac
+rsh.1: rsh.h2m $(top_srcdir)/src/rsh.c $(top_srcdir)/.version
 
-rshd.8: rshd.h2m $(top_srcdir)/src/rshd.c $(top_srcdir)/configure.ac
+rshd.8: rshd.h2m $(top_srcdir)/src/rshd.c $(top_srcdir)/.version
 
-syslogd.8: syslogd.h2m $(top_srcdir)/src/syslogd.c $(top_srcdir)/configure.ac
+syslogd.8: syslogd.h2m $(top_srcdir)/src/syslogd.c $(top_srcdir)/.version
 
-talk.1: talk.h2m $(top_srcdir)/talk/talk.c $(top_srcdir)/configure.ac
+talk.1: talk.h2m $(top_srcdir)/talk/talk.c $(top_srcdir)/.version
 
-talkd.8: talkd.h2m $(top_srcdir)/talkd/talkd.c $(top_srcdir)/configure.ac
+talkd.8: talkd.h2m $(top_srcdir)/talkd/talkd.c $(top_srcdir)/.version
 
-telnet.1: telnet.h2m $(top_srcdir)/telnet/main.c $(top_srcdir)/configure.ac
+telnet.1: telnet.h2m $(top_srcdir)/telnet/main.c $(top_srcdir)/.version
 
-telnetd.8: telnetd.h2m $(top_srcdir)/telnetd/telnetd.c $(top_srcdir)/configure.ac
+telnetd.8: telnetd.h2m $(top_srcdir)/telnetd/telnetd.c $(top_srcdir)/.version
 
-tftp.1: tftp.h2m $(top_srcdir)/src/tftp.c $(top_srcdir)/configure.ac
+tftp.1: tftp.h2m $(top_srcdir)/src/tftp.c $(top_srcdir)/.version
 
-tftpd.8: tftpd.h2m $(top_srcdir)/src/tftpd.c $(top_srcdir)/configure.ac
+tftpd.8: tftpd.h2m $(top_srcdir)/src/tftpd.c $(top_srcdir)/.version
 
-traceroute.1: traceroute.h2m $(top_srcdir)/src/traceroute.c $(top_srcdir)/configure.ac
+traceroute.1: traceroute.h2m $(top_srcdir)/src/traceroute.c $(top_srcdir)/.version
 
-uucpd.8: uucpd.h2m $(top_srcdir)/src/uucpd.c $(top_srcdir)/configure.ac
+uucpd.8: uucpd.h2m $(top_srcdir)/src/uucpd.c $(top_srcdir)/.version
 
-whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
+whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/.version
 
 .h2m.1:
 	$(MAKE) man TOOL=$* SECTION=1

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


commit 686b1c287f38a3956acb4bd8d134554ff32101ee
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 14:54:17 2021 +0200

    Reorganize NEWS entries.
    
    * NEWS: Update.

diff --git a/NEWS b/NEWS
index 8c48c73..4c75bfd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,6 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
-** ChangeLog is now automatically generated from version controlled logs.
-
-Historical information is preserved as ChangeLog.0 and ChangeLog.1.
-
 ** ftp
 
 Disable use of readline when environment variable TERM is unset or set
@@ -14,7 +10,7 @@ Alex Bochannek for report, debugging and patch.
 
 ** telnet
 
-** Implement --bind (-b).
+*** Implement --bind (-b).
 
 This is used to bind to a particular local socket, for compatibility
 with NetKit's telnet.
@@ -23,6 +19,11 @@ with NetKit's telnet.
 
 Updated whois servers for .ORG and .IN.
 
+** Various bugs fixes, internal improvements and clean ups.
+
+ChangeLog is now automatically generated from version controlled logs.
+Historical information is preserved as ChangeLog.0 and ChangeLog.1.
+
 * Noteworthy changes in release 2.0 (2021-02-05) [stable]
 
 * ping

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

Summary of changes:
 Makefile.am                |  6 +----
 NEWS                       | 11 ++++----
 bootstrap.conf             | 14 ----------
 configure.ac               | 13 ---------
 gl/top/README-release.diff | 66 ++++++++++++++++++++++++++++++++++++++++------
 man/Makefile.am            | 52 ++++++++++++++++++------------------
 6 files changed, 91 insertions(+), 71 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 10:09:28 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7ILI-0004qf-9v
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 10:09:28 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:39802)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7ILG-0004nw-Uz
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 10:09:26 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:60185)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7ILG-00020v-9R
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 10:09:26 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 10DCF20D0A; Sat, 24 Jul 2021 10:09:25 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.0-20-g353812a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 23065b1faf77a10957574d78b6321d875e60304d
X-Git-Newrev: 353812a5d9dfc77e9f70d278b611c6110404b510
Message-Id: <20210724140926.10DCF20D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 10:09:25 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 14:09:27 -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  353812a5d9dfc77e9f70d278b611c6110404b510 (commit)
       via  6d0c8ac203aca5ee9d00da918f60f66b8a42fdef (commit)
      from  23065b1faf77a10957574d78b6321d875e60304d (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=353812a5d9dfc77e9f70d278b611c6110404b510


commit 353812a5d9dfc77e9f70d278b611c6110404b510
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 15:56:30 2021 +0200

    Use gnulib's fts code instead of custom libls/ version.
    
    * bootstrap.conf (gnulib_modules): Add fts.
    * libls/fts.h, libls/fts.c: Remove files.
    * NEWS: Mention change.
    * configure.ac: Drop fchdir test.

diff --git a/NEWS b/NEWS
index 4c75bfd..6427c26 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ Disable use of readline when environment variable TERM is unset or set
 to "dumb" (caused problems with Emacs AngeFTP on MacOS).  Thanks to
 Alex Bochannek for report, debugging and patch.
 
+** ftpd
+
+Our libls now uses gnulib's fts instead of our own custom version.
+
 ** telnet
 
 *** Implement --bind (-b).
diff --git a/bootstrap.conf b/bootstrap.conf
index b6d1382..abf5a5f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -49,6 +49,7 @@ extensions
 fdl-1.3
 filemode
 forkpty
+fts
 gendocs
 getaddrinfo
 getcwd
diff --git a/configure.ac b/configure.ac
index af83f35..94d141c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,8 +200,8 @@ AC_SUBST(LIBDL)
 AC_SUBST(LIBPAM)
 AC_SUBST(FTPD_LIBPAM)
 
-# Can we use libls? but we must have fchdir()
-if test "$enable_libls" = yes && test "$ac_cv_func_fchdir" = yes ; then
+# Use libls?
+if test "$enable_libls" = yes; then
   LIBLS="../libls/libls.a"
   libls_BUILD="libls.a"
   AC_DEFINE([WITH_LIBLS], 1, [Define to one if you have -lls])
@@ -771,7 +771,7 @@ AC_FUNC_FORK
 AC_FUNC_STRCOLL
 AC_FUNC_MMAP
 
-AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
+AC_CHECK_FUNCS(cfsetspeed cgetent dirfd flock \
                fork fpathconf ftruncate \
                getcwd getmsg getpwuid_r getspnam getutxent getutxuser \
                initgroups initsetproctitle killpg \
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 5123ac5..c7dd4f1 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -25,6 +25,6 @@ noinst_LIBRARIES = $(libls_BUILD)
 
 EXTRA_LIBRARIES = libls.a
 
-libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c fts.c
+libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c
 
-noinst_HEADERS = extern.h ls.h fts.h
+noinst_HEADERS = extern.h ls.h
diff --git a/libls/fts.c b/libls/fts.c
deleted file mode 100644
index b5f5aad..0000000
--- a/libls/fts.c
+++ /dev/null
@@ -1,1098 +0,0 @@
-/*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
-
-  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/'. */
-
-/*
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <config.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <unused-parameter.h>
-
-#include "fts.h"
-
-/* Largest alignment size needed, minus one.
- * It is used as value and as bit mask.
- * Usually long double is the worst case.  */
-#ifndef ALIGNBYTES
-# define ALIGNBYTES	(__alignof__ (long double) - 1)
-#endif
-
-/* Align P to size ALIGNBYTES at adapted boundary.  */
-#ifndef ALIGN
-# define ALIGN(p)	(((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
-#endif
-
-
-static FTSENT *fts_alloc (FTS *, const char *, int);
-static FTSENT *fts_build (FTS *, int);
-static void fts_lfree (FTSENT *);
-static void fts_load (FTS *, FTSENT *);
-static size_t fts_maxarglen (char *const *);
-static void fts_padjust (FTS *, void *);
-static int fts_palloc (FTS *, size_t);
-static FTSENT *fts_sort (FTS *, FTSENT *, int);
-static unsigned short fts_stat (FTS *, struct dirent *, FTSENT *, int);
-
-#ifndef MAX
-# define MAX(a, b)	(((a) > (b)) ? (a) : (b))
-#endif
-
-#define ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-#define ISSET(opt)	(sp->fts_options & opt)
-#define SET(opt)	(sp->fts_options |= opt)
-
-#define CHDIR(sp, path)	(!ISSET(FTS_NOCHDIR) && chdir(path))
-#ifdef HAVE_FCHDIR
-# define FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
-#else
-# define FCHDIR(sp, fd)  (!ISSET(FTS_NOCHDIR) && -1)
-#endif
-
-/* fts_build flags */
-#define BCHILD		1	/* fts_children */
-#define BNAMES		2	/* fts_children, names only */
-#define BREAD		3	/* fts_read */
-
-FTS *
-fts_open (char *const *argv, register int options, int (*compar) (const FTSENT **, const FTSENT **))
-{
-  register FTS *sp;
-  register FTSENT *p, *root;
-  register int nitems;
-  FTSENT *parent;
-  FTSENT *tmp = NULL;
-  int len;
-
-  /* Options check. */
-  if (options & ~FTS_OPTIONMASK)
-    {
-      errno = EINVAL;
-      return (NULL);
-    }
-
-  /* Allocate/initialize the stream */
-  if ((sp = malloc ((u_int) sizeof (FTS))) == NULL)
-    return (NULL);
-  memset (sp, 0, sizeof (FTS));
-  sp->fts_compar = (int (*)(const void *, const void *)) compar;
-  sp->fts_options = options;
-
-  /* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-  if (ISSET (FTS_LOGICAL))
-    SET (FTS_NOCHDIR);
-
-  /* Always set NOCHDIR for OS lacking fchdir ()  */
-#ifndef HAVE_FCHDIR
-  SET (FTS_NOCHDIR);
-#endif
-  /*
-   * Start out with 1K of path space, and enough, in any case,
-   * to hold the user's paths.
-   */
-#ifndef MAXPATHLEN
-# define MAXPATHLEN 1024
-#endif
-  if (fts_palloc (sp, MAX (fts_maxarglen (argv), MAXPATHLEN)))
-    goto mem1;
-
-  /* Allocate/initialize root's parent. */
-  if ((parent = fts_alloc (sp, "", 0)) == NULL)
-    goto mem2;
-  parent->fts_level = FTS_ROOTPARENTLEVEL;
-
-  /* Allocate/initialize root(s). */
-  for (root = NULL, nitems = 0; *argv; ++argv, ++nitems)
-    {
-      /* Don't allow zero-length paths. */
-      if ((len = strlen (*argv)) == 0)
-	{
-	  errno = ENOENT;
-	  goto mem3;
-	}
-
-      p = fts_alloc (sp, *argv, len);
-      p->fts_level = FTS_ROOTLEVEL;
-      p->fts_parent = parent;
-      p->fts_accpath = p->fts_name;
-      p->fts_info = fts_stat (sp, NULL, p, ISSET (FTS_COMFOLLOW));
-
-      /* Command-line "." and ".." are real directories. */
-      if (p->fts_info == FTS_DOT)
-	p->fts_info = FTS_D;
-
-      /*
-       * If comparison routine supplied, traverse in sorted
-       * order; otherwise traverse in the order specified.
-       */
-      if (compar)
-	{
-	  p->fts_link = root;
-	  root = p;
-	}
-      else
-	{
-	  p->fts_link = NULL;
-	  if (root == NULL)
-	    tmp = root = p;
-	  else
-	    {
-	      tmp->fts_link = p;
-	      tmp = p;
-	    }
-	}
-    }
-  if (compar && nitems > 1)
-    root = fts_sort (sp, root, nitems);
-
-  /*
-   * Allocate a dummy pointer and make fts_read think that we've just
-   * finished the node before the root(s); set p->fts_info to FTS_INIT
-   * so that everything about the "current" node is ignored.
-   */
-  if ((sp->fts_cur = fts_alloc (sp, "", 0)) == NULL)
-    goto mem3;
-  sp->fts_cur->fts_link = root;
-  sp->fts_cur->fts_info = FTS_INIT;
-
-  /*
-   * If using chdir(2), grab a file descriptor pointing to dot to insure
-   * that we can get back here; this could be avoided for some paths,
-   * but almost certainly not worth the effort.  Slashes, symbolic links,
-   * and ".." are all fairly nasty problems.  Note, if we can't get the
-   * descriptor we run anyway, just more slowly.
-   */
-  if (!ISSET (FTS_NOCHDIR) && (sp->fts_rfd = open (".", O_RDONLY, 0)) < 0)
-    SET (FTS_NOCHDIR);
-
-  return (sp);
-
-mem3:fts_lfree (root);
-  free (parent);
-mem2:free (sp->fts_path);
-mem1:free (sp);
-  return (NULL);
-}
-
-static void
-fts_load (FTS *sp, register FTSENT *p)
-{
-  register int len;
-  register char *cp;
-
-  /*
-   * Load the stream structure for the next traversal.  Since we don't
-   * actually enter the directory until after the preorder visit, set
-   * the fts_accpath field specially so the chdir gets done to the right
-   * place and the user can access the first node.  From fts_open it's
-   * known that the path will fit.
-   */
-  len = p->fts_pathlen = p->fts_namelen;
-  memmove (sp->fts_path, p->fts_name, len + 1);
-  if ((cp = strrchr (p->fts_name, '/')) && (cp != p->fts_name || cp[1]))
-    {
-      len = strlen (++cp);
-      memmove (p->fts_name, cp, len + 1);
-      p->fts_namelen = len;
-    }
-  p->fts_accpath = p->fts_path = sp->fts_path;
-  sp->fts_dev = p->fts_dev;
-}
-
-int
-fts_close (FTS *sp)
-{
-  register FTSENT *freep, *p;
-  int saved_errno = 0;
-  int retval = 0;
-
-  /*
-   * This still works if we haven't read anything -- the dummy structure
-   * points to the root list, so we step through to the end of the root
-   * list which has a valid parent pointer.
-   */
-  if (sp->fts_cur)
-    {
-      for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;)
-	{
-	  freep = p;
-	  p = p->fts_link ? p->fts_link : p->fts_parent;
-	  free (freep);
-	}
-      free (p);
-    }
-
-  /* Free up child linked list, sort array, path buffer. */
-  if (sp->fts_child)
-    fts_lfree (sp->fts_child);
-  free (sp->fts_array);
-  free (sp->fts_path);
-
-  /* Return to original directory, save errno if necessary. */
-  if (!ISSET (FTS_NOCHDIR))
-    {
-      saved_errno = fchdir (sp->fts_rfd) ? errno : 0;
-      close (sp->fts_rfd);
-    }
-
-  /* Set errno and return. */
-  if (!ISSET (FTS_NOCHDIR) && saved_errno)
-    {
-      errno = saved_errno;
-      retval = -1;
-    }
-
-  /* Free up the stream pointer. */
-  free (sp);
-
-  return retval;
-}
-
-/*
- * Special case a root of "/" so that slashes aren't appended which would
- * cause paths to be written as "//foo".
- */
-#define NAPPEND(p)							\
-	(p->fts_level == FTS_ROOTLEVEL && p->fts_pathlen == 1 &&	\
-	    p->fts_path[0] == '/' ? 0 : p->fts_pathlen)
-
-FTSENT *
-fts_read (register FTS *sp)
-{
-  register FTSENT *p;
-  register FTSENT *tmp;
-  register int instr;
-  register char *t;
-  int saved_errno;
-
-  /* If finished or unrecoverable error, return NULL. */
-  if (sp->fts_cur == NULL || ISSET (FTS_STOP))
-    return (NULL);
-
-  /* Set current node pointer. */
-  p = sp->fts_cur;
-
-  /* Save and zero out user instructions. */
-  instr = p->fts_instr;
-  p->fts_instr = FTS_NOINSTR;
-
-  /* Any type of file may be re-visited; re-stat and re-turn. */
-  if (instr == FTS_AGAIN)
-    {
-      p->fts_info = fts_stat (sp, NULL, p, 0);
-      return (p);
-    }
-
-  /*
-   * Following a symlink -- SLNONE test allows application to see
-   * SLNONE and recover.  If indirecting through a symlink, have
-   * keep a pointer to current location.  If unable to get that
-   * pointer, follow fails.
-   */
-  if (instr == FTS_FOLLOW &&
-      (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
-    {
-      p->fts_info = fts_stat (sp, NULL, p, 1);
-      if (p->fts_info == FTS_D && !ISSET (FTS_NOCHDIR))
-	{
-	  if ((p->fts_symfd = open (".", O_RDONLY, 0)) < 0)
-	    {
-	      p->fts_errno = errno;
-	      p->fts_info = FTS_ERR;
-	    }
-	  else
-	    p->fts_flags |= FTS_SYMFOLLOW;
-	}
-      return (p);
-    }
-
-  /* Directory in pre-order. */
-  if (p->fts_info == FTS_D)
-    {
-      /* If skipped or crossed mount point, do post-order visit. */
-      if (instr == FTS_SKIP ||
-	  (ISSET (FTS_XDEV) && p->fts_dev != sp->fts_dev))
-	{
-	  if (p->fts_flags & FTS_SYMFOLLOW)
-	    close (p->fts_symfd);
-	  if (sp->fts_child)
-	    {
-	      fts_lfree (sp->fts_child);
-	      sp->fts_child = NULL;
-	    }
-	  p->fts_info = FTS_DP;
-	  return (p);
-	}
-
-      /* Rebuild if only read the names and now traversing. */
-      if (sp->fts_child && sp->fts_options & FTS_NAMEONLY)
-	{
-	  sp->fts_options &= ~FTS_NAMEONLY;
-	  fts_lfree (sp->fts_child);
-	  sp->fts_child = NULL;
-	}
-
-      /*
-       * Cd to the subdirectory.
-       *
-       * If have already read and now fail to chdir, whack the list
-       * to make the names come out right, and set the parent errno
-       * so the application will eventually get an error condition.
-       * Set the FTS_DONTCHDIR flag so that when we logically change
-       * directories back to the parent we don't do a chdir.
-       *
-       * If haven't read do so.  If the read fails, fts_build sets
-       * FTS_STOP or the fts_info field of the node.
-       */
-      if (sp->fts_child)
-	{
-	  if (CHDIR (sp, p->fts_accpath))
-	    {
-	      p->fts_errno = errno;
-	      p->fts_flags |= FTS_DONTCHDIR;
-	      for (p = sp->fts_child; p; p = p->fts_link)
-		p->fts_accpath = p->fts_parent->fts_accpath;
-	    }
-	}
-      else if ((sp->fts_child = fts_build (sp, BREAD)) == NULL)
-	{
-	  if (ISSET (FTS_STOP))
-	    return (NULL);
-	  return (p);
-	}
-      p = sp->fts_child;
-      sp->fts_child = NULL;
-      goto name;
-    }
-
-  /* Move to the next node on this level. */
-next:tmp = p;
-  if ((p = p->fts_link))
-    {
-      free (tmp);
-
-      /*
-       * If reached the top, return to the original directory, and
-       * load the paths for the next root.
-       */
-      if (p->fts_level == FTS_ROOTLEVEL)
-	{
-	  if (!ISSET (FTS_NOCHDIR) && FCHDIR (sp, sp->fts_rfd))
-	    {
-	      SET (FTS_STOP);
-	      return (NULL);
-	    }
-	  fts_load (sp, p);
-	  return (sp->fts_cur = p);
-	}
-
-      /*
-       * User may have called fts_set on the node.  If skipped,
-       * ignore.  If followed, get a file descriptor so we can
-       * get back if necessary.
-       */
-      if (p->fts_instr == FTS_SKIP)
-	goto next;
-      if (p->fts_instr == FTS_FOLLOW)
-	{
-	  p->fts_info = fts_stat (sp, NULL, p, 1);
-	  if (p->fts_info == FTS_D && !ISSET (FTS_NOCHDIR))
-	    {
-	      if ((p->fts_symfd = open (".", O_RDONLY, 0)) < 0)
-		{
-		  p->fts_errno = errno;
-		  p->fts_info = FTS_ERR;
-		}
-	      else
-		p->fts_flags |= FTS_SYMFOLLOW;
-	    }
-	  p->fts_instr = FTS_NOINSTR;
-	}
-
-    name:t = sp->fts_path + NAPPEND (p->fts_parent);
-      *t++ = '/';
-      memmove (t, p->fts_name, p->fts_namelen + 1);
-      return (sp->fts_cur = p);
-    }
-
-  /* Move up to the parent node. */
-  p = tmp->fts_parent;
-  free (tmp);
-
-  if (p->fts_level == FTS_ROOTPARENTLEVEL)
-    {
-      /*
-       * Done; free everything up and set errno to 0 so the user
-       * can distinguish between error and EOF.
-       */
-      free (p);
-      errno = 0;
-      return (sp->fts_cur = NULL);
-    }
-
-  /* Nul terminate the pathname. */
-  sp->fts_path[p->fts_pathlen] = '\0';
-
-  /*
-   * Return to the parent directory.  If at a root node or came through
-   * a symlink, go back through the file descriptor.  Otherwise, cd up
-   * one directory.
-   */
-  if (p->fts_level == FTS_ROOTLEVEL)
-    {
-      if (!ISSET (FTS_NOCHDIR) && FCHDIR (sp, sp->fts_rfd))
-	{
-	  SET (FTS_STOP);
-	  return (NULL);
-	}
-    }
-  else if (p->fts_flags & FTS_SYMFOLLOW)
-    {
-      if (FCHDIR (sp, p->fts_symfd))
-	{
-	  saved_errno = errno;
-	  close (p->fts_symfd);
-	  errno = saved_errno;
-	  SET (FTS_STOP);
-	  return (NULL);
-	}
-      close (p->fts_symfd);
-    }
-  else if (!(p->fts_flags & FTS_DONTCHDIR))
-    {
-      if (CHDIR (sp, ".."))
-	{
-	  SET (FTS_STOP);
-	  return (NULL);
-	}
-    }
-  p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-  return (sp->fts_cur = p);
-}
-
-/*
- * Fts_set takes the stream as an argument although it's not used in this
- * implementation; it would be necessary if anyone wanted to add global
- * semantics to fts using fts_set.  An error return is allowed for similar
- * reasons.
- */
-int
-fts_set (FTS *sp _GL_UNUSED_PARAMETER, FTSENT *p, int instr)
-{
-  if (instr && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-      instr != FTS_NOINSTR && instr != FTS_SKIP)
-    {
-      errno = EINVAL;
-      return (1);
-    }
-  p->fts_instr = instr;
-  return (0);
-}
-
-FTSENT *
-fts_children (register FTS *sp, int instr)
-{
-  register FTSENT *p;
-  int fd;
-
-  if (instr && instr != FTS_NAMEONLY)
-    {
-      errno = EINVAL;
-      return (NULL);
-    }
-
-  /* Set current node pointer. */
-  p = sp->fts_cur;
-
-  /*
-   * Errno set to 0 so user can distinguish empty directory from
-   * an error.
-   */
-  errno = 0;
-
-  /* Fatal errors stop here. */
-  if (ISSET (FTS_STOP))
-    return (NULL);
-
-  /* Return logical hierarchy of user's arguments. */
-  if (p->fts_info == FTS_INIT)
-    return (p->fts_link);
-
-  /*
-   * If not a directory being visited in pre-order, stop here.  Could
-   * allow FTS_DNR, assuming the user has fixed the problem, but the
-   * same effect is available with FTS_AGAIN.
-   */
-  if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */ )
-    return (NULL);
-
-  /* Free up any previous child list. */
-  if (sp->fts_child)
-    fts_lfree (sp->fts_child);
-
-  if (instr == FTS_NAMEONLY)
-    {
-      sp->fts_options |= FTS_NAMEONLY;
-      instr = BNAMES;
-    }
-  else
-    instr = BCHILD;
-
-  /*
-   * If using chdir on a relative path and called BEFORE fts_read does
-   * its chdir to the root of a traversal, we can lose -- we need to
-   * chdir into the subdirectory, and we don't know where the current
-   * directory is, so we can't get back so that the upcoming chdir by
-   * fts_read will work.
-   */
-  if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-      ISSET (FTS_NOCHDIR))
-    return (sp->fts_child = fts_build (sp, instr));
-
-  if ((fd = open (".", O_RDONLY, 0)) < 0)
-    return (NULL);
-  sp->fts_child = fts_build (sp, instr);
-  if (fchdir (fd))
-    return (NULL);
-  close (fd);
-  return (sp->fts_child);
-}
-
-/*
- * This is the tricky part -- do not casually change *anything* in here.  The
- * idea is to build the linked list of entries that are used by fts_children
- * and fts_read.  There are lots of special cases.
- *
- * The real slowdown in walking the tree is the stat calls.  If FTS_NOSTAT is
- * set and it's a physical walk (so that symbolic links can't be directories),
- * we can do things quickly.  First, if it's a 4.4BSD file system, the type
- * of the file is in the directory entry.  Otherwise, we assume that the number
- * of subdirectories in a node is equal to the number of links to the parent.
- * The former skips all stat calls.  The latter skips stat calls in any leaf
- * directories and for any files after the subdirectories in the directory have
- * been found, cutting the stat calls by about 2/3.
- */
-static FTSENT *
-fts_build (register FTS *sp, int type)
-{
-  struct dirent *dp;
-  register FTSENT *p, *head;
-  register int nitems;
-  FTSENT *cur, *tail;
-  DIR *dirp;
-  void *adjaddr;
-  int cderrno, descend, len, level, maxlen, nlinks, saved_errno;
-  char *cp = NULL;
-#ifdef HAVE___OPENDIR2
-  int oflag;
-#endif
-
-  /* Set current node pointer. */
-  cur = sp->fts_cur;
-
-  /*
-   * Open the directory for reading.  If this fails, we're done.
-   * If being called from fts_read, set the fts_info field.
-   */
-#if defined HAVE___OPENDIR2
-  oflag = DTF_NODUP;
-
-# ifdef DTF_REWIND
-  oflag |= DTF_REWIND;
-# endif
-
-# ifdef DTF_HIDEW
-  if (!ISSET (FTS_WHITEOUT))
-    oflag |= DTF_HIDEW;
-# endif /* DTF_HIDEW */
-
-  dirp = __opendir2 (cur->fts_accpath, oflag);
-#else /* !HAVE___OPENDIR2 */
-  dirp = opendir (cur->fts_accpath);
-#endif /* !HAVE___OPENDIR2 */
-
-  if (dirp == NULL)
-    {
-      if (type == BREAD)
-	{
-	  cur->fts_info = FTS_DNR;
-	  cur->fts_errno = errno;
-	}
-      return (NULL);
-    }
-
-  /*
-   * Nlinks is the number of possible entries of type directory in the
-   * directory if we're cheating on stat calls, 0 if we're not doing
-   * any stat calls at all, -1 if we're doing stats on everything.
-   */
-  if (type == BNAMES)
-    nlinks = 0;
-  else if (ISSET (FTS_NOSTAT) && ISSET (FTS_PHYSICAL))
-    nlinks = cur->fts_nlink - (ISSET (FTS_SEEDOT) ? 0 : 2);
-  else
-    nlinks = -1;
-
-  /*
-   * If we're going to need to stat anything or we want to descend
-   * and stay in the directory, chdir.  If this fails we keep going,
-   * but set a flag so we don't chdir after the post-order visit.
-   * We won't be able to stat anything, but we can still return the
-   * names themselves.  Note, that since fts_read won't be able to
-   * chdir into the directory, it will have to return different path
-   * names than before, i.e. "a/b" instead of "b".  Since the node
-   * has already been visited in pre-order, have to wait until the
-   * post-order visit to return the error.  There is a special case
-   * here, if there was nothing to stat then it's not an error to
-   * not be able to stat.  This is all fairly nasty.  If a program
-   * needed sorted entries or stat information, they had better be
-   * checking FTS_NS on the returned nodes.
-   */
-  cderrno = 0;
-  if (nlinks || type == BREAD)
-    {
-      if (FCHDIR (sp, dirfd (dirp)))
-	{
-	  if (nlinks && type == BREAD)
-	    cur->fts_errno = errno;
-	  cur->fts_flags |= FTS_DONTCHDIR;
-	  descend = 0;
-	  cderrno = errno;
-	}
-      else
-	descend = 1;
-    }
-  else
-    descend = 0;
-
-  /*
-   * Figure out the max file name length that can be stored in the
-   * current path -- the inner loop allocates more path as necessary.
-   * We really wouldn't have to do the maxlen calculations here, we
-   * could do them in fts_read before returning the path, but it's a
-   * lot easier here since the length is part of the dirent structure.
-   *
-   * If not changing directories set a pointer so that can just append
-   * each new name into the path.
-   */
-  maxlen = sp->fts_pathlen - cur->fts_pathlen - 1;
-  len = NAPPEND (cur);
-  if (ISSET (FTS_NOCHDIR))
-    {
-      cp = sp->fts_path + len;
-      *cp++ = '/';
-    }
-
-  level = cur->fts_level + 1;
-
-  /* Read the directory, attaching each entry to the `link' pointer. */
-  adjaddr = NULL;
-  head = tail = NULL;
-  nitems = 0;
-  while ((dp = readdir (dirp)))
-    {
-      int namlen;
-
-      if (!ISSET (FTS_SEEDOT) && ISDOT (dp->d_name))
-	continue;
-
-      namlen = strlen (dp->d_name) + 1;
-      if ((p = fts_alloc (sp, dp->d_name, namlen)) == NULL)
-	goto mem1;
-      if (namlen > maxlen)
-	{
-	  if (fts_palloc (sp, (size_t) namlen))
-	    {
-	      /*
-	       * No more memory for path or structures.  Save
-	       * errno, free up the current structure and the
-	       * structures already allocated.
-	       */
-	    mem1:saved_errno = errno;
-	      free (p);
-	      fts_lfree (head);
-	      closedir (dirp);
-	      errno = saved_errno;
-	      cur->fts_info = FTS_ERR;
-	      SET (FTS_STOP);
-	      return (NULL);
-	    }
-	  adjaddr = sp->fts_path;
-	  maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen - 1;
-	}
-
-      p->fts_pathlen = len + namlen + 1;
-      p->fts_parent = sp->fts_cur;
-      p->fts_level = level;
-
-      if (cderrno)
-	{
-	  if (nlinks)
-	    {
-	      p->fts_info = FTS_NS;
-	      p->fts_errno = cderrno;
-	    }
-	  else
-	    p->fts_info = FTS_NSOK;
-	  p->fts_accpath = cur->fts_accpath;
-	}
-      else if (nlinks == 0
-#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
-	       || (nlinks > 0 &&
-		   dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-#endif
-	)
-	{
-	  p->fts_accpath = ISSET (FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-	  p->fts_info = FTS_NSOK;
-	}
-      else
-	{
-	  /* Build a file name for fts_stat to stat. */
-	  if (ISSET (FTS_NOCHDIR))
-	    {
-	      p->fts_accpath = p->fts_path;
-	      memmove (p->fts_name, cp, p->fts_namelen + 1);
-	    }
-	  else
-	    p->fts_accpath = p->fts_name;
-	  /* Stat it. */
-	  p->fts_info = fts_stat (sp, dp, p, 0);
-
-	  /* Decrement link count if applicable. */
-	  if (nlinks > 0 && (p->fts_info == FTS_D ||
-			     p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-	    --nlinks;
-	}
-
-      /* We walk in directory order so "ls -f" doesn't get upset. */
-      p->fts_link = NULL;
-      if (head == NULL)
-	head = tail = p;
-      else
-	{
-	  tail->fts_link = p;
-	  tail = p;
-	}
-      ++nitems;
-    }
-  closedir (dirp);
-
-  /*
-   * If had to realloc the path, adjust the addresses for the rest
-   * of the tree.
-   */
-  if (adjaddr)
-    fts_padjust (sp, adjaddr);
-
-  /*
-   * If not changing directories, reset the path back to original
-   * state.
-   */
-  if (ISSET (FTS_NOCHDIR))
-    {
-      if (cp - 1 > sp->fts_path)
-	--cp;
-      *cp = '\0';
-    }
-
-  /*
-   * If descended after called from fts_children or after called from
-   * fts_read and nothing found, get back.  At the root level we use
-   * the saved fd; if one of fts_open()'s arguments is a relative path
-   * to an empty directory, we wind up here with no other way back.  If
-   * can't get back, we're done.
-   */
-  if (descend && (type == BCHILD || !nitems) &&
-      (cur->fts_level == FTS_ROOTLEVEL ?
-       FCHDIR (sp, sp->fts_rfd) : CHDIR (sp, "..")))
-    {
-      cur->fts_info = FTS_ERR;
-      SET (FTS_STOP);
-      return (NULL);
-    }
-
-  /* If didn't find anything, return NULL. */
-  if (!nitems)
-    {
-      if (type == BREAD)
-	cur->fts_info = FTS_DP;
-      return (NULL);
-    }
-
-  /* Sort the entries. */
-  if (sp->fts_compar && nitems > 1)
-    head = fts_sort (sp, head, nitems);
-  return (head);
-}
-
-static unsigned short
-fts_stat (FTS *sp, struct dirent *dp, register FTSENT *p, int follow)
-{
-  register FTSENT *t;
-  register dev_t dev;
-  register ino_t ino;
-  struct stat *sbp, sb;
-  int saved_errno;
-
-  /* If user needs stat info, stat buffer already allocated. */
-  sbp = ISSET (FTS_NOSTAT) ? &sb : p->fts_statp;
-
-#if defined DT_WHT && defined S_IFWHT
-  /*
-   * Whited-out files don't really exist.  However, there's stat(2) file
-   * mask for them, so we set it so that programs (i.e., find) don't have
-   * to test FTS_W separately from other file types.
-   */
-  if (dp != NULL && dp->d_type == DT_WHT)
-    {
-      memset (sbp, 0, sizeof (struct stat));
-      sbp->st_mode = S_IFWHT;
-      return (FTS_W);
-    }
-#endif
-
-  /*
-   * If doing a logical walk, or application requested FTS_FOLLOW, do
-   * a stat(2).  If that fails, check for a non-existent symlink.  If
-   * fail, set the errno from the stat call.
-   */
-  if (ISSET (FTS_LOGICAL) || follow)
-    {
-      if (stat (p->fts_accpath, sbp))
-	{
-	  saved_errno = errno;
-	  if (!lstat (p->fts_accpath, sbp))
-	    {
-	      errno = 0;
-	      return (FTS_SLNONE);
-	    }
-	  p->fts_errno = saved_errno;
-	  goto err;
-	}
-    }
-  else if (lstat (p->fts_accpath, sbp))
-    {
-      p->fts_errno = errno;
-    err:memset (sbp, 0, sizeof (struct stat));
-      return (FTS_NS);
-    }
-
-  if (S_ISDIR (sbp->st_mode))
-    {
-      /*
-       * Set the device/inode.  Used to find cycles and check for
-       * crossing mount points.  Also remember the link count, used
-       * in fts_build to limit the number of stat calls.  It is
-       * understood that these fields are only referenced if fts_info
-       * is set to FTS_D.
-       */
-      dev = p->fts_dev = sbp->st_dev;
-      ino = p->fts_ino = sbp->st_ino;
-      p->fts_nlink = sbp->st_nlink;
-
-      if (ISDOT (p->fts_name))
-	return (FTS_DOT);
-
-      /*
-       * Cycle detection is done by brute force when the directory
-       * is first encountered.  If the tree gets deep enough or the
-       * number of symbolic links to directories is high enough,
-       * something faster might be worthwhile.
-       */
-      for (t = p->fts_parent;
-	   t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-	if (ino == t->fts_ino && dev == t->fts_dev)
-	  {
-	    p->fts_cycle = t;
-	    return (FTS_DC);
-	  }
-      return (FTS_D);
-    }
-  if (S_ISLNK (sbp->st_mode))
-    return (FTS_SL);
-  if (S_ISREG (sbp->st_mode))
-    return (FTS_F);
-  return (FTS_DEFAULT);
-}
-
-static FTSENT *
-fts_sort (FTS *sp, FTSENT *head, register int nitems)
-{
-  register FTSENT **ap, *p;
-
-  /*
-   * Construct an array of pointers to the structures and call qsort(3).
-   * Reassemble the array in the order returned by qsort.  If unable to
-   * sort for memory reasons, return the directory entries in their
-   * current order.  Allocate enough space for the current needs plus
-   * 40 so don't realloc one entry at a time.
-   */
-  if (nitems > sp->fts_nitems)
-    {
-      sp->fts_nitems = nitems + 40;
-      if ((sp->fts_array = realloc (sp->fts_array,
-				    (size_t) (sp->fts_nitems *
-					      sizeof (FTSENT *)))) == NULL)
-	{
-	  sp->fts_nitems = 0;
-	  return (head);
-	}
-    }
-  for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-    *ap++ = p;
-  qsort ((void *) sp->fts_array, nitems, sizeof (FTSENT *), sp->fts_compar);
-  for (head = *(ap = sp->fts_array); --nitems; ++ap)
-    ap[0]->fts_link = ap[1];
-  ap[0]->fts_link = NULL;
-  return (head);
-}
-
-static FTSENT *
-fts_alloc (FTS *sp, const char *name, register int namelen)
-{
-  register FTSENT *p;
-  size_t len;
-
-  /*
-   * The file name is a variable length array and no stat structure is
-   * necessary if the user has set the nostat bit.  Allocate the FTSENT
-   * structure, the file name and the stat structure in one chunk, but
-   * be careful that the stat structure is reasonably aligned.  Since the
-   * fts_name field is declared to be of size 1, the fts_name pointer is
-   * namelen + 2 before the first possible address of the stat structure.
-   */
-  len = sizeof (FTSENT) + namelen;
-  if (!ISSET (FTS_NOSTAT))
-    len += sizeof (struct stat) + ALIGNBYTES;
-  if ((p = malloc (len)) == NULL)
-    return (NULL);
-
-  /* Copy the name plus the trailing NULL. */
-  memmove (p->fts_name, name, namelen + 1);
-
-  if (!ISSET (FTS_NOSTAT))
-    p->fts_statp = (struct stat *) ALIGN (p->fts_name + namelen + 2);
-  p->fts_namelen = namelen;
-  p->fts_path = sp->fts_path;
-  p->fts_errno = 0;
-  p->fts_flags = 0;
-  p->fts_instr = FTS_NOINSTR;
-  p->fts_number = 0;
-  p->fts_pointer = NULL;
-  return (p);
-}
-
-static void
-fts_lfree (register FTSENT *head)
-{
-  register FTSENT *p;
-
-  /* Free a linked list of structures. */
-  while ((p = head))
-    {
-      head = head->fts_link;
-      free (p);
-    }
-}
-
-/*
- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
- * though the kernel won't resolve them.  Add the size (not just what's needed)
- * plus 256 bytes so don't realloc the path 2 bytes at a time.
- */
-static int
-fts_palloc (FTS *sp, size_t more)
-{
-  sp->fts_pathlen += more + 256;
-  sp->fts_path = realloc (sp->fts_path, (size_t) sp->fts_pathlen);
-  return (sp->fts_path == NULL);
-}
-
-/*
- * When the path is realloc'd, have to fix all of the pointers in structures
- * already returned.
- */
-static void
-fts_padjust (FTS *sp, void *addr)
-{
-  FTSENT *p;
-
-#define ADJUST(p) {							\
-	(p)->fts_accpath =						\
-	    (char *)addr + ((p)->fts_accpath - (p)->fts_path);		\
-	(p)->fts_path = addr;						\
-}
-  /* Adjust the current set of children. */
-  for (p = sp->fts_child; p; p = p->fts_link)
-    ADJUST (p);
-
-  /* Adjust the rest of the tree. */
-  for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;)
-    {
-      ADJUST (p);
-      p = p->fts_link ? p->fts_link : p->fts_parent;
-    }
-}
-
-static size_t
-fts_maxarglen (char *const *argv)
-{
-  size_t len, max;
-
-  for (max = 0; *argv; ++argv)
-    if ((len = strlen (*argv)) > max)
-      max = len;
-  return (max);
-}
diff --git a/libls/fts.h b/libls/fts.h
deleted file mode 100644
index 3d6a29f..0000000
--- a/libls/fts.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-  2020, 2021 Free Software Foundation, Inc.
-
-  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/'. */
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _FTS_H
-# define _FTS_H 1
-
-# ifdef HAVE_FEATURES_H
-#  include <features.h>
-# endif
-# include <sys/types.h>
-
-typedef struct
-{
-  struct _ftsent *fts_cur;	/* current node */
-  struct _ftsent *fts_child;	/* linked list of children */
-  struct _ftsent **fts_array;	/* sort array */
-  dev_t fts_dev;		/* starting device # */
-  char *fts_path;		/* path for this descent */
-  int fts_rfd;			/* fd for root */
-  int fts_pathlen;		/* sizeof(path) */
-  int fts_nitems;		/* elements in the sort array */
-  int (*fts_compar) (const void *, const void *);	/* compare fn */
-
-# define FTS_COMFOLLOW	0x0001	/* follow command line symlinks */
-# define FTS_LOGICAL	0x0002	/* logical walk */
-# define FTS_NOCHDIR	0x0004	/* don't change directories */
-# define FTS_NOSTAT	0x0008	/* don't get stat info */
-# define FTS_PHYSICAL	0x0010	/* physical walk */
-# define FTS_SEEDOT	0x0020	/* return dot and dot-dot */
-# define FTS_XDEV	0x0040	/* don't cross devices */
-# define FTS_WHITEOUT	0x0080	/* return whiteout information */
-# define FTS_OPTIONMASK	0x00ff	/* valid user option mask */
-
-# define FTS_NAMEONLY	0x0100	/* (private) child names only */
-# define FTS_STOP	0x0200	/* (private) unrecoverable error */
-  int fts_options;		/* fts_open options, global flags */
-} FTS;
-
-typedef struct _ftsent
-{
-  struct _ftsent *fts_cycle;	/* cycle node */
-  struct _ftsent *fts_parent;	/* parent directory */
-  struct _ftsent *fts_link;	/* next file in directory */
-  long fts_number;		/* local numeric value */
-  void *fts_pointer;		/* local address value */
-  char *fts_accpath;		/* access path */
-  char *fts_path;		/* root path */
-  int fts_errno;		/* errno for this node */
-  int fts_symfd;		/* fd for symlink */
-  unsigned short fts_pathlen;	/* strlen(fts_path) */
-  unsigned short fts_namelen;	/* strlen(fts_name) */
-
-  ino_t fts_ino;		/* inode */
-  dev_t fts_dev;		/* device */
-  nlink_t fts_nlink;		/* link count */
-
-# define FTS_ROOTPARENTLEVEL	-1
-# define FTS_ROOTLEVEL		 0
-  short fts_level;		/* depth (-1 to N) */
-
-# define FTS_D		 1	/* preorder directory */
-# define FTS_DC		 2	/* directory that causes cycles */
-# define FTS_DEFAULT	 3	/* none of the above */
-# define FTS_DNR	 4	/* unreadable directory */
-# define FTS_DOT	 5	/* dot or dot-dot */
-# define FTS_DP		 6	/* postorder directory */
-# define FTS_ERR	 7	/* error; errno is set */
-# define FTS_F		 8	/* regular file */
-# define FTS_INIT	 9	/* initialized only */
-# define FTS_NS		10	/* stat(2) failed */
-# define FTS_NSOK	11	/* no stat(2) requested */
-# define FTS_SL		12	/* symbolic link */
-# define FTS_SLNONE	13	/* symbolic link without target */
-# define FTS_W		14	/* whiteout object */
-  unsigned short fts_info;	/* user flags for FTSENT structure */
-
-# define FTS_DONTCHDIR	 0x01	/* don't chdir .. to the parent */
-# define FTS_SYMFOLLOW	 0x02	/* followed a symlink to get here */
-  unsigned short fts_flags;	/* private flags for FTSENT structure */
-
-# define FTS_AGAIN	 1	/* read node again */
-# define FTS_FOLLOW	 2	/* follow symbolic link */
-# define FTS_NOINSTR	 3	/* no instructions */
-# define FTS_SKIP	 4	/* discard node */
-  unsigned short fts_instr;	/* fts_set() instructions */
-
-  struct stat *fts_statp;	/* stat(2) information */
-  char fts_name[1];		/* file name */
-} FTSENT;
-
-FTSENT *fts_children (FTS *, int);
-int fts_close (FTS *);
-FTS *fts_open (char *const *, int, int (*)(const FTSENT **, const FTSENT **));
-FTSENT *fts_read (FTS *);
-int fts_set (FTS *, FTSENT *, int);
-
-#endif /* fts.h */

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


commit 6d0c8ac203aca5ee9d00da918f60f66b8a42fdef
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 15:34:51 2021 +0200

    Remove tests obsoleted by gnulib.
    
    * configure.ac (poll.h, HAVE_SNPRINTF, HAVE_VSNPRINTF, strerror): Drop tests.

diff --git a/configure.ac b/configure.ac
index 07a02ec..af83f35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -810,30 +810,6 @@ AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
 # the system one doesn't have getopt_long.
 AC_CHECK_FUNC(getopt_long)
 
-AC_CHECK_HEADER(poll.h)
-
-# See if snprintf exists, otherwise just use a bogus version
-AC_CHECK_FUNC(snprintf,
-  [AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
-
-# See if vsnprintf exists, otherwise use our own.
-AC_CHECK_FUNC(vsnprintf,
-  [AC_DEFINE([HAVE_VSNPRINTF], 1, [Define to one if you have vsnprintf])])
-
-# See if the system has strerror, and replace it if not
-AC_CHECK_FUNC(strerror)
-if test "$ac_cv_func_strerror" = no; then
-  # No strerror, so see if the SYS_ERRLIST variable can be used by
-  # ours
-  AC_CHECK_FUNC(sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
-                              [Define to one if you have sys_errlist.]))
-  if test "$ac_cv_func_sys_errlist" = yes; then
-    AC_CHECK_DECL(sys_errlist, , ,
-      [IU_FLUSHLEFT([#include <stdio.h>
-                    #include <errno.h>])])
-  fi
-fi
-
 # See if the system has hstrerror, and replace it if not
 save_LIBS=$LIBS
 

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

Summary of changes:
 NEWS              |    4 +
 bootstrap.conf    |    1 +
 configure.ac      |   30 +-
 libls/Makefile.am |    4 +-
 libls/fts.c       | 1098 -----------------------------------------------------
 libls/fts.h       |  143 -------
 6 files changed, 10 insertions(+), 1270 deletions(-)
 delete mode 100644 libls/fts.c
 delete mode 100644 libls/fts.h


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 12:13:44 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7KHY-0007Bk-On
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 12:13:44 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:54492)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7KHX-0007BY-2P
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 12:13:43 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:34136)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7KHW-0005IO-7R
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 12:13:42 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id CCE4D20D0A; Sat, 24 Jul 2021 12:13:41 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.0-21-g3dcdf66
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 353812a5d9dfc77e9f70d278b611c6110404b510
X-Git-Newrev: 3dcdf66cd654154adc2786e2ce77cba6234f5c66
Message-Id: <20210724161341.CCE4D20D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 12:13:41 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 16:13: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  3dcdf66cd654154adc2786e2ce77cba6234f5c66 (commit)
      from  353812a5d9dfc77e9f70d278b611c6110404b510 (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=3dcdf66cd654154adc2786e2ce77cba6234f5c66


commit 3dcdf66cd654154adc2786e2ce77cba6234f5c66
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 18:12:40 2021 +0200

    Fix gnulib fts usage.
    
    * libls/cmp.c: Include fts_.h instead of fts.h.
    * libls/ls.c: Likewise.
    * libls/print.c: Likewise.
    * libls/util.c: Likewise.

diff --git a/libls/cmp.c b/libls/cmp.c
index e7d1ee7..65fe9e4 100644
--- a/libls/cmp.c
+++ b/libls/cmp.c
@@ -54,7 +54,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "fts.h"
+#include <fts_.h>
 #include <string.h>
 
 #include "ls.h"
diff --git a/libls/ls.c b/libls/ls.c
index 11cd33a..bdd7866 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -57,7 +57,7 @@
 #include <sys/ioctl.h>
 
 #include <errno.h>
-#include "fts.h"
+#include <fts_.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libls/print.c b/libls/print.c
index c7a9c47..f28e827 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -56,7 +56,7 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include "fts.h"
+#include <fts_.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
diff --git a/libls/util.c b/libls/util.c
index 115599f..ae7bc3f 100644
--- a/libls/util.c
+++ b/libls/util.c
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
-#include "fts.h"
+#include <fts_.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

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

Summary of changes:
 libls/cmp.c   | 2 +-
 libls/ls.c    | 2 +-
 libls/print.c | 2 +-
 libls/util.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 14:30:25 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7MPp-0003ya-BG
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 14:30:25 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:43748)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7MPh-0003yI-R4
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 14:30:23 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:36202)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7MPe-0005r2-Md
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 14:30:16 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id EDBC320D0A; Sat, 24 Jul 2021 14:30:13 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.0-22-gb36ba18
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3dcdf66cd654154adc2786e2ce77cba6234f5c66
X-Git-Newrev: b36ba1847966e296457df9802aaf1fd4ba655d74
Message-Id: <20210724183013.EDBC320D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 14:30:13 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 18:30: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  b36ba1847966e296457df9802aaf1fd4ba655d74 (commit)
      from  3dcdf66cd654154adc2786e2ce77cba6234f5c66 (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=b36ba1847966e296457df9802aaf1fd4ba655d74


commit b36ba1847966e296457df9802aaf1fd4ba655d74
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 20:28:04 2021 +0200

    Really try to fix gnulib fts usage.
    
    * libls/ls.c (ls_main): Use FTS_NOCHDIR.

diff --git a/libls/ls.c b/libls/ls.c
index bdd7866..ee779c3 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -153,7 +153,7 @@ ls_main (int argc, char **argv)
 
   optind = 1;	/* Reset for reentrant scanning.  */
 
-  fts_options = FTS_PHYSICAL;
+  fts_options = FTS_PHYSICAL | FTS_NOCHDIR;
   while ((ch = getopt (argc, argv, "1ACFLRSTWacdfgiklmnopqrstux")) != -1)
     {
       switch (ch)

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 15:44:59 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7NZz-0000Cr-O2
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 15:44:59 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51652)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7NZy-0000BX-B7
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 15:44:58 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:37284)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7NZx-0005hY-Sr
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 15:44:57 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id A499620311; Sat, 24 Jul 2021 15:44:57 -0400 (EDT)
Authentication-Results: vcs0.savannah.gnu.org; dkim=none
 reason="no signature"; dkim-adsp=fail (unprotected policy);
 dkim-atps=neutral
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  annotated tag, v2.1, created. v2.1
X-Git-Refname: refs/tags/v2.1
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 3f88a315412cca028537345d7e4e7b9690f526e6
Message-Id: <20210724194457.A499620311@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 15:44:57 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 19:44:58 -0000

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

The annotated tag, v2.1 has been created
        at  3f88a315412cca028537345d7e4e7b9690f526e6 (tag)
   tagging  6f10dcf937d2b64ddb87f34f27df549eacd8294c (commit)
  replaces  v2.0
 tagged by  Simon Josefsson
        on  Sat Jul 24 21:37:46 2021 +0200

- Log -----------------------------------------------------------------
inetutils 2.1
-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCYPxsCgAKCRBRcisI/kdF
ogNgAQDrAR6LrfsXGWDfAa+uy0AOxNHjUMg1ckFnTgol/SPA2gEA93UmoG1omINs
608DVcYoVhB1yT95CBxhpu2HW/r7+gU=
=W7SE
-----END PGP SIGNATURE-----

Alfred M. Szmidt (1):
      README: Update.

Ashish SHUKLA (2):
      whois: .ORG is not handled by InterNIC anymore
      whois: Update whois server for .IN

Simon Josefsson (20):
      maint: post-release administrivia
      Fix last commit.
      Fix some autoreconf 2.71 warnings.
      Use gnulib sys_types module so we can assume sys/types.h.
      TODO: Add items discussed on mailing list.
      telnet: Support --bind (-b) for NetKit compatibility.
      Use gitlog-to-changelog.
      Mention 'whois' fixes.
      ftp: Fix usage under Emacs AngeFTP on Mac OS.
      Sync bootstrap with gnulib.
      doc: Remove completed TODO item.
      Reorganize NEWS entries.
      Depend on .version instead of configure.ac (for version number changes).
      doc: Improve README-release.
      Drop old or unnecessary build rules.
      Remove tests obsoleted by gnulib.
      Use gnulib's fts code instead of custom libls/ version.
      Fix gnulib fts usage.
      Really try to fix gnulib fts usage.
      version 2.1

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 15:45:00 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7NZz-0000D5-Td
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 15:44:59 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51650)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7NZy-0000B2-B7
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 15:44:58 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:37282)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7NZx-0005hX-Nr
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 15:44:57 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 721D020D0A; Sat, 24 Jul 2021 15:44:57 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.1-1-gdf1e2c1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b36ba1847966e296457df9802aaf1fd4ba655d74
X-Git-Newrev: df1e2c1fe1da12274a065fd4760231781ad9eded
Message-Id: <20210724194457.721D020D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 15:44:57 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 19:44:58 -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  df1e2c1fe1da12274a065fd4760231781ad9eded (commit)
       via  6f10dcf937d2b64ddb87f34f27df549eacd8294c (commit)
      from  b36ba1847966e296457df9802aaf1fd4ba655d74 (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=df1e2c1fe1da12274a065fd4760231781ad9eded


commit df1e2c1fe1da12274a065fd4760231781ad9eded
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 21:42:28 2021 +0200

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

diff --git a/.prev-version b/.prev-version
index cd5ac03..879b416 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.0
+2.1
diff --git a/NEWS b/NEWS
index 7c5e62c..4b6ee48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.1 (2021-07-24) [stable]
 
 ** ftp
diff --git a/cfg.mk b/cfg.mk
index a13b389..1e80277 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -55,7 +55,7 @@ exclude_file_name_regexp--sc_obsolete_symbols = \
 exclude_file_name_regexp--sc_trailing_blank = \
 	^gl/top/README-release.diff$$
 
-old_NEWS_hash = 332d582cf1b06a9579f0be6e8fa5545c
+old_NEWS_hash = 201ce074704595e403c6614987d484e4
 
 htmldir = ../www-$(PACKAGE)
 

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


commit 6f10dcf937d2b64ddb87f34f27df549eacd8294c
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 21:37:46 2021 +0200

    version 2.1
    
    * NEWS: Record release date.

diff --git a/NEWS b/NEWS
index 6427c26..7c5e62c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
-* Noteworthy changes in release ?.? (????-??-??) [?]
+* Noteworthy changes in release 2.1 (2021-07-24) [stable]
 
 ** ftp
 

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

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


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 16:31:39 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7OJ9-0003D5-AO
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 16:31:39 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:56222)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7OJ7-0003Cv-P5
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 16:31:37 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:38062)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7OJ6-0003Uh-Rb
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 16:31:36 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 79BBE20D0A; Sat, 24 Jul 2021 16:31:36 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.1-8-g0b8e380
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: df1e2c1fe1da12274a065fd4760231781ad9eded
X-Git-Newrev: 0b8e380b707be207960d07fa8a066771839462e4
Message-Id: <20210724203136.79BBE20D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 16:31:35 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 20:31:38 -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  0b8e380b707be207960d07fa8a066771839462e4 (commit)
       via  ec7169ac6363982c5b04df4b4f23c0490f119250 (commit)
       via  75efa1973f9f7cae43920c2b826f6e55ffa80889 (commit)
       via  7476bb2b9ac1c1b9b8ccada9aa873e1d8c215e2d (commit)
       via  c32b2c42805a6c44f061121367cce623f58e520b (commit)
       via  80b12181a4bea17b4a3d1ced4a84803a8a9446f9 (commit)
       via  dc6c830ed9ba7440682015b07dab01681e94724d (commit)
      from  df1e2c1fe1da12274a065fd4760231781ad9eded (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=0b8e380b707be207960d07fa8a066771839462e4


commit 0b8e380b707be207960d07fa8a066771839462e4
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:25:12 2021 +0200

    Drop AC_C_CONST (obsolete).
    
    * configure.ac: Remove it.

diff --git a/configure.ac b/configure.ac
index 92e1327..167bec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -749,7 +749,6 @@ IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
 		  #include <arpa/tftp.h>])
 
 ### Checks for compiler characteristics.
-AC_C_CONST
 
 # See if `weak refs' are possible; these make it possible (with shared
 # libraries) to check for the existance of a standard function at

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


commit ec7169ac6363982c5b04df4b4f23c0490f119250
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:21:15 2021 +0200

    Use gnulib module socklen.
    
    * bootstrap.conf (gnulib_modules): Add it.
    * configure.ac: Don't look for it.

diff --git a/bootstrap.conf b/bootstrap.conf
index 2894e5a..ed51c93 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -86,6 +86,7 @@ signal
 size_max
 snippet/unused-parameter
 snprintf
+socklen
 stdarg
 stdbool
 stdint
diff --git a/configure.ac b/configure.ac
index 7851fd4..92e1327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -653,12 +653,6 @@ fi
 # Checks return type of signal handlers
 AC_TYPE_SIGNAL
 
-AC_CHECK_TYPE(socklen_t, ,
-  [AC_DEFINE([socklen_t], int,
-    [Define to int if <sys/types.h> does not define])],
-  [IU_FLUSHLEFT([#include <sys/types.h>
-                 #include <sys/socket.h>])])
-
 AC_CHECK_TYPES(struct if_nameindex, , ,
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <sys/socket.h>

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


commit 75efa1973f9f7cae43920c2b826f6e55ffa80889
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:19:31 2021 +0200

    Use gnulib modules stdarg, stdlib and string.
    
    * bootstrap.conf (gnulib_modules): Add them.
    * configure.ac: Don't look for them.

diff --git a/bootstrap.conf b/bootstrap.conf
index aed2beb..2894e5a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -86,10 +86,13 @@ signal
 size_max
 snippet/unused-parameter
 snprintf
+stdarg
 stdbool
 stdint
+stdlib
 strchrnul
 strerror
+string
 strndup
 strnlen
 sys_types
diff --git a/configure.ac b/configure.ac
index 8d24170..7851fd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -618,7 +618,7 @@ AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h features.h \
 		  glob.h memory.h netinet/ether.h netinet/in_systm.h \
 		  netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
 		  security/pam_appl.h shadow.h \
-		  stdarg.h stdlib.h string.h stropts.h sys/tty.h \
+		  stropts.h sys/tty.h \
 		  sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
 		  sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
 		  sys/sockio.h sys/sysmacros.h sys/param.h sys/file.h \

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


commit 7476bb2b9ac1c1b9b8ccada9aa873e1d8c215e2d
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:14:15 2021 +0200

    Use gnulib environ module.
    
    * bootstrap.conf (gnulib_modules): Add environ.
    * configure.ac: Don't look for environ.

diff --git a/bootstrap.conf b/bootstrap.conf
index cfe4be8..aed2beb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -43,8 +43,9 @@ argp-version-etc
 autobuild
 dirfd
 dirname-lgpl
-error
+environ
 errno
+error
 exitfail
 extensions
 fdl-1.3
diff --git a/configure.ac b/configure.ac
index edcc2cf..8d24170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -909,11 +909,6 @@ AC_CHECK_DECLS(htons, , ,
                  #endif
                  #include <netinet/in.h> ])])
 
-# Our home-grown version of setenv needs to use ENVIRON
-AC_CHECK_DECLS(environ, , ,
-  [IU_FLUSHLEFT([#include <unistd.h>
-                 #include <stdlib.h>])])
-
 # See if we have h_errno (the test is here so we can use -lresolv if
 # necessary).
 AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,

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


commit c32b2c42805a6c44f061121367cce623f58e520b
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:06:09 2021 +0200

    Use gnulib errno module.
    
    * bootstrap.conf (gnulib_modules): Add errno.
    * configure.ac: Don't look for errno.h.

diff --git a/bootstrap.conf b/bootstrap.conf
index 8471bb9..cfe4be8 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -44,6 +44,7 @@ autobuild
 dirfd
 dirname-lgpl
 error
+errno
 exitfail
 extensions
 fdl-1.3
diff --git a/configure.ac b/configure.ac
index 3966a2c..edcc2cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -614,7 +614,7 @@ IU_CHECK_LIBIDN([$with_libidn_prefix], [$with_idn])
 
 AC_HEADER_DIRENT
 
-AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \
+AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h features.h \
 		  glob.h memory.h netinet/ether.h netinet/in_systm.h \
 		  netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
 		  security/pam_appl.h shadow.h \
@@ -876,13 +876,6 @@ AC_MSG_RESULT([$ac_iu_const_enctype_names])
 
 AC_CHECK_DECLS(crypt, , , [#include <unistd.h>])
 
-# EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
-IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], , ,
-  [AC_DEFINE([EWOULDBLOCK], EAGAIN, 1,
-     [Define to EAGAIN if system does not provide EWOULDBLOCK])])
-
-AC_CHECK_DECLS(errno, , , [#include <errno.h>])
-
 # See whether <syslog.h> will declare special internal stuff if we
 # define SYSLOG_NAMES before including it.  We check for various
 # syslog internal macros, the typedef `CODE', and the variable

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


commit 80b12181a4bea17b4a3d1ced4a84803a8a9446f9
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:01:29 2021 +0200

    Use gnulib getpeername module.
    
    * bootstrap.conf (gnulib_modules): Add getpeername.
    * configure.ac: Don't look for getpeername.

diff --git a/bootstrap.conf b/bootstrap.conf
index abf5a5f..8471bb9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -56,6 +56,7 @@ getcwd
 getline
 getopt-gnu
 getpass
+getpeername
 gettext-h
 getusershell
 git-version-gen
diff --git a/configure.ac b/configure.ac
index 94d141c..3966a2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,6 @@ gl_INIT
 
 ### Checks for libraries.
 AC_SEARCH_LIBS([inet_ntoa], [nsl])
-AC_SEARCH_LIBS([getpeername], [socket])
 
 # See if a termcap library is available (under one of several names)
 IU_LIB_TERMCAP

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


commit dc6c830ed9ba7440682015b07dab01681e94724d
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 21:57:01 2021 +0200

    Refresh some release-related build rules.
    
    * cfg.mk: Update.

diff --git a/cfg.mk b/cfg.mk
index 1e80277..a79240c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,9 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-_makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
+manual_title = GNU Network Utilities
+
+bootstrap-tools = gnulib,autoconf,automake,bison,m4,makeinfo,help2man,make,gzip,tar
+
+old_NEWS_hash = 201ce074704595e403c6614987d484e4
 
-_build-aux = build-aux
+_makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 
 local-checks-to-skip = \
 	sc_cast_of_x_alloc_return_value \
@@ -55,20 +59,6 @@ exclude_file_name_regexp--sc_obsolete_symbols = \
 exclude_file_name_regexp--sc_trailing_blank = \
 	^gl/top/README-release.diff$$
 
-old_NEWS_hash = 201ce074704595e403c6614987d484e4
-
-htmldir = ../www-$(PACKAGE)
-
-manual_title = GNU network utilities
-
-web-coverage:
-	rm -fv `find $(htmldir)/coverage -type f | grep -v CVS`
-	cp -rv doc/coverage/* $(htmldir)/coverage/
-
-upload-web-coverage:
-	cd $(htmldir) && \
-		cvs commit -m "Update." coverage
-
 sc_unsigned_char:
 	@prohibit=u''_char \
 	halt='don'\''t use u''_char; instead use unsigned char'	\

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

Summary of changes:
 bootstrap.conf |  7 +++++++
 cfg.mk         | 22 ++++++----------------
 configure.ac   | 24 ++----------------------
 3 files changed, 15 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 24 16:56:11 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7Ogt-0007kR-1j
	for mharc-commit-inetutils@gnu.org; Sat, 24 Jul 2021 16:56:11 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:57914)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7Ogr-0007jv-O3
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 16:56:09 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:38421)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7Ogq-0002pb-Ui
 for commit-inetutils@gnu.org; Sat, 24 Jul 2021 16:56:08 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id BABF120D0A; Sat, 24 Jul 2021 16:56:08 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.1-11-gc42e147
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0b8e380b707be207960d07fa8a066771839462e4
X-Git-Newrev: c42e1472ee87521ee0c15d6dec01abe033653dfb
Message-Id: <20210724205608.BABF120D0A@vcs0.savannah.gnu.org>
Date: Sat, 24 Jul 2021 16:56:08 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2021 20:56:10 -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  c42e1472ee87521ee0c15d6dec01abe033653dfb (commit)
       via  1631c62b77dcd4d96c9c6f759adaa8ecde836726 (commit)
       via  f4ae6d889110a0b9732f8335eb5d7be861bf9a1e (commit)
      from  0b8e380b707be207960d07fa8a066771839462e4 (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=c42e1472ee87521ee0c15d6dec01abe033653dfb


commit c42e1472ee87521ee0c15d6dec01abe033653dfb
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:44:27 2021 +0200

    Don't check for getopt_long, no longer used anywhere.
    
    * configure.ac: Remove check.

diff --git a/configure.ac b/configure.ac
index 4062e08..5e16c3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -794,10 +794,6 @@ AC_CHECK_FUNC(_obstack_free)
 AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
                           [Define to `setpgrp' if you don't have `setpgid'.]))
 
-# We use our own version of getopt (including our own header file) if
-# the system one doesn't have getopt_long.
-AC_CHECK_FUNC(getopt_long)
-
 # See if the system has hstrerror, and replace it if not
 save_LIBS=$LIBS
 

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


commit 1631c62b77dcd4d96c9c6f759adaa8ecde836726
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:40:11 2021 +0200

    Don't check for getpass, getusershell, and poll (gnulib modules already imported).
    
    * configure.ac: Remove checks.

diff --git a/configure.ac b/configure.ac
index 830edb6..4062e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -782,9 +782,6 @@ LIBS="$LIBS $LIBUTIL"
 AC_CHECK_FUNCS(login loginx logout logoutx logwtmp logwtmpx)
 LIBS="$_SAVE_LIBS"
 
-# Functions that we will define if necessary.
-AC_REPLACE_FUNCS(getpass getusershell poll)
-
 # Look for the crypt function itself (in libcrypt if possible)
 _SAVE_LIBS="$LIBS"
 LIBS="$LIBCRYPT $LIBS"

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


commit f4ae6d889110a0b9732f8335eb5d7be861bf9a1e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Jul 24 22:35:52 2021 +0200

    Don't check for memcmp, memcpy, memmove, memset and strdup (no gnulib module needed).
    
    * configure.ac: Remove checks.

diff --git a/configure.ac b/configure.ac
index 167bec1..830edb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,8 +783,7 @@ AC_CHECK_FUNCS(login loginx logout logoutx logwtmp logwtmpx)
 LIBS="$_SAVE_LIBS"
 
 # Functions that we will define if necessary.
-AC_REPLACE_FUNCS(getpass getusershell memcmp memcpy memmove memset \
-		 strdup poll)
+AC_REPLACE_FUNCS(getpass getusershell poll)
 
 # Look for the crypt function itself (in libcrypt if possible)
 _SAVE_LIBS="$LIBS"

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

Summary of changes:
 configure.ac | 8 --------
 1 file changed, 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Jul 25 03:21:14 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7YRm-0004rw-EZ
	for mharc-commit-inetutils@gnu.org; Sun, 25 Jul 2021 03:21:14 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:48632)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7YRk-0004rX-VZ
 for commit-inetutils@gnu.org; Sun, 25 Jul 2021 03:21:12 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:48342)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7YRk-0003HW-9l
 for commit-inetutils@gnu.org; Sun, 25 Jul 2021 03:21:12 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id DBF9720D0A; Sun, 25 Jul 2021 03:21:11 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.1-12-g71c80e6
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c42e1472ee87521ee0c15d6dec01abe033653dfb
X-Git-Newrev: 71c80e612f38e3f497cf7104577e3e281bc4f825
Message-Id: <20210725072111.DBF9720D0A@vcs0.savannah.gnu.org>
Date: Sun, 25 Jul 2021 03:21:11 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jul 2021 07:21:13 -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  71c80e612f38e3f497cf7104577e3e281bc4f825 (commit)
      from  c42e1472ee87521ee0c15d6dec01abe033653dfb (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=71c80e612f38e3f497cf7104577e3e281bc4f825


commit 71c80e612f38e3f497cf7104577e3e281bc4f825
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jul 25 09:20:33 2021 +0200

    tests: Don't fail ftp-localhost.sh when sysctl is missing.
    
    * tests/ftp-localhost.sh: Silent fail.

diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 2d94317..974e948 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -610,7 +610,7 @@ else
     # Do we have sysctl(8) available?
     # It need not be present with the default search path,
     # so locally augment PATH!
-    SYSCTL=`PATH="$PATH":/usr/sbin:/sbin command -v sysctl`
+    SYSCTL=`PATH="$PATH":/usr/sbin:/sbin command -v sysctl || true`
 
     if test -n "$SYSCTL"; then
 	have_sysctl=true

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

Summary of changes:
 tests/ftp-localhost.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Jul 26 01:21:11 2021
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1m7t39-0002aw-9T
	for mharc-commit-inetutils@gnu.org; Mon, 26 Jul 2021 01:21:11 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:45108)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@josefsson.org>)
 id 1m7t37-0002ao-Mb
 for commit-inetutils@gnu.org; Mon, 26 Jul 2021 01:21:09 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:39457)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <simon@josefsson.org>) id 1m7t37-0005TB-4f
 for commit-inetutils@gnu.org; Mon, 26 Jul 2021 01:21:09 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66976)
 id 98C0F20D0A; Mon, 26 Jul 2021 01:21:08 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master, updated. v2.1-14-g1965afb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 71c80e612f38e3f497cf7104577e3e281bc4f825
X-Git-Newrev: 1965afb227ff00db56d822c4848bbb3f16f10c44
Message-Id: <20210726052108.98C0F20D0A@vcs0.savannah.gnu.org>
Date: Mon, 26 Jul 2021 01:21:08 -0400 (EDT)
From: simon@josefsson.org (Simon Josefsson)
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jul 2021 05:21: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  1965afb227ff00db56d822c4848bbb3f16f10c44 (commit)
       via  6bdf6b485c381d7c9472f8c2ce4642eeb2266bf9 (commit)
      from  71c80e612f38e3f497cf7104577e3e281bc4f825 (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=1965afb227ff00db56d822c4848bbb3f16f10c44


commit 1965afb227ff00db56d822c4848bbb3f16f10c44
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jul 26 07:19:35 2021 +0200

    logger: Code for non-getaddrinfo removed.
    
    * NEWS: Mention change.
    * src/logger.c [!HAVE_DECL_GETADDRINFO]: Remove.

diff --git a/NEWS b/NEWS
index b7d35c3..4b930dc 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** logger
+
+Code for non-getaddrinfo removed, since we are using gnulib to provide
+getaddrinfo on any platform that lacks it.  This may have resulted in
+logger not using getaddrinfo on platforms that didn't have the
+getaddrinfo prototype, even though we use the gnulib module.
+
 ** Various bugs fixes, internal improvements and clean ups.
 
 A lot of configure.ac checks were removed that are no longer needed
diff --git a/src/logger.c b/src/logger.c
index 7f62cff..1228a1e 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -61,14 +61,12 @@ static char *unixsock = NULL;
 static char *source;
 static char *pidstr;
 
-#if HAVE_DECL_GETADDRINFO
-# if HAVE_IPV6
+#if HAVE_IPV6
 static int host_family = AF_UNSPEC;
-# else
+#else
 /* Fall back to only IPv4.  */
 static int host_family = AF_INET;
-# endif /* !HAVE_IPV6 */
-#endif /* HAVE_DECL_GETADDRINFO */
+#endif /* !HAVE_IPV6 */
 
 
 
@@ -141,9 +139,7 @@ open_socket (void)
   union logger_sockaddr sockaddr;
   socklen_t socklen;
   int family;
-#if HAVE_DECL_GETADDRINFO
   int ret;
-#endif
 
   /* A UNIX socket name can be specified in two ways.
    * Zero length of `unixsock' is handled automatically.  */
@@ -165,13 +161,7 @@ open_socket (void)
     }
   else
     {
-#if HAVE_DECL_GETADDRINFO
       struct addrinfo hints, *ai, *res;
-#else
-      struct hostent *hp;
-      struct servent *sp;
-      unsigned short port;
-#endif /* !HAVE_DECL_GETADDRINFO */
       char *p;
 
 #if HAVE_IPV6
@@ -209,7 +199,6 @@ open_socket (void)
       if (!p)
 	p = "syslog";
 
-#if HAVE_DECL_GETADDRINFO
       memset (&hints, 0, sizeof (hints));
       hints.ai_socktype = SOCK_DGRAM;
 
@@ -275,43 +264,13 @@ open_socket (void)
 	error (EXIT_FAILURE, EADDRNOTAVAIL, "%s:%s", host, p);
 
       /* Existing socket can be returned now.
-       * This handles AF_INET and AF_INET6 in case
-       * HAVE_DECL_GETADDRINFO is true.  */
+       * This handles AF_INET and AF_INET6.  */
       return;
 
-#else /* !HAVE_DECL_GETADDRINFO */
-
-      sockaddr.sinet.sin_family = AF_INET;
-      family = PF_INET;
-
-      hp = gethostbyname (host);
-      if (hp)
-	sockaddr.sinet.sin_addr.s_addr = *(unsigned long*) hp->h_addr_list[0];
-      else if (inet_aton (host, (struct in_addr *) &sockaddr.sinet.sin_addr)
-	       != 1)
-	error (EXIT_FAILURE, 0, "unknown host name");
-
-      if (isdigit (*p))
-	{
-	  char *end;
-	  unsigned long n = strtoul (p, &end, 10);
-	  if (*end || (port = n) != n)
-	    error (EXIT_FAILURE, 0, "%s: invalid port number", p);
-	  port = htons (port);
-	}
-      else if ((sp = getservbyname (p, "udp")) != NULL)
-	port = sp->s_port;
-      else
-	error (EXIT_FAILURE, 0, "%s: unknown service name", p);
-
-      sockaddr.sinet.sin_port = port;
-#endif /* !HAVE_DECL_GETADDRINFO */
-
       socklen = sizeof (sockaddr.sinet);
     }
 
-  /* Execution arrives here for AF_UNIX and for
-   * situations with !HAVE_DECL_GETADDRINFO.  */
+  /* Execution arrives here for AF_UNIX.  */
 
   fd = socket (family, SOCK_DGRAM, 0);
   if (fd < 0)

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


commit 6bdf6b485c381d7c9472f8c2ce4642eeb2266bf9
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jul 26 07:16:42 2021 +0200

    doc: Document recent fixes.
    
    * NEWS: Add.

diff --git a/NEWS b/NEWS
index 4b6ee48..b7d35c3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Various bugs fixes, internal improvements and clean ups.
+
+A lot of configure.ac checks were removed that are no longer needed
+since we rely on gnulib for portability.
+
+The tests/ftp-localhost.sh self-test no longer fails on platforms
+where sysctl is missing.
 
 * Noteworthy changes in release 2.1 (2021-07-24) [stable]
 

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

Summary of changes:
 NEWS         | 14 ++++++++++++++
 src/logger.c | 51 +++++----------------------------------------------
 2 files changed, 19 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


