Attachment #193015 for bug #225559

Lines 2-13 Link Here

(-)Makefile (-18 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= freerdp	4	PORTNAME= freerdp
5	DISTVERSION= 2.0.0-rc1	5	DISTVERSION= 2.0.0-rc2.g20180503
6	PORTREVISION= 4
7	CATEGORIES= net comms ipv6	6	CATEGORIES= net comms ipv6
8		7
9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
10	PATCHFILES= 78df32c77f28.patch:-p1 ed571e74a594.patch:-p1	9	PATCHFILES= 2fb992a96263.patch:-p1 # TRIO/RPATH
		10	PATCHFILES+= 5463b23591c4.patch:-p1 # 64-bit file
		11	PATCHFILES+= 824ace49accd.patch:-p1 a7c0632bf2d4.patch:-p1 # CMake Modules
		12	PATCHFILES+= f1a7c3cc6a5a.patch:-p1 # epoll fix
		13	PATCHFILES+= 1fd5c53a7473.patch:-p1 # Arg parsing
11		14
12	MAINTAINER= kevans@FreeBSD.org	15	MAINTAINER= kevans@FreeBSD.org
13	COMMENT= Free implementation of Remote Desktop Protocol	16	COMMENT= Free implementation of Remote Desktop Protocol
Lines 15-20 Link Here
15	LICENSE= APACHE20	18	LICENSE= APACHE20
16	LICENSE_FILE= ${WRKSRC}/LICENSE	19	LICENSE_FILE= ${WRKSRC}/LICENSE
17		20
		21	LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
		22
18	USES= alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl	23	USES= alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
19	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
20	CPE_VENDOR= freerdp_project	25	CPE_VENDOR= freerdp_project
Lines 22-27 Link Here
22	USE_GITHUB= yes	27	USE_GITHUB= yes
23	GH_ACCOUNT= FreeRDP	28	GH_ACCOUNT= FreeRDP
24	GH_PROJECT= ${GH_ACCOUNT}	29	GH_PROJECT= ${GH_ACCOUNT}
		30	GH_TAGNAME= 2215071b2380
25		31
26	CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}	32	CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
27		33
Lines 75-82 Link Here
75		81
76	WAYLAND_DESC= Build FreeRDP Wayland client	82	WAYLAND_DESC= Build FreeRDP Wayland client
77	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	83	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
78	WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \	84	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
79	libwayland-client.so:graphics/wayland \
80	libwayland-cursor.so:graphics/wayland \	85	libwayland-cursor.so:graphics/wayland \
81	libxkbcommon.so:x11/libxkbcommon	86	libxkbcommon.so:x11/libxkbcommon
82	WAYLAND_CMAKE_BOOL= WITH_WAYLAND	87	WAYLAND_CMAKE_BOOL= WITH_WAYLAND
Lines 98-116 Link Here
98	.endif	103	.endif
99		104
100	post-patch:	105	post-patch:
101	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
102	${WRKSRC}/CMakeLists.txt
103	@${REINPLACE_CMD} -e 's/Linux/Linux\|FreeBSD/' \
104	${WRKSRC}/winpr/CMakeLists.txt
105	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \
106	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
107	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake	106	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
108	@${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_LIBDIR}/cmake\|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules\|' \
109	${WRKSRC}/client/CMakeLists.txt \
110	${WRKSRC}/winpr/CMakeLists.txt \
111	${WRKSRC}/uwac/CMakeLists.txt \
112	${WRKSRC}/server/CMakeLists.txt \
113	${WRKSRC}/server/shadow/CMakeLists.txt \
114	${WRKSRC}/libfreerdp/CMakeLists.txt
115		107
116	.include <bsd.port.post.mk>	108	.include <bsd.port.post.mk>




