Attachment 199071 Details for Bug 229021 – Fix build by conditionally applying Ken's patch

[patch] Fix build by conditionally applying Ken's patch

229021_devel_p4.diff (text/plain), 1.93 KB, created by Alan Somers on 2018-11-08 01:44:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Somers

Created: 2018-11-08 01:44:46 UTC

Size: 1.93 KB

patch

obsolete

>Index: devel/p4/Makefile
>===================================================================
>--- devel/p4/Makefile	(revision 484299)
>+++ devel/p4/Makefile	(working copy)
>@@ -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
>@@ -33,6 +33,11 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${OSVERSION} >= 1200085
>+# P4 needs a patch for compatibility with OpenSSL 1.1.1
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-net_netsslcredentials.cc
>+.endif
>+
> .include "Makefile.inc"
> 
> # Sadly, Jam always returns 1 even on success.  Ignore its return value and
>Index: devel/p4/files/extra-patch-net_netsslcredentials.cc
>===================================================================
>--- devel/p4/files/extra-patch-net_netsslcredentials.cc	(nonexistent)
>+++ devel/p4/files/extra-patch-net_netsslcredentials.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- net/netsslcredentials.cc.old	2018-02-05 20:46:46.000000000 +0000
>++++ net/netsslcredentials.cc	2018-11-06 19:53:58.183556000 +0000
>+@@ -218,7 +218,7 @@ 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 (privateKey->type != EVP_PKEY_RSA)
>++	if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA)
>+ 	{
>+ 	    e->Set( MsgRpc::SslKeyNotRSA );
>+ 	    goto fail;
>
>Property changes on: devel/p4/files/extra-patch-net_netsslcredentials.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 229021: 198708 | 199027 | 199028 | 199033 | 199071 | 199084