Fix FTBFS on GNU/Hurd and GNU/kFreeBSD systems

- Use IFF_ flags conditionally.
- Do not include <stropts.h> to get ioctl declaration as we get it from
  the wrapped <sys/ioctl.h>, otherwise we get conflicting symbols.
- Include <sys/types.h> in ifconfig/flags.h for size_t.

Closes: #596638

3 files changed, 89 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8b3f9b8..ed34d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+inetutils (2:1.8-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on GNU/Hurd and GNU/kFreeBSD systems. (Closes: #596638)
+    - Use IFF_ flags conditionally.
+    - Do not include <stropts.h> to get ioctl declaration as we get it from
+      the wrapped <sys/ioctl.h>, otherwise we get conflicting symbols.
+    - Include <sys/types.h> in ifconfig/flags.h for size_t.
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 22 Sep 2010 06:40:25 +0200
+
 inetutils (2:1.8-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/70_ftbfs_non-linux.patch b/debian/patches/70_ftbfs_non-linux.patch
new file mode 100644
index 0000000..75089e7
--- /dev/null
+++ b/debian/patches/70_ftbfs_non-linux.patch
@@ -0,0 +1,78 @@
+---
+ ifconfig/flags.h  |    2 ++
+ telnetd/telnetd.h |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/telnetd/telnetd.h
++++ b/telnetd/telnetd.h
+@@ -45,7 +45,7 @@
+ #ifdef HAVE_SYS_PTYVAR_H
+ # include <sys/ptyvar.h>
+ #endif
+-#ifdef HAVE_STROPTS_H
++#if 0
+ # include <stropts.h>
+ #endif
+ #include <sys/ioctl.h>
+--- a/ifconfig/flags.h
++++ b/ifconfig/flags.h
+@@ -22,6 +22,8 @@
+ #ifndef IFCONFIG_FLAGS_H
+ # define IFCONFIG_FLAGS_H
+ 
++# include <sys/types.h>
++
+ /* Using these avoid strings with if_flagtoname, the caller can set a
+    preference on returned flag names.  If one of the names in the list
+    is found for the flag, the search continues to attempt a better
+--- a/ifconfig/flags.c
++++ b/ifconfig/flags.c
+@@ -391,22 +391,48 @@ struct if_flag_char
+    That's the way netstat does it.
+ */
+ static struct if_flag_char flag_char_tab[] = {
++#ifdef IFF_ALLMULTI
+   { IFF_ALLMULTI,    'A' },
++#endif
++#ifdef IFF_BROADCAST
+   { IFF_BROADCAST,   'B' },
++#endif
++#ifdef IFF_DEBUG
+   { IFF_DEBUG,       'D' },
++#endif
++#ifdef IFF_LOOPBACK
+   { IFF_LOOPBACK,    'L' },
++#endif
++#ifdef IFF_MULTICAST
+   { IFF_MULTICAST,   'M' },
++#endif
+ #ifdef HAVE_DYNAMIC
+   { IFF_DYNAMIC,     'd' },
+ #endif
++#ifdef IFF_PROMISC
+   { IFF_PROMISC,     'P' },
++#endif
++#ifdef IFF_NOTRAILERS
+   { IFF_NOTRAILERS,  'N' },
++#endif
++#ifdef IFF_NOARP
+   { IFF_NOARP,       'O' },
++#endif
++#ifdef IFF_POINTOPOINT
+   { IFF_POINTOPOINT, 'P' },
++#endif
++#ifdef IFF_SLAVE
+   { IFF_SLAVE,       's' },
++#endif
++#ifdef IFF_MASTER
+   { IFF_MASTER,      'm' },
++#endif
++#ifdef IFF_RUNNING
+   { IFF_RUNNING,     'R' },
++#endif
++#ifdef IFF_UP
+   { IFF_UP,          'U' },
++#endif
+   { 0 }
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d1bd1a8..1e66f36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 60_inetd_support_argless_services.patch
 61_inetd_listen_on_tcpmux_ports.patch
 62_inetd_change_ipv6_protocol_semantics.patch
+70_ftbfs_non-linux.patch