From MAILER-DAEMON Wed Nov 09 16:48:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROG0h-0000Mj-9M
	for mharc-commit-inetutils@gnu.org; Wed, 09 Nov 2011 16:48:43 -0500
Received: from eggs.gnu.org ([140.186.70.92]:46962)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ROG0e-0000MU-F4
	for commit-inetutils@gnu.org; Wed, 09 Nov 2011 16:48:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ROG0c-0006Cp-Ft
	for commit-inetutils@gnu.org; Wed, 09 Nov 2011 16:48:40 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47483)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ROG0c-0006Cg-Cv
	for commit-inetutils@gnu.org; Wed, 09 Nov 2011 16:48:38 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1ROG0a-0001Sm-M4
	for commit-inetutils@gnu.org; Wed, 09 Nov 2011 21:48:37 +0000
Date: Wed, 09 Nov 2011 21:48:37 +0000
Message-Id: <E1ROG0a-0001Sm-M4@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-148-g50d40fa
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 094ba8a78999a741759a7537b6fc980e5e3ce8ae
X-Git-Newrev: 50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Nov 2011 21:48:41 -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  50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4 (commit)
      from  094ba8a78999a741759a7537b6fc980e5e3ce8ae (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=50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4


commit 50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Nov 9 22:46:45 2011 +0100

    syslogd: Prevent buffer overrun with socket names.

diff --git a/ChangeLog b/ChangeLog
index bd401db..3facf51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-09  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/syslogd.c (create_unix_socket): Avoid buffer
+	overrun for very long UNIX socket names.  Return proper
+	error codes also when bind() or chmod() fail.
+	* tests/syslogd.sh: Implement tests for the boundary
+	cases of very long UNIX socket names.
+
 2011-10-31  Simon Josefsson  <simon@josefsson.org>
 
 	* doc/inetutils.texi (Top): Remove 'Concept Index'.  Doc fix.
diff --git a/src/syslogd.c b/src/syslogd.c
index ff83f4a..1e943ab 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -812,11 +812,18 @@ create_unix_socket (const char *path)
   if (path[0] == '\0')
     return -1;
 
+  if (strlen (path) >= sizeof (sunx.sun_path))
+    {
+      snprintf (line, sizeof (line), "UNIX socket name too long: %s", path);
+      logerror (line);
+      return -1;
+    }
+
   unlink (path);
 
   memset (&sunx, 0, sizeof (sunx));
   sunx.sun_family = AF_UNIX;
-  strncpy (sunx.sun_path, path, sizeof (sunx.sun_path));
+  strncpy (sunx.sun_path, path, sizeof (sunx.sun_path) - 1);
   fd = socket (AF_UNIX, SOCK_DGRAM, 0);
   if (fd < 0 || bind (fd, (struct sockaddr *) &sunx, SUN_LEN (&sunx)) < 0
       || chmod (path, 0666) < 0)
@@ -825,6 +832,7 @@ create_unix_socket (const char *path)
       logerror (line);
       dbg_printf ("cannot create %s: %s\n", path, strerror (errno));
       close (fd);
+      fd = -1;
     }
   return fd;
 }
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 3d3f7b6..6550350 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -31,13 +31,43 @@ PID=$IU_TESTDIR/syslogd.pid
 OUT=$IU_TESTDIR/messages
 : ${SOCKET:=$IU_TESTDIR/log}
 
-IU_SYSLOGD=./src/syslogd$EXEEXT
-IU_LOGGER=./src/logger$EXEEXT
+# For testing of critical lengths for UNIX socket names,
+# we need a well defined base directory; choose "/tmp/".
+IU_TEN=0123456789
+IU_TWENTY=${IU_TEN}${IU_TEN}
+IU_FORTY=${IU_TWENTY}${IU_TWENTY}
+IU_EIGHTY=${IU_FORTY}${IU_FORTY}
+
+# This good name base consumes twentythree chracters.
+IU_GOOD_BASE=/tmp/$(date +%y-%m-%d)_socket_iu
+
+# Add a single character to violate the size condition.
+IU_BAD_BASE=/tmp/X$(date +%y-%m-%d)_socket_iu
+
+IU_OS=$(uname -s)
+if [ "${IU_OS}" != "OpenBSD" -a "${IU_OS}" != "FreeBSD" ]; then
+	# Aim at the boundary of 108 characters.
+	IU_GOOD_BASE=${IU_GOOD_BASE}_lnx
+	IU_BAD_BASE=${IU_BAD_BASE}_lnx
+fi
+
+# Establish largest possible socket name.  The long
+# name consists of 103 or 107 non-NUL characters,
+# where the excessive string contains 104 or 108.
+# BSD allocates only 104, whereas GLIBC and Solaris
+# admits 108 characters in "sun_path", including NUL.
+IU_LONG_SOCKET=${IU_GOOD_BASE}${IU_EIGHTY}
+IU_EXCESSIVE_SOCKET=${IU_BAD_BASE}${IU_EIGHTY}
 
 # All messages intended for post-detection are
 # to be uniformly tagged.
 TAG="syslogd-test"
 
+# The executables under test.
+
+IU_SYSLOGD=./src/syslogd$EXEEXT
+IU_LOGGER=./src/logger$EXEEXT
+
 # Step out of `tests/', should the invokation
 # have been made there.
 #
@@ -92,6 +122,8 @@ fi
 #
 ## Base configuration.
 IU_OPTIONS="--rcfile=$CONF --pidfile=$PID --socket=$SOCKET"
+IU_OPTIONS="$IU_OPTIONS -a $IU_LONG_SOCKET -a $IU_EXCESSIVE_SOCKET"
+
 ## Enable INET service when running as root.
 if [ "$USER" = "root" ]; then
 	IU_OPTIONS="$IU_OPTIONS --ipany --inet --hop"
@@ -120,12 +152,20 @@ fi
 # as well as an exit code.
 #
 TESTCASES=0
+SUCCESSES=0
 EXITCODE=1
 
+# Check that the excessively long UNIX socket name was rejected.
+TESTCASES=$((TESTCASES + 1))
+if grep -q "UNIX socket name too long.*${IU_BAD_BASE}" $OUT; then
+	SUCCESSES="$((SUCCESSES + 1))"
+fi
+
 # Send messages on two sockets: IPv4 and UNIX.
 #
-TESTCASES=$((TESTCASES + 1))
+TESTCASES=$((TESTCASES + 2))
 $IU_LOGGER -h $SOCKET -p user.info -t $TAG "Sending BSD message. (pid $$)"
+$IU_LOGGER -h $IU_LONG_SOCKET -p user.info -t $TAG "Sending via long socket name. (pid $$)"
 
 if [ "$USER" = "root" ]; then
 	TESTCASES=$((TESTCASES + 2))
@@ -135,15 +175,15 @@ fi
 
 # Detection of registered messages.
 #
-TEXTLINES="$(grep $TAG $OUT | wc -l)"
+SUCCESSES="$((SUCCESSES + $(grep $TAG $OUT | wc -l) ))"
 
 if [ -n "${VERBOSE+yes}" ]; then
 	grep $TAG $OUT
 fi
 
-echo "Registered $TEXTLINES lines out of $TESTCASES."
+echo "Registered $SUCCESSES successes out of $TESTCASES."
 
-if [ "$TEXTLINES" -eq "$TESTCASES" ]; then
+if [ "$SUCCESSES" -eq "$TESTCASES" ]; then
 	echo "Successful testing."
 	EXITCODE=0
 else

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

Summary of changes:
 ChangeLog        |    8 ++++++++
 src/syslogd.c    |   10 +++++++++-
 tests/syslogd.sh |   52 ++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 63 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Nov 11 06:51:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ROpe1-0008Dp-5k
	for mharc-commit-inetutils@gnu.org; Fri, 11 Nov 2011 06:51:41 -0500
Received: from eggs.gnu.org ([140.186.70.92]:41170)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ROpdy-0008DB-Gm
	for commit-inetutils@gnu.org; Fri, 11 Nov 2011 06:51:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ROpdw-0006Gw-W5
	for commit-inetutils@gnu.org; Fri, 11 Nov 2011 06:51:38 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51524)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ROpdu-0006Gp-1F
	for commit-inetutils@gnu.org; Fri, 11 Nov 2011 06:51:36 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1ROpdc-0004Su-Ll
	for commit-inetutils@gnu.org; Fri, 11 Nov 2011 11:51:25 +0000
Date: Fri, 11 Nov 2011 11:51:21 +0000
Message-Id: <E1ROpdc-0004Su-Ll@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-149-g4cde9ff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4
X-Git-Newrev: 4cde9ffd1608bae7f5c749606efbd5e847dab2a5
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Nov 2011 11:51:39 -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  4cde9ffd1608bae7f5c749606efbd5e847dab2a5 (commit)
      from  50d40fa24a4238c0a0d0a775b8adc5f2dbb8c6d4 (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=4cde9ffd1608bae7f5c749606efbd5e847dab2a5


commit 4cde9ffd1608bae7f5c749606efbd5e847dab2a5
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Nov 11 12:49:31 2011 +0100

    inetutils.texi: Corrections to telnetd description.

diff --git a/ChangeLog b/ChangeLog
index 3facf51..1e2e91c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-11  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* doc/inetutils.texi (Introduction): White space.
+	(Common options): Mention `--usage'.  Replace brackets.
+	(Exit status): Spacing around `---'.
+	(telnetd invocation): Several corrections.
+	* telnetd/telnetd.c (argp_options): Remove duplicate space.
+
 2011-11-09  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/syslogd.c (create_unix_socket): Avoid buffer
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 751fd57..f71a5b4 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -162,7 +162,7 @@ generated.
 Many features were integrated from NetBSD, OpenBSD, FreeBSD and
 GNU/Linux, the merges were done by a group of dedicated hackers (in no
 particular order): Jeff Bailey, Marcus Brinkmann, Michael Vogt,
-Bernhard Rosenkraenzer, Kaveh R.  Ghazi, NIIBE Yutaka, Nathan
+Bernhard Rosenkraenzer, Kaveh R. Ghazi, NIIBE Yutaka, Nathan
 Neulinger, Jeff Smith, Dan Stromberg, David O'Shea, Frederic Goudal,
 Gerald Combs, Joachim Gabler, Marco D'Itri, Sergey Poznyakoff, and
 many more.
@@ -172,8 +172,8 @@ many more.
 
 Certain options are available in all these programs.  Rather than
 writing identical descriptions for each of the programs, they are
-described here.  (In fact, every @sc{gnu} program accepts (or should
-accept) these options.)
+described here.  (In fact, every @sc{gnu} program accepts, or should
+accept, these options.)
 
 Many of these programs take arbitrary strings as arguments.  In those
 cases, @option{--help} and @option{--version} are taken as these
@@ -183,9 +183,15 @@ options only if there is one and exactly one command line argument.
 @item --help
 @opindex --help
 @cindex help, online
-Print a usage message listing all available options, then exit
+Print a usage message, listing all available options, then exit
 successfully.
 
+@item --usage
+@opindex --usage
+@cindex usage, online
+Print a condensed usage message, displaying all available options
+formatted like a command line call, then exit successfully.
+
 @item --version
 @opindex --version
 @cindex version number, finding
@@ -213,8 +219,8 @@ indicates failure.
 Nearly every command invocation yields an integral @dfn{exit status}
 that can be used to change how other commands work.  For the vast
 majority of commands, an exit status of zero indicates success.
-Failure is indicated by a nonzero value---typically @samp{1}, though
-it may differ on unusual platforms as POSIX requires only that it be
+Failure is indicated by a nonzero value --- typically @samp{1}, though
+it may differ on unusual platforms, as POSIX requires only that it be
 nonzero.
 
 @node hostname invocation
@@ -3426,20 +3432,21 @@ the additional level indicator, but is instead equivalent to
 setting the socket option @samp{SO_DEBUG} for debugging the
 complete traffic.
 
-The outcome is the file @file{/var/telnet.debug}, to which
+The outcome is the file @file{/tmp/telnet.debug}, to which
 data is incrementally added as time passes.
 
-@item    -E
+@item -E STRING
 @itemx --exec-login=STRING
 Set program to be executed instead of @command{/bin/login}.
 
-@item    -h
+@item -h
 @itemx --no-hostinfo
 Do not print host information before login has been completed.
 
-@item -l
-@item --linemode=[MODE]
-Set line mode.
+@item -l[MODE]
+@itemx --linemode=[MODE]
+Set line mode.  An empty argument will force line mode at all times.
+The only recognised value is otherwise @samp{nokludge}.
 
 @item -n
 @itemx --no-keepalive
@@ -3450,9 +3457,12 @@ Disable TCP keep-alives.
 Refuse connections from addresses that cannot be mapped back into a
 symbolic name.
 
-@item -X
+@item -X AUTHTYPE
 @itemx --disable-auth-type=AUTHTYPE
-Disable the use of given authentication option.
+Disable the use of the given authentication type.
+Use this option multiple times if more than one type
+is to be disabled.  Standard choices are @samp{null},
+@samp{kerberos_v4}, and @samp{kerberos_v5}.
 @end table
 
 @node uucpd invocation
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 9442f39..7bfeb4f 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -104,7 +104,7 @@ static struct argp_option argp_options[] = {
   { "no-keepalive", 'n', NULL, 0,
     "disable TCP keep-alives" },
   { "reverse-lookup", 'U', NULL, 0,
-    "refuse  connections from addresses that "
+    "refuse connections from addresses that "
     "cannot be mapped back into a symbolic name" },
 #ifdef  AUTHENTICATION
   { "disable-auth-type", 'X', "TYPE", 0,

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

Summary of changes:
 ChangeLog          |    8 ++++++++
 doc/inetutils.texi |   38 ++++++++++++++++++++++++--------------
 telnetd/telnetd.c  |    2 +-
 3 files changed, 33 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 12 13:06:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPHyc-0001I0-Bp
	for mharc-commit-inetutils@gnu.org; Sat, 12 Nov 2011 13:06:50 -0500
Received: from eggs.gnu.org ([140.186.70.92]:49322)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPHyZ-0001Hq-KU
	for commit-inetutils@gnu.org; Sat, 12 Nov 2011 13:06:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPHyY-0000s2-2E
	for commit-inetutils@gnu.org; Sat, 12 Nov 2011 13:06:47 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34082)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPHyX-0000rp-Ul
	for commit-inetutils@gnu.org; Sat, 12 Nov 2011 13:06:45 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RPHyW-0008IO-VW
	for commit-inetutils@gnu.org; Sat, 12 Nov 2011 18:06:45 +0000
Date: Sat, 12 Nov 2011 18:06:45 +0000
Message-Id: <E1RPHyW-0008IO-VW@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-150-gc548bd6
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4cde9ffd1608bae7f5c749606efbd5e847dab2a5
X-Git-Newrev: c548bd6aba8c95c3ed8fa102362f5a9c60534c9e
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 12 Nov 2011 18:06:48 -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  c548bd6aba8c95c3ed8fa102362f5a9c60534c9e (commit)
      from  4cde9ffd1608bae7f5c749606efbd5e847dab2a5 (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=c548bd6aba8c95c3ed8fa102362f5a9c60534c9e


commit c548bd6aba8c95c3ed8fa102362f5a9c60534c9e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 12 19:05:32 2011 +0100

    Doc fixes.

diff --git a/.gitignore b/.gitignore
index 1b19fff..a17d837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 .sc-start-sc_prohibit_have_config_h
 .tarball-version
 .version
+/build-aux
 ABOUT-NLS
 GNUmakefile
 INSTALL
@@ -40,7 +41,6 @@ include
 inetutils-*.tar.gz
 inetutils-*/
 lib/
-!lib/Makefile.am
 libtool
 m4
 maint.mk
@@ -48,3 +48,4 @@ pathdefs.make
 paths.defs
 stamp-h.in
 stamp-h1
+!lib/Makefile.am
diff --git a/ChangeLog b/ChangeLog
index 1e2e91c..5f67afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12  Simon Josefsson  <simon@josefsson.org>
+
+	* .gitignore, doc/.gitignore: Update from gnulib-tool.
+	* NEWS: Add.
+
 2011-11-11  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* doc/inetutils.texi (Introduction): White space.
diff --git a/NEWS b/NEWS
index 78e651f..6942c9e 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ Handle IPv6 connections.
 Now under GNU/Linux "ifconfig -a" shows also interfaces without an address.
 
 Adjusted output formating for "unix".
+
+* Various bugs fixes, internal improvements and clean ups.
 
 May 15, 2010
 Version 1.8:
diff --git a/doc/.gitignore b/doc/.gitignore
index 3a21987..ba54d04 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,3 +1,5 @@
+/fdl-1.3.texi
+/gendocs_template
 fdl-1.3.texi
 gendocs_template
 inetutils.info*

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

Summary of changes:
 .gitignore     |    3 ++-
 ChangeLog      |    5 +++++
 NEWS           |    2 ++
 doc/.gitignore |    2 ++
 4 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 14 04:52:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPtDO-0008Th-VX
	for mharc-commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:52:34 -0500
Received: from eggs.gnu.org ([140.186.70.92]:51623)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtDM-0008TZ-GT
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:52:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtDL-00036D-7M
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:52:32 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40972)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtDL-000369-4b
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:52:31 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RPtDK-0006xU-Em
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 09:52:30 +0000
Date: Mon, 14 Nov 2011 09:52:30 +0000
Message-Id: <E1RPtDK-0006xU-Em@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-152-g75ea8ee
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 63d7239880d949f1b9cc856e55def0276e232cec
X-Git-Newrev: 75ea8ee88d2708b1641ad3b2d687669cee3a5023
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 14 Nov 2011 09:52:33 -0000

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

The branch, master has been updated
       via  75ea8ee88d2708b1641ad3b2d687669cee3a5023 (commit)
      from  63d7239880d949f1b9cc856e55def0276e232cec (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=75ea8ee88d2708b1641ad3b2d687669cee3a5023


commit 75ea8ee88d2708b1641ad3b2d687669cee3a5023
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 14 10:51:58 2011 +0100

    logger: Make it build.
    
    * src/Makefile.am (logger_SOURCES): Add logprio.h.

diff --git a/ChangeLog b/ChangeLog
index 3c245e3..d99f46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
 
+	* src/Makefile.am (logger_SOURCES): Add logprio.h
+
+2011-11-14  Simon Josefsson  <simon@josefsson.org>
+
 	* ping/ping.c: New variable.
 	(argp_options): Add parameter -W aka --linger.
 	(parse_opt): Parse -W parameter.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e32b9e..a395b89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ hostname_SOURCES = hostname.c
 EXTRA_PROGRAMS += hostname
 
 bin_PROGRAMS += @logger_BUILD@
-logger_SOURCES = logger.c
+logger_SOURCES = logger.c logprio.h
 EXTRA_PROGRAMS += logger
 
 bin_PROGRAMS += @rcp_BUILD@

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

Summary of changes:
 ChangeLog       |    4 ++++
 src/Makefile.am |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 14 04:54:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPtEs-0000EY-KX
	for mharc-commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:54:06 -0500
Received: from eggs.gnu.org ([140.186.70.92]:51803)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtEp-0000Dh-Nb
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:54:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtEn-0003SL-Lr
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:54:03 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40986)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtEn-0003SD-GJ
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:54:01 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RPtEn-00075M-32
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 09:54:01 +0000
Date: Mon, 14 Nov 2011 09:54:01 +0000
Message-Id: <E1RPtEn-00075M-32@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-153-gb5a722b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75ea8ee88d2708b1641ad3b2d687669cee3a5023
X-Git-Newrev: b5a722b3120a112e18f5dc228bd7297605679fb5
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 14 Nov 2011 09:54:05 -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  b5a722b3120a112e18f5dc228bd7297605679fb5 (commit)
      from  75ea8ee88d2708b1641ad3b2d687669cee3a5023 (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=b5a722b3120a112e18f5dc228bd7297605679fb5


commit b5a722b3120a112e18f5dc228bd7297605679fb5
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 14 10:53:23 2011 +0100

    Fix typo in last commit. (silent change)

diff --git a/ChangeLog b/ChangeLog
index d99f46c..afb7ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
 
-	* src/Makefile.am (logger_SOURCES): Add logprio.h
+	* src/Makefile.am (logger_SOURCES): Add logprio.h.
 
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
 

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

Summary of changes:
 ChangeLog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 14 04:58:04 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPtIi-0001Uv-RF
	for mharc-commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:58:04 -0500
Received: from eggs.gnu.org ([140.186.70.92]:34678)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtIg-0001U6-BG
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:58:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtIe-0003xO-Jo
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:58:02 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:41634)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPtIe-0003xK-H6
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:58:00 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RPtId-0007SW-EB
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 09:57:59 +0000
Date: Mon, 14 Nov 2011 09:57:59 +0000
Message-Id: <E1RPtId-0007SW-EB@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-154-g338e153
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b5a722b3120a112e18f5dc228bd7297605679fb5
X-Git-Newrev: 338e1532644b43b4e3df06117a1cecc9f0c47d75
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 14 Nov 2011 09:58:03 -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  338e1532644b43b4e3df06117a1cecc9f0c47d75 (commit)
      from  b5a722b3120a112e18f5dc228bd7297605679fb5 (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=338e1532644b43b4e3df06117a1cecc9f0c47d75


commit 338e1532644b43b4e3df06117a1cecc9f0c47d75
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 14 10:57:33 2011 +0100

    telnet, telnetd: Fix Solaris build.
    
    * telnet/Makefile.am (LDADD): Add LIBREADLINE, for tgetent on Solaris.
    * telnetd/Makefile.am (LDADD): Likewise.

diff --git a/ChangeLog b/ChangeLog
index afb7ed3..cbaf5d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-14  Bruno Haible <bruno@clisp.org>  (tiny change)
+
+	* telnet/Makefile.am (LDADD): Add LIBREADLINE, for tgetent on
+	Solaris.
+	* telnetd/Makefile.am (LDADD): Likewise.
+
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
 
 	* src/Makefile.am (logger_SOURCES): Add logprio.h.
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index cb5bf6a..9ea0935 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -29,4 +29,4 @@ noinst_HEADERS = defines.h externs.h general.h ring.h types.h
 INCLUDES = $(iu_INCLUDES)
 AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
 
-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH)
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 71cb7b1..be08ada 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -31,4 +31,4 @@ noinst_HEADERS = telnetd.h
 AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
 INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH)
 
-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)

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

