The branch, master has been updated via 769d5c17f51f20e91f8bff1fb1830fba2ade4e05 (commit) from 9a385f3d881a59c8e589c3c373eeba8f66049d6e (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 769d5c17f51f20e91f8bff1fb1830fba2ade4e05 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 20 11:21:03 2013 +0100 postinst/postrm scripts:The user x2gobroker is required by x2gobroker-agent and x2gobroker-daemon. So now both bin:packages provide that user account. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ debian/x2gobroker-agent.postrm | 10 ++++++---- ...r-agent.postinst => x2gobroker-daemon.postinst} | 7 +------ ...-x2gobroker.postrm => x2gobroker-daemon.postrm} | 10 +++++++--- 4 files changed, 17 insertions(+), 13 deletions(-) copy debian/{x2gobroker-agent.postinst => x2gobroker-daemon.postinst} (84%) copy debian/{python-x2gobroker.postrm => x2gobroker-daemon.postrm} (69%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ebbbbd3..a44162f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low + Add bin:package x2gobroker-agent. * /debian/x2gobroker-daemon.init: + Handle stale PID file and already running daemon. + * postinst/postrm scripts: + + The user x2gobroker is required by x2gobroker-agent and x2gobroker-daemon. + So now both bin:packages provide that user account. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm index d703d32..e96ebe8 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/x2gobroker-agent.postrm @@ -22,10 +22,12 @@ case "$1" in dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent fi - # remove user/group x2gobroker from system - getent passwd x2gobroker >/dev/null && deluser x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker + if [ ! -d /usr/share/doc/x2gobroker-daemon ]; then + # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon + getent passwd x2gobroker >/dev/null && deluser x2gobroker + getent group x2gobroker >/dev/null && delgroup x2gobroker + getent group x2gobroker >/dev/null && delgroup x2gobroker + fi ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-daemon.postinst similarity index 84% copy from debian/x2gobroker-agent.postinst copy to debian/x2gobroker-daemon.postinst index 95faece..fca14ca 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/x2gobroker-daemon.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for x2gobroker-agent +# postinst script for x2gobroker-daemon # # see: dh_installdeb(1) @@ -40,11 +40,6 @@ case "$1" in echo "User x2gobroker already exists." >&2 fi - # the x2gobroker-agent has to be installed setuid root - if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent - fi - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/python-x2gobroker.postrm b/debian/x2gobroker-daemon.postrm similarity index 69% copy from debian/python-x2gobroker.postrm copy to debian/x2gobroker-daemon.postrm index 22abe93..678bbb9 100755 --- a/debian/python-x2gobroker.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -1,5 +1,5 @@ #! /bin/sh -# postrm script for x2gobroker-agent +# postrm script for x2gobroker-daemon # # see: dh_installdeb(1) # summary of how this script can be called: @@ -18,8 +18,12 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then - dpkg-statoverride --remove /var/log/x2gobroker + + if [ ! -d /usr/share/doc/x2gobroker-agent ]; then + # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + getent passwd x2gobroker >/dev/null && deluser x2gobroker + getent group x2gobroker >/dev/null && delgroup x2gobroker + getent group x2gobroker >/dev/null && delgroup x2gobroker fi ;; hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).