x2go-commits September 2012

x2go-commits@lists.x2go.org

1 participants
231 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-55-g0057643
by git-admin＠x2go.org 20 Sep '12

20 Sep '12

The branch, master has been updated via 005764349afec01e39dfe385a1266013637c1d03 (commit) from 45d72cdb20821139e9d47f1922abfa2613cab913 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 005764349afec01e39dfe385a1266013637c1d03 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-54-g45d72cd
by git-admin＠x2go.org 20 Sep '12

20 Sep '12

The branch, master has been updated via 45d72cdb20821139e9d47f1922abfa2613cab913 (commit) from 4b48023b7e502ca5bd9bd1aa1cf85d8f1c323577 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 45d72cdb20821139e9d47f1922abfa2613cab913 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-53-g4b48023
by git-admin＠x2go.org 20 Sep '12

20 Sep '12

The branch, master has been updated via 4b48023b7e502ca5bd9bd1aa1cf85d8f1c323577 (commit) from 0f4c848a45fd8fa8576cca118a9b7c2b4fc1ed5c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4b48023b7e502ca5bd9bd1aa1cf85d8f1c323577 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Fri Sep 21 00:20:49 2012 +0200 more packaging fixes ----------------------------------------------------------------------- Summary of changes: debian/{x2goserver.config => config} | 2 +- debian/control | 129 ++++++++++++++++---------------- debian/libx2go-server-db-perl.postinst | 3 - debian/po/de.po | 4 +- debian/templates | 4 +- debian/x2goserver-common.postinst | 4 - debian/x2goserver-common.postrm | 1 - 7 files changed, 69 insertions(+), 78 deletions(-) rename debian/{x2goserver.config => config} (88%) The diff of changes is: diff --git a/debian/x2goserver.config b/debian/config similarity index 88% rename from debian/x2goserver.config rename to debian/config index 89ff9f4..58fc25f 100755 --- a/debian/x2goserver.config +++ b/debian/config @@ -18,7 +18,7 @@ if dpkg --compare-versions "$LASTVERSION" lt "3.2.0.0" && \ [ -e /etc/x2go/x2gosql/sql ] && \ egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then - db_input critical x2goserver/postgresql-upgrade-3_2_0_0 || true + db_input critical x2goserver/upgrade-3_2_0_0 || true db_go fi \ No newline at end of file diff --git a/debian/control b/debian/control index b594663..976b430 100644 --- a/debian/control +++ b/debian/control @@ -13,14 +13,72 @@ Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary +Package: x2goserver +Architecture: any +Depends: + ${misc:Depends}, + libx2go-server-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), + x2goagent (>= 2:3.5.0.15-0~), + lsof, + openssh-client, + openssh-server, + xauth, + psmisc, + net-tools +Recommends: + sshfs, + x11-apps, + x11-session-utils, + x11-utils, + x11-xfs-utils, + x11-xkb-utils, + x11-xserver-utils, + xinit, + x2goserver-extensions (= ${source:Version}) +Suggests: + x2goserver-printing (= ${source:Version}), + x2goserver-compat (= ${source:Version}), + x2goserver-xsession (= ${source:Version}), + x2goserver-fmbindings (= ${source:Version}), + x2goserver-pyhoca (= ${source:Version}), + rdesktop, + pulseaudio-utils +Breaks: + x2goserver-one, + x2goserver-home, +Replaces: + x2goserver-one, + x2goserver-home, +Description: X2Go server daemon scripts + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains the main daemon and tools for + X2Go server-side session administrations. + . + The x2goserver package provides full functionality + for running the X2Go project's legacy X2Go client + (x2goclient) on the client-side. + . + However, if you intend using other client implementations + of X2Go make sure that you also have X2Go server + extensions package (x2goserver-extensions) installed. + + Package: x2goserver-common Architecture: any Depends: ${misc:Depends}, + adduser, Breaks: - x2goserver (< 3.2.0.0-0~), + x2goserver (<< 3.2.0.0-0~), Replaces: - x2goserver (< 3.2.0.0-0~), + x2goserver (<< 3.2.0.0-0~), Description: X2Go Server (common files) X2Go is a server based computing environment with - session resuming @@ -39,6 +97,7 @@ Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + libconfig-simple-perl, libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), @@ -60,6 +119,10 @@ Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, + makepasswd, + libconfig-simple-perl, + libdbd-pg-perl, + libdbd-sqlite3-perl, libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server:DB package @@ -91,68 +154,6 @@ Description: Perl X2Go::Log package . This package contains the X2Go::Log Perl package. -Package: x2goserver -Architecture: any -Depends: - ${misc:Depends}, - libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), - libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), - x2goagent (>= 2:3.5.0.15-0~), - lsof, - openssh-client, - openssh-server, - libconfig-simple-perl, - makepasswd, - libdbd-pg-perl, - libdbd-sqlite3-perl, - adduser, - xauth, - psmisc, - net-tools -Recommends: - sshfs, - x11-apps, - x11-session-utils, - x11-utils, - x11-xfs-utils, - x11-xkb-utils, - x11-xserver-utils, - xinit, - x2goserver-extensions (= ${source:Version}) -Suggests: - x2goserver-printing (= ${source:Version}), - x2goserver-compat (= ${source:Version}), - x2goserver-xsession (= ${source:Version}), - x2goserver-fmbindings (= ${source:Version}), - x2goserver-pyhoca (= ${source:Version}), - rdesktop, - pulseaudio-utils -Breaks: - x2goserver-one, - x2goserver-home, -Replaces: - x2goserver-one, - x2goserver-home, -Description: X2Go server daemon scripts - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - LDAP support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - This package contains the main daemon and tools for - X2Go server-side session administrations. - . - The x2goserver package provides full functionality - for running the X2Go project's legacy X2Go client - (x2goclient) on the client-side. - . - However, if you intend using other client implementations - of X2Go make sure that you also have X2Go server - extensions package (x2goserver-extensions) installed. - Package: x2goserver-printing Architecture: all Depends: diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index 1e34a99..147d902 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -5,9 +5,6 @@ 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/debian/po/de.po b/debian/po/de.po index ec35005..069909c 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -45,10 +45,8 @@ msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor si #. Type: text #. Description #: ../templates:2001 -#, fuzzy -#| msgid "X2Go Server / PostgreSQL Upgrade" msgid "X2Go Server Upgrade" -msgstr "X2Go Server / PostgreSQL Upgrade" +msgstr "X2Go Server Upgrade" #. Type: text #. Description diff --git a/debian/templates b/debian/templates index 671220e..153d971 100644 --- a/debian/templates +++ b/debian/templates @@ -8,7 +8,7 @@ _Description: X2Go Server / PostgreSQL Upgrade using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz -Template: x2goserver/postgresql-upgrade-3_2_0_0 +Template: x2goserver/upgrade-3_2_0_0 Type: text _Description: X2Go Server Upgrade You are upgrading from an X2Go Server version (< 3.2.0.0). Between @@ -16,4 +16,4 @@ _Description: X2Go Server Upgrade change. . Note that most of the Perl code in X2Go Server has been moved into - its own Perl API X2Go::Server. \ No newline at end of file + its own Perl API X2Go::Server. diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst index b67e638..7c0123b 100755 --- a/debian/x2goserver-common.postinst +++ b/debian/x2goserver-common.postinst @@ -5,9 +5,6 @@ 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> @@ -20,7 +17,6 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package - case "$1" in configure) diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm index bd67b1d..1644a21 100755 --- a/debian/x2goserver-common.postrm +++ b/debian/x2goserver-common.postrm @@ -15,7 +15,6 @@ set -e - case "$1" in purge) getent passwd x2gouser >/dev/null && deluser x2gouser hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-52-g0f4c848
by git-admin＠x2go.org 20 Sep '12

