Refresh and rmeove patches for 1.6

15 files changed, 100 insertions, 1062 deletions

diff --git a/debian/changelog b/debian/changelog
index cf78f83..668a8c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,19 @@ inetutils (2:1.6-1) UNRELEASED; urgency=low
     - debian/patches/00_build_dfsg.patch: Remove.
     - debian/tarball.sh: No need to strip documentation anymore.
     - Update debian/copyright file.
+    - debian/patches/02_missing_config.rpath.patch: Remove, fixed upstream.
+    - debian/patches/03_ifreq_typo.patch: Likewise.
+    - debian/patches/04_shishi_telnet.patch: Likewise.
+    - debian/patches/05_shishi_delayed_init.patch: Likewise.
+    - debian/patches/40_ftpd_LOGCMD_NULL.patch: Likewise.
+    - debian/patches/41_gethostbyname_segfault.patch: Likewise.
+    - debian/patches/42_syslogd_leaks.patch: Likewise.
+    - debian/patches/43_ret_converted_to_int.patch: Likewise.
+    - debian/patches/50_split_load_conffile.patch: Refresh.
+    - debian/patches/51_add_load_confdir_support.patch: Likewise.
+    - debian/patches/52_sigalarm.patch: Likewise.
+    - debian/patches/99_inetd_max_conn.patch: Refresh, and rename to ...
+    - debian/patches/53_man_inetd_max_conn.patch: ... this.
   * Switch to debhelper compatibility level 7.
   * Use dh_prep instead of “dh_clean -k”.
   * Remove RCS keywords from packaging files.
diff --git a/debian/patches/02_missing_config.rpath.patch b/debian/patches/02_missing_config.rpath.patch
deleted file mode 100644
index 73169d0..0000000
--- a/debian/patches/02_missing_config.rpath.patch
+++ /dev/null
@@ -1,619 +0,0 @@
-Index: b/build-aux/config.rpath
-===================================================================
---- /dev/null
-+++ b/build-aux/config.rpath
-@@ -0,0 +1,614 @@
-+#! /bin/sh
-+# Output a system dependent set of variables, describing how to set the
-+# run time search path of shared libraries in an executable.
-+#
-+#   Copyright 1996-2006 Free Software Foundation, Inc.
-+#   Taken from GNU libtool, 2001
-+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+#   This file is free software; the Free Software Foundation gives
-+#   unlimited permission to copy and/or distribute it, with or without
-+#   modifications, as long as this notice is preserved.
-+#
-+# The first argument passed to this file is the canonical host specification,
-+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or
-+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-+# should be set by the caller.
-+#
-+# The set of defined variables is at the end of this script.
-+
-+# Known limitations:
-+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-+#   than 256 bytes, otherwise the compiler driver will dump core. The only
-+#   known workaround is to choose shorter directory names for the build
-+#   directory and/or the installation directory.
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+shrext=.so
-+
-+host="$1"
-+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+# Code taken from libtool.m4's _LT_CC_BASENAME.
-+
-+for cc_temp in $CC""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-+
-+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
-+
-+wl=
-+if test "$GCC" = yes; then
-+  wl='-Wl,'
-+else
-+  case "$host_os" in
-+    aix*)
-+      wl='-Wl,'
-+      ;;
-+    darwin*)
-+      case $cc_basename in
-+        xlc*)
-+          wl='-Wl,'
-+          ;;
-+      esac
-+      ;;
-+    mingw* | pw32* | os2*)
-+      ;;
-+    hpux9* | hpux10* | hpux11*)
-+      wl='-Wl,'
-+      ;;
-+    irix5* | irix6* | nonstopux*)
-+      wl='-Wl,'
-+      ;;
-+    newsos6)
-+      ;;
-+    linux*)
-+      case $cc_basename in
-+        icc* | ecc*)
-+          wl='-Wl,'
-+          ;;
-+        pgcc | pgf77 | pgf90)
-+          wl='-Wl,'
-+          ;;
-+        ccc*)
-+          wl='-Wl,'
-+          ;;
-+        como)
-+          wl='-lopt='
-+          ;;
-+        *)
-+          case `$CC -V 2>&1 | sed 5q` in
-+            *Sun\ C*)
-+              wl='-Wl,'
-+              ;;
-+          esac
-+          ;;
-+      esac
-+      ;;
-+    osf3* | osf4* | osf5*)
-+      wl='-Wl,'
-+      ;;
-+    sco3.2v5*)
-+      ;;
-+    solaris*)
-+      wl='-Wl,'
-+      ;;
-+    sunos4*)
-+      wl='-Qoption ld '
-+      ;;
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      wl='-Wl,'
-+      ;;
-+    sysv4*MP*)
-+      ;;
-+    unicos*)
-+      wl='-Wl,'
-+      ;;
-+    uts4*)
-+      ;;
-+  esac
-+fi
-+
-+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
-+
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+
-+case "$host_os" in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # Set some defaults for GNU ld with shared library support. These
-+  # are reset later if shared libraries are not supported. Putting them
-+  # here allows them to be overridden if necessary.
-+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
-+  # option of GNU ld is called -rpath, not --rpath.
-+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+  case "$host_os" in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    amigaos*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we cannot use
-+      # them.
-+      ld_shlibs=no
-+      ;;
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    cygwin* | mingw* | pw32*)
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    interix3*)
-+      hardcode_direct=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      ;;
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    netbsd*)
-+      ;;
-+    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+        ld_shlibs=no
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+          ld_shlibs=no
-+          ;;
-+        *)
-+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+          else
-+            ld_shlibs=no
-+          fi
-+          ;;
-+      esac
-+      ;;
-+    sunos4*)
-+      hardcode_direct=yes
-+      ;;
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+  esac
-+  if test "$ld_shlibs" = no; then
-+    hardcode_libdir_flag_spec=
-+  fi
-+else
-+  case "$host_os" in
-+    aix3*)
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes; then
-+        # Neither direct hardcoding nor static linking is supported with a
-+        # broken collect2.
-+        hardcode_direct=unsupported
-+      fi
-+      ;;
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+        # On IA64, the linker does run time linking by default, so we don't
-+        # have to do anything special.
-+        aix_use_runtimelinking=no
-+      else
-+        aix_use_runtimelinking=no
-+        # Test if we are trying to use run time linking or normal
-+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+        # need to do runtime linking.
-+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+          for ld_flag in $LDFLAGS; do
-+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+              aix_use_runtimelinking=yes
-+              break
-+            fi
-+          done
-+          ;;
-+        esac
-+      fi
-+      hardcode_direct=yes
-+      hardcode_libdir_separator=':'
-+      if test "$GCC" = yes; then
-+        case $host_os in aix4.[012]|aix4.[012].*)
-+          collect2name=`${CC} -print-prog-name=collect2`
-+          if test -f "$collect2name" && \
-+            strings "$collect2name" | grep resolve_lib_name >/dev/null
-+          then
-+            # We have reworked collect2
-+            hardcode_direct=yes
-+          else
-+            # We have old collect2
-+            hardcode_direct=unsupported
-+            hardcode_minus_L=yes
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_libdir_separator=
-+          fi
-+          ;;
-+        esac
-+      fi
-+      # Begin _LT_AC_SYS_LIBPATH_AIX.
-+      echo 'int main () { return 0; }' > conftest.c
-+      ${CC} ${LDFLAGS} conftest.c -o conftest
-+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+      if test -z "$aix_libpath"; then
-+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+      fi
-+      if test -z "$aix_libpath"; then
-+        aix_libpath="/usr/lib:/lib"
-+      fi
-+      rm -f conftest.c conftest
-+      # End _LT_AC_SYS_LIBPATH_AIX.
-+      if test "$aix_use_runtimelinking" = yes; then
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+      else
-+        if test "$host_cpu" = ia64; then
-+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+        else
-+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        fi
-+      fi
-+      ;;
-+    amigaos*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # see comment about different semantics on the GNU ld section
-+      ld_shlibs=no
-+      ;;
-+    bsdi[45]*)
-+      ;;
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec=' '
-+      libext=lib
-+      ;;
-+    darwin* | rhapsody*)
-+      hardcode_direct=no
-+      if test "$GCC" = yes ; then
-+        :
-+      else
-+        case $cc_basename in
-+          xlc*)
-+            ;;
-+          *)
-+            ld_shlibs=no
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    dgux*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      ;;
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
-+    freebsd2.2*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    freebsd2*)
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      ;;
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    hpux9*)
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      ;;
-+    hpux10*)
-+      if test "$with_gnu_ld" = no; then
-+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator=:
-+        hardcode_direct=yes
-+        # hardcode_minus_L: Not really in the search PATH,
-+        # but as the default location of the library.
-+        hardcode_minus_L=yes
-+      fi
-+      ;;
-+    hpux11*)
-+      if test "$with_gnu_ld" = no; then
-+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator=:
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            hardcode_direct=no
-+            ;;
-+          *)
-+            hardcode_direct=yes
-+            # hardcode_minus_L: Not really in the search PATH,
-+            # but as the default location of the library.
-+            hardcode_minus_L=yes
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    irix5* | irix6* | nonstopux*)
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    netbsd*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    newsos6)
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    openbsd*)
-+      hardcode_direct=yes
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      else
-+        case "$host_os" in
-+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+            hardcode_libdir_flag_spec='-R$libdir'
-+            ;;
-+          *)
-+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      ;;
-+    osf3*)
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    osf4* | osf5*)
-+      if test "$GCC" = yes; then
-+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+        # Both cc and cxx compiler support -rpath directly
-+        hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      hardcode_libdir_separator=:
-+      ;;
-+    solaris*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+    sunos4*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      ;;
-+    sysv4)
-+      case $host_vendor in
-+        sni)
-+          hardcode_direct=yes # is this really true???
-+          ;;
-+        siemens)
-+          hardcode_direct=no
-+          ;;
-+        motorola)
-+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+          ;;
-+      esac
-+      ;;
-+    sysv4.3*)
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+        ld_shlibs=yes
-+      fi
-+      ;;
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+      ;;
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator=':'
-+      ;;
-+    uts4*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      ;;
-+    *)
-+      ld_shlibs=no
-+      ;;
-+  esac
-+fi
-+
-+# Check dynamic linker characteristics
-+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
-+libname_spec='lib$name'
-+case "$host_os" in
-+  aix3*)
-+    ;;
-+  aix4* | aix5*)
-+    ;;
-+  amigaos*)
-+    ;;
-+  beos*)
-+    ;;
-+  bsdi[45]*)
-+    ;;
-+  cygwin* | mingw* | pw32*)
-+    shrext=.dll
-+    ;;
-+  darwin* | rhapsody*)
-+    shrext=.dylib
-+    ;;
-+  dgux*)
-+    ;;
-+  freebsd1*)
-+    ;;
-+  kfreebsd*-gnu)
-+    ;;
-+  freebsd* | dragonfly*)
-+    ;;
-+  gnu*)
-+    ;;
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_cpu in
-+      ia64*)
-+        shrext=.so
-+        ;;
-+      hppa*64*)
-+        shrext=.sl
-+        ;;
-+      *)
-+        shrext=.sl
-+        ;;
-+    esac
-+    ;;
-+  interix3*)
-+    ;;
-+  irix5* | irix6* | nonstopux*)
-+    case "$host_os" in
-+      irix5* | nonstopux*)
-+        libsuff= shlibsuff=
-+        ;;
-+      *)
-+        case $LD in
-+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-+          *) libsuff= shlibsuff= ;;
-+        esac
-+        ;;
-+    esac
-+    ;;
-+  linux*oldld* | linux*aout* | linux*coff*)
-+    ;;
-+  linux*)
-+    ;;
-+  knetbsd*-gnu)
-+    ;;
-+  netbsd*)
-+    ;;
-+  newsos6)
-+    ;;
-+  nto-qnx*)
-+    ;;
-+  openbsd*)
-+    ;;
-+  os2*)
-+    libname_spec='$name'
-+    shrext=.dll
-+    ;;
-+  osf3* | osf4* | osf5*)
-+    ;;
-+  solaris*)
-+    ;;
-+  sunos4*)
-+    ;;
-+  sysv4 | sysv4.3*)
-+    ;;
-+  sysv4*MP*)
-+    ;;
-+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+    ;;
-+  uts4*)
-+    ;;
-+esac
-+
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+
-+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-+
-+# How to pass a linker flag through the compiler.
-+wl="$escaped_wl"
-+
-+# Static library suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally "so").
-+shlibext="$shlibext"
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator="$hardcode_libdir_separator"
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct="$hardcode_direct"
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L="$hardcode_minus_L"
-+
-+EOF
diff --git a/debian/patches/03_ifreq_typo.patch b/debian/patches/03_ifreq_typo.patch
deleted file mode 100644
index f769a98..0000000
--- a/debian/patches/03_ifreq_typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -531,7 +531,7 @@ if test "$ac_cv_header_utmpx_h" = yes; t
-   IU_CHECK_MEMBERS([struct utmpx.ut_tv], , , [#include <utmpx.h>])
- fi
- 
--IU_CHECK_MEMBERS([stuct ifreq.ifr_index,
-+IU_CHECK_MEMBERS([struct ifreq.ifr_index,
-                   struct ifreq.ifr_netmask,
-                   struct ifreq.ifr_broadaddr], , ,
-                  [#include <sys/types.h>
diff --git a/debian/patches/04_shishi_telnet.patch b/debian/patches/04_shishi_telnet.patch
deleted file mode 100644
index c8ce123..0000000
--- a/debian/patches/04_shishi_telnet.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-2007-03-13  Simon Josefsson  <simon@josefsson.org>
-
-        * libtelnet/shishi.c (krb5shishi_send): Don't set a
-        use-session-key ap-options, that is for user2user authentication
-        which is not appropriate here.
-
-Index: b/libtelnet/shishi.c
-===================================================================
---- a/libtelnet/shishi.c
-+++ b/libtelnet/shishi.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003 Simon Josefsson
-+/* Copyright (C) 2002, 2003, 2007 Simon Josefsson
-    Copyright (C) 2003 Free Software Foundation, Inc.
- 
- This file is part of Shishi / GNU Inetutils.
-@@ -169,10 +169,6 @@ krb5shishi_send (TN_Authenticator * ap)
-   else
-     ap_opts = 0;
- 
--#ifdef ENCRYPTION
--  ap_opts |= SHISHI_APOPTIONS_USE_SESSION_KEY;
--#endif	/* ENCRYPTION */
--
-   type_check[0] = ap->type;
-   type_check[1] = ap->way;
- 
diff --git a/debian/patches/05_shishi_delayed_init.patch b/debian/patches/05_shishi_delayed_init.patch
deleted file mode 100644
index 3549c07..0000000
--- a/debian/patches/05_shishi_delayed_init.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: b/libtelnet/shishi.c
-===================================================================
---- a/libtelnet/shishi.c
-+++ b/libtelnet/shishi.c
-@@ -1,5 +1,4 @@
--/* Copyright (C) 2002, 2003, 2007 Simon Josefsson
--   Copyright (C) 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
- 
- This file is part of Shishi / GNU Inetutils.
- 
-@@ -59,7 +58,7 @@ static unsigned char str_data[2048] = { 
- #define KRB_ACCEPT           2	/* Accepted */
- #define KRB_RESPONSE         3	/* Response for mutual auth. */
- 
--Shishi *shishi_handle = 0;
-+Shishi *shishi_handle = NULL;
- Shishi_ap *auth_handle;
- 
- #define DEBUG(c) if (auth_debug_mode) printf c
-@@ -105,14 +104,29 @@ int
- krb5shishi_init (TN_Authenticator * ap, int server)
- {
-   if (server)
-+    str_data[3] = TELQUAL_REPLY;
-+  else
-+    str_data[3] = TELQUAL_IS;
-+
-+  if (!shishi_check_version (SHISHI_VERSION))
-+    return 0;
-+
-+  return 1;
-+}
-+
-+static int
-+delayed_shishi_init (void)
-+{
-+  if (shishi_handle)
-+    return 1;
-+
-+  if (str_data[3] == TELQUAL_REPLY)
-     {
--      str_data[3] = TELQUAL_REPLY;
-       if (!shishi_handle && shishi_init_server (&shishi_handle) != SHISHI_OK)
- 	return 0;
-     }
-   else
-     {
--      str_data[3] = TELQUAL_IS;
-       if (!shishi_handle && shishi_init (&shishi_handle) != SHISHI_OK)
- 	return 0;
-     }
-@@ -123,11 +137,11 @@ krb5shishi_init (TN_Authenticator * ap, 
- void
- krb5shishi_cleanup (TN_Authenticator * ap)
- {
--  if (shishi_handle == 0)
-+  if (shishi_handle == NULL)
-     return;
- 
-   shishi_done (shishi_handle);
--  shishi_handle = 0;
-+  shishi_handle = NULL;
- }
- 
- int
-@@ -143,6 +157,12 @@ krb5shishi_send (TN_Authenticator * ap)
-   char *apreq;
-   size_t apreq_len;
- 
-+  if (!delayed_shishi_init ())
-+    {
-+      DEBUG (("telnet: Kerberos V5: shishi initialization failed\r\n"));
-+      return 0;
-+    }
-+
-   tmp = malloc (strlen ("host/") + strlen (RemoteHostName) + 1);
-   sprintf (tmp, "host/%s", RemoteHostName);
-   memset (&hint, 0, sizeof (hint));
-@@ -385,6 +405,12 @@ krb5shishi_is_auth (TN_Authenticator * a
-   Session_Key skey;
- #endif
- 
-+  if (!delayed_shishi_init ())
-+    {
-+      DEBUG (("telnet: Kerberos V5: shishi initialization failed\r\n"));
-+      return 0;
-+    }
-+
-   rc = shishi_ap (shishi_handle, &auth_handle);
-   if (rc != SHISHI_OK)
-     {
diff --git a/debian/patches/40_ftpd_LOGCMD_NULL.patch b/debian/patches/40_ftpd_LOGCMD_NULL.patch
deleted file mode 100644
index a88a646..0000000
--- a/debian/patches/40_ftpd_LOGCMD_NULL.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-2006-10-21  Guillem Jover  <guillem@hadrons.org>
-
-	* ftpd/ftpd.c (store): Do not overwrite `name' with gunique's return
-	value, to avoid passing NULL to LOGCMD.
-
-
-Index: b/ftpd/ftpd.c
-===================================================================
---- a/ftpd/ftpd.c
-+++ b/ftpd/ftpd.c
-@@ -934,11 +934,17 @@ store (const char *name, const char *mod
-   struct stat st;
-   int (*closefunc) (FILE *);
- 
--  if (unique && stat (name, &st) == 0
--      && (name = gunique (name)) == NULL)
-+  if (unique && stat (name, &st) == 0)
-     {
--      LOGCMD (*mode == 'w' ? "put" : "append", name);
--      return;
-+      const char *name_unique = gunique (name);
-+
-+      if (name_unique)
-+        name = name_unique;
-+      else
-+        {
-+          LOGCMD (*mode == 'w' ? "put" : "append", name);
-+          return;
-+        }
-     }
- 
-   if (restart_point)
diff --git a/debian/patches/41_gethostbyname_segfault.patch b/debian/patches/41_gethostbyname_segfault.patch
deleted file mode 100644
index 81aa5e5..0000000
--- a/debian/patches/41_gethostbyname_segfault.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-2006-10-21  Guillem Jover  <guillem@hadrons.org>
-
-	* libinetutils/localhost.c (localhost): Determine the FQDN only
-	if gethostname did not fail.
-
-
-Index: b/libinetutils/localhost.c
-===================================================================
---- a/libinetutils/localhost.c
-+++ b/libinetutils/localhost.c
-@@ -77,22 +77,23 @@ localhost (void)
-       free (buf);
-       buf = 0;
-     }
-+  else
-+    /* Determine FQDN */
-+    {
-+      struct hostent *hp = gethostbyname(buf);
- 
--  /* Determine FQDN */
--  {
--    struct hostent *hp = gethostbyname(buf);
-+      if (hp)
-+        {
-+	  struct in_addr addr;
-+	  addr.s_addr = *(unsigned int*) hp->h_addr;
-+	  hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
-+	  if (hp)
-+	    {
-+	      free(buf);
-+	      buf = strdup(hp->h_name);
-+	    }
-+        }
-+    }
- 
--    if (hp)
--      {
--	struct in_addr addr;
--	addr.s_addr = *(unsigned int*) hp->h_addr;
--	hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
--	if (hp)
--	  {
--	    free(buf);
--	    buf = strdup(hp->h_name);
--	  }
--      }
--  }
-   return buf;
- }
diff --git a/debian/patches/42_syslogd_leaks.patch b/debian/patches/42_syslogd_leaks.patch
deleted file mode 100644
index f455a3e..0000000
--- a/debian/patches/42_syslogd_leaks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-2006-10-21  Guillem Jover  <guillem@hadrons.org>
-
-	* syslogd/syslogd.c (init): Close CF properly before returning.
-
-
-Index: b/syslogd/syslogd.c
-===================================================================
---- a/syslogd/syslogd.c
-+++ b/syslogd/syslogd.c
-@@ -1657,6 +1657,7 @@ init (int signo)
-     {
-       /* There is no graceful recovery here.  */
-       dbg_printf ("cannot allocate space for configuration\n");
-+      fclose (cf);
-       return;
-     }
-   cline = cbuf;
-@@ -1696,6 +1697,7 @@ init (int signo)
- 	    {
- 	      /* Sigh ...  */
- 	      dbg_printf ("cannot allocate space configuration\n");
-+	      fclose (cf);
- 	      free (cbuf);
- 	      return;
- 	    }
diff --git a/debian/patches/43_ret_converted_to_int.patch b/debian/patches/43_ret_converted_to_int.patch
deleted file mode 100644
index 1fdc652..0000000
--- a/debian/patches/43_ret_converted_to_int.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: b/rsh/rsh.c
-===================================================================
---- a/rsh/rsh.c
-+++ b/rsh/rsh.c
-@@ -70,6 +70,8 @@
- # include <sys/select.h>
- #endif
- 
-+#include "xalloc.h"
-+
- #ifdef SHISHI
- #define REALM_SZ 1040
- #endif
-Index: b/telnet/authenc.c
-===================================================================
---- a/telnet/authenc.c
-+++ b/telnet/authenc.c
-@@ -40,6 +40,7 @@ static char sccsid[] = "@(#)authenc.c	8.
- #include <arpa/telnet.h>
- #include <libtelnet/encrypt.h>
- #include <libtelnet/misc.h>
-+#include <unistd.h>
- 
- #include "general.h"
- #include "ring.h"
diff --git a/debian/patches/50_split_load_conffile.patch b/debian/patches/50_split_load_conffile.patch
index a34e9a8..62a9bbd 100644
--- a/debian/patches/50_split_load_conffile.patch
+++ b/debian/patches/50_split_load_conffile.patch
@@ -11,7 +11,7 @@ Index: b/syslogd/syslogd.c
 ===================================================================
 --- a/syslogd/syslogd.c
 +++ b/syslogd/syslogd.c
-@@ -268,6 +268,7 @@ int decode (const char *, CODE *);
+@@ -263,6 +263,7 @@ int decode (const char *, CODE *);
  void die (int);
  void domark (int);
  void fprintlog (struct filed *, const char *, int, const char *);
@@ -19,13 +19,13 @@ Index: b/syslogd/syslogd.c
  void init (int);
  void logerror (const char *);
  void logmsg (int, const char *, const char *, int);
-@@ -1583,12 +1584,11 @@ die (int signo)
+@@ -1551,12 +1552,11 @@ die (int signo)
    exit (0);
  }
  
 -/* INIT -- Initialize syslogd from configuration table.  */
 -RETSIGTYPE
--init (int signo)
+-init (int signo ARG_UNUSED)
 +static int
 +load_conffile (const char *filename, struct filed **nextp)
  {
@@ -34,8 +34,8 @@ Index: b/syslogd/syslogd.c
 +  struct filed *f;
    char *p;
  #ifndef LINE_MAX
- #define LINE_MAX 2048
-@@ -1597,60 +1597,20 @@ init (int signo)
+ # define LINE_MAX 2048
+@@ -1565,61 +1565,20 @@ init (int signo ARG_UNUSED)
    char *cbuf;
    char *cline;
    int cont_line = 0;
@@ -47,7 +47,8 @@ Index: b/syslogd/syslogd.c
 -    {
 -      errno = 0;
 -      logerror ("network logging disabled (syslog/udp service unknown).");
--      logerror ("see syslogd(8) for details of whether and how to enable it.");
+-      logerror
+-	("see syslogd(8) for details of whether and how to enable it.");
 -      return;
 -    }
 -  LogPort = sp->s_port;
@@ -58,7 +59,7 @@ Index: b/syslogd/syslogd.c
 -    {
 -      /* Flush any pending output.  */
 -      if (f->f_prevcount)
--	fprintlog (f, LocalHostName, 0, (char *)NULL);
+-	fprintlog (f, LocalHostName, 0, (char *) NULL);
 -
 -      switch (f->f_type)
 -	{
@@ -84,9 +85,9 @@ Index: b/syslogd/syslogd.c
      {
 -      dbg_printf ("cannot open %s\n", ConfFile);
 +      dbg_printf ("cannot open %s\n", filename);
-       *nextp = (struct filed *) calloc (1, sizeof(*f));
+       *nextp = (struct filed *) calloc (1, sizeof (*f));
        cfline ("*.ERR\t" PATH_CONSOLE, *nextp);
-       (*nextp)->f_next = (struct filed *) calloc (1, sizeof(*f));
+       (*nextp)->f_next = (struct filed *) calloc (1, sizeof (*f));
        cfline ("*.PANIC\t*", (*nextp)->f_next);
        Initialized = 1;
 -      return;
@@ -99,7 +100,7 @@ Index: b/syslogd/syslogd.c
    /* Allocate a buffer for line parsing.  */
    cbuf = malloc (line_max);
    if (cbuf == NULL)
-@@ -1658,7 +1618,7 @@ init (int signo)
+@@ -1627,7 +1586,7 @@ init (int signo ARG_UNUSED)
        /* There is no graceful recovery here.  */
        dbg_printf ("cannot allocate space for configuration\n");
        fclose (cf);
@@ -108,7 +109,7 @@ Index: b/syslogd/syslogd.c
      }
    cline = cbuf;
  
-@@ -1699,7 +1659,7 @@ init (int signo)
+@@ -1668,7 +1627,7 @@ init (int signo ARG_UNUSED)
  	      dbg_printf ("cannot allocate space configuration\n");
  	      fclose (cf);
  	      free (cbuf);
@@ -117,7 +118,7 @@ Index: b/syslogd/syslogd.c
  	    }
  	  else
  	    cbuf = tmp;
-@@ -1746,6 +1706,57 @@ init (int signo)
+@@ -1715,6 +1674,58 @@ init (int signo ARG_UNUSED)
    fclose (cf);
    free (cbuf);
  
@@ -137,7 +138,8 @@ Index: b/syslogd/syslogd.c
 +    {
 +      errno = 0;
 +      logerror ("network logging disabled (syslog/udp service unknown).");
-+      logerror ("see syslogd(8) for details of whether and how to enable it.");
++      logerror
++	("see syslogd(8) for details of whether and how to enable it.");
 +      return;
 +    }
 +  LogPort = sp->s_port;
diff --git a/debian/patches/51_add_load_confdir_support.patch b/debian/patches/51_add_load_confdir_support.patch
index 47bcbe1..afd19eb 100644
--- a/debian/patches/51_add_load_confdir_support.patch
+++ b/debian/patches/51_add_load_confdir_support.patch
@@ -54,23 +54,23 @@ Index: b/syslogd/syslogd.c
 ===================================================================
 --- a/syslogd/syslogd.c
 +++ b/syslogd/syslogd.c
-@@ -101,6 +101,7 @@ static char sccsid[] = "@(#)syslogd.c	8.
+@@ -119,6 +119,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#include <dirent.h>
  #include <unistd.h>
- #include <getopt.h>
  
-@@ -128,6 +129,7 @@ static char sccsid[] = "@(#)syslogd.c	8.
+ #ifdef HAVE_STDARG_H
+@@ -147,6 +148,7 @@
  int facilities_seen;
  
- const char *ConfFile = PATH_LOGCONF; /* Default Configuration file.  */
-+const char *ConfDir = PATH_LOGCONFD; /* Default Configuration directory.  */
- const char *PidFile = PATH_LOGPID; /* Default path to tuck pid.  */
- char ctty[] = PATH_CONSOLE; /* Default console to send message info.  */
+ const char *ConfFile = PATH_LOGCONF;	/* Default Configuration file.  */
++const char *ConfDir = PATH_LOGCONFD;	/* Default Configuration directory.  */
+ const char *PidFile = PATH_LOGPID;	/* Default path to tuck pid.  */
+ char ctty[] = PATH_CONSOLE;	/* Default console to send message info.  */
  
-@@ -269,6 +271,7 @@ void die (int);
+@@ -264,6 +266,7 @@ void die (int);
  void domark (int);
  void fprintlog (struct filed *, const char *, int, const char *);
  static int load_conffile (const char *, struct filed **);
@@ -78,34 +78,28 @@ Index: b/syslogd/syslogd.c
  void init (int);
  void logerror (const char *);
  void logmsg (int, const char *, const char *, int);
-@@ -299,6 +302,7 @@ usage (int err)
-       fprintf (stdout, "Usage: %s [OPTION] ...\n", program_name);
-       puts ("Log system messages.\n\n\
-   -f, --rcfile=FILE  Override configuration file (default: " PATH_LOGCONF ")\n\
-+      --rcdir=DIR    Override configuration directory (default: " PATH_LOGCONFD ")\n\
-       --pidfile=FILE Override pidfile (default: " PATH_LOGPID ")\n\
-   -n, --no-detach    Don't enter daemon mode\n\
-   -d, --debug        Print debug information (implies -n)\n\
-@@ -331,6 +335,7 @@ static struct option long_options[] =
- {
-   { "debug", no_argument, 0, 'd' },
-   { "rcfile", required_argument, 0, 'f' },
-+  { "rcdir", required_argument, 0, 'D' },
-   { "pidfile", required_argument, 0, 'P' },
-   { "hop", no_argument, 0, 'h' },
-   { "mark", required_argument, 0, 'm' },
-@@ -388,6 +393,10 @@ main (int argc, char *argv[])
- 	  ConfFile = optarg;
- 	  break;
+@@ -344,6 +347,9 @@ static struct argp_option argp_options[]
+   {"rcfile", 'f', "FILE", 0, "Override configuration file (default: "
+    PATH_LOGCONF ")",
+    GRP+1},
++  {"rcdir", 'D', "DIR", 0, "Override configuration directory (default: "
++   PATH_LOGCONFD ")",
++   GRP+1},
+   {"socket", 'p', "FILE", 0, "Override default unix domain socket " PATH_LOG,
+    GRP+1},
+   {"sync", 'S', NULL, 0, "Force a file sync on every line", GRP+1},
+@@ -415,6 +421,10 @@ parse_opt (int key, char *arg, struct ar
+       ConfFile = arg;
+       break;
  
-+	case 'D': /* Override the default config directory.  */
-+	  ConfDir = optarg;
-+	  break;
++    case 'D':
++      ConfDir = arg;
++      break;
 +
- 	case 'h': /* Disable forwarding.  */
- 	  NoHops = 0;
- 	  break;
-@@ -1709,6 +1718,51 @@ load_conffile (const char *filename, str
+     case 'p':
+       funix[0].name = arg;
+       funix[0].fd = -1;
+@@ -1677,6 +1687,51 @@ load_conffile (const char *filename, str
    return 1;
  }
  
@@ -157,7 +151,7 @@ Index: b/syslogd/syslogd.c
  /* INIT -- Initialize syslogd from configuration table.  */
  RETSIGTYPE
  init (int signo ARG_UNUSED)
-@@ -1755,7 +1809,7 @@ init (int signo ARG_UNUSED)
+@@ -1724,7 +1779,7 @@ init (int signo ARG_UNUSED)
    /* Foreach line in the conf table, open that file.  */
    f = NULL;
  
diff --git a/debian/patches/52_sigalarm.patch b/debian/patches/52_sigalarm.patch
index d3e8164..fc17f98 100644
--- a/debian/patches/52_sigalarm.patch
+++ b/debian/patches/52_sigalarm.patch
@@ -2,7 +2,7 @@ Index: b/syslogd/syslogd.c
 ===================================================================
 --- a/syslogd/syslogd.c
 +++ b/syslogd/syslogd.c
-@@ -268,6 +268,7 @@ void cfline (const char *, struct filed 
+@@ -263,6 +263,7 @@ void cfline (const char *, struct filed 
  const char *cvthname (struct sockaddr_in *);
  int decode (const char *, CODE *);
  void die (int);
@@ -10,15 +10,15 @@ Index: b/syslogd/syslogd.c
  void domark (int);
  void fprintlog (struct filed *, const char *, int, const char *);
  static int load_conffile (const char *, struct filed **);
-@@ -477,6 +478,7 @@ main (int argc, char *argv[])
+@@ -475,6 +476,7 @@ main (int argc, char *argv[])
  
- 	 IMO, the GNU/Linux distributors should fix there booting
- 	 sequence. But we still keep the approach.  */
+          IMO, the GNU/Linux distributors should fix there booting
+          sequence. But we still keep the approach.  */
 +      signal (SIGTERM, doexit);
        ppid = waitdaemon (0, 0, 30);
        if (ppid < 0)
- 	{
-@@ -623,7 +625,7 @@ main (int argc, char *argv[])
+         error (1, errno, "could not become daemon");
+@@ -610,7 +612,7 @@ main (int argc, char *argv[])
    /* If we're doing waitdaemon(), tell the parent to exit,
       we are ready to roll.  */
    if (ppid)
@@ -27,7 +27,7 @@ Index: b/syslogd/syslogd.c
  
    for (;;)
      {
-@@ -1553,6 +1555,12 @@ logerror (const char *type)
+@@ -1521,6 +1523,12 @@ logerror (const char *type)
  }
  
  RETSIGTYPE
diff --git a/debian/patches/53_man_inetd_max_conn.patch b/debian/patches/53_man_inetd_max_conn.patch
new file mode 100644
index 0000000..cf61e37
--- /dev/null
+++ b/debian/patches/53_man_inetd_max_conn.patch
@@ -0,0 +1,35 @@
+Index: b/inetd/inetd.8
+===================================================================
+--- a/inetd/inetd.8
++++ b/inetd/inetd.8
+@@ -88,7 +88,7 @@ Pass local and remote address data via e
+ \fBENVIRONMENT\fP below.
+ .It Fl R, -rate Ar rate
+ Specifies the maximum number of times a service can be invoked
+-in one minute; the default is 1000.
++in one minute; the default is 40.
+ .It Fl -resolve
+ Resolve local and remote IP addresses and pass them to the server program
+ via \fBTCPLOCALHOST\fP and \fBTCPREMOTEHOST\fP environment variables. See
+@@ -227,6 +227,21 @@ are both examples of the latter type of
+ datagram server.
+ .Xr Tftpd 8
+ is an example of a multi-threaded datagram server.
++The optional
++.Dq max
++suffix (separated from
++.Dq wait
++or
++.Dq nowait
++by a dot) specifies the maximum number of times a service can be invoked
++in one minute; the default is 40.
++If a service exceeds this limit,
++.Nm
++will log the problem
++and stop servicing requests for the specific service for ten minutes.
++See also the
++.Fl R
++option above.
+ .Pp
+ Servers using stream sockets generally are multi-threaded and
+ use the
diff --git a/debian/patches/99_inetd_max_conn.patch b/debian/patches/99_inetd_max_conn.patch
deleted file mode 100644
index a366695..0000000
--- a/debian/patches/99_inetd_max_conn.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: b/inetd/inetd.c
-===================================================================
---- a/inetd/inetd.c
-+++ b/inetd/inetd.c
-@@ -78,7 +78,7 @@ static char sccsid[] = "@(#)inetd.c	8.4 
-  *					name a tcpmux service
-  *	socket type			stream/dgram/raw/rdm/seqpacket
-  *	protocol			must be in /etc/protocols
-- *	wait/nowait			single-threaded/multi-threaded
-+ *	wait/nowait.max			single-threaded/multi-threaded
-  *	user				user to run daemon as
-  *	server program			full path name
-  *	server program arguments	arguments starting with argv[0]
-@@ -170,6 +170,7 @@ struct	servtab {
-   int	se_socktype;		/* type of socket to use */
-   char	*se_proto;		/* protocol used */
-   pid_t	se_wait;		/* single threaded server */
-+  unsigned se_max;		/* Maximum number of instances per 60 sec. */
-   short	se_checked;		/* looked at during merge */
-   char	*se_user;		/* user name to run as */
-   struct biltin *se_bi;		/* if built-in, description */
-@@ -555,7 +556,8 @@ main (int argc, char *argv[], char *envp
- 	      {
- 		if (sep->se_count++ == 0)
- 		  gettimeofday (&sep->se_time, NULL);
--		else if (sep->se_count >= toomany)
-+		else if ((sep->se_max && sep->se_count > sep->se_max)
-+			 || sep->se_count >= toomany)
- 		  {
- 		    struct timeval now;
- 
-@@ -1232,7 +1234,7 @@ getconfigent (FILE *fconfig, const char 
-       if ((strncmp (sep->se_proto, "tcp6", 4) == 0)
- 	  || (strncmp (sep->se_proto, "udp6", 4) == 0))
- 	{
--	  syslog (LOG_ERR, "%s:%lu: %s: IPv6 support isn't eneabled",
-+	  syslog (LOG_ERR, "%s:%lu: %s: IPv6 support isn't enabled",
- 		  file, (unsigned long) *line, sep->se_proto);
- 	  continue;
- 	}
-@@ -1240,6 +1242,30 @@ getconfigent (FILE *fconfig, const char 
-       sep->se_family = AF_INET;
- #endif
-       
-+	{
-+	char *p, *q;
-+	
-+	p = strchr(argv[INETD_WAIT], '.');
-+	if (p)
-+	  *p++ = 0;
-+	if (strcmp (argv[INETD_WAIT], "wait") == 0)
-+	  sep->se_wait = 1;
-+	else if (strcmp (argv[INETD_WAIT], "nowait") == 0)
-+	  sep->se_wait = 0;
-+	else
-+	  {
-+	    syslog (LOG_WARNING, "%s:%lu: bad wait type",
-+		    file, (unsigned long) *line);
-+	  }
-+	if (p)
-+	  {
-+	    sep->se_max = strtoul(p, &q, 10);
-+	    if (*q)
-+	      syslog (LOG_WARNING, "%s:%lu: invalid number (%s)",
-+		      file, (unsigned long) *line, p);
-+	  }
-+	}
-+
-       if (strcmp (argv[INETD_WAIT], "wait") == 0)
- 	sep->se_wait = 1;
-       else if (strcmp (argv[INETD_WAIT], "nowait") == 0)
-Index: b/inetd/inetd.8
-===================================================================
---- a/inetd/inetd.8
-+++ b/inetd/inetd.8
-@@ -74,7 +74,7 @@ Pass local and remote address data via e
- \fBENVIRONMENT\fP below.
- .It Fl R, -rate Ar rate
- Specifies the maximum number of times a service can be invoked
--in one minute; the default is 1000.
-+in one minute; the default is 40.
- .It Fl -resolve
- Resolve local and remote IP addresses and pass them to the server program
- via \fBTCPLOCALHOST\fP and \fBTCPREMOTEHOST\fP environment variables. See
-@@ -103,7 +103,7 @@ fields of the configuration file are as 
- service name
- socket type
- protocol
--wait/nowait
-+wait/nowait[.max]
- user
- server program
- server program arguments
-@@ -215,6 +215,21 @@ are both examples of the latter type of
- datagram server.
- .Xr Tftpd 8
- is an example of a multi-threaded datagram server.
-+The optional
-+.Dq max
-+suffix (separated from
-+.Dq wait
-+or
-+.Dq nowait
-+by a dot) specifies the maximum number of times a service can be invoked
-+in one minute; the default is 40.
-+If a service exceeds this limit,
-+.Nm
-+will log the problem
-+and stop servicing requests for the specific service for ten minutes.
-+See also the
-+.Fl R
-+option above.
- .Pp
- Servers using stream sockets generally are multi-threaded and
- use the
diff --git a/debian/patches/series b/debian/patches/series
index 730773b..79de9ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,9 @@
-00_build_dfsg.patch
 01_no_link_extralibs.patch
-02_missing_config.rpath.patch
-03_ifreq_typo.patch
-04_shishi_telnet.patch
-05_shishi_delayed_init.patch
 07_dev_test_e.patch
 10_syslog_klog_doc.patch
 22_syslogd_conf.patch
 30_ping_suid_perms.patch
-40_ftpd_LOGCMD_NULL.patch
-41_gethostbyname_segfault.patch
-42_syslogd_leaks.patch
-43_ret_converted_to_int.patch
 50_split_load_conffile.patch
 51_add_load_confdir_support.patch
 52_sigalarm.patch
-99_inetd_max_conn.patch
+53_man_inetd_max_conn.patch