Page MenuHomeFreeBSD
Files F133497589

D9671.id25472.diff
No OneTemporary
Actions

D9671.id25472.diff
View Options

Index: head/net/freerdp/Makefile
===================================================================
--- head/net/freerdp/Makefile
+++ head/net/freerdp/Makefile
@@ -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: head/net/freerdp/files/patch-libfreerdp_crypto_tls.c
===================================================================
--- head/net/freerdp/files/patch-libfreerdp_crypto_tls.c
+++ head/net/freerdp/files/patch-libfreerdp_crypto_tls.c
@@ -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!

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 27, 5:35 AM (4 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24271880
Default Alt Text
D9671.id25472.diff (2 KB)

Event Timeline