Attachment 179853 Details for Bug 216980 – fix build with libressl-devel

[patch] fix build with libressl-devel

patch (text/plain), 2.47 KB, created by Matthew Rezny on 2017-02-10 21:31:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2017-02-10 21:31:51 UTC

Size: 2.47 KB

patch

obsolete

>Index: net/freerdp/Makefile
>===================================================================
>--- net/freerdp/Makefile	(revision 433756)
>+++ net/freerdp/Makefile	(working copy)
>@@ -26,12 +26,14 @@
> CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
> CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
> 
>-OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11
>+OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO X11
> OPTIONS_DEFAULT=	CUPS GSTREAMER X11
> OPTIONS_SUB=		yes
> 
> OPTIONS_DEFINE_armv6=	NEON
>-OPTIONS_EXCLUDE_armv6=	SSE
>+OPTIONS_DEFINE_amd64=	SSE
>+OPTIONS_DEFINE_i386=	SSE
>+OPTIONS_DEFAULT_amd64=	SSE
> 
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_CMAKE_BOOL=	WITH_ALSA
>Index: net/freerdp/files/patch-libfreerdp_crypto_tls.c
>===================================================================
>--- net/freerdp/files/patch-libfreerdp_crypto_tls.c	(nonexistent)
>+++ net/freerdp/files/patch-libfreerdp_crypto_tls.c	(working copy)
>@@ -0,0 +1,32 @@
>+--- libfreerdp/crypto/tls.c.orig	2016-11-24 14:45:22 UTC
>++++ libfreerdp/crypto/tls.c
>+@@ -218,9 +218,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, i
>+ 		case BIO_CTRL_RESET:
>+ 			SSL_shutdown(tls->ssl);
>+ 
>+-			if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect)
>++			if (SSL_in_connect_init(tls->ssl))
>+ 				SSL_set_connect_state(tls->ssl);
>+-			else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept)
>++			else if (SSL_in_accept_init(tls->ssl))
>+ 				SSL_set_accept_state(tls->ssl);
>+ 
>+ 			SSL_clear(tls->ssl);
>+@@ -805,7 +805,7 @@ int tls_connect(rdpTls* tls, BIO* underl
>+ 	return tls_do_handshake(tls, TRUE);
>+ }
>+ 
>+-#ifndef OPENSSL_NO_TLSEXT
>++#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
>+ static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,
>+         int type, unsigned char* data, int len, void* arg)
>+ {
>+@@ -949,7 +949,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underl
>+ 		return FALSE;
>+ 	}
>+ 
>+-#ifndef OPENSSL_NO_TLSEXT
>++#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 	/**
>+ 	 * The Microsoft iOS clients eventually send a null or even double null
>+ 	 * terminated hostname in the SNI TLS extension!
>
>Property changes on: net/freerdp/files/patch-libfreerdp_crypto_tls.c
>___________________________________________________________________
>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 216980: 179853