x2go-commits May 2013

x2go-commits@lists.x2go.org

2 participants
1156 discussions

x2goserver.git - build-baikal (branch) updated: 4.0.0.1-2-ge8b78ed
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal has been updated via e8b78edd63056c33fd0053ab00fe9f2624f727da (commit) from 7f482404a7a6966a4b2a2687c445b853376e310a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2goserver-xsession/etc/Xsession | 8 ++++++++ x2goserver/VERSION.x2goserver | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1ce3e5b..1e277a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:26:09 +0100 + x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low [ Bernard Cafarelli ] diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 9fd5104..94c841e 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -49,6 +49,14 @@ internal_errormsg () { "<x2go-dev(a)lists.x2go.org>." } +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + # initialize variables for use by all session scripts OPTIONFILE=/etc/x2go/Xsession.options diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 4b0a782..33d19b9 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-158-gda78814
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, master has been updated via da78814254872c8d400aea80aff6f63f7ef08d10 (commit) from dfa5930ccce0cecc922150899606e891f81929fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit da78814254872c8d400aea80aff6f63f7ef08d10 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:55:01 2013 +0200 cherry-pick from release branch: update changelog for release 4.0.0.2 Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0a32e0a..43a974b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,7 +50,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.2-0~x2go1) unstable; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.2): @@ -73,7 +73,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + Create session log symlink after launching x2goagent. Fix order of target and symlink name when executing the command. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 00:54:34 +0200 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-18-g1341d20
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 1341d206bfb573e3b25d8e22f273daf508a1c107 (commit) from 011d14ae076ba6fec96cd1e019c4f82444ab0f9f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2cf2dde..89ec4ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). + + Create session log symlink after launching x2goagent. Fix order of target + and symlink name when executing the command. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 45b3ba5..83e559d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -277,6 +276,8 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi +ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-15-g275a802
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 275a8022ed3ea2fab21329f7ea2f19aa07a19187 (commit) from 8f2eb0d783eece54db114e73ad90fe3666a46b7c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver/bin/x2gostartagent | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 470a502..359a2f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). + not present. /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index e6de5fb..45b3ba5 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -135,7 +135,8 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` #Get all used in system ports from X2Go database and ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); -USED_NONSSH_PORTS=$( +USED_PORTS=$( + "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; "$ss" -lnt | perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; ); @@ -143,12 +144,12 @@ USED_NONSSH_PORTS=$( while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - + #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too. NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then + grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then OUTPUT="XXX" else SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" @@ -163,7 +164,6 @@ done while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" - USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"` while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) @@ -209,6 +209,7 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" +ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -276,9 +277,6 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi -# link the session.log on /tmp into the session directory -ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" - X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-17-g011d14a
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 011d14ae076ba6fec96cd1e019c4f82444ab0f9f (commit) from 3f7c053a58aa2e38c93935c9ac3ac570896e6506 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- debian/changelog | 3 +++ debian/rules | 4 +-- x2goserver/Makefile | 4 +-- x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- 5 files changed, 12 insertions(+), 55 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 3be40f9..588084f 100755 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR=$(PREFIX)/lib/x2go SHAREDIR=$(PREFIX)/share/x2go diff --git a/debian/changelog b/debian/changelog index 470a502..2cf2dde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if not present. (Fixes: #200). + - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to + x2gosqlitewrapper.pl during build via defining a macro in the Makefile. + Thanks to Richard Weinberger for spotting this!!! /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/debian/rules b/debian/rules index b32e08d..5bb94b2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,10 @@ #!/usr/bin/make -f %: - dh $@ + PREFIX=/usr dh $@ override_dh_auto_install: - make -f Makefile build-arch + PREFIX=/usr make -f Makefile build-arch override_dh_auto_clean: rm -fv x2gosqlitewrapper diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 4287478..e9d56e6 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -15,7 +15,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin @@ -41,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index a134efc..ad95eff 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -21,58 +21,12 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <libgen.h> -#include <errno.h> - int main( int argc, char *argv[] ) { - char * x2gosqlitewrapper = NULL; - size_t path_max; - -/* - The following snippet is taken from the realpath manpage -*/ -#ifdef PATH_MAX - path_max = PATH_MAX; -#else - path_max = pathconf (".", _PC_PATH_MAX); - if (path_max <= 0){ - path_max = 4096; - } -#endif - { - // allocate dynamic buffer in stack: this needs C99 or gnu?? - char buffer[path_max]; - ssize_t rvrl; - int rvap; - - // resolve link of /proc/self/exe to find out where we are - rvrl = readlink("/proc/self/exe", buffer, path_max); - if(rvrl == -1){ - perror("readlink(\"/proc/self/exe\",buffer,path_max)"); - exit(EXIT_FAILURE); - } - if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); - exit(EXIT_FAILURE); - } - - // derive the full path of x2gosqlitewrapper.pl from path of this binary - rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); - if(rvap == -1){ - fprintf(stderr, "Failed to allocate memory calling asprintf\n"); - exit(EXIT_FAILURE); - } - - // execute the script, running with user-rights of this binary - execv(x2gosqlitewrapper, argv); - } + char x2gosqlitewrapper[] = TRUSTED_BINARY; - // ...fail - fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); - return EXIT_FAILURE; + argv[0] = "x2gosqlitewrapper.pl"; + // execute the script, running with user-rights of this binary + execv(x2gosqlitewrapper, argv); } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-16-g3f7c053
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 3f7c053a58aa2e38c93935c9ac3ac570896e6506 (commit) from 275a8022ed3ea2fab21329f7ea2f19aa07a19187 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 359a2f9..470a502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. + not present. (Fixes: #200). /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-13-gbad455e
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via bad455edefdce83da6a1f3b42e6626030e8b82d2 (commit) from fb53bd9d0133a821a410e716d186a6b5c728fd29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/sbin/x2godbadmin | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 72a4f4d..359a2f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). [ Mike Gabriel ] + * New upstream version (4.0.0.2): + - Use make_path from File::Path in x2godbadmin to create user directory if + not present. /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index b39c8cb..f8eea83 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -22,6 +22,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); +use File::Path qw( make_path ); use Getopt::Long; use Config::Simple; use DBI; @@ -82,7 +83,7 @@ my $user="x2gouser"; { if (! -d "$dir" ) { - mkdir("$dir"); + make_path("$dir"); } if ( -e $dbfile) { @@ -342,7 +343,7 @@ sub add_user() if (! -d "$dir/.x2go" ) { - mkdir("$dir/.x2go"); + make_path("$dir/.x2go"); } #save user password hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-14-g8f2eb0d
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 8f2eb0d783eece54db114e73ad90fe3666a46b7c (commit) from bad455edefdce83da6a1f3b42e6626030e8b82d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver/bin/x2gostartagent | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 359a2f9..470a502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. + not present. (Fixes: #200). /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 45b3ba5..e6de5fb 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -135,8 +135,7 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` #Get all used in system ports from X2Go database and ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); -USED_PORTS=$( - "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; +USED_NONSSH_PORTS=$( "$ss" -lnt | perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; ); @@ -144,12 +143,12 @@ USED_PORTS=$( while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - + #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too. NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then + grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then OUTPUT="XXX" else SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" @@ -164,6 +163,7 @@ done while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" + USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"` while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) @@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -277,6 +276,9 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi +# link the session.log on /tmp into the session directory +ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.2
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 498e2b7e5a8fa9216a57f2234f57f6a6fa7ed261 (commit) from 1341d206bfb573e3b25d8e22f273daf508a1c107 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 89ec4ee..3548efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.2-0~x2go1) unstable; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.2): @@ -21,7 +21,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + Create session log symlink after launching x2goagent. Fix order of target and symlink name when executing the command. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 00:54:34 +0200 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-12-gfb53bd9
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via fb53bd9d0133a821a410e716d186a6b5c728fd29 (commit) from 98fa38c879da3ee1663f8d076163ff365adb63bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ debian/control | 2 ++ 2 files changed, 7 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 654403a..72a4f4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). + [ Mike Gabriel ] + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index f242c27..44f3789 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,8 @@ Recommends: x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, + xfonts-base, + fontconfig, xinit, x2goserver-extensions (= ${source:Version}) Suggests: hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2013