freerdp: update to 2.0.0.
This commit is contained in:
parent
3d4f9aeed9
commit
ca58a4301f
3 changed files with 7 additions and 47 deletions
|
@ -1,25 +0,0 @@
|
||||||
From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
|
|
||||||
From: akallabeth <akallabeth@posteo.net>
|
|
||||||
Date: Thu, 22 Nov 2018 19:10:05 +0100
|
|
||||||
Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
|
|
||||||
|
|
||||||
Need to check specifically for LIBRESSL_VERSION_NUMBER as they
|
|
||||||
set the version higher than OpenSSL 1.1 but without API support.
|
|
||||||
---
|
|
||||||
libfreerdp/crypto/tls.c | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
|
|
||||||
index 76f51701fe..ded41f127e 100644
|
|
||||||
--- libfreerdp/crypto/tls.c
|
|
||||||
+++ libfreerdp/crypto/tls.c
|
|
||||||
@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
|
|
||||||
SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-
|
|
||||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
source: $OpenBSD: patch-libfreerdp_crypto_tls_c,v 1.3 2018/10/24 17:10:22 jsing Exp $
|
|
||||||
|
|
||||||
Stop reaching into libssl internals to send TLS alerts.
|
|
||||||
|
|
||||||
--- libfreerdp/crypto/tls.c 2018-11-20 11:43:51.000000000 +0100
|
|
||||||
+++ libfreerdp/crypto/tls.c 2019-05-10 01:49:19.466050550 +0200
|
|
||||||
@@ -1026,7 +1026,7 @@
|
|
||||||
* FIXME: The following code does not work on OpenSSL > 1.1.0 because the
|
|
||||||
* SSL struct is opaqe now
|
|
||||||
*/
|
|
||||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2080000fL)
|
|
||||||
|
|
||||||
if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
|
|
||||||
{
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Template file for 'freerdp'
|
# Template file for 'freerdp'
|
||||||
pkgname=freerdp
|
pkgname=freerdp
|
||||||
version=2.0.0rc4
|
version=2.0.0
|
||||||
revision=2
|
revision=1
|
||||||
wrksrc="FreeRDP-${version/r/-r}"
|
wrksrc="FreeRDP-${version}"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
|
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
|
||||||
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
|
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
|
||||||
|
@ -10,7 +10,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
|
||||||
-DWITH_XCURSOR=ON -DWITH_XEXT=ON -DWITH_XI=ON -DWITH_XINERAMA=ON
|
-DWITH_XCURSOR=ON -DWITH_XEXT=ON -DWITH_XI=ON -DWITH_XINERAMA=ON
|
||||||
-DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON"
|
-DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON"
|
||||||
hostmakedepends="pkg-config xmlto"
|
hostmakedepends="pkg-config xmlto"
|
||||||
makedepends="alsa-lib-devel ffmpeg-devel glib-devel
|
makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
|
||||||
libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel
|
libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel
|
||||||
libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel"
|
libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel"
|
||||||
short_desc="Free RDP (Remote Desktop Protocol) client"
|
short_desc="Free RDP (Remote Desktop Protocol) client"
|
||||||
|
@ -18,8 +18,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
homepage="https://www.freerdp.com/"
|
homepage="https://www.freerdp.com/"
|
||||||
changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
|
changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
|
||||||
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version/r/-r}.tar.gz"
|
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
|
||||||
checksum=3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49
|
checksum=6f5202240119f79bb9f23c82b71ab17b493d92571bfd3f59ca6dcad11d77030d
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
|
i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
|
||||||
|
@ -29,7 +29,7 @@ libfreerdp_package() {
|
||||||
replaces="${sourcepkg}<1.0.2_2"
|
replaces="${sourcepkg}<1.0.2_2"
|
||||||
short_desc+=" - runtime libraries"
|
short_desc+=" - runtime libraries"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/lib/*.so.*
|
vmove "usr/lib/*.so.*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
freerdp-devel_package() {
|
freerdp-devel_package() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue