This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 2af6ff8 debian/po: minor fixup on author name. new 8309f4a debian/control: resurrect x2go{thinclient-management,usbmount,cdmanager,smartcardrules} as dummy packages in the spirit of x2gothinclient for a smooth upgrade path. new 3ade983 usbmount/x2gousbmount: make user pseudo-selectible via a variable and fix usage across file. new 743683b debian/changelog: fixup only. new ea055a2 usbmount/x2gousbmount: update copyright notice. new 44b8652 usbmount/x2gousbmount: try to create file-sharing facilities harder. new c500f90 usbmount/x2gousbmount: fix desktop/thinclient mode detection. Fixes: #1136. The 6 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 | 11 +++++++- debian/control | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ usbmount/x2gousbmount | 73 +++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 147 insertions(+), 13 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 8309f4a45fdba2b7a2f22cb5271be725bc7abc4c Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Apr 25 22:03:17 2017 +0200 debian/control: resurrect x2go{thinclient-management,usbmount,cdmanager,smartcardrules} as dummy packages in the spirit of x2gothinclient for a smooth upgrade path. --- debian/changelog | 3 +++ debian/control | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/debian/changelog b/debian/changelog index fa9dbc3..598574d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,9 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed versioning. + - Resurrect x2go{thinclient-management,usbmount,cdmanager,smartcardrules} + as dummy packages in the spirit of x2gothinclient for a smooth upgrade + path. * debian/po: - Minor fixup on author name. diff --git a/debian/control b/debian/control index f2c8604..02a4af0 100644 --- a/debian/control +++ b/debian/control @@ -50,6 +50,25 @@ Description: Management tools for X2Go Thin Client chroot server For chroot servers we recommend a very separate machine (not your main server on your network) that only serves this purpose. +Package: x2gothinclientmanagement +Architecture: all +Depends: + ${misc:Depends}, + x2gothinclient-management (>= ${source:Version}), +Description: temporary dependency package for migration to x2gothinclient-management + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session broker support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2gothinclientmanagement: + --------------- + This package is a temporary migration package and will be deprecated soon. + Package: x2gothinclient-chroot Architecture: all Depends: @@ -265,6 +284,25 @@ Description: clientside usb mass-storage device mounting This package adds client-side USB mass storage device mounting using UDEV rules to your X2Go Thin Client. +Package: x2gousbmount +Architecture: all +Depends: + ${misc:Depends}, + x2gothinclient-usbmount (>= ${source:Version}), +Description: temporary dependency package for migration to x2gothinclient-usbmount + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session broker support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2gousbmount: + --------------- + This package is a temporary migration package and will be deprecated soon. + Package: x2gothinclient-cdmanager Architecture: any Depends: @@ -295,6 +333,25 @@ Description: clientside daemon enabling automatic CD-Rom mounting This package adds a client-side daemon to your X2Go Thin Client that enables automatic CD-ROM mounting within Thin Client X2Go sessions. +Package: x2gocdmanager +Architecture: all +Depends: + ${misc:Depends}, + x2gothinclient-cdmanager (>= ${source:Version}), +Description: temporary dependency package for migration to x2gothinclient-cdmanager + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session broker support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2gocdmanager: + --------------- + This package is a temporary migration package and will be deprecated soon. + Package: x2gothinclient-smartcardrules Architecture: all Depends: @@ -321,3 +378,22 @@ Description: UDEV rules for smartcard readers . This package provides UDEV rules for smartcard readers (devices that serve the purpose of ID-card based authentication). + +Package: x2gosmartcardrules +Architecture: all +Depends: + ${misc:Depends}, + x2gothinclient-smartcardrules (>= ${source:Version}), +Description: temporary dependency package for migration to x2gothinclient-smartcardrules + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session broker support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2gosmartcardrules: + --------------- + This package is a temporary migration package and will be deprecated soon. -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 3ade983456add8596fb3a1a679f9530bacf48c80 Author: Stefan Baur <X2Go-ML-1@baur-itcs.de> Date: Tue Apr 25 22:27:59 2017 +0200 usbmount/x2gousbmount: make user pseudo-selectible via a variable and fix usage across file. --- debian/changelog | 2 ++ usbmount/x2gousbmount | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 598574d..573e2df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low [ Stefan Baur ] * New upstream release (1.5.0.0): - Allow Xinerama / XRandR setup via /proc/cmdline. (Closes: #726). + * usbmount/x2gousbmount: + - Make user pseudo-selectible via a variable and fix usage across file. [ Mark Pedersen-Cook ] * debian/po: diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount index 4da1fbd..be0e7b2 100755 --- a/usbmount/x2gousbmount +++ b/usbmount/x2gousbmount @@ -22,6 +22,13 @@ use strict; use File::Path::Expand; use Sys::Syslog qw( :standard :macros ); +my $user; +if ( -d "/lib/live/config" ) { + $user='user'; +} else { + $user='x2gothinclient'; +} + openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(LOG_NOTICE) ); @@ -45,9 +52,11 @@ if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop my $action=$ENV{'ACTION'}; my @ldev=split("/","$dev"); my $ldev=@ldev[@ldev-1]; + # mntdir is not the directory where the mountpoint will be rooted, + # but where tracking of mount states takes place my $mntdir; - if ( -d expand_filename("~/mounts")) { - $mntdir=expand_filename("~/mounts"); + if ( -d expand_filename("~$user/mounts")) { + $mntdir=expand_filename("~$user/mounts"); } elsif ( -d "/var/run" ) { $mntdir="/var/run"; } elsif ( -d "/run" ) { @@ -80,12 +89,12 @@ if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop mkdir("/media/$name/$ldev"); # mount the USB device - if(system("mount $dev /media/$name/$ldev -o uid=x2gothinclient,sync,uni_xlate")==0) + if(system("mount $dev /media/$name/$ldev -o uid=$user,sync,uni_xlate")==0) { syslog('notice', "USB device $name ($ldev) successfully mounted"); # if mounted, inform x2goclient about it... system("touch $mntdir/$ldev.mounted"); - open (D,">",expand_filename("~x2gothinclient/export/$name.$ldev")); + open (D,">",expand_filename("~$user/export/$name.$ldev")); print D "export=/media/$name/$ldev\n"; close (D); } @@ -103,8 +112,8 @@ if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop { # inform x2goclient about this... system("touch $mntdir/$ldev.encrypted"); - system("chown -R x2gothinclient /media/$name/$ldev/dsa.key"); - open (D,">",expand_filename("~/x2gothinclient/logins/$name.$ldev")); + system("chown -R $user /media/$name/$ldev/dsa.key"); + open (D,">",expand_filename("~$user/logins/$name.$ldev")); print D "login=/media/$name/$ldev\n"; close (D); } @@ -135,7 +144,7 @@ if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop # inform x2goclient that the device has been removed system ("umount -ff /media/$name/$ldev"); unlink ("$mntdir/$ldev.mounted"); - open ( D,">",expand_filename("~x2gothinclient/export/$name.$ldev.unexport")); + open ( D,">",expand_filename("~$user/export/$name.$ldev.unexport")); print D "unexport=/media/$name/$ldev\n"; close (D); syslog('notice', "USB device $name ($ldev) successfully unmounted"); @@ -145,7 +154,7 @@ if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop # inform x2goclient that the device has been removed # release the encrypted device mapping unlink ("$mntdir/$ldev.encrypted"); - open ( D,">",expand_filename("~/x2gothinclient/logins/$name.$ldev.unexport")); + open ( D,">",expand_filename("~$user/logins/$name.$ldev.unexport")); print D "logout=/media/$name/$ldev\n"; system("umount /media/$name/$ldev"); system("/sbin/cryptsetup luksClose keystick"); -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit ea055a2ac74a8060cb43f168095a2acb55f20f64 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Apr 25 22:29:11 2017 +0200 usbmount/x2gousbmount: update copyright notice. --- debian/changelog | 1 + usbmount/x2gousbmount | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9b3867b..559558e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -105,6 +105,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low several lines and concatenate them. * usbmount/x2gousbmount: - Fix typo int -> print. Fixes: #840. + - Update copyright notice. * debian/control: - Whitespace only. - x2gothinclient-cdmanager: drop libqt4-gui Depends. Already handled by diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount index be0e7b2..da9e1a5 100755 --- a/usbmount/x2gousbmount +++ b/usbmount/x2gousbmount @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2015 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2007-2017 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # X2Go is free software; you can redistribute it and/or modify -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 743683b43198ec087a8754c7113a94a3a07dc22b Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Apr 25 22:28:45 2017 +0200 debian/changelog: fixup only. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 573e2df..9b3867b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,7 +103,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low continue commented out command on the next line. Fixes: #1147. - displaymanager/sbin/x2gothinclientd: correctly break long strings over several lines and concatenate them. - * usbmount/x2gousbmount: fix typo int -> print. Fixes: #840. + * usbmount/x2gousbmount: + - Fix typo int -> print. Fixes: #840. * debian/control: - Whitespace only. - x2gothinclient-cdmanager: drop libqt4-gui Depends. Already handled by -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 44b86525be59cf087c26b9d7dca5d225cc2087cc Author: Stefan Baur <X2Go-ML-1@baur-itcs.de> Date: Tue Apr 25 22:33:30 2017 +0200 usbmount/x2gousbmount: try to create file-sharing facilities harder. --- debian/changelog | 1 + usbmount/x2gousbmount | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index 559558e..03a6502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low - Allow Xinerama / XRandR setup via /proc/cmdline. (Closes: #726). * usbmount/x2gousbmount: - Make user pseudo-selectible via a variable and fix usage across file. + - Try to create file-sharing facilities harder. [ Mark Pedersen-Cook ] * debian/po: diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount index da9e1a5..5b4d2df 100755 --- a/usbmount/x2gousbmount +++ b/usbmount/x2gousbmount @@ -29,6 +29,34 @@ if ( -d "/lib/live/config" ) { $user='x2gothinclient'; } +# We need this as chown requires numeric uid/gid +my ($login,$pass,$uid,$gid) = getpwnam($user); + +# Some last-ditch efforts to fulfill the prerequisites for File Sharing: +# - This is stuff that should already have happened earlier in the boot process. +# - Also, if a directory already exists, we silently assume that ownership and +# permissions are correct. This is so that users that deliberately set +# different ownership/permission values don't have their settings silently +# overwritten. + +unless ( -d expand_filename("~$user/mounts")) { + mkdir expand_filename("~$user/mounts"); + chmod 0700, expand_filename("~$user/mounts"); + chown $uid, $gid, expand_filename("~$user/mounts"); +} + +unless ( -d expand_filename("~$user/export")) { + mkdir expand_filename("~$user/export"); + chmod 0700, expand_filename("~$user/export"); + chown $uid, $gid, expand_filename("~$user/export"); +} + +unless ( -d expand_filename("~$user/logins")) { + mkdir expand_filename("~$user/logins"); + chmod 0700, expand_filename("~$user/logins"); + chown $uid, $gid, expand_filename("~$user/logins"); +} + openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(LOG_NOTICE) ); -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit c500f9075111a47796f5c5ac8f0846500956d518 Author: Stefan Baur <X2Go-ML-1@baur-itcs.de> Date: Tue Apr 25 22:41:32 2017 +0200 usbmount/x2gousbmount: fix desktop/thinclient mode detection. Fixes: #1136. --- debian/changelog | 1 + usbmount/x2gousbmount | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03a6502..2ed8f9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * usbmount/x2gousbmount: - Make user pseudo-selectible via a variable and fix usage across file. - Try to create file-sharing facilities harder. + - Fix desktop/thinclient mode detection. Fixes: #1136. [ Mark Pedersen-Cook ] * debian/po: diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount index 5b4d2df..d1d5a45 100755 --- a/usbmount/x2gousbmount +++ b/usbmount/x2gousbmount @@ -61,15 +61,27 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(LOG_NOTICE) ); sub check_x2gothinclientd { + my $ret = 0; + + # Check for x2gothinclientd first... my $x=`ps ax | grep x2gothinclient`; if ( $x=~m/thinclientd/ ) { - return 1; + $ret = 1; + } + + # And for x2goclient --thinclient if nothing was found. + if (!$ret) { + $x=`ps u -C x2goclient`; + if ( $x=~m/\W*--thinclient\W*/ ) + { + $ret = 1; + } } - return 0; + return $ret; } -if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop" ) ) +if ( check_x2gothinclientmode() || ( -x "/etc/x2go/x2gothinclient-minidesktop_start" ) ) { open (F,">>/var/log/usb"); -- Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org