TIMESTAMP = 1525317756
SHA256 (FreeRDP-FreeRDP-2.0.0-rc2.g20180503-2215071b2380_GH0.tar.gz) = aaca55e47b49d4cc374b181c863682852b569ec7ab53a9468e357a480bb09152
SIZE (FreeRDP-FreeRDP-2.0.0-rc2.g20180503-2215071b2380_GH0.tar.gz) = 6569124
SHA256 (2fb992a96263.patch) = afeb91f41ee2e2845ad1858ce6dc3dd839906a70f68a0af2fcb955c2d37ba86e
SIZE (2fb992a96263.patch) = 1377
SHA256 (5463b23591c4.patch) = 2e72bd36442921ecb160032e449dae65c9e522529481aca556d04a474063a433
SIZE (5463b23591c4.patch) = 1222
SHA256 (824ace49accd.patch) = 3442c46452a2b897cc4bb9f2db3b7481d79137377ba64555adb1a5a55def94df
SIZE (824ace49accd.patch) = 1670
SHA256 (a7c0632bf2d4.patch) = 5c518726be968dc244a8a19d26e40db1213f445e005490bef3280252a686ea2b
SIZE (a7c0632bf2d4.patch) = 4059
SHA256 (f1a7c3cc6a5a.patch) = dba3ea25ce1e64843d706aad1c0e03eb7cb155a08575fd68c9be33862050302e
SIZE (f1a7c3cc6a5a.patch) = 1033
SHA256 (1fd5c53a7473.patch) = 177c97c22e1d7b7249a36628e49f2f7719dec5f0a5fe7af70db7dd5aa974edae
SIZE (1fd5c53a7473.patch) = 3920




--- CMakeLists.txt.orig	2016-11-24 13:19:47 UTC
+++ CMakeLists.txt
@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
 	endif()
 endif()
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+	set(BSD TRUE)
+	set(FREEBSD TRUE)
+endif()
+
 # Configure MSVC Runtime
 if(MSVC)
 	include(MSVCRuntime)




--- client/Wayland/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
+++ client/Wayland/CMakeLists.txt
@@ -39,5 +39,12 @@ target_link_libraries(${MODULE_NAME} ${$
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
+
+if(WITH_MANPAGES)
 configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
+	if(BSD)
+	    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 DESTINATION man/man1)
+	else()
+	    install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
+	endif()
+endif(WITH_MANPAGES)




--- client/X11/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
+++ client/X11/CMakeLists.txt
@@ -111,7 +111,11 @@ if(WITH_MANPAGES)
 		add_custom_target(xfreerdp.manpage ALL
 			DEPENDS xfreerdp.1)
 
-		install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
+		if(BSD)
+		    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION man/man1)
+		else()
+		    install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
+		endif()
 	else()
 		message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed")
 	endif()




--- 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)




--- 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;




--- 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)
 




--- 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;
 }




--- winpr/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
+++ winpr/CMakeLists.txt
@@ -180,7 +180,14 @@ if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
 
-install_freerdp_man(wlog.7 7)
+if(WITH_MANPAGES)
+	if(BSD)
+	   install(FILES wlog.7 DESTINATION man/man7)
+	else()
+	   install_freerdp_man(wlog.7 7)
+	endif()
+endif(WITH_MANPAGES)
+
 # Exporting
 
 if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")




--- 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




--- 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);




--- winpr/tools/hash-cli/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
+++ winpr/tools/hash-cli/CMakeLists.txt
@@ -50,5 +50,11 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
+if(WITH_MANPAGES)
 configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
+	if(BSD)
+	    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 DESTINATION man/man1)
+	else()
+	    install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
+	endif()
+endif(WITH_MANPAGES)




--- winpr/tools/makecert-cli/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
+++ winpr/tools/makecert-cli/CMakeLists.txt
@@ -51,5 +51,11 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
     install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()
 
+if(WITH_MANPAGES)
 configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
+	if(BSD)
+	    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 DESTINATION man/man1)
+	else()
+	    install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
+	endif()
+endif(WITH_MANPAGES)

Lines 1-11 Link Here

