[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-187-g66e35f3

[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  66e35f34292651c34e5347a1707772df73c2eef3 (commit)
      from  d53944dca6544de38238e950f382de621fdc407e (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=66e35f34292651c34e5347a1707772df73c2eef3


commit 66e35f34292651c34e5347a1707772df73c2eef3
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Dec 1 11:23:50 2011 +0100

    Incomplete header inclusion. Fixes in syslogd test.

diff --git a/ChangeLog b/ChangeLog
index 74d415c..f48cbed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-01  Mats Erik Andersson <address@hidden>
+
+       * ifconfig/ifconfig.c: Include <netinet/in.h>.
+       * ifconfig/printif.h: Likewise.
+       * ping/libping.c: Likewise.
+       * src/hostname.c: Include <arpa/inet.h> after <netinet/in.h>.
+       * tests/syslogd.sh: Extra long socket name only for known cases.
+       Delay verbose version printing.  Clean up when port was busy.
+
 2011-11-30  Mats Erik Andersson <address@hidden>
 
        OpenBSD 4.9 has changed <syslog.h>.  Relax configuration.
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index b180b17..18375f8 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -42,6 +42,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <progname.h>
 #include "ifconfig.h"
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index bf5852e..5b518fa 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -22,6 +22,7 @@
 #ifndef IFCONFIG_PRINTIF_H
 # define IFCONFIG_PRINTIF_H
 
+# include <netinet/in.h>
 # include <net/if.h>
 # include <arpa/inet.h>
 # include "ifconfig.h"
diff --git a/ping/libping.c b/ping/libping.c
index 4302584..99b5cd5 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -23,6 +23,7 @@
 #include <sys/file.h>
 #include <sys/time.h>
 
+#include <netinet/in.h>
 /*#include <netinet/ip_icmp.h> -- deliberately not including this */
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/src/hostname.c b/src/hostname.c
index 3974737..3e62df5 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <progname.h>
 #include "libinetutils.h"
 #include "xalloc.h"
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 16daae4..1546ea7 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -87,7 +87,8 @@ IU_GOOD_BASE=/tmp/$(date +%y-%m-%d)_socket_iu
 IU_BAD_BASE=/tmp/X$(date +%y-%m-%d)_socket_iu
 
 IU_OS=$(uname -s)
-if [ "${IU_OS}" != "OpenBSD" -a "${IU_OS}" != "FreeBSD" ]; then
+if [ "${IU_OS}" = "Linux" -o "${IU_OS}" = "GNU/kFreeBSD" \
+     -o "${IU_OS}" = "SunOS" ]; then
        # Aim at the boundary of 108 characters.
        IU_GOOD_BASE=${IU_GOOD_BASE}_lnx
        IU_BAD_BASE=${IU_BAD_BASE}_lnx
@@ -110,17 +111,17 @@ TAG="syslogd-test"
 IU_SYSLOGD=./src/syslogd$EXEEXT
 IU_LOGGER=./src/logger$EXEEXT
 
+# Step out of `tests/', should the invokation
+# have been made there.
+#
+[ -d ../src ] && cd ..
+
 if [ $VERBOSE ]; then
     set -x
     $IU_SYSLOGD --version
     $IU_LOGGER --version
 fi
 
-# Step out of `tests/', should the invokation
-# have been made there.
-#
-[ -d ../src ] && cd ..
-
 if [ ! -x $IU_SYSLOGD ]; then
        echo "Missing executable 'syslogd'. Failing."
        clean_testdir
@@ -150,6 +151,7 @@ else
        if [ $? -eq 0 ]; then
                echo "The INET port $PORT/$PROTO is already in use."
                echo "No reliable test is possible."
+               clean_testdir
                exit 77
        fi
 fi

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

Summary of changes:
 ChangeLog           |    9 +++++++++
 ifconfig/ifconfig.c |    1 +
 ifconfig/printif.h  |    1 +
 ping/libping.c      |    1 +
 src/hostname.c      |    2 +-
 tests/syslogd.sh    |   14 ++++++++------
 6 files changed, 21 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils