This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from e08bec4 Add logcheck rules for X2Go Server. Thanks to Frank Werner for sending them in. new 286a447 Correctly use diversions from stderr to stdout in shell commands. (Fixes: #520). 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 | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++-- x2goserver/bin/x2gomountdirs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) -- Alioth's /srv/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 release/4.0.1.x in repository x2goserver. commit 286a44789ae0aacc417eca5063040f84f0b8adea Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 25 12:20:27 2014 +0200 Correctly use diversions from stderr to stdout in shell commands. (Fixes: #520). --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++-- x2goserver/bin/x2gomountdirs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d7cc89..665986b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low kernel namespace sockets. - Add logcheck rules for X2Go Server. Thanks to Frank Werner for sending them in. + - Correctly use diversions from stderr to stdout in shell commands. + (Fixes: #520). * debian/control, x2goserver.spec: + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go works with poly-instantiated /tmp directories. diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 9d901a4..2b4a14d 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -17,7 +17,7 @@ message () { # is available and $DISPLAY is set MESSAGE="$PROGNAME: $*" echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2 - if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then + if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - fi } @@ -27,7 +27,7 @@ message_nonl () { # xmessage if it is available and $DISPLAY is set MESSAGE="$PROGNAME: $*" echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; - if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then + if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - fi } diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index ba3f367..dc6fc45 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -289,7 +289,7 @@ for (my $i=0;$i<@dirs;$i++) $msg = "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"; syslog('debug', "executing: $msg"); print "inserted, $msg\n"; - if (system("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 2>&1 1>>$sessiondir/sshfs-mounts.log")==0) + if (system("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) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org