[x2goclient] Add patch to fix libssh timeout issue (bug #1053923)

[Orion Poplawski]

commit 0907733c4c262f349fd511956749b0c1d7354ea8
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Jan 22 14:48:29 2014 -0700

    Add patch to fix libssh timeout issue (bug #1053923)

 x2goclient-timeout.patch |   12 ++++++++++++
 x2goclient.spec          |    6 ++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/x2goclient-timeout.patch b/x2goclient-timeout.patch
new file mode 100644
index 0000000..ec1f557
--- /dev/null
+++ b/x2goclient-timeout.patch
@@ -0,0 +1,12 @@
+diff -up x2goclient-4.0.1.3/sshmasterconnection.cpp.timeout x2goclient-4.0.1.3/sshmasterconnection.cpp
+--- x2goclient-4.0.1.3/sshmasterconnection.cpp.timeout	2014-01-22 00:58:25.000000000 -0700
++++ x2goclient-4.0.1.3/sshmasterconnection.cpp	2014-01-22 14:41:07.754428027 -0700
+@@ -1445,7 +1445,7 @@ void SshMasterConnection::channelLoop()
+         struct timeval tv;
+ 
+         tv.tv_sec = 0;
+-        tv.tv_usec = 500;
++        tv.tv_usec = 1000;
+ 
+         int retval;
+         int maxsock=-1;
diff --git a/x2goclient.spec b/x2goclient.spec
index 174c2a1..7d4db9f 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -7,6 +7,8 @@ Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://www.x2go.org
 Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
+# Increase select timeout for libssh 0.6.0 change
+Patch0:         x2goclient-timeout.patch
 
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -88,6 +90,7 @@ the X2Go Plugin via an Apache webserver.
 
 %prep
 %setup -q
+%patch0 -p1 -b .timeout
 # Fix up install issues
 sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
@@ -151,6 +154,9 @@ fi
 
 
 %changelog
+* Wed Jan 22 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.3-2
+- Add patch to fix libssh timeout issue (bug #1053923)
+
 * Wed Jan 22 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.3-1
 - Update to 4.0.1.3
 - Drop provider patch applied upstream