(-)files/patch-winpr_tools_makecert_makecert.c (-11 lines)
1	--- winpr/tools/makecert/makecert.c.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/tools/makecert/makecert.c
3	@@ -1275,7 +1275,7 @@ void makecert_context_free(MAKECERT_CONT
4	#ifdef WITH_OPENSSL
5	X509_free(context->x509);
6	EVP_PKEY_free(context->pkey);
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
9	CRYPTO_cleanup_all_ex_data();
10	#endif
11	#endif




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

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

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

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

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

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

Return to bug 225559

Lines 1-7 Link Here

(-)distinfo (-7 / +15 lines)
1	TIMESTAMP = 1514888037	1	TIMESTAMP = 1525317756
2	SHA256 (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2	2	SHA256 (FreeRDP-FreeRDP-2.0.0-rc2.g20180503-2215071b2380_GH0.tar.gz) = aaca55e47b49d4cc374b181c863682852b569ec7ab53a9468e357a480bb09152
3	SIZE (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = 6530403	3	SIZE (FreeRDP-FreeRDP-2.0.0-rc2.g20180503-2215071b2380_GH0.tar.gz) = 6569124
4	SHA256 (78df32c77f28.patch) = 797b38de1570e7f09fa4dc2d54e2e5f297ab15431b8d09348f55314716429f7c	4	SHA256 (2fb992a96263.patch) = afeb91f41ee2e2845ad1858ce6dc3dd839906a70f68a0af2fcb955c2d37ba86e
5	SIZE (78df32c77f28.patch) = 2393	5	SIZE (2fb992a96263.patch) = 1377
6	SHA256 (ed571e74a594.patch) = a40e4bc915c8c90d312d9369dcdf84433d9de3ceaf1595327b09c38f137db8d6	6	SHA256 (5463b23591c4.patch) = 2e72bd36442921ecb160032e449dae65c9e522529481aca556d04a474063a433
7	SIZE (ed571e74a594.patch) = 1789	7	SIZE (5463b23591c4.patch) = 1222
		8	SHA256 (824ace49accd.patch) = 3442c46452a2b897cc4bb9f2db3b7481d79137377ba64555adb1a5a55def94df
		9	SIZE (824ace49accd.patch) = 1670
		10	SHA256 (a7c0632bf2d4.patch) = 5c518726be968dc244a8a19d26e40db1213f445e005490bef3280252a686ea2b
		11	SIZE (a7c0632bf2d4.patch) = 4059
		12	SHA256 (f1a7c3cc6a5a.patch) = dba3ea25ce1e64843d706aad1c0e03eb7cb155a08575fd68c9be33862050302e
		13	SIZE (f1a7c3cc6a5a.patch) = 1033
		14	SHA256 (1fd5c53a7473.patch) = 177c97c22e1d7b7249a36628e49f2f7719dec5f0a5fe7af70db7dd5aa974edae
		15	SIZE (1fd5c53a7473.patch) = 3920

Lines 1-14 Link Here

(-)files/patch-CMakeLists.txt (-14 lines)
1	--- CMakeLists.txt.orig 2016-11-24 13:19:47 UTC
2	+++ CMakeLists.txt
3	@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
4	endif()
5	endif()
6
7	+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
8	+ set(BSD TRUE)
9	+ set(FREEBSD TRUE)
10	+endif()
11	+
12	# Configure MSVC Runtime
13	if(MSVC)
14	include(MSVCRuntime)

Lines 1-16 Link Here

(-)files/patch-client_Wayland_CMakeLists.txt (-16 lines)
1	--- client/Wayland/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
2	+++ client/Wayland/CMakeLists.txt
3	@@ -39,5 +39,12 @@ target_link_libraries(${MODULE_NAME} ${$
4	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
5
6	set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
7	+
8	+if(WITH_MANPAGES)
9	configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1)
10	-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
11	+ if(BSD)
12	+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 DESTINATION man/man1)
13	+ else()
14	+ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
15	+ endif()
16	+endif(WITH_MANPAGES)

Lines 1-15 Link Here

(-)files/patch-client_X11_CMakeLists.txt (-15 lines)
1	--- client/X11/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
2	+++ client/X11/CMakeLists.txt
3	@@ -111,7 +111,11 @@ if(WITH_MANPAGES)
4	add_custom_target(xfreerdp.manpage ALL
5	DEPENDS xfreerdp.1)
6
7	- install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
8	+ if(BSD)
9	+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION man/man1)
10	+ else()
11	+ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
12	+ endif()
13	else()
14	message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed")
15	endif()

Lines 1-22 Link Here

(-)files/patch-libfreerdp_core_nla.c (-22 lines)
1	--- libfreerdp/core/nla.c.orig 2018-03-21 03:26:15 UTC
2	+++ libfreerdp/core/nla.c
3	@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla)
4	static int nla_decode_ts_request(rdpNla* nla, wStream* s)
5	{
6	int length;
7	+ UINT32 version = 0;
8
9	/* TSRequest */
10	if (!ber_read_sequence_tag(s, &length) \|\|
11	!ber_read_contextual_tag(s, 0, &length, TRUE) \|\|
12	- !ber_read_integer(s, &nla->version))
13	+ !ber_read_integer(s, &version))
14	{
15	return -1;
16	}
17	+
18	+ if (version < nla->version)
19	+ nla->version = version;
20
21	/* [1] negoTokens (NegoData) */
22	if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)

Lines 1-27 Link Here

(-)files/patch-libfreerdp_crypto_tls.c (-27 lines)
1	--- libfreerdp/crypto/tls.c.orig 2017-07-24 08:46:54 UTC
2	+++ libfreerdp/crypto/tls.c
3	@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying)
4	if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE))
5	return FALSE;
6
7	-#ifndef OPENSSL_NO_TLSEXT
8	+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
9	SSL_set_tlsext_host_name(tls->ssl, tls->hostname);
10	#endif
11	return tls_do_handshake(tls, TRUE);
12	}
13
14	-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
15	+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
16	static void tls_openssl_tlsext_debug_callback(SSL* s, int client_server,
17	int type, unsigned char* data, int len, void* arg)
18	{
19	@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti
20	return FALSE;
21	}
22
23	-#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT)
24	+#if defined(MICROSOFT_IOS_SNI_BUG) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
25	SSL_set_tlsext_debug_callback(tls->ssl, tls_openssl_tlsext_debug_callback);
26	#endif
27	return tls_do_handshake(tls, FALSE) > 0;

Lines 1-21 Link Here

(-)files/patch-uwac_libuwac_CMakeLists.txt (-21 lines)
1	--- uwac/libuwac/CMakeLists.txt.orig 2017-11-27 16:59:34 UTC
2	+++ uwac/libuwac/CMakeLists.txt
3	@@ -40,6 +40,9 @@ generate_protocol_file(xdg-shell)
4	generate_protocol_file(ivi-application)
5	generate_protocol_file(fullscreen-shell)
6
7	+find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h sys/timerfd.h HINTS /usr/local/include/libepoll-shim)
8	+find_library(EPOLLSHIM_LIBS NAMES epoll-shim libepoll-shim HINTS /usr/local/lib)
9	+include_directories(${EPOLLSHIM_INCLUDE_DIR})
10	include_directories(${WAYLAND_INCLUDE_DIR})
11	include_directories(${XKBCOMMON_INCLUDE_DIR})
12	include_directories("${CMAKE_SOURCE_DIR}/uwac/include")
13	@@ -69,7 +72,7 @@ if (WITH_LIBRARY_VERSIONING)
14	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
15	endif()
16
17	-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp)
18	+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PRIVATE_KEYWORD} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} ${EPOLLSHIM_LIBS} freerdp)
19
20	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
21

Lines 1-29 Link Here

(-)files/patch-uwac_libuwac_uwac-os.c (-29 lines)
1	--- uwac/libuwac/uwac-os.c.orig 2017-11-27 16:54:50 UTC
2	+++ uwac/libuwac/uwac-os.c
3	@@ -31,6 +31,7 @@
4
5	#include <sys/types.h>
6	#include <sys/socket.h>
7	+#include <sys/mman.h>
8	#include <unistd.h>
9	#include <fcntl.h>
10	#include <errno.h>
11	@@ -153,17 +154,7 @@ static int create_tmpfile_cloexec(char *tmpname)
12	{
13	int fd;
14
15	-#ifdef HAVE_MKOSTEMP
16	- fd = mkostemp(tmpname, O_CLOEXEC);
17	- if (fd >= 0)
18	- unlink(tmpname);
19	-#else
20	- fd = mkstemp(tmpname);
21	- if (fd >= 0) {
22	- fd = set_cloexec_or_close(fd);
23	- unlink(tmpname);
24	- }
25	-#endif
26	+ fd = shm_open(SHM_ANON, O_CREAT \| O_RDWR, 0600);
27
28	return fd;
29	}

Lines 1-18 Link Here

