This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from e20bbe2 Provide --debug option for x2gocleansession that allows running x2gocleansessions in foreground (and in debug mode). new 335a8ef Properly clean up shadow sessions for the session database. new 14170cc various changelog fixes new 6fbaeef sync in fixes from x2gosever.spec on release/4.0.1.x branch The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 ++++--- x2goserver.spec | 24 ++++++++++++++++++++---- x2goserver/sbin/x2gocleansessions | 16 +++++++++++++++- 3 files changed, 39 insertions(+), 8 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 14170cc423d0f5bb0a949b08e37649c5ade61a3c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 5 11:49:32 2015 +0100 various changelog fixes --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ff2927..dc1f318 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,7 +99,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low + Provide DEP-5 compliant copyright file. + Add copyright.in auto-generated file (by licensecheck+CDBS) for later reference. - * x2goclient.spec: + * x2goserver.spec: + Bring debian/control and x2goclient.spec in sync. + Make sure x2godbadmin is evoked from package x2goserver. + Handle X2Go session DB creation in x2goserver _and_ @@ -228,9 +228,9 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + Add D (x2goserver): libfile-which-perl. + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2-0~). (Fixes: #700). + Bump Standards: to 3.9.6. No changes needed. - - Don't depend on libdb-pg-perl for armhf builds. (Fixes: #712). Thanks to + + Don't depend on libdb-pg-perl for armhf builds. (Fixes: #712). Thanks to Heinrich Schuchardt for providing information on this. - - Upgrade to D again (bin:package x2goserver): xfonts-base (Fixes: #770). + + Upgrade to D again (bin:package x2goserver): xfonts-base (Fixes: #770). * debian/x2goserver.docs: + Install README.i18n file into bin:package x2goserver. * x2goserver.spec: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6fbaeef1b78216957937ee8b65598759046211a2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 5 12:06:02 2015 +0100 sync in fixes from x2gosever.spec on release/4.0.1.x branch --- x2goserver.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 5584622..b59304d 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -97,7 +97,6 @@ Requires: sshfs Requires: sudo Requires: x2goagent >= 3.5.0.25 Requires(post): grep -Requires(post): perl(DBD::SQLite) Requires: perl(File::Which) Requires: perl(File::BaseDir) @@ -215,7 +214,7 @@ Summary: Perl X2Go::Server::DB package Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl(Config::Simple) -Requires: perl(DBD::SQLite) +Requires(post): perl(DBD::SQLite) Requires: perl(DBD::Pg) %if 0%{?suse_version} Requires(pre): permissions @@ -479,7 +478,7 @@ EOF if ! getent group x2gouser 1>/dev/null; then groupadd -r x2gouser fi -if ! getent passwd x2gouser >/dev/null; then +if ! getent passwd x2gouser 1>/dev/null; then useradd -r -g x2gouser -d %{_localstatedir}/lib/x2go -s /sbin/nologin \ -c "x2go" x2gouser fi @@ -571,12 +570,13 @@ if [ $1 -eq 0 ] ; then /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : fi + %pre printing getent group x2goprint 1>/dev/null || groupadd -r x2goprint getent passwd x2goprint 1>/dev/null || \ useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \ -c "x2go" x2goprint -exit 0 + %files %defattr(-,root,root) @@ -637,6 +637,8 @@ exit 0 %files -n perl-X2Go-Log %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %dir %{perl_vendorlib}/X2Go %{perl_vendorlib}/X2Go/Log.pm %{_mandir}/man3/X2Go::Log.* @@ -644,6 +646,8 @@ exit 0 %files -n perl-X2Go-Server %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %dir %{perl_vendorlib}/X2Go/Server %{perl_vendorlib}/X2Go/Config.pm %{perl_vendorlib}/X2Go/Server.pm @@ -660,6 +664,8 @@ exit 0 %files -n perl-X2Go-Server-DB %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %dir %{_libdir}/x2go %if 0%{?suse_version} %config(noreplace) %{_sysconfdir}/permissions.d/perl-X2Go-Server-DB @@ -673,6 +679,8 @@ exit 0 %files common %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/ %dir %{_sysconfdir}/x2go/ %dir %{_sysconfdir}/x2go/x2gosql @@ -684,6 +692,8 @@ exit 0 %files extensions %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %{_libdir}/x2go/extensions %{_bindir}/x2goserver-run-extensions %{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features @@ -693,6 +703,8 @@ exit 0 %files fmbindings %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %{_bindir}/x2gofm %{_datadir}/applications/x2gofm.desktop %{_datadir}/mime/packages/sshfs-x2go.xml @@ -703,6 +715,8 @@ exit 0 %files printing %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %{_bindir}/x2goprint %{_datadir}/x2go/versions/VERSION.x2goserver-printing %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features @@ -712,6 +726,8 @@ exit 0 %files xsession %defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog %{_sysconfdir}/x2go/xinitrc.d %if 0%{?fedora} || 0%{?rhel} %{_sysconfdir}/x2go/Xclients.d -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 335a8efb18f7baad1333148b2bcef64ea2b1550a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 5 11:48:38 2015 +0100 Properly clean up shadow sessions for the session database. --- debian/changelog | 1 + x2goserver/sbin/x2gocleansessions | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ac1bef1..5ff2927 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - Make it possible to change the state of shadow sessions. - Provide --debug option for x2gocleansession that allows running x2gocleansessions in foreground (and in debug mode). + - Properly clean up shadow sessions for the session database. * debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 4cfe224..83e57a1 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -149,6 +149,9 @@ elsif ($pid == 0 ) my %remembered_sessions_since = (); my $last_reniced = 0; + my $user; + my $effective_user; + while(sleep 2) { my $outp=system_capture_stdout_output("$x2go_lib_path/x2golistsessions_sql", "$serv"); @@ -214,7 +217,18 @@ elsif ($pid == 0 ) } elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { - system("su", "@sinfo[11]", "-s", "/bin/sh", "-c", "$x2go_lib_path/x2gochangestatus 'F' @sinfo[1]"); + $user = @sinfo[11]; + + # For shadow sessions we need to su to the user who provided the shared desktop (not the one who + # requested the desktop sharing)... + if ( @sinfo[1] =~ m/$user-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD.*XSHAD.*/ ) + { + $effective_user = @sinfo[1]; + $effective_user =~ s/$user\-[0-9]{2,}\-[0-9]{10}_stS[0-1]XSHAD(.*)XSHAD.*/$1/; + $user = $effective_user; + } + + system("su", "$user", "-s", "/bin/sh", "-c", "$x2go_lib_path/x2gochangestatus 'F' @sinfo[1]"); my $display = @sinfo[2]; if (-S "/tmp/.X11-unix/X$display") { # remove the NX-X11 socket file (we don't know how the agent disappeared, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org