Update to 1.88

Changes:	https://metacpan.org/changes/distribution/Net-SSLeay
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2020-01-20 20:12:03 +00:00
parent 1cb36aae41
commit 143f08478b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=523678
5 changed files with 28 additions and 85 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Net-SSLeay
PORTVERSION= 1.85
PORTVERSION= 1.88
CATEGORIES= security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -16,16 +16,17 @@ TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
p5-Test-Warn>=0:devel/p5-Test-Warn
OPTIONS_DEFINE= EXAMPLES
CONFIGURE_ENV= OPENSSL_PREFIX=${OPENSSLBASE}
USES= perl5 shebangfix ssl
USE_PERL5= configure
CONFIGURE_ENV= OPENSSL_PREFIX=${OPENSSLBASE}
PORTEXAMPLES= *
SHEBANG_FILES= examples/*.pl
OPTIONS_DEFINE= EXAMPLES
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/SSLeay/SSLeay.so

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1521036337
SHA256 (Net-SSLeay-1.85.tar.gz) = 9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8
SIZE (Net-SSLeay-1.85.tar.gz) = 418349
TIMESTAMP = 1579531374
SHA256 (Net-SSLeay-1.88.tar.gz) = 2000da483c8471a0b61e06959e92a6fca7b9e40586d5c828de977d3d2081cfdd
SIZE (Net-SSLeay-1.88.tar.gz) = 436215

View file

@ -0,0 +1,20 @@
--- Makefile.PL.orig 2019-05-06 14:37:59 UTC
+++ Makefile.PL
@@ -12,11 +12,12 @@ use Symbol qw(gensym);
# the Net-SSLeay loadable object on Windows
my $win_link_statically = 0;
-my $tests = prompt(
- "Do you want to run external tests?\n".
- "These tests *will* *fail* if you do not have network connectivity.",
- 'n',
-) =~ /^y/i ? 't/*/*.t t/*/*/*.t' : 't/local/*.t t/handle/local/*.t';
+# my $tests = prompt(
+# "Do you want to run external tests?\n".
+# "These tests *will* *fail* if you do not have network connectivity.",
+# 'n',
+# ) =~ /^y/i ? 't/*/*.t t/*/*/*.t' : 't/local/*.t t/handle/local/*.t';
+my $tests = 't/local/*.t t/handle/local/*.t';
my %eumm_args = (
NAME => 'Net::SSLeay',

View file

@ -1,11 +0,0 @@
--- inc/Module/Install/PRIVATE/Net/SSLeay.pm.orig 2009-08-24 12:42:03 UTC
+++ inc/Module/Install/PRIVATE/Net/SSLeay.pm
@@ -45,7 +45,7 @@
$self->makemaker_args( CCCDLFLAGS => $opts->{cccdlflags} );
- if ( $self->prompt(
+ if ( 0 && $self->prompt( #don't require interaction during install
"Do you want to run external tests?\n".
"These tests *will* *fail* if you do not have network connectivity.",
'n',

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;