[x2goclient] Add patch to fix libssh password auth issue (bug #1057871)

[Orion Poplawski]

commit 7eb4a10b4dc92cf4dc24559f79c5b632844f069d
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Jan 29 09:46:22 2014 -0700

    Add patch to fix libssh password auth issue (bug #1057871)

 x2goclient-sshauth.patch |   13 +++++++++++++
 x2goclient.spec          |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/x2goclient-sshauth.patch b/x2goclient-sshauth.patch
new file mode 100644
index 0000000..43933b3
--- /dev/null
+++ b/x2goclient-sshauth.patch
@@ -0,0 +1,13 @@
+diff -up x2goclient-4.0.1.3/sshmasterconnection.cpp.sshauth x2goclient-4.0.1.3/sshmasterconnection.cpp
+--- x2goclient-4.0.1.3/sshmasterconnection.cpp.sshauth	2014-01-29 08:52:44.564013247 -0700
++++ x2goclient-4.0.1.3/sshmasterconnection.cpp	2014-01-29 09:32:31.963139911 -0700
+@@ -924,6 +924,9 @@ bool SshMasterConnection::userChallengeA
+ 
+ bool SshMasterConnection::userAuthWithPass()
+ {
++    // Populate the userauth_list
++    ssh_userauth_none(my_ssh_session, NULL);
++
+     int method = ssh_userauth_list(my_ssh_session, NULL);
+ 
+     if (method& SSH_AUTH_METHOD_INTERACTIVE)
diff --git a/x2goclient.spec b/x2goclient.spec
index 7759db8..edecbdc 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -1,6 +1,6 @@
 Name:           x2goclient
 Version:        4.0.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        X2Go Client application (Qt4)
 
 Group:          Applications/Communications
@@ -9,6 +9,11 @@ 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
+# Fix password auth with libssh 0.6.0
+# https://bugzilla.redhat.com/show_bug.cgi?id=1057871
+# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=420
+Patch1:         x2goclient-sshauth.patch
+
 
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -91,6 +96,7 @@ the X2Go Plugin via an Apache webserver.
 %prep
 %setup -q
 %patch0 -p1 -b .timeout
+%patch1 -p1 -b .sshauth
 # Fix up install issues
 sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
@@ -154,6 +160,9 @@ fi
 
 
 %changelog
+* Wed Jan 29 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.3-3
+- Add patch to fix libssh password auth issue (bug #1057871)
+
 * 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)