Mon Apr 12 12:14:36 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/nagios-plugins/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7578/F-12

Modified Files:
	.cvsignore nagios-plugins.spec sources 
Added Files:
	import.log 
	nagios-pugins-0001-Do-not-use-usr-local-for-perl.patch 
	nagios-pugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch 
	nagios-pugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch 
	nagios-pugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch 
Removed Files:
	check_smtp.recvline.diff.2 
	nagios-plugins-1.4.11-pgsql-fix.patch 
	nagios-plugins-1.4.11-ping_timeout.patch 
	nagios-plugins-1.4.13-linux_raid.patch 
	nagios-plugins-1.4.13-ntp.patch 
	nagios-plugins-1.4.3-ntpd.patch 
	nagios-plugins-1.4.3-subst.patch 
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
	nagios-plugins-1.4.6-radius-ng.patch 
	nagios-plugins-check_log-path.patch 
	nagiosplugins-checksnmp-crash.patch 
Log Message:
Ver. 1.4.14 with rhbz tickets #469530, #526561, #538916 and #533777 closed


--- NEW FILE import.log ---
nagios-plugins-1_4_14-2_fc12:F-12:nagios-plugins-1.4.14-2.fc12.src.rpm:1271074440

nagios-pugins-0001-Do-not-use-usr-local-for-perl.patch:
 check_linux_raid.pl |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nagios-pugins-0001-Do-not-use-usr-local-for-perl.patch ---
>From 73739072f928639592ea37c45b3f63c505b8f62a Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 10 Mar 2010 12:02:00 +0300
Subject: [PATCH 1/4] Do not use /usr/local for perl

---
 contrib/check_linux_raid.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
index da1aff8..11bc3cd 100644
--- a/contrib/check_linux_raid.pl
+++ b/contrib/check_linux_raid.pl
@@ -23,7 +23,7 @@
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 
 use strict;
-use lib "/usr/local/nagios/libexec";
+use lib utils.pm;
 use utils qw(%ERRORS);
 
 # die with an error if we're not on Linux
-- 
1.6.6.1


nagios-pugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch:
 check_ntp.pl |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE nagios-pugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch ---
>From 983d069d97b3bdf0c8986c24e6042a68282f3a9f Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 10 Mar 2010 12:08:35 +0300
Subject: [PATCH 2/4] Remove assignment of (not parsed) to jitter

---
 plugins-scripts/check_ntp.pl |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl
index 5c87e0a..0733a63 100755
--- a/plugins-scripts/check_ntp.pl
+++ b/plugins-scripts/check_ntp.pl
@@ -313,7 +313,6 @@ if ($have_ntpq) {
 				}
 			} else {
 				print "No match!\n" if $verbose;
-				$jitter = '(not parsed)';
 			}
 			
 		}
-- 
1.6.6.1


nagios-pugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch:
 check_log.sh |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE nagios-pugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch ---
>From ccb5810ba28d726c29617d4544ca16ce20d97e03 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 10 Mar 2010 12:10:16 +0300
Subject: [PATCH 3/4] Fedora-specific fixes for searching for diff and tail

---
 plugins-scripts/check_log.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index a1bfb48..20fc2b2 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -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"
-- 
1.6.6.1


nagios-pugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch:
 subst.in |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE nagios-pugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch ---
>From a6aaae514c0a1c85dcefe8bad78ec24bf1db099e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 10 Mar 2010 12:15:08 +0300
Subject: [PATCH 4/4] Fedora-specific patch for not to fixing fully qualified paths in scripts

---
 plugins-scripts/subst.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in
index a70ad88..08f2895 100644
--- a/plugins-scripts/subst.in
+++ b/plugins-scripts/subst.in
@@ -52,11 +52,11 @@ BEGIN {
 # returned from the which subroutine. run before changes to INC to add libexecdir
 # FIXME: Prepend executables with a substitution keyword instead.
 #
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-	c=substr($0,RSTART,RLENGTH);
-	sub(c,which(c,path));
-}
+#/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
+#	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
+#	c=substr($0,RSTART,RLENGTH);
+#	sub(c,which(c,path));
+#}
 
 # add to libexecdir to INC for perl utils.pm
 /^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
-- 
1.6.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Sep 2008 03:42:16 -0000	1.12
+++ .cvsignore	12 Apr 2010 12:14:31 -0000	1.13
@@ -1 +1 @@
-nagios-plugins-1.4.13.tar.gz
+nagios-plugins-1.4.14.tar.gz


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-12/nagios-plugins.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- nagios-plugins.spec	21 Aug 2009 14:36:34 -0000	1.61
+++ nagios-plugins.spec	12 Apr 2010 12:14:34 -0000	1.62
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.13
-Release: 17%{?dist}
+Version: 1.4.14
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -8,11 +8,10 @@ License: GPLv2+
 URL: http://nagiosplug.sourceforge.net/
 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.3-ntpd.patch
