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

[Jan Wagner]

Author: waja
Date: 2010-01-12 21:46:33 +0000 (Tue, 12 Jan 2010)
New Revision: 1813

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/rules
Log:
just use inetutils-ping on non-linux

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-01-12 21:27:18 UTC (rev 1812)
+++ nagios-plugins/trunk/debian/changelog	2010-01-12 21:46:33 UTC (rev 1813)
@@ -18,11 +18,10 @@
   * 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
+  * Depend on inetutils-ping on kfreebsd and hurd, 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
+    - Use '-n -c %d %s' as ping argument on archs where inetutils-ping is used
+    - Add 41_check_ping_detect_args.dpatch, thanks to Thomas Guyot-Sionnest
   * Add hint to NEWS.Debian, that check_linux_raid.pl and check_bgpstate will
     be removed in the next future
   * Add 42_check_linux_raid_fix_r10.dpatch, which fixes RAID Levels with more

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2010-01-12 21:27:18 UTC (rev 1812)
+++ nagios-plugins/trunk/debian/rules	2010-01-12 21:46:33 UTC (rev 1813)
@@ -14,6 +14,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 CFLAGS = -Wall -g
 
@@ -47,6 +48,15 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -n -U -w %d -c %d %s" \
+                      --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s"
+else
+PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -n -c %d %s" \
+                      --with-ping6-command="/bin/ping6 -n -c %d %s"
+endif
+
+
 config.status: configure
 	export PATH=$(PATH)
 	dh_testdir
@@ -81,8 +91,7 @@
 		--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" \
+		$(PING_CONFIGURE_ARGS) \
 		--with-nslookup-command="/usr/bin/nslookup -sil" \
 		--with-uptime-command="/usr/bin/uptime" \
 		--with-rpcinfo-command="/usr/bin/rpcinfo" \