[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-51-g236256e

[Mats Erik Andersson]

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  236256e897e51ea4993d2e70f77f23a085ac115e (commit)
      from  31714fe8bfeb19bf53502e8a9f503aeba67ad281 (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=236256e897e51ea4993d2e70f77f23a085ac115e


commit 236256e897e51ea4993d2e70f77f23a085ac115e
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Mar 14 19:27:52 2015 +0100

    Complaints during IPv6-less testing.

diff --git a/ChangeLog b/ChangeLog
index 0310ba6..f4f3ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-03-14  Mats Erik Andersson  <address@hidden>
 
+       Complaints during IPv6-less testing.
+       Unused IPv6 directives cause logged complaints by inetd.
+
+       * tests/ftp-localhost.sh: Add a tcp6 listener to `inetd.conf'
+       only if TEST_IPV6 is not `no'.
+       * tests/tftp.sh: Likewise with udp6.
+
+2015-03-14  Mats Erik Andersson  <address@hidden>
+
        Build failures while IPv6 is disabled.
 
        * configure.ac (ENABLE_hstrerror): New conditional variable.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 32ff34f..f589549 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -250,6 +250,10 @@ fi
 
 cat <<EOT > "$TMPDIR/inetd.conf"
 $PORT stream tcp4 nowait $USER $PWD/$FTPD ftpd -A -l
+EOT
+
+test "$TEST_IPV6" = "no" ||
+    cat <<EOT >> "$TMPDIR/inetd.conf"
 $PORT stream tcp6 nowait $USER $PWD/$FTPD ftpd -A -l
 EOT
 
diff --git a/tests/tftp.sh b/tests/tftp.sh
index fac2e44..34adf4c 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -209,6 +209,10 @@ fi
 write_conf () {
     cat > "$INETD_CONF" <<-EOF
        $PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
+       EOF
+
+    test "$TEST_IPV6" = "no" ||
+       cat >> "$INETD_CONF" <<-EOF
        $PORT dgram ${PROTO}6 wait $USER $TFTPD   tftpd -l $TMPDIR/tftp-test
        EOF
 }
@@ -420,6 +424,10 @@ if $do_secure_setting; then
 
     cat > "$INETD_CONF" <<-EOF
        $PORT dgram ${PROTO}4 wait $USER $TFTPD   tftpd -l -s $TMPDIR /tftp-test
+       EOF
+
+    test "$TEST_IPV6" = "no" ||
+       cat >> "$INETD_CONF" <<-EOF
        $PORT dgram ${PROTO}6 wait $USER $TFTPD   tftpd -l -s $TMPDIR /tftp-test
        EOF
 

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

Summary of changes:
 ChangeLog              |    9 +++++++++
 tests/ftp-localhost.sh |    4 ++++
 tests/tftp.sh          |    8 ++++++++
 3 files changed, 21 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils