[Pkg-nagios-changes] [pkg-nagios] r1791 - nagios-plugins/trunk/debian

[Jan Wagner]

Author: waja
Date: 2009-11-18 20:17:16 +0000 (Wed, 18 Nov 2009)
New Revision: 1791

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/control
   nagios-plugins/trunk/debian/rules
Log:
revert r1788, since check_ping is segfaulting, needs more investigating

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2009-11-16 22:18:05 UTC (rev 1790)
+++ nagios-plugins/trunk/debian/changelog	2009-11-18 20:17:16 UTC (rev 1791)
@@ -18,10 +18,6 @@
   * 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
 

Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control	2009-11-16 22:18:05 UTC (rev 1790)
+++ nagios-plugins/trunk/debian/control	2009-11-18 20:17:16 UTC (rev 1791)
@@ -33,7 +33,7 @@
 
 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

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2009-11-16 22:18:05 UTC (rev 1790)
+++ nagios-plugins/trunk/debian/rules	2009-11-18 20:17:16 UTC (rev 1791)
@@ -81,8 +81,8 @@
 		--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" \