From unknown Tue May 19 00:11:35 2026
X-Loop: owner@bugs.x2go.org
Subject: Bug#1505: Fix sftp-server path for opensuse tumbleweed
Reply-To: balasr <balasr@student.ethz.ch>, 1505@bugs.x2go.org
Resent-From: balasr <balasr@student.ethz.ch>
Resent-To: x2go-dev@lists.x2go.org
Resent-CC: X2Go Developers <x2go-dev@lists.x2go.org>
X-Loop: owner@bugs.x2go.org
Resent-Date: Sun, 15 Nov 2020 15:30:02 +0000
Resent-Message-ID: <handler.1505.B.160545394115477@bugs.x2go.org>
Resent-Sender: owner@bugs.x2go.org
X-X2Go-PR-Message: report 1505
X-X2Go-PR-Package: x2goclient
X-X2Go-PR-Keywords: 
Received: via spool by submit@bugs.x2go.org id=B.160545394115477
          (code B); Sun, 15 Nov 2020 15:30:02 +0000
Received: (at submit) by bugs.x2go.org; 15 Nov 2020 15:25:41 +0000
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=3.0 tests=BAYES_00,SPF_HELO_NONE,
	URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2
Received: from mailg110.ethz.ch (mailg110.ethz.ch [IPv6:2001:67c:10ec:5605::21])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 0D1015DA8B
	for <submit@bugs.x2go.org>; Sun, 15 Nov 2020 16:25:00 +0100 (CET)
Received: from mailm112.d.ethz.ch (2001:67c:10ec:5602::24) by mailg110.ethz.ch
 (2001:67c:10ec:5605::21) with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 15 Nov
 2020 16:24:53 +0100
Received: from sandkasten.local (84.227.193.77) by mailm112.d.ethz.ch
 (2001:67c:10ec:5602::24) with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 15 Nov
 2020 16:24:59 +0100
To: <submit@bugs.x2go.org>
From: balasr <balasr@student.ethz.ch>
Message-ID: <a4db5c36-aff2-3a4c-7b93-fbf300fd3a9e@student.ethz.ch>
Date: Sun, 15 Nov 2020 16:24:59 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.4.0
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="------------9079138F6CAEB3BAB8DD1109"
Content-Language: en-US
X-Originating-IP: [84.227.193.77]
X-ClientProxiedBy: mailm116.d.ethz.ch (2001:67c:10ec:5602::28) To
 mailm112.d.ethz.ch (2001:67c:10ec:5602::24)
X-TM-SNTS-SMTP: 9DE8F22D8CBC0F741E05B5564C73E179E01993ACF3F378910F3019D02A00BD8C2000:8

--------------9079138F6CAEB3BAB8DD1109
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Package: x2goclient
Version: 4.1.2.2
Tag: patch

Recently Opensuse Tumbleweed moved the location of where they put the sftp-server binary. See this bug report on the opensuse bugtracker: https://bugzilla.opensuse.org/show_bug.cgi?id=1175964

This patch adds this path to the search path



--------------9079138F6CAEB3BAB8DD1109
Content-Type: text/x-patch; charset="UTF-8"; name="sftp-path.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="sftp-path.patch"

diff -rub x2goclient-4.1.2.2/src/onmainwindow.cpp x2goclient-4.1.2.2-patched/src/onmainwindow.cpp
--- x2goclient-4.1.2.2/src/onmainwindow.cpp	2020-02-13 11:36:07.000000000 +0100
+++ x2goclient-4.1.2.2-patched/src/onmainwindow.cpp	2020-11-15 15:34:45.454199647 +0100
@@ -10870,6 +10870,7 @@
     QString sftp_binary;
     QStringList common_sftp_dirs;
     common_sftp_dirs << "/usr/lib/openssh" /* Debian and Ubuntu */
+                     << "/usr/libexec/ssh" /* Opensuse Tumbleweed */
                      << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
                      << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
                      << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */

--------------9079138F6CAEB3BAB8DD1109--