-Patch2: nagios-plugins-check_log-path.patch
-Patch3: nagios-plugins-1.4.13-linux_raid.patch
-Patch4: nagios-plugins-1.4.13-ntp.patch
+Patch1:	nagios-pugins-0001-Do-not-use-usr-local-for-perl.patch
+Patch2: nagios-pugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch
+Patch3: nagios-pugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch
+Patch4: nagios-pugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +28,16 @@ BuildRequires: ntp
 BuildRequires: %{_bindir}/mailq
 BuildRequires: %{_sbindir}/fping
 BuildRequires: perl(Net::SNMP)
+%if 0%{?el4}
+%else
 BuildRequires: radiusclient-ng-devel
-BuildRequires: %{_bindir}/qstat
+%endif
+#BuildRequires: %{_bindir}/qstat
+#BuildRequires: %{_bindir}/quakestat
+BuildRequires: qstat
+
+Requires: nagios
+Requires(pre): nagios
 
 %global reqfilt sh -c "%{__perl_requires} | sed -e 's!perl(utils)!nagios-plugins-perl!'"
 %define __perl_requires %{reqfilt}
@@ -387,6 +394,8 @@ Requires: qstat
 %description game
 Provides check_game support for Nagios.
 
+%if 0%{?el4}
+%else
 %package radius
 Summary: Nagios Plugin - check_radius
 Group: Applications/System
@@ -394,6 +403,7 @@ Requires: nagios-plugins = %{version}-%{
 
 %description radius
 Provides check_radius support for Nagios.
+%endif
 
 %package real
 Summary: Nagios Plugin - check_real
@@ -511,17 +521,16 @@ Provides check_wave support for Nagios.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p0
-%patch4 -p2
+%patch1 -p1 -b .no_usr_local
+%patch2 -p1 -b .not_parsed
+%patch3 -p1 -b .proper_paths
+%patch4 -p1 -b .no_need_fo_fix_paths
 
 %build
 %configure \
 	--libexecdir=%{_libdir}/nagios/plugins \
 	--with-mysql \
-	PATH_TO_QSTAT=%{_bindir}/qstat \
+	PATH_TO_QSTAT=%{_bindir}/quakestat \
 	PATH_TO_FPING=%{_sbindir}/fping \
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
@@ -537,7 +546,10 @@ make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
 make check_ldap
+%if 0%{?el4}
+%else
 make check_radius
+%endif
 make check_pgsql
 
 cd ..
@@ -555,7 +567,10 @@ sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS
 %{__install} -m 0755 contrib/check_linux_raid %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins/check_ldap %{buildroot}/%{_libdir}/nagios/plugins
+%if 0%{?el4}
+%else
 %{__install} -m 0755 plugins/check_radius %{buildroot}/%{_libdir}/nagios/plugins
+%endif
 %{__install} -m 0755 plugins/check_pgsql %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
@@ -731,9 +746,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_game
 
+%if 0%{?el4}
+%else
 %files radius
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_radius
+%endif
 
 %files real
 %defattr(-,root,root,-)
@@ -809,6 +827,15 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Mon Apr 12 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-2
+- Added missing Requires - nagios (see rhbz #469530).
+- Fixed path to qstat -> quakestat (see rhbz #533777)
+- Disable radius plugin for EL4 - there is not radiuscleint-ng for EL-4
+
+* Wed Mar 10 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-1
+- Ver. 1.4.14
+- Rebased patches.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.13-17
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Sep 2008 03:42:16 -0000	1.12
+++ sources	12 Apr 2010 12:14:35 -0000	1.13
@@ -1 +1 @@
-be6cc7699fff3ee29d1fd4d562377386  nagios-plugins-1.4.13.tar.gz
+a1835a48a777863ed2583de3c82446a9  nagios-plugins-1.4.14.tar.gz


--- check_smtp.recvline.diff.2 DELETED ---


--- nagios-plugins-1.4.11-pgsql-fix.patch DELETED ---


--- nagios-plugins-1.4.11-ping_timeout.patch DELETED ---


--- nagios-plugins-1.4.13-linux_raid.patch DELETED ---


--- nagios-plugins-1.4.13-ntp.patch DELETED ---


--- nagios-plugins-1.4.3-ntpd.patch DELETED ---


--- nagios-plugins-1.4.3-subst.patch DELETED ---


--- nagios-plugins-1.4.4-check_ide_smart.patch DELETED ---


--- nagios-plugins-1.4.4-linux_raid.patch DELETED ---


--- nagios-plugins-1.4.6-radius-ng.patch DELETED ---


--- nagios-plugins-check_log-path.patch DELETED ---


--- nagiosplugins-checksnmp-crash.patch DELETED ---

