Attachment 193015 Details for Bug 225559 – svn(1) diff of net/freerdp

[patch] svn(1) diff of net/freerdp

freerdp-2.0.0-rc2.diff (text/plain), 23.60 KB, created by Kyle Evans on 2018-05-03 03:36:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2018-05-03 03:36:14 UTC

Size: 23.60 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 468760)
>+++ Makefile	(working copy)
>@@ -2,12 +2,15 @@
> # $FreeBSD$
> 
> PORTNAME=	freerdp
>-DISTVERSION=	2.0.0-rc1
>-PORTREVISION=	4
>+DISTVERSION=	2.0.0-rc2.g20180503
> CATEGORIES=	net comms ipv6
> 
> PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>-PATCHFILES=	78df32c77f28.patch:-p1 ed571e74a594.patch:-p1
>+PATCHFILES=		2fb992a96263.patch:-p1							# TRIO/RPATH
>+PATCHFILES+=	5463b23591c4.patch:-p1							# 64-bit file
>+PATCHFILES+=	824ace49accd.patch:-p1 a7c0632bf2d4.patch:-p1	# CMake Modules
>+PATCHFILES+=	f1a7c3cc6a5a.patch:-p1							# epoll fix
>+PATCHFILES+=	1fd5c53a7473.patch:-p1							# Arg parsing
> 
> MAINTAINER=	kevans@FreeBSD.org
> COMMENT=	Free implementation of Remote Desktop Protocol
>@@ -15,6 +18,8 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
>+
> USES=		alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
> USE_LDCONFIG=	yes
> CPE_VENDOR=	freerdp_project
>@@ -22,6 +27,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	FreeRDP
> GH_PROJECT=	${GH_ACCOUNT}
>+GH_TAGNAME=	2215071b2380
> 
> CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
> 
>@@ -75,8 +81,7 @@
> 
> WAYLAND_DESC=		Build FreeRDP Wayland client
> WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
>-WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
>-			libwayland-client.so:graphics/wayland \
>+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
> 			libwayland-cursor.so:graphics/wayland \
> 			libxkbcommon.so:x11/libxkbcommon
> WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
>@@ -98,19 +103,6 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
>-		${WRKSRC}/CMakeLists.txt
>-	@${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \
>-		${WRKSRC}/winpr/CMakeLists.txt
>-	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
>-		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
> 	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
>-	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \
>-		${WRKSRC}/client/CMakeLists.txt \
>-		${WRKSRC}/winpr/CMakeLists.txt \
>-		${WRKSRC}/uwac/CMakeLists.txt \
>-		${WRKSRC}/server/CMakeLists.txt \
>-		${WRKSRC}/server/shadow/CMakeLists.txt \
>-		${WRKSRC}/libfreerdp/CMakeLists.txt
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 468760)
>+++ distinfo	(working copy)
>@@ -1,7 +1,15 @@
>-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 = 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
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 468760)
>+++ files/patch-CMakeLists.txt	(nonexistent)
>@@ -1,14 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-client_Wayland_CMakeLists.txt
>===================================================================
>--- files/patch-client_Wayland_CMakeLists.txt	(revision 468760)
>+++ files/patch-client_Wayland_CMakeLists.txt	(nonexistent)
>@@ -1,16 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-client_Wayland_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-client_X11_CMakeLists.txt
>===================================================================
>--- files/patch-client_X11_CMakeLists.txt	(revision 468760)
>+++ files/patch-client_X11_CMakeLists.txt	(nonexistent)
>@@ -1,15 +0,0 @@
>---- 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()
>
>Property changes on: files/patch-client_X11_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-libfreerdp_core_nla.c
>===================================================================
>--- files/patch-libfreerdp_core_nla.c	(revision 468760)
>+++ files/patch-libfreerdp_core_nla.c	(nonexistent)
>@@ -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)
>
>Property changes on: files/patch-libfreerdp_core_nla.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-libfreerdp_crypto_tls.c
>===================================================================
>--- files/patch-libfreerdp_crypto_tls.c	(revision 468760)
>+++ files/patch-libfreerdp_crypto_tls.c	(nonexistent)
>@@ -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;
>
>Property changes on: files/patch-libfreerdp_crypto_tls.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-uwac_libuwac_CMakeLists.txt
>===================================================================
>--- files/patch-uwac_libuwac_CMakeLists.txt	(revision 468760)
>+++ files/patch-uwac_libuwac_CMakeLists.txt	(nonexistent)
>@@ -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)
>- 
>
>Property changes on: files/patch-uwac_libuwac_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-uwac_libuwac_uwac-os.c
>===================================================================
>--- files/patch-uwac_libuwac_uwac-os.c	(revision 468760)
>+++ files/patch-uwac_libuwac_uwac-os.c	(nonexistent)
>@@ -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;
>- }
>
>Property changes on: files/patch-uwac_libuwac_uwac-os.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-winpr_CMakeLists.txt
>===================================================================
>--- files/patch-winpr_CMakeLists.txt	(revision 468760)
>+++ files/patch-winpr_CMakeLists.txt	(nonexistent)
>@@ -1,18 +0,0 @@
>---- 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")
>
>Property changes on: files/patch-winpr_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-winpr_libwinpr_crypto_hash.c
>===================================================================
>--- files/patch-winpr_libwinpr_crypto_hash.c	(revision 468760)
>+++ files/patch-winpr_libwinpr_crypto_hash.c	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-winpr_libwinpr_crypto_hash.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-winpr_libwinpr_utils_ssl.c
>===================================================================
>--- files/patch-winpr_libwinpr_utils_ssl.c	(revision 468760)
>+++ files/patch-winpr_libwinpr_utils_ssl.c	(nonexistent)
>@@ -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);
>
>Property changes on: files/patch-winpr_libwinpr_utils_ssl.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-winpr_tools_hash-cli_CMakeLists.txt
>===================================================================
>--- files/patch-winpr_tools_hash-cli_CMakeLists.txt	(revision 468760)
>+++ files/patch-winpr_tools_hash-cli_CMakeLists.txt	(nonexistent)
>@@ -1,15 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-winpr_tools_hash-cli_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-winpr_tools_makecert-cli_CMakeLists.txt
>===================================================================
>--- files/patch-winpr_tools_makecert-cli_CMakeLists.txt	(revision 468760)
>+++ files/patch-winpr_tools_makecert-cli_CMakeLists.txt	(nonexistent)
>@@ -1,15 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-winpr_tools_makecert-cli_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-winpr_tools_makecert_makecert.c
>===================================================================
>--- files/patch-winpr_tools_makecert_makecert.c	(revision 468760)
>+++ files/patch-winpr_tools_makecert_makecert.c	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-winpr_tools_makecert_makecert.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 468760)
>+++ pkg-plist	(working copy)
>@@ -20,6 +20,7 @@
> 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/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/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/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/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/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

Actions: View | Diff

Attachments on bug 225559: 192351 | 192358 | 192835 | 192843 | 193015