New upstream release 1.9

Implement ”ping -W linger”. (Closes: #566845)
Pass “-Im4 -Iam” to autoreconf call in debian/rules.

1 files changed, 51 insertions, 58 deletions

diff --git a/debian/patches/03_reduce_shared_lib_depends.patch b/debian/patches/03_reduce_shared_lib_depends.patch
index 99fada0..79bdb49 100644
--- a/debian/patches/03_reduce_shared_lib_depends.patch
+++ b/debian/patches/03_reduce_shared_lib_depends.patch
@@ -1,25 +1,23 @@
 ---
- am/libcurses.m4     |   18 +++++++++---------
+ am/libcurses.m4     |    4 ----
  configure.ac        |    6 +++---
- ftp/Makefile.am     |    3 +--
- src/Makefile.am     |   16 +++++++++++-----
- telnet/Makefile.am  |    2 +-
- telnetd/Makefile.am |    2 +-
- 6 files changed, 26 insertions(+), 21 deletions(-)
+ ftp/Makefile.am     |    4 +++-
+ src/Makefile.am     |   10 ++++++++--
+ telnet/Makefile.am  |    5 ++++-
+ telnetd/Makefile.am |    5 ++++-
+ 6 files changed, 22 insertions(+), 12 deletions(-)
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -24,6 +24,9 @@ inetdaemon_PROGRAMS =
+@@ -24,6 +24,7 @@ inetdaemon_PROGRAMS =
  bin_PROGRAMS =
  EXTRA_PROGRAMS =
  
-+LDADD = \
-+	../libinetutils/libinetutils.a \
-+	../lib/libgnu.a
++LDADD = $(iu_LIBRARIES) $(LIBUTIL)
  
  bin_PROGRAMS += @hostname_BUILD@
  hostname_SOURCES = hostname.c
-@@ -35,6 +38,7 @@ EXTRA_PROGRAMS += logger
+@@ -35,6 +36,7 @@ EXTRA_PROGRAMS += logger
  
  bin_PROGRAMS += @rcp_BUILD@
  rcp_SOURCES = rcp.c
@@ -27,7 +25,7 @@
  EXTRA_PROGRAMS += rcp
  
  bin_PROGRAMS += @rexec_BUILD@
-@@ -43,10 +47,12 @@ EXTRA_PROGRAMS += rexec
+@@ -43,10 +45,12 @@ EXTRA_PROGRAMS += rexec
  
  bin_PROGRAMS += @rlogin_BUILD@
  rlogin_SOURCES = rlogin.c
@@ -40,15 +38,15 @@
  EXTRA_PROGRAMS += rsh
  
  bin_PROGRAMS += @tftp_BUILD@
-@@ -55,6 +61,7 @@ EXTRA_PROGRAMS += tftp
+@@ -55,6 +59,7 @@ EXTRA_PROGRAMS += tftp
  
  bin_PROGRAMS += @traceroute_BUILD@
  traceroute_SOURCES = traceroute.c
-+traceroute_LDADD = ../libicmp/libicmp.a $(LDADD)
++traceroute_LDADD = $(LDADD) $(top_builddir)/libicmp/libicmp.a
  EXTRA_PROGRAMS += traceroute
  
  inetdaemon_PROGRAMS += @inetd_BUILD@
-@@ -63,14 +70,17 @@ EXTRA_PROGRAMS += inetd
+@@ -63,14 +68,17 @@ EXTRA_PROGRAMS += inetd
  
  inetdaemon_PROGRAMS += @rexecd_BUILD@
  rexecd_SOURCES = rexecd.c
@@ -66,28 +64,23 @@
  EXTRA_PROGRAMS += rshd
  
  inetdaemon_PROGRAMS += @syslogd_BUILD@
-@@ -83,17 +93,13 @@ EXTRA_PROGRAMS += tftpd
+@@ -83,12 +107,11 @@ EXTRA_PROGRAMS += tftpd
  
  inetdaemon_PROGRAMS += @uucpd_BUILD@
  uucpd_SOURCES = uucpd.c
-+uucpd_LDADD = $(LDADD) $(LIBUTIL) $(LIBCRYPT)
++uucpd_LDADD = $(LDADD) $(LIBCRYPT)
  EXTRA_PROGRAMS += uucpd
  
- INCLUDES = -I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/libinetutils \
- 	-I$(top_srcdir)/libicmp
+ INCLUDES = $(iu_INCLUDES) -I$(top_srcdir)/libicmp
  
--LDADD = -L$(top_builddir)/libicmp -licmp \
--	-L$(top_builddir)/libinetutils -linetutils \
--	-L$(top_builddir)/lib ../lib/libgnu.a \
--	$(LIBAUTH) $(LIBCRYPT) $(LIBUTIL)
+-LDADD = $(iu_LIBRARIES) $(top_builddir)/libicmp/libicmp.a $(LIBAUTH) $(LIBCRYPT) $(LIBUTIL)
 -
  AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) $(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) $(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UUCICO)
  
  SUIDMODE = -o root -m 4775
 --- a/configure.ac
 +++ b/configure.ac
