rpms/nagios-plugins/F-7 nagios-plugins-1.4.11-ping_timeout.patch, NONE, 1.1 nagios-plugins.spec, 1.32, 1.33 sources, 1.9, 1.10

Thu Apr 10 14:49:35 UTC 2008

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22960/F-7

Modified Files:
	nagios-plugins.spec sources 
Added Files:
	nagios-plugins-1.4.11-ping_timeout.patch 
Log Message:
upstream released new version

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/F-7/nagios-plugins.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nagios-plugins.spec	10 Jan 2008 14:47:39 -0000	1.32
+++ nagios-plugins.spec	10 Apr 2008 14:48:53 -0000	1.33
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.10
-Release: 4%{?dist}
+Version: 1.4.11
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -10,8 +10,9 @@
 Source1: nagios-plugins.README.Fedora
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
-Patch2: nagiosplugins-checksnmp-crash.patch
-Patch3: nagios-plugins-check_log-path.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,7 +512,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 
 %build
@@ -687,6 +688,8 @@
 %files ntp
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_ntp
+%{_libdir}/nagios/plugins/check_ntp_peer
+%{_libdir}/nagios/plugins/check_ntp_time
 
 %files nwstat
 %defattr(-,root,root,-)
@@ -798,6 +801,19 @@
 %{_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
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.10-6
+- Autorebuild for GCC 4.3
+
+* Tue Feb 12 2008 Mike McGrath <mmcgrath at redhat.com> 1.4-10-5
+- Rebuild for gcc43
+
 * Thu Jan 10 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.10-4
 - Fixed check_log plugin #395601
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Jan 2008 14:31:47 -0000	1.9
+++ sources	10 Apr 2008 14:48:53 -0000	1.10
@@ -1 +1 @@
-c67841223864ae1626ab2adb2f0b4c9d  nagios-plugins-1.4.10.tar.gz
+042783a2180a6987e0b403870b3d01f7  nagios-plugins-1.4.11.tar.gz


