x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2goserver.git - build-main (branch) updated: 4.0.0.2-10-g7095712
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-main has been updated via 709571203da179ba6e4a46f9b68d9c354dfdc8d2 (commit) from 037a8b807fd2d30894ab51ec5ec6f51ebf04e832 (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/sbin/x2gocleansessions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 1548e2b..4b9f637 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -129,7 +129,7 @@ elsif ($pid == 0 ) while ( my ($session, $blocked_time) = each(%blocked_sessions) ) { if (! join(',', @outp)=~m/$session/) { - delete $blocked_sessions{$session} + delete $blocked_sessions{$session}; } } @@ -147,7 +147,7 @@ elsif ($pid == 0 ) { # send SIGKILL to dangling X-server processes syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); - qw(kill -9 @sinfo[0]) + qw(kill -9 @sinfo[0]); } } else { $blocked_sessions{@sinfo[1]} = 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-main (branch) updated: 4.0.0.2-3-g82ff682
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-main has been updated via 82ff682e9e52aaa158f35ec3b615580f57fd3419 (commit) from 2aabac70cc2137fe7e0377f6d2ac257841186507 (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/bin/x2gosuspend-session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 645c352..46b6210 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -56,7 +56,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" # If we reach here it means that the x2goagent process of the session has vanisshed - # If this happens than we mark the session as finished... + # If this happens then we mark the session as finished... $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-suspend 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-1-g52763c2
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-main has been updated via 52763c215a1575d7edbebcf482b06267fa82f1cf (commit) from 498e2b7e5a8fa9216a57f2234f57f6a6fa7ed261 (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 3548efd..8990be3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 + x2goserver (4.0.0.2-0~x2go1) unstable; urgency=low [ Matthew L. Dailey ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 33d19b9..11f45e6 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.3 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 33d19b9..11f45e6 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.3 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 33d19b9..11f45e6 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.3 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 33d19b9..11f45e6 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.3 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 33d19b9..11f45e6 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.3 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 33d19b9..11f45e6 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.3 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 33d19b9..11f45e6 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.0.2 \ No newline at end of file +4.0.0.3 \ 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-main (branch) updated: 4.0.0.2-2-g2aabac7
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-main has been updated via 2aabac70cc2137fe7e0377f6d2ac257841186507 (commit) from 52763c215a1575d7edbebcf482b06267fa82f1cf (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 | 4 +++- debian/rules | 2 +- x2goserver-compat/Makefile | 4 ++-- x2goserver-extensions/Makefile | 4 ++-- x2goserver-fmbindings/Makefile | 4 ++-- x2goserver-printing/Makefile | 4 ++-- x2goserver-pyhoca/Makefile | 4 ++-- x2goserver-xsession/Makefile | 4 ++-- x2goserver/Makefile | 4 ++-- 10 files changed, 19 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 588084f..3d575cb 100755 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= +DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR=$(PREFIX)/lib/x2go diff --git a/debian/changelog b/debian/changelog index 8990be3..56eb297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (4.0.0.3): + - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. + Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/debian/rules b/debian/rules index 5bb94b2..f71ab24 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,4 @@ override_dh_auto_clean: rm -fv x2gosqlitewrapper rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html - dh_auto_clean + PREFIX=/usr dh_auto_clean diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index d8a3c95..439ae59 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 13cf560..cc15e52 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 8661e83..ef9a5d3 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 1c956f4..8dc1339 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index 95ab06d..1d05bd5 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 50c2818..6ce7beb 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -11,8 +11,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go #BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver/Makefile b/x2goserver/Makefile index e9d56e6..d324bc5 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -14,7 +14,7 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= +DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin @@ -41,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gosqlitewrapper.pl\" -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

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.3
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, release/4.0.0.x has been updated via 8a82fe757e5b944d55441b9cf457a7879a9b4688 (commit) from 7af9b5bb6d2e39992d6d11aa1b75826218680d41 (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 ab2fc5a..e34e253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.3-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. @@ -6,7 +6,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Partially revert USED_PORTS detection code back to the old-style awk-way. (Fixes: #155). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:03:20 +0200 x2goserver (4.0.0.2-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.2-28-g8a82fe7
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-baikal has been updated via 8a82fe757e5b944d55441b9cf457a7879a9b4688 (commit) from 7af9b5bb6d2e39992d6d11aa1b75826218680d41 (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 8a82fe757e5b944d55441b9cf457a7879a9b4688 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 7 23:03:30 2013 +0200 release 4.0.0.3 ----------------------------------------------------------------------- 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 ab2fc5a..e34e253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.3-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. @@ -6,7 +6,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Partially revert USED_PORTS detection code back to the old-style awk-way. (Fixes: #155). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:03:20 +0200 x2goserver (4.0.0.2-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.2-26-g556cc82
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-baikal has been updated via 556cc823947aa4b5f36a744c4540794f2806ed20 (commit) from 12500017a4c4f6e8e97dcec2c775d365a83e76a6 (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/sbin/x2gocleansessions | 44 ++++--------------------------------- 2 files changed, 4 insertions(+), 42 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3648e93..56eb297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,6 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. - - Add support to x2gocleansessions to suspend session via state changes - in the session DB. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 0be7cee..6cc0edd 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -51,20 +51,7 @@ sub check_pid return 0; } -sub has_terminated -{ - my $sess=shift; - my $user=shift; - my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; - if ($text =~ m/Session terminated/) - { - return 1; - } - return 0; -} - -sub is_suspended +sub check_stat { my $sess=shift; my $user=shift; @@ -72,22 +59,9 @@ sub is_suspended my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { - return 1; - } - return 0; -} - -sub is_running -{ - my $sess=shift; - my $user=shift; - my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; - if (!is_suspended($sess, $user) && !has_terminated($sess, $user)) - { - return 1; + return 0; } - return 0; + return 1; } sub catch_term @@ -142,7 +116,7 @@ elsif ($pid == 0 ) { if (@sinfo[4]eq 'R') { - if (is_suspended(@sinfo[1],@sinfo[11])) + if (!check_stat(@sinfo[1],@sinfo[11])) { system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); @@ -150,16 +124,6 @@ elsif ($pid == 0 ) system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } - if (@sinfo[4]eq 'S') - { - if (is_running(@sinfo[1],@sinfo[11])) - { - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" > /dev/null"); - syslog('debug', "@sinfo[1] was found running and has now been 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: 4.0.0.2-27-g7af9b5b
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-baikal has been updated via 7af9b5bb6d2e39992d6d11aa1b75826218680d41 (commit) from 556cc823947aa4b5f36a744c4540794f2806ed20 (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 | 4 ++-- x2goserver/bin/x2gostartagent | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 56eb297..ab2fc5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. + - Partially revert USED_PORTS detection code back to the old-style awk-way. + (Fixes: #155). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index f4b5624..9c2eca8 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -67,8 +67,8 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "old ports: $GR_PORT, $SOUND_PORT, $FS_PO #Get all used in system ports from ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); USED_PORTS=$( - "$ss" -lnt | - perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; + "$ss" -nt -all | + awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'; ); #check if saved in DB ports free diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 83e559d..e137368 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -137,8 +137,8 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); USED_PORTS=$( "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; - "$ss" -lnt | - perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; + "$ss" -nt -all | + awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'; ); while [ "$OUTPUT" != "inserted" ]; do 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-22-g23bbab3
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-baikal has been updated via 23bbab3585b44d728146393f8c1b03d9d8908453 (commit) from ab4d1afa5aa7a43024c597b04001d974442a4aee (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/x2golistsessions_sql | 16 +--------------- x2goserver/sbin/x2gocleansessions | 29 ++--------------------------- 3 files changed, 3 insertions(+), 44 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 64f8ff5..cadd8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,6 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low in the session DB. - Add support for terminating sessions via the session DB. - Raise the frequency of the x2gocleansessions loop to every two seconds. - - Send SIGKILL to blocked X-Server (x2goagent) processes, if they do not - disappear within 20secs. (Fixes: #32). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index b667b4f..2957437 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -31,20 +31,6 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); -sub check_pid -{ - my $pid=shift; - my $sess=shift; - open (F,"</proc/$pid/cmdline") or return 0; - my $text=<F>; - close (F); - if ($text =~ m/$sess/) - { - return 1; - } - return 0; -} - my $serv=shift; my @array; if($serv eq "--all-servers") @@ -59,7 +45,7 @@ my $i; for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); - if ((@ln[4] eq "F") && (check_pid(@ln[0], @ln[1])) + if (@ln[4] eq "F") { my $sid = @ln[1]; dbsys_rmsessionsroot($sid); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 1548e2b..ca4f95a 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -118,43 +118,18 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %blocked_sessions = (); - while(sleep 2) { my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`; my @outp=split("\n","$outp"); - - # forget earlier remembered blocked sessions - while ( my ($session, $blocked_time) = each(%blocked_sessions) ) { - if (! join(',', @outp)=~m/$session/) - { - delete $blocked_sessions{$session} - } - } - for (my $i=0;$i<@outp;$i++) { my @sinfo=split('\\|',"@outp[$i]"); if (@sinfo[4]eq 'F') { - syslog('debug', "@sinfo[1] is blocked"); - if defined $hash{ $key } - { - $blocked_sessions{@sinfo[1]} += 2; - if ($blocked_sessions{@sinfo[1]} >= 20) { - { - # send SIGKILL to dangling X-server processes - syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); - qw(kill -9 @sinfo[0]) - } - } else { - $blocked_sessions{@sinfo[1]} = 0; - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - } - + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { 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-25-g1250001
by git-admin＠x2go.org 07 Jun '13

07 Jun '13

The branch, build-baikal has been updated via 12500017a4c4f6e8e97dcec2c775d365a83e76a6 (commit) from f0928803d9cf47f380996a19286bbc04c947be8f (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 | 1 - x2goserver/bin/x2gomountdirs | 2 -- x2goserver/bin/x2goumount-session | 13 +++---------- x2goserver/share/x2gofeature.d/x2goserver.features | 1 - 4 files changed, 3 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4012bda..3648e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. - - Make x2gomountdirs / x2goumount-session UNC path aware. - Add support to x2gocleansessions to suspend session via state changes in the session DB. diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 4c6d6b4..d151255 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -259,7 +259,6 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; - $p=~s/~_uncpath_//; $p=~s/~//g; mkdir("$this_mdir/$p"); $mntpath="$this_mdir/$p"; @@ -318,7 +317,6 @@ for (my $i=0;$i<@dirs;$i++) my $p=@dirs[$i]; $p=~s/\/cygdrive\///; $p=~s/\/windrive\///; - $p=~s/\/uncpath\///; $p=~s/ /_/g; $p=~s/\//_/g; $fname="$fname/$p"; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 095fa22..2d10c26 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -123,25 +123,19 @@ for ($i=0;$i<@outp;$i++) { if (@line[1] ne $only_path) { - # this is for Python X2Go, the base of Windows mounted shares starts with _windrive or _uncpath, not _cygdrive + # this is for Python X2Go, the base of Windows mounted shares starts with _windrive, not _cygdrive my $only_path_windrive=$only_path; - my $only_path_uncpath=$only_path; $only_path_windrive=~ s/_cygdrive_/_windrive_/; - $only_path_uncpath=~ s/_cygdrive_/_uncpath_/; - if ((@line[1] ne $only_path_windrive) && (@line[1] ne $only_path_uncpath)) + if (@line[1] ne $only_path_windrive) { syslog('debug', "skipping non-requested path @line[1]"); goto cont; } - if (@line[1] e $only_path_windrive) + else { $only_path = $only_path_windrive; } - if (@line[1] e $only_path_uncpath) - { - $only_path = $only_path_uncpath; - } } } my $j; @@ -184,7 +178,6 @@ break: $remote=~s/\/cygdrive\///; $remote=~s/\/windrive\///; - $remote=~s/\/uncpath\///; $remote=~s/\//_/g; $remote=~s/ /_/g; $remote=~s/\\040/_/g; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 24fd41a..1d23695 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -36,7 +36,6 @@ case "$X2GO_FEATURE" in "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;; "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; - "X2GO_MOUNT_UNCPATHS") echo "ok"; exit 0;; *) exit -1;; esac 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