This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 388dfdd x2goserver-xsession/etc/Xsession: use /bin/bash explicitly on RedHat-, Gentoo- and SuSE-based systems. new 8b4ef73 x2goserver/bin/x2gomountdirs: remove blowfish Cipher spec hardcoded for sshfs mounts. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++++ x2goserver/bin/x2gomountdirs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 8b4ef73a82ec56f8b6cf99c743a94b70bbe2207c Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 25 15:21:04 2016 +0100 x2goserver/bin/x2gomountdirs: remove blowfish Cipher spec hardcoded for sshfs mounts. The speed improvement is probably mostly an illusion (unless talking about high-bandwidth links) and more importantly recent OpenSSH server versions seem to disable the Blowfish cipher by default, leading to errors like "Connection reset by peer." Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 5 +++++ x2goserver/bin/x2gomountdirs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5632cd8..db41835 100644 --- a/debian/changelog +++ b/debian/changelog @@ -251,6 +251,11 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low Gentoo- and SuSE-based systems. Users might change /bin/sh to point to a shell like mksh or dash, which do not support the -l or -c flags to exec. C.f., BGO #575022 (Gentoo.) + - x2goserver/bin/x2gomountdirs: remove blowfish Cipher spec hardcoded for + sshfs mounts. The speed improvement is probably mostly an illusion + (unless talking about high-bandwidth links) and more importantly recent + OpenSSH server versions seem to disable the Blowfish cipher by default, + leading to errors like "Connection reset by peer." * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 06bfcdb..77379e4 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -284,12 +284,12 @@ for (my $i=0;$i<@dirs;$i++) { syslog('debug', "SSH host key has arrived: $key.ident"); } - $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; + $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; syslog('debug', "executing: $msg"); print "inserted, $msg\n"; # FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file - if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) + if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org