cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update p5-Net-SSLeay to 1.88

Browse Source
This commit is contained in:
bluhm 2019-05-12 16:15:29 +00:00
parent 11da792a95
commit 6cef382ec8
4 changed files with 5 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/p5-Net_SSLeay/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.72 2019/01/06 14:50:49 danj Exp $
# $OpenBSD: Makefile,v 1.73 2019/05/12 16:15:29 bluhm Exp $
COMMENT = perl module for using OpenSSL
DISTNAME = Net-SSLeay-1.85
REVISION = 2
DISTNAME = Net-SSLeay-1.88
CATEGORIES = security
MAINTAINER = Alexander Bluhm <bluhm@openbsd.org>
# Perl
# Artistic 2.0
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c crypto perl ssl z

4
security/p5-Net_SSLeay/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Net-SSLeay-1.85.tar.gz) = nYGIufscrjvXkZecIFVJJdXpShONAEFPGmgUVJknsMg=
SIZE (Net-SSLeay-1.85.tar.gz) = 418349
SHA256 (Net-SSLeay-1.88.tar.gz) = IADaSDyEcaC2HgaVnpKm/Ke55AWG1cgo3pd9PSCBz90=
SIZE (Net-SSLeay-1.88.tar.gz) = 436215

67
security/p5-Net_SSLeay/patches/patch-SSLeay_xs
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-SSLeay_xs,v 1.15 2018/11/07 01:55:42 bluhm Exp $
https://github.com/radiator-software/p5-net-ssleay/pull/96
https://github.com/radiator-software/p5-net-ssleay/pull/95
https://github.com/radiator-software/p5-net-ssleay/pull/94
Index: SSLeay.xs
--- SSLeay.xs.orig
+++ SSLeay.xs
@@ -2766,7 +2766,7 @@ RAND_write_file(file_name)
#define REM40 "Minimal X509 stuff..., this is a bit ugly and should be put in its own modules Net::SSLeay::X509.pm"
-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
int
X509_check_host(X509 *cert, const char *name, unsigned int flags = 0, SV *peername = &PL_sv_undef)
@@ -4366,7 +4366,7 @@ TLSv1_2_client_method()
#endif
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x20020002L)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
const SSL_METHOD *
TLS_method()
@@ -4377,10 +4377,10 @@ TLS_server_method()
const SSL_METHOD *
TLS_client_method()
-#endif /* OpenSSL 1.1.0 or LibreSSL 2.2.2 */
+#endif /* OpenSSL 1.1.0 */
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x2060000fL)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
int
SSL_CTX_set_min_proto_version(ctx, version)
@@ -4402,7 +4402,7 @@ SSL_set_max_proto_version(ssl, version)
SSL * ssl
int version
-#endif /* OpenSSL 1.1.0 or LibreSSL 2.6.0 */
+#endif /* OpenSSL 1.1.0 */
#if OPENSSL_VERSION_NUMBER >= 0x1010007fL && !defined(LIBRESSL_VERSION_NUMBER)
@@ -5612,7 +5612,7 @@ SSL_get_client_random(s)
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
void
SSL_get_server_random(s)
@@ -5643,7 +5643,7 @@ int
SSL_get_keyblock_size(s)
SSL * s
CODE:
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
const SSL_CIPHER *ssl_cipher;
int cipher = NID_undef, digest = NID_undef, mac_secret_size = 0;
const EVP_CIPHER *c = NULL;

16
security/p5-Net_SSLeay/patches/patch-t_local_33_x509_create_cert_t
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-t_local_33_x509_create_cert_t,v 1.4 2018/11/07 01:55:42 bluhm Exp $
https://github.com/radiator-software/p5-net-ssleay/commit/512334aa69e8c64ada0163c8c01b90ed84472
Index: t/local/33_x509_create_cert.t
--- t/local/33_x509_create_cert.t.orig
+++ t/local/33_x509_create_cert.t
@@ -299,7 +299,7 @@ SKIP: { ### X509 certificate - unicode
SKIP:
{
- skip 'd2i_X509_bio fails for openssl-1.1.0e and later', 1 unless Net::SSLeay::SSLeay < 0x1010005f;
+ skip 'd2i_X509_bio fails for openssl-1.1.0e and later', 1 unless Net::SSLeay::SSLeay < 0x1010005f or Net::SSLeay::constant("LIBRESSL_VERSION_NUMBER");
ok(my $x509 = Net::SSLeay::d2i_X509_bio($bio2), "d2i_X509_bio");
}
}