x2go-commits January 2014

x2go-commits@lists.x2go.org

2 participants
8921 discussions

x2goserver.git - build-baikal (branch) updated: 3.1.1.1-13-g5c11e7e
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 5c11e7e4e870b057bccba4c87d2e42209d5e899a (commit) from 1368c7b4026cf2c8b0c81c890179eaa8bfc39f58 (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: .../bin}/.placeholder | 0 .../man/man8}/.placeholder | 0 2 files changed, 0 insertions(+), 0 deletions(-) copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/bin}/.placeholder (100%) copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/man/man8}/.placeholder (100%) The diff of changes is: diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/bin/.placeholder similarity index 100% copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder copy to x2goserver-pyhoca/bin/.placeholder diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/man/man8/.placeholder similarity index 100% copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder copy to x2goserver-pyhoca/man/man8/.placeholder 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: 3.1.1.0-25-g266caa3
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 266caa371a9fa8b393a0cf3ae7c5126531f95cc0 (commit) from 256fe8a5e2f9211367ecaf0e5a40cf7fee334d42 (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 0dea2cb..537e086 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low in X2Go session cache directory. - Add support for client-side keyboard detection. Moved script x2gosetkeyboard from x2goserver-pyhoca into x2goserver package. - - Make x2gosetkeyboard set the client-side keyboard on sessino start and + - Make x2gosetkeyboard set the client-side keyboard on session start and resume if usekbd is set to True and the keyboard type is set ,,auto''. - Reset keyboard settings to pc104/us before setting client-side keyboard parameters. 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: 3.1.1.1-1-g612f5ec
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 612f5ecbe31f42cbeb5148d9126660e09bbc7adb (commit) from dc092a92bb23b613d76c6357022fc04c30acd213 (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-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 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 845e2b7..29249fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 26 Jun 2012 09:32:31 +0200 + x2goserver (3.1.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 164a848..2fc27ca 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 164a848..2fc27ca 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 646c786..ff03238 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.1 +3.1.1.2 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 164a848..2fc27ca 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 164a848..2fc27ca 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 164a848..2fc27ca 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 164a848..2fc27ca 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.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 - build-baikal (branch) updated: 3.1.1.0-23-g9a49f76
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 9a49f7672ec2bbde2b70c891fc5d005782efd7b6 (commit) from 5de98c2ed290873f044368348d310522ccda3004 (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/bin/x2gosetkeyboard | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bc71ddd..1b8278b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,10 +22,11 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low x2gosetkeyboard from x2goserver-pyhoca into x2goserver package. - Make x2gosetkeyboard set the client-side keyboard on sessino start and resume. + - Reset keyboard settings to pc104/us before setting client-side keyboard + parameters. * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch 105_nxagent_export-remote-keyboard-config.full.patch included. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index 710daa9..949af5e 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -64,6 +64,10 @@ read_keyboard_file() { } +reset_keymap() { + setxkbmap -layout us -option "" -model pc104 +} + update_keymap() { if [ "$XKB_RULES" = "evdev" ]; then @@ -83,5 +87,6 @@ update_keymap() { ### main ### $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "Setting X keyboard according to ${X2GO_CLIENT_KBD_FILE}" read_keyboard_file +reset_keymap update_keymap 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: 3.1.1.0-24-g256fe8a
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 256fe8a5e2f9211367ecaf0e5a40cf7fee334d42 (commit) from 9a49f7672ec2bbde2b70c891fc5d005782efd7b6 (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/x2goresume-session | 5 ++--- x2goserver/bin/x2gostartagent | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1b8278b..0dea2cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Add support for client-side keyboard detection. Moved script x2gosetkeyboard from x2goserver-pyhoca into x2goserver package. - Make x2gosetkeyboard set the client-side keyboard on sessino start and - resume. + resume if usekbd is set to True and the keyboard type is set ,,auto''. - Reset keyboard settings to pc104/us before setting client-side keyboard parameters. * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 78f96a6..3a9772f 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -128,8 +128,7 @@ LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}` KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"` X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"` -if [ "$X2GO_SET_KBD" == "0" ] -then +if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then X2GO_KBD_TYPE="null\/null" fi @@ -175,7 +174,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) # set client-side keyboard model, type, variant, etc. - if [ "$X2GO_SET_KBD" == "0" ]; then + if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) export DISPLAY=:$X2GO_DISPLAY.0 x2gosetkeyboard "$SESSION_NAME" >/dev/null 2>/dev/null & diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 90b82b1..e772bf4 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -214,8 +214,7 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "$ xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" -if [ "$X2GO_SET_KBD" == "0" ] -then +if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" else X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" @@ -273,7 +272,7 @@ X2GO_SND_PORT=1024 $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null -if [ "$X2GO_SET_KBD" != "0" ]; then +if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "info" "blocking creation of agent's keyboard file ${SESSION_DIR}/keyboard as requested by session startup command" mkdir -p ${SESSION_DIR}/keyboard fi 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: 3.1.1.0-26-g2e471b4
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 2e471b45ddf6a9cd7dca06d3b0f276ef35a3788a (commit) from 266caa371a9fa8b393a0cf3ae7c5126531f95cc0 (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/lib/x2godbwrapper.pm | 21 ++++++++++++++++++++- x2goserver/lib/x2gosqlitewrapper.pl | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 537e086..54de803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low resume if usekbd is set to True and the keyboard type is set ,,auto''. - Reset keyboard settings to pc104/us before setting client-side keyboard parameters. + - For finished sessions purge all mount points that still hover in the + DB's mounts table. * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch 105_nxagent_export-remote-keyboard-config.full.patch included. diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 2690544..f290b71 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -88,11 +88,12 @@ use base 'Exporter'; our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', - 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot'); + 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts'); sub dbsys_rmsessionsroot { my $sid=shift or die "argument \"session_id\" missed"; + dbsys_deletemounts($sid); if($backend eq 'postgres') { my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", @@ -109,6 +110,24 @@ sub dbsys_rmsessionsroot } } +sub dbsys_deletemounts +{ + my $sid=shift or die "argument \"session_id\" missed"; + if ($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from mounts where session_id='$sid'"); + $sth->execute(); + $sth->finish(); + $dbh->disconnect(); + } + if ($backend eq 'sqlite') + { + `$x2go_lib_path/x2gosqlitewrapper deletemounts $sid`; + } + syslog('debug', "dbsys_deletemounts called, session ID: $sid"); +} + sub dbsys_listsessionsroot { my $server=shift or die "argument \"server\" missed"; diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index ba2c02d..f47fdec 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -153,6 +153,20 @@ elsif($cmd eq "deletemount") $sth->finish(); } +elsif($cmd eq "deletemounts") +{ + my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); + my $sth=$dbh->prepare("delete from mounts where session_id=?"); + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "deletemounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } + $sth->finish(); +} + elsif($cmd eq "insertmount") { my $sid=shift or die "argument \"session_id\" missed"; 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: 3.1.1.0-27-gf9d2dc4
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via f9d2dc4b501f959472d20899732bd25d8f269c9a (commit) from 2e471b45ddf6a9cd7dca06d3b0f276ef35a3788a (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/x2goumount-session | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 54de803..0ccfb0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low parameters. - For finished sessions purge all mount points that still hover in the DB's mounts table. + - Make sure we run fusermount from within a directory that the user has read + access to. * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch 105_nxagent_export-remote-keyboard-config.full.patch included. diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index f79a733..6d5f062 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -124,7 +124,7 @@ for ($i=0;$i<@outp;$i++) break: if ($found) { - if (system( "fusermount -u @line[1]" ) == 0) + if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0) { syslog('notice', "successfully unmounted @line[1]"); $found=0; 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: 3.1.1.1
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via dc092a92bb23b613d76c6357022fc04c30acd213 (commit) from f9d2dc4b501f959472d20899732bd25d8f269c9a (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 0ccfb0a..845e2b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.1.1.1): @@ -31,7 +31,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch 105_nxagent_export-remote-keyboard-config.full.patch included. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 21 Jun 2012 14:16:08 +0200 x2goserver (3.1.1.0-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: 3.1.1.1-2-g49688c3
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 49688c37bb09861fee632a40130278e312f6216b (commit) from 612f5ecbe31f42cbeb5148d9126660e09bbc7adb (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/bin/x2goruncommand | 2 +- x2goserver/bin/x2gostartagent | 16 ++++++++++++---- x2goserver/sbin/x2gocleansessions | 2 +- x2goserver/sbin/x2golistsessions_root | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 29249fc..15413f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Mike Gabriel ] + * New upstream version (3.1.1.2): + - Place session.log into /tmp directory, make x2gocleansessions and + x2golistsessions_root work even if home directories are mounted + via NFSv4+Krb5 and not accessible by root. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 26 Jun 2012 09:32:31 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 012f713..4884e93 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -246,5 +246,5 @@ test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout # clean up session dir if not in debug mode and if session has been successful if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then - (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& + (sleep 10; rm -Rf "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -f "/tmp/.x2go-${USER}/session-C-${X2GO_SESSION}.log"; )& fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index e772bf4..373ee13 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -190,6 +190,14 @@ fi SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" +# do not use $TMP or $TEMP here, the session.log file location has to be accessible by root +SESSION_LOG="/tmp/.x2go-${USER}/session-C-${SESSION_NAME}.log" +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" fi @@ -215,9 +223,9 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" + X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" else - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" + X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" fi @@ -247,9 +255,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & else - x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi X2GO_AGENT_PID=$! diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 6e21482..9263d61 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -55,7 +55,7 @@ sub check_stat { my $sess=shift; my $user=shift; - my $log="~$user/.x2go/C-$sess/session.log"; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index dddcae3..71fc5dd 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -34,7 +34,7 @@ sub check_stat { my $sess=shift; my $user=shift; - my $log="~$user/.x2go/C-$sess/session.log"; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { 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: 3.1.1.1-3-g85cbd8a
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 85cbd8a06b78ed13d9ad2a3de47b4d854ae9e5d7 (commit) from 49688c37bb09861fee632a40130278e312f6216b (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/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 15413f5..9593147 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low - Place session.log into /tmp directory, make x2gocleansessions and x2golistsessions_root work even if home directories are mounted via NFSv4+Krb5 and not accessible by root. + - Use -fPIE gcc (position independed executable) for building + x2gosqlitewrapper.c (as suggested by Jan Engelhardt). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 26 Jun 2012 09:32:31 +0200 diff --git a/x2goserver/Makefile b/x2goserver/Makefile index c90f1c9..be689c5 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -37,7 +37,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -o x2gosqlitewrapper x2gosqlitewrapper.c + gcc -fPIE -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html 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 January 2014