Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Feb 2017 14:33:55 +0000 (UTC)
From:      Matthew Rezny <rezny@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r434532 - in head/net/freerdp: . files
Message-ID:  <201702211433.v1LEXtik016630@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rezny
Date: Tue Feb 21 14:33:55 2017
New Revision: 434532
URL: https://svnweb.freebsd.org/changeset/ports/434532

Log:
  Fix build with libressl-devel. Restrict SSE option to x86, default on amd64.
  
  PR:		216980
  Approved by:	bsdports@kyle-evans.net (maintainer), swills (mentor)
  Obtained from:	OpenBSD
  Differential Revision:	https://reviews.freebsd.org/D9671

Added:
  head/net/freerdp/files/patch-libfreerdp_crypto_tls.c   (contents, props changed)
Modified:
  head/net/freerdp/Makefile

Modified: head/net/freerdp/Makefile
==============================================================================
--- head/net/freerdp/Makefile	Tue Feb 21 14:33:28 2017	(r434531)
+++ head/net/freerdp/Makefile	Tue Feb 21 14:33:55 2017	(r434532)
@@ -26,12 +26,14 @@ CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWIT
 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

Added: head/net/freerdp/files/patch-libfreerdp_crypto_tls.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freerdp/files/patch-libfreerdp_crypto_tls.c	Tue Feb 21 14:33:55 2017	(r434532)
@@ -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!



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702211433.v1LEXtik016630>