20 Sep '12

The branch, master has been updated via 0f4c848a45fd8fa8576cca118a9b7c2b4fc1ed5c (commit) via 4248dbeafd989ef4985daa419100b2904bc36050 (commit) from c5cd92dcf4963ff87dd87e5dff454a870cd726eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f4c848a45fd8fa8576cca118a9b7c2b4fc1ed5c … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 20 23:50:42 2012 +0200 Move code in pre/post+inst/rm scripts around (from x2goserver package to libx2go-server-db-perl and x2goserver-common). commit 4248dbeafd989ef4985daa419100b2904bc36050 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 20 21:50:23 2012 +0200 Use Breaks/Replaces to exchange x2goserver.conf in x2goserver package by x2goserver.conf in new x2goserver-common package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + debian/control | 10 ++- debian/libx2go-server-db-perl.postinst | 19 +++++ debian/libx2go-server-db-perl.postrm | 7 ++ debian/po/de.po | 28 ++++++-- debian/po/templates.pot | 24 ++++++- debian/templates | 10 +++ debian/x2goserver-common.postinst | 77 ++++++++++++++++++++ ...{x2goserver.postrm => x2goserver-common.postrm} | 6 -- ...2goserver.preinst => x2goserver-common.preinst} | 2 - debian/x2goserver.config | 8 ++ debian/x2goserver.postinst | 58 +-------------- debian/x2goserver.postrm | 9 --- debian/x2goserver.preinst | 4 - 14 files changed, 180 insertions(+), 86 deletions(-) create mode 100755 debian/x2goserver-common.postinst copy debian/{x2goserver.postrm => x2goserver-common.postrm} (82%) copy debian/{x2goserver.preinst => x2goserver-common.preinst} (94%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5a4875f..4cb7f98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low + x2goserver package: Depend on libx2go-log-perl, libx2go-server-db-perl. + Move x2goserver.conf into separate package: x2goserver-common. Provide man page for x2goserver.conf. + + Use Breaks/Replaces to exchange x2goserver.conf in x2goserver package by + x2goserver.conf in new x2goserver-common package. + * Move code in pre/post+inst/rm scripts around (from x2goserver package + to libx2go-server-db-perl and x2goserver-common). [ Oleksandr Shneyder ] * New upstream version (3.2.0.0): diff --git a/debian/control b/debian/control index a1a2530..b594663 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,10 @@ Package: x2goserver-common Architecture: any Depends: ${misc:Depends}, +Breaks: + x2goserver (< 3.2.0.0-0~), +Replaces: + x2goserver (< 3.2.0.0-0~), Description: X2Go Server (common files) X2Go is a server based computing environment with - session resuming @@ -26,7 +30,7 @@ Description: X2Go Server (common files) - audio support - authentication by smartcard and USB stick . - This package contains files needed by the X2Go Server + This package contains common files needed by the X2Go Server and the X2Go::Server Perl API. Package: libx2go-server-perl @@ -35,6 +39,8 @@ Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), + libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server package X2Go is a server based computing environment with @@ -54,7 +60,7 @@ Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, - libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), + libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index b8a43f3..1e34a99 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -23,12 +23,31 @@ set -e case "$1" in configure) + mkdir -p /etc/x2go/x2gosql/passwords + chmod 700 /etc/x2go/x2gosql/passwords + touch /etc/x2go/x2gosql/passwords/pgadmin + chmod 600 /etc/x2go/x2gosql/passwords/pgadmin # the SQLite3 X2Go session db has to be accessed as uid x2gouser if ! dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper fi + # setup up SQLite3 database, do nothing it PostgeSQL is already configured + if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then + if [ ! -f /var/lib/x2go/x2go_sessions ]; then + x2godbadmin --createdb + else + # make sure db permissions are set correctly + chown -R root:x2gouser /var/lib/x2go + # egid x2gouser needs write access to the db dir (for temporary db journal file) + chmod 0770 /var/lib/x2go + # ... and to the db file itself, of course + chmod 0660 /var/lib/x2go/x2go_sessions + fi + else + echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm index 2071de4..2258690 100755 --- a/debian/libx2go-server-db-perl.postrm +++ b/debian/libx2go-server-db-perl.postrm @@ -22,6 +22,13 @@ case "$1" in dpkg-statoverride --remove /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper fi + echo "Removing X2Go session database" >&2 + rm -vf /var/lib/x2go/x2go_sessions + rm -vf /etc/x2go/x2gosql/passwords/pgadmin + + rm -Rf /etc/x2go/sql + rmdir --ignore-fail-on-non-empty /etc/x2go + ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/po/de.po b/debian/po/de.po index 11de240..ec35005 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-22 13:45+0100\n" -"PO-Revision-Date: 2012-02-22 13:52+0100\n" +"POT-Creation-Date: 2012-09-20 23:46+0200\n" +"PO-Revision-Date: 2012-09-20 23:48+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: \n" @@ -39,10 +39,26 @@ msgstr "Ihr X2Go Server nutzt eine PostgreSQL Datenbank, um X2Go Sitzungsdaten z #. 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" 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 +#: ../templates:2001 +#, fuzzy +#| msgid "X2Go Server / PostgreSQL Upgrade" +msgid "X2Go Server Upgrade" +msgstr "X2Go Server / PostgreSQL Upgrade" + +#. Type: text +#. Description +#: ../templates:2001 +msgid "You are upgrading from an X2Go Server version (< 3.2.0.0). Between 3.2.0.0 and 3.1.1.x the package structure has undergone a major change." +msgstr "Sie aktualisieren X2Go Server von einer Version (< 3.2.0.0). Seit 3.1.1.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." + diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 657ffb4..d18be4d 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-22 13:45+0100\n" +"POT-Creation-Date: 2012-09-20 23:46+0200\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" @@ -39,3 +39,25 @@ msgid "" "using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-" "database.gz" msgstr "" + +#. Type: text +#. Description +#: ../templates:2001 +msgid "X2Go Server Upgrade" +msgstr "" + +#. Type: text +#. Description +#: ../templates:2001 +msgid "" +"You are upgrading from an X2Go Server version (< 3.2.0.0). Between 3.2.0.0 " +"and 3.1.1.x the package structure has undergone a major change." +msgstr "" + +#. 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 "" diff --git a/debian/templates b/debian/templates index db48433..671220e 100644 --- a/debian/templates +++ b/debian/templates @@ -7,3 +7,13 @@ _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.gz + +Template: x2goserver/postgresql-upgrade-3_2_0_0 +Type: text +_Description: X2Go Server Upgrade + You are upgrading from an X2Go Server version (< 3.2.0.0). Between + 3.2.0.0 and 3.1.1.x the package structure has undergone a major + change. + . + Note that most of the Perl code in X2Go Server has been moved into + its own Perl API X2Go::Server. \ No newline at end of file diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst new file mode 100755 index 0000000..b67e638 --- /dev/null +++ b/debian/x2goserver-common.postinst @@ -0,0 +1,77 @@ +#!/bin/sh +# postinst script for x2goserver +# +# see: dh_installdeb(1) + +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> +# * <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 + + +case "$1" in + configure) + + ### + ### setup X2Go user account (needed for session database) + ### + + # setup x2gouser and group + if ! getent group x2gouser >/dev/null; then + echo "Creating x2gouser group." >&2 + addgroup --system x2gouser + else + echo "Group x2gouser already exists." >&2 + fi + if ! getent passwd x2gouser >/dev/null; then + echo "Creating x2gouser user." >&2 + adduser --system --no-create-home \ + --disabled-password --disabled-login \ + --shell /bin/false --group --home /var/lib/x2go x2gouser + else + echo "User x2gouser already exists." >&2 + # make sure all settings are appropriate + if [ "`id -gn x2gouser`" != "x2gouser" ]; then + usermod --gid x2gouser x2gouser + test -d /var/lib/x2go && \ + usermod --home /var/lib/x2go x2gouser || \ + usermod --move-home --home /var/lib/x2go x2gouser + fi + if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then + usermod --move-home --home /var/lib/x2go x2gouser + fi + # we leave user shell alone. we have never set this wrongly + # and we need to respect the administrator's choices + 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.postrm b/debian/x2goserver-common.postrm similarity index 82% copy from debian/x2goserver.postrm copy to debian/x2goserver-common.postrm index 8d5f624..bd67b1d 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver-common.postrm @@ -18,16 +18,10 @@ set -e case "$1" in purge) - echo "Removing x2go session database" >&2 - rm -vf /var/lib/x2go/x2go_sessions - rm -vf /etc/x2go/x2gosql/passwords/pgadmin getent passwd x2gouser >/dev/null && deluser x2gouser getent group x2gouser >/dev/null && delgroup x2gouser getent group x2gousers >/dev/null && delgroup x2gousers - rm -Rf /etc/x2go/applications - rm -Rf /etc/x2go/sql - rm -Rf /etc/x2go/x2go_logout.d rmdir --ignore-fail-on-non-empty /etc/x2go ;; diff --git a/debian/x2goserver.preinst b/debian/x2goserver-common.preinst similarity index 94% copy from debian/x2goserver.preinst copy to debian/x2goserver-common.preinst index fdff7bf..0638c70 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver-common.preinst @@ -20,8 +20,6 @@ set -e case "$1" in install|upgrade) - # cleanup old x2goserver installations - rm -Rfv /var/db/x2go/ if getent group x2gousers >/dev/null; then echo "The group ,,x2gousers'' is no longer used by X2Go and can be" echo "removed as soon as no users are members of this group anymore." diff --git a/debian/x2goserver.config b/debian/x2goserver.config index b7012da..89ff9f4 100755 --- a/debian/x2goserver.config +++ b/debian/x2goserver.config @@ -14,3 +14,11 @@ if dpkg --compare-versions "$LASTVERSION" lt "3.1.0.0" && \ fi +if dpkg --compare-versions "$LASTVERSION" lt "3.2.0.0" && \ + [ -e /etc/x2go/x2gosql/sql ] && \ + egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then + + db_input critical x2goserver/postgresql-upgrade-3_2_0_0 || true + db_go + +fi \ No newline at end of file diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index e8efa5c..d7d6952 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -23,60 +23,8 @@ set -e case "$1" in configure) - mkdir -p /etc/x2go/x2gosql/passwords - chmod 700 /etc/x2go/x2gosql/passwords - touch /etc/x2go/x2gosql/passwords/pgadmin - chmod 600 /etc/x2go/x2gosql/passwords/pgadmin - - ### - ### X2Go session DB management - ### - - # setup x2gouser and group - if ! getent group x2gouser >/dev/null; then - echo "Creating x2gouser group." >&2 - addgroup --system x2gouser - else - echo "Group x2gouser already exists." >&2 - fi - if ! getent passwd x2gouser >/dev/null; then - echo "Creating x2gouser user." >&2 - adduser --system --no-create-home \ - --disabled-password --disabled-login \ - --shell /bin/false --group --home /var/lib/x2go x2gouser - else - echo "User x2gouser already exists." >&2 - # make sure all settings are appropriate - if [ "`id -gn x2gouser`" != "x2gouser" ]; then - usermod --gid x2gouser x2gouser - test -d /var/lib/x2go && \ - usermod --home /var/lib/x2go x2gouser || \ - usermod --move-home --home /var/lib/x2go x2gouser - fi - if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then - usermod --move-home --home /var/lib/x2go x2gouser - fi - # we leave user shell alone. we have never set this wrongly - # and we need to respect the administrator's choices - fi - - if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then - - if [ ! -f /var/lib/x2go/x2go_sessions ]; then - x2godbadmin --createdb - else - # make sure db permissions are set correctly - chown -R root:x2gouser /var/lib/x2go - # egid x2gouser needs write access to the db dir (for temporary db journal file) - chmod 0770 /var/lib/x2go - # ... and to the db file itself, of course - chmod 0660 /var/lib/x2go/x2go_sessions - fi - else - echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." - fi - ### setgid section for x2gouser (SQLite DB access) + ### cleaning ab setgid stuff of older versions of package x2goserver # we may be upgrading from versions of x2goserver that had # /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. This script is @@ -101,7 +49,7 @@ case "$1" in # create /etc/x2go/applications symlink if not already there (as link or as dir) if ! test -e /etc/x2go/applications; then - ln -s /usr/share/applications /etc/x2go/applications + ln -s /usr/share/applications /etc/x2go/applications fi ;; @@ -121,5 +69,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 8d5f624..d563665 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -18,18 +18,9 @@ set -e case "$1" in purge) - echo "Removing x2go session database" >&2 - rm -vf /var/lib/x2go/x2go_sessions - rm -vf /etc/x2go/x2gosql/passwords/pgadmin - getent passwd x2gouser >/dev/null && deluser x2gouser - getent group x2gouser >/dev/null && delgroup x2gouser - getent group x2gousers >/dev/null && delgroup x2gousers - rm -Rf /etc/x2go/applications - rm -Rf /etc/x2go/sql rm -Rf /etc/x2go/x2go_logout.d rmdir --ignore-fail-on-non-empty /etc/x2go - ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index fdff7bf..437ff71 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -22,10 +22,6 @@ case "$1" in install|upgrade) # cleanup old x2goserver installations rm -Rfv /var/db/x2go/ - if getent group x2gousers >/dev/null; then - echo "The group ,,x2gousers'' is no longer used by X2Go and can be" - echo "removed as soon as no users are members of this group anymore." - fi ;; abort-upgrade) ;; 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). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.14-15-g9f1868d
by git-admin＠x2go.org 20 Sep '12