Summary of changes:
 ChangeLog           |    6 ++++++
 telnet/Makefile.am  |    2 +-
 telnetd/Makefile.am |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 14 05:03:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPtNq-0002jl-3B
	for mharc-commit-inetutils@gnu.org; Mon, 14 Nov 2011 05:03:22 -0500
Received: from eggs.gnu.org ([140.186.70.92]:41701)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPt2o-0005Vp-0F
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:41:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPt2f-0001De-Vl
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:41:37 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60483)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPt2f-0001DZ-RH
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 04:41:29 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RPt2e-0005V8-KB
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 09:41:29 +0000
Date: Mon, 14 Nov 2011 09:41:29 +0000
Message-Id: <E1RPt2e-0005V8-KB@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-151-g63d7239
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c548bd6aba8c95c3ed8fa102362f5a9c60534c9e
X-Git-Newrev: 63d7239880d949f1b9cc856e55def0276e232cec
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 14 Nov 2011 10:03:20 -0000

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

The branch, master has been updated
       via  63d7239880d949f1b9cc856e55def0276e232cec (commit)
      from  c548bd6aba8c95c3ed8fa102362f5a9c60534c9e (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=63d7239880d949f1b9cc856e55def0276e232cec


commit 63d7239880d949f1b9cc856e55def0276e232cec
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 14 10:40:34 2011 +0100

    ping: Support -W parameter.
    
    * ping/ping.c: New variable.
    (argp_options): Add parameter -W aka --linger.
    (parse_opt): Parse -W parameter.
    (ping_run): Use linger parameter.
    * doc/inetutils.texi (ping invocation): Doc fix.
    * NEWS: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5f67afc..3c245e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-14  Simon Josefsson  <simon@josefsson.org>
+
+	* ping/ping.c: New variable.
+	(argp_options): Add parameter -W aka --linger.
+	(parse_opt): Parse -W parameter.
+	(ping_run): Use linger parameter.
+	* doc/inetutils.texi (ping invocation): Doc fix.
+	* NEWS: Likewise.
+
 2011-11-12  Simon Josefsson  <simon@josefsson.org>
 
 	* .gitignore, doc/.gitignore: Update from gnulib-tool.
diff --git a/NEWS b/NEWS
index 6942c9e..06a43fc 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,11 @@ Now under GNU/Linux "ifconfig -a" shows also interfaces without an address.
 
 Adjusted output formating for "unix".
 
+* ping
+
+Now supports -W parameter to specify number of seconds to wait for
+response.
+
 * Various bugs fixes, internal improvements and clean ups.
 
 May 15, 2010
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index f71a5b4..568b597 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -565,6 +565,12 @@ bytes of ICMP header data.
 @opindex -w
 @opindex --timeout
 Stop after @var{n} seconds.
+
+@item -W @var{n}
+@itemx --linger=@var{n}
+@opindex -W
+@opindex --linger
+Maximum number of seconds @var{n} to wait for a response.
 @end table
 
 @section Using ping for network fault isolation
diff --git a/ping/ping.c b/ping/ping.c
index fe65dd9..b90ebec 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -65,6 +65,7 @@ size_t data_length = PING_DATALEN;
 unsigned options;
 unsigned long preload = 0;
 int timeout = -1;
+int linger = MAXWAIT;
 int (*ping_type) (char *hostname) = ping_echo;
 
 int (*decode_type (const char *arg)) (char *hostname);
@@ -112,6 +113,7 @@ static struct argp_option argp_options[] = {
    "network", GRP+1},
   {"verbose", 'v', NULL, 0, "verbose output", GRP+1},
   {"timeout", 'w', "N", 0, "stop after N seconds", GRP+1},
+  {"linger", 'W', "N", 0, "number of seconds to wait for response", GRP+1},
 #undef GRP
 #define GRP 20
   {NULL, 0, NULL, 0, "Options valid for --echo requests:", GRP},
@@ -179,6 +181,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       timeout = ping_cvt_number (arg, INT_MAX, 0);
       break;
 
+    case 'W':
+      linger = ping_cvt_number (arg, INT_MAX, 0);
+      break;
+
     case 'R':
       options |= OPT_RROUTE;
       break;
@@ -402,7 +408,7 @@ ping_run (PING * ping, int (*finish) ())
 	    {
 	      finishing = 1;
 
-	      intvl.tv_sec = MAXWAIT;
+	      intvl.tv_sec = linger;
 	    }
 	  gettimeofday (&last, NULL);
 	}

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

Summary of changes:
 ChangeLog          |    9 +++++++++
 NEWS               |    5 +++++
 doc/inetutils.texi |    6 ++++++
 ping/ping.c        |    8 +++++++-
 4 files changed, 27 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 14 07:48:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RPvy4-0001hm-V8
	for mharc-commit-inetutils@gnu.org; Mon, 14 Nov 2011 07:48:56 -0500
Received: from eggs.gnu.org ([140.186.70.92]:56280)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPvy2-0001hX-L0
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 07:48:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPvy1-0005AH-90
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 07:48:54 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:49746)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RPvy1-0005AD-6H
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 07:48:53 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RPvy0-00014U-6d
	for commit-inetutils@gnu.org; Mon, 14 Nov 2011 12:48:52 +0000
Date: Mon, 14 Nov 2011 12:48:52 +0000
Message-Id: <E1RPvy0-00014U-6d@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-155-g5868ae2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 338e1532644b43b4e3df06117a1cecc9f0c47d75
X-Git-Newrev: 5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 14 Nov 2011 12:48:55 -0000

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

The branch, master has been updated
       via  5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f (commit)
      from  338e1532644b43b4e3df06117a1cecc9f0c47d75 (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=5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f


commit 5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 14 13:48:47 2011 +0100

    doc: Mention that non-Shishi Kerberos does not work.

diff --git a/ChangeLog b/ChangeLog
index cbaf5d9..7d936f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-14  Simon Josefsson  <simon@josefsson.org>
+
+	* README (Notes): Doc fix.
+
 2011-11-14  Bruno Haible <bruno@clisp.org>  (tiny change)
 
 	* telnet/Makefile.am (LDADD): Add LIBREADLINE, for tgetent on
diff --git a/README b/README
index 039bbf4..8c73766 100644
--- a/README
+++ b/README
@@ -40,6 +40,8 @@ Some known deficiencies:
  - GNU Inetutils does not work on Solaris.  Patches to make GNU
    inetutils work on Solaris are happily accepted.
 
+ - Non-Shishi Kerberos support does not build.  Patches welcome.
+
 See the file INSTALL for installation instructions.
 
 Please send all bug reports to <bug-inetutils@gnu.org>.

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

Summary of changes:
 ChangeLog |    4 ++++
 README    |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Nov 17 17:08:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRA8N-0006PF-K1
	for mharc-commit-inetutils@gnu.org; Thu, 17 Nov 2011 17:08:39 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38675)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRA8K-0006P3-PO
	for commit-inetutils@gnu.org; Thu, 17 Nov 2011 17:08:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRA8I-00038h-WD
	for commit-inetutils@gnu.org; Thu, 17 Nov 2011 17:08:36 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48507)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRA8I-00038b-Uf
	for commit-inetutils@gnu.org; Thu, 17 Nov 2011 17:08:34 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RRA8H-0002B4-Vk
	for commit-inetutils@gnu.org; Thu, 17 Nov 2011 22:08:34 +0000