(-)files/patch-winpr_CMakeLists.txt (-18 lines)
1	--- winpr/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/CMakeLists.txt
3	@@ -180,7 +180,14 @@ if(BUILD_TESTING)
4	add_subdirectory(test)
5	endif()
6
7	-install_freerdp_man(wlog.7 7)
8	+if(WITH_MANPAGES)
9	+ if(BSD)
10	+ install(FILES wlog.7 DESTINATION man/man7)
11	+ else()
12	+ install_freerdp_man(wlog.7 7)
13	+ endif()
14	+endif(WITH_MANPAGES)
15	+
16	# Exporting
17
18	if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")

Lines 1-29 Link Here

(-)files/patch-winpr_libwinpr_crypto_hash.c (-29 lines)
1	--- winpr/libwinpr/crypto/hash.c.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/libwinpr/crypto/hash.c
3	@@ -179,7 +179,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx
4	if (!evp \|\| !hmac)
5	return FALSE;
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
9	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
10	return TRUE;
11	#else
12	@@ -215,7 +215,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* c
13	{
14	#if defined(WITH_OPENSSL)
15	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
16	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
18	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
19	return TRUE;
20	#else
21	@@ -247,7 +247,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ct
22
23	#if defined(WITH_OPENSSL)
24	hmac = (HMAC_CTX*) ctx;
25	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
26	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
27	HMAC_Final(hmac, output, NULL); /* no return value on OpenSSL 0.9.x */
28	return TRUE;
29	#else

Lines 1-47 Link Here

(-)files/patch-winpr_libwinpr_utils_ssl.c (-47 lines)
1	--- winpr/libwinpr/utils/ssl.c.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/libwinpr/utils/ssl.c
3	@@ -58,7 +58,7 @@ struct CRYPTO_dynlock_value
4	};
5
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
9	static unsigned long _winpr_openssl_id(void)
10	{
11	return (unsigned long)GetCurrentThreadId();
12	@@ -174,7 +174,7 @@ static BOOL _winpr_openssl_initialize_lo
13	}
14
15	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
16	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
18
19	if (CRYPTO_get_id_callback())
20	{
21	@@ -224,7 +224,7 @@ static BOOL _winpr_openssl_cleanup_locki
22	CRYPTO_set_dynlock_destroy_callback(NULL);
23	}
24
25	-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
26	+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
27
28	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
29	{
30	@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_init
31
32	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
33	{
34	-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
35	+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
36	WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
37	#else
38	WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
39	@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
40
41	BOOL winpr_FIPSMode(void)
42	{
43	-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
44	+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
45	return FALSE;
46	#else
47	return (FIPS_mode() == 1);

Lines 1-15 Link Here

(-)files/patch-winpr_tools_hash-cli_CMakeLists.txt (-15 lines)
1	--- winpr/tools/hash-cli/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/tools/hash-cli/CMakeLists.txt
3	@@ -50,5 +50,11 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
4	endif()
5
6	set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
7	+if(WITH_MANPAGES)
8	configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1)
9	-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
10	+ if(BSD)
11	+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 DESTINATION man/man1)
12	+ else()
13	+ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
14	+ endif()
15	+endif(WITH_MANPAGES)

Lines 1-15 Link Here

(-)files/patch-winpr_tools_makecert-cli_CMakeLists.txt (-15 lines)
1	--- winpr/tools/makecert-cli/CMakeLists.txt.orig 2017-11-28 14:26:30 UTC
2	+++ winpr/tools/makecert-cli/CMakeLists.txt
3	@@ -51,5 +51,11 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
4	install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
5	endif()
6
7	+if(WITH_MANPAGES)
8	configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1)
9	-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
10	+ if(BSD)
11	+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 DESTINATION man/man1)
12	+ else()
13	+ install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
14	+ endif()
15	+endif(WITH_MANPAGES)

Lines 20-25 Link Here

(-)pkg-plist (+6 lines)
20	include/freerdp2/freerdp/channels/channels.h	20	include/freerdp2/freerdp/channels/channels.h
21	include/freerdp2/freerdp/channels/cliprdr.h	21	include/freerdp2/freerdp/channels/cliprdr.h
22	include/freerdp2/freerdp/channels/encomsp.h	22	include/freerdp2/freerdp/channels/encomsp.h
		23	include/freerdp2/freerdp/channels/geometry.h
