net/freerdp: Update to 2.0.0-rc3

- Remove patches committed upstream

Changes this release:
  https://github.com/FreeRDP/FreeRDP/blob/2.0.0-rc3/ChangeLog

Approved by:	kevans (maintainer)
Differential Revision:	https://reviews.freebsd.org/D16918

10 files changed, 20 insertions, 205 deletions

diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 234ddaaf570f..4f87d6ffcc26 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	freerdp
-DISTVERSION=	2.0.0-rc1
-PORTREVISION=	8
+DISTVERSION=	2.0.0-rc3
 CATEGORIES=	net comms ipv6
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	78df32c77f28.patch:-p1 ed571e74a594.patch:-p1
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index b59771672a70..dbb131ae5fa9 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1514888037
-SHA256 (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2
-SIZE (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = 6530403
-SHA256 (78df32c77f28.patch) = 797b38de1570e7f09fa4dc2d54e2e5f297ab15431b8d09348f55314716429f7c
-SIZE (78df32c77f28.patch) = 2393
-SHA256 (ed571e74a594.patch) = a40e4bc915c8c90d312d9369dcdf84433d9de3ceaf1595327b09c38f137db8d6
-SIZE (ed571e74a594.patch) = 1789
+TIMESTAMP = 1535247383
+SHA256 (FreeRDP-FreeRDP-2.0.0-rc3_GH0.tar.gz) = d32d4a092e468deb3a1296e8358f900bf7e80afd0876d815ba43622ce29596c5
+SIZE (FreeRDP-FreeRDP-2.0.0-rc3_GH0.tar.gz) = 6578109
diff --git a/net/freerdp/files/patch-libfreerdp_core_nla.c b/net/freerdp/files/patch-libfreerdp_core_nla.c
deleted file mode 100644
index b4c1df754922..000000000000
--- a/net/freerdp/files/patch-libfreerdp_core_nla.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libfreerdp/core/nla.c.orig	2018-03-21 03:26:15 UTC
-+++ libfreerdp/core/nla.c
-@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla)
- static int nla_decode_ts_request(rdpNla* nla, wStream* s)
- {
- 	int length;
-+	UINT32 version = 0;
- 
- 	/* TSRequest */
- 	if (!ber_read_sequence_tag(s, &length) ||
- 	    !ber_read_contextual_tag(s, 0, &length, TRUE) ||
--	    !ber_read_integer(s, &nla->version))
-+	    !ber_read_integer(s, &version))
- 	{
- 		return -1;
- 	}
-+
-+	if (version < nla->version)
-+		nla->version = version;
- 
- 	/* [1] negoTokens (NegoData) */
- 	if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
diff --git a/net/freerdp/files/patch-libfreerdp_crypto_tls.c b/net/freerdp/files/patch-libfreerdp_crypto_tls.c
deleted file mode 100644
index 848c3c7213af..000000000000
--- a/net/freerdp/files/patch-libfreerdp_crypto_tls.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- libfreerdp/crypto/tls.c.orig	2017-07-24 08:46:54 UTC
-+++ libfreerdp/crypto/tls.c
-@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying)
- 	if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE))
- 		return FALSE;
- 
--#ifndef OPENSSL_NO_TLSEXT
-+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_set_tlsext_host_name(tls->ssl, tls->hostname);
- #endif
- 	return tls_do_handshake(tls, TRUE);
- }
- 
--#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
-+#if defined(MICROSOFT_IOS_SNI_BUG) && !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)
- {
-@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti
- 		return FALSE;
- 	}
- 
--#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
-+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_set_tlsext_debug_callback(tls->ssl, tls_openssl_tlsext_debug_callback);
- #endif
- 	return tls_do_handshake(tls, FALSE) > 0;
diff --git a/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt b/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt
deleted file mode 100644
index fa5e346d84e0..000000000000
--- a/net/freerdp/files/patch-uwac_libuwac_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- uwac/libuwac/CMakeLists.txt.orig	2017-11-27 16:59:34 UTC
-+++ uwac/libuwac/CMakeLists.txt
-@@ -40,6 +40,9 @@ generate_protocol_file(xdg-shell)
- generate_protocol_file(ivi-application)
- generate_protocol_file(fullscreen-shell)
- 
-+find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h sys/timerfd.h HINTS /usr/local/include/libepoll-shim)
-+find_library(EPOLLSHIM_LIBS NAMES epoll-shim libepoll-shim HINTS /usr/local/lib)
-+include_directories(${EPOLLSHIM_INCLUDE_DIR})
- include_directories(${WAYLAND_INCLUDE_DIR})
- include_directories(${XKBCOMMON_INCLUDE_DIR})
- include_directories("${CMAKE_SOURCE_DIR}/uwac/include")
-@@ -69,7 +72,7 @@ if (WITH_LIBRARY_VERSIONING)
- 	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
- endif()
- 
--target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp)
-+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} ${EPOLLSHIM_LIBS} freerdp)
- 
- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
- 
diff --git a/net/freerdp/files/patch-uwac_libuwac_uwac-os.c b/net/freerdp/files/patch-uwac_libuwac_uwac-os.c
deleted file mode 100644
index 541d6e07aeb4..000000000000
--- a/net/freerdp/files/patch-uwac_libuwac_uwac-os.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- uwac/libuwac/uwac-os.c.orig	2017-11-27 16:54:50 UTC
-+++ uwac/libuwac/uwac-os.c
-@@ -31,6 +31,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/mman.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -153,17 +154,7 @@ static int create_tmpfile_cloexec(char *tmpname)
- {
- 	int fd;
- 
--#ifdef HAVE_MKOSTEMP
--	fd = mkostemp(tmpname, O_CLOEXEC);
--	if (fd >= 0)
--		unlink(tmpname);
--#else
--	fd = mkstemp(tmpname);
--	if (fd >= 0) {
--		fd = set_cloexec_or_close(fd);
--		unlink(tmpname);
--	}
--#endif
-+	fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
- 
- 	return fd;
- }
diff --git a/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c b/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c
deleted file mode 100644
index cde32a9cc918..000000000000
--- a/net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- winpr/libwinpr/crypto/hash.c.orig	2017-11-28 14:26:30 UTC
-+++ winpr/libwinpr/crypto/hash.c
-@@ -179,7 +179,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx
- 	if (!evp || !hmac)
- 		return FALSE;
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
- 	return TRUE;
- #else
-@@ -215,7 +215,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* c
- {
- #if defined(WITH_OPENSSL)
- 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
- 	return TRUE;
- #else
-@@ -247,7 +247,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ct
- 
- #if defined(WITH_OPENSSL)
- 	hmac = (HMAC_CTX*) ctx;
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	HMAC_Final(hmac, output, NULL); /* no return value on OpenSSL 0.9.x */
- 	return TRUE;
- #else
diff --git a/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c b/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c
deleted file mode 100644
index 1b503ddde0d9..000000000000
--- a/net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- winpr/libwinpr/utils/ssl.c.orig	2017-11-28 14:26:30 UTC
-+++ winpr/libwinpr/utils/ssl.c
-@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
- };
- 
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- static unsigned long _winpr_openssl_id(void)
- {
- 	return (unsigned long)GetCurrentThreadId();
-@@ -174,7 +174,7 @@ static BOOL _winpr_openssl_initialize_lo
- 	}
- 
- 	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 
- 	if (CRYPTO_get_id_callback())
- 	{
-@@ -224,7 +224,7 @@ static BOOL _winpr_openssl_cleanup_locki
- 		CRYPTO_set_dynlock_destroy_callback(NULL);
- 	}
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 
- 	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
- 	{
-@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_init
- 
- 	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
- #else
- 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
-@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- 
- BOOL winpr_FIPSMode(void)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	return FALSE;
- #else
- 	return (FIPS_mode() == 1);
diff --git a/net/freerdp/files/patch-winpr_tools_makecert_makecert.c b/net/freerdp/files/patch-winpr_tools_makecert_makecert.c
deleted file mode 100644
index d85dc49c104c..000000000000
--- a/net/freerdp/files/patch-winpr_tools_makecert_makecert.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- winpr/tools/makecert/makecert.c.orig	2017-11-28 14:26:30 UTC
-+++ winpr/tools/makecert/makecert.c
-@@ -1275,7 +1275,7 @@ void makecert_context_free(MAKECERT_CONT
- #ifdef WITH_OPENSSL
- 		X509_free(context->x509);
- 		EVP_PKEY_free(context->pkey);
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		CRYPTO_cleanup_all_ex_data();
- #endif
- #endif
diff --git a/net/freerdp/pkg-plist b/net/freerdp/pkg-plist
index 4dac3c60d5c5..1002a39950d5 100644
--- a/net/freerdp/pkg-plist
+++ b/net/freerdp/pkg-plist
@@ -20,6 +20,7 @@ include/freerdp2/freerdp/channels/audin.h
 include/freerdp2/freerdp/channels/channels.h
 include/freerdp2/freerdp/channels/cliprdr.h
 include/freerdp2/freerdp/channels/encomsp.h
+include/freerdp2/freerdp/channels/geometry.h
 include/freerdp2/freerdp/channels/log.h
 include/freerdp2/freerdp/channels/rail.h
 include/freerdp2/freerdp/channels/rdpdr.h
@@ -28,6 +29,7 @@ include/freerdp2/freerdp/channels/rdpgfx.h
 include/freerdp2/freerdp/channels/rdpsnd.h
 include/freerdp2/freerdp/channels/remdesk.h
 include/freerdp2/freerdp/channels/tsmf.h
+include/freerdp2/freerdp/channels/video.h
 include/freerdp2/freerdp/channels/wtsvc.h
 include/freerdp2/freerdp/client.h
 include/freerdp2/freerdp/client/audin.h
@@ -38,6 +40,7 @@ include/freerdp2/freerdp/client/disp.h
 include/freerdp2/freerdp/client/drdynvc.h
 include/freerdp2/freerdp/client/encomsp.h
 include/freerdp2/freerdp/client/file.h
+include/freerdp2/freerdp/client/geometry.h
 include/freerdp2/freerdp/client/rail.h
 include/freerdp2/freerdp/client/rdpei.h
 include/freerdp2/freerdp/client/rdpgfx.h
@@ -45,6 +48,7 @@ include/freerdp2/freerdp/client/rdpsnd.h
 include/freerdp2/freerdp/client/remdesk.h
 include/freerdp2/freerdp/client/sshagent.h
 include/freerdp2/freerdp/client/tsmf.h
+include/freerdp2/freerdp/client/video.h
 include/freerdp2/freerdp/codec/audio.h
 include/freerdp2/freerdp/codec/bitmap.h
 include/freerdp2/freerdp/codec/bulk.h
@@ -62,6 +66,7 @@ include/freerdp2/freerdp/codec/progressive.h
 include/freerdp2/freerdp/codec/region.h
 include/freerdp2/freerdp/codec/rfx.h
 include/freerdp2/freerdp/codec/xcrush.h
+include/freerdp2/freerdp/codec/yuv.h
 include/freerdp2/freerdp/codec/zgfx.h
 include/freerdp2/freerdp/codecs.h
 include/freerdp2/freerdp/constants.h
@@ -84,6 +89,7 @@ include/freerdp2/freerdp/gdi/gfx.h
 include/freerdp2/freerdp/gdi/pen.h
 include/freerdp2/freerdp/gdi/region.h
 include/freerdp2/freerdp/gdi/shape.h
+include/freerdp2/freerdp/gdi/video.h
 include/freerdp2/freerdp/graphics.h
 include/freerdp2/freerdp/input.h
 include/freerdp2/freerdp/listener.h
@@ -178,6 +184,7 @@ include/winpr2/winpr/sspi.h
 include/winpr2/winpr/sspicli.h
 include/winpr2/winpr/stream.h
 include/winpr2/winpr/string.h
+include/winpr2/winpr/strlst.h
 include/winpr2/winpr/synch.h
 include/winpr2/winpr/sysinfo.h
 include/winpr2/winpr/tchar.h
@@ -214,6 +221,11 @@ libdata/pkgconfig/freerdp2.pc
 %%WAYLAND%%libdata/pkgconfig/uwac0.pc
 libdata/pkgconfig/winpr-tools2.pc
 libdata/pkgconfig/winpr2.pc
+%%MANPAGES%%man/man1/winpr-hash.1.gz
+%%MANPAGES%%man/man1/winpr-makecert.1.gz
+%%WAYLAND%%%%MANPAGES%%man/man1/wlfreerdp.1.gz
+%%X11%%%%MANPAGES%%man/man1/xfreerdp.1.gz
+%%MANPAGES%%man/man7/wlog.7.gz
 share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
 share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
 share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -222,16 +234,11 @@ share/cmake/Modules/FreeRDP2/FreeRDPConfig.cmake
 share/cmake/Modules/FreeRDP2/FreeRDPConfigVersion.cmake
 share/cmake/Modules/FreeRDP2/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake
 share/cmake/Modules/FreeRDP2/FreeRDPTargets.cmake
-%%WAYLAND%%share/cmake/Modules/uwac0/uwac-%%CMAKE_BUILD_TYPE%%.cmake
-%%WAYLAND%%share/cmake/Modules/uwac0/uwac.cmake
-%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfig.cmake
-%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfigVersion.cmake
 share/cmake/Modules/WinPR2/WinPRConfig.cmake
 share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
 share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
 share/cmake/Modules/WinPR2/WinPRTargets.cmake
-%%MANPAGES%%man/man1/winpr-hash.1.gz
-%%MANPAGES%%man/man1/winpr-makecert.1.gz
-%%WAYLAND%%%%MANPAGES%%man/man1/wlfreerdp.1.gz
-%%X11%%%%MANPAGES%%man/man1/xfreerdp.1.gz
-%%MANPAGES%%man/man7/wlog.7.gz
+%%WAYLAND%%share/cmake/Modules/uwac0/uwac-%%CMAKE_BUILD_TYPE%%.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwac.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfig.cmake
+%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfigVersion.cmake