Refresh patches with -pab

Closes: #484949

19 files changed, 89 insertions, 84 deletions

diff --git a/debian/changelog b/debian/changelog
index fe0e74a..f56d1a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ inetutils (2:1.5.dfsg.1-7) UNRELEASED; urgency=low
 
   * Add a debian/README.source file.
   * Now using Standards-Version 3.8.0.
+  * Refresh patches with -pab. (Closes: #484949)
 
  -- Guillem Jover <guillem@debian.org>  Sat, 21 Jun 2008 07:32:02 +0300
 
diff --git a/debian/patches/00_build_dfsg.patch b/debian/patches/00_build_dfsg.patch
index f23dcba..554ad8c 100644
--- a/debian/patches/00_build_dfsg.patch
+++ b/debian/patches/00_build_dfsg.patch
@@ -1,7 +1,7 @@
-Index: inetutils-1.5/configure.ac
+Index: b/configure.ac
 ===================================================================
---- inetutils-1.5.orig/configure.ac	2006-10-23 07:55:10.000000000 +0300
-+++ inetutils-1.5/configure.ac	2006-10-23 07:55:23.000000000 +0300
+--- a/configure.ac
++++ b/configure.ac
 @@ -794,5 +794,5 @@ ifconfig/Makefile
  ifconfig/system/Makefile
  confpaths.h:confpaths.h.in
@@ -9,10 +9,10 @@ Index: inetutils-1.5/configure.ac
 -doc/Makefile doc/rfc/Makefile])
 +])
  AC_OUTPUT
-Index: inetutils-1.5/Makefile.am
+Index: b/Makefile.am
 ===================================================================
---- inetutils-1.5.orig/Makefile.am	2006-10-23 07:55:27.000000000 +0300
-+++ inetutils-1.5/Makefile.am	2006-10-23 07:55:36.000000000 +0300
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -25,7 +25,7 @@ EXTRA_DIST = README-alpha paths ChangeLo
  SUBDIRS = lib headers libinetutils libtelnet glob \
  	inetd telnetd libls ftpd rshd rlogind uucpd rexecd syslogd tftpd \
diff --git a/debian/patches/01_no_link_extralibs.patch b/debian/patches/01_no_link_extralibs.patch
index 843973c..db1d9fb 100644
--- a/debian/patches/01_no_link_extralibs.patch
+++ b/debian/patches/01_no_link_extralibs.patch
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=0
-Index: configure.ac
+Index: b/configure.ac
 ===================================================================
---- configure.ac.orig	2006-10-21 14:57:04.000000000 +0300
-+++ configure.ac	2006-10-23 07:48:53.000000000 +0300
+--- a/configure.ac
++++ b/configure.ac
 @@ -131,7 +131,7 @@ AC_PROG_YACC
  gl_INIT
  
diff --git a/debian/patches/02_missing_config.rpath.patch b/debian/patches/02_missing_config.rpath.patch
index 265b3e5..73169d0 100644
--- a/debian/patches/02_missing_config.rpath.patch
+++ b/debian/patches/02_missing_config.rpath.patch
@@ -1,7 +1,7 @@
-Index: build-aux/config.rpath
+Index: b/build-aux/config.rpath
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ build-aux/config.rpath	2006-11-07 00:39:27.000000000 +0200
+--- /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
diff --git a/debian/patches/03_ifreq_typo.patch b/debian/patches/03_ifreq_typo.patch
index e40a1df..f769a98 100644
--- a/debian/patches/03_ifreq_typo.patch
+++ b/debian/patches/03_ifreq_typo.patch
@@ -1,7 +1,7 @@
-Index: configure.ac
+Index: b/configure.ac
 ===================================================================
---- configure.ac.orig	2007-02-19 01:44:47.000000000 +0200
-+++ configure.ac	2007-02-19 01:44:52.000000000 +0200
+--- 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
diff --git a/debian/patches/04_shishi_telnet.patch b/debian/patches/04_shishi_telnet.patch
index b93a195..c8ce123 100644
--- a/debian/patches/04_shishi_telnet.patch
+++ b/debian/patches/04_shishi_telnet.patch
@@ -4,15 +4,17 @@
         use-session-key ap-options, that is for user2user authentication
         which is not appropriate here.
 
---- libtelnet/shishi.c    08 Mar 2007 15:02:20 +0100      1.2
-+++ libtelnet/shishi.c    13 Mar 2007 17:31:30 +0100
+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 @@
+@@ -169,10 +169,6 @@ krb5shishi_send (TN_Authenticator * ap)
    else
      ap_opts = 0;
  
