commit 5213297fdec4902190aa1d01165d7821d7d02be1
Author: Adam Osuchowski <ad...@pld-linux.org>
Date: Thu Mar 22 14:25:01 2018 +0100
- fix nla: don't use server version
(https://github.com/FreeRDP/FreeRDP/pull/4487)
- rel .2
freerdp-nla-KB4088776.patch | 24 ++++++++++++++++++++++++
freerdp2.spec | 4 +++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/freerdp2.spec b/freerdp2.spec
index 657b72c..5e5e016 100644
--- a/freerdp2.spec
+++ b/freerdp2.spec
@@ -30,7 +30,7 @@ Name: freerdp2
Version: 2.0.0
%define snap 20170724
%define gitref 84f8161897534d9263ffebe43092827d40fc7ffb
-%define rel 1
+%define rel 2
Release: 0.%{snap}.%{rel}
License: Apache v2.0
Group: Applications/Communications
@@ -40,6 +40,7 @@ Patch0: freerdp-DirectFB-include.patch
Patch1: freerdp-opt.patch
Patch2: freerdp-gsm.patch
Patch3: freerdp-sse.patch
+Patch4: freerdp-nla-KB4088776.patch
URL: http://www.freerdp.com/
%{?with_directfb:BuildRequires: DirectFB-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel}
@@ -183,6 +184,7 @@ wykorzystujących biblioteki FreeRDP 2.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cat << EOF > xfreerdp.desktop
[Desktop Entry]
diff --git a/freerdp-nla-KB4088776.patch b/freerdp-nla-KB4088776.patch
new file mode 100644
index 0000000..6a6b2af
--- /dev/null
+++ b/freerdp-nla-KB4088776.patch
@@ -0,0 +1,24 @@
+diff -ruNp
FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb.orig/libfreerdp/core/nla.c
FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb/libfreerdp/core/nla.c
+---
FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb.orig/libfreerdp/core/nla.c
2017-11-28 15:26:30.000000000 +0100
++++ FreeRDP-84f8161897534d9263ffebe43092827d40fc7ffb/libfreerdp/core/nla.c
2018-03-22 13:36:50.163380787 +0100
+@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla)
+ static int nla_decode_ts_request(rdpNla* nla, wStream* s)
+ {
+ int length;
++ UINT32 version = 0;
+
+ /* TSRequest */
+ if (!ber_read_sequence_tag(s, &length) ||
+ !ber_read_contextual_tag(s, 0, &length, TRUE) ||
+- !ber_read_integer(s, &nla->version))
++ !ber_read_integer(s, &version))
+ {
+ return -1;
+ }
+
++ if (version < nla->version)
++ nla->version = version;
++
+ /* [1] negoTokens (NegoData) */
+ if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freerdp2.git/commitdiff/5213297fdec4902190aa1d01165d7821d7d02be1
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
