svn commit: r465177 - in head/net: freerdp freerdp/files remmina-plugin-rdp vinagre
Kyle Evans
kevans at FreeBSD.org
Wed Mar 21 14:04:06 UTC 2018
Author: kevans (src committer)
Date: Wed Mar 21 14:04:05 2018
New Revision: 465177
URL: https://svnweb.freebsd.org/changeset/ports/465177
Log:
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)
Added:
head/net/freerdp/files/patch-libfreerdp_core_nla.c (contents, props changed)
Modified:
head/net/freerdp/Makefile
head/net/remmina-plugin-rdp/Makefile
head/net/vinagre/Makefile
Modified: head/net/freerdp/Makefile
==============================================================================
--- head/net/freerdp/Makefile Wed Mar 21 14:03:11 2018 (r465176)
+++ head/net/freerdp/Makefile Wed Mar 21 14:04:05 2018 (r465177)
@@ -3,7 +3,7 @@
PORTNAME= freerdp
DISTVERSION= 2.0.0-rc1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net comms ipv6
MAINTAINER= kevans at FreeBSD.org
Added: head/net/freerdp/files/patch-libfreerdp_core_nla.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/freerdp/files/patch-libfreerdp_core_nla.c Wed Mar 21 14:04:05 2018 (r465177)
@@ -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)
Modified: head/net/remmina-plugin-rdp/Makefile
==============================================================================
--- head/net/remmina-plugin-rdp/Makefile Wed Mar 21 14:03:11 2018 (r465176)
+++ head/net/remmina-plugin-rdp/Makefile Wed Mar 21 14:04:05 2018 (r465177)
@@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMESUFFIX= -rdp
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Remmina plugin for RDP protocol
Modified: head/net/vinagre/Makefile
==============================================================================
--- head/net/vinagre/Makefile Wed Mar 21 14:03:11 2018 (r465176)
+++ head/net/vinagre/Makefile Wed Mar 21 14:04:05 2018 (r465177)
@@ -3,7 +3,7 @@
PORTNAME= vinagre
PORTVERSION= 3.18.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
More information about the svn-ports-head
mailing list