Attachment #199071 for bug #229021

Lines 3-9 Link Here

(-)devel/p4/Makefile (-1 / +6 lines)
3		3
4	PORTNAME= p4	4	PORTNAME= p4
5	PORTVERSION= ${YEAR}.${MAJOR}.${MINOR}	5	PORTVERSION= ${YEAR}.${MAJOR}.${MINOR}
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	# Perforce stupidly rerolls their distfiles on a regular basis, updating the	8	# Perforce stupidly rerolls their distfiles on a regular basis, updating the
9	# files' timestamps when they do, which changes the zip file's checksum. Work	9	# files' timestamps when they do, which changes the zip file's checksum. Work
Lines 33-38 Link Here
33		33
34	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
35		35
		36	.if ${OSVERSION} >= 1200085
		37	# P4 needs a patch for compatibility with OpenSSL 1.1.1
		38	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-net_netsslcredentials.cc
		39	.endif
		40
36	.include "Makefile.inc"	41	.include "Makefile.inc"
37		42
38	# Sadly, Jam always returns 1 even on success. Ignore its return value and	43	# Sadly, Jam always returns 1 even on success. Ignore its return value and

Line 0 Link Here

(-)devel/p4/files/extra-patch-net_netsslcredentials.cc (+11 lines)
	1	--- net/netsslcredentials.cc.old 2018-02-05 20:46:46.000000000 +0000
	2	+++ net/netsslcredentials.cc 2018-11-06 19:53:58.183556000 +0000
	3	@@ -218,7 +218,7 @@ NetSslCredentials::ReadCredentials( Error *e )
	4	privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL );
	5	SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError );
	6	// verify that RSA key
	7	- if (privateKey->type != EVP_PKEY_RSA)
	8	+ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA)
	9	{
	10	e->Set( MsgRpc::SslKeyNotRSA );
	11	goto fail;

Return to bug 229021