cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/freerdp: Update to 2.0.0 RC0

Browse Source 
- Fix patches and post-patch to apply against new release
- Bump PORTREVISION of dependent ports

PR:		221240
Approved by:	kevans (maintainer)
This commit is contained in:
Ben Woods 2017-08-06 00:31:24 +00:00
parent 112302449d
commit 08d630621c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447436
10 changed files with 173 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/freerdp/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= freerdp
PORTVERSION= 2.0.0.g2016.11.24
PORTREVISION= 4
DISTVERSION= 2.0.0-rc0
CATEGORIES= net comms ipv6
MAINTAINER= kevans@FreeBSD.org
@ -15,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
GH_PROJECT= ${GH_ACCOUNT}
GH_TAGNAME= 2a6dbab
USES= alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl
USE_LDCONFIG= yes
@ -85,8 +83,6 @@ post-patch:
${WRKSRC}/client/X11/CMakeLists.txt
@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
${WRKSRC}/channels/drive/client/statvfs.c
@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \
${WRKSRC}/client/CMakeLists.txt \

6
net/freerdp/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1480005507
SHA256 (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 2a8550c3b067f49353614c4dc13fff4b2c0cf7653dd765c8e44eccaf8c79f20b
SIZE (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 6417326
TIMESTAMP = 1501924476
SHA256 (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664
SIZE (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = 6486533

11
net/freerdp/files/patch-libfreerdp_crypto_crypto.c Normal file
View File

@ -0,0 +1,11 @@
--- 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 \

37
net/freerdp/files/patch-libfreerdp_crypto_tls.c
View File

@ -1,32 +1,27 @@
--- libfreerdp/crypto/tls.c.orig 2016-11-24 14:45:22 UTC
--- libfreerdp/crypto/tls.c.orig 2017-07-24 08:46:54 UTC
+++ libfreerdp/crypto/tls.c
@@ -218,9 +218,9 @@ static long bio_rdp_tls_ctrl(BIO* bio, i
case BIO_CTRL_RESET:
SSL_shutdown(tls->ssl);
@@ -853,13 +853,13 @@ int tls_connect(rdpTls* tls, BIO* underlying)
if (!tls_prepare(tls, underlying, SSLv23_client_method(), options, TRUE))
return FALSE;
- if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect)
+ if (SSL_in_connect_init(tls->ssl))
SSL_set_connect_state(tls->ssl);
- else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept)
+ else if (SSL_in_accept_init(tls->ssl))
SSL_set_accept_state(tls->ssl);
SSL_clear(tls->ssl);
@@ -805,7 +805,7 @@ int tls_connect(rdpTls* tls, BIO* underl
-#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);
}
-#ifndef OPENSSL_NO_TLSEXT
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
-#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)
{
@@ -949,7 +949,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underl
@@ -1002,7 +1002,7 @@ BOOL tls_accept(rdpTls* tls, BIO* underlying, rdpSetti
return FALSE;
}
-#ifndef OPENSSL_NO_TLSEXT
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
/**
* The Microsoft iOS clients eventually send a null or even double null
* terminated hostname in the SNI TLS extension!
-#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;

29
net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c Normal file
View File

@ -0,0 +1,29 @@
--- 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
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
@@ -214,7 +214,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const BYTE
#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
#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

56
net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c Normal file
View File

@ -0,0 +1,56 @@
--- 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);

38
net/freerdp/files/patch-winpr_tools_makecert_makecert.c Normal file
View File

@ -0,0 +1,38 @@
--- 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

30
net/freerdp/pkg-plist
View File

@ -190,24 +190,22 @@ include/winpr2/winpr/wlog.h
include/winpr2/winpr/wnd.h
include/winpr2/winpr/wtsapi.h
include/winpr2/winpr/wtypes.h
lib/libfreerdp-client.so
lib/libfreerdp-client.so.2
lib/libfreerdp-client.so.2.0.0
lib/libfreerdp.so
lib/libfreerdp.so.2
lib/libfreerdp.so.2.0.0
lib/libwinpr-tools.so
lib/libwinpr-tools.so.2
lib/libwinpr-tools.so.2.0.0
lib/libwinpr.so
lib/libwinpr.so.2
lib/libwinpr.so.2.0.0
lib/libfreerdp-client2.so
lib/libfreerdp-client2.so.2
lib/libfreerdp-client2.so.2.0.0
lib/libfreerdp2.so
lib/libfreerdp2.so.2
lib/libfreerdp2.so.2.0.0
lib/libwinpr-tools2.so
lib/libwinpr-tools2.so.2
lib/libwinpr-tools2.so.2.0.0
lib/libwinpr2.so
lib/libwinpr2.so.2
lib/libwinpr2.so.2.0.0
libdata/pkgconfig/freerdp-client2.pc
libdata/pkgconfig/freerdp2.pc
libdata/pkgconfig/winpr-tools2.pc
libdata/pkgconfig/winpr2.pc
man/man1/wlog.1.gz
%%X11%%man/man1/xfreerdp.1.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
@ -220,3 +218,7 @@ 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
share/man/man1/winpr-hash.1
share/man/man1/winpr-makecert.1
%%X11%%share/man/man1/xfreerdp.1
share/man/man7/wlog.7

3
net/remmina-plugin-rdp/Makefile
View File

@ -2,10 +2,11 @@
# $FreeBSD$
PKGNAMESUFFIX= -rdp
PORTREVISION= 1
COMMENT= Remmina plugin for RDP protocol
LIB_DEPENDS= libfreerdp.so:net/freerdp
LIB_DEPENDS= libfreerdp2.so:net/freerdp
USE_GNOME+= cairo
USE_XORG+= ice sm x11 xext

2
net/vinagre/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= vinagre
PORTVERSION= 3.18.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3