summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2010-06-10 22:40:15 +0200
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:26 +0200
commit4f4bbf12cc54da472a19c0b78ab65c5f866b02cf (patch)
tree16a62eaa55e83e011d4d9be2bca019b4e2f0278f
parentc7db582c8b6f6c97eb3bc57f8b951d21c9860700 (diff)
downloadinetutils-4f4bbf12cc54da472a19c0b78ab65c5f866b02cf.tar.gz
New upstream release 1.8
-rw-r--r--debian/changelog17
-rw-r--r--debian/patches/01_no_link_extralibs.patch13
-rw-r--r--debian/patches/07_dev_test_e.patch22
-rw-r--r--debian/patches/10_syslog_klog_doc.patch6
-rw-r--r--debian/patches/22_syslogd_conf.patch25
-rw-r--r--debian/patches/30_ping_suid_perms.patch12
-rw-r--r--debian/patches/50_split_load_conffile.patch24
-rw-r--r--debian/patches/51_add_load_confdir_support.patch67
-rw-r--r--debian/patches/52_sigalarm.patch42
-rw-r--r--debian/patches/53_man_inetd_max_conn.patch6
-rw-r--r--debian/patches/99_acinclude_del_dnl.patch33
-rw-r--r--debian/patches/99_ping_default_inf_count.patch29
-rw-r--r--debian/patches/series5
13 files changed, 83 insertions, 218 deletions
diff --git a/debian/changelog b/debian/changelog
index ccd7403..0ae810b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+inetutils (2:1.8-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - debian/patches/01_no_link_extralibs.patch: Remove, merged upstream.
+ - debian/patches/07_dev_test_e.patch: Likewise.
+ - debian/patches/52_sigalarm.patch: Likewise.
+ - debian/patches/99_acinclude_del_dnl.patch: Likewise.
+ - debian/patches/99_ping_default_inf_count.patch: Likewise.
+ - debian/patches/10_syslog_klog_doc.patch: Refreshed.
+ - debian/patches/22_syslogd_conf.patch: Likewise.
+ - debian/patches/30_ping_suid_perms.patch: Likewise.
+ - debian/patches/50_split_load_conffile.patch: Likewise.
+ - debian/patches/51_add_load_confdir_support.patch: Likewise.
+ - debian/patches/53_man_inetd_max_conn.patch: Likewise.
+
+ -- Guillem Jover <guillem@debian.org> Tue, 08 Jun 2010 21:16:04 +0200
+
inetutils (2:1.6-3) unstable; urgency=low
* Fix init script dependency information: (Closes: #547513)
diff --git a/debian/patches/01_no_link_extralibs.patch b/debian/patches/01_no_link_extralibs.patch
deleted file mode 100644
index 583af54..0000000
--- a/debian/patches/01_no_link_extralibs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -131,7 +131,7 @@ AC_PROG_YACC
- gl_INIT
-
- ### Checks for libraries.
--AC_CHECK_LIB(bsd, revoke)
-+#AC_CHECK_LIB(bsd, revoke)
- AC_CHECK_LIB(nsl, inet_ntoa)
- AC_CHECK_LIB(resolv, gethostname)
- AC_CHECK_LIB(socket, getpeername)
diff --git a/debian/patches/07_dev_test_e.patch b/debian/patches/07_dev_test_e.patch
deleted file mode 100644
index dd45caf..0000000
--- a/debian/patches/07_dev_test_e.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Description:
- While testing paths, ./configure uses test -r to check for those who
- are not provided by system headers. However, this does not work for
- root-only files. On hurd-i386 for instance, /dev/klog is only root
- readable, so the test fails, and thus inetutils-syslogd doesn't fill
- /dev/kern.log. ./configure should use test -e instead.
-
-
-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
-
-- iu_test_type=r # `exists'
-+ iu_test_type=e # `exists'
- iu_default='' iu_prev_cross_test=''
- for iu_try in $iu_paths_h $iu_search; do
- iu_cross_test=''
diff --git a/debian/patches/10_syslog_klog_doc.patch b/debian/patches/10_syslog_klog_doc.patch
index 4a63129..ea93ed8 100644
--- a/debian/patches/10_syslog_klog_doc.patch
+++ b/debian/patches/10_syslog_klog_doc.patch
@@ -1,7 +1,7 @@
-Index: b/syslogd/syslogd.8
+Index: b/src/syslogd.8
===================================================================
---- a/syslogd/syslogd.8
-+++ b/syslogd/syslogd.8
+--- a/src/syslogd.8
++++ b/src/syslogd.8
@@ -116,9 +116,12 @@ domain socket
.Pa /dev/log ,
from an Internet domain socket specified in
diff --git a/debian/patches/22_syslogd_conf.patch b/debian/patches/22_syslogd_conf.patch
index 69226d5..39843b2 100644
--- a/debian/patches/22_syslogd_conf.patch
+++ b/debian/patches/22_syslogd_conf.patch
@@ -1,7 +1,10 @@
-Index: b/syslogd/syslog.conf
-===================================================================
+---
+ src/Makefile.am | 2 +
+ src/syslog.conf | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 72 insertions(+)
+
--- /dev/null
-+++ b/syslogd/syslog.conf
++++ b/src/syslog.conf
@@ -0,0 +1,70 @@
+# /etc/syslog.conf Configuration file for inetutils-syslogd.
+#
@@ -73,16 +76,14 @@ Index: b/syslogd/syslog.conf
+ *.=debug;*.=info;\
+ *.=notice;*.=warn |/dev/xconsole
+
-Index: b/syslogd/Makefile.am
-===================================================================
---- a/syslogd/Makefile.am
-+++ b/syslogd/Makefile.am
-@@ -24,6 +24,8 @@ EXTRA_PROGRAMS = syslogd
-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -114,6 +114,8 @@ inetdaemon_PROGRAMS += @syslogd_BUILD@
syslogd_SOURCES = syslogd.c
+ EXTRA_PROGRAMS += syslogd
+dist_sysconf_DATA = syslog.conf
+
- man_MANS = syslog.conf.5 syslogd.8
-
- @PATHDEFS_MAKE@
+ inetdaemon_PROGRAMS += @tftpd_BUILD@
+ tftpd_SOURCES = tftpd.c
+ EXTRA_PROGRAMS += tftpd
diff --git a/debian/patches/30_ping_suid_perms.patch b/debian/patches/30_ping_suid_perms.patch
index 2c77b03..d3f2cf3 100644
--- a/debian/patches/30_ping_suid_perms.patch
+++ b/debian/patches/30_ping_suid_perms.patch
@@ -1,13 +1,15 @@
-Index: b/ping/Makefile.am
-===================================================================
+---
+ ping/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
-@@ -32,7 +32,7 @@ ping_SOURCES = ping.c ping_common.c ping
-
+@@ -36,7 +36,7 @@ ping_SOURCES = ping.c ping_common.c ping
+ ping_router.c ping_timestamp.c ping_common.h ping_impl.h ping.h libping.c
ping6_SOURCES = ping6.c ping_common.c ping_common.h ping6.h
-SUIDMODE = -o root -m 4775
+SUIDMODE = -o root -m 4755
install-ping-hook:
- -@for program in $(bin_PROGRAMS); do \
+ -@for x in $(bin_PROGRAMS); do \
diff --git a/debian/patches/50_split_load_conffile.patch b/debian/patches/50_split_load_conffile.patch
index 62a9bbd..6a22953 100644
--- a/debian/patches/50_split_load_conffile.patch
+++ b/debian/patches/50_split_load_conffile.patch
@@ -4,22 +4,20 @@ Date: Wed, 20 Feb 2008 05:23:19 +0200
Subject: [PATCH] Split load_conffile
---
- syslogd/syslogd.c | 111 +++++++++++++++++++++++++++++------------------------
- 1 files changed, 61 insertions(+), 50 deletions(-)
+ src/syslogd.c | 111 +++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 61 insertions(+), 50 deletions(-)
-Index: b/syslogd/syslogd.c
-===================================================================
---- a/syslogd/syslogd.c
-+++ b/syslogd/syslogd.c
-@@ -263,6 +263,7 @@ int decode (const char *, CODE *);
- void die (int);
+--- a/src/syslogd.c
++++ b/src/syslogd.c
+@@ -249,6 +249,7 @@ void die (int);
+ void doexit (int);
void domark (int);
void fprintlog (struct filed *, const char *, int, const char *);
+static int load_conffile (const char *, struct filed **);
void init (int);
void logerror (const char *);
void logmsg (int, const char *, const char *, int);
-@@ -1551,12 +1552,11 @@ die (int signo)
+@@ -1541,12 +1542,11 @@ die (int signo)
exit (0);
}
@@ -35,7 +33,7 @@ Index: b/syslogd/syslogd.c
char *p;
#ifndef LINE_MAX
# define LINE_MAX 2048
-@@ -1565,61 +1565,20 @@ init (int signo ARG_UNUSED)
+@@ -1555,61 +1555,20 @@ init (int signo ARG_UNUSED)
char *cbuf;
char *cline;
int cont_line = 0;
@@ -100,7 +98,7 @@ Index: b/syslogd/syslogd.c
/* Allocate a buffer for line parsing. */
cbuf = malloc (line_max);
if (cbuf == NULL)
-@@ -1627,7 +1586,7 @@ init (int signo ARG_UNUSED)
+@@ -1617,7 +1576,7 @@ init (int signo ARG_UNUSED)
/* There is no graceful recovery here. */
dbg_printf ("cannot allocate space for configuration\n");
fclose (cf);
@@ -109,7 +107,7 @@ Index: b/syslogd/syslogd.c
}
cline = cbuf;
-@@ -1668,7 +1627,7 @@ init (int signo ARG_UNUSED)
+@@ -1658,7 +1617,7 @@ init (int signo ARG_UNUSED)
dbg_printf ("cannot allocate space configuration\n");
fclose (cf);
free (cbuf);
@@ -118,7 +116,7 @@ Index: b/syslogd/syslogd.c
}
else
cbuf = tmp;
-@@ -1715,6 +1674,58 @@ init (int signo ARG_UNUSED)
+@@ -1705,6 +1664,58 @@ init (int signo ARG_UNUSED)
fclose (cf);
free (cbuf);
diff --git a/debian/patches/51_add_load_confdir_support.patch b/debian/patches/51_add_load_confdir_support.patch
index afd19eb..28a8850 100644
--- a/debian/patches/51_add_load_confdir_support.patch
+++ b/debian/patches/51_add_load_confdir_support.patch
@@ -4,17 +4,15 @@ Date: Wed, 20 Feb 2008 05:29:26 +0200
Subject: [PATCH] Add load_confdir support
---
- paths | 1 +
- syslogd/Makefile.am | 3 +-
- syslogd/syslogd.8 | 3 ++
- syslogd/syslogd.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ paths | 1
+ src/Makefile.am | 2 -
+ src/syslogd.8 | 3 ++
+ src/syslogd.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 61 insertions(+), 2 deletions(-)
-Index: b/paths
-===================================================================
--- a/paths
+++ b/paths
-@@ -91,6 +91,7 @@ PATH_LASTLOG <utmp.h> $(localstatedir)/l
+@@ -90,6 +90,7 @@ PATH_LASTLOG <utmp.h> $(localstatedir)/l
PATH_LOG <syslog.h> /dev/log
PATH_KLOG <syslog.h> /dev/klog no
PATH_LOGCONF $(sysconfdir)/syslog.conf
@@ -22,24 +20,19 @@ Index: b/paths
PATH_LOGIN x $(bindir)/login search:login
PATH_LOGPID $(localstatedir)/run/syslog.pid
PATH_NOLOGIN $(sysconfdir)/nologin
-Index: b/syslogd/Makefile.am
-===================================================================
---- a/syslogd/Makefile.am
-+++ b/syslogd/Makefile.am
-@@ -31,7 +31,8 @@ man_MANS = syslog.conf.5 syslogd.8
- @PATHDEFS_MAKE@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -133,7 +133,7 @@ LDADD = -L$(top_builddir)/libicmp -licmp
+ -L$(top_builddir)/lib ../lib/libgnu.a \
+ $(LIBAUTH) $(LIBCRYPT) $(LIBUTIL)
- AM_CPPFLAGS = $(PATHDEF_LOG) $(PATHDEF_KLOG) $(PATHDEF_LOGCONF) \
-- $(PATHDEF_LOGPID) $(PATHDEF_CONSOLE) $(PATHDEF_UTMP)
-+ $(PATHDEF_LOGCONFD) $(PATHDEF_LOGPID) $(PATHDEF_CONSOLE) \
-+ $(PATHDEF_UTMP)
+-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)
++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_LOGCONFD) $(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UUCICO)
- INCLUDES = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib
+ SUIDMODE = -o root -m 4775
-Index: b/syslogd/syslogd.8
-===================================================================
---- a/syslogd/syslogd.8
-+++ b/syslogd/syslogd.8
+--- a/src/syslogd.8
++++ b/src/syslogd.8
@@ -70,6 +70,9 @@ sockets.
.It \fB-f\fR, \fB--rcfile\fR=\fIFILE\fP
Specify the pathname of an alternate configuration file;
@@ -50,19 +43,17 @@ Index: b/syslogd/syslogd.8
.It \fB-h\fR, \fB--hop\fR
Enable forwarding remote messages. By default syslogd will not
forward messages it receives from remote hosts.
-Index: b/syslogd/syslogd.c
-===================================================================
---- a/syslogd/syslogd.c
-+++ b/syslogd/syslogd.c
-@@ -119,6 +119,7 @@
+--- a/src/syslogd.c
++++ b/src/syslogd.c
+@@ -108,6 +108,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <dirent.h>
#include <unistd.h>
- #ifdef HAVE_STDARG_H
-@@ -147,6 +148,7 @@
+ #include <stdarg.h>
+@@ -132,6 +133,7 @@
int facilities_seen;
const char *ConfFile = PATH_LOGCONF; /* Default Configuration file. */
@@ -70,7 +61,7 @@ Index: b/syslogd/syslogd.c
const char *PidFile = PATH_LOGPID; /* Default path to tuck pid. */
char ctty[] = PATH_CONSOLE; /* Default console to send message info. */
-@@ -264,6 +266,7 @@ void die (int);
+@@ -250,6 +252,7 @@ void doexit (int);
void domark (int);
void fprintlog (struct filed *, const char *, int, const char *);
static int load_conffile (const char *, struct filed **);
@@ -78,17 +69,17 @@ Index: b/syslogd/syslogd.c
void init (int);
void logerror (const char *);
void logmsg (int, const char *, const char *, int);
-@@ -344,6 +347,9 @@ static struct argp_option argp_options[]
- {"rcfile", 'f', "FILE", 0, "Override configuration file (default: "
+@@ -328,6 +331,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: "
++ {"rcdir", 'D', "DIR", 0, "override configuration directory (default: "
+ PATH_LOGCONFD ")",
+ GRP+1},
- {"socket", 'p', "FILE", 0, "Override default unix domain socket " PATH_LOG,
+ {"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
+ {"sync", 'S', NULL, 0, "force a file sync on every line", GRP+1},
+@@ -399,6 +405,10 @@ parse_opt (int key, char *arg, struct ar
ConfFile = arg;
break;
@@ -99,7 +90,7 @@ Index: b/syslogd/syslogd.c
case 'p':
funix[0].name = arg;
funix[0].fd = -1;
-@@ -1677,6 +1687,51 @@ load_conffile (const char *filename, str
+@@ -1667,6 +1677,51 @@ load_conffile (const char *filename, str
return 1;
}
@@ -151,7 +142,7 @@ Index: b/syslogd/syslogd.c
/* INIT -- Initialize syslogd from configuration table. */
RETSIGTYPE
init (int signo ARG_UNUSED)
-@@ -1724,7 +1779,7 @@ init (int signo ARG_UNUSED)
+@@ -1714,7 +1769,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
deleted file mode 100644
index fc17f98..0000000
--- a/debian/patches/52_sigalarm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: b/syslogd/syslogd.c
-===================================================================
---- a/syslogd/syslogd.c
-+++ b/syslogd/syslogd.c
-@@ -263,6 +263,7 @@ void cfline (const char *, struct filed
- const char *cvthname (struct sockaddr_in *);
- int decode (const char *, CODE *);
- void die (int);
-+void doexit (int);
- void domark (int);
- void fprintlog (struct filed *, const char *, int, const char *);
- static int load_conffile (const char *, struct filed **);
-@@ -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. */
-+ signal (SIGTERM, doexit);
- ppid = waitdaemon (0, 0, 30);
- if (ppid < 0)
- 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)
-- kill (ppid, SIGALRM);
-+ kill (ppid, SIGTERM);
-
- for (;;)
- {
-@@ -1521,6 +1523,12 @@ logerror (const char *type)
- }
-
- RETSIGTYPE
-+doexit (int signo ARG_UNUSED)
-+{
-+ exit (0);
-+}
-+
-+RETSIGTYPE
- die (int signo)
- {
- struct filed *f;
diff --git a/debian/patches/53_man_inetd_max_conn.patch b/debian/patches/53_man_inetd_max_conn.patch
index cf61e37..1090f87 100644
--- a/debian/patches/53_man_inetd_max_conn.patch
+++ b/debian/patches/53_man_inetd_max_conn.patch
@@ -1,7 +1,7 @@
-Index: b/inetd/inetd.8
+Index: b/src/inetd.8
===================================================================
---- a/inetd/inetd.8
-+++ b/inetd/inetd.8
+--- a/src/inetd.8
++++ b/src/inetd.8
@@ -88,7 +88,7 @@ Pass local and remote address data via e
\fBENVIRONMENT\fP below.
.It Fl R, -rate Ar rate
diff --git a/debian/patches/99_acinclude_del_dnl.patch b/debian/patches/99_acinclude_del_dnl.patch
deleted file mode 100644
index 106f33f..0000000
--- a/debian/patches/99_acinclude_del_dnl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 81676d4013791d32315d098541886e3207b6077d Mon Sep 17 00:00:00 2001
-From: Simon Josefsson <simon@josefsson.org>
-Date: Sat, 2 May 2009 06:38:27 +0000
-Subject: [PATCH] acinclude.m4: Avoid comment to fix script.
-
----
- acinclude.m4 | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index ebb8ee1..6206545 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1,6 +1,6 @@
- dnl Autoconf macros used by inetutils
- dnl
--dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
-+dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
- dnl
- dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
- dnl
-@@ -577,7 +577,7 @@ if (sizeof(ac_aggr.m4_bpatsubst([$1], [^[^.]*\.])))
- return 0;])],
- [AS_VAR_SET(ac_Member, yes)],
- [AS_VAR_SET(ac_Member, no)])])
--AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl
-+AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])
- AS_VAR_POPDEF([ac_Member])dnl
- ])dnl IU_CHECK_MEMBER
-
---
-1.6.3.3
-
diff --git a/debian/patches/99_ping_default_inf_count.patch b/debian/patches/99_ping_default_inf_count.patch
deleted file mode 100644
index 30e2e1e..0000000
--- a/debian/patches/99_ping_default_inf_count.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7e04d54de0ee83fd9c944962c2daa1cc745bbcb7 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
-Date: Mon, 5 Jan 2009 16:12:39 +0000
-Subject: [PATCH] More fixes.
-
-* ping/ping_common.h (DEFAULT_PING_COUNT): Set to 0. The
-standard behavior for ping is to keep sending packets until
-the user cancels it (unless -c is given).
-
----
- ping/ping_common.h | 2 +-
- 5 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/ping/ping_common.h b/ping/ping_common.h
-index a3618e4..2adeeea 100644
---- a/ping/ping_common.h
-+++ b/ping/ping_common.h
-@@ -50,7 +50,7 @@ struct ping_stat
-
- #define PING_CKTABSIZE 128
-
--#define DEFAULT_PING_COUNT 4
-+#define DEFAULT_PING_COUNT 0
-
- #define PING_TIMING(s) (s >= PING_HEADER_LEN)
- #define PING_HEADER_LEN sizeof (struct timeval)
---
-1.6.3.3
-
diff --git a/debian/patches/series b/debian/patches/series
index c515b24..1db5f42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,6 @@
-01_no_link_extralibs.patch
-07_dev_test_e.patch
10_syslog_klog_doc.patch
22_syslogd_conf.patch
30_ping_suid_perms.patch
50_split_load_conffile.patch
51_add_load_confdir_support.patch
-52_sigalarm.patch
53_man_inetd_max_conn.patch
-99_acinclude_del_dnl.patch
-99_ping_default_inf_count.patch