rpms/nagios-plugins/EL-5 nagios-plugins-check_log-path.patch, NONE, 1.1 nagios-plugins.spec, 1.30, 1.31

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/EL-5

Modified Files:
	nagios-plugins.spec 
Added Files:
	nagios-plugins-check_log-path.patch 
Log Message:
fix check_log

nagios-plugins-check_log-path.patch:

--- NEW FILE nagios-plugins-check_log-path.patch ---
--- nagios-plugins-1.4.8/plugins-scripts/check_log.sh.orig  2007-11-22 12:19:57.000000000 +0000
+++ nagios-plugins-1.4.8/plugins-scripts/check_log.sh   2007-11-22 12:20:13.000000000 +0000
@@ -62,8 +62,8 @@
 
 ECHO="/bin/echo"
 GREP="/bin/egrep"
-DIFF="/bin/diff"
-TAIL="/bin/tail"
+DIFF="/usr/bin/diff"
+TAIL="/usr/bin/tail"
 CAT="/bin/cat"
 RM="/bin/rm"
 CHMOD="/bin/chmod"



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/EL-5/nagios-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nagios-plugins.spec	26 Oct 2007 14:24:25 -0000	1.30
+++ nagios-plugins.spec	10 Jan 2008 14:19:15 -0000	1.31
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.8
-Release: 9%{?dist}
+Version: 1.4.10
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -9,11 +9,9 @@
 Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
 Source1: nagios-plugins.README.Fedora
 Patch0: nagios-plugins-1.4.3-subst.patch
-Patch1: nagios-plugins-1.4.6-radius-ng.patch
-Patch2: nagios-plugins-1.4.3-ntpd.patch
-Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
-Patch4: check_smtp.recvline.diff.2
-Patch5: nagiosplugins-checksnmp-crash.patch
+Patch1: nagios-plugins-1.4.3-ntpd.patch
+Patch2: nagiosplugins-checksnmp-crash.patch
+Patch3: nagios-plugins-check_log-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -50,7 +48,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave, nagios!
 -plugins-cluster
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -74,6 +72,14 @@
 %description breeze
 Provides check_breeze support for Nagios.
 
+%package cluster
+Summary: Nagios Plugin - check_cluster
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description cluster
+Provides check_cluster support for Nagios.
+
 %package by_ssh
 Summary: Nagios Plugin - check_by_ssh
 Group: Applications/System
@@ -507,8 +513,6 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
-%patch4 -p0
-%patch5 -p0
 
 %build
 %configure \
@@ -566,6 +570,10 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
 
+%files cluster
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_cluster
+
 %files by_ssh
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_by_ssh
@@ -637,6 +645,7 @@
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_ldap
+%{_libdir}/nagios/plugins/check_ldaps
 
 %files linux_raid
 %defattr(-,root,root,-)
@@ -789,6 +798,16 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Thu Jan 10 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.10-3
+- Fixed check_log plugin #395601
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.4.10-2
+- Rebuild for deps
+
+* Thu Dec 06 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.10-1
+- Upstream released new version
+- Removed some patches
+
 * Fri Oct 26 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.8-9
 - Fix for Bug 348731 and CVE-2007-5623