[Pkg-nagios-changes] [pkg-nagios-plugins] 195/413: depend on inetutils-ping

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 466c887beec0de8e8e9f7f0837221be5b8410cfd
Author: Jan Wagner <waja at cyconet.org>
Date:   Sat Dec 5 01:51:36 2009 +0000

    depend on inetutils-ping
---
 debian/changelog                                |  7 ++++-
 debian/control                                  |  2 +-
 debian/patches/00list                           |  1 +
 debian/patches/41_check_ping_detect_args.dpatch | 36 +++++++++++++++++++++++++
 debian/rules                                    |  4 +--
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e25aae8..0bee717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,13 @@ nagios-plugins (1.4.14-1) unstable; urgency=low
   * Add 40_check_http_proxy_auth.dpatch to make check_http able to check proxy
     authorization
   * Update copyright, thanks to Robert Millan (Closes: 548303)
+  * Depend on inetutils-ping instead of iputils-ping, thanks to Petr Salinger
+    (Closes: #555532)
+    - Use '-n -c %d %s' as ping argument, since unfortunately '-U -w %d' isn't
+      supported by inetutils-ping
+    - Add 41_check_ping_detect_args.dpatch, that to Thomas Guyot-Sionnest
 
- -- Jan Wagner <waja at cyconet.org>  Thu, 12 Nov 2009 02:19:28 +0100
+ -- Jan Wagner <waja at cyconet.org>  Sat, 05 Dec 2009 02:46:35 +0100
 
 nagios-plugins (1.4.13+git200906171200-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b4392be..ef0420d 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: Plugins for the nagios network monitoring and management system
 
 Package: nagios-plugins-basic
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, procps, inetutils-ping, ucf
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins, nagios-plugins-standard
 Suggests: nagios3
diff --git a/debian/patches/00list b/debian/patches/00list
index 019ef7d..c2bd6ff 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -15,3 +15,4 @@
 38_fix_libexec.dpatch
 39_check_ircd_fix_epn.dpatch
 40_check_http_proxy_auth.dpatch
+41_check_ping_detect_args.dpatch
diff --git a/debian/patches/41_check_ping_detect_args.dpatch b/debian/patches/41_check_ping_detect_args.dpatch
new file mode 100644
index 0000000..c656a7b
--- /dev/null
+++ b/debian/patches/41_check_ping_detect_args.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 41_check_ping_detect_args.dpatch
+## From: Thomas Guyot-Sionnest <dermoth at aei.ca>
+## Date: Fri, 4 Dec 2009 15:24:15 -0500
+## Subject: [PATCH] Detect arguments passed via --with-ping[6]-command (#2908236)
+### X-Git-Url: http://repo.or.cz/w/nagiosplugins.git?a=commitdiff_plain;h=08199792ba8bf19c2dbdc27f68689e571d4240a9
+##
+## DP: Detect arguments passed via --with-ping[6]-command (SF #2908236 / Debian #555532)
+
+ at DPATCH@
+
+diff --git a/configure.in b/configure.in
+index f354734..84b2050 100644
+--- a/configure.in
++++ b/configure.in
+@@ -877,10 +877,16 @@ ac_cv_ping_has_timeout=no
+ if test -n "$with_ping_command"
+ then
+ 	AC_MSG_RESULT([(command-line) $with_ping_command])
+-	if test -n "$ac_cv_ping_packets_first"
++	if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
+ 	then
+ 		ac_cv_ping_packets_first=yes
+ 		ac_cv_ping_has_timeout=yes
++	elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null
++	then
++		ac_cv_ping_has_timeout=yes
++	elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
++	then
++		ac_cv_ping_packets_first=yes
+ 	fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+-- 
+1.6.5.1
+
diff --git a/debian/rules b/debian/rules
index f61c513..da2209f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,8 @@ config.status: configure
 		--with-ps-format="%s %d %d %d %d %d %f %s %s %n" \
 		--with-ps-cols=10 \
 		--with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" \
-		--with-ping-command="/bin/ping -n -U -w %d -c %d %s" \
-		--with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" \
+		--with-ping-comman="/bin/ping -n -c %d %s" \
+		--with-ping6-command="/bin/ping6 -n -c %d %s" \
 		--with-nslookup-command="/usr/bin/nslookup -sil" \
 		--with-uptime-command="/usr/bin/uptime" \
 		--with-rpcinfo-command="/usr/bin/rpcinfo" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git