Attachment 189337 Details for Bug 224658 – patch-freerdp-2.0.0-rc1

[patch] patch-freerdp-2.0.0-rc1

freerdp.diff (text/plain), 10.35 KB, created by Carlos J. Puga Medina on 2018-01-02 12:18:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2018-01-02 12:18:59 UTC

Size: 10.35 KB

patch

obsolete

>Index: net/freerdp/Makefile
>===================================================================
>--- net/freerdp/Makefile	(revision 457839)
>+++ net/freerdp/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	freerdp
>-DISTVERSION=	2.0.0-rc0
>-PORTREVISION=	3
>+DISTVERSION=	2.0.0-rc1
> CATEGORIES=	net comms ipv6
> 
> MAINTAINER=	kevans@FreeBSD.org
>@@ -12,21 +11,22 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+USES=		alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
>+USE_LDCONFIG=	yes
>+CPE_VENDOR=	freerdp_project
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	FreeRDP
> GH_PROJECT=	${GH_ACCOUNT}
> 
>-USES=		alias cmake:outsource compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
>-USE_LDCONFIG=	yes
>-CPE_VENDOR=	freerdp_project
>-
> CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
> 
> CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
> CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
> 
>-OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO WAYLAND X11
>-OPTIONS_DEFAULT=	CUPS GSTREAMER WAYLAND X11
>+OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
>+			PULSEAUDIO WAYLAND X11
>+OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11
> OPTIONS_SUB=		yes
> 
> OPTIONS_DEFINE_armv6=	NEON
>@@ -49,6 +49,15 @@
> GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xext,xextproto,xrandr
> GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
> 
>+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
>+ICU_CMAKE_BOOL=		WITH_ICU
>+
>+KERBEROS_CMAKE_BOOL=	WITH_GSSAPI_HEIMDAL
>+
>+MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt
>+MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
>+MANPAGES_CMAKE_OFF=	-DWITH_MANPAGES=OFF
>+
> NEON_DESC=		Enable	Media Processing Engine instructions
> NEON_CMAKE_BOOL=	WITH_NEON
> .if ! ${CFLAGS:M-march*}
>@@ -69,7 +78,6 @@
> WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
> 
> X11_DESC=		Build FreeRDP X11 client
>-X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
> X11_CMAKE_BOOL=		WITH_X11
> X11_CMAKE_OFF=		-DWITH_XKBFILE=OFF
> X11_USE=		xorg=x11,xcursor,xext,xextproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
>@@ -88,9 +96,8 @@
> post-patch:
> 	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
> 		${WRKSRC}/CMakeLists.txt
>-	@${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \
>-		${WRKSRC}/winpr/CMakeLists.txt \
>-		${WRKSRC}/client/X11/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
>Index: net/freerdp/distinfo
>===================================================================
>--- net/freerdp/distinfo	(revision 457839)
>+++ net/freerdp/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1501924476
>-SHA256 (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664
>-SIZE (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = 6486533
>+TIMESTAMP = 1514888037
>+SHA256 (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2
>+SIZE (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = 6530403
>Index: net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c
>===================================================================
>--- net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c	(revision 457839)
>+++ net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c	(working copy)
>@@ -1,6 +1,6 @@
>---- winpr/libwinpr/crypto/hash.c.orig	2017-08-05 09:37:24 UTC
>+--- winpr/libwinpr/crypto/hash.c.orig	2017-11-28 14:26:30 UTC
> +++ winpr/libwinpr/crypto/hash.c
>-@@ -178,7 +178,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYP
>+@@ -179,7 +179,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx
>  	if (!evp || !hmac)
>  		return FALSE;
>  
>@@ -9,16 +9,16 @@
>  	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
>  	return TRUE;
>  #else
>-@@ -214,7 +214,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const BYTE
>+@@ -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
>-@@ -244,7 +244,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ctx, BYTE* outpu
>+@@ -247,7 +247,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ct
>  
>  #if defined(WITH_OPENSSL)
>  	hmac = (HMAC_CTX*) ctx;
>Index: net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c
>===================================================================
>--- net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c	(revision 457839)
>+++ net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c	(working copy)
>@@ -1,4 +1,4 @@
>---- winpr/libwinpr/utils/ssl.c.orig	2017-07-24 08:46:54 UTC
>+--- 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
>  };
>@@ -9,7 +9,7 @@
>  static unsigned long _winpr_openssl_id(void)
>  {
>  	return (unsigned long)GetCurrentThreadId();
>-@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void)
>+@@ -174,7 +174,7 @@ static BOOL _winpr_openssl_initialize_lo
>  	}
>  
>  	/* Use the deprecated CRYPTO_get_id_callback() if building against OpenSSL < 1.0.0 */
>@@ -18,7 +18,7 @@
>  
>  	if (CRYPTO_get_id_callback())
>  	{
>-@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void)
>+@@ -224,7 +224,7 @@ static BOOL _winpr_openssl_cleanup_locki
>  		CRYPTO_set_dynlock_destroy_callback(NULL);
>  	}
>  
>@@ -27,30 +27,21 @@
>  
>  	if (CRYPTO_get_id_callback() == _winpr_openssl_id)
>  	{
>-@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O
>- 	}
>- #endif
>- 	/* SSL_load_error_strings() is void */
>--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 	SSL_load_error_strings();
>- 	/* SSL_library_init() always returns "1" */
>- 	SSL_library_init();
>-@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
>- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
>- 		_winpr_openssl_cleanup_locking();
>- #endif
>--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 		CRYPTO_cleanup_all_ex_data();
>- 		ERR_free_strings();
>- 		EVP_cleanup();
>-@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
>- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
>- 	if (flags & WINPR_SSL_CLEANUP_THREAD)
>+@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_init
>+ 
>+ 	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
>  	{
>--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
>-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 		ERR_remove_state(0);
>+-#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
>- 		ERR_remove_thread_state(NULL);
>+ 		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);
>Index: net/freerdp/files/patch-winpr_tools_makecert_makecert.c
>===================================================================
>--- net/freerdp/files/patch-winpr_tools_makecert_makecert.c	(revision 457839)
>+++ net/freerdp/files/patch-winpr_tools_makecert_makecert.c	(working copy)
>@@ -1,33 +1,6 @@
>---- winpr/tools/makecert/makecert.c.orig	2017-07-24 08:46:54 UTC
>+--- winpr/tools/makecert/makecert.c.orig	2017-11-28 14:26:30 UTC
> +++ winpr/tools/makecert/makecert.c
>-@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_
>- 				printf("Using default export password \"password\"\n");
>- 			}
>- 
>--#if OPENSSL_VERSION_NUMBER < 0x10100000L
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 			OpenSSL_add_all_algorithms();
>- 			OpenSSL_add_all_ciphers();
>- 			OpenSSL_add_all_digests();
>-@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
>- 		key_length = atoi(arg->Value);
>- 	}
>- 
>--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
>- #else
>- 	{
>-@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
>- 	{
>- 		ASN1_TIME* before;
>- 		ASN1_TIME* after;
>--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 		before = X509_get_notBefore(context->x509);
>- 		after = X509_get_notAfter(context->x509);
>- #else
>-@@ -1242,7 +1242,7 @@ void makecert_context_free(MAKECERT_CONTEXT* context)
>+@@ -1275,7 +1275,7 @@ void makecert_context_free(MAKECERT_CONT
>  #ifdef WITH_OPENSSL
>  		X509_free(context->x509);
>  		EVP_PKEY_free(context->pkey);
>Index: net/freerdp/pkg-descr
>===================================================================
>--- net/freerdp/pkg-descr	(revision 457839)
>+++ net/freerdp/pkg-descr	(working copy)
>@@ -3,4 +3,4 @@
> software wherever you want, the way you want it, in a world where
> interoperability can finally liberate your computing experience.
> 
>-WWW: http://www.freerdp.com/
>+WWW: http://www.freerdp.com
>Index: net/freerdp/pkg-plist
>===================================================================
>--- net/freerdp/pkg-plist	(revision 457839)
>+++ net/freerdp/pkg-plist	(working copy)
>@@ -43,6 +43,7 @@
> include/freerdp2/freerdp/client/rdpgfx.h
> 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/codec/audio.h
> include/freerdp2/freerdp/codec/bitmap.h
>@@ -229,8 +230,8 @@
> share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
> share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
> share/cmake/Modules/WinPR2/WinPRTargets.cmake
>-share/man/man1/winpr-hash.1
>-share/man/man1/winpr-makecert.1
>-%%WAYLAND%%share/man/man1/wlfreerdp.1
>-%%X11%%share/man/man1/xfreerdp.1
>-share/man/man7/wlog.7
>+%%MANPAGES%%share/man/man1/winpr-hash.1
>+%%MANPAGES%%share/man/man1/winpr-makecert.1
>+%%WAYLAND%%%%MANPAGES%%share/man/man1/wlfreerdp.1
>+%%X11%%%%MANPAGES%%share/man/man1/xfreerdp.1
>+%%MANPAGES%%share/man/man7/wlog.7

Actions: View | Diff

Attachments on bug 224658: 189178 | 189195 | 189337 | 189352