Tue May 18 06:27:17 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/nagios-plugins/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5113/EL-5

Modified Files:
	import.log nagios-plugins.spec 
Added Files:
	nagios-plugins-0001-Do-not-use-usr-local-for-perl.patch 
	nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch 
	nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch 
	nagios-plugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch 
	nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch 
Removed Files:
	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 
Log Message:
Restore ssl behaviour for check_http in case of self-sugned certificates for EL-4/5

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

--- NEW FILE nagios-plugins-0001-Do-not-use-usr-local-for-perl.patch ---
>From 7db89e0edeeb9006234ee8b8a92065acca0d02a5 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/5] 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-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch:
 check_ntp.pl |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch ---
>From 85fb9c0abeb554568c2e3f27a9fe215a6e9fb77d 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/5] 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-plugins-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-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch ---
>From 5e778e429ee782992f1eaa862df095fd3b353576 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/5] 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-plugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch:
 subst.in |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE nagios-plugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch ---
>From 28a32b3e87ac5489a544e6727a65ff98a9dfaeb3 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/5] 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


nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch:
 check_http.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch ---
>From 054f0527f51c1c40da12941f3c2c11004bdd1ed0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 18 May 2010 09:48:59 +0400
Subject: [PATCH 5/5] Restore SSL behaviour in case of self-signed certificates as it was in
 previous version 1.4.13. This should affect only EL-4 and EL-5 branches.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 plugins/check_http.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 79f6adf..0310203 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -790,7 +790,7 @@ check_http (void)
     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
 #ifdef HAVE_SSL
   if (use_ssl == TRUE) {
-    np_net_ssl_init_with_hostname(sd, host_name);
+    np_net_ssl_init(sd);
     if (check_cert == TRUE) {
       result = np_net_ssl_check_cert(days_till_exp);
       np_net_ssl_cleanup();
-- 
1.6.6.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	30 Apr 2010 11:24:33 -0000	1.3
+++ import.log	18 May 2010 06:27:13 -0000	1.4
@@ -1,3 +1,4 @@
 nagios-plugins-1_4_14-1_fc12:EL-5:nagios-plugins-1.4.14-1.fc12.src.rpm:1268215116
 nagios-plugins-1_4_14-2_fc12:EL-5:nagios-plugins-1.4.14-2.fc12.src.rpm:1271074619
 nagios-plugins-1_4_14-3_fc12:EL-5:nagios-plugins-1.4.14-3.fc12.src.rpm:1272626561
+nagios-plugins-1_4_14-4_fc12:EL-5:nagios-plugins-1.4.14-4.fc12.src.rpm:1274163890


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/EL-5/nagios-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- nagios-plugins.spec	30 Apr 2010 11:24:33 -0000	1.44
+++ nagios-plugins.spec	18 May 2010 06:27:15 -0000	1.45
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.14
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -8,10 +8,11 @@ License: GPLv2+
 URL: http://nagiosplug.sourceforge.net/
 Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
 Source1: nagios-plugins.README.Fedora
-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
+Patch1:	nagios-plugins-0001-Do-not-use-usr-local-for-perl.patch
+Patch2: nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch
+Patch3: nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch
+Patch4: nagios-plugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch
+Patch5: nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -528,6 +529,9 @@ Provides check_wave support for Nagios.
 %patch2 -p1 -b .not_parsed
 %patch3 -p1 -b .proper_paths
 %patch4 -p1 -b .no_need_fo_fix_paths
+%if 0%{?el4}%{?el5}
+%patch5 -p1 -b .restore_ssl_behaviour
+%endif
 
 %build
 %configure \
@@ -829,6 +833,10 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/check_wave
 
 %changelog
+* Tue May 18 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-4
+- Restore ssl behaviour for check_http in case of self-signed
+  certificates (see rhbz #584227).
+
 * Sat Apr 24 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-3
 - Removed Requires - nagios (see rhbz #469530).
 - Added "Requires,Requires(pre): group(nagios)" where necessary


--- nagios-pugins-0001-Do-not-use-usr-local-for-perl.patch DELETED ---


--- nagios-pugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch DELETED ---


--- nagios-pugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch DELETED ---


--- nagios-pugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch DELETED ---

