[gentoo-commits] gentoo-x86 commit in net-misc/x2goclient/files: x2goclient-4.0.1.3-password_connection.patch x2goclient-4.0.1.3-timeout.patch

[Bernard Cafarelli (voyageur)]

voyageur    14/04/07 15:25:47

  Added:                x2goclient-4.0.1.3-password_connection.patch
                        x2goclient-4.0.1.3-timeout.patch
  Log:
  Backport fix for 100% CPU usage, thanks Theofilos Intzoglou 
<int....@gmail.com> in bug #506770. Also backport password login fix
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
C74525F2)

Revision  Changes    Path
1.1                  
net-misc/x2goclient/files/x2goclient-4.0.1.3-password_connection.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goclient/files/x2goclient-4.0.1.3-password_connection.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goclient/files/x2goclient-4.0.1.3-password_connection.patch?rev=1.1&content-type=text/plain

Index: x2goclient-4.0.1.3-password_connection.patch
===================================================================
>From 083ece20445bf6e1db26a74856185d0c9b1e8b5a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <or...@cora.nwra.com>
Date: Tue, 4 Feb 2014 12:28:07 +0100
Subject: [PATCH] Fix password connection with libssh 0.6.0

---
 debian/changelog        |    3 ++-
 sshmasterconnection.cpp |    3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index e0266db..827eefe 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -936,6 +936,9 @@ bool SshMasterConnection::userChallengeAuth()
 
 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)
-- 
1.7.9.5




1.1                  net-misc/x2goclient/files/x2goclient-4.0.1.3-timeout.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goclient/files/x2goclient-4.0.1.3-timeout.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goclient/files/x2goclient-4.0.1.3-timeout.patch?rev=1.1&content-type=text/plain

Index: x2goclient-4.0.1.3-timeout.patch
===================================================================
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 = 500000;
 
         int retval;
         int maxsock=-1;