[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-52-g0f4c848
X2Go dev team
git-admin at x2go.org
Thu Sep 20 23:50:49 CEST 2012
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
Author: Mike Gabriel <mike.gabriel at 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 at 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 at 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 at das-netzwerkteam.de>\n"
"Language-Team: LANGUAGE <LL at 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 at 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 at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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).
More information about the x2go-commits
mailing list