Date: Thu, 17 Nov 2011 22:08:34 +0000
Message-Id: <E1RRA8H-0002B4-Vk@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-156-g0a83fb1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f
X-Git-Newrev: 0a83fb189cd3a7a81131b74b9aba0e0e1a838bad
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Thu, 17 Nov 2011 22:08:37 -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  0a83fb189cd3a7a81131b74b9aba0e0e1a838bad (commit)
      from  5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f (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=0a83fb189cd3a7a81131b74b9aba0e0e1a838bad


commit 0a83fb189cd3a7a81131b74b9aba0e0e1a838bad
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Nov 17 22:10:05 2011 +0100

    telnet,telnetd: Portability to GNU/OpenSolaris.
    
    Some standard header inclusions were missing.

diff --git a/ChangeLog b/ChangeLog
index 7d936f3..967f0be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-17  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* telnet/telnet.c [HAVE_LIBREADLINE]: Include <curses.h>.
+	* telnetd/utility.c [HAVE_LIBREADLINE]: Likewise.
+	[HAVE_STREAMSPTY && ...]: Include <stropts.h>.
+	* telnetd/state.c [HAVE_STREAMSPTY && ...]: Likewise.
+	[!NTELOPTS]: Define NTELOPTS.
+
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
 
 	* README (Notes): Doc fix.
diff --git a/telnet/telnet.c b/telnet/telnet.c
index ba057c9..ebfd86c 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -74,6 +74,7 @@
 #include "general.h"
 
 #ifdef HAVE_LIBREADLINE
+# include <curses.h>
 # include <term.h>
 #endif
 
diff --git a/telnetd/state.c b/telnetd/state.c
index 3d218b0..3aa4063 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -52,6 +52,15 @@
 #include "telnetd.h"
 #include <stdarg.h>
 
+#if defined HAVE_STREAMSPTY && defined TIOCSIGNAL \
+	&& defined HAVE_STROPTS_H
+# include <stropts.h>	/* I_FLUSH, FLUSHR */
+#endif
+
+#ifndef NTELOPTS	/* OpenSolaris */
+# define NTELOPTS	(1+TELOPT_NEW_ENVIRON)
+#endif
+
 /* Format lines for corresponing commands */
 char doopt[] = { IAC, DO, '%', 'c', 0 };
 char dont[] = { IAC, DONT, '%', 'c', 0 };
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 47dc22a..3fd054e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -38,9 +38,14 @@
 #endif
 
 #ifdef HAVE_LIBREADLINE
+# include <curses.h>
 # include <term.h>
 #endif
 
+#if defined HAVE_STREAMSPTY && defined HAVE_GETMSG \
+	&& defined HAVE_STROPTS_H
+# include <stropts.h>
+#endif
 
 static char netobuf[BUFSIZ + NETSLOP], *nfrontp, *nbackp;
 static char *neturg;		/* one past last byte of urgent data */

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

Summary of changes:
 ChangeLog         |    8 ++++++++
 telnet/telnet.c   |    1 +
 telnetd/state.c   |    9 +++++++++
 telnetd/utility.c |    5 +++++
 4 files changed, 23 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Nov 18 07:20:53 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRNR7-0002kK-AS
	for mharc-commit-inetutils@gnu.org; Fri, 18 Nov 2011 07:20:53 -0500
Received: from eggs.gnu.org ([140.186.70.92]:45436)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRNR1-0002kE-7W
	for commit-inetutils@gnu.org; Fri, 18 Nov 2011 07:20:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRNQw-0001U1-DP
	for commit-inetutils@gnu.org; Fri, 18 Nov 2011 07:20:47 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:49031)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRNQw-0001Tx-AX
	for commit-inetutils@gnu.org; Fri, 18 Nov 2011 07:20:42 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RRNQo-0002Kf-RS
	for commit-inetutils@gnu.org; Fri, 18 Nov 2011 12:20:38 +0000
Date: Fri, 18 Nov 2011 12:20:36 +0000
Message-Id: <E1RRNQo-0002Kf-RS@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-157-g7a61b85
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0a83fb189cd3a7a81131b74b9aba0e0e1a838bad
X-Git-Newrev: 7a61b85b3d9388eed3f25f486ddb14f36c7b296a
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 12:20:51 -0000

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

