[PR PATCH] freerdp: update to 2.0.0.

[PR PATCH] freerdp: update to 2.0.0.

[daniel-eys]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

There is a new pull request by daniel-eys against master on the void-packages repository

https://github.com/daniel-eys/void-packages freerdp
https://github.com/void-linux/void-packages/pull/20894

freerdp: update to 2.0.0.
None

A patch file from https://github.com/void-linux/void-packages/pull/20894.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp-20894.patch --]
[-- Type: text/x-diff, Size: 4775 bytes --]

From fe4d085963b8ed6ea5d78dc7e38e6b8b257f9482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 11 Apr 2020 19:16:13 +0200
Subject: [PATCH] freerdp: update to 2.0.0.

---
 ...8b8562d5e4b017570815c7e4d8faa0dd9a9e.patch | 25 -------------------
 srcpkgs/freerdp/patches/libressl.patch        | 15 -----------
 srcpkgs/freerdp/template                      | 14 +++++------
 3 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/freerdp/patches/effa8b8562d5e4b017570815c7e4d8faa0dd9a9e.patch
 delete mode 100644 srcpkgs/freerdp/patches/libressl.patch

diff --git a/srcpkgs/freerdp/patches/effa8b8562d5e4b017570815c7e4d8faa0dd9a9e.patch b/srcpkgs/freerdp/patches/effa8b8562d5e4b017570815c7e4d8faa0dd9a9e.patch
deleted file mode 100644
index 87baa8162a4..00000000000
--- a/srcpkgs/freerdp/patches/effa8b8562d5e4b017570815c7e4d8faa0dd9a9e.patch
+++ /dev/null
@@ -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
- 
diff --git a/srcpkgs/freerdp/patches/libressl.patch b/srcpkgs/freerdp/patches/libressl.patch
deleted file mode 100644
index 0ef982d9486..00000000000
--- a/srcpkgs/freerdp/patches/libressl.patch
+++ /dev/null
@@ -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)
- 	{
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 0aaf62a1315..1e6099b058c 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,8 +1,8 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.0.0rc4
-revision=2
-wrksrc="FreeRDP-${version/r/-r}"
+version=2.0.0
+revision=1
+wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=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_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON"
 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
  libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
@@ -18,8 +18,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
-distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version/r/-r}.tar.gz"
-checksum=3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=6f5202240119f79bb9f23c82b71ab17b493d92571bfd3f59ca6dcad11d77030d
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
@@ -29,7 +29,7 @@ libfreerdp_package() {
 	replaces="${sourcepkg}<1.0.2_2"
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 freerdp-devel_package() {

Re: [PR PATCH] [Merged]: freerdp: update to 2.0.0.

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

There's a merged pull request on the void-packages repository

freerdp: update to 2.0.0.
https://github.com/void-linux/void-packages/pull/20894

Description:
None