23	include/freerdp2/freerdp/channels/log.h	24	include/freerdp2/freerdp/channels/log.h
24	include/freerdp2/freerdp/channels/rail.h	25	include/freerdp2/freerdp/channels/rail.h
25	include/freerdp2/freerdp/channels/rdpdr.h	26	include/freerdp2/freerdp/channels/rdpdr.h
Lines 28-33 Link Here
28	include/freerdp2/freerdp/channels/rdpsnd.h	29	include/freerdp2/freerdp/channels/rdpsnd.h
29	include/freerdp2/freerdp/channels/remdesk.h	30	include/freerdp2/freerdp/channels/remdesk.h
30	include/freerdp2/freerdp/channels/tsmf.h	31	include/freerdp2/freerdp/channels/tsmf.h
		32	include/freerdp2/freerdp/channels/video.h
31	include/freerdp2/freerdp/channels/wtsvc.h	33	include/freerdp2/freerdp/channels/wtsvc.h
32	include/freerdp2/freerdp/client.h	34	include/freerdp2/freerdp/client.h
33	include/freerdp2/freerdp/client/audin.h	35	include/freerdp2/freerdp/client/audin.h
Lines 38-43 Link Here
38	include/freerdp2/freerdp/client/drdynvc.h	40	include/freerdp2/freerdp/client/drdynvc.h
39	include/freerdp2/freerdp/client/encomsp.h	41	include/freerdp2/freerdp/client/encomsp.h
40	include/freerdp2/freerdp/client/file.h	42	include/freerdp2/freerdp/client/file.h
		43	include/freerdp2/freerdp/client/geometry.h
41	include/freerdp2/freerdp/client/rail.h	44	include/freerdp2/freerdp/client/rail.h
42	include/freerdp2/freerdp/client/rdpei.h	45	include/freerdp2/freerdp/client/rdpei.h
43	include/freerdp2/freerdp/client/rdpgfx.h	46	include/freerdp2/freerdp/client/rdpgfx.h
Lines 45-50 Link Here
45	include/freerdp2/freerdp/client/remdesk.h	48	include/freerdp2/freerdp/client/remdesk.h
46	include/freerdp2/freerdp/client/sshagent.h	49	include/freerdp2/freerdp/client/sshagent.h
47	include/freerdp2/freerdp/client/tsmf.h	50	include/freerdp2/freerdp/client/tsmf.h
		51	include/freerdp2/freerdp/client/video.h
48	include/freerdp2/freerdp/codec/audio.h	52	include/freerdp2/freerdp/codec/audio.h
49	include/freerdp2/freerdp/codec/bitmap.h	53	include/freerdp2/freerdp/codec/bitmap.h
50	include/freerdp2/freerdp/codec/bulk.h	54	include/freerdp2/freerdp/codec/bulk.h
Lines 62-67 Link Here
62	include/freerdp2/freerdp/codec/region.h	66	include/freerdp2/freerdp/codec/region.h
63	include/freerdp2/freerdp/codec/rfx.h	67	include/freerdp2/freerdp/codec/rfx.h
64	include/freerdp2/freerdp/codec/xcrush.h	68	include/freerdp2/freerdp/codec/xcrush.h
		69	include/freerdp2/freerdp/codec/yuv.h
65	include/freerdp2/freerdp/codec/zgfx.h	70	include/freerdp2/freerdp/codec/zgfx.h
66	include/freerdp2/freerdp/codecs.h	71	include/freerdp2/freerdp/codecs.h
67	include/freerdp2/freerdp/constants.h	72	include/freerdp2/freerdp/constants.h
Lines 84-89 Link Here
84	include/freerdp2/freerdp/gdi/pen.h	89	include/freerdp2/freerdp/gdi/pen.h
85	include/freerdp2/freerdp/gdi/region.h	90	include/freerdp2/freerdp/gdi/region.h
86	include/freerdp2/freerdp/gdi/shape.h	91	include/freerdp2/freerdp/gdi/shape.h
		92	include/freerdp2/freerdp/gdi/video.h
87	include/freerdp2/freerdp/graphics.h	93	include/freerdp2/freerdp/graphics.h
88	include/freerdp2/freerdp/input.h	94	include/freerdp2/freerdp/input.h
89	include/freerdp2/freerdp/listener.h	95	include/freerdp2/freerdp/listener.h