The branch, master has been updated
       via  7a61b85b3d9388eed3f25f486ddb14f36c7b296a (commit)
      from  0a83fb189cd3a7a81131b74b9aba0e0e1a838bad (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=7a61b85b3d9388eed3f25f486ddb14f36c7b296a


commit 7a61b85b3d9388eed3f25f486ddb14f36c7b296a
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Nov 18 09:50:31 2011 +0100

    ftp: Use gnulib's readline module.
    
    * ftp/cmds.c: Replace complex readline #includes with simple
    include of gnulib's readline.h.
    (another): Assume libreadline has add_history.
    * ftp/main.c: Likewise.
    * configure.ac: Remove obsolete readline checks (we now use
    gnulib's readline module).

diff --git a/ChangeLog b/ChangeLog
index 967f0be..50a6993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-18  Simon Josefsson  <simon@josefsson.org>
+
+	* ftp/cmds.c: Replace complex readline #includes with simple
+	include of gnulib's readline.h.
+	(another): Assume libreadline has add_history.
+	* ftp/main.c: Likewise.
+	* configure.ac: Remove obsolete readline checks (we now use
+	gnulib's readline module).
+
 2011-11-17  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* telnet/telnet.c [HAVE_LIBREADLINE]: Include <curses.h>.
diff --git a/configure.ac b/configure.ac
index 06c6a39..e1fd73a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,37 +148,6 @@ AC_CHECK_LIB(socket, getpeername)
 # See if a termcap library is available (under one of several names)
 IU_LIB_TERMCAP
 
-# We want to use libreadline if it is available.  However, it seems that the
-# guile hackers have had problems because there is a Solaris libreadline
-# that is different from the GNU libreadline; therefore we test for an obscure
-# function in the GNU libreadline.
-#AC_CHECK_LIB(termcap, tputs)
-#AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
-AC_CHECK_LIB(readline, rl_bind_key,
-             [LIBREADLINE=-lreadline
-              AC_DEFINE([HAVE_LIBREADLINE], 1,
-	           [Define to one if you have -lreadline])],
-             [LIBREADLINE=], "$LIBTERMCAP")
-AC_SUBST(LIBREADLINE)
-AC_SUBST(LIBTERMCAP)
-
-AC_CHECK_LIB(history, add_history,
-             [LIBHISTORY=-lhistory
-              AC_DEFINE([HAVE_LIBHISTORY], 1,
-	           [Define to one if you have -lhistory])],
-             [LIBHISTORY=])
-
-# If libhistory does not provide add_history check if libreadline has it.
-if test -z "$LIBHISTORY" && test -n "$LIBREADLINE"; then
-  AC_CHECK_LIB(readline, add_history,
-               [LIBHISTORY=-lreadline
-                AC_DEFINE([HAVE_LIBHISTORY], 1,
-                     [Define to one if you have -lhistory])],
-               [LIBHISTORY=])
-fi
-
-AC_SUBST(LIBHISTORY)
-
 dnl See if there's a separate libcrypt (many systems put crypt there)
 AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
 AC_SUBST(LIBCRYPT)
@@ -461,7 +430,6 @@ AC_HEADER_DIRENT
 AC_CHECK_HEADERS([arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
                   krb.h memory.h malloc.h netinet/in_systm.h netinet/ip.h \
                   netinet/ip_icmp.h netinet/ip_var.h \
-		  readline/readline.h \
 		  security/pam_appl.h \
                   shadow.h stdarg.h stdlib.h string.h stropts.h sys/tty.h \
                   sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
diff --git a/ftp/cmds.c b/ftp/cmds.c
index f9072f4..697cf70 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -77,12 +77,7 @@
    system headers on some platforms. */
 #include <glob.h>
 
-#if HAVE_LIBREADLINE
-# include <readline/readline.h>
-# include <readline/history.h>
-#else
-# include "readline.h"
-#endif
+#include "readline.h"
 
 #include "ftp_var.h"
 #include "unused-parameter.h"
@@ -147,10 +142,8 @@ another (int *pargc, char ***pargv, const char *prompt)
   arg = readline (buffer);
   free (buffer);
 
-#if HAVE_LIBHISTORY
   if (arg && *arg)
     add_history (arg);
-#endif
 
   if (!arg)
     intr (0);
diff --git a/ftp/main.c b/ftp/main.c
index 5ebfbb7..914a4fb 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -77,12 +77,7 @@
 #include "libinetutils.h"
 #include "unused-parameter.h"
 
-#if HAVE_LIBREADLINE
-# include <readline/readline.h>
-# include <readline/history.h>
-#else
-# include "readline.h"
-#endif
+#include "readline.h"
 
 
 #define DEFAULT_PROMPT "ftp> "
@@ -347,10 +342,8 @@ cmdscanner (int top)
 	  break;
 	}
 
-#if HAVE_LIBHISTORY
       if (line && *line)
 	add_history (line);
-#endif
 
       if (l == 0)
 	break;

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

Summary of changes:
 ChangeLog    |    9 +++++++++
 configure.ac |   32 --------------------------------
 ftp/cmds.c   |    9 +--------
 ftp/main.c   |    9 +--------
 4 files changed, 11 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 05:41:28 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRiMS-0000q6-LB
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:41:28 -0500
Received: from eggs.gnu.org ([140.186.70.92]:52292)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRiMP-0000py-Ta
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:41:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRiMO-000230-5g
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:41:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57053)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRiMO-00022w-48
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:41:24 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RRiMN-0004gK-CS
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:41:23 +0000
Date: Sat, 19 Nov 2011 10:41:23 +0000
Message-Id: <E1RRiMN-0004gK-CS@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-159-g0aeea0c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7a61b85b3d9388eed3f25f486ddb14f36c7b296a
X-Git-Newrev: 0aeea0cb612ca487908380ce37dcb96b0a0afd59
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 10:41: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  0aeea0cb612ca487908380ce37dcb96b0a0afd59 (commit)
       via  efbf4c7d7f41b452aedcca15368fec1bb25cf750 (commit)
      from  7a61b85b3d9388eed3f25f486ddb14f36c7b296a (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=0aeea0cb612ca487908380ce37dcb96b0a0afd59


commit 0aeea0cb612ca487908380ce37dcb96b0a0afd59
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 19 11:39:41 2011 +0100

    tests: Added self-tests of ftp and ftpd (using inetd).
    
    * tests/Makefile.am (dist_check_SCRIPTS): Add ftp-localhost.sh.
    * tests/ftp-localhost.sh: New file.

diff --git a/ChangeLog b/ChangeLog
index c8060f6..32f4da6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
 
+	* tests/Makefile.am (dist_check_SCRIPTS): Add ftp-localhost.sh.
+	* tests/ftp-localhost.sh: New file.
+
+2011-11-19  Simon Josefsson  <simon@josefsson.org>
+
 	* ftp/cmds.c [HAVE_READLINE_HISTORY_H]: Include
 	readline/history.h.
 	* ftp/main.c: Likewise.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00cdd62..e952218 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,6 +46,14 @@ dist_check_SCRIPTS += syslogd.sh
 endif
 endif
 
+if ENABLE_inetd
+if ENABLE_ftp
+if ENABLE_ftpd
+dist_check_SCRIPTS += ftp-localhost.sh
+endif
+endif
+endif
+
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
new file mode 100755
index 0000000..0a589dd
--- /dev/null
+++ b/tests/ftp-localhost.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Inetutils.
+#
+# GNU Inetutils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+# Written by Simon Josefsson
+
+set -e
+
+FTP=${FTP:-../ftp/ftp$EXEEXT}
+FTPD=${FTPD:-../ftpd/ftpd$EXEEXT}
+INETD=${INETD:-../src/inetd$EXEEXT}
+TARGET=${TARGET:-127.0.0.1}
+
+if [ $VERBOSE ]; then
+    set -x
+    $FTP --version | head -1
+    $FTPD --version | head -1
+    $INETD --version | head -1
+fi
+
+if [ `id -u` != 0 ]; then
+    echo "ftpd needs to run as root"
+    exit 77
+fi
+
+if ! id -u ftp > /dev/null; then
+    echo "anonymous ftpd needs a 'ftp' user"
+    exit 77
+fi
+
+# Note that inetd changes directory to / when --debug is not given so
+# all paths must be absolute for things to work.
+
+TMPDIR=`mktemp --tmpdir=$PWD -d`
+trap 'rm -rf "$TMPDIR"' 0 1 2 3 15
+
+echo "4711 stream tcp nowait root $PWD/$FTPD ftpd -A -l" > $TMPDIR/inetd.conf
+echo "machine 127.0.0.1 login ftp password foobar" > $TMPDIR/.netrc
+chmod 600 $TMPDIR/.netrc
+
+$INETD --pidfile=$TMPDIR/inetd.pid $TMPDIR/inetd.conf
+
+# Wait for inetd to write pid and open socket
+sleep 2
+
+echo "rstatus\ndir\n" \
+    | HOME=$TMPDIR $FTP $TARGET 4711 -v -p -t | tee $TMPDIR/ftp.stdout
+errno=$?
+if [ $errno != 0 ]; then
+    echo running ftp failed? errno $errno
+    exit 77
+fi
+
+if [ $errno != 0 ]; then
+    echo running ftp failed? errno $errno
+    exit 77
+fi
+
+if ! grep 'FTP server status' $TMPDIR/ftp.stdout; then
+    echo cannot find expected output from ftp client?
+    exit 1
+fi
+
+inetd_pid=`cat $TMPDIR/inetd.pid`
+kill -9 $inetd_pid
+
+exit 0

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


commit efbf4c7d7f41b452aedcca15368fec1bb25cf750
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 19 11:37:52 2011 +0100

    ftp: Avoid build warnings about missing add_history prototype.
    
    * ftp/cmds.c [HAVE_READLINE_HISTORY_H]: Include readline/history.h.
    * ftp/main.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 50a6993..c8060f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-19  Simon Josefsson  <simon@josefsson.org>
+
+	* ftp/cmds.c [HAVE_READLINE_HISTORY_H]: Include
+	readline/history.h.
+	* ftp/main.c: Likewise.
+
 2011-11-18  Simon Josefsson  <simon@josefsson.org>
 
 	* ftp/cmds.c: Replace complex readline #includes with simple
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 697cf70..1d14cd0 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -78,6 +78,9 @@
 #include <glob.h>
 
 #include "readline.h"
+#ifdef HAVE_READLINE_HISTORY_H
+# include <readline/history.h>
+#endif
 
 #include "ftp_var.h"
 #include "unused-parameter.h"
diff --git a/ftp/main.c b/ftp/main.c
index 914a4fb..7668c03 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -78,6 +78,9 @@
 #include "unused-parameter.h"
 
 #include "readline.h"
+#ifdef HAVE_READLINE_HISTORY_H
+# include <readline/history.h>
+#endif
 
 
 #define DEFAULT_PROMPT "ftp> "

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

Summary of changes:
 ChangeLog              |   11 ++++++
 ftp/cmds.c             |    3 ++
 ftp/main.c             |    3 ++
 tests/Makefile.am      |    8 +++++
 tests/ftp-localhost.sh |   82 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 0 deletions(-)
 create mode 100755 tests/ftp-localhost.sh


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 05:51:24 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRiW4-0001K0-Tw
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:51:24 -0500
Received: from eggs.gnu.org ([140.186.70.92]:43213)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRiW2-0001Jh-3t
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:51:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRiW0-0003MQ-O1
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:51:22 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60125)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRiW0-0003MM-LK
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 05:51:20 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RRiW0-0005kp-2w
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:51:20 +0000
Date: Sat, 19 Nov 2011 10:51:20 +0000
Message-Id: <E1RRiW0-0005kp-2w@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-160-ga1e3795
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0aeea0cb612ca487908380ce37dcb96b0a0afd59
X-Git-Newrev: a1e37953a388d25327d3125d3e356114a1fe6c44
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 10:51:23 -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  a1e37953a388d25327d3125d3e356114a1fe6c44 (commit)
      from  0aeea0cb612ca487908380ce37dcb96b0a0afd59 (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=a1e37953a388d25327d3125d3e356114a1fe6c44


commit a1e37953a388d25327d3125d3e356114a1fe6c44
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Nov 19 11:49:12 2011 +0100

    telnet,telnetd: Build fix for recent readline support.
    
    Condition on HAVE_READLINE, not HAVE_LIBREADLINE.

diff --git a/ChangeLog b/ChangeLog
index 32f4da6..7ec361c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-19  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* telnet/telnet.c [HAVE_READLINE]: Replace previous use of
+	HAVE_LIBREADLINE for header inclusion and code protection.
+	* telnetd/utility.c [HAVE_READLINE]: Likewise.
+
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
 
 	* tests/Makefile.am (dist_check_SCRIPTS): Add ftp-localhost.sh.
diff --git a/telnet/telnet.c b/telnet/telnet.c
index ebfd86c..c5b4b19 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -73,7 +73,7 @@
 #include "types.h"
 #include "general.h"
 
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
 # include <curses.h>
 # include <term.h>
 #endif
@@ -729,7 +729,7 @@ int
 init_term (char *tname, int fd, int *errp)
 {
   int err = -1;
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
   err = tgetent (termbuf, tname);
 #endif
   if (err == 1)
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 3fd054e..bb49298 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -37,7 +37,7 @@
 # define NET_ENCRYPT()
 #endif
 
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
 # include <curses.h>
 # include <term.h>
 #endif
@@ -826,7 +826,7 @@ terminaltypeok (char *s)
   if (terminaltype == NULL)
     return 1;
 
-#ifdef HAVE_LIBREADLINE
+#ifdef HAVE_READLINE
   if (tgetent (buf, s) == 0)
 #endif
     return 0;

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

Summary of changes:
 ChangeLog         |    6 ++++++
 telnet/telnet.c   |    4 ++--
 telnetd/utility.c |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 08:32:11 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRl1f-00070O-FM
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:32:11 -0500
Received: from eggs.gnu.org ([140.186.70.92]:59024)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRl1d-00070I-MO
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:32:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RRl1c-0001R8-3d
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:32:09 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59228)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRl1b-0001R4-VF
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:32:08 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RRl1c-0004s4-7m
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 13:32:08 +0000
Date: Sat, 19 Nov 2011 13:32:08 +0000
Message-Id: <E1RRl1c-0004s4-7m@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-161-gd08a54c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a1e37953a388d25327d3125d3e356114a1fe6c44
X-Git-Newrev: d08a54c8e67ff41b5f611e15bdbeb4a4ec6ad8d9
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 13:32: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  d08a54c8e67ff41b5f611e15bdbeb4a4ec6ad8d9 (commit)
      from  a1e37953a388d25327d3125d3e356114a1fe6c44 (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=d08a54c8e67ff41b5f611e15bdbeb4a4ec6ad8d9


commit d08a54c8e67ff41b5f611e15bdbeb4a4ec6ad8d9
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 19 14:32:02 2011 +0100

    cfg.mk (sc_unsigned_char, sc_unsigned_long): New targets.

diff --git a/ChangeLog b/ChangeLog
index 7ec361c..ec9669a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
+
+	* cfg.mk (sc_unsigned_char, sc_unsigned_long): New targets.
+
 2011-11-19  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* telnet/telnet.c [HAVE_READLINE]: Replace previous use of
diff --git a/cfg.mk b/cfg.mk
index 0fd9d7d..efb773c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -49,3 +49,13 @@ upload-web-coverage:
 		cvs commit -m "Update." coverage
 
 release-prep-hook =
+
+sc_unsigned_char:
+	@prohibit=u''_char \
+	halt='don'\''t use u''_char; instead use unsigned char'	\
+	  $(_sc_search_regexp)
+
+sc_unsigned_long:
+	@prohibit=u''_long \
+	halt='don'\''t use u''_long; instead use unsigned long'	\
+	  $(_sc_search_regexp)

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

Summary of changes:
 ChangeLog |    4 ++++
 cfg.mk    |   10 ++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 08:50:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRlJo-0000Vx-G7
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:50:56 -0500
Received: from eggs.gnu.org ([140.186.70.92]:32813)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRlJl-0000VN-Hj
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:50:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RRlJk-0004AW-2a
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:50:53 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47988)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRlJj-0004AM-W4
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 08:50:52 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RRlJj-00073x-W7
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 13:50:52 +0000
Date: Sat, 19 Nov 2011 13:50:52 +0000
Message-Id: <E1RRlJj-00073x-W7@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-162-g75d1a60
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d08a54c8e67ff41b5f611e15bdbeb4a4ec6ad8d9
X-Git-Newrev: 75d1a604ca9ac9adae670ede5a5a3beeb72b8ce4
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 13:50:54 -0000

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

The branch, master has been updated
       via  75d1a604ca9ac9adae670ede5a5a3beeb72b8ce4 (commit)
      from  d08a54c8e67ff41b5f611e15bdbeb4a4ec6ad8d9 (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=75d1a604ca9ac9adae670ede5a5a3beeb72b8ce4


commit 75d1a604ca9ac9adae670ede5a5a3beeb72b8ce4
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 19 14:50:46 2011 +0100

    NEWS, README: Updated.  (silent change)

diff --git a/NEWS b/NEWS
index 06a43fc..f0a7624 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,12 @@ Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 XXX YY, ZZ
 Version A.B:
 
-Many OpenBSD fixes.
+* Solaris is now a supported platform
+
+Support is still new, so please report any bugs to
+<bug-inetutils@gnu.org>.
+
+* Many OpenBSD fixes.
 
 * tftp
 
diff --git a/README b/README
index 8c73766..e5df321 100644
--- a/README
+++ b/README
@@ -37,9 +37,6 @@ Notes:
 
 Some known deficiencies:
 
- - GNU Inetutils does not work on Solaris.  Patches to make GNU
-   inetutils work on Solaris are happily accepted.
-
  - Non-Shishi Kerberos support does not build.  Patches welcome.
 
 See the file INSTALL for installation instructions.

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

Summary of changes:
 NEWS   |    7 ++++++-
 README |    3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 09:08:07 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRlaR-0006Zx-La
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:08:07 -0500
Received: from eggs.gnu.org ([140.186.70.92]:54893)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRlaP-0006Zr-SV
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:08:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RRlaO-0006s7-A3
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:08:05 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38905)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRlaO-0006rx-7J
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:08:04 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RRlaN-0001NQ-Ec
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 14:08:03 +0000
Date: Sat, 19 Nov 2011 14:08:03 +0000
Message-Id: <E1RRlaN-0001NQ-Ec@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-163-gd225085
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75d1a604ca9ac9adae670ede5a5a3beeb72b8ce4
X-Git-Newrev: d225085e2dab694dd54eecda48449e2104c5b008
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 14:08:06 -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  d225085e2dab694dd54eecda48449e2104c5b008 (commit)
      from  75d1a604ca9ac9adae670ede5a5a3beeb72b8ce4 (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=d225085e2dab694dd54eecda48449e2104c5b008


commit d225085e2dab694dd54eecda48449e2104c5b008
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 19 15:07:56 2011 +0100

    configure.ac: Add check for IPV6_2292HOPLIMIT.

diff --git a/ChangeLog b/ChangeLog
index ec9669a..216dcbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Add check for IPV6_2292HOPLIMIT.
+
+2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
+
 	* cfg.mk (sc_unsigned_char, sc_unsigned_long): New targets.
 
 2011-11-19  Mats Erik Andersson <gnu@gisladisker.se>
diff --git a/configure.ac b/configure.ac
index e1fd73a..421bda6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -367,6 +367,10 @@ else
   if test "X$working_icmp6" = "Xyes"; then
     IU_CHECK_MACRO(IPV6_RECVHOPLIMIT, [#include <netinet/in.h>], ,
 		   [have_recvhoplimt=yes], [have_recvhoplimt=no])
+    IU_CHECK_MACRO(IPV6_2292HOPLIMIT, [#include <netinet/in.h>], , [
+      AC_DEFINE([IPV6_HOPLIMIT], IPV6_2292HOPLIMIT,
+                [Define to IPV6_HOPLIMIT if not available])
+    ], [working_icmp6=no])
     if test "X$have_recvhoplimt" = "Xno"; then
       IU_CHECK_MACRO(IPV6_HOPLIMIT, [#include <netinet/in.h>], , [
         AC_DEFINE([IPV6_RECVHOPLIMIT], IPV6_HOPLIMIT,

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

Summary of changes:
 ChangeLog    |    4 ++++
 configure.ac |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 09:33:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRlz9-0001Ai-GM
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:33:39 -0500
Received: from eggs.gnu.org ([140.186.70.92]:37655)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRlz7-0001Ab-8B
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:33:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RRlz5-0002lm-NJ
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:33:37 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:43357)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRlz5-0002li-Ip
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:33:35 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RRlz5-0005fk-20
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 14:33:35 +0000
Date: Sat, 19 Nov 2011 14:33:35 +0000
Message-Id: <E1RRlz5-0005fk-20@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-165-g8af3abb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d225085e2dab694dd54eecda48449e2104c5b008
X-Git-Newrev: 8af3abb47557bff5a6d66148183f40ab8e74b45b
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 14:33: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  8af3abb47557bff5a6d66148183f40ab8e74b45b (commit)
       via  4a21046e0c24dcaea52d5b8cbf844ae2881d360a (commit)
      from  d225085e2dab694dd54eecda48449e2104c5b008 (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=8af3abb47557bff5a6d66148183f40ab8e74b45b


commit 8af3abb47557bff5a6d66148183f40ab8e74b45b
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 19 15:33:20 2011 +0100

    bootstrap.conf (gnulib_modules): Don't try to create m4/ for ./bootstrap.

diff --git a/ChangeLog b/ChangeLog
index 216dcbd..502ee5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
 
+	* bootstrap.conf (gnulib_modules): Don't try to create m4/ for
+	./bootstrap.
+
 	* configure.ac: Add check for IPV6_2292HOPLIMIT.
 
 2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
@@ -20,7 +23,7 @@
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
 
 	* ftp/cmds.c [HAVE_READLINE_HISTORY_H]: Include
-	readline/history.h.
+	<readline/history.h>.
 	* ftp/main.c: Likewise.
 
 2011-11-18  Simon Josefsson  <simon@josefsson.org>
@@ -36,9 +39,9 @@
 
 	* telnet/telnet.c [HAVE_LIBREADLINE]: Include <curses.h>.
 	* telnetd/utility.c [HAVE_LIBREADLINE]: Likewise.
-	[HAVE_STREAMSPTY && ...]: Include <stropts.h>.
-	* telnetd/state.c [HAVE_STREAMSPTY && ...]: Likewise.
-	[!NTELOPTS]: Define NTELOPTS.
+	[HAVE_STREAMSPTY && HAVE_GETMSG && HAVE_STROPTS_H]: Include <stropts.h>.
+	* telnetd/state.c [HAVE_STREAMSPTY && TIOCSIGNAL && HAVE_STROPTS_H]: Likewise.
+	(NTELOPTS) [!NTELOPTS]: New macro.
 
 2011-11-14  Simon Josefsson  <simon@josefsson.org>
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 0d1985e..3f9042d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -110,6 +110,3 @@ if [ -r .bootstrap ]; then
   echo "$0: Reading configuration file .bootstrap"
   eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
 fi
-
-# Work around a silly `bug' in bootstrap.
-test -d m4 || mkdir m4

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


commit 4a21046e0c24dcaea52d5b8cbf844ae2881d360a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 19 15:20:46 2011 +0100

    README: Updated.  (silent change)

diff --git a/README b/README
index e5df321..6de48f2 100644
--- a/README
+++ b/README
@@ -32,8 +32,8 @@ address.
 Notes:
 
 1) All of the r* commands clients, rcp, rlogin, rsh, need to be
-   install setuid root to work correctly they use privileged ports for
-   communication.
+   install setuid root to work correctly because they use privileged
+   ports for communication.
 
 Some known deficiencies:
 

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

Summary of changes:
 ChangeLog      |   11 +++++++----
 README         |    4 ++--
 bootstrap.conf |    3 ---
 3 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 09:45:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRmAK-0003HA-Dq
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:45:12 -0500
Received: from eggs.gnu.org ([140.186.70.92]:57184)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRmAH-0003Fm-DG
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:45:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RRmAF-0004b4-PI
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:45:09 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51248)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RRmAF-0004b0-Nj
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 09:45:07 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RRmAF-0007o6-EP
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 14:45:07 +0000
Date: Sat, 19 Nov 2011 14:45:07 +0000
Message-Id: <E1RRmAF-0007o6-EP@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-166-g83c828d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8af3abb47557bff5a6d66148183f40ab8e74b45b
X-Git-Newrev: 83c828db1380d4c6886dfb2cd35af65c7dcfe74c
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 14:45: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  83c828db1380d4c6886dfb2cd35af65c7dcfe74c (commit)
      from  8af3abb47557bff5a6d66148183f40ab8e74b45b (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=83c828db1380d4c6886dfb2cd35af65c7dcfe74c


commit 83c828db1380d4c6886dfb2cd35af65c7dcfe74c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 19 15:44:57 2011 +0100

    .gitignore (/m4): Added to list.

diff --git a/.gitignore b/.gitignore
index a17d837..f63795b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 .tarball-version
 .version
 /build-aux
+/m4
 ABOUT-NLS
 GNUmakefile
 INSTALL
diff --git a/ChangeLog b/ChangeLog
index 502ee5f..2c2fe98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
 
+	* .gitignore (/m4): Added to list.
 	* bootstrap.conf (gnulib_modules): Don't try to create m4/ for
 	./bootstrap.
 

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

Summary of changes:
 .gitignore |    1 +
 ChangeLog  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 10:35:14 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRmwk-0002VN-Gz
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:35:14 -0500
Received: from eggs.gnu.org ([140.186.70.92]:48019)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRmwh-0002Ux-Ga
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:35:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRmwf-0004kC-NM
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:35:11 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48365)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRmwf-0004k8-KO
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:35:09 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RRmwf-0007P5-5U
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 15:35:09 +0000
Date: Sat, 19 Nov 2011 15:35:09 +0000
Message-Id: <E1RRmwf-0007P5-5U@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-168-g7a2dba7
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 83c828db1380d4c6886dfb2cd35af65c7dcfe74c
X-Git-Newrev: 7a2dba700aae9a9ba8ab2b205ac29812f0b7fdd8
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 15:35:12 -0000

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

The branch, master has been updated
       via  7a2dba700aae9a9ba8ab2b205ac29812f0b7fdd8 (commit)
       via  49d3cbf19690de7b82475e2919b76ddba660b5e6 (commit)
      from  83c828db1380d4c6886dfb2cd35af65c7dcfe74c (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=7a2dba700aae9a9ba8ab2b205ac29812f0b7fdd8


commit 7a2dba700aae9a9ba8ab2b205ac29812f0b7fdd8
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 19 16:34:42 2011 +0100

    doc: Mention portability issues.
    
    * README (Notes): Doc fix.

diff --git a/ChangeLog b/ChangeLog
index a760a6e..4b5fd5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
 
+	* README (Notes): Doc fix.
+
+2011-11-19  Simon Josefsson  <simon@josefsson.org>
+
 	* bootstrap.conf (gnulib_modules): Remove readline.
 	* configure.ac: Search for readline.
 	* ftp/cmds.c: Unconditionally include readline headers.
diff --git a/README b/README
index 6de48f2..f00e59b 100644
--- a/README
+++ b/README
@@ -39,6 +39,9 @@ Some known deficiencies:
 
  - Non-Shishi Kerberos support does not build.  Patches welcome.
 
+ - InetUtils does not build on Cygwin, Minix, MinGW, MSCV, BeOS, Haiki
+   (and probably other systems as well).  Patches welcome.
+
 See the file INSTALL for installation instructions.
 
 Please send all bug reports to <bug-inetutils@gnu.org>.

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


commit 49d3cbf19690de7b82475e2919b76ddba660b5e6
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 19 16:11:13 2011 +0100

    ftp: require the real readline library.
    
    * bootstrap.conf (gnulib_modules): Remove readline.
    * configure.ac: Search for readline.
    * ftp/cmds.c: Unconditionally include readline headers.
    * ftp/main.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2c2fe98..a760a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-19  Simon Josefsson  <simon@josefsson.org>
+
+	* bootstrap.conf (gnulib_modules): Remove readline.
+	* configure.ac: Search for readline.
+	* ftp/cmds.c: Unconditionally include readline headers.
+	* ftp/main.c: Likewise.
+
 2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
 
 	* .gitignore (/m4): Added to list.
diff --git a/am/readline.m4 b/am/readline.m4
new file mode 100644
index 0000000..b7ce9e4
--- /dev/null
+++ b/am/readline.m4
@@ -0,0 +1,81 @@
+# readline.m4 serial 9
+dnl Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Simon Josefsson, with help from Bruno Haible and Oskar
+dnl Liljeblad.
+
+AC_DEFUN([gl_FUNC_READLINE],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libreadline and define LIBREADLINE, LTLIBREADLINE and
+  dnl INCREADLINE accordingly.
+  AC_LIB_LINKFLAGS_BODY([readline])
+
+  dnl Add $INCREADLINE to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libreadline and not disabled its use
+  dnl via --without-libreadline-prefix, he wants to use it. The AC_LINK_IFELSE
+  dnl will then succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCREADLINE])
+
+  AC_CACHE_CHECK([for readline], [gl_cv_lib_readline], [
+    gl_cv_lib_readline=no
+    am_save_LIBS="$LIBS"
+    dnl On some systems, -lreadline doesn't link without an additional
+    dnl -lncurses or -ltermcap.
+    dnl Try -lncurses before -ltermcap, because libtermcap is unsecure
+    dnl by design and obsolete since 1994. Try -lcurses last, because
+    dnl libcurses is unusable on some old Unices.
+    for extra_lib in "" ncurses termcap curses; do
+      LIBS="$am_save_LIBS $LIBREADLINE"
+      if test -n "$extra_lib"; then
+        LIBS="$LIBS -l$extra_lib"
+      fi
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+#include <readline/readline.h>]],
+          [[readline((char*)0);]])],
+        [if test -n "$extra_lib"; then
+           gl_cv_lib_readline="yes, requires -l$extra_lib"
+         else
+           gl_cv_lib_readline="yes"
+         fi
+        ])
+      if test "$gl_cv_lib_readline" != no; then
+        break
+      fi
+    done
+    LIBS="$am_save_LIBS"
+  ])
+
+  if test "$gl_cv_lib_readline" != no; then
+    AC_DEFINE([HAVE_READLINE], [1], [Define if you have the readline library.])
+    extra_lib=`echo "$gl_cv_lib_readline" | sed -n -e 's/yes, requires //p'`
+    if test -n "$extra_lib"; then
+      LIBREADLINE="$LIBREADLINE $extra_lib"
+      LTLIBREADLINE="$LTLIBREADLINE $extra_lib"
+    fi
+    AC_MSG_CHECKING([how to link with libreadline])
+    AC_MSG_RESULT([$LIBREADLINE])
+  else
+    dnl If $LIBREADLINE didn't lead to a usable library, we don't
+    dnl need $INCREADLINE either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBREADLINE=
+    LTLIBREADLINE=
+  fi
+  AC_SUBST([LIBREADLINE])
+  AC_SUBST([LTLIBREADLINE])
+
+  AC_CHECK_HEADERS([readline/readline.h readline/history.h])
+])
+
+# Prerequisites of lib/readline.c.
+AC_DEFUN([gl_PREREQ_READLINE], [
+  :
+])
diff --git a/bootstrap.conf b/bootstrap.conf
index 3f9042d..02235c1 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -74,7 +74,6 @@ obstack
 poll
 progname
 read-file
-readline
 readutmp
 realloc-gnu
 regex
diff --git a/configure.ac b/configure.ac
index 421bda6..75d43f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,14 @@ AC_CHECK_LIB(socket, getpeername)
 # See if a termcap library is available (under one of several names)
 IU_LIB_TERMCAP
 
+# Find libreadline -- disable the ftp client if not found.
+gl_FUNC_READLINE
+if test "$gl_cv_lib_readline" = no; then
+  enable_ftp=no
+  ftp_BUILD=''
+  ftp_INSTALL_HOOK=''
+fi
+
 dnl See if there's a separate libcrypt (many systems put crypt there)
 AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
 AC_SUBST(LIBCRYPT)
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 1d14cd0..9ecb408 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -77,10 +77,8 @@
    system headers on some platforms. */
 #include <glob.h>
 
-#include "readline.h"
-#ifdef HAVE_READLINE_HISTORY_H
-# include <readline/history.h>
-#endif
+#include <readline/readline.h>
+#include <readline/history.h>
 
 #include "ftp_var.h"
 #include "unused-parameter.h"
diff --git a/ftp/main.c b/ftp/main.c
index 7668c03..90fe2ef 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -77,10 +77,8 @@
 #include "libinetutils.h"
 #include "unused-parameter.h"
 
-#include "readline.h"
-#ifdef HAVE_READLINE_HISTORY_H
-# include <readline/history.h>
-#endif
+#include <readline/readline.h>
+#include <readline/history.h>
 
 
 #define DEFAULT_PROMPT "ftp> "

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

Summary of changes:
 ChangeLog      |   11 +++++++
 README         |    3 ++
 am/readline.m4 |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 bootstrap.conf |    1 -
 configure.ac   |    8 +++++
 ftp/cmds.c     |    6 +---
 ftp/main.c     |    6 +---
 7 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 am/readline.m4


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 10:37:30 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRmyw-0002en-Sf
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:37:30 -0500
Received: from eggs.gnu.org ([140.186.70.92]:48416)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRmyt-0002ee-9h
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:37:28 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRmyr-0004vM-Uc
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:37:27 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40893)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRmyr-0004vH-TC
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:37:25 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RRmyr-0007ku-Oe
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 15:37:26 +0000
Date: Sat, 19 Nov 2011 15:37:25 +0000
Message-Id: <E1RRmyr-0007ku-Oe@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-169-g525da5d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7a2dba700aae9a9ba8ab2b205ac29812f0b7fdd8
X-Git-Newrev: 525da5d91eec14e3570f241615d5e19134df786c
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 15:37:28 -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  525da5d91eec14e3570f241615d5e19134df786c (commit)
      from  7a2dba700aae9a9ba8ab2b205ac29812f0b7fdd8 (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=525da5d91eec14e3570f241615d5e19134df786c


commit 525da5d91eec14e3570f241615d5e19134df786c
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 19 16:36:57 2011 +0100

    Fix last commit.  (silent change)

diff --git a/README b/README
index f00e59b..20d7fce 100644
--- a/README
+++ b/README
@@ -39,8 +39,9 @@ Some known deficiencies:
 
  - Non-Shishi Kerberos support does not build.  Patches welcome.
 
- - InetUtils does not build on Cygwin, Minix, MinGW, MSCV, BeOS, Haiki
-   (and probably other systems as well).  Patches welcome.
+ - InetUtils does not build on HP-UX 11.00, Cygwin, Minix, MinGW,
+   MSCV, BeOS, Haiki (and probably other systems as well).  Patches
+   welcome.
 
 See the file INSTALL for installation instructions.
 

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

Summary of changes:
 README |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 10:41:28 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRn2m-0003JX-O5
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:41:28 -0500
Received: from eggs.gnu.org ([140.186.70.92]:57503)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRn2j-0003Hb-UD
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:41:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRn2i-0005eq-R0
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:41:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34766)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RRn2i-0005em-Lj
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 10:41:24 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RRn2i-0008CP-F1
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 15:41:24 +0000
Date: Sat, 19 Nov 2011 15:41:24 +0000
Message-Id: <E1RRn2i-0008CP-F1@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-170-g0b660bd
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 525da5d91eec14e3570f241615d5e19134df786c
X-Git-Newrev: 0b660bda0d4fcb1354d5893b7adf30210d08892f
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 15:41:26 -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  0b660bda0d4fcb1354d5893b7adf30210d08892f (commit)
      from  525da5d91eec14e3570f241615d5e19134df786c (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=0b660bda0d4fcb1354d5893b7adf30210d08892f


commit 0b660bda0d4fcb1354d5893b7adf30210d08892f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 19 16:41:09 2011 +0100

    doc: Mention portability issue.
    
    * TODO: Updated.

diff --git a/ChangeLog b/ChangeLog
index 4b5fd5f..840d645 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
 
+	* TODO: Updated.
+
+2011-11-19  Simon Josefsson  <simon@josefsson.org>
+
 	* README (Notes): Doc fix.
 
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
diff --git a/TODO b/TODO
index 0630678..17f544d 100644
--- a/TODO
+++ b/TODO
@@ -107,6 +107,10 @@ translations, especially for the clients.
 2.0 will be a release that tries to put as much as possible into
 libraries (startup code, etc).  We would also like to try and write
 (or convince someone else to write) a gopher and gopherd pair.
+
+Make src/hostname.c handle missing 'sethostname' functions on
+platforms that doesn't have them (it could just print an error
+message).
 
 * libicmp
 

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

Summary of changes:
 ChangeLog |    4 ++++
 TODO      |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 19 13:00:23 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RRpDD-000442-4a
	for mharc-commit-inetutils@gnu.org; Sat, 19 Nov 2011 13:00:23 -0500
Received: from eggs.gnu.org ([140.186.70.92]:59586)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRpDB-00043w-GE
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 13:00:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRpD9-0002Fm-S6
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 13:00:21 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38033)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RRpD9-0002Fh-NT
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 13:00:19 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RRpD7-0005NA-LA
	for commit-inetutils@gnu.org; Sat, 19 Nov 2011 18:00:18 +0000