diff --git a/debian/patches/05_shishi_delayed_init.patch b/debian/patches/05_shishi_delayed_init.patch
index 702c7b8..3549c07 100644
--- a/debian/patches/05_shishi_delayed_init.patch
+++ b/debian/patches/05_shishi_delayed_init.patch
@@ -1,7 +1,7 @@
 Index: b/libtelnet/shishi.c
 ===================================================================
---- a/libtelnet/shishi.c	2008-04-11 08:09:20.000000000 +0300
-+++ b/libtelnet/shishi.c	2008-04-11 08:11:55.000000000 +0300
+--- 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.
diff --git a/debian/patches/07_dev_test_e.patch b/debian/patches/07_dev_test_e.patch
index aba8fa1..dd45caf 100644
--- a/debian/patches/07_dev_test_e.patch
+++ b/debian/patches/07_dev_test_e.patch
@@ -7,9 +7,11 @@ Description:
  /dev/kern.log. ./configure should use test -e instead.
 
 
---- a/acinclude.m4orig	2008-05-24 23:51:39.000000000 +0000
-+++ b/acinclude.m4	2008-05-24 23:57:05.000000000 +0000
-@@ -306,7 +306,7 @@
+Index: b/acinclude.m4
+===================================================================
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -306,7 +306,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
      else
        # search for a reasonable value
  
diff --git a/debian/patches/10_syslog_klog_doc.patch b/debian/patches/10_syslog_klog_doc.patch
index fbf34b3..bcc7226 100644
--- a/debian/patches/10_syslog_klog_doc.patch
+++ b/debian/patches/10_syslog_klog_doc.patch
@@ -1,8 +1,10 @@
 #DPATCHLEVEL=0
 
---- syslogd/syslogd.8.orig	2000-08-05 15:39:00.000000000 +0300
-+++ syslogd/syslogd.8	2006-01-09 07:11:57.000000000 +0200
-@@ -116,9 +116,12 @@
+Index: b/syslogd/syslogd.8
+===================================================================
+--- a/syslogd/syslogd.8
++++ b/syslogd/syslogd.8
+@@ -116,9 +116,12 @@ domain socket
  .Pa /dev/log ,
  from an Internet domain socket specified in
  .Pa /etc/services ,
@@ -17,7 +19,7 @@
  .Pp
  .Nm Syslogd
  creates the file
-@@ -148,7 +151,7 @@
+@@ -148,7 +151,7 @@ The process id of current
  Name of the
  .Tn UNIX
  domain datagram log socket.
diff --git a/debian/patches/22_syslogd_conf.patch b/debian/patches/22_syslogd_conf.patch
index f109843..42f5ddd 100644
--- a/debian/patches/22_syslogd_conf.patch
+++ b/debian/patches/22_syslogd_conf.patch
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur inetutils-20030703-old/syslogd/syslog.conf inetutils-20030703/syslogd/syslog.conf
---- inetutils-20030703-old/syslogd/syslog.conf	1970-01-01 01:00:00.000000000 +0100
-+++ inetutils-20030703/syslogd/syslog.conf	2003-10-01 04:18:52.000000000 +0200
+Index: b/syslogd/syslog.conf
+===================================================================
+--- /dev/null
++++ b/syslogd/syslog.conf
 @@ -0,0 +1,70 @@
 +#  /etc/syslog.conf	Configuration file for inetutils-syslogd.
 +#
@@ -73,10 +74,11 @@ diff -Naur inetutils-20030703-old/syslogd/syslog.conf inetutils-20030703/syslogd
 +	*.=debug;*.=info;\
 +	*.=notice;*.=warn	|/dev/xconsole
 +
-diff -Naur inetutils-20030703/syslogd/Makefile.am inetutils-20030703-patched/syslogd/Makefile.am
---- inetutils-20030703/syslogd/Makefile.am	2002-04-28 19:24:36.000000000 +0200
-+++ inetutils-20030703-patched/syslogd/Makefile.am	2003-10-02 07:53:16.000000000 +0200
-@@ -24,6 +24,8 @@
+Index: b/syslogd/Makefile.am
+===================================================================
+--- a/syslogd/Makefile.am
++++ b/syslogd/Makefile.am
+@@ -24,6 +24,8 @@ EXTRA_PROGRAMS = syslogd
  
  syslogd_SOURCES = syslogd.c
  
diff --git a/debian/patches/30_ping_suid_perms.patch b/debian/patches/30_ping_suid_perms.patch
index e28c02b..3fbac3f 100644
--- a/debian/patches/30_ping_suid_perms.patch
+++ b/debian/patches/30_ping_suid_perms.patch
@@ -1,7 +1,9 @@
 #DPATCHLEVEL=0
