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
This commit is contained in:
Paul Howarth 2014-04-08 11:22:31 +01:00
parent 2926895385
commit 28b9bc71ad
4 changed files with 54 additions and 2 deletions

View File

@ -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
}

View File

@ -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

View File

@ -1,11 +1,13 @@
Name: perl-IO-Socket-SSL Name: perl-IO-Socket-SSL
Version: 1.979 Version: 1.980
Release: 1%{?dist} Release: 1%{?dist}
Summary: Perl library for transparent SSL Summary: Perl library for transparent SSL
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
URL: http://search.cpan.org/dist/IO-Socket-SSL/ 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 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch BuildArch: noarch
BuildRequires: openssl >= 0.9.8 BuildRequires: openssl >= 0.9.8
@ -58,6 +60,11 @@ mod_perl.
%prep %prep
%setup -q -n IO-Socket-SSL-%{version} %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 %build
echo n | perl Makefile.PL INSTALLDIRS=vendor echo n | perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags} make %{?_smp_mflags}
@ -83,6 +90,14 @@ rm -rf %{buildroot}
%{_mandir}/man3/IO::Socket::SSL::Utils.3* %{_mandir}/man3/IO::Socket::SSL::Utils.3*
%changelog %changelog
* 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
- 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@city-fan.org> - 1.979-1 * Sun Apr 6 2014 Paul Howarth <paul@city-fan.org> - 1.979-1
- Update to 1.979 - Update to 1.979
- Hostname checking: - Hostname checking:

View File

@ -1 +1 @@
3c2f1c40425b23867d6cf7c255dcc916 IO-Socket-SSL-1.979.tar.gz 5b654dc92798b9488e4717da1991dab9 IO-Socket-SSL-1.980.tar.gz