Date: Sat, 19 Nov 2011 18:00:18 +0000
Message-Id: <E1RRpD7-0005NA-LA@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-171-g8202099
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0b660bda0d4fcb1354d5893b7adf30210d08892f
X-Git-Newrev: 8202099fb33385fc159d4d11e1f77945d3f9d91d
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 19 Nov 2011 18:00:22 -0000

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

The branch, master has been updated
       via  8202099fb33385fc159d4d11e1f77945d3f9d91d (commit)
      from  0b660bda0d4fcb1354d5893b7adf30210d08892f (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=8202099fb33385fc159d4d11e1f77945d3f9d91d


commit 8202099fb33385fc159d4d11e1f77945d3f9d91d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Nov 19 18:58:44 2011 +0100

    doc: Issues with OpenSolaris; tftp speaks IPv6.
    
    * TODO: Updated.

diff --git a/ChangeLog b/ChangeLog
index 840d645..a28679a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-19  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* TODO: Updated.
+
 2011-11-19  Simon Josefsson  <simon@josefsson.org>
 
 	* TODO: Updated.
diff --git a/TODO b/TODO
index 17f544d..751629b 100644
--- a/TODO
+++ b/TODO
@@ -25,8 +25,6 @@ TODO, confpaths.h.in, ifconfig/COMPATIBILITY, whois/as_del_list,
 whois/ip_del_list, whois/make_as_del.pl, whois/make_ip_del.pl,
 whois/make_tld_serv.pl, and whois/tld_serv_list.
 
-tftp does not work with IPv6.
-
 Add a better autoconf check for bison, it will succeed even though the
 generated files do not exist.
 
@@ -148,6 +146,17 @@ Ability to ping multiple host in one go.
   For example, if a system specific option shadows a normal option?
   Allow this?
 
+* telnetd
+
+With OpenSolaris, the variable TERM is not set correctly.
+No issue with other systems. Debug this!
+
+* tftpd
+
+OpenSolaris is only able to transmit a single package of
+size at most PKTSIZE. Debug libinetutils/tftpsubs.c on this.
+No issue with other systems.
+
 * whois
 
 What about rwhois?

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

Summary of changes:
 ChangeLog |    4 ++++
 TODO      |   13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Nov 20 02:36:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RS1x2-0006XD-Ul
	for mharc-commit-inetutils@gnu.org; Sun, 20 Nov 2011 02:36:32 -0500
Received: from eggs.gnu.org ([140.186.70.92]:44023)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RS1wz-0006WF-HJ
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 02:36:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RS1wy-0002kP-5m
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 02:36:29 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59890)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RS1wy-0002kL-2a
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 02:36:28 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RS1wx-000748-G3
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 07:36:27 +0000
Date: Sun, 20 Nov 2011 07:36:27 +0000
Message-Id: <E1RS1wx-000748-G3@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-172-ge5cd5d3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8202099fb33385fc159d4d11e1f77945d3f9d91d
X-Git-Newrev: e5cd5d3ba8a55f91bd39ae1ea776f3a349ec004a
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 20 Nov 2011 07:36:31 -0000

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

The branch, master has been updated
       via  e5cd5d3ba8a55f91bd39ae1ea776f3a349ec004a (commit)
      from  8202099fb33385fc159d4d11e1f77945d3f9d91d (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=e5cd5d3ba8a55f91bd39ae1ea776f3a349ec004a


commit e5cd5d3ba8a55f91bd39ae1ea776f3a349ec004a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Nov 20 08:35:11 2011 +0100

    ChangeLog: Mention am/readline.m4 (silent change)

diff --git a/ChangeLog b/ChangeLog
index a28679a..4b86fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
 	* configure.ac: Search for readline.
 	* ftp/cmds.c: Unconditionally include readline headers.
 	* ftp/main.c: Likewise.
+	* am/readline.m4: New file.
 
 2011-11-19  Alfred M. Szmidt  <ams@gnu.org>
 

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

Summary of changes:
 ChangeLog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Nov 20 18:25:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSGlQ-0007ej-U8
	for mharc-commit-inetutils@gnu.org; Sun, 20 Nov 2011 18:25:32 -0500
Received: from eggs.gnu.org ([140.186.70.92]:35961)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSGlN-0007ec-N8
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 18:25:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSGlL-0006Gz-LW
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 18:25:29 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47515)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSGlL-0006Gv-I9
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 18:25:27 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RSGlL-0007IM-2r
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 23:25:27 +0000
Date: Sun, 20 Nov 2011 23:25:27 +0000
Message-Id: <E1RSGlL-0007IM-2r@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-173-g31c990c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e5cd5d3ba8a55f91bd39ae1ea776f3a349ec004a
X-Git-Newrev: 31c990c3651ba0c56cbd731ff6156b576769e1f6
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 20 Nov 2011 23:25:31 -0000

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

