x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - master (branch) updated: 0.0.2.0-14-gc485372
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, master has been updated via c485372401718f61f7bf6d3b1d66617ad12d49ff (commit) from 1120e90923542f62c7e897de178afbf45e052e77 (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 c485372401718f61f7bf6d3b1d66617ad12d49ff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 11:35:32 2013 +0200 changelog: typo fix ----------------------------------------------------------------------- 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 b39fc37..fb9787e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low x2gobroker-agent.pl during build via defining a macro in the Makefile. Thanks to Richard Weinberger for spotting this!!! * Provide init scripts and *.default files outside of /debian folder (as - they are also relevant for non-Debian packaging. + they are also relevant for non-Debian packaging). [ Jan Engelhardt ] * New upstream version (0.0.2.1): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

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

18 May '13

The branch, build-baikal 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-baikal (branch) updated: 4.0.0.1-14-g8f2eb0d
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal 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-baikal (branch) updated: 4.0.0.1-17-g011d14a
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal 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-baikal (branch) updated: 4.0.0.1-16-g3f7c053
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal 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-baikal (branch) updated: 4.0.0.1-15-g275a802
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal 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-baikal (branch) updated: 4.0.0.2
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal 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-baikal (branch) updated: 4.0.0.1-5-gc1c60c2
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal has been updated via c1c60c2feeeb62f03910fb51efe4cca99a69d432 (commit) from 9ef3110f1550fc1f8d7455f8ef357ccc7ea6f23b (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: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 33d19b9..4b0a782 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 33d19b9..4b0a782 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 33d19b9..4b0a782 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 33d19b9..4b0a782 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 33d19b9..4b0a782 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.1 \ 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 - build-baikal (branch) updated: 4.0.0.1-8-g966ad0d
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal has been updated via 966ad0d5852bf6e543b1686d45d5685d6bf6f094 (commit) from ee84314f340b3227cc42e1ea5b17fd6e4a456732 (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 +++- x2goserver-xsession/etc/Xsession | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c2434fe..f8d9ea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Matthew L. Dailey ] + * New upstream version (4.0.0.2): + - Do parse profile/xprofile files in X2Go's Xsession file. (Fixes: #149). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 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 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-baikal (branch) updated: 4.0.0.1-9-g44e6743
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-baikal has been updated via 44e6743519e92ca1c1520032f2c0b13d81780956 (commit) from 966ad0d5852bf6e543b1686d45d5685d6bf6f094 (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 ++++ x2goserver-printing/bin/x2goprint | 2 +- x2goserver/bin/x2gogetapps | 2 +- x2goserver/bin/x2gogetservers | 2 +- x2goserver/bin/x2golistdesktops | 2 +- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2gosessionlimit | 2 +- x2goserver/bin/x2goshowblocks | 2 +- x2goserver/bin/x2goumount-session | 2 +- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2godbwrapper.pm | 4 ++-- x2goserver/lib/x2gogetagent | 2 +- x2goserver/lib/x2gogetdisplays | 2 +- x2goserver/lib/x2gogetports | 2 +- x2goserver/lib/x2gogetstatus | 2 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2golistsessions_sql | 2 +- x2goserver/lib/x2gologlevel | 2 +- x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gormport | 2 +- x2goserver/lib/x2gosuspend-agent | 2 +- x2goserver/lib/x2gosyslog | 2 +- x2goserver/sbin/x2godbadmin | 2 +- x2goserver/sbin/x2golistsessions_root | 2 +- 28 files changed, 32 insertions(+), 28 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f8d9ea3..654403a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Do parse profile/xprofile files in X2Go's Xsession file. (Fixes: #149). + [ Jan Engelhardt ] + * New upstream version (4.0.0.2): + - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). + -- 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/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index e3f3f8f..b5739c8 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -26,7 +26,7 @@ use File::Copy; use File::Path; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 8414daa..50b42f4 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -24,7 +24,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use MIME::Base64 qw(encode_base64); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; my @iconext=("png","svg","jpeg","jpg","xpm","bmp"); diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index d34cc98..cafc2fe 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index acdd7c4..71a15b0 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index ade0c67..879ca61 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index e4421b3..eb24196 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index ef7f139..d151255 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -24,7 +24,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use File::BaseDir qw( xdg_config_home ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 91f747b..bae41f7 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -24,7 +24,7 @@ use strict; use Config::Simple; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index f253a73..46dd6d0 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 33ffc01..2d10c26 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -25,7 +25,7 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); use File::BaseDir qw( xdg_config_home ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index ce33520..5cd1981 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index ceb62a9..6f81e5f 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index f290b71..e6bcb48 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -26,8 +26,8 @@ use DBI; use POSIX; use Sys::Syslog qw( :standard :macros ); -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +my $x2go_lib_path = `x2gopath libexec`; +use lib `x2gopath lib`; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 897d75e..d7f5e92 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index db29b5c..28474db 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index b269800..02d6639 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index d2271a4..0fe5a63 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index bc18d96..9eea344 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index 372208b..2cf3086 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 6563705..2957437 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index 9269097..5914448 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -22,7 +22,7 @@ use strict; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; print x2gologlevel(); diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 7391cd3..a5da249 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 4ba632d..0ea101d 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 7000281..052ace6 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -23,7 +23,7 @@ strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index c7650f7..704b9f1 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; setlogmask( LOG_UPTO(x2gologlevel()) ); diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index fc86ca8..b39c8cb 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -26,7 +26,7 @@ use Getopt::Long; use Config::Simple; use DBI; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index dda2b31..a3b7ea6 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -23,7 +23,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits