Pull fixes from upstream

Restore the traditional behavior of ping without -c option.

Closes: #524011

Fix build failure due to an m4 comment eating a new line.

Closes: #541775

4 files changed, 68 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 048b87b..0f4b7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ inetutils (2:1.6-2) UNRELEASED; urgency=low
   * Add support for LSB status action on init scripts.
   * Use a variable instead of hardcoding the pid file path in inetutils-inetd
     init script.
+  * Restore the traditional behavior of ping without -c option. Closes: #524011
+    Stolen from upstream.
+  * Fix build failure due to an m4 comment eating a new line. Closes: #541775
+    Stolen from upstream.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 18 Apr 2009 01:26:42 +0200
 
diff --git a/debian/patches/99_acinclude_del_dnl.patch b/debian/patches/99_acinclude_del_dnl.patch
new file mode 100644
index 0000000..106f33f
--- /dev/null
+++ b/debian/patches/99_acinclude_del_dnl.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000..30e2e1e
--- /dev/null
+++ b/debian/patches/99_ping_default_inf_count.patch
@@ -0,0 +1,29 @@
+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 79de9ea..c515b24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@
 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