diff options
| author | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-21 14:33:55 +0000 |
|---|---|---|
| committer | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-21 14:33:55 +0000 |
| commit | 82a8f29f22ecbed9b33f2f4b15a4084fa0827981 (patch) | |
| tree | f8d3ca0e31976f903c81ec622738b026d0796848 /net/freerdp | |
| parent | a43611575e01e52c4fecb825ea387aa2b7a703bb (diff) | |
| download | ports-82a8f29f22ecbed9b33f2f4b15a4084fa0827981.tar.gz ports-82a8f29f22ecbed9b33f2f4b15a4084fa0827981.zip | |
Notes
Diffstat (limited to 'net/freerdp')
| -rw-r--r-- | net/freerdp/Makefile | 6 | ||||
| -rw-r--r-- | net/freerdp/files/patch-libfreerdp_crypto_tls.c | 32 |
2 files changed, 36 insertions, 2 deletions
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 07f3e6ce0d75..caa92d045114 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -26,12 +26,14 @@ CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF 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 diff --git a/net/freerdp/files/patch-libfreerdp_crypto_tls.c b/net/freerdp/files/patch-libfreerdp_crypto_tls.c new file mode 100644 index 000000000000..473fbb00f41e --- /dev/null +++ b/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! |