View | Details | Raw Unified | Return to bug 224658 | Differences between
and this patch

Collapse All | Expand All

(-)net/freerdp/Makefile (-7 / +14 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	freerdp
4
PORTNAME=	freerdp
5
DISTVERSION=	2.0.0-rc0
5
DISTVERSION=	2.0.0-rc1
6
PORTREVISION=	2
7
CATEGORIES=	net comms ipv6
6
CATEGORIES=	net comms ipv6
8
7
9
MAINTAINER=	kevans@FreeBSD.org
8
MAINTAINER=	kevans@FreeBSD.org
Lines 25-32 Link Here
25
CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
24
CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
26
CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
25
CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
27
26
28
OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO X11
27
OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
29
OPTIONS_DEFAULT=	CUPS GSTREAMER X11
28
			PULSEAUDIO X11
29
OPTIONS_DEFAULT=	CUPS GSTREAMER ICU MANPAGES X11
30
OPTIONS_SUB=		yes
30
OPTIONS_SUB=		yes
31
31
32
OPTIONS_DEFINE_armv6=	NEON
32
OPTIONS_DEFINE_armv6=	NEON
Lines 49-54 Link Here
49
GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr
49
GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr
50
GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
50
GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
51
51
52
ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
53
ICU_CMAKE_BOOL=		WITH_ICU
54
55
KERBEROS_CMAKE_BOOL=	WITH_GSSAPI_HEIMDAL
56
52
NEON_DESC=		Enable	Media Processing Engine instructions
57
NEON_DESC=		Enable	Media Processing Engine instructions
53
NEON_CMAKE_BOOL=	WITH_NEON
58
NEON_CMAKE_BOOL=	WITH_NEON
54
.if ! ${CFLAGS:M-march*}
59
.if ! ${CFLAGS:M-march*}
Lines 55-60 Link Here
55
NEON_CFLAGS=		-march=armv7-a
60
NEON_CFLAGS=		-march=armv7-a
56
.endif
61
.endif
57
62
63
MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
64
MANPAGES_CMAKE_OFF=	-DWITH_MANPAGES=OFF
65
58
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
66
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
59
PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
67
PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
60
68
Lines 80-88 Link Here
80
post-patch:
88
post-patch:
81
	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
89
	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
82
		${WRKSRC}/CMakeLists.txt
90
		${WRKSRC}/CMakeLists.txt
83
	@${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \
91
	@${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \
84
		${WRKSRC}/winpr/CMakeLists.txt \
92
		${WRKSRC}/winpr/CMakeLists.txt
85
		${WRKSRC}/client/X11/CMakeLists.txt
86
	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
93
	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
87
		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
94
		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
88
	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
95
	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
(-)net/freerdp/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1501924476
1
TIMESTAMP = 1514487220
2
SHA256 (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664
2
SHA256 (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2
3
SIZE (FreeRDP-FreeRDP-2.0.0-rc0_GH0.tar.gz) = 6486533
3
SIZE (FreeRDP-FreeRDP-2.0.0-rc1_GH0.tar.gz) = 6530403
(-)net/freerdp/files/patch-libfreerdp_crypto_crypto.c (-11 lines)
Lines 1-11 Link Here
1
--- libfreerdp/crypto/crypto.c.orig	2017-08-05 09:35:32 UTC
2
+++ libfreerdp/crypto/crypto.c
3
@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* ce
4
 	if (cert_ctx == NULL)
5
 		goto end;
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
9
 	OpenSSL_add_all_algorithms();
10
 #else
11
 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
(-)net/freerdp/files/patch-winpr_libwinpr_crypto_hash.c (-6 / +6 lines)
Lines 1-6 Link Here
1
--- winpr/libwinpr/crypto/hash.c.orig	2017-08-05 09:37:24 UTC
1
--- winpr/libwinpr/crypto/hash.c.orig	2017-11-28 15:26:30.000000000 +0100
2
+++ winpr/libwinpr/crypto/hash.c
2
+++ winpr/libwinpr/crypto/hash.c	2017-12-28 19:59:46.049089000 +0100
3
@@ -178,7 +178,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYP
3
@@ -179,7 +179,7 @@
4
 	if (!evp || !hmac)
4
 	if (!evp || !hmac)
5
 		return FALSE;
5
 		return FALSE;
6
 
6
 
Lines 9-24 Link Here
9
 	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
9
 	HMAC_Init_ex(hmac, key, keylen, evp, NULL); /* no return value on OpenSSL 0.9.x */
10
 	return TRUE;
10
 	return TRUE;
11
 #else
11
 #else
12
@@ -214,7 +214,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const BYTE
12
@@ -215,7 +215,7 @@
13
 {
13
 #if defined(WITH_OPENSSL)
14
 #if defined(WITH_OPENSSL)
14
 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
15
 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
15
 
16
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
16
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
17
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
17
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
18
 	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
18
 	HMAC_Update(hmac, input, ilen); /* no return value on OpenSSL 0.9.x */
19
 	return TRUE;
19
 	return TRUE;
20
 #else
20
 #else
21
@@ -244,7 +244,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ctx, BYTE* outpu
21
@@ -247,7 +247,7 @@
22
 
22
 
23
 #if defined(WITH_OPENSSL)
23
 #if defined(WITH_OPENSSL)
24
 	hmac = (HMAC_CTX*) ctx;
24
 	hmac = (HMAC_CTX*) ctx;
(-)net/freerdp/files/patch-winpr_libwinpr_utils_ssl.c (-56 lines)
Lines 1-56 Link Here
1
--- winpr/libwinpr/utils/ssl.c.orig	2017-07-24 08:46:54 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
@@ -172,7 +172,7 @@ static BOOL _winpr_openssl_initialize_locking(void)
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
@@ -222,7 +222,7 @@ static BOOL _winpr_openssl_cleanup_locking(void)
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
@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_O
31
 	}
32
 #endif
33
 	/* SSL_load_error_strings() is void */
34
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
35
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
36
 	SSL_load_error_strings();
37
 	/* SSL_library_init() always returns "1" */
38
 	SSL_library_init();
39
@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
40
 #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
41
 		_winpr_openssl_cleanup_locking();
42
 #endif
43
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
44
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
45
 		CRYPTO_cleanup_all_ex_data();
46
 		ERR_free_strings();
47
 		EVP_cleanup();
48
@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
49
 #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
50
 	if (flags & WINPR_SSL_CLEANUP_THREAD)
51
 	{
52
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
53
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
54
 		ERR_remove_state(0);
55
 #else
56
 		ERR_remove_thread_state(NULL);
(-)net/freerdp/files/patch-winpr_tools_makecert_makecert.c (-38 lines)
Lines 1-38 Link Here
1
--- winpr/tools/makecert/makecert.c.orig	2017-07-24 08:46:54 UTC
2
+++ winpr/tools/makecert/makecert.c
3
@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_
4
 				printf("Using default export password \"password\"\n");
5
 			}
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
9
 			OpenSSL_add_all_algorithms();
10
 			OpenSSL_add_all_ciphers();
11
 			OpenSSL_add_all_digests();
12
@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
13
 		key_length = atoi(arg->Value);
14
 	}
15
 
16
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
17
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
18
 	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
19
 #else
20
 	{
21
@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context
22
 	{
23
 		ASN1_TIME* before;
24
 		ASN1_TIME* after;
25
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
26
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
27
 		before = X509_get_notBefore(context->x509);
28
 		after = X509_get_notAfter(context->x509);
29
 #else
30
@@ -1242,7 +1242,7 @@ void makecert_context_free(MAKECERT_CONTEXT* context)
31
 #ifdef WITH_OPENSSL
32
 		X509_free(context->x509);
33
 		EVP_PKEY_free(context->pkey);
34
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
35
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
36
 		CRYPTO_cleanup_all_ex_data();
37
 #endif
38
 #endif
(-)net/freerdp/pkg-descr (-1 / +1 lines)
Lines 3-6 Link Here
3
software wherever you want, the way you want it, in a world where
3
software wherever you want, the way you want it, in a world where
4
interoperability can finally liberate your computing experience.
4
interoperability can finally liberate your computing experience.
5
5
6
WWW: http://www.freerdp.com/
6
WWW: http://www.freerdp.com
(-)net/freerdp/pkg-plist (-4 / +5 lines)
Lines 42-47 Link Here
42
include/freerdp2/freerdp/client/rdpgfx.h
42
include/freerdp2/freerdp/client/rdpgfx.h
43
include/freerdp2/freerdp/client/rdpsnd.h
43
include/freerdp2/freerdp/client/rdpsnd.h
44
include/freerdp2/freerdp/client/remdesk.h
44
include/freerdp2/freerdp/client/remdesk.h
45
include/freerdp2/freerdp/client/sshagent.h
45
include/freerdp2/freerdp/client/tsmf.h
46
include/freerdp2/freerdp/client/tsmf.h
46
include/freerdp2/freerdp/codec/audio.h
47
include/freerdp2/freerdp/codec/audio.h
47
include/freerdp2/freerdp/codec/bitmap.h
48
include/freerdp2/freerdp/codec/bitmap.h
Lines 218-224 Link Here
218
share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
219
share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
219
share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
220
share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
220
share/cmake/Modules/WinPR2/WinPRTargets.cmake
221
share/cmake/Modules/WinPR2/WinPRTargets.cmake
221
share/man/man1/winpr-hash.1
222
%%MANPAGES%%share/man/man1/winpr-hash.1
222
share/man/man1/winpr-makecert.1
223
%%MANPAGES%%share/man/man1/winpr-makecert.1
223
%%X11%%share/man/man1/xfreerdp.1
224
%%X11%%%%MANPAGES%%share/man/man1/xfreerdp.1
224
share/man/man7/wlog.7
225
%%MANPAGES%%share/man/man7/wlog.7

Return to bug 224658