-@@ -137,8 +137,8 @@ AC_PROG_LN_S
+@@ -140,8 +140,8 @@ AC_PROG_LN_S
  gl_INIT
  
  ### Checks for libraries.
@@ -98,7 +91,7 @@
  AC_CHECK_LIB(socket, getpeername)
  
  # See if a termcap library is available (under one of several names)
-@@ -189,7 +189,7 @@ AC_SUBST(LIBUTIL)
+@@ -169,7 +169,7 @@ AC_SUBST(LIBUTIL)
  
  # See if we have libpam.a this is for ftpd.
  if test "$with_pam" = yes ; then
@@ -109,53 +102,53 @@
       AC_DEFINE([WITH_PAM], 1, [Define to one if you have -lpam.])
 --- a/telnetd/Makefile.am
 +++ b/telnetd/Makefile.am
-@@ -35,4 +35,4 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
- LDADD = -L../libinetutils -linetutils \
-         -L../libtelnet -ltelnet \
-         ../lib/libgnu.a \
--	$(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
+@@ -31,4 +31,7 @@ noinst_HEADERS = telnetd.h
+ AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
+ INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH) $(NCURSES_INCLUDE)
+ 
+-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
++LDADD = \
++	$(iu_LIBRARIES) \
++	$(top_builddir)/libtelnet/libtelnet.a \
 +	$(LIBTERMCAP) $(LIBUTIL) $(LIBAUTH)
 --- a/telnet/Makefile.am
 +++ b/telnet/Makefile.am
-@@ -30,4 +30,4 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
- AM_CPPFLAGS=-DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
+@@ -29,4 +29,7 @@ noinst_HEADERS = defines.h externs.h gen
+ INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE)
+ AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
  
- LDADD = -L../libinetutils -L../libtelnet -linetutils	\
--	-ltelnet ../lib/libgnu.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH)
-+	-ltelnet ../lib/libgnu.a $(LIBTERMCAP) $(LIBAUTH)
+-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
++LDADD = \
++	$(iu_LIBRARIES) \
++	$(top_builddir)/libtelnet/libtelnet.a \
++	$(LIBTERMCAP) $(LIBAUTH)
 --- a/am/libcurses.m4
 +++ b/am/libcurses.m4
-@@ -84,15 +84,15 @@ dnl LIBTERMCAP is defined with the appro
+@@ -85,9 +85,6 @@ dnl LIBTERMCAP is defined with the appro
  dnl
  AC_DEFUN([IU_LIB_TERMCAP], [
    AC_REQUIRE([IU_LIB_NCURSES])
 -  if test "$LIBNCURSES"; then
 -    LIBTERMCAP="$LIBNCURSES"
 -  else
--    AC_CHECK_LIB(curses, tgetent, LIBTERMCAP=-lcurses)
--    if test "$ac_cv_lib_curses_tgetent" = no; then
--      AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP=-ltermcap)
--    fi
--    if test "$ac_cv_lib_termcap_tgetent" = no; then
--      AC_CHECK_LIB(termlib, tgetent, LIBTERMCAP=-ltermlib)
-+  AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP=-ltermcap)
-+  if test "$ac_cv_lib_termcap_tgetent" = no; then
-+    AC_CHECK_LIB(termlib, tgetent, LIBTERMCAP=-ltermlib)
-+  fi
-+  if test "$ac_cv_lib_termlib_tgetent" = no; then
-+    if test "$LIBNCURSES"; then
-+      LIBTERMCAP="$LIBNCURSES"
-+    else
-+      AC_CHECK_LIB(curses, tgetent, LIBTERMCAP=-lcurses)
+     AC_CHECK_LIB(termcap, tgetent, LIBTERMCAP=-ltermcap)
+     AC_CHECK_HEADERS([termcap.h])
+     if test "$ac_cv_lib_termcap_tgetent" = yes \
+@@ -113,7 +110,6 @@ AC_DEFUN([IU_LIB_TERMCAP], [
+     if test -n "$LIBTERMCAP"; then
+       AC_DEFINE([HAVE_TGETENT], 1, [Define to 1 if tgetent() exists.])
      fi
-   fi
+-  fi
    AC_SUBST(LIBTERMCAP)])dnl
+ 
+ dnl IU_LIB_CURSES -- check for curses, and associated libraries
 --- a/ftp/Makefile.am
 +++ b/ftp/Makefile.am
-@@ -30,5 +30,4 @@ noinst_HEADERS = extern.h ftp_var.h
- INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils 
+@@ -30,4 +30,6 @@ noinst_HEADERS = extern.h ftp_var.h
+ INCLUDES = $(iu_INCLUDES)
  AM_CPPFLAGS = $(PATHDEF_TMP) $(PATHDEF_BSHELL)
  
--READLINE = $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
--LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBGLOB) $(READLINE)
-+LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBGLOB) $(LIBREADLINE)
+-LDADD = $(iu_LIBRARIES) $(LIBGLOB) $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
++LDADD = \
++	$(iu_LIBRARIES) \
++	$(LIBGLOB) $(LIBREADLINE)