This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from b9643e5 etc/x2gobroker.conf: Switch over to using dynamic auth cookies by default. new 2cd0cdc debian/x2gobroker-wsgi.postinst: When purging x2gobroker-wsgi, make sure apache2-maintscript-helper gets called correctly. new 9e44861 debian/x2gobroker-ssh.postinst: Assure proper file permissions, owner and group settings for x2gobroker-ssh. new f394943 debian/x2gobroker-ssh.prerm: Drop dpkg-statoverride of /usr/bin/x2gobroker-ssh before package removal. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++- debian/x2gobroker-ssh.postinst | 8 ++++++- ...thon-x2gobroker.postrm => x2gobroker-ssh.prerm} | 22 +++++++++++++++----- debian/x2gobroker-wsgi.postrm | 2 +- 4 files changed, 32 insertions(+), 8 deletions(-) copy debian/{python-x2gobroker.postrm => x2gobroker-ssh.prerm} (61%) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 2cd0cdc8b73967b87d53c615a5952a83309ba63f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 05:27:25 2015 +0200 debian/x2gobroker-wsgi.postinst: When purging x2gobroker-wsgi, make sure apache2-maintscript-helper gets called correctly. --- debian/changelog | 2 +- debian/x2gobroker-wsgi.postrm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 011d798..51c8191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -306,7 +306,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low + Update file to match current status quo of upstream source files. * debian/x2gobroker-agent.dirs: + Provide empty log file directory. - * x2gobroker-wsgi postinst/postrm: + * debian/x2gobroker-wsgi postinst/postrm: + Make bin:package x2gobroker-wsgi compliant Debian's packaging style of Apache2.4 / Apache2.2. + On package purgal: Disable Apache2 config first and then attempt the diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm index 1299a7a..1ebf055 100755 --- a/debian/x2gobroker-wsgi.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -33,7 +33,7 @@ apacheconf_remove() { case "$1" in purge) - apacheconf_remove + apacheconf_remove $@ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-loadchecker ]; then if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 9e44861e4a29897228cb70a95d6853dbe85779b0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 05:50:45 2015 +0200 debian/x2gobroker-ssh.postinst: Assure proper file permissions, owner and group settings for x2gobroker-ssh. --- debian/changelog | 3 +++ debian/x2gobroker-ssh.postinst | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 51c8191..ffdf318 100644 --- a/debian/changelog +++ b/debian/changelog @@ -313,6 +313,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low removal of the x2gobroker user/group. + Pass $@ to our apacheconf_configure, apacheconf_remove functions to not break apache2-maintscript-helper. + * debian/x2gobroker-ssh.postinst: + + Assure proper file permissions, owner and group settings for + x2gobroker-ssh. * debian/*.postinst: + Assure that the log directory always exists (no matter what combination of packages got installed). diff --git a/debian/x2gobroker-ssh.postinst b/debian/x2gobroker-ssh.postinst index 6631767..45bdd6f 100755 --- a/debian/x2gobroker-ssh.postinst +++ b/debian/x2gobroker-ssh.postinst @@ -64,13 +64,19 @@ case "$1" in elif ! getent group $group >/dev/null; then echo "Creating $group group." 1>&2 addgroup $group + + # invalidate group cache before proceeding... + if which nscd 1>/dev/null; then + nscd -i group + fi + else echo "Group »$group« already exists." 1>&2 fi fi # the x2gobroker-ssh wrapper needs special permissions for its executable - if [ "$group" != "$last_group" ]; then + if [ "$group" != "$last_group" ] || [ "$create_group" = "true" ]; then if dpkg-statoverride --list /usr/bin/x2gobroker-ssh 1>/dev/null; then dpkg-statoverride --remove /usr/bin/x2gobroker-ssh -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit f394943a7ad3c361d0bd473b64b4bb37477eb558 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 05:49:12 2015 +0200 debian/x2gobroker-ssh.prerm: Drop dpkg-statoverride of /usr/bin/x2gobroker-ssh before package removal. --- debian/changelog | 3 +++ debian/x2gobroker-ssh.prerm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/debian/changelog b/debian/changelog index ffdf318..a5e8570 100644 --- a/debian/changelog +++ b/debian/changelog @@ -316,6 +316,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low * debian/x2gobroker-ssh.postinst: + Assure proper file permissions, owner and group settings for x2gobroker-ssh. + * debian/x2gobroker-ssh.prerm: + + Drop dpkg-statoverride of /usr/bin/x2gobroker-ssh before package + removal. * debian/*.postinst: + Assure that the log directory always exists (no matter what combination of packages got installed). diff --git a/debian/x2gobroker-ssh.prerm b/debian/x2gobroker-ssh.prerm new file mode 100755 index 0000000..0361558 --- /dev/null +++ b/debian/x2gobroker-ssh.prerm @@ -0,0 +1,39 @@ +#! /bin/sh +# prerm script for x2gobroker-ssh +# +# see: dh_installdeb(1) +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> +# for details, see /usr/share/doc/packaging-manual/ + +set -e + + +case "$1" in + remove) + if dpkg-statoverride --list /usr/bin/x2gobroker-ssh 1>/dev/null; then + dpkg-statoverride --remove /usr/bin/x2gobroker-ssh + fi + chown root:root /usr/bin/x2gobroker-ssh + chmod 0755 /usr/bin/x2gobroker-ssh + ;; + deconfigure|upgrade|failed-upgrade) + : + ;; + *) echo "$0: didn't understand being called with \`$1'" 1>&2 + exit 1;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git