The branch, master has been updated
       via  31c990c3651ba0c56cbd731ff6156b576769e1f6 (commit)
      from  e5cd5d3ba8a55f91bd39ae1ea776f3a349ec004a (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=31c990c3651ba0c56cbd731ff6156b576769e1f6


commit 31c990c3651ba0c56cbd731ff6156b576769e1f6
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 21 00:24:17 2011 +0100

    Missing inclusion, prototype, and doc update.

diff --git a/ChangeLog b/ChangeLog
index 4b86fb7..d148d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* libtelnet/getent.c [HAVE_CGETENT]: Include <stdlib.h>.
+	* telnet/sys_bsd.c [SIGINFO] (sendayt): Missing declaration.
+	* doc/inetutils.texi (telnet invocation): Minor fixes.
+	* TODO: Updated.
+
 2011-11-19  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* TODO: Updated.
diff --git a/TODO b/TODO
index 751629b..99b8d91 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,8 @@ supdup: A telnet client/daemon like program for the SUPDUP protocol;
   running.  And I don't think there is an actual daemon program for
   GNU systems at all (ITS has one though :-).
 
-Add framework for tests.
+Add framework for tests.  How can tests needing root priviliges
+be maintained, automated, or rewritten?
 
 Function for parsing [USER@]HOSTNAME[:PORT], that returns each value
 in a structure.  Handle IP (v4 and v6) numbers as well.  And make
@@ -90,6 +91,10 @@ unconditionally in a lot of places, even if an autoconf test is
 already done for them, &c.
 
 Testing and debugging the encryption and authentication modes.
+Include all relevant options in the Texinfo source.
+
+Remove support for kerberos_v4. Make sure kerberos_v5 and shishi
+do not interfere when building on systems where both are present.
 
 Add more utilities:
   Tcpdump
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 568b597..771042b 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -1981,7 +1981,8 @@ previous state.
 @node telnet invocation
 @chapter @command{telnet}: User interface to TELNET
 
-Login to remote system HOST (optionally, on service port PORT)
+Login to a remote system HOST, optionally using a (non-standard)
+service port PORT:
 
 @example
 telnet [@var{OPTION}...] [@var{HOST} [@var{PORT}]]
@@ -2006,7 +2007,7 @@ Attempt automatic login.
 
 @item -c
 @itemx --no-rc
-Don't read the user's .telnetrc file.
+Do not read the user's file @file{$HOME/.telnetrc}.
 
 @item -d
 @itemx --debug
@@ -2014,7 +2015,7 @@ Turn on debugging.
 
 @item -e CHAR
 @itemx --escape=CHAR
-Use CHAR as an escape character.
+Use CHAR as escape character.
 
 @item -E
 @itemx --no-escape
@@ -2022,7 +2023,7 @@ Use no escape character.
 
 @item -K
 @itemx --no-login
-Don't automatically login to the remote system.
+Do not automatically login to the remote system.
 
 @item -l USER
 @itemx --user=USER
@@ -2038,11 +2039,18 @@ Record trace information into FILE.
 
 @item -r
 @itemx --rlogin
-Use a user-interface similar to rlogin.
+Display a user-interface similar to that of @command{rlogin}.
+
+@item -x
+@itemx --encrypt
+If possible, encrypt the data stream.
 
 @item -X ATYPE
 @itemx --disable-auth=ATYPE
-Disable type ATYPE authentication.
+Disable authentication of type ATYPE.
+Use this option multiple times if more than one type
+is to be disabled.  Standard choices are @samp{null},
+@samp{kerberos_v4}, and @samp{kerberos_v5}.
 @end table
 
 @node inetd invocation
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index 606b61c..c846a60 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -50,6 +50,8 @@
 #include <config.h>
 
 #ifdef HAVE_CGETENT
+# include <stdlib.h>
+
 static char *area;
 #endif
 
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index fc14211..cb1343e 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -72,6 +72,7 @@
 
 #ifdef	SIGINFO
 extern void ayt_status ();
+extern void sendayt ();
 #endif
 
 int tout,			/* Output file descriptor */

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

Summary of changes:
 ChangeLog          |    7 +++++++
 TODO               |    7 ++++++-
 doc/inetutils.texi |   20 ++++++++++++++------
 libtelnet/getent.c |    2 ++
 telnet/sys_bsd.c   |    1 +
 5 files changed, 30 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Nov 20 20:58:57 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSJ9t-0002aF-G2
	for mharc-commit-inetutils@gnu.org; Sun, 20 Nov 2011 20:58:57 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38554)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSJ9r-0002a9-0K
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 20:58:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSJ9p-0000kO-Me
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 20:58:54 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44276)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSJ9p-0000kI-Ia
	for commit-inetutils@gnu.org; Sun, 20 Nov 2011 20:58:53 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RSJ9o-0006FX-Qe
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 01:58:53 +0000
Date: Mon, 21 Nov 2011 01:58:52 +0000
Message-Id: <E1RSJ9o-0006FX-Qe@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-174-g5a4a40a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 31c990c3651ba0c56cbd731ff6156b576769e1f6
X-Git-Newrev: 5a4a40a3c3b96ff6ef78ca0991fed8b1ae863989
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 21 Nov 2011 01:58:56 -0000

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

The branch, master has been updated
       via  5a4a40a3c3b96ff6ef78ca0991fed8b1ae863989 (commit)
      from  31c990c3651ba0c56cbd731ff6156b576769e1f6 (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=5a4a40a3c3b96ff6ef78ca0991fed8b1ae863989


commit 5a4a40a3c3b96ff6ef78ca0991fed8b1ae863989
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 21 02:56:59 2011 +0100

    tests/syslogd.sh: Post-run cleanup.

diff --git a/ChangeLog b/ChangeLog
index d148d59..9f5f27c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/syslogd.sh: Implement post-run cleanup.
+
+2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* libtelnet/getent.c [HAVE_CGETENT]: Include <stdlib.h>.
 	* telnet/sys_bsd.c [SIGINFO] (sendayt): Missing declaration.
 	* doc/inetutils.texi (telnet invocation): Minor fixes.
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 6550350..4d52773 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -20,11 +20,48 @@
 # Tests to establish functionality of SYSLOG daemon.
 #
 
-# Keep any external assignment.
+# Is usage explanation in demand?
 #
-: ${IU_TESTDIR:=/tmp/iu_syslog}
+if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "--usage" ]; then
+	cat <<HERE
+Test utility for syslogd and logger.
+
+The following environment variables are used:
+
+NOCLEAN		No clean up of testing directory, if set.
+VERBOSE		Be verbose, if set.
+OPTIONS		Base options to build upon.
+IU_TESTDIR	If set, use this as testing dir. Unless
+		NOCLEAN is also set, any created \$IU_TESTDIR
+		will be erased after the test.
+REMOTE_LOGHOST	Add this host as a receiving loghost.
+
+HERE
+	exit 0
+fi
+
+# Keep any external assignment of testing directory.
+# Otherwise a randomisation is included if NOCLEAN
+# has been set.
+#
+if [ -n "${NOCLEAN+yes}" ]; then
+	: ${IU_TESTDIR:=/tmp/iu_syslog}
+else
+	: ${IU_TESTDIR:=/tmp/iu_syslog$$}
+fi
 
-mkdir -p $IU_TESTDIR
+if [ ! -d $IU_TESTDIR ]; then
+	IU_DO_CLEANDIR=yes
+	mkdir -p $IU_TESTDIR
+fi
+
+# Erase the testing directory.
+#
+clean_testdir () {
+	if [ -z "${NOCLEAN+no}" -a "$IU_DO_CLEANDIR" = "yes" ]; then
+		rm -fR $IU_TESTDIR
+	fi
+}
 
 CONF=$IU_TESTDIR/syslog.conf
 PID=$IU_TESTDIR/syslogd.pid
@@ -75,11 +112,13 @@ IU_LOGGER=./src/logger$EXEEXT
 
 if [ ! -x $IU_SYSLOGD ]; then
 	echo "Missing executable 'syslogd'. Failing."
+	clean_testdir
 	exit 1;
 fi
 
 if [ ! -x $IU_LOGGER ]; then
 	echo "Missing executable 'logger'. Failing."
+	clean_testdir
 	exit 1
 fi
 
@@ -130,7 +169,9 @@ if [ "$USER" = "root" ]; then
 fi
 ## Bring in additional options from command line.
 ## Disable kernel messages otherwise.
-: OPTIONS=${OPTIONS:=--no-klog}
+if [ -c /dev/klog ]; then
+	: OPTIONS=${OPTIONS:=--no-klog}
+fi
 IU_OPTIONS="$IU_OPTIONS $OPTIONS"
 
 $IU_SYSLOGD $IU_OPTIONS
@@ -145,6 +186,7 @@ sleep 1
 #
 if [ ! -r $PID ]; then
 	echo "The service daemon never started. Failing."
+	clean_testdir
 	exit 1
 fi
 
@@ -193,4 +235,6 @@ fi
 # Remove the daemon process.
 [ -r $PID ] && kill "$(cat $PID)"
 
+clean_testdir
+
 exit $EXITCODE

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

Summary of changes:
 ChangeLog        |    4 ++++
 tests/syslogd.sh |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 52 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 21 08:39:35 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSU5v-000359-KY
	for mharc-commit-inetutils@gnu.org; Mon, 21 Nov 2011 08:39:35 -0500
Received: from eggs.gnu.org ([140.186.70.92]:53304)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSU5p-00034d-GG
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 08:39:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSU5i-0000Xd-GY
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 08:39:29 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58807)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSU5i-0000XZ-Cm
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 08:39:22 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RSU5h-00005M-OG
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 13:39:21 +0000
Date: Mon, 21 Nov 2011 13:39:21 +0000
Message-Id: <E1RSU5h-00005M-OG@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-175-g69b659c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5a4a40a3c3b96ff6ef78ca0991fed8b1ae863989
X-Git-Newrev: 69b659c136ca297cd351bbd1ad24cc3fc23bc9ce
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 21 Nov 2011 13:39:34 -0000

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

The branch, master has been updated
       via  69b659c136ca297cd351bbd1ad24cc3fc23bc9ce (commit)
      from  5a4a40a3c3b96ff6ef78ca0991fed8b1ae863989 (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=69b659c136ca297cd351bbd1ad24cc3fc23bc9ce


commit 69b659c136ca297cd351bbd1ad24cc3fc23bc9ce
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 21 14:37:49 2011 +0100

    telnetd: Updated invocation string for Solaris.

diff --git a/ChangeLog b/ChangeLog
index 9f5f27c..cc96ecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* telnetd/telnetd.c (login_invocation) [SOLARIS]: Changes for terminal
+	and user name.
+	* TODO: Updated.
+
+2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/syslogd.sh: Implement post-run cleanup.
 
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
diff --git a/TODO b/TODO
index 99b8d91..325307d 100644
--- a/TODO
+++ b/TODO
@@ -151,11 +151,6 @@ Ability to ping multiple host in one go.
   For example, if a system specific option shadows a normal option?
   Allow this?
 
-* telnetd
-
-With OpenSolaris, the variable TERM is not set correctly.
-No issue with other systems. Debug this!
-
 * tftpd
 
 OpenSolaris is only able to transmit a single package of
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 7bfeb4f..a3095b9 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -39,7 +39,7 @@ static void print_hostinfo (void);
 
 char *login_invocation =
 #ifdef SOLARIS
-  PATH_LOGIN " -h %h %?T{TERM=%T}{-} %?u{%?a{-f }-- %u}"
+  PATH_LOGIN " -h %h %?T{-t %T} %?u{-u %u}"
 #else
   PATH_LOGIN " -p -h %h %?u{-f %u}"
 #endif

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

Summary of changes:
 ChangeLog         |    6 ++++++
 TODO              |    5 -----
 telnetd/telnetd.c |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Nov 21 12:04:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RSXHw-0003mA-Qk
	for mharc-commit-inetutils@gnu.org; Mon, 21 Nov 2011 12:04:12 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38265)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSXHp-0003l1-Mt
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 12:04:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSXHk-00051X-5g
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 12:04:05 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38510)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RSXHk-00051R-2v
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 12:04:00 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RSXHM-0005n8-GO
	for commit-inetutils@gnu.org; Mon, 21 Nov 2011 17:03:58 +0000
