From 3a8abefd954abc366ec3f1fba1b7fae44a6c0b84 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Fri, 8 Apr 2011 15:04:16 +0200
Subject: [PATCH] Improve compatibility with vinagre client (#692048).

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 tigervnc.spec             |  7 ++++++-
 tigervnc11-rh692048.patch | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tigervnc11-rh692048.patch

diff --git a/tigervnc.spec b/tigervnc.spec
index ad9536b..512ddf2 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -44,6 +44,7 @@ Patch8:		tigervnc-viewer-reparent.patch
 Patch10:	tigervnc11-ldnow.patch
 Patch11:	tigervnc11-gethomedir.patch
 Patch12:	tigervnc11-glx.patch
+Patch13:	tigervnc11-rh692048.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -131,6 +132,7 @@ This package contains license of the TigerVNC suite
 %patch10 -p1 -b .ldnow
 %patch11 -p1 -b .gethomedir
 %patch12 -p1 -b .glx
+%patch13 -p1 -b .rh692048
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
@@ -300,6 +302,9 @@ fi
 %doc LICENCE.TXT
 
 %changelog
+* Fri Apr 08 2011 Adam Tkac <atkac redhat com> - 1.0.90-2
+- improve compatibility with vinagre client (#692048)
+
 * Tue Mar 22 2011 Adam Tkac <atkac redhat com> - 1.0.90-1
 - update to 1.0.90
 
diff --git a/tigervnc11-rh692048.patch b/tigervnc11-rh692048.patch
new file mode 100644
index 0000000..924c1cf
--- /dev/null
+++ b/tigervnc11-rh692048.patch
@@ -0,0 +1,44 @@
+diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx
+--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245	2011-02-21 14:14:16.000000000 +0100
++++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx	2011-03-31 09:47:34.519099718 +0200
+@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes
+ ("SecurityTypes",
+  "Specify which security scheme to use (None, VncAuth)",
+ #ifdef HAVE_GNUTLS
+- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
++ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
+ #else
+  "VncAuth,None",
+ #endif
+diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx
+--- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245	2011-02-21 14:14:16.000000000 +0100
++++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx	2011-03-31 09:47:34.519099718 +0200
+@@ -67,7 +67,6 @@ const std::list<rdr::U8> Security::GetEn
+   list<rdr::U8> result;
+   list<U32>::iterator i;
+ 
+-  result.push_back(secTypeVeNCrypt);
+   for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
+     if (*i < 0x100)
+       result.push_back(*i);
+@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType)
+   for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
+     if (*i == secType)
+       return true;
+-  if (secType == secTypeVeNCrypt)
+-    return true;
+ 
+   return false;
+ }
+diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx
+--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245	2011-02-21 14:50:17.000000000 +0100
++++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx	2011-03-31 10:06:43.595362302 +0200
+@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes
+ ("SecurityTypes",
+  "Specify which security scheme to use (None, VncAuth)",
+ #ifdef HAVE_GNUTLS
+- "VncAuth,TLSVnc",
++ "VncAuth",
+ #else
+  "VncAuth",
+ #endif