20 Sep '12

The branch, master has been updated via 9f1868deff94b85d65f97dbdb6b038d4c3b0c155 (commit) via dc30db8a106bbc9e1772f836f73f3f51d8771b43 (commit) from f6adfd1fa2d5afc98166486b905305ad718853d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9f1868deff94b85d65f97dbdb6b038d4c3b0c155 … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 20 22:13:12 2012 +0200 mark issue #16 as closed by last added patch commit dc30db8a106bbc9e1772f836f73f3f51d8771b43 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 20 22:12:00 2012 +0200 fix patch name ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- ...ch => 204_nxagent_repaint-solidpict.full.patch} | 0 debian/patches/series | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename debian/patches/{204-nxagent_repaint-solidpict.full.patch => 204_nxagent_repaint-solidpict.full.patch} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c2c83bf..7b45a74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of - SolidFill pictures by nxagent/x2goagent on reconnects. + SolidFill pictures by nxagent/x2goagent on reconnects. Closes upstream + issue #16. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200 diff --git a/debian/patches/204-nxagent_repaint-solidpict.full.patch b/debian/patches/204_nxagent_repaint-solidpict.full.patch similarity index 100% rename from debian/patches/204-nxagent_repaint-solidpict.full.patch rename to debian/patches/204_nxagent_repaint-solidpict.full.patch diff --git a/debian/patches/series b/debian/patches/series index b97897d..19525cc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,7 +39,7 @@ 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch -204-nxagent_repaint-solidpict.full.patch +204_nxagent_repaint-solidpict.full.patch 209_x2goagent-add-man-page.full.patch 220_nxproxy-bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.14-13-gf6adfd1
by git-admin＠x2go.org 20 Sep '12