Date: Mon, 21 Nov 2011 17:03:41 +0000
Message-Id: <E1RSXHM-0005n8-GO@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-176-g0847dca
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 69b659c136ca297cd351bbd1ad24cc3fc23bc9ce
X-Git-Newrev: 0847dcaaa4c9cebf863915c4eb8930c15a62515d
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 21 Nov 2011 17:04: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  0847dcaaa4c9cebf863915c4eb8930c15a62515d (commit)
      from  69b659c136ca297cd351bbd1ad24cc3fc23bc9ce (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=0847dcaaa4c9cebf863915c4eb8930c15a62515d


commit 0847dcaaa4c9cebf863915c4eb8930c15a62515d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Nov 21 17:58:49 2011 +0100

    Remove obsolete inclusion <malloc.h>.

diff --git a/ChangeLog b/ChangeLog
index cc96ecb..87f80de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* configure.ac: Do not check for <malloc.h>.
+	* libinetutils/localhost.c [HAVE_MALLOC_H]: Do not include
+	<malloc.h> and delete the conditional.
+	* telnet/commands.c [HAVE_MALLOC_H]: Likewise.
+
+2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* telnetd/telnetd.c (login_invocation) [SOLARIS]: Changes for terminal
 	and user name.
 	* TODO: Updated.
diff --git a/configure.ac b/configure.ac
index 75d43f5..b0259e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,7 +440,7 @@ AC_HEADER_TIME
 AC_HEADER_DIRENT
 
 AC_CHECK_HEADERS([arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
-                  krb.h memory.h malloc.h netinet/in_systm.h netinet/ip.h \
+                  krb.h memory.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 \
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index 8d00270..abb734b 100644
--- a/libinetutils/localhost.c
+++ b/libinetutils/localhost.c
@@ -23,9 +23,6 @@
 #include <config.h>
 
 #include <unistd.h>
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/telnet/commands.c b/telnet/commands.c
index 1f68d3c..a2db7fe 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -71,9 +71,6 @@
 #include <errno.h>
 
 #include <stdlib.h>
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
 
 #include <arpa/inet.h>
 #include <arpa/telnet.h>

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

Summary of changes:
 ChangeLog                |    7 +++++++
 configure.ac             |    2 +-
 libinetutils/localhost.c |    3 ---
 telnet/commands.c        |    3 ---
 4 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 26 12:30:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUM53-0002aI-Sp
	for mharc-commit-inetutils@gnu.org; Sat, 26 Nov 2011 12:30:25 -0500
Received: from eggs.gnu.org ([140.186.70.92]:59175)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUM51-0002aA-Ij
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 12:30:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUM50-0000Zm-6V
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 12:30:23 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33397)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUM50-0000Zg-1m
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 12:30:22 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RUM4u-0007DF-NY
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 17:30:21 +0000
Date: Sat, 26 Nov 2011 17:30:18 +0000
Message-Id: <E1RUM4u-0007DF-NY@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-177-g6526bd8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0847dcaaa4c9cebf863915c4eb8930c15a62515d
X-Git-Newrev: 6526bd881f3d820f4c7ab5e3ba4d9b1964e6c0b6
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 26 Nov 2011 17: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  6526bd881f3d820f4c7ab5e3ba4d9b1964e6c0b6 (commit)
      from  0847dcaaa4c9cebf863915c4eb8930c15a62515d (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=6526bd881f3d820f4c7ab5e3ba4d9b1964e6c0b6


commit 6526bd881f3d820f4c7ab5e3ba4d9b1964e6c0b6
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Nov 26 11:08:16 2011 +0100

    Portability fixes discovered by Solaris.
    
    * <protocols/talkd.h> need not be present.
    * Unused code in `ftpd/logwtmp.c'.
    * Implementation of logwtmp() is needed in Solaris.

diff --git a/ChangeLog b/ChangeLog
index 87f80de..168a8c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* configure.ac: Check presence of <protocols/talkd.h>. Disable
+	building of `talk' and `talkd' if it is missing.
+	* ftpd/Makefile.am (ftpd_SOURCES): Exclude unused `logwtmp.c'.
+	* libinetutils/logwtmpko.c [HAVE_UTMPX_H && SOLARIS]: Include
+	<utmpx.h>.
+	[HAVE_UPDWTMP && SOLARIS]: Implement missing `logwtmp()'.
+
 2011-11-21  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* configure.ac: Do not check for <malloc.h>.
diff --git a/configure.ac b/configure.ac
index b0259e5..5ebe9fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,21 @@ fi
 AC_SUBST(LIBLS)
 AC_SUBST(libls_BUILD)
 
+dnl At least OpenSolaris is missing <protocols/talkd.h>.
+AC_CHECK_HEADER(protocols/talkd.h, , ,
+  [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
+		 # include <sys/types.h>
+		 #endif
+		 #include <sys/socket.h>])])
+
+if test "$ac_cv_header_protocols_talkd_h" = no; then
+  AC_MSG_WARN([protocols/talkd.h is not available, not building talk, nor talkd])
+  enable_talk=no
+  talk_BUILD=''
+  enable_talkd=no
+  talkd_BUILD=''
+fi
+
 # Only talk uses curses, so only check for it if we want that
 if test "$enable_talk" != no; then
   IU_LIB_CURSES
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index b97d7f5..79c1c5a 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -23,7 +23,7 @@ inetdaemon_PROGRAMS = @ftpd_BUILD@
 
 EXTRA_PROGRAMS = ftpd
 
-ftpd_SOURCES = ftpcmd.y ftpd.c logwtmp.c popen.c pam.c auth.c \
+ftpd_SOURCES = ftpcmd.y ftpd.c popen.c pam.c auth.c \
                conf.c server_mode.c
 
 noinst_HEADERS = extern.h
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index 2818304..3e1d91c 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -19,5 +19,43 @@
 
 #include <config.h>
 
+#if HAVE_UTMPX_H && defined SOLARIS
+# include <utmpx.h>	/* updwtmp() */
+#endif
+
 #define KEEP_OPEN
 #include "logwtmp.c"
+
+/* Solaris does not provide logwtmp(3c).
+ * It is needed in addition to logwtmp_keep_open().
+ */
+#if HAVE_UPDWTMP && defined SOLARIS
+void
+logwtmp (char *line, char *name, char *host)
+{
+  struct utmp ut;
+#ifdef HAVE_STRUCT_UTMP_UT_TV
+  struct timeval tv;
+#endif
+
+  memset (&ut, 0, sizeof (ut));
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
+  ut.ut_type = USER_PROCESS;
+#endif
+  strncpy (ut.ut_line, line, sizeof ut.ut_line);
+  strncpy (ut.ut_name, name, sizeof ut.ut_name);
+#ifdef HAVE_STRUCT_UTMP_UT_HOST
+  strncpy (ut.ut_host, host, sizeof ut.ut_host);
+#endif
+
+# ifdef HAVE_STRUCT_UTMP_UT_TV
+  gettimeofday (&tv, NULL);
+  ut.ut_tv.tv_sec = tv.tv_sec;
+  ut.ut_tv.tv_usec = tv.tv_usec;
+# else
+  time (&ut.ut_time);
+# endif
+
+  updwtmp (PATH_WTMP, &ut);
+}
+#endif /* HAVE_UPDWTMP && defined SOLARIS */

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

Summary of changes:
 ChangeLog                |    9 +++++++++
 configure.ac             |   15 +++++++++++++++
 ftpd/Makefile.am         |    2 +-
 libinetutils/logwtmpko.c |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 26 13:26:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUMxL-00044P-FN
	for mharc-commit-inetutils@gnu.org; Sat, 26 Nov 2011 13:26:31 -0500
Received: from eggs.gnu.org ([140.186.70.92]:54651)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUMxI-00043v-4i
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 13:26:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUMxG-0000uU-Jj
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 13:26:28 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42150)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUMxG-0000uQ-Gt
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 13:26:26 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RUMxF-000180-BB
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 18:26:26 +0000
Date: Sat, 26 Nov 2011 18:26:25 +0000
Message-Id: <E1RUMxF-000180-BB@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-178-ga463810
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6526bd881f3d820f4c7ab5e3ba4d9b1964e6c0b6
X-Git-Newrev: a4638103d3091c4c95e2d13bcc2b7c2fa08cf994
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 26 Nov 2011 18:26:29 -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  a4638103d3091c4c95e2d13bcc2b7c2fa08cf994 (commit)
      from  6526bd881f3d820f4c7ab5e3ba4d9b1964e6c0b6 (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=a4638103d3091c4c95e2d13bcc2b7c2fa08cf994


commit a4638103d3091c4c95e2d13bcc2b7c2fa08cf994
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Nov 26 19:25:47 2011 +0100

    tests/tftp.sh: Improve robustness and portability.

diff --git a/ChangeLog b/ChangeLog
index 168a8c8..11926d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/tftp.sh (INETD_PID): New variable; allows better robustness.
+	Improve patterns to fit also BSD.
+
+2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* configure.ac: Check presence of <protocols/talkd.h>. Disable
 	building of `talk' and `talkd' if it is missing.
 	* ftpd/Makefile.am (ftpd_SOURCES): Exclude unused `logwtmp.c'.
diff --git a/tests/tftp.sh b/tests/tftp.sh
index b670c63..023b0d7 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -32,6 +32,7 @@ AF=${AF:-inet}
 PROTO=${PROTO:-udp}
 PORT=${PORT:-7777}
 INETD_CONF="$PWD/inetd.conf.tmp"
+INETD_PID="$PWD/inetd.pid.$$"
 
 ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
      -e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
@@ -50,7 +51,7 @@ if [ "$VERBOSE" ]; then
 fi
 
 # Check that the port is still available
-netstat -na | grep -q "^$PROTO .*$PORT "
+netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
 if test $? -eq 0; then
     echo "Desired port $PORT/$PROTO is already in use."
     exit 1
@@ -64,8 +65,9 @@ $PORT dgram $PROTO wait $USER $TFTPD   tftpd -l `pwd`/tftp-test
 EOF
 
 # Launch `inetd', assuming it's reachable at all $ADDRESSES.
-$INETD -d "$INETD_CONF" &
-inetd_pid="$!"
+$INETD -d -p"$INETD_PID" "$INETD_CONF" &
+sleep 1
+inetd_pid="$(cat $INETD_PID)"
 
 test -z "$VERBOSE" || echo "Launched Inetd as process $inetd_pid." >&2
 
@@ -73,7 +75,7 @@ test -z "$VERBOSE" || echo "Launched Inetd as process $inetd_pid." >&2
 sleep 1
 
 # Did `inetd' really succeed in establishing a listener?
-netstat -na | grep "^$PROTO .*$PORT "
+netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
 if test $? -ne 0; then
     # No it did not.
     ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
@@ -113,7 +115,7 @@ done
 
 ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
 
-rm -rf tftp-test tftp-test-file "$INETD_CONF"
+rm -rf tftp-test tftp-test-file "$INETD_CONF" "$INETD_PID"
 
 # Minimal clean up
 echo

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

Summary of changes:
 ChangeLog     |    5 +++++
 tests/tftp.sh |   12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Nov 26 15:59:17 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RUPLB-0004gQ-1z
	for mharc-commit-inetutils@gnu.org; Sat, 26 Nov 2011 15:59:17 -0500
Received: from eggs.gnu.org ([140.186.70.92]:51340)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUPL7-0004gJ-Rw
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 15:59:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUPL6-0007U0-GM
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 15:59:13 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38320)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RUPL6-0007Tw-DO
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 15:59:12 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RUPL5-0000Kw-9G
	for commit-inetutils@gnu.org; Sat, 26 Nov 2011 20:59:12 +0000
Date: Sat, 26 Nov 2011 20:59:11 +0000
Message-Id: <E1RUPL5-0000Kw-9G@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-179-g4088071
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a4638103d3091c4c95e2d13bcc2b7c2fa08cf994
X-Git-Newrev: 4088071c2f55192e81dc77e64c28672d7313bbba
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 26 Nov 2011 20:59:15 -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  4088071c2f55192e81dc77e64c28672d7313bbba (commit)
      from  a4638103d3091c4c95e2d13bcc2b7c2fa08cf994 (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=4088071c2f55192e81dc77e64c28672d7313bbba


commit 4088071c2f55192e81dc77e64c28672d7313bbba
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Nov 26 21:57:48 2011 +0100

    Allow tests to return skip code instead of failure.

diff --git a/ChangeLog b/ChangeLog
index 11926d4..5449692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* tests/tftp.sh: Return skip code if INET port is already in use.
+	* tests/syslogd.sh: Likewise. Implement the corresponding test.
+	(PORT, PROTO): New variables.
+
+2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* tests/tftp.sh (INETD_PID): New variable; allows better robustness.
 	Improve patterns to fit also BSD.
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 4d52773..c9ee342 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -68,6 +68,11 @@ PID=$IU_TESTDIR/syslogd.pid
 OUT=$IU_TESTDIR/messages
 : ${SOCKET:=$IU_TESTDIR/log}
 
+# Test at this port.
+# Standard is syslog at 514/udp.
+PROTO=udp
+PORT=514
+
 # For testing of critical lengths for UNIX socket names,
 # we need a well defined base directory; choose "/tmp/".
 IU_TEN=0123456789
@@ -113,13 +118,13 @@ IU_LOGGER=./src/logger$EXEEXT
 if [ ! -x $IU_SYSLOGD ]; then
 	echo "Missing executable 'syslogd'. Failing."
 	clean_testdir
-	exit 1;
+	exit 77
 fi
 
 if [ ! -x $IU_LOGGER ]; then
 	echo "Missing executable 'logger'. Failing."
 	clean_testdir
-	exit 1
+	exit 77
 fi
 
 # Remove old messages.
@@ -132,6 +137,15 @@ if [ "$USER" != "root" ]; then
 	Disabling INET server tests since you seem
 	to be underprivileged.
 	EOT
+else
+	# Is the INET port already in use? If so,
+	# skip the test in its entirety.
+	netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+	if [ $? -eq 0 ]; then
+		echo "The INET port $PORT/$PROTO is already in use."
+		echo "No reliable test is possible."
+		exit 77
+	fi
 fi
 
 # A minimal, catch-all configuration.
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 023b0d7..b880581 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -54,7 +54,7 @@ fi
 netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
 if test $? -eq 0; then
     echo "Desired port $PORT/$PROTO is already in use."
-    exit 1
+    exit 77
 fi
 
 # Create `inetd.conf'.  Note: We want $TFTPD to be an absolute file

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

Summary of changes:
 ChangeLog        |    6 ++++++
 tests/syslogd.sh |   18 ++++++++++++++++--
 tests/tftp.sh    |    2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Nov 29 07:34:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVMtB-0002Qo-0E
	for mharc-commit-inetutils@gnu.org; Tue, 29 Nov 2011 07:34:21 -0500
Received: from eggs.gnu.org ([140.186.70.92]:54694)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RVMt3-0002Qc-Ms
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 07:34:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RVMsv-0004Na-HA
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 07:34:13 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55902)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RVMsv-0004NW-Ff
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 07:34:05 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RVMsj-0006Jl-Ps
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 12:34:02 +0000
Date: Tue, 29 Nov 2011 12:33:56 +0000
Message-Id: <E1RVMsj-0006Jl-Ps@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-180-g77d5ea7
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4088071c2f55192e81dc77e64c28672d7313bbba
X-Git-Newrev: 77d5ea7a6fcbf8cb1789b60522a2cecab36c73cd
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 29 Nov 2011 12:34:19 -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  77d5ea7a6fcbf8cb1789b60522a2cecab36c73cd (commit)
      from  4088071c2f55192e81dc77e64c28672d7313bbba (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=77d5ea7a6fcbf8cb1789b60522a2cecab36c73cd


commit 77d5ea7a6fcbf8cb1789b60522a2cecab36c73cd
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Nov 29 13:11:55 2011 +0100

    make_ip_del.pl: Arithmetic on 64-bit systems.

diff --git a/ChangeLog b/ChangeLog
index 5449692..b58ce2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-29  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* whois/make_ip_del.pl: Compute netmasks correctly
+	also with 64-bit arithmetic.
+
 2011-11-26  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* tests/tftp.sh: Return skip code if INET port is already in use.
diff --git a/whois/make_ip_del.pl b/whois/make_ip_del.pl
index cd98cf1..89ffaa5 100755
--- a/whois/make_ip_del.pl
+++ b/whois/make_ip_del.pl
@@ -29,7 +29,7 @@ while (<>) {
 	my $m=$2; my $s=$3;
 	my ($i1, $i2, $i3, $i4)=split(/\./, $1);
 	print "{ ".(($i1<<24)+($i2<<16)+($i3<<8)+$i4)."UL, ".
-		(~(0xffffffff>>$m))."UL, \"";
+		(0xffffffff^(0xffffffff>>$m))."UL, \"";
 	if ($s =~ /\./) {
 		print "$s";
 	} else {

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

Summary of changes:
 ChangeLog            |    5 +++++
 whois/make_ip_del.pl |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Nov 29 09:47:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVOy3-0005rI-Es
	for mharc-commit-inetutils@gnu.org; Tue, 29 Nov 2011 09:47:31 -0500
Received: from eggs.gnu.org ([140.186.70.92]:41631)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RVOxx-0005qh-Va
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 09:47:30 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RVOxw-0007Ej-A9
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 09:47:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51775)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RVOxw-0007Ea-88
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 09:47:24 -0500
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RVOxv-0007SL-Sd
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 14:47:24 +0000
Date: Tue, 29 Nov 2011 14:47:23 +0000
Message-Id: <E1RVOxv-0007SL-Sd@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-181-g399b72e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 77d5ea7a6fcbf8cb1789b60522a2cecab36c73cd
X-Git-Newrev: 399b72eb69f3213ea802debea11ff316e10e44c5
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 29 Nov 2011 14:47:30 -0000

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

The branch, master has been updated
       via  399b72eb69f3213ea802debea11ff316e10e44c5 (commit)
      from  77d5ea7a6fcbf8cb1789b60522a2cecab36c73cd (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=399b72eb69f3213ea802debea11ff316e10e44c5


commit 399b72eb69f3213ea802debea11ff316e10e44c5
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Nov 29 15:29:23 2011 +0100

    tests: fix a failure.

diff --git a/ChangeLog b/ChangeLog
index b58ce2f..a8b333d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-29  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+	* tests/syslogd.sh: Use 12.0.0.1 and [::1] instead of localhost as
+	arguments to logger.
+
 2011-11-29  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* whois/make_ip_del.pl: Compute netmasks correctly
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index c9ee342..2a504d7 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -225,8 +225,8 @@ $IU_LOGGER -h $IU_LONG_SOCKET -p user.info -t $TAG "Sending via long socket name
 
 if [ "$USER" = "root" ]; then
 	TESTCASES=$((TESTCASES + 2))
-	$IU_LOGGER -4 -h localhost -p user.info -t $TAG "Sending IPv4 message. (pid $$)"
-	$IU_LOGGER -6 -h localhost -p user.info -t $TAG "Sending IPv6 message. (pid $$)"
+	$IU_LOGGER -4 -h 127.0.0.1 -p user.info -t $TAG "Sending IPv4 message. (pid $$)"
+	$IU_LOGGER -6 -h "[::1]" -p user.info -t $TAG "Sending IPv6 message. (pid $$)"
 fi
 
 # Detection of registered messages.

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

Summary of changes:
 ChangeLog        |    5 +++++
 tests/syslogd.sh |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Nov 29 10:40:41 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVPnV-0005RH-BB
	for mharc-commit-inetutils@gnu.org; Tue, 29 Nov 2011 10:40:41 -0500
Received: from eggs.gnu.org ([140.186.70.92]:38809)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RVPnR-0005Qj-J1
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 10:40:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RVPnL-00021n-Ph
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 10:40:37 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48489)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RVPnL-00021j-Mq
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 10:40:31 -0500
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RVPnK-0007SI-9X
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 15:40:31 +0000
Date: Tue, 29 Nov 2011 15:40:31 +0000
Message-Id: <E1RVPnK-0007SI-9X@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-182-gac6d288
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 399b72eb69f3213ea802debea11ff316e10e44c5
X-Git-Newrev: ac6d2887d46588e58bbd018c968ddee19e9704f3
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 29 Nov 2011 15:40: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  ac6d2887d46588e58bbd018c968ddee19e9704f3 (commit)
      from  399b72eb69f3213ea802debea11ff316e10e44c5 (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=ac6d2887d46588e58bbd018c968ddee19e9704f3


commit ac6d2887d46588e58bbd018c968ddee19e9704f3
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Nov 29 16:40:26 2011 +0100

    Fix ChangeLog entry (silent change).

diff --git a/ChangeLog b/ChangeLog
index a8b333d..d8366ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-11-29  Giuseppe Scrivano  <gscrivano@gnu.org>
 
-	* tests/syslogd.sh: Use 12.0.0.1 and [::1] instead of localhost as
+	* tests/syslogd.sh: Use 127.0.0.1 and [::1] instead of localhost as
 	arguments to logger.
 
 2011-11-29  Mats Erik Andersson <gnu@gisladisker.se>

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

Summary of changes:
 ChangeLog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Nov 29 11:16:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVQM0-0005u1-HU
	for mharc-commit-inetutils@gnu.org; Tue, 29 Nov 2011 11:16:20 -0500
Received: from eggs.gnu.org ([140.186.70.92]:49862)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RVQLq-0005p4-FK
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 11:16:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RVQLo-000173-Cc
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 11:16:10 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47289)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RVQLo-00016m-5f
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 11:16:08 -0500
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RVQLj-0003b8-0s
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 16:16:07 +0000
Date: Tue, 29 Nov 2011 16:16:05 +0000
Message-Id: <E1RVQLj-0003b8-0s@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-185-gbfee55f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ac6d2887d46588e58bbd018c968ddee19e9704f3
X-Git-Newrev: bfee55f68b31152a62d68fef07cec9461fd905a9
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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, 29 Nov 2011 16:16:19 -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  bfee55f68b31152a62d68fef07cec9461fd905a9 (commit)
       via  9e80485a4a209dab94e960ce733f968600285a7f (commit)
       via  d4953310453c7e721e0888df4f1dca6c881649f4 (commit)
      from  ac6d2887d46588e58bbd018c968ddee19e9704f3 (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=bfee55f68b31152a62d68fef07cec9461fd905a9


commit bfee55f68b31152a62d68fef07cec9461fd905a9
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Nov 29 17:13:47 2011 +0100

    Basic test case for `hostname'.

diff --git a/ChangeLog b/ChangeLog
index 5ff5cec..ad2d939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
 
+	Basic test case for `hostname'.
+
+	* tests/Makefile.am (dist_check_SCRIPTS) [ENABLE_hostname]: Added hostname.sh.
+	* tests/hostname.sh: New file.
+
+2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
+
 	* tests/syslogd.sh: Output verbose output if VERBOSE is true.
 
 2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e952218..16b901a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,6 +54,10 @@ endif
 endif
 endif
 
+if ENABLE_hostname
+dist_check_SCRIPTS += hostname.sh
+endif
+
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/hostname.sh b/tests/hostname.sh
new file mode 100755
index 0000000..cddddf5
--- /dev/null
+++ b/tests/hostname.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Copyright (C) 2011 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/'.
+
+hostname=${hostname:-../src/hostname$EXEEXT}
+
+if [ $VERBOSE ]; then
+    set -x
+    $hostname --version
+fi
+
+errno=0
+
+$hostname || errno=$?
+test $errno -eq 0 || echo "Failed to get hostname." >&2
+test $errno -eq 0 || exit $errno
+
+test `$hostname` = `uname -n` || errno=$?
+test $errno -eq 0 || echo "Failed to get hostname." >&2
+test $errno -eq 0 || exit $errno
+
+if [ `id -u` != 0 ]; then
+    echo "hostname: skipping tests to set host name"
+else
+    # Only run this if hostname succeeded...
+    if [ $errno -eq 0 ]; then
+	$hostname `$hostname` || errno=$?
+	test $errno -eq 0 || echo "Failed to set hostname." >&2
+	test $errno -eq 0 || exit $errno
+    fi
+fi
+
+exit $errno

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


commit 9e80485a4a209dab94e960ce733f968600285a7f
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Nov 29 17:10:44 2011 +0100

    tests/syslogd.sh: Output verbose output if VERBOSE is true.

diff --git a/ChangeLog b/ChangeLog
index 29d0ac7..5ff5cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
 
+	* tests/syslogd.sh: Output verbose output if VERBOSE is true.
+
+2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
+
 	Be more robust in checking for IPV6_HOPLIMIT, and
 	IPV6_RECVHOPLIMIT.
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 2a504d7..16daae4 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -110,6 +110,12 @@ TAG="syslogd-test"
 IU_SYSLOGD=./src/syslogd$EXEEXT
 IU_LOGGER=./src/logger$EXEEXT
 
+if [ $VERBOSE ]; then
+    set -x
+    $IU_SYSLOGD --version
+    $IU_LOGGER --version
+fi
+
 # Step out of `tests/', should the invokation
 # have been made there.
 #

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


commit d4953310453c7e721e0888df4f1dca6c881649f4
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Nov 29 16:44:08 2011 +0100

    Be more robust in checking for IPV6_HOPLIMIT, and IPV6_RECVHOPLIMIT.

diff --git a/ChangeLog b/ChangeLog
index d8366ff..29d0ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	Be more robust in checking for IPV6_HOPLIMIT, and
+	IPV6_RECVHOPLIMIT.
+
+	* configure.ac: Rewrite check for IPV6_HOPLIMIT,
+	IPV6_RECVHOPLIMIT, and IPV6_2292HOPLIMIT.  Don't add X prefix to
+	checks related to working_icmp6, have_beyondscope and ipv6.
+
 2011-11-29  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* tests/syslogd.sh: Use 127.0.0.1 and [::1] instead of localhost as
diff --git a/configure.ac b/configure.ac
index 5ebe9fe..b0e1e49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,44 +309,44 @@ AC_ARG_ENABLE([ipv6],
 )
 
 working_ipv6=yes
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   IU_CHECK_MACRO(AF_INET6, [#include <sys/socket.h>], , , working_ipv6=no)
 fi
 
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   IU_CHECK_MACRO(IPV6_V6ONLY, [#include <netinet/in.h>], , , working_ipv6=no)
 fi
 
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   AC_CHECK_TYPE(struct sockaddr_storage, , working_ipv6=no, [#include <sys/socket.h>])
 fi
 
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   AC_CHECK_TYPE(struct sockaddr_in6, , working_ipv6=no, [#include <sys/types.h>
 #include <netinet/in.h>])
 fi
 
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   AC_CHECK_TYPE(struct addrinfo, , working_ipv6=no, [#include <netdb.h>])
 fi
 
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   AC_CHECK_FUNC(getnameinfo, ,working_ipv6=no, [#include <netdb.h>])
 fi
 
-if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
+if test ! "$ipv6" = "no" && test "$working_ipv6" = "yes"; then
   AC_DEFINE([IPV6], 1, [Define to one if you want IPv6.])
 else
-  if test "X$ipv6" = "Xyes"; then
+  if test "$ipv6" = "yes"; then
     AC_MSG_FAILURE([IPv6 support not available])
   else
-    if test "X$ipv6" = "Xauto"; then
+    if test "$ipv6" = "auto"; then
       AC_MSG_WARN([IPv6 support not available, disabling IPv6])
     fi
   fi
 fi
 
-if test "X$ipv6" = "Xno" || test "X$working_ipv6" = "Xno";then
+if test "$ipv6" = "no" || test "$working_ipv6" = "no";then
   ping6_BUILD=''
 else
   working_icmp6=yes
@@ -357,7 +357,7 @@ else
 		   #include <sys/socket.h>
 		   #include <netinet/in.h>])])
 
-  if test "X$working_icmp6" = "Xyes"; then
+  if test "$working_icmp6" = "yes"; then
     AC_CHECK_HEADER(netinet/ip6.h, , working_icmp6=no,
       [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
 		     # include <sys/types.h>
@@ -367,7 +367,7 @@ else
 
   fi
 
-  if test "X$working_icmp6" = "Xyes"; then
+  if test "$working_icmp6" = "yes"; then
     AC_CHECK_TYPE(struct icmp6_filter, , working_icmp6=no,
       [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
 		     # include <sys/types.h>
@@ -377,7 +377,7 @@ else
 		     #include <netinet/icmp6.h>])])
   fi
 
-  if test "X$working_icmp6" = "Xyes"; then
+  if test "$working_icmp6" = "yes"; then
     AC_CHECK_TYPE(struct icmp6_hdr, , working_icmp6=no,
       [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
 		     # include <sys/types.h>
@@ -387,22 +387,47 @@ else
 		     #include <netinet/icmp6.h>])])
   fi
 
-  if test "X$working_icmp6" = "Xyes"; then
+  if test "$working_icmp6" = "yes"; then
+    IU_CHECK_MACRO(IPV6_HOPLIMIT, [#include <netinet/in.h>], ,
+		   [have_hoplimit=yes], [have_hoplimit=no])
+    IU_CHECK_MACRO(IPV6_2292HOPLIMIT, [#include <netinet/in.h>], ,
+		   [have_2292hoplimit=yes], [have_2292hoplimit=no])
     IU_CHECK_MACRO(IPV6_RECVHOPLIMIT, [#include <netinet/in.h>], ,
-		   [have_recvhoplimt=yes], [have_recvhoplimt=no])
-    IU_CHECK_MACRO(IPV6_2292HOPLIMIT, [#include <netinet/in.h>], , [
+		   [have_recvhoplimit=yes], [have_recvhoplimit=no])
+
+    # Reset, ping6 can't compile without HOPLIMIT/RECVHOPLIMIT (or
+    # similar).
+    working_icmp6=no
+
+    if test $have_recvhoplimit = yes && test $have_hoplimit = yes; then
+      # ping6 uses HOPLIMIT and RECVLIMIT, if those exist, happy happy
+      # joy joy.
+      working_icmp6=yes
+    fi
+
+    if test $have_2292hoplimit = yes && test $have_hoplimit = no; then
+      # Some systems (BSDs) define these macros prefixed with "2292",
+      # violating RFC 2292; work around it.
       AC_DEFINE([IPV6_HOPLIMIT], IPV6_2292HOPLIMIT,
+                [Define to IPV6_2292HOPLIMIT if not available])
+      have_hoplimit=yes
+      working_icmp6=yes
+    fi
+
+    if test $have_recvhoplimit = no && test $have_hoplimit = yes; then
+      # There exist strange systems (FIXME: which ones?) where
+      # RECVHOPLIMIT might not be defined, but HOPLIMIT is.  So define
+      # that.
+      AC_DEFINE([IPV6_RECVHOPLIMIT], IPV6_HOPLIMIT,
                 [Define to IPV6_HOPLIMIT if not available])
-    ], [working_icmp6=no])
-    if test "X$have_recvhoplimt" = "Xno"; then
-      IU_CHECK_MACRO(IPV6_HOPLIMIT, [#include <netinet/in.h>], , [
-        AC_DEFINE([IPV6_RECVHOPLIMIT], IPV6_HOPLIMIT,
-                  [Define to IPV6_HOPLIMIT if not available])
-      ], [working_icmp6=no])
+      working_icmp6=yes
     fi
+
+    # If we got this far then we are SOL, and the reset above takes
+    # care of the rest.
   fi
 
-  if test "X$working_icmp6" = "Xyes"; then
+  if test "$working_icmp6" = "yes"; then
     IU_CHECK_MACRO(ICMP6_DST_UNREACH_BEYONDSCOPE,
                    [#ifdef HAVE_SYS_TYPES_H
 		    # include <sys/types.h>
@@ -411,7 +436,7 @@ else
 		    #include <netinet/in.h>
 		    #include <netinet/icmp6.h>], ,
 		   [have_beyondscope=yes], [have_beyondscope=no])
-    if test "X$have_beyondscope" = "Xno"; then
+    if test "$have_beyondscope" = "no"; then
       IU_CHECK_MACRO(ICMP6_DST_UNREACH_NOTNEIGHBOR, [#include <netinet/icmp6.h>], , [
         AC_DEFINE([ICMP6_DST_UNREACH_BEYONDSCOPE], ICMP6_DST_UNREACH_NOTNEIGHBOR,
                   [Define to ICMP6_DST_UNREACH_NOTNEIGHBOR if not available])
@@ -419,7 +444,7 @@ else
     fi
   fi
 
-  if test "X$working_icmp6" = "Xno"; then
+  if test "$working_icmp6" = "no"; then
     AC_MSG_WARN([ICMPv6 support not available, disabling ping6])
     ping6_BUILD=''
   fi

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

Summary of changes:
 ChangeLog                                |   20 ++++++++
 configure.ac                             |   75 ++++++++++++++++++++----------
 tests/Makefile.am                        |    4 ++
 tests/{ping-localhost.sh => hostname.sh} |   40 ++++++++--------
 tests/syslogd.sh                         |    6 ++
 5 files changed, 100 insertions(+), 45 deletions(-)
 copy tests/{ping-localhost.sh => hostname.sh} (56%)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Nov 29 22:13:52 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RVacK-0005Bo-2D
	for mharc-commit-inetutils@gnu.org; Tue, 29 Nov 2011 22:13:52 -0500
Received: from eggs.gnu.org ([140.186.70.92]:40548)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RVacH-0005BC-Lx
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 22:13:50 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RVacF-0003Oy-4T
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 22:13:49 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54964)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RVacE-0003Ot-Uv
	for commit-inetutils@gnu.org; Tue, 29 Nov 2011 22:13:47 -0500
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RVacB-0008BW-Rr
	for commit-inetutils@gnu.org; Wed, 30 Nov 2011 03:13:46 +0000
Date: Wed, 30 Nov 2011 03:13:45 +0000
Message-Id: <E1RVacB-0008BW-Rr@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-186-gd53944d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bfee55f68b31152a62d68fef07cec9461fd905a9
X-Git-Newrev: d53944dca6544de38238e950f382de621fdc407e
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Nov 2011 03:13:50 -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  d53944dca6544de38238e950f382de621fdc407e (commit)
      from  bfee55f68b31152a62d68fef07cec9461fd905a9 (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=d53944dca6544de38238e950f382de621fdc407e


commit d53944dca6544de38238e950f382de621fdc407e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Nov 30 04:09:13 2011 +0100

    Portability fix for <syslog.h> in recent OpenBSD.

diff --git a/ChangeLog b/ChangeLog
index ad2d939..74d415c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-30  Mats Erik Andersson <gnu@gisladisker.se>
+
+	OpenBSD 4.9 has changed <syslog.h>.  Relax configuration.
+
+	* configure.ac (syslog internal macros): Remove check of LOG_MAKEPRI.
+	* src/syslogd.c (LOG_MAKEPRI) [!LOG_MAKEPRI]: New macro.
+
 2011-11-29  Alfred M. Szmidt  <ams@gnu.org>
 
 	Basic test case for `hostname'.
diff --git a/configure.ac b/configure.ac
index b0e1e49..e4af8a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,7 +690,7 @@ define([iu_syslog_includes],
     #include <syslog.h> ]])
 IU_CHECK_MACRO(syslog internal macros,
   iu_syslog_includes,
-  [LOG_MAKEPRI LOG_PRI LOG_FAC],
+  [LOG_PRI LOG_FAC],
   AC_CHECK_TYPE(CODE,
     AC_CHECK_DECL(prioritynames,
       AC_DEFINE([HAVE_SYSLOG_INTERNAL], 1, [FIXME]),,
diff --git a/src/syslogd.c b/src/syslogd.c
index 1e943ab..1a660f5 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -116,6 +116,10 @@
 # include "logprio.h"
 #endif
 
+#ifndef LOG_MAKEPRI
+#  define LOG_MAKEPRI(fac, p)	(((fac) << 3) | (p))
+#endif
+
 #include <error.h>
 #include <progname.h>
 #include <libinetutils.h>

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

Summary of changes:
 ChangeLog     |    7 +++++++
 configure.ac  |    2 +-
 src/syslogd.c |    4 ++++
 3 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


