Date: Tue, 13 Nov 2018 17:15:09 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484879 - in head/devel/p4: . files Message-ID: <201811131715.wADHF9b5086504@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers (src committer) Date: Tue Nov 13 17:15:09 2018 New Revision: 484879 URL: https://svnweb.freebsd.org/changeset/ports/484879 Log: devel/p4: fix build with OpenSSL 1.1 PR: 229021 Reported by: brnrd Submitted by: ken MFH: 2018Q4 Added: head/devel/p4/files/patch-net_netsslcredentials.cc (contents, props changed) Modified: head/devel/p4/Makefile Modified: head/devel/p4/Makefile ============================================================================== --- head/devel/p4/Makefile Tue Nov 13 16:28:36 2018 (r484878) +++ head/devel/p4/Makefile Tue Nov 13 17:15:09 2018 (r484879) @@ -3,7 +3,7 @@ PORTNAME= p4 PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel # Perforce stupidly rerolls their distfiles on a regular basis, updating the # files' timestamps when they do, which changes the zip file's checksum. Work Added: head/devel/p4/files/patch-net_netsslcredentials.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p4/files/patch-net_netsslcredentials.cc Tue Nov 13 17:15:09 2018 (r484879) @@ -0,0 +1,23 @@ +--- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000 ++++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000 +@@ -42,6 +42,7 @@ extern "C" + # include <openssl/x509v3.h> + # include <openssl/ssl.h> + # include <openssl/x509_vfy.h> ++# include <openssl/opensslv.h> + } + # include <stdio.h> + # include "netdebug.h" +@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) + privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL ); + SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError ); + // verify that RSA key ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (privateKey->type != EVP_PKEY_RSA) ++#else ++ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA) ++#endif + { + e->Set( MsgRpc::SslKeyNotRSA ); + goto fail; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811131715.wADHF9b5086504>