From 48b55376ef7b2f0431ee4449753bab503e07f870 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 21 Nov 2016 09:36:03 +0000 Subject: [PATCH] Update to 2.039 - New upstream release 2.039 - OpenSSL 1.1.0c changed the behavior of SSL_read so that it now returns -1 on EOF without proper SSL shutdown; since it looks like that this behavior will be kept at least for 1.1.1+, adapt to the changed API by treating errno=NOERR on SSL_ERROR_SYSCALL as EOF - Update patches as needed --- ...-SSL-2.039-use-system-default-SSL-version.patch | 4 ++-- ...-SSL-2.039-use-system-default-cipher-list.patch | 4 ++-- perl-IO-Socket-SSL.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) rename IO-Socket-SSL-2.038-use-system-default-SSL-version.patch => IO-Socket-SSL-2.039-use-system-default-SSL-version.patch (95%) rename IO-Socket-SSL-2.038-use-system-default-cipher-list.patch => IO-Socket-SSL-2.039-use-system-default-cipher-list.patch (97%) diff --git a/IO-Socket-SSL-2.038-use-system-default-SSL-version.patch b/IO-Socket-SSL-2.039-use-system-default-SSL-version.patch similarity index 95% rename from IO-Socket-SSL-2.038-use-system-default-SSL-version.patch rename to IO-Socket-SSL-2.039-use-system-default-SSL-version.patch index f3ee03a..e3c16cc 100644 --- a/IO-Socket-SSL-2.038-use-system-default-SSL-version.patch +++ b/IO-Socket-SSL-2.039-use-system-default-SSL-version.patch @@ -1,6 +1,6 @@ --- lib/IO/Socket/SSL.pm +++ lib/IO/Socket/SSL.pm -@@ -96,7 +96,7 @@ my $algo2digest = do { +@@ -97,7 +97,7 @@ my $algo2digest = do { # global defaults my %DEFAULT_SSL_ARGS = ( SSL_check_crl => 0, @@ -9,7 +9,7 @@ SSL_verify_callback => undef, SSL_verifycn_scheme => undef, # fallback cn verification SSL_verifycn_publicsuffix => undef, # fallback default list verification -@@ -2206,7 +2206,7 @@ sub new { +@@ -2214,7 +2214,7 @@ sub new { my $ssl_op = $DEFAULT_SSL_OP; diff --git a/IO-Socket-SSL-2.038-use-system-default-cipher-list.patch b/IO-Socket-SSL-2.039-use-system-default-cipher-list.patch similarity index 97% rename from IO-Socket-SSL-2.038-use-system-default-cipher-list.patch rename to IO-Socket-SSL-2.039-use-system-default-cipher-list.patch index bbfdbb2..982ec02 100644 --- a/IO-Socket-SSL-2.038-use-system-default-cipher-list.patch +++ b/IO-Socket-SSL-2.039-use-system-default-cipher-list.patch @@ -1,6 +1,6 @@ --- lib/IO/Socket/SSL.pm +++ lib/IO/Socket/SSL.pm -@@ -104,10 +104,10 @@ my %DEFAULT_SSL_ARGS = ( +@@ -105,10 +105,10 @@ my %DEFAULT_SSL_ARGS = ( SSL_npn_protocols => undef, # meaning depends whether on server or client side SSL_alpn_protocols => undef, # list of protocols we'll accept/send, for example ['http/1.1','spdy/3.1'] @@ -15,7 +15,7 @@ ); my %DEFAULT_SSL_CLIENT_ARGS = ( -@@ -117,63 +117,6 @@ my %DEFAULT_SSL_CLIENT_ARGS = ( +@@ -118,63 +118,6 @@ my %DEFAULT_SSL_CLIENT_ARGS = ( SSL_ca_file => undef, SSL_ca_path => undef, diff --git a/perl-IO-Socket-SSL.spec b/perl-IO-Socket-SSL.spec index 4e16ca3..0c5cf34 100644 --- a/perl-IO-Socket-SSL.spec +++ b/perl-IO-Socket-SSL.spec @@ -1,13 +1,13 @@ Name: perl-IO-Socket-SSL -Version: 2.038 +Version: 2.039 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-2.038-use-system-default-cipher-list.patch -Patch1: IO-Socket-SSL-2.038-use-system-default-SSL-version.patch +Patch0: IO-Socket-SSL-2.039-use-system-default-cipher-list.patch +Patch1: IO-Socket-SSL-2.039-use-system-default-SSL-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # Module Build @@ -116,6 +116,14 @@ rm -rf %{buildroot} %{_mandir}/man3/IO::Socket::SSL::Utils.3* %changelog +* Mon Nov 21 2016 Paul Howarth - 2.039-1 +- Update to 2.039 + - OpenSSL 1.1.0c changed the behavior of SSL_read so that it now returns -1 + on EOF without proper SSL shutdown; since it looks like that this behavior + will be kept at least for 1.1.1+, adapt to the changed API by treating + errno=NOERR on SSL_ERROR_SYSCALL as EOF +- Update patches as needed + * Mon Sep 19 2016 Paul Howarth - 2.038-1 - Update to 2.038 - Restrict session ticket callback to Net::SSLeay 1.79+ since version before