libvncclient sets +SRP in priority string (#1449605)

libvncserver blocks gtk-vnc clients >= 0.7.0 (#1451321)

0040-Ensure-compatibility-with-gtk-vnc-0.7.0.patch

@@ -0,0 +1,28 @@
+From 75f04c14e49e084e41bdd5491edad8823773a08c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <github@kempniu.pl>
+Date: Tue, 14 Feb 2017 12:42:04 +0100
+Subject: [PATCH 40/98] Ensure compatibility with gtk-vnc 0.7.0+
+
+---
+ libvncserver/websockets.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libvncserver/websockets.c b/libvncserver/websockets.c
+index 72396c2..0b2d46f 100644
+--- a/libvncserver/websockets.c
++++ b/libvncserver/websockets.c
+@@ -245,7 +245,10 @@ webSocketsCheck (rfbClientPtr cl)
+       return FALSE;
+     }
+ 
+-    if (strncmp(bbuf, "<", 1) == 0) {
++    if (strncmp(bbuf, "RFB ", 4) == 0) {
++        rfbLog("Normal socket connection\n");
++        return TRUE;
++    } else if (strncmp(bbuf, "<", 1) == 0) {
+         rfbLog("Got Flash policy request, sending response\n");
+         if (rfbWriteExact(cl, FLASH_POLICY_RESPONSE,
+                           SZ_FLASH_POLICY_RESPONSE) < 0) {
+-- 
+2.9.4
+

LibVNCServer-0.9.10-system-crypto-policy.patch

@@ -7,7 +7,7 @@ diff -Naur libvncserver-LibVNCServer-0.9.10.old/libvncclient/tls_gnutls.c libvnc
  
 -static const char *rfbTLSPriority = "NORMAL:+DHE-DSS:+RSA:+DHE-RSA:+SRP";
 -static const char *rfbAnonTLSPriority= "NORMAL:+ANON-DH";
-+static const char *rfbTLSPriority = "@SYSTEM:+SRP";
++static const char *rfbTLSPriority = "@SYSTEM";
 +static const char *rfbAnonTLSPriority= "@SYSTEM:+ANON-DH";
  
  #define DH_BITS 1024

libvncserver.spec

@@ -1,16 +1,20 @@
 Summary:    Library to make writing a VNC server easy
 Name:       libvncserver
 Version:    0.9.11
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 # NOTE: --with-filetransfer => GPLv2
 License:    GPLv2+
 URL:        http://libvnc.github.io/
 Source0:    https://github.com/LibVNC/libvncserver/archive/LibVNCServer-%{version}.tar.gz
 
-Patch1:     libvncserver-0.9.11-system_minilzo.patch
-Patch2:     libvncserver-0.9.1-multilib.patch
-Patch3:     LibVNCServer-0.9.10-system-crypto-policy.patch
+## upstream patches
+Patch4: 0040-Ensure-compatibility-with-gtk-vnc-0.7.0.patch
+
+## downstream patches
+Patch100:     libvncserver-0.9.11-system_minilzo.patch
+Patch101:     libvncserver-0.9.1-multilib.patch
+Patch102:     LibVNCServer-0.9.10-system-crypto-policy.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -60,12 +64,14 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-LibVNCServer-%{version}
 
-%patch1 -p1 -b .system_minilzo
+%patch4 -p1 -b .0004
+
+%patch100 -p1 -b .system_minilzo
 # Nuke bundled minilzo
 #rm -fv common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c
 
-%patch2 -p1 -b .multilib
-%patch3 -p1
+%patch101 -p1 -b .multilib
+%patch102 -p1
 
 # Fix encoding
 for file in ChangeLog ; do
@@ -125,6 +131,10 @@ make -C test test ||:
 
 
 %changelog
+* Tue May 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.9.11-2
+- libvncclient sets +SRP in priority string (#1449605)
+- libvncserver blocks gtk-vnc clients >= 0.7.0 (#1451321)
+
 * Tue Feb 14 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.9.11-1
 - 0.9.11 (#1421948)