diff --git a/.gitignore b/.gitignore index 878d3b2..a2bba48 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nagios-plugins-1.4.14.tar.gz +nagios-plugins-1.4.15.tar.gz diff --git a/nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch b/nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch deleted file mode 100644 index a6338af..0000000 --- a/nagios-plugins-0005-Restore-SSL-behaviour-in-case-of-self-signed-certifi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 054f0527f51c1c40da12941f3c2c11004bdd1ed0 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -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 ---- - 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 - diff --git a/nagios-plugins.spec b/nagios-plugins.spec index c6b5189..be222b5 100644 --- a/nagios-plugins.spec +++ b/nagios-plugins.spec @@ -1,18 +1,17 @@ Name: nagios-plugins -Version: 1.4.14 -Release: 4%{?dist} +Version: 1.4.15 +Release: 1%{?dist} Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System License: GPLv2+ URL: http://nagiosplug.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz Source1: nagios-plugins.README.Fedora 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) @@ -529,9 +528,6 @@ 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 \ @@ -833,6 +829,10 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/check_wave %changelog +* Wed Aug 18 2010 Peter Lemenkov - 1.4.15-1 +- Ver. 1.4.15 +- Dropped patch for restoration of behaviour in case of ssl checks + * Tue May 18 2010 Peter Lemenkov - 1.4.14-4 - Restore ssl behaviour for check_http in case of self-signed certificates (see rhbz #584227). diff --git a/sources b/sources index 34181b6..09215b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1835a48a777863ed2583de3c82446a9 nagios-plugins-1.4.14.tar.gz +56abd6ade8aa860b38c4ca4a6ac5ab0d nagios-plugins-1.4.15.tar.gz