[Pkg-nagios-changes] [pkg-nagios] r1347 - in nagios-plugins/branches/sarge/debian: . patches

[Sean Finney]

Author: seanius
Date: 2008-02-15 20:34:05 +0000 (Fri, 15 Feb 2008)
New Revision: 1347

Modified:
   nagios-plugins/branches/sarge/debian/patches/11_hardcode_against_regressions.dpatch
   nagios-plugins/branches/sarge/debian/rules
Log:
update ping fix for regression fix

Modified: nagios-plugins/branches/sarge/debian/patches/11_hardcode_against_regressions.dpatch
===================================================================
--- nagios-plugins/branches/sarge/debian/patches/11_hardcode_against_regressions.dpatch	2008-02-15 20:14:14 UTC (rev 1346)
+++ nagios-plugins/branches/sarge/debian/patches/11_hardcode_against_regressions.dpatch	2008-02-15 20:34:05 UTC (rev 1347)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad nagios-plugins-sarge~/config.h.in nagios-plugins-sarge/config.h.in
 --- nagios-plugins-sarge~/config.h.in	2005-02-04 01:47:45.000000000 +0100
-+++ nagios-plugins-sarge/config.h.in	2008-02-15 20:16:36.000000000 +0100
++++ nagios-plugins-sarge/config.h.in	2008-02-15 21:33:07.000000000 +0100
 @@ -632,6 +632,9 @@
  
  /* path to qmail-qstat */
@@ -18,3 +18,15 @@
  
  /* path to ntpdate binary */
  #undef PATH_TO_NTPDATE
+diff -urNad nagios-plugins-sarge~/configure nagios-plugins-sarge/configure
+--- nagios-plugins-sarge~/configure	2008-02-15 21:33:07.000000000 +0100
++++ nagios-plugins-sarge/configure	2008-02-15 21:35:06.000000000 +0100
+@@ -14347,7 +14347,7 @@
+ 
+ fi
+ 
+-if test "x$ac_cv_ping_has_timeout" != "xno"
++if test "x$ac_cv_ping_has_timeout" != "xno" || test -n "$PING_HAS_TIMEOUT"
+ then
+ 
+ cat >>confdefs.h <<\_ACEOF

Modified: nagios-plugins/branches/sarge/debian/rules
===================================================================
--- nagios-plugins/branches/sarge/debian/rules	2008-02-15 20:14:14 UTC (rev 1346)
+++ nagios-plugins/branches/sarge/debian/rules	2008-02-15 20:34:05 UTC (rev 1347)
@@ -37,7 +37,7 @@
 		exit 1; \
 	fi
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" PATH_TO_MAILQ="/usr/bin/mailq" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/nagios/plugins --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-df-command="/bin/df -Pk" --with-ping-command="/bin/ping -n -U -w %d -c %d %s" --with-ping6-command="/bin/ping6 -n -U -c %d %s"
+	CFLAGS="$(CFLAGS)" PATH_TO_MAILQ="/usr/bin/mailq" PING_HAS_TIMEOUT=1 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/nagios/plugins --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-df-command="/bin/df -Pk" --with-ping-command="/bin/ping -n -U -w %d -c %d %s" --with-ping6-command="/bin/ping6 -n -U -c %d %s"
 
 build: patch-stamp build-stamp