moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

freerdp: update to 2.0.0rc4.

Browse source
This commit is contained in:
Rasmus Thomsen 2018-12-30 16:17:20 +01:00 • committed by Helmut Pozimski
parent 8f90f8d9e0
commit f9bffae541
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
srcpkgs/freerdp/patches/effa8b8562d5e4b017570815c7e4d8faa0dd9a9e.patch Normal file
View file

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

8
srcpkgs/freerdp/template
View file

@ -1,7 +1,7 @@
# Template file for 'freerdp' # Template file for 'freerdp'
pkgname=freerdp pkgname=freerdp
version=2.0.0rc3 version=2.0.0rc4
revision=2 revision=1
wrksrc="FreeRDP-${version/r/-r}" wrksrc="FreeRDP-${version/r/-r}"
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
@ -19,7 +19,7 @@ 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/r/-r}.tar.gz"
checksum=d32d4a092e468deb3a1296e8358f900bf7e80afd0876d815ba43622ce29596c5 checksum=3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49
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";;
@ -34,7 +34,7 @@ libfreerdp_package() {
} }
freerdp-devel_package() { freerdp-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"
depends="lib${sourcepkg}>=${version}_${revision}" depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig