--- net/freerdp/Makefile (revision 457465) +++ net/freerdp/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= freerdp -DISTVERSION= 2.0.0-rc0 -PORTREVISION= 2 +DISTVERSION= 2.0.0-rc1 CATEGORIES= net comms ipv6 MAINTAINER= kevans@FreeBSD.org @@ -25,8 +24,9 @@ CMAKE_ARGS_aarch64= -DWITH_NEON=ON CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang -OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO X11 -OPTIONS_DEFAULT= CUPS GSTREAMER X11 +OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \ + PULSEAUDIO X11 +OPTIONS_DEFAULT= CUPS GSTREAMER ICU MANPAGES X11 OPTIONS_SUB= yes OPTIONS_DEFINE_armv6= NEON @@ -49,6 +49,11 @@ GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,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 + NEON_DESC= Enable Media Processing Engine instructions NEON_CMAKE_BOOL= WITH_NEON .if ! ${CFLAGS:M-march*} @@ -55,6 +60,9 @@ NEON_CFLAGS= -march=armv7-a .endif +MANPAGES_CMAKE_BOOL= WITH_MANPAGES +MANPAGES_CMAKE_OFF= -DWITH_MANPAGES=OFF + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE @@ -80,9 +88,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 --- net/freerdp/distinfo (revision 457465) +++ 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 = 1514487220 +SHA256 (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2 +SIZE (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = 6530403 --- net/freerdp/files/patch-libfreerdp_crypto_crypto.c (revision 457465) +++ net/freerdp/files/patch-libfreerdp_crypto_crypto.c (nonexistent) @@ -1,11 +0,0 @@ ---- libfreerdp/crypto/crypto.c.orig 2017-08-05 09:35:32 UTC -+++ libfreerdp/crypto/crypto.c -@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* ce - if (cert_ctx == NULL) - goto end; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - OpenSSL_add_all_algorithms(); - #else - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ --- net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c (revision 457465) +++ 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 -@@ -178,7 +178,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYP +--- winpr/libwinpr/crypto/hash.c.orig 2017-11-28 15:26:30.000000000 +0100 ++++ winpr/libwinpr/crypto/hash.c 2017-12-28 19:59:46.049089000 +0100 +@@ -179,7 +179,7 @@ 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 @@ + { #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 @@ #if defined(WITH_OPENSSL) hmac = (HMAC_CTX*) ctx; --- net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (revision 457465) +++ net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (nonexistent) @@ -1,56 +0,0 @@ ---- winpr/libwinpr/utils/ssl.c.orig 2017-07-24 08:46:54 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(); -@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void) - } - - /* 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()) - { -@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void) - 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) - { -@@ -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) - { --#if (OPENSSL_VERSION_NUMBER < 0x10000000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) - ERR_remove_state(0); - #else - ERR_remove_thread_state(NULL); --- net/freerdp/files/patch-winpr_tools_makecert_makecert.c (revision 457465) +++ net/freerdp/files/patch-winpr_tools_makecert_makecert.c (nonexistent) @@ -1,38 +0,0 @@ ---- winpr/tools/makecert/makecert.c.orig 2017-07-24 08:46:54 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) - #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 --- net/freerdp/pkg-descr (revision 457465) +++ 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 --- net/freerdp/pkg-plist (revision 457465) +++ net/freerdp/pkg-plist (working copy) @@ -42,6 +42,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 @@ -218,7 +219,7 @@ 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 -%%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 +%%X11%%%%MANPAGES%%share/man/man1/xfreerdp.1 +%%MANPAGES%%share/man/man7/wlog.7