x2go-commits January 2014

x2go-commits@lists.x2go.org

2 participants
8921 discussions

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-37-g25339e0
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 25339e0d943a7592b1fe776d2ec08be6d9a723e2 (commit) from 183e55caf0729743747154bedb87776dc51fb6b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6276bed..4fc158d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low forking as a daemon. - Add copyright header for x2gofm script. - Add man page for x2gogetservers script. + - Add man page for x2gofm wrapper script. * Let x2goserver package suggest x2goserver-fmbindings. * Add package upgrade warning for installation using PostgreSQL. The upgrade warning refers to README.upgrade-pgsql-database. hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.1.0.0
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 988da7922e3dc848d49c42ad2b6cff8fb2783297 (commit) from 763775ea379d06d28340bf9f9ae55e1242044692 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f4c01dc..84f0a9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.0.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.1.0.0): @@ -49,7 +49,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low upgrade warning refers to README.upgrade-pgsql-database. * x2goserver-fmbindings does not have to depend on ${shlibs:Depends}. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:37:34 +0100 x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-36-g183e55c
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 183e55caf0729743747154bedb87776dc51fb6b1 (commit) from b1de1ed47501af09628afbdb15fff8130afdfe7a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/man/man8/x2gogetservers.8 | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 x2goserver/man/man8/x2gogetservers.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 646c1f3..6276bed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Make sure x2gocleansessions close _all_ open file handles after forking as a daemon. - Add copyright header for x2gofm script. + - Add man page for x2gogetservers script. * Let x2goserver package suggest x2goserver-fmbindings. * Add package upgrade warning for installation using PostgreSQL. The upgrade warning refers to README.upgrade-pgsql-database. diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 new file mode 100644 index 0000000..a23d69a --- /dev/null +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -0,0 +1,25 @@ +'\" -*- 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 x2gogetservers 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.SH NAME +x2gogetservers \- Retrieve list of available X2Go servers +.SH SYNOPSIS +'nh +.fi +.ad l +x2gogetservers + +.SH DESCRIPTION +\fBx2gogetservers\fR retrieves a list of available X2Go servers. This command is +only used by \fIx2goclient\fR if it runs in LDAP mode. +.PP +The \fBx2gogetservers\fR is run with X2Go user privileges. + +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-39-g1974cdc
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 1974cdcefbe9e30bb78c3e9eff74d863062d1cf7 (commit) from 9c0321a3a7ebe21afba303397cdaec61f44b5fef (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/man/man8/x2golistdesktops.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 97f2136..4125c37 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -23,7 +23,7 @@ is used here. a list of available desktops that may be candidates for X2Go desktop sharing (shadow sessions). .PP The list of desktops will include local desktop sessions (launched via KDM, GDM, etc.) run by the same user, X2Go desktop -sessions run by the same user and desktop sessions of other users (local or remote) that are announced via +sessions run by the same user and desktop sessions of other users (local or remote) that are announced via the \fBx2godesktopsharing\fR utility. .SH RETURN VALUES A list of available X desktops, line-by-line. hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-42-g763775e
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 763775ea379d06d28340bf9f9ae55e1242044692 (commit) from c7c08d58deb17843064a18749af07124b13a4cf5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c295b39..f4c01dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low * Let x2goserver package suggest x2goserver-fmbindings. * Add package upgrade warning for installation using PostgreSQL. The upgrade warning refers to README.upgrade-pgsql-database. + * x2goserver-fmbindings does not have to depend on ${shlibs:Depends}. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/debian/control b/debian/control index ae422e5..a8578fe 100644 --- a/debian/control +++ b/debian/control @@ -170,7 +170,7 @@ Description: X2Go server daemon scripts (Xsession runner) Package: x2goserver-fmbindings Architecture: all -Depends: ${shlibs:Depends}, +Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), desktop-file-utils, hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-30-g65b0817
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 65b0817cef86ea0ee0085d539571bd4e689c6055 (commit) from e298bd19efb2fc0b1e7d1ec256332f8d9871d2fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2gosqlitewrapper.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 2f6512e..1e3b7e3 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -324,8 +324,9 @@ sub check_user my $sid=shift or die "argument \"session_id\" missed"; return if $realuser eq "root"; # session id looks like someuser-51-1304005895_stDgnome-session_dp24 + # during DB insertsession it only looks like someuser-51-1304005895 my $user = "$sid"; - $user =~ s/$realuser-[0-9]+-[0-9]+.*/$realuser/; + $user =~ s/$realuser-[0-9]{2,}-[0-9]{10,}.*/$realuser/; $user eq $realuser or die "$realuser is not authorized"; } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-31-g6d06ba1
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 6d06ba1e3e965314e6a8753b11e69aeb45f8b5ad (commit) from 65b0817cef86ea0ee0085d539571bd4e689c6055 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/sbin/x2gocleansessions | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4c36ff3..57a32f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Place quotations where appropriate into shell scripts. - Fix call to x2goterminate-desktopsharing in x2goruncommand. - Tolerate user names containing "-" characters (SQLite DB backend). + - Make sure x2gocleansessions close _all_ open file handles after + forking as a daemon. * Let x2goserver package suggest x2goserver-fmbindings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 963ab32..b3f65db 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -86,9 +86,8 @@ elsif ($pid != 0) } elsif ($pid == 0 ) { - close(STDIN); - close(STDOUT); - close(STDERR); + # close any open file descriptor left open by our parent before the fork + for (glob "/proc/$$/fd/*") { POSIX::close($1) if m{/(\d+)$}; } $SIG{TERM}=\&catch_term; hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-29-ge298bd1
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via e298bd19efb2fc0b1e7d1ec256332f8d9871d2fd (commit) from b4684ddfafa899ff10de734b9b0957dcd38909c2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/lib/x2gosqlitewrapper.pl | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 56dde28..4c36ff3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. - Place quotations where appropriate into shell scripts. - Fix call to x2goterminate-desktopsharing in x2goruncommand. + - Tolerate user names containing "-" characters (SQLite DB backend). * Let x2goserver package suggest x2goserver-fmbindings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index ac8a7c6..2f6512e 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -324,8 +324,9 @@ sub check_user my $sid=shift or die "argument \"session_id\" missed"; return if $realuser eq "root"; # session id looks like someuser-51-1304005895_stDgnome-session_dp24 - my ( $user, $rest ) = split('-', $sid, 2); - $user eq $realuser or die "$realuser is not authorized (should be $user)"; + my $user = "$sid"; + $user =~ s/$realuser-[0-9]+-[0-9]+.*/$realuser/; + $user eq $realuser or die "$realuser is not authorized"; } sub fetchrow_printall_array hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-32-gd1a5d75
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via d1a5d757ef2e45912f2f58162a6e6c39fa482d13 (commit) from 6d06ba1e3e965314e6a8753b11e69aeb45f8b5ad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/po/POTFILES.in | 1 + debian/po/de.po | 44 ++++++++++++++++++++++++++ debian/po/templates.pot | 41 ++++++++++++++++++++++++ debian/templates | 9 ++++++ debian/x2goserver.docs | 1 + debian/x2goserver.postinst | 3 ++ x2goserver/doc/README.upgrade-pgsql-database | 44 ++++++++++++++++++++++++++ 8 files changed, 145 insertions(+) create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/de.po create mode 100644 debian/po/templates.pot create mode 100644 debian/templates create mode 100644 x2goserver/doc/README.upgrade-pgsql-database The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 57a32f7..bc47463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Make sure x2gocleansessions close _all_ open file handles after forking as a daemon. * Let x2goserver package suggest x2goserver-fmbindings. + * Add package upgrade warning for installation using PostgreSQL. The + upgrade warning refers to README.upgrade-pgsql-database. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..cef83a3 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 0000000..dc47d07 --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,44 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: x2goserver(a)packages.debian.org\n" +"POT-Creation-Date: 2012-02-06 21:20+0100\n" +"PO-Revision-Date: 2012-02-06 21:25+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "X2Go Server / PostgreSQL Upgrade" +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." + +#. 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" +msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor sie mit der Weiternutzung Ihres X2Go Servers fortfahren: /usr/share/x2goserver/README.upgrade-pgsl-database" + diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..1667bd9 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,41 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: x2goserver(a)packages.debian.org\n" +"POT-Creation-Date: 2012-02-06 21:20+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "X2Go Server / PostgreSQL Upgrade" +msgstr "" + +#. 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 "" + +#. 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" +msgstr "" diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..384574a --- /dev/null +++ b/debian/templates @@ -0,0 +1,9 @@ +Template: x2goserver/postgresql-upgrade-3_1_0_0 +Type: text +_Description: X2Go Server / PostgreSQL Upgrade + 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. + . + Please follow these PostgreSQL DB upgrade instructions before you continue + using your X2Go Server: + /usr/share/doc/x2goserver/README.upgrade-pgsql-database diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs index 6c7d3af..869c67e 100644 --- a/debian/x2goserver.docs +++ b/debian/x2goserver.docs @@ -1 +1,2 @@ x2goserver/.build_man2html/html +x2goserver/doc/* diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 68d83d7..f1582a8 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -5,6 +5,9 @@ set -e +# Source debconf library. +. /usr/share/debconf/confmodule + # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> diff --git a/x2goserver/doc/README.upgrade-pgsql-database b/x2goserver/doc/README.upgrade-pgsql-database new file mode 100644 index 0000000..bb78733 --- /dev/null +++ b/x2goserver/doc/README.upgrade-pgsql-database @@ -0,0 +1,44 @@ + +####################################### +### +### X2Go DB maintenance after upgrades +### +####################################### + +UPGRADING +========= + +Normally no DB upgrades are necessary on x2goserver package upgrades. However, there are some +exceptions for some specific version of the x2goserver package. + + +Upgrading to x2goserver 3.1.0.0 +------------------------------- + +From: x2goserver (<= 3.0.99.10) +To: x2goserver (>= 3.1.0.0) + +A new column has been added to the database: ,,used_ports''. + +X2Go users in the PostgreSQL database need access to this new column. + +Alternative 1: recreate all X2Go db users + + x2godbadmin --rmuser <username> + x2godbadmin --adduser <username> + +Alternative 2: + + Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database + + $ su - postgres + $ psql + psql (<YOUR-PSQL-VERSION) + Type "help" for help. + . + postgres=# \connect x2go_sessions + x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username1>"; + x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username2>"; + ... + + hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99.10-34-g839ab4f
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 839ab4f783081aecf5667588c791f7ef5986568c (commit) from add1c479ab49cda6325f89ba1cbc45d57f8a1685 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/po/de.po | 14 +++++---- debian/po/templates.pot | 4 +-- debian/templates | 2 +- x2goserver/doc/README.upgrade-pgsql-database | 40 ++++++++++++-------------- 4 files changed, 31 insertions(+), 29 deletions(-) The diff of changes is: diff --git a/debian/po/de.po b/debian/po/de.po index dc47d07..11de240 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: x2goserver(a)packages.debian.org\n" -"POT-Creation-Date: 2012-02-06 21:20+0100\n" -"PO-Revision-Date: 2012-02-06 21:25+0100\n" +"POT-Creation-Date: 2012-02-22 13:45+0100\n" +"PO-Revision-Date: 2012-02-22 13:52+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: \n" @@ -34,11 +34,15 @@ msgstr "X2Go Server / PostgreSQL Upgrade" #. 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." +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" -msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor sie mit der Weiternutzung Ihres X2Go Servers fortfahren: /usr/share/x2goserver/README.upgrade-pgsl-database" +#| msgid "" +#| "Please follow these PostgreSQL DB upgrade instructions before you " +#| "continue using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-" +#| "pgsql-database" +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" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 1667bd9..657ffb4 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: x2goserver(a)packages.debian.org\n" -"POT-Creation-Date: 2012-02-06 21:20+0100\n" +"POT-Creation-Date: 2012-02-22 13:45+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -37,5 +37,5 @@ msgstr "" msgid "" "Please follow these PostgreSQL DB upgrade instructions before you continue " "using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-" -"database" +"database.gz" msgstr "" diff --git a/debian/templates b/debian/templates index 384574a..db48433 100644 --- a/debian/templates +++ b/debian/templates @@ -6,4 +6,4 @@ _Description: X2Go Server / PostgreSQL Upgrade . Please follow these PostgreSQL DB upgrade instructions before you continue using your X2Go Server: - /usr/share/doc/x2goserver/README.upgrade-pgsql-database + /usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz diff --git a/x2goserver/doc/README.upgrade-pgsql-database b/x2goserver/doc/README.upgrade-pgsql-database index bb78733..5e7de9d 100644 --- a/x2goserver/doc/README.upgrade-pgsql-database +++ b/x2goserver/doc/README.upgrade-pgsql-database @@ -17,28 +17,26 @@ Upgrading to x2goserver 3.1.0.0 From: x2goserver (<= 3.0.99.10) To: x2goserver (>= 3.1.0.0) - -A new column has been added to the database: ,,used_ports''. - -X2Go users in the PostgreSQL database need access to this new column. - -Alternative 1: recreate all X2Go db users - +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 + . x2godbadmin --rmuser <username> x2godbadmin --adduser <username> - -Alternative 2: - - Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database - - $ su - postgres - $ psql - psql (<YOUR-PSQL-VERSION) - Type "help" for help. - . - postgres=# \connect x2go_sessions - x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username1>"; - x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username2>"; - ... + . + Alternative 2: + . + Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database + . + $ su - postgres + $ psql + psql (<YOUR-PSQL-VERSION) + Type "help" for help. + . + postgres=# \connect x2go_sessions + x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username1>"; + x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username2>"; + ... hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2014