---- ping/Makefile.am	2005-10-11 14:29:11.000000000 +0300
-+++ ping/Makefile.am	2006-07-19 09:15:57.000000000 +0300
-@@ -32,7 +32,7 @@
+Index: b/ping/Makefile.am
+===================================================================
+--- a/ping/Makefile.am
++++ b/ping/Makefile.am
+@@ -32,7 +32,7 @@ ping_SOURCES = ping.c ping_common.c ping
  
  ping6_SOURCES = ping6.c ping_common.c ping_common.h ping6.h
  
diff --git a/debian/patches/40_ftpd_LOGCMD_NULL.patch b/debian/patches/40_ftpd_LOGCMD_NULL.patch
index 7680379..a88a646 100644
--- a/debian/patches/40_ftpd_LOGCMD_NULL.patch
+++ b/debian/patches/40_ftpd_LOGCMD_NULL.patch
@@ -4,14 +4,11 @@
 	value, to avoid passing NULL to LOGCMD.
 
 
-Index: ftpd/ftpd.c
+Index: b/ftpd/ftpd.c
 ===================================================================
-RCS file: /sources/inetutils/inetutils/ftpd/ftpd.c,v
-retrieving revision 1.56
-diff -u -r1.56 ftpd.c
---- ftpd/ftpd.c	12 Oct 2006 09:57:27 -0000	1.56
-+++ ftpd/ftpd.c	21 Oct 2006 13:15:28 -0000
-@@ -934,11 +934,17 @@
+--- 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 *);
  
diff --git a/debian/patches/41_gethostbyname_segfault.patch b/debian/patches/41_gethostbyname_segfault.patch
index 290df6b..81aa5e5 100644
--- a/debian/patches/41_gethostbyname_segfault.patch
+++ b/debian/patches/41_gethostbyname_segfault.patch
@@ -4,14 +4,11 @@
 	if gethostname did not fail.
 
 
-Index: libinetutils/localhost.c
+Index: b/libinetutils/localhost.c
 ===================================================================
-RCS file: /sources/inetutils/inetutils/libinetutils/localhost.c,v
-retrieving revision 1.13
-diff -u -r1.13 localhost.c
---- libinetutils/localhost.c	2 Dec 2005 14:05:28 -0000	1.13
-+++ libinetutils/localhost.c	21 Oct 2006 13:32:06 -0000
-@@ -77,22 +77,23 @@
+--- a/libinetutils/localhost.c
++++ b/libinetutils/localhost.c
+@@ -77,22 +77,23 @@ localhost (void)
        free (buf);
        buf = 0;
      }
diff --git a/debian/patches/42_syslogd_leaks.patch b/debian/patches/42_syslogd_leaks.patch
index f4b2635..f455a3e 100644
--- a/debian/patches/42_syslogd_leaks.patch
+++ b/debian/patches/42_syslogd_leaks.patch
@@ -3,10 +3,10 @@
 	* syslogd/syslogd.c (init): Close CF properly before returning.
 
 
-Index: syslogd/syslogd.c
+Index: b/syslogd/syslogd.c
 ===================================================================
---- syslogd/syslogd.c.orig	2006-10-21 15:11:57.000000000 +0300
-+++ syslogd/syslogd.c	2006-11-07 00:59:47.000000000 +0200
+--- a/syslogd/syslogd.c
++++ b/syslogd/syslogd.c
 @@ -1657,6 +1657,7 @@ init (int signo)
      {
        /* There is no graceful recovery here.  */
diff --git a/debian/patches/43_ret_converted_to_int.patch b/debian/patches/43_ret_converted_to_int.patch
index 951446d..1fdc652 100644
--- a/debian/patches/43_ret_converted_to_int.patch
+++ b/debian/patches/43_ret_converted_to_int.patch
@@ -1,7 +1,7 @@
-Index: rsh/rsh.c
+Index: b/rsh/rsh.c
 ===================================================================
---- rsh/rsh.c.orig	2006-11-07 01:01:29.000000000 +0200
-+++ rsh/rsh.c	2006-11-07 01:01:46.000000000 +0200
+--- a/rsh/rsh.c
++++ b/rsh/rsh.c
 @@ -70,6 +70,8 @@
  # include <sys/select.h>
  #endif
@@ -11,10 +11,10 @@ Index: rsh/rsh.c
  #ifdef SHISHI
  #define REALM_SZ 1040
  #endif
-Index: telnet/authenc.c
+Index: b/telnet/authenc.c
 ===================================================================
---- telnet/authenc.c.orig	2006-11-07 01:01:06.000000000 +0200
-+++ telnet/authenc.c	2006-11-07 01:01:14.000000000 +0200
+--- 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>
diff --git a/debian/patches/50_split_load_conffile.patch b/debian/patches/50_split_load_conffile.patch
index 31ba1de..a34e9a8 100644
--- a/debian/patches/50_split_load_conffile.patch
+++ b/debian/patches/50_split_load_conffile.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] Split load_conffile
 
 Index: b/syslogd/syslogd.c
 ===================================================================
