sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (137653d473e33d5fd911f4cfcc60c8aad6e5fc98)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (137653d473e33d5fd911f4cfcc60c8aad6e5fc98)
Date: Fri, 10 Apr 2020 18:20:03 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

shell-term-fm/freerdp/DEPENDS | 44
+++++++++++++++++++++--------------
shell-term-fm/freerdp/DETAILS | 10 +++----
shell-term-fm/freerdp/HISTORY | 7 +++++
shell-term-fm/freerdp/PRE_BUILD | 4 +++
shell-term-fm/freerdp/libressl.patch | 11 ++++++++
5 files changed, 54 insertions(+), 22 deletions(-)

New commits:
commit 137653d473e33d5fd911f4cfcc60c8aad6e5fc98
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

freerdp: => 2.0.0

diff --git a/shell-term-fm/freerdp/DEPENDS b/shell-term-fm/freerdp/DEPENDS
index 96367fe..8699f3a 100755
--- a/shell-term-fm/freerdp/DEPENDS
+++ b/shell-term-fm/freerdp/DEPENDS
@@ -1,18 +1,28 @@
-depends cmake &&
+depends cmake &&
depends SSL &&
-depends zlib &&
-optional_depends pcsc-lite '-DWITH_PCSC=1' \
- '-DWITH_PCSC=0' \
- '' &&
-optional_depends cups '-DWITH_CUPS=1' \
- '-DWITH_CUPS=0' \
- 'printer support' &&
-optional_depends LIBAVCODEC '-DWITH_FFMPEG=1' \
- '-DWITH_FFMPEG=0' \
- 'streaming io support' &&
-optional_depends pulseaudio '-DWITH_PULSEAUDIO=1' \
- '-DWITH_PULSEAUDIO=0' \
- 'streaming io support'
-optional_depends alsa-lib '-DWITH_ALSA=1' \
- '-DWITH_ALSA=0' \
- 'ALSA sound support'
+depends zlib &&
+
+optional_depends pcsc-lite \
+ "-DWITH_PCSC=1" \
+ "-DWITH_PCSC=0" \
+ "for smart card device redirection support" &&
+
+optional_depends cups \
+ "-DWITH_CUPS=1" \
+ "-DWITH_CUPS=0" \
+ "for printer support" &&
+
+optional_depends LIBAVCODEC \
+ "-DWITH_FFMPEG=1" \
+ "-DWITH_FFMPEG=0" \
+ "for multimedia redirection support" &&
+
+optional_depends pulseaudio \
+ "-DWITH_PULSE=1" \
+ "-DWITH_PULSE=0" \
+ "for PulseAudio support" &&
+
+optional_depends alsa-lib \
+ "-DWITH_ALSA=1" \
+ "-DWITH_ALSA=0" \
+ "for ALSA support"
diff --git a/shell-term-fm/freerdp/DETAILS b/shell-term-fm/freerdp/DETAILS
index ac54d87..f6b5c32 100755
--- a/shell-term-fm/freerdp/DETAILS
+++ b/shell-term-fm/freerdp/DETAILS
@@ -1,10 +1,10 @@
SPELL=freerdp
- VERSION=1.0.2
-
SOURCE_HASH=sha512:370b30e05bc125c69fd06583ab747f885e1bf41b47a68c0e326208f22be06e48a4163f4632085767c76aaeabda95b6ab9d285784fd33a73f7d404c9517d54f3c
+ VERSION=2.0.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=https://github.com/FreeRDP/FreeRDP/archive/$VERSION.tar.gz
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/FreeRDP-${VERSION}"
- WEB_SITE=http://www.freerdp.com/
+ SOURCE_URL[0]=https://pub.freerdp.com/releases/${SOURCE}
+
SOURCE_HASH=sha256:4ee064e87486cb6fea85d5b6b606add9f02df25ce73f9818b49de75cebd7fedf
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://www.freerdp.com/
LICENSE[0]=GPL
ENTERED=20100720
SHORT="a client for the rdp protocol"
diff --git a/shell-term-fm/freerdp/HISTORY b/shell-term-fm/freerdp/HISTORY
index 063e355..be0d621 100644
--- a/shell-term-fm/freerdp/HISTORY
+++ b/shell-term-fm/freerdp/HISTORY
@@ -1,3 +1,10 @@
+2020-04-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.0; updated source URL
+ * DEPENDS: rewritten
+ * PRE_BUILD: added, to apply patch
+ * libressl.patch: added, to fix build against libressl in stable
+ grimoire
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/shell-term-fm/freerdp/PRE_BUILD b/shell-term-fm/freerdp/PRE_BUILD
new file mode 100755
index 0000000..2c03a54
--- /dev/null
+++ b/shell-term-fm/freerdp/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/libressl.patch"
diff --git a/shell-term-fm/freerdp/libressl.patch
b/shell-term-fm/freerdp/libressl.patch
new file mode 100644
index 0000000..6f45d49
--- /dev/null
+++ b/shell-term-fm/freerdp/libressl.patch
@@ -0,0 +1,11 @@
+--- libfreerdp/crypto/tls.c.orig 2020-04-09 09:00:51.000000000 -0700
++++ libfreerdp/crypto/tls.c 2020-04-10 10:34:39.099216963 -0700
+@@ -661,7 +661,7 @@
+ SSL_CTX_set_mode(tls->ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER |
SSL_MODE_ENABLE_PARTIAL_WRITE);
+ SSL_CTX_set_options(tls->ctx, options);
+ SSL_CTX_set_read_ahead(tls->ctx, 1);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ||
defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) &&
LIBRESSL_VERSION_NUMBER >= 0x2060000fL)
+ SSL_CTX_set_min_proto_version(tls->ctx, TLS1_VERSION); /* min version
*/
+ SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported
version by library */
+ #endif

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (137653d473e33d5fd911f4cfcc60c8aad6e5fc98), Vlad Glagolev, 04/10/2020