mirror of
https://git.freebsd.org/ports.git
synced 2025-06-10 07:10:32 -04:00
net/freerdp: Fix following recent Windows update, bump dependents
Patch backported from upstream @ fbe01c7; breakage seems to be that FreeRDP will emit an error "ERRCONNECT_PASSWORD_CERTAINLY_EXPIRED" in a context where one is certain that that is not the case. PR: 226651 Approved by: brd (ports), me (maintainer)
This commit is contained in:
parent
2e3cb773fa
commit
1a1f12d394
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465177
4 changed files with 47 additions and 3 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= freerdp
|
PORTNAME= freerdp
|
||||||
DISTVERSION= 2.0.0-rc1
|
DISTVERSION= 2.0.0-rc1
|
||||||
PORTREVISION= 1
|
PORTREVISION= 2
|
||||||
CATEGORIES= net comms ipv6
|
CATEGORIES= net comms ipv6
|
||||||
|
|
||||||
MAINTAINER= kevans@FreeBSD.org
|
MAINTAINER= kevans@FreeBSD.org
|
||||||
|
|
44
net/freerdp/files/patch-libfreerdp_core_nla.c
Normal file
44
net/freerdp/files/patch-libfreerdp_core_nla.c
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
--- libfreerdp/core/nla.c.orig 2018-03-21 03:26:15 UTC
|
||||||
|
+++ libfreerdp/core/nla.c
|
||||||
|
@@ -1663,14 +1663,18 @@ 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)
|
||||||
|
--- libfreerdp/core/nla.c.orig 2018-03-21 03:26:15 UTC
|
||||||
|
+++ libfreerdp/core/nla.c
|
||||||
|
@@ -1663,14 +1663,18 @@ 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)
|
|
@ -2,7 +2,7 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PKGNAMESUFFIX= -rdp
|
PKGNAMESUFFIX= -rdp
|
||||||
PORTREVISION= 1
|
PORTREVISION= 2
|
||||||
|
|
||||||
COMMENT= Remmina plugin for RDP protocol
|
COMMENT= Remmina plugin for RDP protocol
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= vinagre
|
PORTNAME= vinagre
|
||||||
PORTVERSION= 3.18.2
|
PORTVERSION= 3.18.2
|
||||||
PORTREVISION= 5
|
PORTREVISION= 6
|
||||||
CATEGORIES= net gnome
|
CATEGORIES= net gnome
|
||||||
MASTER_SITES= GNOME
|
MASTER_SITES= GNOME
|
||||||
DIST_SUBDIR= gnome3
|
DIST_SUBDIR= gnome3
|
||||||
|
|
Loading…
Add table
Reference in a new issue