The branch, statusflag has been updated via 844c16a5ba5c1a80b0284a6c9a8ab2d0e7548a07 (commit) from c1fd1498fb07e9bec817db053d4ca6015163c28f (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: X2Go/Broker/Common.pm | 2 +- debian/x2gobroker-agent.install | 2 +- debian/x2gobroker-agent.postinst | 66 ++++++++++++++++++++++++++++++++++++++ debian/x2gobroker-agent.postrm | 44 +++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100755 debian/x2gobroker-agent.postinst create mode 100755 debian/x2gobroker-agent.postrm The diff of changes is: diff --git a/X2Go/Broker/Common.pm b/X2Go/Broker/Common.pm index a81d85c..f480082 100644 --- a/X2Go/Broker/Common.pm +++ b/X2Go/Broker/Common.pm @@ -35,7 +35,7 @@ our @EXPORT = ('ExecBrokerAgent', ); sub ExecBrokerAgent { my ($user, $hostname, $cmd)=@_; - my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$hostname -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/broker/x2gobroker-agent $user $cmd 2>/dev/null\"`; + my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$hostname -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/x2gobroker-agent $user $cmd 2>/dev/null\"`; my @rarr=split("\n",$res); my $stat; if( @rarr[0] eq 'OK' ) diff --git a/debian/x2gobroker-agent.install b/debian/x2gobroker-agent.install index ff18e26..2ad94cd 100644 --- a/debian/x2gobroker-agent.install +++ b/debian/x2gobroker-agent.install @@ -1 +1 @@ -lib/x2gobroker-agent* usr/lib/x2go/broker/ \ No newline at end of file +lib/x2gobroker-agent* usr/lib/x2go/ \ No newline at end of file diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst new file mode 100755 index 0000000..b811f63 --- /dev/null +++ b/debian/x2gobroker-agent.postinst @@ -0,0 +1,66 @@ +#!/bin/sh +# postinst script for x2gobroker-agent +# +# 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 user/group x2gobroker + if ! getent group x2gobroker >/dev/null; then + echo "Creating x2gobroker group." >&2 + addgroup --system x2gobroker + else + echo "Group x2gobroker already exists." >&2 + fi + if ! getent passwd x2gobroker >/dev/null; then + echo "Creating x2gobroker user." >&2 + adduser --system --no-create-home \ + --disabled-password --disabled-login \ + --shell /bin/false --group --home /var/lib/x2gobroker x2gobroker + else + 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) + ;; + + *) + 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/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm new file mode 100755 index 0000000..d703d32 --- /dev/null +++ b/debian/x2gobroker-agent.postrm @@ -0,0 +1,44 @@ +#! /bin/sh +# postrm script for x2gobroker-agent +# +# 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 + purge) + if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then + 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 + + ;; + 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 +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 \ No newline at end of file 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).