update p5-IO-Socket-SSL to 2.066

This commit is contained in:
bluhm 2019-05-12 17:58:45 +00:00
parent b5396dac1d
commit 3cef5a1bae
3 changed files with 5 additions and 35 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.120 2018/09/17 14:14:29 bluhm Exp $
# $OpenBSD: Makefile,v 1.121 2019/05/12 17:58:45 bluhm Exp $
COMMENT = Perl SSL sockets with IO::Socket interface
DISTNAME = IO-Socket-SSL-2.060
DISTNAME = IO-Socket-SSL-2.066
CATEGORIES = security
@ -12,7 +12,7 @@ MAINTAINER = Alexander Bluhm <bluhm@openbsd.org>
PERMIT_PACKAGE_CDROM = Yes
MODULES = cpan
RUN_DEPENDS = security/p5-Net_SSLeay>=1.83
RUN_DEPENDS = security/p5-Net_SSLeay>=1.88
TEST_DEPENDS = net/p5-IO-Socket-INET6>=2.62 \
converters/p5-Net-IDN-Encode \
www/p5-URI>=1.50

View File

@ -1,2 +1,2 @@
SHA256 (IO-Socket-SSL-2.060.tar.gz) = +1sod6xbaGpde43XHPVGT/510QwyBHtVcGdIcORrG4w=
SIZE (IO-Socket-SSL-2.060.tar.gz) = 233169
SHA256 (IO-Socket-SSL-2.066.tar.gz) = DUcGR4GlRTBNXc6l387jrMLpWjLhtIhNgFBc3o7m680=
SIZE (IO-Socket-SSL-2.066.tar.gz) = 244730

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-lib_IO_Socket_SSL_pm,v 1.2 2018/03/05 22:45:47 bluhm Exp $
Net::SSLeay 1.83 has been fixed and does not export the NPN symbols.
Index: lib/IO/Socket/SSL.pm
--- lib/IO/Socket/SSL.pm.orig
+++ lib/IO/Socket/SSL.pm
@@ -70,21 +70,7 @@ my $can_tckt_keycb; # TLS ticket key callback
BEGIN {
$can_client_sni = Net::SSLeay::OPENSSL_VERSION_NUMBER() >= 0x01000000;
$can_server_sni = defined &Net::SSLeay::get_servername;
- if ($can_npn = defined &Net::SSLeay::P_next_proto_negotiated and
- Net::SSLeay::SSLeay_version(0) =~m{^LibreSSL\s+(\d+)\.(\d+)\.(\d+)}) {
- # LibreSSL 2.6.1 disabled NPN by keeping the relevant functions
- # available but remove the actual functionality from these functions. It
- # does not set OPENSSL_NO_NEXTPROTONEG as OpenSSL does in case NPN is
- # not supported, which means one need to rely on checking the LibreSSL
- # version instead.
- $can_npn =
- $1 < 2 ? $can_npn : # version 1.x.y
- $1 > 2 ? 0 : # version 3.x.y
- $2 < 6 ? $can_npn : # version 2.5.y and lower
- $2 > 6 ? 0 : # version 2.7.y and higher
- $3 == 0 ? $can_npn : # version 2.6.0
- 0; # version 2.6.1 and higher
- }
+ $can_npn = defined &Net::SSLeay::P_next_proto_negotiated;
$can_alpn = defined &Net::SSLeay::CTX_set_alpn_protos;
$can_ecdh = defined &Net::SSLeay::CTX_set_tmp_ecdh &&
# There is a regression with elliptic curves on 1.0.1d with 64bit