[Pkg-nagios-changes] [pkg-nagios-plugins] 194/413: revert r1788, since check_ping is segfaulting, needs more investigating

[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 ab3ba9033c1a8446ed6c373b3e6ca6f1093aa6c2
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Nov 18 20:17:16 2009 +0000

    revert r1788, since check_ping is segfaulting, needs more investigating
---
 debian/changelog | 4 ----
 debian/control   | 2 +-
 debian/rules     | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52b1f9d..e25aae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,10 +18,6 @@ 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
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 12 Nov 2009 02:19:28 +0100
 
diff --git a/debian/control b/debian/control
index ef0420d..b4392be 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, inetutils-ping, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping, ucf
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins, nagios-plugins-standard
 Suggests: nagios3
diff --git a/debian/rules b/debian/rules
index 0df4605..f61c513 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 -c %d %s" \
-		--with-ping6-command="/bin/ping6 -n -c %d %s" \
+		--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-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