From 515e50a494133ce3ffebef6148ae8b95dd51c1a2 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Apr 08 2014 12:59:10 +0000
Subject: Update to 1.981


- New upstream release 1.981
  - Fix ecdhe test for openssl 1.0.1d (CPAN RT#95432)
  - Fix detection of openssl 1.0.1d (detected 1.0.1e instead)
  - New function can_ecdh in IO::Socket::SSL

---

diff --git a/IO-Socket-SSL-1.980-ecdhe-test.patch b/IO-Socket-SSL-1.980-ecdhe-test.patch
deleted file mode 100644
index c424022..0000000
--- a/IO-Socket-SSL-1.980-ecdhe-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- t/ecdhe.t
-+++ t/ecdhe.t
-@@ -13,7 +13,11 @@
-     exit
- }
- 
--if ( ! defined &Net::SSLeay::CTX_set_tmp_ecdh ) {
-+if ( ! defined &Net::SSLeay::CTX_set_tmp_ecdh || !
-+	# There is a regression with elliptic curves on 1.0.1d with 64bit
-+	# http://rt.openssl.org/Ticket/Display.html?id=2975
-+	( Net::SSLeay::OPENSSL_VERSION_NUMBER() != 0x1000105f
-+	|| length(pack("P",0)) == 4 )) {
-     print "1..0 # Skipped: no support for ecdh with this openssl/Net::SSLeay\n";
-     exit
- }
diff --git a/IO-Socket-SSL-1.980-openssl-version.patch b/IO-Socket-SSL-1.980-openssl-version.patch
deleted file mode 100644
index 6f201f1..0000000
--- a/IO-Socket-SSL-1.980-openssl-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/IO/Socket/SSL.pm
-+++ lib/IO/Socket/SSL.pm
-@@ -44,7 +44,7 @@ BEGIN {
-     $can_ecdh       = defined &Net::SSLeay::CTX_set_tmp_ecdh && 
- 	# There is a regression with elliptic curves on 1.0.1d with 64bit
- 	# http://rt.openssl.org/Ticket/Display.html?id=2975
--	( Net::SSLeay::OPENSSL_VERSION_NUMBER() != 0x1000105f
-+	( Net::SSLeay::OPENSSL_VERSION_NUMBER() != 0x1000104f
- 	|| length(pack("P",0)) == 4 );
- }
- 
---- t/ecdhe.t
-+++ t/ecdhe.t
-@@ -16,7 +16,7 @@ if ( grep { $^O =~m{$_} } qw( MacOS VOS
- if ( ! defined &Net::SSLeay::CTX_set_tmp_ecdh || !
- 	# There is a regression with elliptic curves on 1.0.1d with 64bit
- 	# http://rt.openssl.org/Ticket/Display.html?id=2975
--	( Net::SSLeay::OPENSSL_VERSION_NUMBER() != 0x1000105f
-+	( Net::SSLeay::OPENSSL_VERSION_NUMBER() != 0x1000104f
- 	|| length(pack("P",0)) == 4 )) {
-     print "1..0 # Skipped: no support for ecdh with this openssl/Net::SSLeay\n";
-     exit
diff --git a/perl-IO-Socket-SSL.spec b/perl-IO-Socket-SSL.spec
index 5c00187..67d6189 100644
--- a/perl-IO-Socket-SSL.spec
+++ b/perl-IO-Socket-SSL.spec
@@ -1,13 +1,11 @@
 Name:		perl-IO-Socket-SSL
-Version:	1.980
+Version:	1.981
 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.980-ecdhe-test.patch
-Patch1:		IO-Socket-SSL-1.980-openssl-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	openssl >= 0.9.8
@@ -60,11 +58,6 @@ mod_perl.
 %prep
 %setup -q -n IO-Socket-SSL-%{version}
 
-# Skip ecdhe test on OpenSSL 1.0.1d 64-bit
-# http://rt.openssl.org/Ticket/Display.html?id=2975
-%patch0
-%patch1
-
 %build
 echo n | perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -90,11 +83,17 @@ rm -rf %{buildroot}
 %{_mandir}/man3/IO::Socket::SSL::Utils.3*
 
 %changelog
+* Tue Apr  8 2014 Paul Howarth <paul@city-fan.org> - 1.981-1
+- Update to 1.981
+  - Fix ecdhe test for openssl 1.0.1d (CPAN RT#95432)
+  - Fix detection of openssl 1.0.1d (detected 1.0.1e instead)
+  - New function can_ecdh in IO::Socket::SSL
+
 * Tue Apr  8 2014 Paul Howarth <paul@city-fan.org> - 1.980-1
 - Update to 1.980
   - Disable elliptic curve support for openssl 1.0.1d on 64-bit
     (http://rt.openssl.org/Ticket/Display.html?id=2975)
-  - Fix fingerprint calculation
+  - Fix certificate fingerprint calculation
 - Add patch to skip elliptic curve test for openssl 1.0.1d on 64-bit
 - Add patch to fix openssl version test
 
diff --git a/sources b/sources
index 3ededfd..1ccef25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b654dc92798b9488e4717da1991dab9  IO-Socket-SSL-1.980.tar.gz
+fcc8b12caf85e757a299534b799d6af1  IO-Socket-SSL-1.981.tar.gz