[perl-IO-Socket-SSL] Update to 1.980

[Paul Howarth]

commit 28b9bc71adbb856859da10dadee3ebfd85ac0e93
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Apr 8 11:22:31 2014 +0100

    Update to 1.980
    
    - New upstream release 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
    - Add patch to skip elliptic curve test for openssl 1.0.1d on 64-bit
    - Add patch to fix openssl version test

 IO-Socket-SSL-1.980-ecdhe-test.patch      |   15 +++++++++++++++
 IO-Socket-SSL-1.980-openssl-version.patch |   22 ++++++++++++++++++++++
 perl-IO-Socket-SSL.spec                   |   17 ++++++++++++++++-
 sources                                   |    2 +-
 4 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/IO-Socket-SSL-1.980-ecdhe-test.patch b/IO-Socket-SSL-1.980-ecdhe-test.patch
new file mode 100644
index 0000000..c424022
--- /dev/null
+++ b/IO-Socket-SSL-1.980-ecdhe-test.patch
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 0000000..6f201f1
--- /dev/null
+++ b/IO-Socket-SSL-1.980-openssl-version.patch
@@ -0,0 +1,22 @@
+--- 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 88148c7..cff10a4 100644
--- a/perl-IO-Socket-SSL.spec
+++ b/perl-IO-Socket-SSL.spec
@@ -1,11 +1,13 @@
 Name:		perl-IO-Socket-SSL
-Version:	1.979
+Version:	1.980
 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
@@ -58,6 +60,11 @@ mod_perl.
 %prep
 %setup -q -n IO-Socket-SSL-%{version}
 
+# Skip ecdhe test on OpenSSL 1.0.0d 64-bit
+# http://rt.openssl.org/Ticket/Display.html?id=2975
+%patch0
+%patch1
+
 %build
 echo n | perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -83,6 +90,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/IO::Socket::SSL::Utils.3*
 
 %changelog
+* Tue Apr  8 2014 Paul Howarth <paul at 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
+- Add patch to skip elliptic curve test for openssl 1.0.1d on 64-bit
+- Add patch to fix openssl version test
+
 * Sun Apr  6 2014 Paul Howarth <paul at city-fan.org> - 1.979-1
 - Update to 1.979
   - Hostname checking:
diff --git a/sources b/sources
index 2415842..3ededfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c2f1c40425b23867d6cf7c255dcc916  IO-Socket-SSL-1.979.tar.gz
+5b654dc92798b9488e4717da1991dab9  IO-Socket-SSL-1.980.tar.gz