This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit aaa17c42d5b26c561ed9781d6f6dec796cf0429a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:33:27 2018 +0100 New bin:pkg: x2goserver-desktopsharing. Move all desktop sharing integration logic from x2godesktopsharing to x2goserver src:pkg. --- Makefile | 7 + debian/changelog | 2 + debian/control | 28 +++ debian/copyright | 16 ++ debian/po/da.po | 181 +++++++++++++++++- debian/po/de.po | 202 ++++++++++++++++++++- debian/po/fi.po | 170 ++++++++++++++++- debian/po/fr.po | 172 +++++++++++++++++- debian/po/templates.pot | 172 +++++++++++++++++- debian/po/tr.po | 168 ++++++++++++++++- debian/templates | 84 +++++++++ debian/x2goserver-desktopsharing.config | 75 ++++++++ debian/x2goserver-desktopsharing.install | 4 + debian/x2goserver-desktopsharing.manpages | 1 + debian/x2goserver-desktopsharing.postinst | 101 +++++++++++ debian/x2goserver-desktopsharing.postrm | 44 +++++ x2goserver-desktopsharing/Makefile | 93 ++++++++++ .../VERSION.x2goserver-desktopsharing | 1 + .../bin/x2goresume-desktopsharing | 39 ++++ .../bin/x2gosuspend-desktopsharing | 34 ++++ .../bin/x2goterminate-desktopsharing | 60 ++++++ .../etc/desktopsharing/settings | 2 + .../man/man8/x2goresume-desktopsharing.8 | 28 +++ .../man/man8/x2gosuspend-desktopsharing.8 | 37 ++++ .../man/man8/x2goterminate-desktopsharing.8 | 30 +++ .../x2goserver-desktopsharing.features | 36 ++++ x2goserver.spec | 39 ++++ 27 files changed, 1801 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 31ad093..f100925 100755 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ build_man2html: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-desktopsharing $@ clean: -$(MAKE) -f Makefile.perl clean @@ -37,6 +38,7 @@ clean: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-desktopsharing $@ distclean: -$(MAKE) -f Makefile.perl realclean @@ -48,6 +50,7 @@ distclean: $(MAKE) -C x2goserver-extensions clean $(MAKE) -C x2goserver-xsession clean $(MAKE) -C x2goserver-fmbindings clean + $(MAKE) -C x2goserver-desktopsharing $@ build-arch: $(MAKE) -C x2goserver-common $@ @@ -58,6 +61,7 @@ build-arch: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-desktopsharing $@ build-indep: $(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS) @@ -70,6 +74,7 @@ build-indep: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-desktopsharing $@ install: $(MAKE) -f Makefile.perl pure_install @@ -81,11 +86,13 @@ install: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-desktopsharing $@ uninstall: $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-x2goagent $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-desktopsharing $@ $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -f Makefile.perl uninstall diff --git a/debian/changelog b/debian/changelog index bc8915f..1347e27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.0.3) - x2goserver.service: Add Documentation= key. - x2goserver/lib/x2gocheckport: chmod a+x. + - New bin:pkg: x2goserver-desktopsharing. Move all desktop sharing + integration logic from x2godesktopsharing to x2goserver src:pkg. * debian/x2goserver*.dirs: + Let dirs have a trailing slash in their path (for the human eye merely). * debian/copyright: diff --git a/debian/control b/debian/control index 5b79c65..b275e11 100644 --- a/debian/control +++ b/debian/control @@ -333,3 +333,31 @@ Description: X2Go Server (Xsession runner) Amongst others the parsing of Xsession scripts will enable desktop-profiles, ssh-agent startups, gpgagent startups and many more Xsession related features on X2Go session login automagically. + +Package: x2goserver-desktopsharing +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + x2goserver (>= 4.0.0.0-0~), + x2godesktopsharing (>= 3.2.0.0~), +Breaks: x2godesktopsharing (<< 3.2.0.0~), +Replaces: x2godesktopsharing (<< 3.2.0.0~), +Description: Share X11 desktops with other users via X2Go + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + X2Go Desktop Sharing is an X2Go add-on feature that allows a user to + grant other X2Go users access to the current session (shadow session + support). The user's current session may be an X2Go session itself or + simply a local X11 session. + . + This package contains all the integration and configuration logics + of a system-wide manageable desktop sharing setup. + diff --git a/debian/copyright b/debian/copyright index 47f5f14..7d2f083 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,6 +12,7 @@ Files: X2Go/Config.pm X2Go_in_progress_do_not_use/Server/DB/MySQL.pm X2Go/Server/DB/SQLite3.pm libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl + x2goserver-desktopsharing/share/x2gofeature.d/x2goserver-desktopsharing.features x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features x2goserver-printing/bin/x2goprint @@ -141,6 +142,15 @@ Copyright: 2007-2015, X2Go Project - http://wiki.x2go.org 2012-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL-2+ +Files: x2goserver-desktopsharing/bin/x2goresume-desktopsharing + x2goserver-desktopsharing/bin/x2gosuspend-desktopsharing + x2goserver-desktopsharing/bin/x2goterminate-desktopsharing +Copyright: 2007-2015, X2Go Project - http:wiki.x2go.org + 2011-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2011-2015, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ + Files: ChangeLog INSTALL Makefile @@ -157,6 +167,12 @@ Files: ChangeLog x2goserver-common/etc/x2goserver.conf x2goserver-common/etc/x2gosql/sql x2goserver-common/man/man5/x2goserver.conf.5 + x2goserver-desktopsharing/etc/desktopsharing/settings + x2goserver-desktopsharing/Makefile + x2goserver-desktopsharing/VERSION.x2goserver-desktopsharing + x2goserver-desktopsharing/man/man8/x2goresume-desktopsharing.8 + x2goserver-desktopsharing/man/man8/x2gosuspend-desktopsharing.8 + x2goserver-desktopsharing/man/man8/x2goterminate-desktopsharing.8 x2goserver-extensions/Makefile x2goserver-extensions/README.md x2goserver-extensions/VERSION.x2goserver-extensions diff --git a/debian/po/da.po b/debian/po/da.po index b059d90..f4fc695 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -15,10 +15,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" -"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"POT-Creation-Date: 2018-11-14 10:31+0100\n" "PO-Revision-Date: 2014-11-03 11:50+0100\n" "Last-Translator: Mark Pedersen-Cook <mark@fleten.net>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -48,12 +49,12 @@ msgstr "" #: ../templates:1001 msgid "" "Please follow these PostgreSQL DB upgrade instructions before you continue " -"using your X2Go Server: " -"/usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz" +"using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-" +"database.gz" msgstr "" "Venligst følg disse PostgreSQL DB opgraderings instruktioner før du " -"fortsætter med at bruge din X2Go Server: " -"/usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz" +"fortsætter med at bruge din X2Go Server: /usr/share/doc/x2goserver/README." +"upgrade-pgsql-database.gz" #. Type: text #. Description @@ -68,8 +69,8 @@ msgid "" "You are upgrading from an X2Go Server version (< 4.1.0.0). Between 4.1.0.0 " "and 4.0.0.x the package structure has undergone a major change." msgstr "" -"Du opgradere fra en X2Go Server Version (<4.1.0.0). Imellem 4.1.0.0 og " -"4.0.0.x har pakke strukturen fået store ændringer." +"Du opgradere fra en X2Go Server Version (<4.1.0.0). Imellem 4.1.0.0 og 4.0.0." +"x har pakke strukturen fået store ændringer." #. Type: text #. Description @@ -80,3 +81,169 @@ msgid "" msgstr "" "Bemærk, at det meste af Perl coden i X2Go Server er blevet flyttet ind i sin " "egen Perl API X2Go::Server." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing users gain the privilege to share one another's X2Go/" +"X11 desktop session by being members of a common POSIX group. The POSIX " +"group being used for this can be configured system-wide and on a per user " +"basis." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust what group to " +"use for this later on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created / not assigned, users will not be able to share " +"X2Go/X11 desktop sessions with each other." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"Please specify the name of the POSIX group that you want to assign the X2Go " +"Desktop Sharing privilege to." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"For an X2Go/X11 desktop session to be accessible via X2Go Desktop Sharing, " +"the X2Go Desktop Sharing applet needs to be running. It advertises the users " +"X2Go/X11 session through an access controlled socket to X2Go client " +"applications." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"The applet can be configured to start automatically on desktop session " +"startup, but for security reasons this is not the default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " +"that request to share the running desktop session get auto-rejected). The " +"user normally has to actively activate the sharing mode in the applet's GUI." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"If you enabled the auto-start option in the previous screen, you can " +"additionally choose here, if desktop sharing shall be activated when the " +"X2Go Desktop Sharing applet is auto-started at session logon." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"For security and data protection reasons, this is not the default. Use this " +"auto-activation feature only in appropriate environments (e.g. on class room " +"computers)." +msgstr "" diff --git a/debian/po/de.po b/debian/po/de.po index 6377a73..9aa8c6f 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" -"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"POT-Creation-Date: 2018-11-14 10:31+0100\n" "PO-Revision-Date: 2012-09-20 23:48+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,14 +33,25 @@ msgstr "X2Go Server / PostgreSQL Upgrade" #. Type: text #. Description #: ../templates:1001 -msgid "You have configured X2Go Server with PostgreSQL as session DB backend and you are upgrading x2goserver from a version minor to 3.1.0.0." -msgstr "Ihr X2Go Server nutzt eine PostgreSQL Datenbank, um X2Go Sitzungsdaten zu verwalten, und Sie aktualisieren gerade das Paket x2goserver von einer Version kleiner als 3.1.0.0." +msgid "" +"You have configured X2Go Server with PostgreSQL as session DB backend and " +"you are upgrading x2goserver from a version minor to 3.1.0.0." +msgstr "" +"Ihr X2Go Server nutzt eine PostgreSQL Datenbank, um X2Go Sitzungsdaten zu " +"verwalten, und Sie aktualisieren gerade das Paket x2goserver von einer " +"Version kleiner als 3.1.0.0." #. Type: text #. Description #: ../templates:1001 -msgid "Please follow these PostgreSQL DB upgrade instructions before you continue using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz" -msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor sie mit der Weiternutzung Ihres X2Go Servers fortfahren: /usr/share/doc/x2goserver/README.upgrade-pgsl-database.gz" +msgid "" +"Please follow these PostgreSQL DB upgrade instructions before you continue " +"using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-" +"database.gz" +msgstr "" +"Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor sie " +"mit der Weiternutzung Ihres X2Go Servers fortfahren: /usr/share/doc/" +"x2goserver/README.upgrade-pgsl-database.gz" #. Type: text #. Description @@ -51,12 +62,185 @@ msgstr "X2Go Server Upgrade" #. Type: text #. Description #: ../templates:2001 -msgid "You are upgrading from an X2Go Server version (< 4.1.0.0). Between 4.1.0.0 and 4.0.0.x the package structure has undergone a major change." -msgstr "Sie aktualisieren X2Go Server von einer Version (< 4.1.0.0). Seit 4.0.0.x wurde das Paket einigen strukturellen �nderungen unterzogen." +msgid "" +"You are upgrading from an X2Go Server version (< 4.1.0.0). Between 4.1.0.0 " +"and 4.0.0.x the package structure has undergone a major change." +msgstr "" +"Sie aktualisieren X2Go Server von einer Version (< 4.1.0.0). Seit 4.0.0.x " +"wurde das Paket einigen strukturellen �nderungen unterzogen." #. Type: text #. Description #: ../templates:2001 -msgid "Note that most of the Perl code in X2Go Server has been moved into its own Perl API X2Go::Server." -msgstr "Der gr��te Anteil des Perl Codes in X2Go Server ist migriert worden in die neue Perl API X2Go::Server." +msgid "" +"Note that most of the Perl code in X2Go Server has been moved into its own " +"Perl API X2Go::Server." +msgstr "" +"Der gr��te Anteil des Perl Codes in X2Go Server ist migriert worden in die " +"neue Perl API X2Go::Server." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing users gain the privilege to share one another's X2Go/" +"X11 desktop session by being members of a common POSIX group. The POSIX " +"group being used for this can be configured system-wide and on a per user " +"basis." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust what group to " +"use for this later on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created / not assigned, users will not be able to share " +"X2Go/X11 desktop sessions with each other." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"Please specify the name of the POSIX group that you want to assign the X2Go " +"Desktop Sharing privilege to." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" +#. Type: error +#. Description +#: ../templates:8001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"For an X2Go/X11 desktop session to be accessible via X2Go Desktop Sharing, " +"the X2Go Desktop Sharing applet needs to be running. It advertises the users " +"X2Go/X11 session through an access controlled socket to X2Go client " +"applications." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"The applet can be configured to start automatically on desktop session " +"startup, but for security reasons this is not the default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " +"that request to share the running desktop session get auto-rejected). The " +"user normally has to actively activate the sharing mode in the applet's GUI." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"If you enabled the auto-start option in the previous screen, you can " +"additionally choose here, if desktop sharing shall be activated when the " +"X2Go Desktop Sharing applet is auto-started at session logon." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"For security and data protection reasons, this is not the default. Use this " +"auto-activation feature only in appropriate environments (e.g. on class room " +"computers)." +msgstr "" diff --git a/debian/po/fi.po b/debian/po/fi.po index acccf12..0752b23 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -15,15 +15,15 @@ msgid "" msgstr "" "Project-Id-Version: X2Go\n" "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" -"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"POT-Creation-Date: 2018-11-14 10:31+0100\n" "PO-Revision-Date: 2017-10-04 12:44+0300\n" "Last-Translator: Martti Pitk�nen <martti@aplcomp.fi>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -"Language: fi\n" #. Type: text #. Description @@ -77,3 +77,169 @@ msgid "" msgstr "" "Suurin osa X2Go Serverin Perl koodista on siirretty sen omaan hostiin Perl " "API X2Go::Server." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing users gain the privilege to share one another's X2Go/" +"X11 desktop session by being members of a common POSIX group. The POSIX " +"group being used for this can be configured system-wide and on a per user " +"basis." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust what group to " +"use for this later on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created / not assigned, users will not be able to share " +"X2Go/X11 desktop sessions with each other." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"Please specify the name of the POSIX group that you want to assign the X2Go " +"Desktop Sharing privilege to." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"For an X2Go/X11 desktop session to be accessible via X2Go Desktop Sharing, " +"the X2Go Desktop Sharing applet needs to be running. It advertises the users " +"X2Go/X11 session through an access controlled socket to X2Go client " +"applications." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"The applet can be configured to start automatically on desktop session " +"startup, but for security reasons this is not the default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " +"that request to share the running desktop session get auto-rejected). The " +"user normally has to actively activate the sharing mode in the applet's GUI." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"If you enabled the auto-start option in the previous screen, you can " +"additionally choose here, if desktop sharing shall be activated when the " +"X2Go Desktop Sharing applet is auto-started at session logon." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"For security and data protection reasons, this is not the default. Use this " +"auto-activation feature only in appropriate environments (e.g. on class room " +"computers)." +msgstr "" diff --git a/debian/po/fr.po b/debian/po/fr.po index b4feaec..efdb41e 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" -"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"POT-Creation-Date: 2018-11-14 10:31+0100\n" "PO-Revision-Date: 2018-07-30 12:28+0200\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -61,8 +61,8 @@ msgid "" "and 4.0.0.x the package structure has undergone a major change." msgstr "" "Vous effectuez une mise à niveau à partir d'une version du serveur X2Go " -"(<4.1.0.0). Entre les versions 4.0.0.x et 4.1.0.0, la structure du paquet " -"a subi un changement majeur." +"(<4.1.0.0). Entre les versions 4.0.0.x et 4.1.0.0, la structure du paquet a " +"subi un changement majeur." #. Type: text #. Description @@ -73,3 +73,169 @@ msgid "" msgstr "" "Veuillez noter que l'essentiel du code de Perl dans le serveur X2Go a migré " "vers sa propre API Perl X2Go::Server." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing users gain the privilege to share one another's X2Go/" +"X11 desktop session by being members of a common POSIX group. The POSIX " +"group being used for this can be configured system-wide and on a per user " +"basis." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust what group to " +"use for this later on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created / not assigned, users will not be able to share " +"X2Go/X11 desktop sessions with each other." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"Please specify the name of the POSIX group that you want to assign the X2Go " +"Desktop Sharing privilege to." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"For an X2Go/X11 desktop session to be accessible via X2Go Desktop Sharing, " +"the X2Go Desktop Sharing applet needs to be running. It advertises the users " +"X2Go/X11 session through an access controlled socket to X2Go client " +"applications." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"The applet can be configured to start automatically on desktop session " +"startup, but for security reasons this is not the default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " +"that request to share the running desktop session get auto-rejected). The " +"user normally has to actively activate the sharing mode in the applet's GUI." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"If you enabled the auto-start option in the previous screen, you can " +"additionally choose here, if desktop sharing shall be activated when the " +"X2Go Desktop Sharing applet is auto-started at session logon." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"For security and data protection reasons, this is not the default. Use this " +"auto-activation feature only in appropriate environments (e.g. on class room " +"computers)." +msgstr "" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 082ae26..752ca17 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the x2goserver package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: x2goserver\n" "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" -"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"POT-Creation-Date: 2018-11-14 10:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -61,3 +61,169 @@ msgid "" "Note that most of the Perl code in X2Go Server has been moved into its own " "Perl API X2Go::Server." msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing users gain the privilege to share one another's X2Go/" +"X11 desktop session by being members of a common POSIX group. The POSIX " +"group being used for this can be configured system-wide and on a per user " +"basis." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust what group to " +"use for this later on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created / not assigned, users will not be able to share " +"X2Go/X11 desktop sessions with each other." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"Please specify the name of the POSIX group that you want to assign the X2Go " +"Desktop Sharing privilege to." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"For an X2Go/X11 desktop session to be accessible via X2Go Desktop Sharing, " +"the X2Go Desktop Sharing applet needs to be running. It advertises the users " +"X2Go/X11 session through an access controlled socket to X2Go client " +"applications." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"The applet can be configured to start automatically on desktop session " +"startup, but for security reasons this is not the default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " +"that request to share the running desktop session get auto-rejected). The " +"user normally has to actively activate the sharing mode in the applet's GUI." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"If you enabled the auto-start option in the previous screen, you can " +"additionally choose here, if desktop sharing shall be activated when the " +"X2Go Desktop Sharing applet is auto-started at session logon." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"For security and data protection reasons, this is not the default. Use this " +"auto-activation feature only in appropriate environments (e.g. on class room " +"computers)." +msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index 72f8a4a..89241ec 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" -"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"POT-Creation-Date: 2018-11-14 10:31+0100\n" "PO-Revision-Date: 2014-11-19 18:25+0000\n" "Last-Translator: Kaan Özdinçer <kaanozdincer@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -69,3 +69,169 @@ msgid "" msgstr "" "X2Go Sunucusunun Perl kodunun çoğu kendi Perl API'si olan X2Go::Server'a " "taşınmıştır." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing users gain the privilege to share one another's X2Go/" +"X11 desktop session by being members of a common POSIX group. The POSIX " +"group being used for this can be configured system-wide and on a per user " +"basis." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust what group to " +"use for this later on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"If this group is not created / not assigned, users will not be able to share " +"X2Go/X11 desktop sessions with each other." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:5001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"Please specify the name of the POSIX group that you want to assign the X2Go " +"Desktop Sharing privilege to." +msgstr "" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:7001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"For an X2Go/X11 desktop session to be accessible via X2Go Desktop Sharing, " +"the X2Go Desktop Sharing applet needs to be running. It advertises the users " +"X2Go/X11 session through an access controlled socket to X2Go client " +"applications." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:9001 +msgid "" +"The applet can be configured to start automatically on desktop session " +"startup, but for security reasons this is not the default." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " +"that request to share the running desktop session get auto-rejected). The " +"user normally has to actively activate the sharing mode in the applet's GUI." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"If you enabled the auto-start option in the previous screen, you can " +"additionally choose here, if desktop sharing shall be activated when the " +"X2Go Desktop Sharing applet is auto-started at session logon." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:10001 +msgid "" +"For security and data protection reasons, this is not the default. Use this " +"auto-activation feature only in appropriate environments (e.g. on class room " +"computers)." +msgstr "" diff --git a/debian/templates b/debian/templates index 4eeed86..1accc93 100644 --- a/debian/templates +++ b/debian/templates @@ -17,3 +17,87 @@ _Description: X2Go Server Upgrade . Note that most of the Perl code in X2Go Server has been moved into its own Perl API X2Go::Server. + +Template: x2goserver-desktopsharing/last-group-sharing +Type: string +Default: +Description: for internal use + +Template: x2goserver-desktopsharing/create-group-for-sharing +Type: boolean +Default: true +_Description: Create group for X2Go Desktop Sharing now? + In X2Go Desktop Sharing users gain the privilege to share one another's + X2Go/X11 desktop session by being members of a common POSIX group. The + POSIX group being used for this can be configured system-wide and on a + per user basis. + . + In X2Go Desktop Sharing's user configuration you can adjust what group + to use for this later on. Here, you are asked for the system-wide default. + . + If this group is not created now, you should assign this desktop sharing + privilege to an already existing group on the next screen. + . + If this group is not created / not assigned, users will not be able to share + X2Go/X11 desktop sessions with each other. + +Template: x2goserver-desktopsharing/use-existing-group-for-sharing +Type: boolean +Default: false +_Description: Use already existing groups for X2Go Desktop Sharing? + If a group appropriate for being assigned the desktop sharing privilege has + already been created (e.g. in an LDAP user/group database) then you can + specify this group name on the next screen. + +Template: x2goserver-desktopsharing/group-sharing +Type: string +Default: x2godesktopsharing +_Description: Assign X2Go Desktop Sharing privilege to POSIX group: + Please specify the name of the POSIX group that you want to assign the + X2Go Desktop Sharing privilege to. + . + If you leave this empty, the "root" group will be used. + +Template: x2goserver-desktopsharing/del-last-group-sharing +Type: boolean +Default: false +_Description: Delete the group that was formerly used for this? + The group for the X2Go Desktop Sharing privilege has been modified. + . + Please specify whether the old group should be deleted. If unsure, + keep the formerly used group and manually investigate later. + +Template: x2goserver-desktopsharing/no-such-group +Type: error +_Description: Non-existing group + The given group does not exist on this system. You should specify an + already existing group. + +Template: x2goserver-desktopsharing/auto-start-on-logon +Type: boolean +Default: false +_Description: Auto-start X2Go Desktop Sharing applet on desktop session startup? + For an X2Go/X11 desktop session to be accessible via X2Go Desktop + Sharing, the X2Go Desktop Sharing applet needs to be running. It + advertises the users X2Go/X11 session through an access controlled + socket to X2Go client applications. + . + The applet can be configured to start automatically on desktop session + startup, but for security reasons this is not the default. + +Template: x2goserver-desktopsharing/auto-activate-on-logon +Type: boolean +Default: false +_Description: Auto-activate X2Go Desktop Sharing on desktop session startup? + The X2Go Desktop Sharing applet normally starts in non-sharing mode + (users that request to share the running desktop session get + auto-rejected). The user normally has to actively activate the sharing + mode in the applet's GUI. + . + If you enabled the auto-start option in the previous screen, you can + additionally choose here, if desktop sharing shall be activated when the + X2Go Desktop Sharing applet is auto-started at session logon. + . + For security and data protection reasons, this is not the default. Use + this auto-activation feature only in appropriate environments (e.g. + on class room computers). diff --git a/debian/x2goserver-desktopsharing.config b/debian/x2goserver-desktopsharing.config new file mode 100755 index 0000000..5708985 --- /dev/null +++ b/debian/x2goserver-desktopsharing.config @@ -0,0 +1,75 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# remember the formerly used (or default) group names, if any +db_get x2goserver-desktopsharing/group-sharing && db_set x2goserver-desktopsharing/last-group-sharing $RET || true + +# set the confirmation questions for group deletions always to false before we begin... +db_set x2goserver-desktopsharing/del-last-group-sharing false + +db_input high x2goserver-desktopsharing/create-group-for-sharing || true +db_go +db_get x2goserver-desktopsharing/create-group-for-sharing +create_group=$RET + +# always allow usage of existing group (also when $create_group is set) +db_set x2goserver-desktopsharing/use-existing-group-for-sharing true +if [ "$create_group" = "false" ]; then + + db_get x2goserver-desktopsharing/group-sharing + if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then + db_set x2goserver-desktopsharing/group-sharing "root" + fi + + db_input high x2goserver-desktopsharing/use-existing-group-for-sharing || true + db_go +fi + +db_get x2goserver-desktopsharing/use-existing-group-for-sharing +use_existing_group=$RET + +if [ "$create_group" = "true" ] || [ "$use_existing_group" = "true" ]; then + + loop=1 + while [ $loop -eq 1 ]; do + db_input high x2goserver-desktopsharing/group-sharing || true + db_go + + db_get x2goserver-desktopsharing/group-sharing + group_sharing=$RET + if getent group $group_sharing 1>/dev/null; then + loop=0 + else + if [ "$create_group" = "true" ]; then + loop=0 + else + db_input critical x2goserver-desktopsharing/no-such-group || true + db_go + continue + fi + fi + + db_get x2goserver-desktopsharing/last-group-sharing + if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then + RET="root" + fi + if [ "$RET" != "$group_sharing" ] && [ $(getent group $RET | cut -d ":" -f 3) -ge 100 ]; then + db_input critical x2goserver-desktopsharing/del-last-group-sharing || true + db_go + fi + done +fi + +db_input high x2goserver-desktopsharing/auto-start-on-logon || true +db_go +db_get x2goserver-desktopsharing/auto-start-on-logon +auto_start=$RET + +if [ "$auto_start" = "true" ]; then + db_input high x2goserver-desktopsharing/auto-activate-on-logon || true + db_go +fi diff --git a/debian/x2goserver-desktopsharing.install b/debian/x2goserver-desktopsharing.install new file mode 100644 index 0000000..74622cf --- /dev/null +++ b/debian/x2goserver-desktopsharing.install @@ -0,0 +1,4 @@ +usr/bin/x2go*-desktopsharing +etc/x2go/desktopsharing/ +usr/share/x2go/versions/VERSION.x2goserver-desktopsharing +usr/share/x2go/x2gofeature.d/x2goserver-desktopsharing.features \ No newline at end of file diff --git a/debian/x2goserver-desktopsharing.manpages b/debian/x2goserver-desktopsharing.manpages new file mode 100644 index 0000000..39e405d --- /dev/null +++ b/debian/x2goserver-desktopsharing.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man8/x2go*-desktopsharing.8* diff --git a/debian/x2goserver-desktopsharing.postinst b/debian/x2goserver-desktopsharing.postinst new file mode 100755 index 0000000..e7aac11 --- /dev/null +++ b/debian/x2goserver-desktopsharing.postinst @@ -0,0 +1,101 @@ +#!/bin/sh + +set -e + +# postinst script for x2godesktopsharing +# +# see: dh_installdeb(1) + + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# Source debconf library. +. /usr/share/debconf/confmodule + +case "$1" in + configure) + + # fetch debconf-variables for x2godesktopsharing + db_get x2goserver-desktopsharing/create-group-for-sharing && x2godesktopsharing_create_group_for_sharing=$RET + db_get x2goserver-desktopsharing/use-existing-group-for-sharing && x2godesktopsharing_use_existing_group_for_sharing=$RET + + # remove previously used sharing group + + db_get x2goserver-desktopsharing/del-last-group-sharing + del_last_group="$RET" + + if [ "$del_last_group" = "true" ]; then + db_get x2goserver-desktopsharing/last-group-sharing + last_group=$(echo $RET | cut -d" " -f1) + + # try to remove the formerly used sharing group; on failure, ignore it + getent group $last_group 1>/dev/null && delgroup "$last_group" || \ + echo "Removing Posix previous X2Go Desktop Sharing group »$last_group« failed." + fi + + # create debconf-configured sharing group + + db_get x2goserver-desktopsharing/group-sharing + # for sanity: we take everything as a group name until we find a blank... + group=$(echo $RET | cut -d" " -f1) + + if [ "$x2godesktopsharing_create_group_for_sharing" = "true" ] && [ "x$group" != "x" ]; then + if echo "$group" | egrep '^[[:digit:]]{1,5}$' 1>/dev/null; then + echo "Specified sharing group is a gidNumber, not creating any group." 1>&2 + elif ! getent group $group >/dev/null; then + echo "Creating $group group." 1>&2 + addgroup --system $group + else + echo "Group »$group« already exists." 1>&2 + fi + fi + + # finally tweak X2Go Desktop Sharing's configuration file and adapt the group parameter + if [ -n "$group" ]; then + sed -i /etc/x2go/desktopsharing/settings -e "s/group=.*/group=$group/" + fi + + db_get x2goserver-desktopsharing/auto-start-on-logon + if [ "$RET" = "true" ] && [ ! -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then + echo "Setting up system-wide XDG autostart for X2Go Desktop Sharing." + cp /usr/share/applications/x2godesktopsharing.desktop /etc/xdg/autostart/x2godesktopsharing.desktop + elif [ "$RET" = "false" ] && [ -f /etc/xdg/autostart/x2godesktopsharing.desktop ]; then + echo "Disabling system-wide XDG autostart for X2Go Desktop Sharing." + rm -f /etc/xdg/autostart/x2godesktopsharing.desktop + fi + + db_get x2goserver-desktopsharing/auto-activate-on-logon + if [ "$RET" = "true" ] && [ -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then + echo "Setting up system-wide auto-activation of X2Go Desktop Sharing." + sed -i /etc/xdg/autostart/x2godesktopsharing.desktop -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing --activate-desktop-sharing@' + elif [ "$RET" = "false" ] && [ -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then + echo "Disabling system-wide auto-activation of X2Go Desktop Sharing." + sed -i /etc/xdg/autostart/x2godesktopsharing.desktop -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing@' + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/x2goserver-desktopsharing.postrm b/debian/x2goserver-desktopsharing.postrm new file mode 100755 index 0000000..c3f40e8 --- /dev/null +++ b/debian/x2goserver-desktopsharing.postrm @@ -0,0 +1,44 @@ +#!/bin/sh +# postrm script for x2godesktopsharing + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# Source debconf library. +. /usr/share/debconf/confmodule + +db_get x2goserver-desktopsharing/group-sharing +group_sharing=$RET + +case "${1}" in + 'purge') + getent 'group' "${group_sharing}" >'/dev/null' && delgroup "${group_sharing}" + ;; + + 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') + ;; + + *) + echo "postrm called with unknown argument '${1}'" >&2 + exit '1' + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit '0' diff --git a/x2goserver-desktopsharing/Makefile b/x2goserver-desktopsharing/Makefile new file mode 100755 index 0000000..d896a28 --- /dev/null +++ b/x2goserver-desktopsharing/Makefile @@ -0,0 +1,93 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +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 +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +LIBDIR=$(PREFIX)/lib/x2go +MANDIR=$(PREFIX)/share/man +SHAREDIR=$(PREFIX)/share/x2go + +BIN_SCRIPTS=$(shell cd bin && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) + +man_pages = `cd man && find * -type f` + +MAN2HTML_BIN = $(shell which man2html) +MAN2HTML_SRC = man +MAN2HTML_DEST = .build_man2html/html + +all: clean build + +build: build-arch build-indep + +build-arch: + +build-indep: build_man2html + +build_man2html: + if [ -n "$(MAN2HTML_BIN)" ]; then \ + mkdir -p $(MAN2HTML_DEST); \ + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ + fi + +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + +install: install_scripts install_config install_man install_version + +install_scripts: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) bin/x2go* $(DESTDIR)$(BINDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/desktopsharing + $(INSTALL_FILE) etc/desktopsharing/settings $(DESTDIR)$(ETCDIR)/desktopsharing/ + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ + +install_config: + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + +install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions + $(INSTALL_FILE) VERSION.x2goserver-desktopsharing $(DESTDIR)$(SHAREDIR)/versions/ + +uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version + +uninstall_scripts: + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done + +uninstall_config: + +uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/desktopsharing/settings + $(RM_DIR) $(DESTDIR)$(ETCDIR)/desktopsharing || true + $(RM_DIR) $(DESTDIR)$(ETCDIR) || true + +uninstall_man: + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + $(RM_DIR) $(DESTDIR)$(MANDIR) || true + +uninstall_version: + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-desktopsharing + $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-desktopsharing/VERSION.x2goserver-desktopsharing b/x2goserver-desktopsharing/VERSION.x2goserver-desktopsharing new file mode 100644 index 0000000..69a1172 --- /dev/null +++ b/x2goserver-desktopsharing/VERSION.x2goserver-desktopsharing @@ -0,0 +1 @@ +3.2.0.0 diff --git a/x2goserver-desktopsharing/bin/x2goresume-desktopsharing b/x2goserver-desktopsharing/bin/x2goresume-desktopsharing new file mode 100755 index 0000000..c07087e --- /dev/null +++ b/x2goserver-desktopsharing/bin/x2goresume-desktopsharing @@ -0,0 +1,39 @@ +#!/bin/bash + +# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`x2gopath libexec` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) + +test -e $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing && { + rm -f $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing + DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null & +} diff --git a/x2goserver-desktopsharing/bin/x2gosuspend-desktopsharing b/x2goserver-desktopsharing/bin/x2gosuspend-desktopsharing new file mode 100755 index 0000000..81639de --- /dev/null +++ b/x2goserver-desktopsharing/bin/x2gosuspend-desktopsharing @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`x2gopath libexec` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +x2goterminate-desktopsharing $SESSION_NAME && touch $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing diff --git a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing new file mode 100755 index 0000000..59735a0 --- /dev/null +++ b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing @@ -0,0 +1,60 @@ +#!/bin/bash + +# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`x2gopath libexec` + +if type -p pidof 1>/dev/null 2>/dev/null; then + PIDOF=pidof +elif [ -x /usr/local/sbin/pidof ]; then + PIDOF=/usr/local/sbin/pidof +elif [ -x /usr/sbin/pidof ]; then + PIDOF=/usr/sbin/pidof +elif [ -x /sbin/pidof ]; then + PIDOF=/sbin/pidof +else + # no pidof utility found, get out the big hammer!!! + killall x2godesktopsharing + exit 0 +fi + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + + +X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) +for process_id in `$PIDOF x2godesktopsharing`; do + env_of_process=$(cat -A /proc/$process_id/environ) + env_of_process=${env_of_process//^@/\\n} + display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2) + if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then + kill -SIGTERM $process_id + exit 0 + fi +done + +exit -1 diff --git a/x2goserver-desktopsharing/etc/desktopsharing/settings b/x2goserver-desktopsharing/etc/desktopsharing/settings new file mode 100644 index 0000000..fc4f7d0 --- /dev/null +++ b/x2goserver-desktopsharing/etc/desktopsharing/settings @@ -0,0 +1,2 @@ +[General] +group=x2godesktopsharing diff --git a/x2goserver-desktopsharing/man/man8/x2goresume-desktopsharing.8 b/x2goserver-desktopsharing/man/man8/x2goresume-desktopsharing.8 new file mode 100644 index 0000000..8b84fe6 --- /dev/null +++ b/x2goserver-desktopsharing/man/man8/x2goresume-desktopsharing.8 @@ -0,0 +1,28 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goresume\-desktopsharing 8 "Aug 2018" "Version 4.1.0.3" "X2Go Server Script" +.SH NAME +x2goresume\-desktopsharing \- Resume Desktop Sharing Applet for a given X2Go Session +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2goresume\-desktopsharing\fR \fI<session_id>\fR + +.SH DESCRIPTION +\fBx2goresume\-desktopsharing\fR launches the \fBx2godesktopsharing\fR applet for X2Go session \fI<session_id>\fR. +.PP +\fBx2goresume\-desktopsharing\fR is run with normal user privileges and it is used from within X2Go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goresume\-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2goresume\-session(8), x2gosuspend\-desktopsharing(8), x2goterminate\-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das\-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver-desktopsharing/man/man8/x2gosuspend-desktopsharing.8 b/x2goserver-desktopsharing/man/man8/x2gosuspend-desktopsharing.8 new file mode 100644 index 0000000..78c4272 --- /dev/null +++ b/x2goserver-desktopsharing/man/man8/x2gosuspend-desktopsharing.8 @@ -0,0 +1,37 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosuspend-desktopsharing 8 "Aug 2018" "Version 4.1.0.3" "X2Go Server Script" +.SH NAME +x2gosuspend-desktopsharing \- Suspend Desktop Sharing for a given X2Go Session +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gosuspend\-desktopsharing\fR \fI<session_id>\fR + +.SH DESCRIPTION +\fBx2gosuspend\-desktopsharing\fR executes \fBx2goterminate\-desktopsharing\fR and places a reminder file +.PP + ,,resume\-desktopsharing'' +.PP +into +.PP + $HOME/.x2go/C\-<session_id>/ +.PP +so that \fBx2godesktopsharing\fR can be resumed +on session resume. +.PP +\fBx2gosuspend\-desktopsharing\fR is run with normal user privileges and it is used from within X2Go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2gosuspend\-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2gosuspend\-session(8), x2goterminate\-desktopsharing(8), x2goresume\-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das\-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver-desktopsharing/man/man8/x2goterminate-desktopsharing.8 b/x2goserver-desktopsharing/man/man8/x2goterminate-desktopsharing.8 new file mode 100644 index 0000000..9841bb5 --- /dev/null +++ b/x2goserver-desktopsharing/man/man8/x2goterminate-desktopsharing.8 @@ -0,0 +1,30 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goterminate\-desktopsharing 8 "Aug 2018" "Version 4.1.0.3" "X2Go Server Tool" +.SH NAME +x2goterminate\-desktopsharing \- Cleanly Terminate Desktop Sharing for a given X2Go Session +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2goterminate\-desktopsharing\fR \fI<session_id>\fR + +.SH DESCRIPTION +\fBx2goterminate\-desktopsharing\fR allows one to detect a running and associated \fBx2godesktopsharing\fR +applet and to cleanly terminate this applet. +.PP +\fBx2goterminate\-desktopsharing\fR is run with normal user privileges and it is used from within X2Go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goterminate\-desktopsharing\fR returns 0 if a \fBx2godesktopsharing\fR process could be identified +and terminated. If not, the exit code is \-1. +.SH SEE ALSO +x2godesktopsharing(1), x2goteminate\-session(8), x2gosuspend\-desktopsharing(8), x2goresume\-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das\-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver-desktopsharing/share/x2gofeature.d/x2goserver-desktopsharing.features b/x2goserver-desktopsharing/share/x2gofeature.d/x2goserver-desktopsharing.features new file mode 100755 index 0000000..26e2518 --- /dev/null +++ b/x2goserver-desktopsharing/share/x2gofeature.d/x2goserver-desktopsharing.features @@ -0,0 +1,36 @@ +#!/bin/bash + +# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + +X2GO_LIB_PATH=`x2gopath libexec` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +X2GO_FEATURE=$1 + +# check for X2Go server core features +case "$X2GO_FEATURE" in + + "X2GO_DESKTOPSHARING") echo "ok"; exit 0;; + *) exit -1;; + +esac + diff --git a/x2goserver.spec b/x2goserver.spec index 36a28e1..7b14ae1 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -398,6 +398,34 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS server). +%package desktopsharing +Summary: X2Go Server (Desktop Sharing support) +Requires: %{name} = %{version}-%{release} +Requires: x2godesktopsharing >= 3.2.0.0 +%if 0%{?fedora} || 0%{?rhel} +Group: Applications/Communications +%else +Group: Productivity/Networking/Remote Desktop +%endif + +%description extensions +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +X2Go Desktop Sharing is an X2Go add-on feature that allows a user to +grant other X2Go users access to the current session (shadow session +support). The user's current session may be an X2Go session itself or +simply a local X11 session. + +This package contains all the integration and configuration logics +of a system-wide manageable desktop sharing setup. + + %package extensions Summary: X2Go Server (extension support) Requires: %{name} = %{version}-%{release} @@ -933,6 +961,17 @@ fi %{_datadir}/x2go/versions/VERSION.x2goserver-common +%files desktopsharing +%defattr(-,root,root) +%doc debian/copyright +%doc debian/changelog +%{_bindir}/x2go*-desktopsharing +%{_datadir}/x2go/versions/VERSION.x2goserver-desktopsharing +%{_datadir}/x2go/x2gofeature.d/x2goserver-desktopsharing.features +%{_mandir}/man8/x2go*-desktopsharing.8* +%config(noreplace) %{_sysconfdir}/x2go/desktopsharing/settings + + %files extensions %defattr(-,root,root) %doc debian/copyright -- Alioth's /home/x2go-admin/maintenancescripts/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 e13a68cb317be23c29d85bf80e1d0f4f50a772eb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:37:21 2018 +0100 debian/control: Move C (x2goserver) with versioned x2godesktopsharing, to B. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b275e11..72c375b 100644 --- a/debian/control +++ b/debian/control @@ -68,8 +68,9 @@ Recommends: Suggests: pulseaudio-utils, rdesktop, -Conflicts: +Breaks: x2godesktopsharing (<< 3.1.1.2-0~), +Conflicts: x2goserver-compat, x2goserver-home, x2goserver-one, -- Alioth's /home/x2go-admin/maintenancescripts/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 1eaf83ce793b48db502dd95ed693dc6d119ba705 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:41:36 2018 +0100 lintian: Drop unused debian/x2goserver-printing.lintian-overrides. --- debian/changelog | 2 ++ debian/x2goserver-printing.lintian-overrides | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cced78c..8a90687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium * debian/po: + Add French translation. Thanks to Jean-Pierre Giraud from the Debian project. (Closes DBTS:#905931). + * lintian: + + Drop unused debian/x2goserver-printing.lintian-overrides. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/x2goserver-printing.lintian-overrides b/debian/x2goserver-printing.lintian-overrides deleted file mode 100644 index 1c853c2..0000000 --- a/debian/x2goserver-printing.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -x2goserver-printing: breaks-without-version -- Alioth's /home/x2go-admin/maintenancescripts/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 e2e263b0ef051888e7b4e6e40311095329e6a490 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:49:57 2018 +0100 debian/x2goserver.postinst: Load debconf module, even if not used (Debian Policy demand). --- debian/changelog | 2 ++ debian/x2goserver.postinst | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 77b57e7..421a9c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium * debian/*.postinst: + Avoid recursive chmod/chown. Recursive chown/chmod is susceptible to hardlink attacks on mainline, non-Debian kernels. + * debian/x2goserver.postinst: + + Load debconf module, even if not used (Debian Policy demand). * debian/*.templates: + Move x2goserver and x2goserver-desktopsharing templates into separate files. diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 0cb8ace..79a8e85 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -20,6 +20,9 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +# Source debconf library. +. /usr/share/debconf/confmodule + case "${1}" in 'configure') ### cleaning up setgid stuff of older versions of package x2goserver -- Alioth's /home/x2go-admin/maintenancescripts/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 3fa21abe5ee19ebbbedf015c3b3330c096633c76 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 11:09:41 2018 +0100 Add x2goserver.spec. --- debian/changelog | 1 + debian/copyright | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2ee8310..8d9318b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium * debian/copyright: + Regenerate auto-generated copyright.in file. + Adopt from recent Debian packaging. + + Add x2goserver.spec. * debian/control: + Move xfonts-base from D to R. Thanks lintian. + Move C (x2goserver) with versioned x2godesktopsharing, to B. diff --git a/debian/copyright b/debian/copyright index 7d2f083..0e0e1ed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -161,6 +161,7 @@ Files: ChangeLog libx2go-server-db-perl/Makefile rpm/x2goserver-rpmlintrc rpm/x2goserver.init + x2goserver.spec x2goserver-common/Makefile x2goserver-common/VERSION.x2goserver-common x2goserver-common/lib/tmpfiles.d/x2goserver.conf -- Alioth's /home/x2go-admin/maintenancescripts/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 cd1d378f452cf460d163b8c11f96da6e3ce2321c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 11:14:03 2018 +0100 Massive white-space cleanup (at EOLs). --- INSTALL | 10 ++++----- README.i18n | 8 +++---- X2Go/Server/DB.pm | 6 +++--- X2Go/Server/DB/PostgreSQL.pm | 32 ++++++++++++++-------------- X2Go/Server/DB/SQLite3.pm | 8 +++---- X2Go/SupeReNicer.pm | 6 +++--- X2Go/Utils.pm | 2 +- debian/changelog | 1 + debian/control | 1 - x2goserver-fmbindings/README.md | 2 +- x2goserver-printing/README.md | 4 ++-- x2goserver-printing/bin/x2goprint | 2 +- x2goserver-xsession/etc/Xsession | 2 +- x2goserver/README.md | 2 +- x2goserver/bin/x2gogetapps | 6 +++--- x2goserver/bin/x2gogetservers | 2 +- x2goserver/bin/x2golistdesktops | 2 +- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2gosessionlimit | 2 +- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 2 +- x2goserver/bin/x2goumount-session | 2 +- x2goserver/bin/x2goversion | 2 +- x2goserver/doc/README.upgrade-pgsql-database | 4 ++-- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2gocreateshadowsession | 2 +- x2goserver/lib/x2gogetagent | 2 +- x2goserver/lib/x2gogetdisplays | 2 +- x2goserver/lib/x2gogetports | 2 +- x2goserver/lib/x2gogetstatus | 2 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2goinsertshadowsession | 2 +- x2goserver/lib/x2golistsessions_sql | 4 ++-- x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gormport | 2 +- x2goserver/lib/x2gosuspend-agent | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 10 ++++----- 42 files changed, 79 insertions(+), 79 deletions(-) diff --git a/INSTALL b/INSTALL index fa48ab8..f530afb 100644 --- a/INSTALL +++ b/INSTALL @@ -21,11 +21,11 @@ already: 2.) BUILD + INSTALL x2goserver FILES ----------------------------- -Extract tarball and run +Extract tarball and run $ make && sudo make install -in base folder of the extracted tarball. +in base folder of the extracted tarball. 3.) SGID GROUP @@ -33,7 +33,7 @@ in base folder of the extracted tarball. Configure ownership, permissions and setgid group bits of libx2go-server-db-sqlite3-wrapper and x2goprint: - NOTE: The described actions 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/libx2go-server-db-sqlite3-wrapper @@ -47,7 +47,7 @@ libx2go-server-db-sqlite3-wrapper and x2goprint: 4.) INIT SCRIPT --------------- Create a simple init script that starts $PREFIX/sbin/x2gocleansessions on system start -(runlevel 2-3-4-5). +(runlevel 2-3-4-5). Alternatively, you can add a single line to /etc/rc.local: @@ -67,7 +67,7 @@ have to be members of your server system's ,,fuse'' group Also users that shall be able to send print jobs to client-side printers have to be members of the server-side ,,fuse'' group (see above). -As X2Go printing setups can be rather versatile, details on X2Go printing are explained in +As X2Go printing setups can be rather versatile, details on X2Go printing are explained in the project's wiki: http://www.x2go.org/doku.php/wiki:components:printing http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-printing diff --git a/README.i18n b/README.i18n index 8133502..cf15ae2 100644 --- a/README.i18n +++ b/README.i18n @@ -21,7 +21,7 @@ THANKS!!! for the time you give to the X2Go project. And, if you are new to the team and language files for the language you want to feel responsible for do not yet exist, please subscribe to this mailing list first: - http://lists.x2go.org/listinfo/x2go-i18n + http://lists.x2go.org/listinfo/x2go-i18n Once you are subscribed, send an email to @@ -53,7 +53,7 @@ you do this by typing the following commands: 1. cd x2goserver/debian/po -2. sudo cp templates.pot da.po +2. sudo cp templates.pot da.po (or whatever langauge you are going to work on) Now the file is ready for translating it into the language you are going to work on. @@ -78,7 +78,7 @@ NOTE: Make sure you translate all boldly marked items: non-translated as well as Sending in the Translation File ------------------------------- -When done, please send the complete translation file +When done, please send the complete translation file <current_dir>/x2goserver/debian/po/<lang>.po @@ -92,7 +92,7 @@ You will get informed on x2go-i18n if a translation update is necessary. So chec your mails there regularly. For updating a translation, either keep the X2Go Server source project folder and -read more on Git by your self. +read more on Git by your self. Alternatively, just remove the folder (once you have sent in the translation file) and start with this documentation all over again. diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index faa0867..7d893a3 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -70,9 +70,9 @@ if ($backend eq 'mysql') use base 'Exporter'; -our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', - 'db_getdisplays', 'db_insertsession', 'db_insertshadowsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_createshadowsession', 'db_insertmount', - 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', +our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', + 'db_getdisplays', 'db_insertsession', 'db_insertshadowsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_createshadowsession', 'db_insertmount', + 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts', 'db_listshadowsessions','db_listshadowsessions_all'); sub dbsys_rmsessionsroot diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index e04f6c4..bb84cf9 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -141,7 +141,7 @@ sub dbsys_rmsessionsroot { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); $sth->execute() or die; @@ -169,7 +169,7 @@ sub dbsys_listsessionsroot init_db(); my $server=shift or die "argument \"server\" missed"; my @strings; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth; if ($with_TeKi) { @@ -188,7 +188,7 @@ sub dbsys_listsessionsroot $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @strings[$i++]=join('|',@data); } @@ -219,7 +219,7 @@ sub dbsys_listsessionsroot_all $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @strings[$i++]=join('|',@data); } @@ -239,7 +239,7 @@ sub dbsys_getmounts $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @mounts[$i++]=join("|",@data); } @@ -259,7 +259,7 @@ sub db_getmounts $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @mounts[$i++]=join("|",@data); } @@ -460,7 +460,7 @@ sub db_getstatus my $sth=$dbh->prepare("select status from sessions_view where session_id = '$sid'"); $sth->execute($sid) or die; my @data; - if (@data = $sth->fetchrow_array) + if (@data = $sth->fetchrow_array) { $status=@data[0]; } @@ -480,7 +480,7 @@ sub db_getdisplays $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @displays[$i++]='|'.@data[0].'|'; } @@ -500,7 +500,7 @@ sub db_getports $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @ports[$i++]='|'.@data[0].'|'; } @@ -518,7 +518,7 @@ sub db_getservers $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @servers[$i++]=@data[0]." ".@data[1]; } @@ -539,7 +539,7 @@ sub db_getagent $sth->execute()or die; my @data; my $i=0; - if (@data = $sth->fetchrow_array) + if (@data = $sth->fetchrow_array) { $agent=@data[0]; } @@ -560,7 +560,7 @@ sub db_getdisplay $sth->execute() or die; my @data; my $i=0; - if (@data = $sth->fetchrow_array) + if (@data = $sth->fetchrow_array) { $display=@data[0]; } @@ -594,7 +594,7 @@ sub db_listsessions $sth->execute() or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } @@ -627,7 +627,7 @@ sub db_listsessions_all $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } @@ -651,7 +651,7 @@ sub db_listshadowsessions $sth->execute() or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } @@ -674,7 +674,7 @@ sub db_listshadowsessions_all $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index ba3cfee..29f68c4 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -35,7 +35,7 @@ use strict; use DBI; use POSIX; -#### NOTE: the default X2Go server setups runs the code in this package +#### NOTE: the default X2Go server setups runs the code in this package #### via a setgid <group> wrapper (where <group> is group ,,x2gouser''). #### It is intended that the code in this package cannot do system() calls. @@ -597,7 +597,7 @@ sub db_listsessions_all strftime('%s','now','localtime') - strftime('%s',init_time),fs_port, tekictrl_port,tekidata_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); - + $sth->execute($realuser); if ($sth->err()) { @@ -644,9 +644,9 @@ sub db_listshadowsessions_all cookie,client,gr_port,sound_port, strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id like '%XSHAD%') order by status desc"); - + $sth->execute($realuser); if ($sth->err()) { diff --git a/X2Go/SupeReNicer.pm b/X2Go/SupeReNicer.pm index 681f852..622f1c2 100644 --- a/X2Go/SupeReNicer.pm +++ b/X2Go/SupeReNicer.pm @@ -171,7 +171,7 @@ sub superenice { } else { ########################################################################################### - # Oh no.... No "/proc"? Lets do this on a per user basis instead then... + # Oh no.... No "/proc"? Lets do this on a per user basis instead then... # If a user have more than one session, both need to be suspended before we renice.... # Resuming any of that users sessions would return them all to normal priority. @@ -195,7 +195,7 @@ sub superenice { foreach my $nUser (keys %niceUsers) { $nUser = sanitizer("pnixusername",$nUser); - # We're only working with "portable" unix usernames.. + # We're only working with "portable" unix usernames.. if ($nUser) { # So if the sanitizer return something we'll do this.... @@ -226,7 +226,7 @@ sub superenice { } } } - # Oh no.... No "/proc"? Lets do this on a per user basis instead then... + # Oh no.... No "/proc"? Lets do this on a per user basis instead then... ########################################################################################### } } diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm index 003c11e..1439770 100644 --- a/X2Go/Utils.pm +++ b/X2Go/Utils.pm @@ -118,7 +118,7 @@ sub sanitizer { if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { $string = $1; return $string; - } else {return 0;} + } else {return 0;} } elsif ($type eq "pnixusername") { $string =~ s/[^a-zA-Z0-9\.\_\-\@]//g; if ($string =~ /^([a-zA-Z0-9\.\_][a-zA-Z0-9\.\_\-\@]*)$/) { diff --git a/debian/changelog b/debian/changelog index 910d4df..2baffe4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - Don't rely on "ln -sf" to remove a symlink before recreating it. If the target is non-writable, this may fail (observed on a Debian stretch system). Thus, removing the symlink file first and then recreating it. + - Massive white-space cleanup (at EOLs). * debian/x2goserver*.dirs: + Let dirs have a trailing slash in their path (for the human eye merely). * debian/copyright: diff --git a/debian/control b/debian/control index 9d6dc8d..c6e507e 100644 --- a/debian/control +++ b/debian/control @@ -360,4 +360,3 @@ Description: Share X11 desktops with other users via X2Go . This package contains all the integration and configuration logics of a system-wide manageable desktop sharing setup. - diff --git a/x2goserver-fmbindings/README.md b/x2goserver-fmbindings/README.md index 2c61c4d..8074aee 100644 --- a/x2goserver-fmbindings/README.md +++ b/x2goserver-fmbindings/README.md @@ -5,7 +5,7 @@ This folder contains all scripts and helpers for the ssh mounted Shared Folders contains the script to open a shared folder with x2go - * man + * man man page documentation diff --git a/x2goserver-printing/README.md b/x2goserver-printing/README.md index 9a88829..0182e7d 100644 --- a/x2goserver-printing/README.md +++ b/x2goserver-printing/README.md @@ -1,7 +1,7 @@ # x2goserver-printing This folder contains the x2go printing service feature. - * bin + * bin contains the script that lets you run the print job remotely at your client side. @@ -9,7 +9,7 @@ This folder contains the x2go printing service feature. man page documentations - * share + * share contains the feature definition itself. diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index c1ea0b6..5c07e8c 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -161,5 +161,5 @@ if ( $mounts=~m/$spooldir/) unlink("$printdir/$pdfFile"); } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 346d004..ebee0c5 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -216,7 +216,7 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE- # At the time of integrating X2Go Xsession support for RHEL6 / Fedora # the Xsession stuff in Fedora/RHEL6 seems to be a little mess. - # The proposed strategy is to have Xclients.$WM.sh files in + # The proposed strategy is to have Xclients.$WM.sh files in # /etc/X11/xinit/Xclients.d. Currently, only wmx uses this mechanism. # As it is a described but rather unused ,,standard'' we will not support it # in X2Go for now, but leave it here as a reminder... diff --git a/x2goserver/README.md b/x2goserver/README.md index ec48bc7..6a16c11 100644 --- a/x2goserver/README.md +++ b/x2goserver/README.md @@ -1,6 +1,6 @@ # x2goserver core component -## x2goserver/bin +## x2goserver/bin This folder contains all the scripts to be used by the server in order to provide functionality to all the clients. The scripts itself are used for various different functions listed below: * x2gobasepath - _todo_ diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index d41ab2f..1a2eb2d 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -100,7 +100,7 @@ sub geticon { my $buf; push(@ret, "<icon>"); - while (read(I, $buf, 60*57)) + while (read(I, $buf, 60*57)) { push(@ret, encode_base64($buf)); } @@ -215,7 +215,7 @@ foreach(@dirs) for my $dirname (grep {-d "$basedir/$_" && ! /^\.{2}$/} readdir($basedh)) { if( opendir(DIR, "$basedir/$dirname")) { - while (defined($file = readdir(DIR))) + while (defined($file = readdir(DIR))) { if($file =~ m/.desktop/) { @@ -228,5 +228,5 @@ foreach(@dirs) } } } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index 1bfce76..278c15f 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -31,5 +31,5 @@ setlogmask( LOG_UPTO(loglevel()) ); my $servers = join("\n", db_getservers); print $servers; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index d5eb3fd..1be3bb0 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -112,6 +112,6 @@ for(my $i=0;$i<@displays;$i++) { print "@displays[$i]\n"; } } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 02b1ee6..ce4201b 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -33,5 +33,5 @@ my $session_id=shift || $ENV{'X2GO_SESSION'} or die "no valid session name that my $mounts = join("\n", db_getmounts($session_id)); print "$mounts\n"; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 17150b9..798bd40 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -93,5 +93,5 @@ for (my $i=0;$i<@outp;$i++) } } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 1f5b47f..00333a8 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -390,5 +390,5 @@ for (my $i=0;$i<@dirs;$i++) unlink($key); unlink("$key.ident"); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 2c15848..6a60ff5 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -105,6 +105,6 @@ if ($maxlimit != -1) { exit 0; } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 2c19262..c822ffa 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -40,7 +40,7 @@ X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` # workaround for knotify, keep silent in case no knotify is running diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 10b5f17..0eeb345 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -40,7 +40,7 @@ X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` # stop x2godesktopsharing process gracefully... diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index b74d7a6..dbc291f 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -244,5 +244,5 @@ rmdir ("$spooldir"); rmdir ("$mimeboxdir/C-$session"); rmdir ("$mimeboxdir"); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index 80ccebd..45d6525 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -41,7 +41,7 @@ if [ -n "$1" ]; then fi else cd "${X2GO_VERSIONS_BASEPATH}" - for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do + for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)" X2GO_COMPONENT_VERSION="$(get_version $compfile)" echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" diff --git a/x2goserver/doc/README.upgrade-pgsql-database b/x2goserver/doc/README.upgrade-pgsql-database index 5e7de9d..145c0db 100644 --- a/x2goserver/doc/README.upgrade-pgsql-database +++ b/x2goserver/doc/README.upgrade-pgsql-database @@ -17,7 +17,7 @@ Upgrading to x2goserver 3.1.0.0 From: x2goserver (<= 3.0.99.10) To: x2goserver (>= 3.1.0.0) -Description: The user (access) permissions on table ,,used_ports'' have been changed. +Description: The user (access) permissions on table ,,used_ports'' have been changed. X2Go users in the PostgreSQL database need access to this new column. . Alternative 1: recreate all X2Go db users @@ -30,7 +30,7 @@ Description: The user (access) permissions on table ,,used_ports'' have been cha Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database . $ su - postgres - $ psql + $ psql psql (<YOUR-PSQL-VERSION) Type "help" for help. . diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index 7fbf54a..5f5b3c7 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -34,5 +34,5 @@ my $sid=shift or die; db_changestatus($status, $sid); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index 5e79ddb..d50d275 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -41,5 +41,5 @@ my $tekidata_port=shift or die; db_createsession($sid, $cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $tekictrl_port, $tekidata_port); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gocreateshadowsession b/x2goserver/lib/x2gocreateshadowsession index 1316aee..9f797fa 100755 --- a/x2goserver/lib/x2gocreateshadowsession +++ b/x2goserver/lib/x2gocreateshadowsession @@ -40,5 +40,5 @@ my $shadreq_user=shift or die; db_createshadowsession($sid, $cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $shadreq_user); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 8bd57c5..32245e3 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -32,5 +32,5 @@ my $sid=shift or die; my $agent = db_getagent($sid); print $agent; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 7b44779..5ef8b83 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -33,5 +33,5 @@ my $host=shift or die; my $displays = join("\n", db_getdisplays($host)); print $displays; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index 161503b..6c0c68f 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -34,5 +34,5 @@ my $host=shift or die; my $ports = join("\n", db_getports($host)); print $ports; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index a18f139..c0a27a1 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -34,5 +34,5 @@ my $sid=shift or die; $status = db_getstatus($sid); print "$status"; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index 76c345c..cd6cd5c 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -36,5 +36,5 @@ my $port=shift or die; db_insertport($server,$sid,$port); print "inserted"; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index ed59682..6f2b107 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -36,5 +36,5 @@ my $sid=shift or die; db_insertsession($display, $server, $sid); print "inserted"; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goinsertshadowsession b/x2goserver/lib/x2goinsertshadowsession index c8e3829..151d25e 100755 --- a/x2goserver/lib/x2goinsertshadowsession +++ b/x2goserver/lib/x2goinsertshadowsession @@ -37,5 +37,5 @@ my $shadreq_user=shift or die; db_insertshadowsession($display, $server, $sid, $shadreq_user); print "inserted"; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 54f07ea..b612442 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -54,7 +54,7 @@ else @array=dbsys_listsessionsroot ($serv); } my $i; -for ( $i=0;$i<@array;$i++) +for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); if ((@ln[4] eq "F") && (!check_pid(@ln[0], @ln[1]))) @@ -66,5 +66,5 @@ for ( $i=0;$i<@array;$i++) print "@array[$i]\n"; } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 58c67f9..39651a7 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -40,5 +40,5 @@ $tekictrl_port=shift or $tekictrl_port=-1; $tekidata_port=shift or $tekidata_port=-1; db_resume($client, $sid, $gr_port, $snd_port, $fs_port, $tekictrl_port, $tekidata_port); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 8a5fd05..b3cc45a 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -35,5 +35,5 @@ my $port=shift or die; db_rmport($server,$sid,$port); -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index ea5f0d3..79c53e4 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -36,5 +36,5 @@ my @words=split(" ",$capt); system("x2gosuspend-session @words[2] > /dev/null"); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index 922506f..66bdfa3 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -61,7 +61,7 @@ then that value will override client-side settings. very probably means that the session's X agent has died, so the session \fI<session_id>\fR will be marked as finished in the X2Go session database. .PP -If everything works out well, a list of session attributes is returned after successful session resumption. +If everything works out well, a list of session attributes is returned after successful session resumption. Session attributes will be presented on a line-by-line basis: field 01: \fI<graphics_port>\fR diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 69d25b9..c8d99a5 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -12,12 +12,12 @@ x2gostartagent \- Start a New X2Go Session 'nh .fi .ad l -\fBx2gostartagent\fI \fI<geometry>\fR \ \\ +\fBx2gostartagent\fI \fI<geometry>\fR \ \\ \fI<link_quality>\fR \ \\ - \fI<nx_pack_meth>\fR \ \\ - \fI<cache_type+dpi>\fR \ \\ - \fI<kblayout>\fR \ \\ - \fI<kbtype>\fR \ \\ + \fI<nx_pack_meth>\fR \ \\ + \fI<cache_type+dpi>\fR \ \\ + \fI<kblayout>\fR \ \\ + \fI<kbtype>\fR \ \\ \fI<setkbd>\fR \ \\ \fI<session_type>\fR \ \\ \fI<command>\fR \ \\ -- Alioth's /home/x2go-admin/maintenancescripts/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 fbdcf949625a24696900a1d7e129c686b6dba203 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 12:23:13 2018 +0100 debian/control: Mention "client side printing support" also in descr of bin:pkg x2goserver-common. --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7caba16..5bb59f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + Move C (x2goserver) with versioned x2godesktopsharing, to B. + Don't depend on essential package without version. Drop bash from D. + Bump Standards-Version: to 4.2.1. No changes needed. + + Mention "client side printing support" also in descr of bin:pkg + x2goserver-common. * debian/*.postinst: + Avoid recursive chmod/chown. Recursive chown/chmod is susceptible to hardlink attacks on mainline, non-Debian kernels. diff --git a/debian/control b/debian/control index c6e507e..19ccf90 100644 --- a/debian/control +++ b/debian/control @@ -184,6 +184,7 @@ Description: X2Go Server (common files) - low bandwidth support - session brokerage support - client side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git