diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-10 00:43:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-10 00:43:02 +0000 |
| commit | a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch) | |
| tree | e6d8d3589fcd01fbc3f1286185639163daa81424 /net-misc/x2goserver/files | |
| parent | fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff) | |
gentoo resync : 10.11.2017
Diffstat (limited to 'net-misc/x2goserver/files')
| -rw-r--r-- | net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch | 21 | ||||
| -rw-r--r-- | net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch | 26 |
2 files changed, 0 insertions, 47 deletions
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch deleted file mode 100644 index b29336349f09..000000000000 --- a/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch +++ /dev/null @@ -1,21 +0,0 @@ -X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver%2Fbin%2Fx2gomountdirs;h=f39d19975c6806ea115921aa0e1949e3dfa44c7d;hp=f0b497edd252481792ebc6e5e73d79158bc4a14c;hb=86a0e421c3da850045459af855a33f646828dd68;hpb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d - -diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs -index f0b497e..f39d199 100755 ---- a/x2goserver/bin/x2gomountdirs -+++ b/x2goserver/bin/x2gomountdirs -@@ -304,12 +304,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"); diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch deleted file mode 100644 index 0eab0d391b69..000000000000 --- a/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch +++ /dev/null @@ -1,26 +0,0 @@ -X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver-xsession%2Fetc%2FXsession;h=7ad477ffc439ef0f7f0ccbbee40f55504a8f2dd6;hp=ab32a1062cdbec6b3ccbea29682d240f06046394;hb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d;hpb=1cc93d59f6bb2559b1c42daba26cf3b9b50f3e69 - -diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession -index ab32a10..7ad477f 100755 ---- a/x2goserver-xsession/etc/Xsession -+++ b/x2goserver-xsession/etc/Xsession -@@ -208,16 +208,16 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE- - - # XCLIENTS_D=/etc/x2go/Xclients.d - #if [ -d "$XCLIENTS_D" -a -x "$XCLIENTS_D/Xclients.${XSESSION_EXEC}.sh" ]; then -- # exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh" -+ # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh\"" - #fi - - # switchdesk support is also totally deprecated in RHEL, but we leave it here - # as a reminder, as well, in case we need it in the future for special setups... - #if [ -x "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}" ]; then -- # exec -l "$SHELL" -c "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}"; -+ # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}\"" - #fi - -- exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$STARTUP\"" -+ exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\"" - fi - - exit 0 |