[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-339-g5b5ba41

[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  5b5ba41fae8baa3cae3d20bab6b8ef8e79f10aaa (commit)
      from  a3a5ee825f903d127c06d073af683b454165fc42 (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=5b5ba41fae8baa3cae3d20bab6b8ef8e79f10aaa


commit 5b5ba41fae8baa3cae3d20bab6b8ef8e79f10aaa
Author: Mats Erik Andersson <address@hidden>
Date:   Sun Sep 8 01:21:14 2013 +0200

    ifconfig: Legacy use with GNU/kFreeBSD.

diff --git a/ChangeLog b/ChangeLog
index d1d572c..32217f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-09-08  Mats Erik Andersson  <address@hidden>
+
+       ifconfig: Legacy use with GNU/kFreeBSD.
+
+       * configure.ac: Check for header <netinet/ether.h>.
+
+       * ifconfig/system.c [__DragonFly || __FreeBSD__ ||
+       __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__]:
+       Add __FreeBSD_kernel__ to conditional.
+       * ifconfig/system.h [__DragonFly || __FreeBSD__ ||
+       __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__]:
+       Likewise.
+       * ifconfig/system/bsd.c [HAVE_NETINET_ETHER_H]:
+       Include <netinet/ether.h>.
+       * ifconfig/system/bsd.h (IU_BSD_TYPE)
+       [__FreeBSD_kernel__]: Assign value to macro.
+
+       * tests/ifconfig.sh: Add an informational check
+       whether the legacy form `ifconfig lo0' works.
+
 2013-09-07  Mats Erik Andersson  <address@hidden>
 
        ftp: Remove line length limit.
diff --git a/configure.ac b/configure.ac
index 556bc0d..201b80a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,8 +586,8 @@ AC_HEADER_TIME
 AC_HEADER_DIRENT
 
 AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \
-                 glob.h memory.h netinet/in_systm.h netinet/ip.h \
-                 netinet/ip_icmp.h netinet/ip_var.h \
+                 glob.h memory.h netinet/ether.h netinet/in_systm.h \
+                 netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
                  security/pam_appl.h shadow.h \
                  stdarg.h stdlib.h string.h stropts.h sys/tty.h \
                  sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
diff --git a/ifconfig/system.c b/ifconfig/system.c
index 7c00597..90030c7 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -26,6 +26,7 @@
 #elif defined __QNX__
 # include "system/qnx.c"
 # elif defined __DragonFly__ || defined __FreeBSD__ || \
+       defined __FreeBSD_kernel__ || \
        defined __NetBSD__ || defined __OpenBSD__
 #  include "system/bsd.c"
 #else
diff --git a/ifconfig/system.h b/ifconfig/system.h
index 7bc297d..f97618b 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -94,6 +94,7 @@ extern struct if_nameindex* (*system_if_nameindex) (void);
 # elif defined __QNX__
 #  include "system/qnx.h"
 # elif defined __DragonFly__ || defined __FreeBSD__ || \
+       defined __FreeBSD_kernel__ || \
        defined __NetBSD__ || defined __OpenBSD__
 #  include "system/bsd.h"
 # else
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index a42da42..601be88 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -26,6 +26,9 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
+#ifdef HAVE_NETINET_ETHER_H
+# include <netinet/ether.h>
+#endif
 #include <netinet/if_ether.h>
 #include <ifaddrs.h>
 
diff --git a/ifconfig/system/bsd.h b/ifconfig/system/bsd.h
index 5b1b866..8143c34 100644
--- a/ifconfig/system/bsd.h
+++ b/ifconfig/system/bsd.h
@@ -28,6 +28,8 @@
 #  define IU_BSD_TYPE "dragonfly"
 # elif defined __FreeBSD__
 #  define IU_BSD_TYPE "freebsd"
+# elif defined __FreeBSD_kernel__
+#  define IU_BSD_TYPE "GNU/kFreeBSD"
 # elif defined __NetBSD__
 #  define IU_BSD_TYPE "netbsd"
 # elif defined __OpenBSD__
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 6d438df..6561647 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -97,6 +97,18 @@ for fmt in ${FORMAT:-gnu gnu-one-entry net-tools osf unix}; 
do
     find_lo_addr $fmt || { errno=1; echo >&2 "Failed with format '$fmt'."; }
 done
 
+# Informational check whether the legacy form use
+# is implemented.  No error produced, only message.
+
+if $IFCONFIG $LO >/dev/null 2>&1; then
+    :
+else
+    cat <<-EOT
+       Hint: This system does not yet support the legacy use
+             which does without switches:  ifconfig $LO
+EOT
+fi
+
 test $errno -ne 0 || $silence echo "Successful testing".
 
 exit $errno

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

Summary of changes:
 ChangeLog             |   20 ++++++++++++++++++++
 configure.ac          |    4 ++--
 ifconfig/system.c     |    1 +
 ifconfig/system.h     |    1 +
 ifconfig/system/bsd.c |    3 +++
 ifconfig/system/bsd.h |    2 ++
 tests/ifconfig.sh     |   12 ++++++++++++
 7 files changed, 41 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils