This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 1c870b3 x2gobroker-pubkeyauthorizer: Tiny Python2to3 fix. new 1ff72dd x2gobroker/utils.py: Provide helper functions for pretty-formatting key fingerprints. new 79bacef x2gobroker-keygen: Use new fingerprint formatting functions. new 29e2699 sbin/x2gobroker-pubkeyauthorizer: Drop unused binascii import. new 6959174 x2gobroker/agent.py: Bail out if no hostaddr contained in remote_agent. new 02ce95a x2gobroker/agent.py: No load-checking when remote_agent is set to 'LOCAL'. new 33788c6 x2gobroker/loadchecker.py: Report properly to the logger if we fail to obtain a load factor. new 6d6b34e x2gobroker/agent.py: Better sanity checks for remote_agent and its dict keys hostname and hostaddr. new 00b89c5 x2gobroker-loadchecker.service: loadchecker service needs to chuid to system user x2gobroker. new 9382d0e x2gobroker-loadchecker.service: File ownership should be x2gobroker:x2gobroker, too. new 220eace x2gobroker-loadchecker: No chown/chmod if we are not running as root (which is mostly the case). new dc605f9 tmpfiles.d utilization: Create RUNDIR/x2gobroker via tmpfiles.d system. Fixes missing dir and flawed permissions when running under systemd. new 81c3a78 debian/*.install: Add tmpfiles.d files into bin:pkgs. new 001cdb1 x2gobroker.spec: Install tmpfiles.d configs into bin:pkgs. new 3f422b6 Makefile: Run setup.py build at build time. new 4bf1279 Makefile: Compress man pages. new 2c8e530 debian/changelog: white-space clean-up at EOL. new 549660b Makefile: Support skipping installation of the x2gobroker PyModule. Useful when building with CDBS on Debian. new df961d8 debian/*: Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. The 18 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: Makefile | 39 ++++++++++++++++++++++++++-------- debian/changelog | 2 +- debian/python3-x2gobroker.install | 3 ++- debian/rules | 9 +++++--- debian/x2gobroker-agent.install | 5 +++-- debian/x2gobroker-agent.manpages | 1 - debian/x2gobroker-authservice.install | 8 ++++--- debian/x2gobroker-authservice.manpages | 1 - debian/x2gobroker-common.install | 10 ++++----- debian/x2gobroker-daemon.install | 7 ++++-- debian/x2gobroker-daemon.manpages | 2 -- debian/x2gobroker-loadchecker.install | 8 ++++--- debian/x2gobroker-loadchecker.manpages | 1 - debian/x2gobroker-ssh.install | 5 +++-- debian/x2gobroker-ssh.manpages | 1 - debian/x2gobroker-wsgi.install | 6 +++--- debian/x2gobroker.install | 12 +++++++---- debian/x2gobroker.manpages | 4 ---- sbin/x2gobroker-keygen | 8 +++++-- sbin/x2gobroker-loadchecker | 7 ++++-- sbin/x2gobroker-pubkeyauthorizer | 1 - tmpfiles.d/x2gobroker-authservice.conf | 2 ++ tmpfiles.d/x2gobroker-daemon.conf | 2 ++ tmpfiles.d/x2gobroker-loadchecker.conf | 2 ++ x2gobroker-loadchecker.service | 6 +++--- x2gobroker.spec | 3 +++ x2gobroker/agent.py | 16 ++++++++++++-- x2gobroker/loadchecker.py | 4 +++- x2gobroker/utils.py | 34 +++++++++++++++++++++++++++++ 29 files changed, 150 insertions(+), 59 deletions(-) delete mode 100644 debian/x2gobroker-agent.manpages delete mode 100644 debian/x2gobroker-authservice.manpages delete mode 100644 debian/x2gobroker-daemon.manpages delete mode 100644 debian/x2gobroker-loadchecker.manpages delete mode 100644 debian/x2gobroker-ssh.manpages delete mode 100644 debian/x2gobroker.manpages create mode 100644 tmpfiles.d/x2gobroker-authservice.conf create mode 100644 tmpfiles.d/x2gobroker-daemon.conf create mode 100644 tmpfiles.d/x2gobroker-loadchecker.conf -- Alioth's /home/x2go-admin/maintenancescripts/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 1ff72ddf58f522226e8676efe7313ccb72ba8b54 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 14:47:28 2018 +0200 x2gobroker/utils.py: Provide helper functions for pretty-formatting key fingerprints. --- x2gobroker/utils.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/x2gobroker/utils.py b/x2gobroker/utils.py index a5a0d4b..291dd25 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -24,6 +24,7 @@ import netaddr import distutils.version import pwd, grp import socket +import binascii def _checkConfigFileDefaults(data_structure): """\ @@ -283,3 +284,36 @@ def portscan(addr, port=22): sock.close() return True + +def get_key_fingerprint(key): + """\ + Retrieve the host key fingerprint of the server to be validated. + + + :returns: host key fingerprint + + :rtype: ``str`` + + """ + return binascii.hexlify(key.get_fingerprint()).decode() + +def get_key_fingerprint_with_colons(key): + """\ + Retrieve the (colonized) host key fingerprint of the server + to be validated. + + + :returns: host key fingerprint (with colons) + + :rtype: ``str`` + + """ + _fingerprint = get_key_fingerprint(key) + _colon_fingerprint = '' + idx = 0 + for char in _fingerprint: + idx += 1 + _colon_fingerprint += char + if idx % 2 == 0: + _colon_fingerprint += ':' + return _colon_fingerprint.rstrip(':') -- Alioth's /home/x2go-admin/maintenancescripts/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 79bacefdb5c26261b92581ced42b4c3b1121b809 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 14:48:11 2018 +0200 x2gobroker-keygen: Use new fingerprint formatting functions. --- sbin/x2gobroker-keygen | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index 6872ecc..ca98b49 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -24,7 +24,6 @@ import sys import setproctitle import argparse import logging -import binascii import paramiko import x2gobroker._paramiko @@ -39,6 +38,11 @@ except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) import x2gobroker.defaults +import x2gobroker._paramiko +x2gobroker._paramiko.monkey_patch_paramiko() + +import x2gobroker.utils + supported_key_types = ('RSA', 'DSA') PROG_NAME = os.path.basename(sys.argv[0]) @@ -119,7 +123,7 @@ if __name__ == '__main__': key = paramiko.DSSKey.generate(1024) id_file = 'id_dsa' - logger_broker.info(' The {key_type} key has been generated, fingerprint: {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint()))) + logger_broker.info(' The {key_type} key has been generated, fingerprint: {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=x2gobroker.utils.get_fingerprint_with_colons(key))) if os.path.exists('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file)) and not cmdline_args.force: logger_broker.error(' Private key {home}/.ssh/{id_file} exists. Use --force to overwrite'.format(home=broker_home, id_file=id_file)) -- Alioth's /home/x2go-admin/maintenancescripts/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 29e2699bddc91d2a9b65bb9ab85d9359a126c5a1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 14:48:29 2018 +0200 sbin/x2gobroker-pubkeyauthorizer: Drop unused binascii import. --- sbin/x2gobroker-pubkeyauthorizer | 1 - 1 file changed, 1 deletion(-) diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 6a9af5a..20a462f 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -24,7 +24,6 @@ import sys import setproctitle import argparse import logging -import binascii import urllib.request import getpass import logging -- Alioth's /home/x2go-admin/maintenancescripts/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 69591740eb0f244e4aa88dfc5e076cc071418996 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 15:10:18 2018 +0200 x2gobroker/agent.py: Bail out if no hostaddr contained in remote_agent. --- x2gobroker/agent.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 1ee6e37..aba0931 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -199,8 +199,12 @@ def _call_remote_broker_agent(username, task, cmdline_args=[], remote_agent=None elif 'host_key_policy' not in remote_agent: remote_agent['host_key_policy'] = paramiko.WarningPolicy() - remote_hostname = remote_agent['hostaddr'] - remote_hostaddr = remote_agent['hostaddr'] + if 'hostaddr' in remote_agent: + remote_hostname = remote_agent['hostaddr'] + remote_hostaddr = remote_agent['hostaddr'] + else: + raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Internal error: The remote_agent dict must always specify a hostaddr key!') + if 'port' in remote_agent: remote_port = int(remote_agent['port']) else: -- Alioth's /home/x2go-admin/maintenancescripts/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 02ce95a337b42f320f1fde5c603969ad21bd5b73 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 15:10:55 2018 +0200 x2gobroker/agent.py: No load-checking when remote_agent is set to 'LOCAL'. --- x2gobroker/agent.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index aba0931..6252619 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -443,6 +443,10 @@ def check_load(remote_agent=None, logger=None, **kwargs): logger.error('no remote agent was given, can\'t query load') return "NO-REMOTE-AGENT" + if remote_agent == 'LOCAL': + logger.error('no load checking support if remote agent is set to \'LOCAL\'') + return "REMOTE-AGENT-IS-SET-TO-LOCAL" + try: if "username" in list(kwargs.keys()): del kwargs["username"] -- Alioth's /home/x2go-admin/maintenancescripts/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 33788c6fad91b4d5b06497a641ae1f62e37ef269 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 16:59:01 2018 +0200 x2gobroker/loadchecker.py: Report properly to the logger if we fail to obtain a load factor. --- x2gobroker/loadchecker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x2gobroker/loadchecker.py b/x2gobroker/loadchecker.py index b2a68c9..1ee423e 100644 --- a/x2gobroker/loadchecker.py +++ b/x2gobroker/loadchecker.py @@ -199,8 +199,10 @@ class LoadChecker(threading.Thread): if _load_factor is None: if self.logger: self.logger.info('LoadChecker.loadchecker(): backend={backend}, profile_id={profile_id}, hostname={hostname}, load factor not available'.format(backend=backend, profile_id=profile_id, hostname=remote_agent['hostname'])) num_failed_queries += 1 - else: + elif type(_load_factor) is int: if self.logger: self.logger.info('LoadChecker.loadchecker(): contacted remote broker agent for backend={backend}, profile_id={profile_id}, hostname={hostname}, new load factor is: {lf}'.format(backend=backend, profile_id=profile_id, hostname=remote_agent['hostname'], lf=_load_factor)) + else: + if self.logger: self.logger.warning('LoadChecker.loadchecker(): no load factor could be obtained for backend={backend}, profile_id={profile_id}, hostname={hostname}, reason: {reason}'.format(backend=backend, profile_id=profile_id, hostname=remote_agent['hostname'], reason=_load_factor)) self.server_load[backend][profile_id][remote_agent['hostname']] = _load_factor if time_to_sleep > 0: if self.logger: self.logger.debug('LoadChecker.loadchecker(): sleeping for {secs}secs before querying next server'.format(secs=time_to_sleep)) -- Alioth's /home/x2go-admin/maintenancescripts/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 6d6b34e330767c224a9add53257db035bdfc3064 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:00:13 2018 +0200 x2gobroker/agent.py: Better sanity checks for remote_agent and its dict keys hostname and hostaddr. --- x2gobroker/agent.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 6252619..58b350c 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -199,11 +199,15 @@ def _call_remote_broker_agent(username, task, cmdline_args=[], remote_agent=None elif 'host_key_policy' not in remote_agent: remote_agent['host_key_policy'] = paramiko.WarningPolicy() + remote_hostaddr = None + remote_hostname = None if 'hostaddr' in remote_agent: - remote_hostname = remote_agent['hostaddr'] remote_hostaddr = remote_agent['hostaddr'] - else: - raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Internal error: The remote_agent dict must always specify a hostaddr key!') + if 'hostname' in remote_agent: + remote_hostname = remote_agent['hostname'] + + if remote_hostaddr is None and remote_hostname is None: + raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Internal error: The remote_agent dict must always specify either a hostaddr or a hostname key!') if 'port' in remote_agent: remote_port = int(remote_agent['port']) -- Alioth's /home/x2go-admin/maintenancescripts/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 00b89c53a793a535657a80b5a14cc05ad70bda82 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:01:18 2018 +0200 x2gobroker-loadchecker.service: loadchecker service needs to chuid to system user x2gobroker. --- x2gobroker-loadchecker.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2gobroker-loadchecker.service b/x2gobroker-loadchecker.service index 692e15f..861b77e 100644 --- a/x2gobroker-loadchecker.service +++ b/x2gobroker-loadchecker.service @@ -2,8 +2,8 @@ Description=X2Go Session Broker Load Checker Service [Service] -User=root -Group=root +User=x2gobroker +Group=x2gobroker Type=forking ExecStart=/usr/sbin/x2gobroker-loadchecker --socket-file=/run/x2gobroker/x2gobroker-loadchecker.socket --daemonize -o root -g x2gobroker -p 0660 --pidfile=/run/x2gobroker/x2gobroker-loadchecker.pid PIDFile=/run/x2gobroker/x2gobroker-loadchecker.pid -- Alioth's /home/x2go-admin/maintenancescripts/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 9382d0e029537efc1930235905a6a52a92c05092 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:14:05 2018 +0200 x2gobroker-loadchecker.service: File ownership should be x2gobroker:x2gobroker, too. --- x2gobroker-loadchecker.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2gobroker-loadchecker.service b/x2gobroker-loadchecker.service index 861b77e..3b6d88b 100644 --- a/x2gobroker-loadchecker.service +++ b/x2gobroker-loadchecker.service @@ -5,7 +5,7 @@ Description=X2Go Session Broker Load Checker Service User=x2gobroker Group=x2gobroker Type=forking -ExecStart=/usr/sbin/x2gobroker-loadchecker --socket-file=/run/x2gobroker/x2gobroker-loadchecker.socket --daemonize -o root -g x2gobroker -p 0660 --pidfile=/run/x2gobroker/x2gobroker-loadchecker.pid +ExecStart=/usr/sbin/x2gobroker-loadchecker --socket-file=/run/x2gobroker/x2gobroker-loadchecker.socket --daemonize -o x2gobroker -g x2gobroker -p 0660 --pidfile=/run/x2gobroker/x2gobroker-loadchecker.pid PIDFile=/run/x2gobroker/x2gobroker-loadchecker.pid [Install] -- Alioth's /home/x2go-admin/maintenancescripts/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 220eacea480d79a483756bd6a3eeecbc7726915e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:14:41 2018 +0200 x2gobroker-loadchecker: No chown/chmod if we are not running as root (which is mostly the case). --- sbin/x2gobroker-loadchecker | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sbin/x2gobroker-loadchecker b/sbin/x2gobroker-loadchecker index 49f55ba..731c20c 100755 --- a/sbin/x2gobroker-loadchecker +++ b/sbin/x2gobroker-loadchecker @@ -111,8 +111,11 @@ class LoadCheckerService(asyncore.dispatcher_with_send): self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM) self.set_reuse_addr() self.bind(socketfile) - os.chown(socketfile, getpwnam(owner).pw_uid, getgrnam(group_owner).gr_gid) - os.chmod(socketfile, int(permissions, 8)) + try: + os.chown(socketfile, getpwnam(owner).pw_uid, getgrnam(group_owner).gr_gid) + os.chmod(socketfile, int(permissions, 8)) + except OSError: + pass self.listen(1) def handle_accept(self): -- Alioth's /home/x2go-admin/maintenancescripts/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 dc605f96aa13918e01b3bc9511339b80a216263a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:32:42 2018 +0200 tmpfiles.d utilization: Create RUNDIR/x2gobroker via tmpfiles.d system. Fixes missing dir and flawed permissions when running under systemd. --- Makefile | 18 +++++++++++++----- tmpfiles.d/x2gobroker-authservice.conf | 2 ++ tmpfiles.d/x2gobroker-daemon.conf | 2 ++ tmpfiles.d/x2gobroker-loadchecker.conf | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a6ab80e..1e198e1 100755 --- a/Makefile +++ b/Makefile @@ -39,8 +39,9 @@ ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +DATADIR ?= $(PREFIX)/share +MANDIR=$(DATADIR)/man +SHAREDIR=$(DATADIR)/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) @@ -102,7 +103,7 @@ install: # x2gobroker-authservice mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(DATADIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-authservice.default \ "${DESTDIR}/etc/default/x2gobroker-authservice" ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ @@ -112,11 +113,13 @@ install: "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" + ${INSTALL_FILE} tmpfiles.d/x2gobroker-authservice.conf \ + "${DESTDIR}${DATADIR}/tmpfiles.d/" # x2gobroker-loadchecker mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(DATADIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-loadchecker.default \ "${DESTDIR}/etc/default/x2gobroker-loadchecker" ${INSTALL_FILE} man/man8/x2gobroker-loadchecker.8* \ @@ -126,9 +129,12 @@ install: "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-loadchecker-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" + ${INSTALL_FILE} tmpfiles.d/x2gobroker-loadchecker.conf \ + "${DESTDIR}${DATADIR}/tmpfiles.d/" # x2gobroker-daemon - mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" + mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" \ + "$(DESTDIR)$(DATADIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-daemon.default \ "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ @@ -143,6 +149,8 @@ install: "${DESTDIR}${BINDIR}/x2gobroker-daemon" ${INSTALL_PROGRAM} sbin/x2gobroker-daemon-debug \ "${DESTDIR}${SBINDIR}/" + ${INSTALL_FILE} tmpfiles.d/x2gobroker-daemon.conf \ + "${DESTDIR}${DATADIR}/tmpfiles.d/" # x2gobroker-ssh mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ diff --git a/tmpfiles.d/x2gobroker-authservice.conf b/tmpfiles.d/x2gobroker-authservice.conf new file mode 100644 index 0000000..ab98b13 --- /dev/null +++ b/tmpfiles.d/x2gobroker-authservice.conf @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/x2gobroker 0770 x2gobroker x2gobroker - - diff --git a/tmpfiles.d/x2gobroker-daemon.conf b/tmpfiles.d/x2gobroker-daemon.conf new file mode 100644 index 0000000..ab98b13 --- /dev/null +++ b/tmpfiles.d/x2gobroker-daemon.conf @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/x2gobroker 0770 x2gobroker x2gobroker - - diff --git a/tmpfiles.d/x2gobroker-loadchecker.conf b/tmpfiles.d/x2gobroker-loadchecker.conf new file mode 100644 index 0000000..ab98b13 --- /dev/null +++ b/tmpfiles.d/x2gobroker-loadchecker.conf @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/x2gobroker 0770 x2gobroker x2gobroker - - -- Alioth's /home/x2go-admin/maintenancescripts/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 81c3a78fb77948e4bb6d0515f7ff222027f69595 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:35:10 2018 +0200 debian/*.install: Add tmpfiles.d files into bin:pkgs. --- debian/x2gobroker-authservice.install | 3 ++- debian/x2gobroker-daemon.install | 1 + debian/x2gobroker-loadchecker.install | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/x2gobroker-authservice.install b/debian/x2gobroker-authservice.install index 00e5a97..ec482d3 100644 --- a/debian/x2gobroker-authservice.install +++ b/debian/x2gobroker-authservice.install @@ -1,3 +1,4 @@ sbin/x2gobroker-authservice usr/sbin/ logrotate/x2gobroker-authservice etc/logrotate.d/ -etc/broker/x2gobroker-authservice-logger.conf etc/x2go/broker \ No newline at end of file +etc/broker/x2gobroker-authservice-logger.conf etc/x2go/broker +usr/share/tmpfiles.d/x2gobroker-authservice.conf diff --git a/debian/x2gobroker-daemon.install b/debian/x2gobroker-daemon.install index ae2a660..7936661 100644 --- a/debian/x2gobroker-daemon.install +++ b/debian/x2gobroker-daemon.install @@ -1,2 +1,3 @@ logrotate/x2gobroker-daemon etc/logrotate.d/ sbin/x2gobroker-daemon-debug usr/sbin/ +usr/share/tmpfiles.d/x2gobroker-daemon.conf diff --git a/debian/x2gobroker-loadchecker.install b/debian/x2gobroker-loadchecker.install index 3517e2a..1d336bf 100644 --- a/debian/x2gobroker-loadchecker.install +++ b/debian/x2gobroker-loadchecker.install @@ -1,3 +1,4 @@ sbin/x2gobroker-loadchecker usr/sbin/ logrotate/x2gobroker-loadchecker etc/logrotate.d/ etc/broker/x2gobroker-loadchecker-logger.conf etc/x2go/broker +usr/share/tmpfiles.d/x2gobroker-loadchecker.conf -- Alioth's /home/x2go-admin/maintenancescripts/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 001cdb17ddb35847dc9bfb935e203e229ba03344 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:36:35 2018 +0200 x2gobroker.spec: Install tmpfiles.d configs into bin:pkgs. --- x2gobroker.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x2gobroker.spec b/x2gobroker.spec index a11408d..9ee1102 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -706,6 +706,7 @@ fi %config %_sysconfdir/logrotate.d/x2gobroker-authservice %_sbindir/x2gobroker-authservice %_mandir/man8/x2gobroker-authservice.8* +%_datadir/tmpfiles.d/x2gobroker-authservice.conf %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker @@ -726,6 +727,7 @@ fi %config %_sysconfdir/logrotate.d/x2gobroker-loadchecker %_sbindir/x2gobroker-loadchecker %_mandir/man8/x2gobroker-loadchecker.8* +%_datadir/tmpfiles.d/x2gobroker-loadchecker.conf %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker @@ -747,6 +749,7 @@ fi %_sbindir/x2gobroker-daemon-debug %_mandir/man1/x2gobroker-daemon.1* %_mandir/man8/x2gobroker-daemon-debug.8* +%_datadir/tmpfiles.d/x2gobroker-daemon.conf %config %_sysconfdir/logrotate.d/x2gobroker-daemon %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker -- Alioth's /home/x2go-admin/maintenancescripts/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 3f422b620387ea789ff5288db6c25d506d25506f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 18:25:11 2018 +0200 Makefile: Run setup.py build at build time. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1e198e1..d736e5b 100755 --- a/Makefile +++ b/Makefile @@ -49,16 +49,19 @@ LIB_FILES=$(shell cd lib && echo *) PERL ?= /usr/bin/perl -all: clean build +all: build build: build-arch build-indep -build-arch: build_setuidwrappers +build-arch: build_setuidwrappers build_pymodule build_setuidwrappers: $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(BINDIR)/x2gobroker\" -o bin/x2gobroker-ssh src/x2gobroker-ssh.c +build_pymodule: + python3 setup.py build + build-indep: distclean: clean -- Alioth's /home/x2go-admin/maintenancescripts/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 4bf127999636bbd9ae2b3cacb2b2dc41de8ffe81 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 19:00:17 2018 +0200 Makefile: Compress man pages. --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d736e5b..22207f8 100755 --- a/Makefile +++ b/Makefile @@ -33,6 +33,8 @@ LDFLAGS += -pie RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty +GZIP = gzip -f --best + DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go @@ -100,6 +102,7 @@ install: "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \ "${DESTDIR}${MANDIR}/man8" + $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8 ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" @@ -111,6 +114,7 @@ install: "${DESTDIR}/etc/default/x2gobroker-authservice" ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ "${DESTDIR}${MANDIR}/man8" + $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8 ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-authservice \ "${DESTDIR}/etc/logrotate.d/" @@ -127,6 +131,7 @@ install: "${DESTDIR}/etc/default/x2gobroker-loadchecker" ${INSTALL_FILE} man/man8/x2gobroker-loadchecker.8* \ "${DESTDIR}${MANDIR}/man8" + $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8 ${INSTALL_PROGRAM} sbin/x2gobroker-loadchecker "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-loadchecker \ "${DESTDIR}/etc/logrotate.d/" @@ -146,8 +151,10 @@ install: "${DESTDIR}${MANDIR}/man1" "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man1/x2gobroker-daemon.1* \ "${DESTDIR}${MANDIR}/man1" + $(GZIP) "${DESTDIR}${MANDIR}/man1/"*.1 ${INSTALL_FILE} man/man8/x2gobroker-daemon-debug.8* \ "${DESTDIR}${MANDIR}/man8" + $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8 ${INSTALL_SYMLINK} x2gobroker \ "${DESTDIR}${BINDIR}/x2gobroker-daemon" ${INSTALL_PROGRAM} sbin/x2gobroker-daemon-debug \ @@ -180,10 +187,11 @@ install: "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man1/x2gobroker{,-testauth}.1* \ "${DESTDIR}${MANDIR}/man1" + $(GZIP) "${DESTDIR}${MANDIR}/man1/"*.1 ${INSTALL_FILE} man/man8/x2gobroker{-keygen,-testagent}.8* \ "${DESTDIR}${MANDIR}/man8" + $(GZIP) "${DESTDIR}${MANDIR}/man8/"*.8 ${INSTALL_PROGRAM} bin/x2gobroker bin/x2gobroker-testauth \ "${DESTDIR}${BINDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-keygen sbin/x2gobroker-testagent \ "${DESTDIR}${SBINDIR}/" - -- Alioth's /home/x2go-admin/maintenancescripts/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 2c8e5307e35f7806edfcf354bb1c65e2c4ae9243 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 19:00:34 2018 +0200 debian/changelog: white-space clean-up at EOL. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dea8588..a119984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium + Bump package version. + CentOS 6 + 7 have python34-devel, not python3-devel. + Enable debug_packages for openSUSE Tumbleweed (suse_version > 1500). - + CentOS 6 + 7 have python34-setuptools, not python3-setuptools. + + CentOS 6 + 7 have python34-setuptools, not python3-setuptools. -- X2Go Release Manager <git-admin@x2go.org> Wed, 05 Apr 2017 20:01:48 +0000 -- Alioth's /home/x2go-admin/maintenancescripts/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 549660b8a52ed2346eb89b217376b3a3c0570556 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 19:01:30 2018 +0200 Makefile: Support skipping installation of the x2gobroker PyModule. Useful when building with CDBS on Debian. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 22207f8..61690e2 100755 --- a/Makefile +++ b/Makefile @@ -51,6 +51,8 @@ LIB_FILES=$(shell cd lib && echo *) PERL ?= /usr/bin/perl +SKIP_INSTALL_PYMODULE ?= + all: build build: build-arch build-indep @@ -84,7 +86,7 @@ install: "${DESTDIR}/var/log/x2gobroker" # python3-x2gobroker - python3 setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} + [ -z "${SKIP_INSTALL_PYMODULE}" ] && python3 setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} || : mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ "${DESTDIR}/etc/default" ${INSTALL_FILE} defaults/python-x2gobroker.default \ -- Alioth's /home/x2go-admin/maintenancescripts/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 df961d8d8abdbe48b4ce929822df42e7c5323957 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 19:03:27 2018 +0200 debian/*: Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. --- debian/python3-x2gobroker.install | 3 ++- debian/rules | 9 ++++++--- debian/x2gobroker-agent.install | 5 +++-- debian/x2gobroker-agent.manpages | 1 - debian/x2gobroker-authservice.install | 7 ++++--- debian/x2gobroker-authservice.manpages | 1 - debian/x2gobroker-common.install | 10 +++++----- debian/x2gobroker-daemon.install | 6 ++++-- debian/x2gobroker-daemon.manpages | 2 -- debian/x2gobroker-loadchecker.install | 7 ++++--- debian/x2gobroker-loadchecker.manpages | 1 - debian/x2gobroker-ssh.install | 5 +++-- debian/x2gobroker-ssh.manpages | 1 - debian/x2gobroker-wsgi.install | 6 +++--- debian/x2gobroker.install | 12 ++++++++---- debian/x2gobroker.manpages | 4 ---- 16 files changed, 42 insertions(+), 38 deletions(-) diff --git a/debian/python3-x2gobroker.install b/debian/python3-x2gobroker.install index 1b91047..6745aa6 100644 --- a/debian/python3-x2gobroker.install +++ b/debian/python3-x2gobroker.install @@ -1 +1,2 @@ -usr/ +usr/lib/python3/ +etc/default/python-x2gobroker diff --git a/debian/rules b/debian/rules index ee0bf1c..4fdc8f6 100755 --- a/debian/rules +++ b/debian/rules @@ -23,23 +23,26 @@ #include /usr/share/dpkg/buildflags.mk export PREFIX=/usr +export DESTDIR="$(DEB_DESTDIR)" +export SKIP_INSTALL_PYMODULE=1 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/utils.mk DEB_MAKE_CHECK_TARGET = check +DEB_MAKE_INSTALL_TARGET = install DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python3 && echo "" || echo "pysupport") -DEB_PYTHON_INSTALL_ARGS_python3-x2gobroker ?= --root=$(DEB_DESTDIR) --no-compile -O0 --install-layout=deb include /usr/share/cdbs/1/class/python-distutils.mk -# needed when building with pysupport (e.g. on Ubuntu lucid) common-binary-indep:: - mkdir -p debian/tmp/usr cp pam/x2gobroker.Debian pam/x2gobroker cp x2gobroker-ssh.sudo x2gobroker-ssh common-binary-arch:: common-binary-indep +common-binary-post-install-arch:: list-missing clean:: rm -f pam/x2gobroker diff --git a/debian/x2gobroker-agent.install b/debian/x2gobroker-agent.install index a9bf1d8..c9dc1a7 100644 --- a/debian/x2gobroker-agent.install +++ b/debian/x2gobroker-agent.install @@ -1,2 +1,3 @@ -lib/x2gobroker-agent* usr/lib/x2go/ -sbin/x2gobroker-pubkeyauthorizer usr/sbin/ \ No newline at end of file +usr/lib/x2go/x2gobroker-agent* +usr/sbin/x2gobroker-pubkeyauthorizer +usr/share/man/man8/x2gobroker-pubkeyauthorizer.8* diff --git a/debian/x2gobroker-agent.manpages b/debian/x2gobroker-agent.manpages deleted file mode 100644 index 747905f..0000000 --- a/debian/x2gobroker-agent.manpages +++ /dev/null @@ -1 +0,0 @@ -man/man8/x2gobroker-pubkeyauthorizer.8 \ No newline at end of file diff --git a/debian/x2gobroker-authservice.install b/debian/x2gobroker-authservice.install index ec482d3..a85b54a 100644 --- a/debian/x2gobroker-authservice.install +++ b/debian/x2gobroker-authservice.install @@ -1,4 +1,5 @@ -sbin/x2gobroker-authservice usr/sbin/ -logrotate/x2gobroker-authservice etc/logrotate.d/ -etc/broker/x2gobroker-authservice-logger.conf etc/x2go/broker +usr/sbin/x2gobroker-authservice +etc/logrotate.d/x2gobroker-authservice +etc/x2go/broker/x2gobroker-authservice-logger.conf usr/share/tmpfiles.d/x2gobroker-authservice.conf +usr/share/man/man8/x2gobroker-authservice.8* diff --git a/debian/x2gobroker-authservice.manpages b/debian/x2gobroker-authservice.manpages deleted file mode 100644 index 8b080d0..0000000 --- a/debian/x2gobroker-authservice.manpages +++ /dev/null @@ -1 +0,0 @@ -man/man8/x2gobroker-authservice.8 \ No newline at end of file diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install index 99e4765..181d0d3 100644 --- a/debian/x2gobroker-common.install +++ b/debian/x2gobroker-common.install @@ -1,5 +1,5 @@ -etc/x2gobroker.conf etc/x2go/ -etc/broker/x2gobroker-sessionprofiles.conf etc/x2go/broker/ -etc/broker/x2gobroker-loggers.conf etc/x2go/broker/ -etc/broker/defaults.conf etc/x2go/broker/ -pam/x2gobroker etc/pam.d/ +etc/x2go/x2gobroker.conf +etc/x2go/broker/x2gobroker-sessionprofiles.conf +etc/x2go/broker/x2gobroker-loggers.conf +etc/x2go/broker/defaults.conf +etc/pam.d/x2gobroker diff --git a/debian/x2gobroker-daemon.install b/debian/x2gobroker-daemon.install index 7936661..31e94c0 100644 --- a/debian/x2gobroker-daemon.install +++ b/debian/x2gobroker-daemon.install @@ -1,3 +1,5 @@ -logrotate/x2gobroker-daemon etc/logrotate.d/ -sbin/x2gobroker-daemon-debug usr/sbin/ +etc/logrotate.d/x2gobroker-daemon +usr/sbin/x2gobroker-daemon-debug usr/share/tmpfiles.d/x2gobroker-daemon.conf +usr/share/man/man1/x2gobroker-daemon.1* +usr/share/man/man8/x2gobroker-daemon-debug.8* diff --git a/debian/x2gobroker-daemon.manpages b/debian/x2gobroker-daemon.manpages deleted file mode 100644 index 4053510..0000000 --- a/debian/x2gobroker-daemon.manpages +++ /dev/null @@ -1,2 +0,0 @@ -man/man1/x2gobroker-daemon.1 -man/man8/x2gobroker-daemon-debug.8 \ No newline at end of file diff --git a/debian/x2gobroker-loadchecker.install b/debian/x2gobroker-loadchecker.install index 1d336bf..481ea76 100644 --- a/debian/x2gobroker-loadchecker.install +++ b/debian/x2gobroker-loadchecker.install @@ -1,4 +1,5 @@ -sbin/x2gobroker-loadchecker usr/sbin/ -logrotate/x2gobroker-loadchecker etc/logrotate.d/ -etc/broker/x2gobroker-loadchecker-logger.conf etc/x2go/broker +usr/sbin/x2gobroker-loadchecker +etc/logrotate.d/x2gobroker-loadchecker +etc/x2go/broker/x2gobroker-loadchecker-logger.conf usr/share/tmpfiles.d/x2gobroker-loadchecker.conf +usr/share/man/man8/x2gobroker-loadchecker.8* diff --git a/debian/x2gobroker-loadchecker.manpages b/debian/x2gobroker-loadchecker.manpages deleted file mode 100644 index 1832989..0000000 --- a/debian/x2gobroker-loadchecker.manpages +++ /dev/null @@ -1 +0,0 @@ -man/man8/x2gobroker-loadchecker.8 \ No newline at end of file diff --git a/debian/x2gobroker-ssh.install b/debian/x2gobroker-ssh.install index 834efe0..b935b4a 100644 --- a/debian/x2gobroker-ssh.install +++ b/debian/x2gobroker-ssh.install @@ -1,2 +1,3 @@ -bin/x2gobroker-ssh usr/bin/ -x2gobroker-ssh etc/sudoers.d/ +usr/bin/x2gobroker-ssh +etc/sudoers.d/x2gobroker-ssh +usr/share/man/man1/x2gobroker-ssh* diff --git a/debian/x2gobroker-ssh.manpages b/debian/x2gobroker-ssh.manpages deleted file mode 100644 index 6affa42..0000000 --- a/debian/x2gobroker-ssh.manpages +++ /dev/null @@ -1 +0,0 @@ -man/man1/x2gobroker-ssh.1 diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install index 9278f62..743a1cc 100644 --- a/debian/x2gobroker-wsgi.install +++ b/debian/x2gobroker-wsgi.install @@ -1,3 +1,3 @@ -etc/x2gobroker-wsgi.apache.conf /etc/x2go/ -etc/x2gobroker-wsgi.apache.vhost /etc/x2go/ -logrotate/x2gobroker-wsgi etc/logrotate.d/ +etc/x2go/x2gobroker-wsgi.apache.conf +etc/x2go/x2gobroker-wsgi.apache.vhost +etc/logrotate.d/x2gobroker-wsgi diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index 2ca9256..cee4dba 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,4 +1,8 @@ -bin/x2gobroker usr/bin/ -bin/x2gobroker-testauth usr/bin/ -sbin/x2gobroker-keygen usr/sbin/ -sbin/x2gobroker-testagent usr/sbin/ +usr/bin/x2gobroker +usr/bin/x2gobroker-testauth +usr/sbin/x2gobroker-keygen +usr/sbin/x2gobroker-testagent +usr/share/man/man1/x2gobroker.1* +usr/share/man/man1/x2gobroker-testauth.1* +usr/share/man/man8/x2gobroker-keygen.8* +usr/share/man/man8/x2gobroker-testagent.8* diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages deleted file mode 100644 index 44c2255..0000000 --- a/debian/x2gobroker.manpages +++ /dev/null @@ -1,4 +0,0 @@ -man/man1/x2gobroker.1 -man/man1/x2gobroker-testauth.1 -man/man8/x2gobroker-keygen.8 -man/man8/x2gobroker-testagent.8 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org