rpms/nagios-plugins/devel nagios-plugins-1.4.11-ping_timeout.patch, NONE, 1.1 nagios-plugins.spec, 1.38, 1.39

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30382

Modified Files:
	nagios-plugins.spec 
Added Files:
	nagios-plugins-1.4.11-ping_timeout.patch 
Log Message:
fixes for 520588

nagios-plugins-1.4.11-ping_timeout.patch:

--- NEW FILE nagios-plugins-1.4.11-ping_timeout.patch ---
--- t/nagios-plugins-1.4.11/configure	2007-12-13 16:42:38.000000000 -0600
+++ nagios-plugins-1.4.11/configure	2008-04-09 10:42:30.000000000 -0500
@@ -25332,7 +25332,7 @@
 	fi
 
 elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
-	$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
+	$PATH_TO_PING -n -s 127.0.0.1 56 1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -U -c %d %s"
@@ -25349,7 +25349,7 @@
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
+elif $PATH_TO_PING -n -U -c 1 127.0.0.1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -U -c %d %s"
@@ -25357,7 +25357,7 @@
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
+elif $PATH_TO_PING -n -c 1 127.0.0.1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING -n -c %d %s"
@@ -25365,35 +25365,35 @@
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
+elif $PATH_TO_PING -n 127.0.0.1 -c 1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING -n %s -c %d"
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
+elif $PATH_TO_PING 127.0.0.1 -n 1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING %s -n %d"
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
+elif $PATH_TO_PING -n -s 127.0.0.1 56 1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
+elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
+elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
@@ -25401,7 +25401,7 @@
 	{ echo "$as_me:$LINENO: result: $with_ping_command" >&5
 echo "${ECHO_T}$with_ping_command" >&6; }
 
-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
+elif $PATH_TO_PING -n -c 1 127.0.0.1 -w 5 2>/dev/null | \
 	egrep -i "^round-trip|^rtt" >/dev/null
 then
 	with_ping_command="$PATH_TO_PING -n -c %d %s"


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- nagios-plugins.spec	29 Feb 2008 04:22:02 -0000	1.38
+++ nagios-plugins.spec	9 Apr 2008 19:26:41 -0000	1.39
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
 Patch2: nagios-plugins-check_log-path.patch
+Patch3: nagios-plugins-1.4.11-ping_timeout.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -511,6 +513,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \
@@ -798,6 +801,9 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Wed Apr 09 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-2
+- Fix for 250588
+
 * Thu Feb 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-1
 - Upstream released version 1.4.11
 - Added check_ntp peer and time