x2go-commits August 2011

x2go-commits@lists.x2go.org

1 participants
75 discussions

cups-x2go.git - master (branch) updated: 3.0.0.2-12-g59c2429
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 59c2429e0897568b5815eb50a71dbcd7b9a40188 (commit) from 66ceeab13cba84ed0e23e09310465d9bb3c184fc (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 59c2429e0897568b5815eb50a71dbcd7b9a40188 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:03:07 2011 +0200 Multiple changes in this commit... * Adapt to x2goprint setgid change in x2goserver package (>=3.0.99.6). * Add syslog support for cups-x2go (Mario Oroz). * Ownership fix for .title file (Mario Oroz). ----------------------------------------------------------------------- Summary of changes: cups-x2go | 40 +++++++++++++++++++++++++++++++++++----- debian/changelog | 5 +++++ 2 files changed, 40 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 853599f..1045a0e 100755 --- a/cups-x2go +++ b/cups-x2go @@ -17,14 +17,19 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +use Sys::Syslog qw( :DEFAULT setlogsock); use Sys::Hostname; use File::Basename; use File::Copy; use strict; +setlogsock('unix'); +openlog($0,'','user'); + my $x2goserver = "local"; my $printdsa = "/root/.x2go/ssh/.x2goprint/id_dsa"; my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; +#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margen-offset.ps \"%s\""; my $cfgfile="/etc/cups/cups-x2go.conf"; my $userName; my @sessions; @@ -64,16 +69,30 @@ sub readconfig } } + sub getsessions { my $sesslist; if ( $x2goserver eq "local" ) { - $sesslist=`su $userName -c "x2golistsessions --all-servers"`; + $sesslist=`su $userName -c "x2golistsessions --all-servers"`; + + ### Suggested patch from Mario OROZ, probably not acceptable here... + #-$sesslist=`su $userName -c "x2golistsessions --all-servers"`; + #+open (SQLCONF, "</etc/x2go/x2gosql/sql"); + #+my $cfgline=<SQLCONF>; + #+close (SQLCONF); + #+if(($cfgline=~m/local/)||($cfgline=~m/sqlite/)) + #+{ + #+ $sesslist=`su $userName -c "x2golistsessions --all-servers"`; + #+} + } else { - $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`; + # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the + # remote X2go server. + $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver 'test -f $(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName || sudo x2goprint $userName"`; } @sessions=split("\n",$sesslist); } @@ -89,8 +108,12 @@ sub printfile my $spfile="$spooldir/$sess$bname"; copy($pfile, $spfile); copy($tfile, "$spfile.title"); - chown $uid,$gid,$spfile; - system( "su x2goprint -c \"sudo x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); + chown $uid,$gid,"$spfile"; + chown $uid,$gid,"$spfile.title"; + system( "su x2goprint -c \"x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); + + # log that we processed a print job + syslog('info', "su x2goprint -c \"x2goprint $userName $sess $bname $bname.title\""); } else { @@ -99,6 +122,7 @@ sub printfile } } + my $uname=$ENV{USER}; if (!$ARGV[0]) @@ -120,7 +144,7 @@ my $printOptions; my $printFile; ($jobID, $userName, $jobTitle, $copies, $printOptions, $printFile) = @ARGV; - +syslog('notice', "Print job received from cups-> $jobID $userName $jobTitle $copies $printOptions $sepa $printFile"); my $tempFile; if (!$printFile) @@ -131,6 +155,7 @@ if (!$printFile) $uid =~ s/\W//g; #sanity check $tempFile = "/tmp/$jid-$uid-cupsjob$$"; open (OUT, ">$tempFile") or die "ERROR: Cannot write $tempFile: $!\n"; + syslog('info', "Print job comes from STDIN, writing incoming job to temp file $tempFile\n"); while(<STDIN>) { print OUT "$_"; @@ -157,8 +182,13 @@ for(my $i=0; $i<scalar(@sessions);$i++ ) if(@sinfo[4] eq "R") { printfile( $printFile, $titleFile, @sinfo[3], @sinfo[1]); + syslog('info', "Call to printfile function with: $printFile $titleFile @sinfo[3] @sinfo[1]\n"); } } unlink ($printFile); unlink ($titleFile); + +# closing syslog +closelog; + diff --git a/debian/changelog b/debian/changelog index 6f8e439..26979b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low * Add dpkg-statoverride for CUPS backend cups-x2go, file permission 0700 on CUPS backend makes CUPS run this backend with root-privileges which is needed for cups-x2go to work. + * Adapt to x2goprint setgid change in x2goserver package (>=3.0.99.6). + + [ Mario Oroz ] + * Add syslog support for cups-x2go. + * Ownership fix for .title file. [ Oleksandr Shneyder ] * fixed reading deprecated /etc/x2go/sql hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-204-ga851ed4
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via a851ed4e8be7b6989eb37830f0777f5bd190b8f0 (commit) from 91df3abe9a3d7a4d52682ae02945b86a38fec9f4 (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 a851ed4e8be7b6989eb37830f0777f5bd190b8f0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:30:03 2011 +0200 Update of x2goserver-compat.manpages DH config file. ----------------------------------------------------------------------- Summary of changes: debian/x2goserver-compat.manpages | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver-compat.manpages b/debian/x2goserver-compat.manpages index 106369b..dc59c8c 100644 --- a/debian/x2goserver-compat.manpages +++ b/debian/x2goserver-compat.manpages @@ -1 +1 @@ -x2goserver-compat/man/man1/* \ No newline at end of file +x2goserver-compat/man/man8/* \ No newline at end of file hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-203-g91df3ab
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 91df3abe9a3d7a4d52682ae02945b86a38fec9f4 (commit) via f72964ba00aa53c2dd67a23dbb37827c1b73997c (commit) from e1b0751932f8194863331db0d7729c90db4497c7 (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 91df3abe9a3d7a4d52682ae02945b86a38fec9f4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:29:02 2011 +0200 Man pages of compat package moved to section 8, add man page for compat script x2gosuspend-agent, fix man page header of x2gosuspend man page. commit f72964ba00aa53c2dd67a23dbb37827c1b73997c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:26:41 2011 +0200 Lintian fix: debian-changelog-line-too long. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- debian/rules | 1 - .../x2gosuspend.1 => man8/x2gosuspend-agent.8} | 6 +++--- .../man/{man1/x2gosuspend.1 => man8/x2gosuspend.8} | 2 +- .../{man1/x2goterminate.1 => man8/x2goterminate.8} | 0 .../man/{man1/x2goumount.1 => man8/x2goumount.8} | 0 6 files changed, 7 insertions(+), 7 deletions(-) copy x2goserver-compat/man/{man1/x2gosuspend.1 => man8/x2gosuspend-agent.8} (70%) rename x2goserver-compat/man/{man1/x2gosuspend.1 => man8/x2gosuspend.8} (89%) rename x2goserver-compat/man/{man1/x2goterminate.1 => man8/x2goterminate.8} (100%) rename x2goserver-compat/man/{man1/x2goumount.1 => man8/x2goumount.8} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 18f0c53..c7cb3f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Use source format 3.0 (native). * Fix of Debian clean rules, fix of Makefile's clean rules. * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint - (instead of Conflicts). + (instead ofB Conflicts). * Switch to setgid instead of setuid for SQLite wrapper. * Tab'ified postinst/postrm scripts. * Store SQLite db in /var/lib/x2go to comply to latest FHS. @@ -32,7 +32,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Fix for TERMINAL command execution if konsole (KDE4) is installed on the server (closes upstream issue #87). * Silence x2golistsessions on missing session.log files. - * Create x2goprint user/group on package installation, add same info to INSTALL howto. + * Create x2goprint user/group on package installation, add same info to + INSTALL howto. * Change permissions on x2goprint, using 2755:root:x2goprint (setgid). * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo. * Makefile update for x2goprint setgid wrapper. diff --git a/debian/rules b/debian/rules index 2af70c1..b32e08d 100755 --- a/debian/rules +++ b/debian/rules @@ -11,4 +11,3 @@ override_dh_auto_clean: rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html dh_auto_clean - diff --git a/x2goserver-compat/man/man1/x2gosuspend.1 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 similarity index 70% copy from x2goserver-compat/man/man1/x2gosuspend.1 copy to x2goserver-compat/man/man8/x2gosuspend-agent.8 index 44d0fa9..e6e8116 100644 --- a/x2goserver-compat/man/man1/x2gosuspend.1 +++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8 @@ -5,14 +5,14 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME -x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with old clients) +x2gosuspend-agent \- X2go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS 'nh .fi .ad l -x2gosuspend <session-name> +x2gosuspend-agent <session-name> .SH DESCRIPTION \fBx2gosuspend\fR is a deprecated script belonging to X2go Server. The availability of this script diff --git a/x2goserver-compat/man/man1/x2gosuspend.1 b/x2goserver-compat/man/man8/x2gosuspend.8 similarity index 89% rename from x2goserver-compat/man/man1/x2gosuspend.1 rename to x2goserver-compat/man/man8/x2gosuspend.8 index 44d0fa9..af119ee 100644 --- a/x2goserver-compat/man/man1/x2gosuspend.1 +++ b/x2goserver-compat/man/man8/x2gosuspend.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man1/x2goterminate.1 b/x2goserver-compat/man/man8/x2goterminate.8 similarity index 100% rename from x2goserver-compat/man/man1/x2goterminate.1 rename to x2goserver-compat/man/man8/x2goterminate.8 diff --git a/x2goserver-compat/man/man1/x2goumount.1 b/x2goserver-compat/man/man8/x2goumount.8 similarity index 100% rename from x2goserver-compat/man/man1/x2goumount.1 rename to x2goserver-compat/man/man8/x2goumount.8 hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-201-ge1b0751
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via e1b0751932f8194863331db0d7729c90db4497c7 (commit) from 656dc5c982735001b32fd79782ec2a2ba6c99910 (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 e1b0751932f8194863331db0d7729c90db4497c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:21:36 2011 +0200 INSTALL howto update. ----------------------------------------------------------------------- Summary of changes: INSTALL | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/INSTALL b/INSTALL index 6f8ad3d..20a093a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ TARBALL INSTALLATION OF x2goserver ================================== -1.) USER + GROUP for X2go -------------------------- +1.) USERS + GROUPS for X2go +--------------------------- Set up x2gouser account and its group if they do not exist already: @@ -10,6 +10,14 @@ already: $ useradd --system --no-create-home \ --shell /bin/false --home /var/lib/x2go x2gouser +Set up x2goprint account and its group if they do not exist +already: + + $ groupadd --system x2goprint + $ useradd --system --no-create-home \ + --shell /bin/false --home /var/spool/x2goprint x2goprint + + 2.) INSTALL x2goserver FILES ----------------------------- Extract tarball and run @@ -19,16 +27,19 @@ Extract tarball and run in base folder of the extracted tarball. -3.) SUID GROUP +3.) SGID GROUP -------------- -Configure ownership, permissions and setuid user bit of x2gosqlitewrapper: +Configure ownership, permissions and setgid group bits of x2gosqlitewrapper and x2goprint: - NOTE: The described action have already been performed by the Makefile + NOTE: The described actions have already been performed by the Makefile run, leaving this here for documentation only. $ chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper $ chmod 2755 /usr/lib/x2go/x2gosqlitewrapper + $ chown root:x2goprint /usr/bin/x2goprint + $ chmod 2755 /usr/bin/x2goprint + 4.) INIT SCRIPT --------------- hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-200-g656dc5c
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 656dc5c982735001b32fd79782ec2a2ba6c99910 (commit) from 3d8515215ebb7d424798583fa27d5168660dfa72 (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 656dc5c982735001b32fd79782ec2a2ba6c99910 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:18:43 2011 +0200 Makefile update for x2goprint setgid wrapper. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/Makefile | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2739a45..18f0c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Create x2goprint user/group on package installation, add same info to INSTALL howto. * Change permissions on x2goprint, using 2755:root:x2goprint (setgid). * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo. + * Makefile update for x2goprint setgid wrapper. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/Makefile b/x2goserver/Makefile index ca4851d..b46c117 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -33,10 +33,11 @@ all: clean build build: build-arch build-indep -build-arch: build_setuidwrapper +build-arch: build_setgidwrappers -build_setuidwrapper: +build_setgidwrappers: gcc -o x2gosqlitewrapper x2gosqlitewrapper.c + gcc -o x2goprint x2goprint.c build-indep: build_man2html @@ -49,6 +50,7 @@ clean: clean_arch clean_man2html clean_arch: rm -f x2gosqlitewrapper + rm -f x2goprint clean_man2html: rm -Rf `dirname $(MAN2HTML_DEST)` @@ -62,10 +64,13 @@ install_scripts: $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) x2gosqlitewrapper $(DESTDIR)$(LIBDIR)/ + $(INSTALL_PROGRAM) x2goprint $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ chmod a-x $(DESTDIR)$(LIBDIR)/*.pm chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper + chown root:x2goprint $(DESTDIR)$(BINDIR)/x2goprint + chmod 2755 $(DESTDIR)$(BINDIR)/x2goprint install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -95,6 +100,7 @@ uninstall_scripts: for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done $(RM_FILE) $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper + $(RM_FILE) $(DESTDIR)$(BINDIR)/x2goprint $(RM_DIR) $(DESTDIR)$(LIBDIR) || true uninstall_config: hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-199-g3d85152
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 3d8515215ebb7d424798583fa27d5168660dfa72 (commit) via 826a087d450237abc912d8498f2a7aeeb815065e (commit) via 256e0dde5c8b5a5af9ab950ad69c7b788c6672ce (commit) via 31f8deabd2a8f1730a11b4093e1efb144cd02041 (commit) via 74cb4ab793b6e59aad8497f7facec9deb20be6ce (commit) via 6957a368ee4202a90be8c844173196660ad5a8c5 (commit) via 2c29f94eb6bef8a28bdcdecf1ad29958bf6a2b82 (commit) from 6daaf7bfa7a5cd9dac41d28860ff9569e54f0eb9 (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 3d8515215ebb7d424798583fa27d5168660dfa72 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:14:14 2011 +0200 and... at last... a compat script... commit 826a087d450237abc912d8498f2a7aeeb815065e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:12:22 2011 +0200 ... and more man pages for x2goserver-extensions package commit 256e0dde5c8b5a5af9ab950ad69c7b788c6672ce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:11:25 2011 +0200 ... and here the scripts x2gosessionlimit, x2golistsessions_root... commit 31f8deabd2a8f1730a11b4093e1efb144cd02041 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:10:23 2011 +0200 Just realized, that I forgot to re-add many files after the /bin -> /lib migration in x2goserver source tree... So here come the man pages... commit 74cb4ab793b6e59aad8497f7facec9deb20be6ce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:09:24 2011 +0200 Change X2go printing concept: use setgit and a sgid wrapper instead of sudo. commit 6957a368ee4202a90be8c844173196660ad5a8c5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 09:06:12 2011 +0200 Create x2goprint user/group on package installation, add same info to INSTALL howto. Change permissions on x2goprint, using 2755:root:x2goprint (setgid). commit 2c29f94eb6bef8a28bdcdecf1ad29958bf6a2b82 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 08:09:18 2011 +0200 Spelling fix for error message. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 + debian/x2goserver.postinst | 45 +++++++++++++++++++- .../bin}/x2gosuspend-agent | 2 +- .../x2gosetkeyboard.1 => man8/x2gosetkeyboard.8} | 2 +- .../man/{man1/x2goversion.1 => man8/x2goversion.8} | 2 +- x2goserver/{sbin => lib}/x2golistsessions_root | 8 ++-- x2goserver/{bin/x2goprint => lib/x2goprint.pl} | 0 x2goserver/{bin => lib}/x2gosessionlimit | 0 .../x2gocmdexitmessage.8} | 2 +- .../x2golistdesktops.1 => man8/x2golistdesktops.8} | 2 +- .../x2golistsessions.1 => man8/x2golistsessions.8} | 2 +- .../{man1/x2gomountdirs.1 => man8/x2gomountdirs.8} | 2 +- .../man/{man1/x2goprint.1 => man8/x2goprint.8} | 2 +- .../x2goresume-session.8} | 2 +- .../x2goruncommand.1 => man8/x2goruncommand.8} | 2 +- .../x2goruncommand.1 => man8/x2goshowblocks.8} | 2 +- .../x2gostartagent.1 => man8/x2gostartagent.8} | 2 +- .../x2gosuspend-session.8} | 2 +- .../x2goterminate-session.8} | 2 +- .../x2goumount-session.8} | 2 +- x2goserver/{x2gosqlitewrapper.c => x2goprint.c} | 12 +++--- x2goserver/x2gosqlitewrapper.c | 2 +- 22 files changed, 73 insertions(+), 27 deletions(-) copy {x2goserver/lib => x2goserver-compat/bin}/x2gosuspend-agent (94%) copy x2goserver-extensions/man/{man1/x2gosetkeyboard.1 => man8/x2gosetkeyboard.8} (92%) copy x2goserver-extensions/man/{man1/x2goversion.1 => man8/x2goversion.8} (93%) copy x2goserver/{sbin => lib}/x2golistsessions_root (87%) rename x2goserver/{bin/x2goprint => lib/x2goprint.pl} (100%) copy x2goserver/{bin => lib}/x2gosessionlimit (100%) copy x2goserver/man/{man1/x2gocmdexitmessage.1 => man8/x2gocmdexitmessage.8} (87%) copy x2goserver/man/{man1/x2golistdesktops.1 => man8/x2golistdesktops.8} (87%) copy x2goserver/man/{man1/x2golistsessions.1 => man8/x2golistsessions.8} (87%) copy x2goserver/man/{man1/x2gomountdirs.1 => man8/x2gomountdirs.8} (87%) copy x2goserver/man/{man1/x2goprint.1 => man8/x2goprint.8} (87%) copy x2goserver/man/{man1/x2goresume-session.1 => man8/x2goresume-session.8} (88%) copy x2goserver/man/{man1/x2goruncommand.1 => man8/x2goruncommand.8} (87%) copy x2goserver/man/{man1/x2goruncommand.1 => man8/x2goshowblocks.8} (87%) copy x2goserver/man/{man1/x2gostartagent.1 => man8/x2gostartagent.8} (93%) copy x2goserver/man/{man1/x2gosuspend-session.1 => man8/x2gosuspend-session.8} (88%) copy x2goserver/man/{man1/x2goterminate-session.1 => man8/x2goterminate-session.8} (88%) copy x2goserver/man/{man1/x2goumount-session.1 => man8/x2goumount-session.8} (88%) copy x2goserver/{x2gosqlitewrapper.c => x2goprint.c} (83%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index df05592..2739a45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Fix for TERMINAL command execution if konsole (KDE4) is installed on the server (closes upstream issue #87). * Silence x2golistsessions on missing session.log files. + * Create x2goprint user/group on package installation, add same info to INSTALL howto. + * Change permissions on x2goprint, using 2755:root:x2goprint (setgid). + * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 76cae94..f856e86 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -25,6 +25,10 @@ case "$1" in touch /etc/x2go/x2gosql/passwords/pgadmin chmod 600 /etc/x2go/x2gosql/passwords/pgadmin + ### + ### X2go session DB management + ### + # setup x2gouser and group if ! getent group x2gouser >/dev/null; then echo "Creating x2gouser group." >&2 @@ -46,7 +50,7 @@ case "$1" in if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then usermod --move-home --home /var/lib/x2go x2gouser fi - # leave user shell alone. we have never set this wrongly + # we leave user shell alone. we have never set this wrongly # and we need to respect the administrator's choices fi @@ -61,6 +65,8 @@ case "$1" in chmod 0660 /var/lib/x2go/x2go_sessions fi + ### setgid section for x2gouser (SQLite DB access) + # we may be upgrading versions of x2goserver that had # /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper.pl >/dev/null; then @@ -80,8 +86,45 @@ case "$1" in if ! dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper fi + + ### + ### X2go printing + ### + + # setup x2goprint user and x2goprint group + if ! getent group x2goprint >/dev/null; then + echo "Creating x2goprint group." >&2 + addgroup --system x2goprint + else + echo "Group x2goprint already exists." >&2 + fi + if ! getent passwd x2goprint >/dev/null; then + echo "Creating x2goprint user." >&2 + adduser --system --no-create-home \ + --disabled-password --disabled-login \ + --shell /bin/false --group --home /var/spool/x2goprint x2goprint + else + echo "User x2goprint already exists." >&2 + # make sure all settings are appropriate + if [ "`id -gn x2gprint`" != "x2goprint" ]; then + usermod --gid x2goprint# x2goprint + fi + if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then + usermod --move-home --home /var/spool/x2goprint x2goprint + fi + # we leave user shell alone. we have never set this wrongly + # and we need to respect the administrator's choices + fi + + ### setgid section for x2goprint (X2go printing) + + # the x2goprint command can only be run by users that are in group x2goprint + if ! dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then + dpkg-statoverride --add --update root x2goprint 2755 /usr/bin/x2goprint + fi ;; + abort-upgrade|abort-remove|abort-deconfigure) ;; diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent similarity index 94% copy from x2goserver/lib/x2gosuspend-agent copy to x2goserver-compat/bin/x2gosuspend-agent index 272d819..9ca6d4f 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver-compat/bin/x2gosuspend-agent @@ -27,4 +27,4 @@ shift; my $capt=shift; my @words=split(" ",$capt); -system("x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file +system("/usr/bin/x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file diff --git a/x2goserver-extensions/man/man1/x2gosetkeyboard.1 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 similarity index 92% copy from x2goserver-extensions/man/man1/x2gosetkeyboard.1 copy to x2goserver-extensions/man/man8/x2gosetkeyboard.8 index f9e0f1f..702155f 100644 --- a/x2goserver-extensions/man/man1/x2gosetkeyboard.1 +++ b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 1 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" +.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client .SH SYNOPSIS diff --git a/x2goserver-extensions/man/man1/x2goversion.1 b/x2goserver-extensions/man/man8/x2goversion.8 similarity index 93% copy from x2goserver-extensions/man/man1/x2goversion.1 copy to x2goserver-extensions/man/man8/x2goversion.8 index a930ceb..bb07d83 100644 --- a/x2goserver-extensions/man/man1/x2goversion.1 +++ b/x2goserver-extensions/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 1 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" +.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" .SH NAME x2goversion \- Retrieve Code Versions of X2go Server Components .SH SYNOPSIS diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root similarity index 87% copy from x2goserver/sbin/x2golistsessions_root copy to x2goserver/lib/x2golistsessions_root index df92ff5..1e60493 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/lib/x2golistsessions_root @@ -1,4 +1,5 @@ #!/usr/bin/perl + # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify @@ -35,8 +36,6 @@ sub check_stat return 1; } -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; - my $uname; my $serv=shift; @@ -45,7 +44,8 @@ if ( ! $serv) $serv=hostname; } -my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`; +my $outp=`x2golistsessions_sql $serv 2>/dev/null`; + my @outp=split("\n","$outp"); @@ -62,7 +62,7 @@ for (my $i=0;$i<@outp;$i++) { if (!check_stat(@sinfo[1],@sinfo[11])) { - system("su - @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); + system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); @outp[$i] =~ s/\|R\|/\|S\|/; } } diff --git a/x2goserver/bin/x2goprint b/x2goserver/lib/x2goprint.pl similarity index 100% rename from x2goserver/bin/x2goprint rename to x2goserver/lib/x2goprint.pl diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/lib/x2gosessionlimit similarity index 100% copy from x2goserver/bin/x2gosessionlimit copy to x2goserver/lib/x2gosessionlimit diff --git a/x2goserver/man/man1/x2gocmdexitmessage.1 b/x2goserver/man/man8/x2gocmdexitmessage.8 similarity index 87% copy from x2goserver/man/man1/x2gocmdexitmessage.1 copy to x2goserver/man/man8/x2gocmdexitmessage.8 index 1c28470..14681ba 100644 --- a/x2goserver/man/man1/x2gocmdexitmessage.1 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goexitmessage \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2golistdesktops.1 b/x2goserver/man/man8/x2golistdesktops.8 similarity index 87% copy from x2goserver/man/man1/x2golistdesktops.1 copy to x2goserver/man/man8/x2golistdesktops.8 index c1bab38..1436bda 100644 --- a/x2goserver/man/man1/x2golistdesktops.1 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2golistdesktops 8 "July 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2golistdesktops \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2golistsessions.1 b/x2goserver/man/man8/x2golistsessions.8 similarity index 87% copy from x2goserver/man/man1/x2golistsessions.1 copy to x2goserver/man/man8/x2golistsessions.8 index 7dfd17d..54f85b3 100644 --- a/x2goserver/man/man1/x2golistsessions.1 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2golistsessions 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2golistsessions \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2gomountdirs.1 b/x2goserver/man/man8/x2gomountdirs.8 similarity index 87% copy from x2goserver/man/man1/x2gomountdirs.1 copy to x2goserver/man/man8/x2gomountdirs.8 index f8bb5f8..fec5c97 100644 --- a/x2goserver/man/man1/x2gomountdirs.1 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gomountdirs 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2gomountdirs \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2goprint.1 b/x2goserver/man/man8/x2goprint.8 similarity index 87% copy from x2goserver/man/man1/x2goprint.1 copy to x2goserver/man/man8/x2goprint.8 index d1e09c2..542aa2c 100644 --- a/x2goserver/man/man1/x2goprint.1 +++ b/x2goserver/man/man8/x2goprint.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goprint 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goprint \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2goresume-session.1 b/x2goserver/man/man8/x2goresume-session.8 similarity index 88% copy from x2goserver/man/man1/x2goresume-session.1 copy to x2goserver/man/man8/x2goresume-session.8 index f12d0a9..f18f421 100644 --- a/x2goserver/man/man1/x2goresume-session.1 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goresume-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goresume-session \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2goruncommand.1 b/x2goserver/man/man8/x2goruncommand.8 similarity index 87% copy from x2goserver/man/man1/x2goruncommand.1 copy to x2goserver/man/man8/x2goruncommand.8 index 145b238..370d907 100644 --- a/x2goserver/man/man1/x2goruncommand.1 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goruncommand 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goruncommand \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2goruncommand.1 b/x2goserver/man/man8/x2goshowblocks.8 similarity index 87% copy from x2goserver/man/man1/x2goruncommand.1 copy to x2goserver/man/man8/x2goshowblocks.8 index 145b238..370d907 100644 --- a/x2goserver/man/man1/x2goruncommand.1 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goruncommand 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goruncommand \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2gostartagent.1 b/x2goserver/man/man8/x2gostartagent.8 similarity index 93% copy from x2goserver/man/man1/x2gostartagent.1 copy to x2goserver/man/man8/x2gostartagent.8 index 16f0a8c..6a84a72 100644 --- a/x2goserver/man/man1/x2gostartagent.1 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2gostartagent \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2gosuspend-session.1 b/x2goserver/man/man8/x2gosuspend-session.8 similarity index 88% copy from x2goserver/man/man1/x2gosuspend-session.1 copy to x2goserver/man/man8/x2gosuspend-session.8 index aeee450..ec4aa2c 100644 --- a/x2goserver/man/man1/x2gosuspend-session.1 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gosuspend-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2gosuspend-session \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2goterminate-session.1 b/x2goserver/man/man8/x2goterminate-session.8 similarity index 88% copy from x2goserver/man/man1/x2goterminate-session.1 copy to x2goserver/man/man8/x2goterminate-session.8 index 60f53fa..2bfcce8 100644 --- a/x2goserver/man/man1/x2goterminate-session.1 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goterminate-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goterminate-session \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/man/man1/x2goumount-session.1 b/x2goserver/man/man8/x2goumount-session.8 similarity index 88% copy from x2goserver/man/man1/x2goumount-session.1 copy to x2goserver/man/man8/x2goumount-session.8 index baef86b..8e8fe0d 100644 --- a/x2goserver/man/man1/x2goumount-session.1 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goumount-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME x2goumount-session \- X2go Server Script .SH SYNOPSIS diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2goprint.c similarity index 83% copy from x2goserver/x2gosqlitewrapper.c copy to x2goserver/x2goprint.c index 63320f1..8f177ca 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2goprint.c @@ -31,7 +31,7 @@ int main( int argc, char *argv[] ) { - char * x2gosqlitewrapper = NULL; + char * x2goprint = NULL; size_t path_max; /* @@ -58,13 +58,13 @@ int main( int argc, char *argv[] ) { exit(EXIT_FAILURE); } if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is to long (> %i)", 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"); + // derive the full path of x2goprint.pl from path of this binary + rvap = asprintf(&x2goprint, "%s/../lib/x2go/%s", dirname(buffer), "x2goprint.pl"); if(rvap == -1){ fprintf(stderr, "Failed to allocate memory calling asprintf\n"); exit(EXIT_FAILURE); @@ -72,12 +72,12 @@ int main( int argc, char *argv[] ) { // execute the script, running with user-rights of this binary - execv(x2gosqlitewrapper, argv); + execv(x2goprint, argv); } // ...fail - fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); + fprintf(stderr, "Failed to execute %s: %s\n", x2goprint, strerror(errno)); return EXIT_FAILURE; } diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index 63320f1..95e2a8a 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -58,7 +58,7 @@ int main( int argc, char *argv[] ) { exit(EXIT_FAILURE); } if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is to long (> %i)", 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); } 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

x2gothinclient.git - master (branch) updated: 7644a08988d56df5afa229ed8e67c59a0b923bf2
by git-admin＠x2go.org 29 Aug '11

29 Aug '11

The branch, master has been updated via 7644a08988d56df5afa229ed8e67c59a0b923bf2 (commit) from 29884c0ea40aeb6664be0f2e2b83305584da321b (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 7644a08988d56df5afa229ed8e67c59a0b923bf2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 29 22:46:21 2011 +0200 semikolon fixes... ----------------------------------------------------------------------- Summary of changes: x2gothinclient/sbin/x2gothinclientd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 2ba42ca..9efdb7d 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -90,14 +90,14 @@ elsif ($pid == 0 ) while(sleep 1) { - my $thinshutdown_delay = 4 + my $thinshutdown_delay = 4; # test if XServer is running, if not launch it... if ( check_x() ==0 ) { system("/usr/bin/Xorg -br &"); # delay appearance of thinshutdown button a little longer on X server (re)start - $thinshutdown_delay = 10 + $thinshutdown_delay = 10; } # test if pulseaudio is running, if not launch it... hooks/post-receive -- x2gothinclient.git (X2go Thin Client Environment) 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 "x2gothinclient.git" (X2go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 29884c0ea40aeb6664be0f2e2b83305584da321b
by git-admin＠x2go.org 29 Aug '11

29 Aug '11

The branch, master has been updated via 29884c0ea40aeb6664be0f2e2b83305584da321b (commit) via 93121f78c4aa8fdb055220937d1c38d3b3fa3f5c (commit) from e3988859da138f3295a712ebbc9cd88cd651783a (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 29884c0ea40aeb6664be0f2e2b83305584da321b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 29 10:21:08 2011 +0200 Delay thinshutdown button appearance for 6 more seconds on X server (re)start (that is: 10s on tce start or X server restart and 4s after session logout). commit 93121f78c4aa8fdb055220937d1c38d3b3fa3f5c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Aug 18 12:10:01 2011 +0200 Use --no-session-edit option when starting x2goclient on TCE. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2gothinclient/sbin/x2gothinclientd | 6 +++++- .../share/x2gothinclient_start | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 623f06e..a52edad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,10 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Move kernel/initrd symlinks after install rather than copying. * Add detection of kernel upgrades to x2gothinclient_upgrade script. * Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs. + * Use --no-session-edit option when starting x2goclient on TCE. + * Delay thinshutdown button appearance for 6 more seconds on X server + (re)start (that is: 10s on tce start or X server restart and 4s after session + logout). [Coco] * Replace tmpfs mount on /etc/network/run with symlink /etc/network/run -> /dev/shm. diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 63e3984..2ba42ca 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -90,10 +90,14 @@ elsif ($pid == 0 ) while(sleep 1) { + my $thinshutdown_delay = 4 + # test if XServer is running, if not launch it... if ( check_x() ==0 ) { system("/usr/bin/Xorg -br &"); + # delay appearance of thinshutdown button a little longer on X server (re)start + $thinshutdown_delay = 10 } # test if pulseaudio is running, if not launch it... @@ -123,7 +127,7 @@ elsif ($pid == 0 ) } if ( !$SHUTD && !$PROXY && $CLIENT) { - system("sleep 4; DISPLAY=:0 thinshutdown &"); + system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &"); } ## wait for x2goclient to finish diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index 90158cd..68c4a05 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -28,6 +28,7 @@ --set-kbd=1 \ --geometry=fullscreen \ --read-exports-from=/home/x2goclient/export \ + --no-session-edit \ --add-to-known-hosts & # for use with LDAP on Skolelinux network hooks/post-receive -- x2gothinclient.git (X2go Thin Client Environment) 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 "x2gothinclient.git" (X2go Thin Client Environment).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-11-g66ceeab
by git-admin＠x2go.org 25 Aug '11

25 Aug '11

The branch, master has been updated via 66ceeab13cba84ed0e23e09310465d9bb3c184fc (commit) from 0b36c971b50eafced979f4656caeb214292b681c (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 66ceeab13cba84ed0e23e09310465d9bb3c184fc Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Thu Aug 25 13:46:51 2011 +0200 * fixed reading deprecated /etc/x2go/sql * fixed saving temprary file in / instead of /tmp ----------------------------------------------------------------------- Summary of changes: cups-x2go | 12 +++--------- debian/changelog | 5 +++++ 2 files changed, 8 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 771eecd..853599f 100755 --- a/cups-x2go +++ b/cups-x2go @@ -69,13 +69,7 @@ sub getsessions my $sesslist; if ( $x2goserver eq "local" ) { - open (SQLCONF, "</etc/x2go/sql"); - my $cfgline=<SQLCONF>; - close (SQLCONF); - if(($cfgline=~m/local/)||($cfgline=~m/sqlite/)) - { - $sesslist=`su $userName -c "x2golistsessions --all-servers"`; - } + $sesslist=`su $userName -c "x2golistsessions --all-servers"`; } else { @@ -92,7 +86,7 @@ sub printfile if($phost eq $host) { my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$spooldir)=getpwnam("x2goprint"); - my $spfile="$spooldir$sess$bname"; + my $spfile="$spooldir/$sess$bname"; copy($pfile, $spfile); copy($tfile, "$spfile.title"); chown $uid,$gid,$spfile; @@ -135,7 +129,7 @@ if (!$printFile) my $uid = $userName; $jid =~ s/\W//g; #sanity check $uid =~ s/\W//g; #sanity check - $tempFile = "$ENV{TMPDIR}/$jid-$uid-cupsjob$$"; + $tempFile = "/tmp/$jid-$uid-cupsjob$$"; open (OUT, ">$tempFile") or die "ERROR: Cannot write $tempFile: $!\n"; while(<STDIN>) { diff --git a/debian/changelog b/debian/changelog index 6bfa28b..6f8e439 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low + [ Mike Gabriel ] * Add dpkg-statoverride for CUPS backend cups-x2go, file permission 0700 on CUPS backend makes CUPS run this backend with root-privileges which is needed for cups-x2go to work. + [ Oleksandr Shneyder ] + * fixed reading deprecated /etc/x2go/sql + * fixed saving temprary file in / instead of /tmp + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 07 Jul 2011 00:05:46 +0200 cups-x2go (3.0.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-192-g6daaf7b
by git-admin＠x2go.org 22 Aug '11

22 Aug '11

The branch, master has been updated via 6daaf7bfa7a5cd9dac41d28860ff9569e54f0eb9 (commit) from 3aefc4614f1abd4e1fa7f0d6c86c968f519e88c7 (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 6daaf7bfa7a5cd9dac41d28860ff9569e54f0eb9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 22 23:29:54 2011 +0200 Fixing x2goserver.postinst ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 227fbe4..76cae94 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -70,11 +70,10 @@ case "$1" in fi # we may be upgrading versions of x2goserver that had - # /usr/bin/x2gosqlitewrapper set to setuid or setgid x2gouser. + # /usr/bin/x2gosqlitewrapper set to setuid or setgid x2gouser, the script itself is + # at this location anymore, we just clear the dpkg-statoverride config entry. if dpkg-statoverride --list /usr/bin/x2gosqlitewrapper >/dev/null; then dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper - chown root:root /usr/bin/x2gosqlitewrapper - chmod 0755 /usr/bin/x2gosqlitewrapper fi # the sqlite db has to be accessed as uid x2gouser 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2011