[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-95-g999a7a6
X2go dev team
git-admin at x2go.org
Mon Jul 18 21:49:46 CEST 2011
The branch, master has been updated
via 999a7a65467e1db2de8582570baa47b9e3bf9223 (commit)
via e7324f82784e188b09885f03378d6a672afcabf1 (commit)
via fff8dfd7d3b73d0e597d08a193d855b6009eaca4 (commit)
from 96655427f63bf17cf244f44859c568366950680c (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 999a7a65467e1db2de8582570baa47b9e3bf9223
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 18 21:49:26 2011 +0200
Make sure upgrades from old x2goserver versions work more cleanly.
commit e7324f82784e188b09885f03378d6a672afcabf1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 18 21:47:02 2011 +0200
indentation fix
commit fff8dfd7d3b73d0e597d08a193d855b6009eaca4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 18 21:38:33 2011 +0200
Tab'ified postinst/postrm scripts.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/x2goserver.postinst | 90 ++++++++++++++++++++++----------------------
debian/x2goserver.postrm | 27 +++++++------
debian/x2goserver.preinst | 43 +++++++++++++++++++++
4 files changed, 103 insertions(+), 58 deletions(-)
create mode 100755 debian/x2goserver.preinst
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5d44ea4..d2fa577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* Fix of Debian clean rules, fix of Makefile's clean rules.
* Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of Conflicts).
* Switch to setgid instead of setuid for SQLite wrapper.
+ * Tab'ified postinst/postrm scripts.
[Martin Oehler]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 5cbd874..e5bc217 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -19,51 +19,51 @@ set -e
case "$1" in
- configure)
- chmod 700 /etc/x2go/x2gosql/passwords
- touch /etc/x2go/x2gosql/passwords/pgadmin
- chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
-
- # 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/db/x2go x2gouser
- else
- echo "User x2gouser already exists." >&2
- fi
-
- if [ ! -f /var/db/x2go/x2go_sessions ]; then
- x2godbadmin --createdb
- else
- # make sure db permissions are set correctly
- chown root:x2gouser /var/db/x2go -Rf
- chmod 0750 /var/db/x2go
- chmod 0660 /var/db/x2go/x2go_sessions
- fi
-
- # the sqlite db has to be accessed as uid x2gouser
- dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true
-
- # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid user.
- dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ configure)
+ chmod 700 /etc/x2go/x2gosql/passwords
+ touch /etc/x2go/x2gosql/passwords/pgadmin
+ chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
+
+ # 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/db/x2go x2gouser
+ else
+ echo "User x2gouser already exists." >&2
+ id -g --name "x2gouser" | grep "x2gousers" >/dev/null && usermod x2gouser -g x2gouser
+ fi
+
+ if [ ! -f /var/db/x2go/x2go_sessions ]; then
+ x2godbadmin --createdb
+ else
+ # make sure db permissions are set correctly
+ chown root:x2gouser /var/db/x2go -Rf
+ chmod 0750 /var/db/x2go
+ chmod 0660 /var/db/x2go/x2go_sessions
+ fi
+
+ # the sqlite db has to be accessed as uid x2gouser
+ dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true
+
+ # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid user.
+ dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true
+ ;;
+
+ 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
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index 37f8c02..4522b04 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -17,19 +17,20 @@ set -e
case "$1" in
- purge)
- dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper || true
- 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 x2gousers >/dev/null && delgroup x2gousers
- ;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 0
+ purge)
+ dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper || true
+ 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 x2gousers >/dev/null && delgroup x2gousers
+ ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst
new file mode 100755
index 0000000..58988d9
--- /dev/null
+++ b/debian/x2goserver.preinst
@@ -0,0 +1,43 @@
+#!/bin/sh
+# preinst script for x2goserver
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# 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)
+ # cleanup old x2goserver installations
+ test -f /var/lib/x2go/x2go_sessions && rm /var/lib/x2go/x2go_sessions
+ getent group x2gousers && echo "WARNING: found obsolete group ,,x2gousers'', please remove manually!!!"
+ ;;
+ 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
+
+
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