From orion@cora.nwra.com  Wed Feb 19 04:15:39 2014
Received: (at submit) by bugs.x2go.org; 19 Feb 2014 03:15:41 +0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID,
	URIBL_BLOCKED autolearn=ham version=3.3.2
Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165])
	by ymir (Postfix) with ESMTPS id 1B7A45DB11
	for <submit@bugs.x2go.org>; Wed, 19 Feb 2014 04:15:38 +0100 (CET)
Received: from pacas.cora.nwra.com (75-171-160-68.hlrn.qwest.net [75.171.160.68])
	(authenticated bits=0)
	by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id s1J3FXJl007489
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO)
	for <submit@bugs.x2go.org>; Tue, 18 Feb 2014 20:15:36 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com;
	s=default; t=1392779736;
	bh=UP2a5YfUSSoV1rlXiHWV1oK3cYaPyEFM81LZoljC/dA=;
	h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type;
	b=aueg1N/kx8f/LaiLrqOrkMyTJY0+OAKWt0/dDorTdLsAKZTp+TTZ1ISpFzgefhE32
	 azT4eEzfTLPRigde+dQSkuYOv9fTC5kbUjbwRFGSobtWwlrVmruG+DItUe8/PW4MSK
	 o5YK4QKsrXKwz88sligIaCnklYF3QnaIcEYQF9wQ=
Message-ID: <530421D5.8010909@cora.nwra.com>
Date: Tue, 18 Feb 2014 20:15:33 -0700
From: Orion Poplawski <orion@cora.nwra.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0
MIME-Version: 1.0
To: submit@bugs.x2go.org
Subject: Incorrect ssh options
X-Enigmail-Version: 1.6
Content-Type: multipart/mixed;
 boundary="------------030102020008000108010809"

This is a multi-part message in MIME format.
--------------030102020008000108010809
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Package: x2goclient
Version: 4.0.1.3
Tags: patch

x2goclient appears to use some ancient Debianism's for ssh options.  The
attached patch should hopefully fix, assuming the comments in bug 125263
below are correct.

https://bugzilla.redhat.com/show_bug.cgi?id=1066744
https://bugzilla.redhat.com/show_bug.cgi?id=125263

-- 
Orion Poplawski
Technical Manager                     303-415-9701 x222
NWRA/CoRA Division                    FAX: 303-415-9702
3380 Mitchell Lane                  orion@cora.nwra.com
Boulder, CO 80301              http://www.cora.nwra.com

--------------030102020008000108010809
Content-Type: text/x-patch;
 name="x2goclient-sshopt.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="x2goclient-sshopt.patch"

diff -up x2goclient-4.0.1.3/sshprocess.cpp.sshopt x2goclient-4.0.1.3/sshprocess.cpp
--- x2goclient-4.0.1.3/sshprocess.cpp.sshopt	2014-01-22 00:58:25.000000000 -0700
+++ x2goclient-4.0.1.3/sshprocess.cpp	2014-02-18 20:05:44.129767801 -0700
@@ -31,11 +31,7 @@
 #undef DEBUG
 // #define DEBUG
 
-#ifdef Q_OS_DARWIN
 #define KEEPALIVE_OPTION " -o ServerAliveInterval=60 "
-#else
-#define KEEPALIVE_OPTION " -o ProtocolKeepAlives=60 "
-#endif
 
 SshProcess::SshProcess(SshMasterConnection* master, int pid): QObject(0)
 {

--------------030102020008000108010809--

