From e1aa44992f5e94af825fff5c790628460a598dab Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Thu, 15 May 2014 13:03:34 +0100
Subject: [PATCH] Update to 1.985

- New upstream release 1.985
  - Make OCSP callback return 1 even if it was called on the server side
    because of bad setup of the socket; otherwise we get an endless calling of
    the OCSP callback
  - Consider an OCSP response that is not yet or no longer valid a soft error
    instead of an hard error
  - Fix skip in t/external/ocsp.t in case fingerprint does not match
  - Call EVP_PKEY_free not EVP_KEY_free in IO::Socket::SSL::Utils::KEY_free
    (CPAN RT#95633)
  - util/analyze.pl - with --show-chain check if chain with SNI is different
    from chain w/o SNI
- Drop ExtUtils::MakeMaker version requirement
---
 IO-Socket-SSL-1.984-key-free.patch | 11 -----------
 perl-IO-Socket-SSL.spec            | 24 +++++++++++++++++-------
 sources                            |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 IO-Socket-SSL-1.984-key-free.patch

diff --git a/IO-Socket-SSL-1.984-key-free.patch b/IO-Socket-SSL-1.984-key-free.patch
deleted file mode 100644
index b0e90c6..0000000
--- a/IO-Socket-SSL-1.984-key-free.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/IO/Socket/SSL/Utils.pm
-+++ lib/IO/Socket/SSL/Utils.pm
-@@ -93,7 +93,7 @@ sub CERT_free {
- 
- sub KEY_free {
-     my $key = shift or return;
--    Net::SSLeay::EVP_KEY_free($key);
-+    Net::SSLeay::EVP_PKEY_free($key);
- }
- 
- sub KEY_create_rsa {
diff --git a/perl-IO-Socket-SSL.spec b/perl-IO-Socket-SSL.spec
index 3c6c2ff..fb5d762 100644
--- a/perl-IO-Socket-SSL.spec
+++ b/perl-IO-Socket-SSL.spec
@@ -1,12 +1,11 @@
 Name:		perl-IO-Socket-SSL
-Version:	1.984
-Release:	2%{?dist}
+Version:	1.985
+Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/IO-Socket-SSL/
 Source0:	http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-%{version}.tar.gz
-Patch0:		IO-Socket-SSL-1.984-key-free.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	openssl >= 0.9.8
@@ -15,7 +14,7 @@ BuildRequires:	perl(Carp)
 BuildRequires:	perl(constant)
 BuildRequires:	perl(Data::Dumper)
 BuildRequires:	perl(Exporter)
-BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.46
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(IO::Select)
 BuildRequires:	perl(IO::Socket)
 BuildRequires:	perl(IO::Socket::INET)
@@ -59,9 +58,6 @@ mod_perl.
 %prep
 %setup -q -n IO-Socket-SSL-%{version}
 
-# Fix typo in Utils.pm (#1097640, CPAN RT#95633)
-%patch0
-
 %build
 echo n | perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -87,6 +83,20 @@ rm -rf %{buildroot}
 %{_mandir}/man3/IO::Socket::SSL::Utils.3*
 
 %changelog
+* Thu May 15 2014 Paul Howarth <paul@city-fan.org> - 1.985-1
+- Update to 1.985
+  - Make OCSP callback return 1 even if it was called on the server side
+    because of bad setup of the socket; otherwise we get an endless calling of
+    the OCSP callback
+  - Consider an OCSP response that is not yet or no longer valid a soft error
+    instead of an hard error
+  - Fix skip in t/external/ocsp.t in case fingerprint does not match
+  - Call EVP_PKEY_free not EVP_KEY_free in IO::Socket::SSL::Utils::KEY_free
+    (CPAN RT#95633)
+  - util/analyze.pl - with --show-chain check if chain with SNI is different
+    from chain w/o SNI
+- Drop ExtUtils::MakeMaker version requirement
+
 * Wed May 14 2014 Paul Howarth <paul@city-fan.org> - 1.984-2
 - Fix typo in Utils.pm (#1097640, CPAN RT#95633)
 
diff --git a/sources b/sources
index 9b1349b..a1410f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2a2554c9394fb774d37ed7e14a8d172  IO-Socket-SSL-1.984.tar.gz
+7ed8bab5859c20a44782e0799ae762a2  IO-Socket-SSL-1.985.tar.gz