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 426b601 x2goserver.spec: %defattr must come before %doc, OR ELSE. Fixes SLE{S,D} 11 builds. new 86d9b3c x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't parse the full desktop file if there are non-Desktop Entries groups. new 23f0480 x2goserver/bin/x2gogetapps: first define an array, then use it... new e305c5a x2goserver/bin/x2gogetapps: do not print spurious newlines. new 1347c0c general: change X2go -> X2Go. The 4 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: INSTALL | 6 +- debian/changelog | 8 ++ x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- .../x2gofeature.d/x2goserver-fmbindings.features | 4 +- x2goserver/bin/x2gogetapps | 78 +++++++++++++------- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- 7 files changed, 67 insertions(+), 35 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 release/4.0.1.x in repository x2goserver. commit 86d9b3c13f7a0055f6c06023832e8aa5469ecd8d Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 11 21:00:36 2015 +0100 x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't parse the full desktop file if there are non-Desktop Entries groups. Based on a patch submitted by Jason Alavaliant. Fixes: #812. Conflicts: debian/changelog --- debian/changelog | 6 ++++ x2goserver/bin/x2gogetapps | 77 ++++++++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index af70337..2508b02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - TERMINAL Session: Add support for qterminal (Lightweight terminal emulator written in Qt) + [ Mihai Moldovan ] + * New upstream version (4.0.1.20): + - x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't + parse the full desktop file if there are non-Desktop Entries groups. + Based on a patch submitted by Jason Alavaliant. Fixes: #812. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 09ba50d..c374d6e 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -91,24 +91,27 @@ sub findicon_ext return ""; } -sub printicon +sub geticon { my $file=shift; + my @ret; if (open(I,"<$file")) { my $buf; - print "<icon>\n"; + push(@ret, "<icon>"); while (read(I, $buf, 60*57)) { - print encode_base64($buf); + push(@ret, encode_base64($buf)); } - print "</icon>\n"; + push(@ret, "</icon>\n"); close(I); } else { - syslog ('info', "x2gogetapps:printicon - can't open file $file: $!"); + syslog ('info', "x2gogetapps:geticon - can't open file $file: $!"); } + + return @ret; } sub proc_desktop_file @@ -116,53 +119,73 @@ sub proc_desktop_file my $file=shift; if (open(F,"<$file")) { - print("<desktop>\n"); + push(@output, "<desktop>"); + my @output; + my $nodisplay = 0; my $is_desktop_entry = 0; - while(!eof(F)) + READ_FILE: while(!eof(F)) { my $line=<F>; + # Hopefully strip most whitespace and newlines surrounding $line. + chomp($line); + # Desktop Entry block search. if ( $line=~m/^\[Desktop Entry\] */ ) { $is_desktop_entry = 1; next; } + # Consume random data. if ( ! $is_desktop_entry ) { next; } + # Stop reading when seeing a non-Desktop Entry block. if ( $line=~m/^\[.*\] */ ) { $is_desktop_entry = 0; - next; + last READ_FILE; + } + # Breaking out when finding NoDisplay=true or Hidden=true. + # Do not use \s here as newlines are not allowed within key-value sets. + # Generally, we're reading lines anyway and a newline can't possibly be part of + # a line, as lines are split on newlines, but play it safe still. + if ( $line=~m/^NoDisplay[ \t]*?=[ \t]*?true/ || $line=~m/^Hidden[ \t]*?=[ \t]*?true/ ) + { + $nodisplay = 1; + last READ_FILE; } - if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Terminal/i || $line=~m/^Comment/i || $line=~m/^Exec/i) + if ( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Terminal/i || $line=~m/^Comment/i || $line=~m/^Exec/i) { - print $line; + push(@output, $line); } - if( $line =~ m/^Icon/ ) + if ( $line =~ m/^Icon/ ) { my $icon=$line; - $icon =~ s/Icon=//; - chop($icon); - #$line is absolute path - if($icon =~ m/\//) - { - $icon=$icon; - } - #$line have format ext. - elsif ($line =~ m/\./) + $icon =~ s/Icon[ \t]*?=//; + #$line is not absolute path + if(!($icon =~ m/\//)) { - $icon=findicon_ext($icon); + #$line have format ext. + if ($line =~ m/\./) + { + $icon=findicon_ext($icon); + } + else + { + $icon=findicon($icon); + } } - else - { - $icon=findicon($icon); - } - printicon($icon); + @output = (@output, geticon($icon)); } } close (F); - print("</desktop>\n"); + push(@output, "</desktop>\n"); + + # Print out parsed entry if it's not hidden or marked NoDisplay. + if (! $nodisplay) + { + print join("\n", @output); + } } else { -- 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 release/4.0.1.x in repository x2goserver. commit 23f048084e5fff8f5d985c309ba66bbd688c3c89 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 11 21:26:29 2015 +0100 x2goserver/bin/x2gogetapps: first define an array, then use it... --- x2goserver/bin/x2gogetapps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index c374d6e..0c3f1ff 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -119,10 +119,10 @@ sub proc_desktop_file my $file=shift; if (open(F,"<$file")) { - push(@output, "<desktop>"); my @output; my $nodisplay = 0; my $is_desktop_entry = 0; + push(@output, "<desktop>"); READ_FILE: while(!eof(F)) { my $line=<F>; -- 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 release/4.0.1.x in repository x2goserver. commit e305c5ae00fe2b47e0d1029714d730509e96803b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 13 01:28:15 2015 +0100 x2goserver/bin/x2gogetapps: do not print spurious newlines. Conflicts: debian/changelog --- debian/changelog | 1 + x2goserver/bin/x2gogetapps | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2508b02..053a167 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't parse the full desktop file if there are non-Desktop Entries groups. Based on a patch submitted by Jason Alavaliant. Fixes: #812. + - x2goserver/bin/x2gogetapps: do not print spurious newlines. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 0c3f1ff..8725119 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -103,7 +103,7 @@ sub geticon { push(@ret, encode_base64($buf)); } - push(@ret, "</icon>\n"); + push(@ret, "</icon>"); close(I); } else @@ -179,12 +179,13 @@ sub proc_desktop_file } } close (F); - push(@output, "</desktop>\n"); + push(@output, "</desktop>"); # Print out parsed entry if it's not hidden or marked NoDisplay. if (! $nodisplay) { print join("\n", @output); + print "\n"; } } else -- 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 release/4.0.1.x in repository x2goserver. commit 1347c0cea22815f2c77599e6614bf75551212398 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 9 04:15:40 2015 +0100 general: change X2go -> X2Go. Cherry-picked from master branch. Conflicts: INSTALL debian/changelog x2goserver/man/man8/x2golistmounts.8 --- INSTALL | 6 +++--- debian/changelog | 1 + x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- .../x2gofeature.d/x2goserver-fmbindings.features | 4 ++-- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/INSTALL b/INSTALL index c006039..62fd5b7 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ TARBALL INSTALLATION OF x2goserver ================================== -1.) USERS + GROUPS for X2go +1.) USERS + GROUPS for X2Go --------------------------- Set up x2gouser account and its group if they do not exist already: @@ -55,7 +55,7 @@ Alternatively, you can add a single line to /etc/rc.local: 5.) LOCAL FOLDER SHARING ------------------------ -Users that shall be able to use X2go's local folder sharing functionality (via sshfs) +Users that shall be able to use X2Go's local folder sharing functionality (via sshfs) have to be members of your server system's ,,fuse'' group $ usermod -a -G fuse <username> @@ -83,7 +83,7 @@ This variant is the default X2Go database setup. The X2Go database keeps track o running/suspended/finished X2Go sessions, mounted devices, etc. If you use SQLite as DB backend, X2Go will run on one single server. -For multi-X2goServer support use the PostgreSQL setup variant of X2Go server. All files +For multi-X2GoServer support use the PostgreSQL setup variant of X2Go server. All files should be present for this setup. If not, please report it as a bug. diff --git a/debian/changelog b/debian/changelog index 053a167..7f9327a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low parse the full desktop file if there are non-Desktop Entries groups. Based on a patch submitted by Jason Alavaliant. Fixes: #812. - x2goserver/bin/x2gogetapps: do not print spurious newlines. + - Change string "X2go" to "X2Go" where appropriate. -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8 index b57d9d6..4ad9c4b 100644 --- a/x2goserver-fmbindings/man/man8/x2gofm.8 +++ b/x2goserver-fmbindings/man/man8/x2gofm.8 @@ -22,5 +22,5 @@ client-side folders shared via X2Go. The default file browser is defined by the freedesktop.org specification of the running desktop environment. .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features index 1736904..d3cad6b 100755 --- a/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features +++ b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2015 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_FMBINDINGS") echo "ok"; exit 0;; diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index 4da4799..8a510f1 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -15,7 +15,7 @@ x2golistmounts \- List Mounted Shares for an X2Go Session x2golistmounts <session_id> .SH DESCRIPTION -\fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2go +\fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2Go session <session_id>. .PP \fBx2golistmounts\fR is run with normal user privileges and it is used by X2Go clients to render diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 887369c..8a5f2c8 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -35,7 +35,7 @@ Execute command <command>. Full paths will be ignored, the command has to be in Possible generic values for <command> are: WWWBROWSER, OFFICE, MAILCLIENT and TERMINAL. .TP \*(T<\fB\<sound_system>\fR\*(T> -Either of the possible sound systems supported by X2go: pulse, esd, arts (obsolete) or none. +Either of the possible sound systems supported by X2Go: pulse, esd, arts (obsolete) or none. .TP \*(T<\fB\<session_type>\fR\*(T> Allowed values for <session_type> are: D (desktop) and R (rootless). -- 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