20 Sep '12

The branch, master has been updated via f6adfd1fa2d5afc98166486b905305ad718853d1 (commit) from b8db5192d8b60c4371aa339e0762268efd62d53f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f6adfd1fa2d5afc98166486b905305ad718853d1 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-… [View More]nice.de> Date: Thu Sep 20 21:27:59 2012 +0200 Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of SolidFill pictures by nxagent/x2goagent on reconnects. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++ .../204-nxagent_repaint-solidpict.full.patch | 53 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 debian/patches/204-nxagent_repaint-solidpict.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 90f1732..c2c83bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Improve 020_add-nxagent-wrapper.full.patch: Properly set NX_TEMP, make sure nxagent launches even with pam_tmpdir.so being in use. * Improve 023_add-x2goagent-wrapper.full.patch: Properly set NX_TEMP, make @@ -17,6 +18,10 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low option to nxproxy options and forces nxproxy to bind to loopback devices only. + [ Oleksandr Shneyder ] + * Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of + SolidFill pictures by nxagent/x2goagent on reconnects. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200 nx-libs (2:3.5.0.14-0) unstable; urgency=low diff --git a/debian/patches/204-nxagent_repaint-solidpict.full.patch b/debian/patches/204-nxagent_repaint-solidpict.full.patch new file mode 100644 index 0000000..139a46a --- /dev/null +++ b/debian/patches/204-nxagent_repaint-solidpict.full.patch @@ -0,0 +1,53 @@ +Description: Fix repainting of SolidFill pictures with libcairo > 1.12.x +Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c 2012-05-16 18:05:07.000000000 +0200 ++++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c 2012-09-20 20:53:37.893459269 +0200 +@@ -2689,11 +2689,17 @@ void nxagentReconnectPicture(pointer p0, + #endif + } + +- if (!pForm) ++ if (!pForm && pPicture->pSourcePict) + { +- *pBool = False; +- +- return; ++ /*possible we need to add support for other picture types, for example gradients...*/ ++ switch(pPicture->pSourcePict->type) ++ { ++ case SourcePictTypeSolidFill: ++ nxagentPicturePriv(pPicture) -> picture = XRenderCreateSolidFill(nxagentDisplay, ++ (const XRenderColor*) &pPicture->pSourcePict->solidFill.fullColor); ++ break; ++ } ++ return; + } + + #ifdef TEST +diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c +--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c 2010-11-11 21:18:00.000000000 +0100 ++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c 2012-09-20 20:54:50.209817849 +0200 +@@ -1137,6 +1137,10 @@ CreateSolidPicture (Picture pid, xRender + } + pPicture->pSourcePict->type = SourcePictTypeSolidFill; + pPicture->pSourcePict->solidFill.color = xRenderColorToCard32(*color); ++ pPicture->pSourcePict->solidFill.fullColor.alpha=color->alpha; ++ pPicture->pSourcePict->solidFill.fullColor.red=color->red; ++ pPicture->pSourcePict->solidFill.fullColor.green=color->green; ++ pPicture->pSourcePict->solidFill.fullColor.blue=color->blue; + return pPicture; + } + +diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h +--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h 2010-10-22 16:04:24.000000000 +0200 ++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h 2012-09-20 20:55:31.106020653 +0200 +@@ -95,6 +95,7 @@ typedef struct _PictTransform { + typedef struct _PictSolidFill { + unsigned int type; + CARD32 color; ++ xRenderColor fullColor; + } PictSolidFill, *PictSolidFillPtr; + + typedef struct _PictGradientStop { + diff --git a/debian/patches/series b/debian/patches/series index 3c4a167..b97897d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,6 +39,7 @@ 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch +204-nxagent_repaint-solidpict.full.patch 209_x2goagent-add-man-page.full.patch 220_nxproxy-bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-50-gc5cd92d
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via c5cd92dcf4963ff87dd87e5dff454a870cd726eb (commit) from 861398a42577ee721be5dadce7ee4c1a5f29a530 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c5cd92dcf4963ff87dd87e5dff454a870cd726eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-49-g861398a
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 861398a42577ee721be5dadce7ee4c1a5f29a530 (commit) from 6655d11f61674b0f1cfb701a7026361a68d02fe5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 861398a42577ee721be5dadce7ee4c1a5f29a530 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-48-g6655d11
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via 6655d11f61674b0f1cfb701a7026361a68d02fe5 (commit) from fecfb1e366a6c83a79e160cf469b9898963cf6a9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6655d11f61674b0f1cfb701a7026361a68d02fe5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-47-gfecfb1e
by git-admin＠x2go.org 18 Sep '12

18 Sep '12

The branch, master has been updated via fecfb1e366a6c83a79e160cf469b9898963cf6a9 (commit) from cbebebc2e846bdc7d1f2a699708804c4829ddaad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fecfb1e366a6c83a79e160cf469b9898963cf6a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Tue Sep 18 21:25:12 2012 +0200 follow-up commit, call Makefile in x2goserver-common from main Makefile ----------------------------------------------------------------------- Summary of changes: Makefile | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 41a508f..c96b24f 100755 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ build: build-arch build-indep # make man2html build available from project's base folder... build_man2html: + $(MAKE) -C x2goserver-common $@ $(MAKE) -C x2goserver $@ $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ @@ -29,6 +30,7 @@ build_man2html: clean: -$(MAKE) -f Makefile.perl clean + $(MAKE) -C x2goserver-common $@ $(MAKE) -C x2goserver $@ $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ @@ -40,6 +42,7 @@ clean: distclean: -$(MAKE) -f Makefile.perl realclean + $(MAKE) -C x2goserver-common clean $(MAKE) -C x2goserver clean $(MAKE) -C libx2go-server-db-perl clean $(MAKE) -C x2goserver-printing clean @@ -50,6 +53,7 @@ distclean: $(MAKE) -C x2goserver-pyhoca clean build-arch: + $(MAKE) -C x2goserver-common $@ $(MAKE) -C x2goserver $@ $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ @@ -62,6 +66,7 @@ build-arch: build-indep: $(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS) $(MAKE) -f Makefile.perl + $(MAKE) -C x2goserver-common $@ $(MAKE) -C x2goserver $@ $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ @@ -73,6 +78,7 @@ build-indep: install: $(MAKE) -f Makefile.perl install + $(MAKE) -C x2goserver-common $@ $(MAKE) -C x2goserver $@ $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver-printing $@ @@ -92,6 +98,7 @@ uninstall: $(MAKE) -f Makefile.perl uninstall $(MAKE) -C libx2go-server-db-perl $@ $(MAKE) -C x2goserver $@ + $(MAKE) -C x2goserver-common $@ if test -d $(DESTDIR)$(LIBDIR); then $(RM_DIR) $(DESTDIR)$(LIBDIR); fi if test -d $(DESTDIR)$(SHAREDIR)/x2gofeature.d; then $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d; fi if test -d $(DESTDIR)$(SHAREDIR); then $(RM_DIR) $(DESTDIR)$(SHAREDIR); fi 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). [View Less]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2012