From 1a1f12d394dfcb4c313f35c6bb8b3d4d20ef8f6c Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 21 Mar 2018 14:04:05 +0000
Subject: [PATCH] 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)
---
 net/freerdp/Makefile                          |  2 +-
 net/freerdp/files/patch-libfreerdp_core_nla.c | 44 +++++++++++++++++++
 net/remmina-plugin-rdp/Makefile               |  2 +-
 net/vinagre/Makefile                          |  2 +-
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 net/freerdp/files/patch-libfreerdp_core_nla.c

diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 69e29e860d70..c445c4378337 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freerdp
 DISTVERSION=	2.0.0-rc1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net comms ipv6
 
 MAINTAINER=	kevans@FreeBSD.org
diff --git a/net/freerdp/files/patch-libfreerdp_core_nla.c b/net/freerdp/files/patch-libfreerdp_core_nla.c
new file mode 100644
index 000000000000..42b74c8e68cb
--- /dev/null
+++ b/net/freerdp/files/patch-libfreerdp_core_nla.c
@@ -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)
diff --git a/net/remmina-plugin-rdp/Makefile b/net/remmina-plugin-rdp/Makefile
index 40f29afdc237..045b8cbedf54 100644
--- a/net/remmina-plugin-rdp/Makefile
+++ b/net/remmina-plugin-rdp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-rdp
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Remmina plugin for RDP protocol
 
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index e2689d2c2a5c..a9d04713dd6a 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vinagre
 PORTVERSION=	3.18.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3