---- a/syslogd/syslogd.c	2008-04-03 07:36:08.000000000 +0300
-+++ b/syslogd/syslogd.c	2008-04-03 07:48:05.000000000 +0300
+--- a/syslogd/syslogd.c
++++ b/syslogd/syslogd.c
 @@ -268,6 +268,7 @@ int decode (const char *, CODE *);
  void die (int);
  void domark (int);
diff --git a/debian/patches/51_add_load_confdir_support.patch b/debian/patches/51_add_load_confdir_support.patch
index 2b25906..47bcbe1 100644
--- a/debian/patches/51_add_load_confdir_support.patch
+++ b/debian/patches/51_add_load_confdir_support.patch
@@ -12,8 +12,8 @@ Subject: [PATCH] Add load_confdir support
 
 Index: b/paths
 ===================================================================
---- a/paths	2006-10-12 00:46:22.000000000 +0300
-+++ b/paths	2008-04-03 07:51:04.000000000 +0300
+--- a/paths
++++ b/paths
 @@ -91,6 +91,7 @@ PATH_LASTLOG	<utmp.h> $(localstatedir)/l
  PATH_LOG	<syslog.h> /dev/log
  PATH_KLOG	<syslog.h> /dev/klog no
@@ -24,8 +24,8 @@ Index: b/paths
  PATH_NOLOGIN	$(sysconfdir)/nologin
 Index: b/syslogd/Makefile.am
 ===================================================================
---- a/syslogd/Makefile.am	2008-04-03 07:36:08.000000000 +0300
-+++ b/syslogd/Makefile.am	2008-04-03 07:51:04.000000000 +0300
+--- a/syslogd/Makefile.am
++++ b/syslogd/Makefile.am
 @@ -31,7 +31,8 @@ man_MANS = syslog.conf.5 syslogd.8
  @PATHDEFS_MAKE@
  
@@ -38,8 +38,8 @@ Index: b/syslogd/Makefile.am
  
 Index: b/syslogd/syslogd.8
 ===================================================================
---- a/syslogd/syslogd.8	2008-04-03 07:36:08.000000000 +0300
-+++ b/syslogd/syslogd.8	2008-04-03 07:51:04.000000000 +0300
+--- a/syslogd/syslogd.8
++++ b/syslogd/syslogd.8
 @@ -70,6 +70,9 @@ sockets.
  .It \fB-f\fR, \fB--rcfile\fR=\fIFILE\fP
  Specify the pathname of an alternate configuration file;
@@ -52,8 +52,8 @@ Index: b/syslogd/syslogd.8
  forward messages it receives from remote hosts.
 Index: b/syslogd/syslogd.c
 ===================================================================
---- a/syslogd/syslogd.c	2008-04-03 07:48:05.000000000 +0300
-+++ b/syslogd/syslogd.c	2008-04-03 07:52:11.000000000 +0300
+--- a/syslogd/syslogd.c
++++ b/syslogd/syslogd.c
 @@ -101,6 +101,7 @@ static char sccsid[] = "@(#)syslogd.c	8.
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/debian/patches/52_sigalarm.patch b/debian/patches/52_sigalarm.patch
index 848db19..d3e8164 100644
--- a/debian/patches/52_sigalarm.patch
+++ b/debian/patches/52_sigalarm.patch
@@ -1,7 +1,7 @@
 Index: b/syslogd/syslogd.c
 ===================================================================
---- a/syslogd/syslogd.c	2008-04-11 06:58:34.000000000 +0300
-+++ b/syslogd/syslogd.c	2008-04-11 07:16:16.000000000 +0300
+--- a/syslogd/syslogd.c
++++ b/syslogd/syslogd.c
 @@ -268,6 +268,7 @@ void cfline (const char *, struct filed 
  const char *cvthname (struct sockaddr_in *);
  int decode (const char *, CODE *);
diff --git a/debian/patches/series b/debian/patches/series
index 2c8e743..aa08997 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,17 +1,17 @@
 00_build_dfsg.patch
-01_no_link_extralibs.patch -p0
-02_missing_config.rpath.patch -p0
-03_ifreq_typo.patch -p0
-04_shishi_telnet.patch -p0
-05_shishi_delayed_init.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 -p0
-22_syslogd_conf.patch -p1
-30_ping_suid_perms.patch -p0
-40_ftpd_LOGCMD_NULL.patch -p0
-41_gethostbyname_segfault.patch -p0
-42_syslogd_leaks.patch -p0
-43_ret_converted_to_int.patch -p0
+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