This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch build-main in repository x2gobroker. commit 2a7fe0b9d4090a24965af9f9ea4450c95ce6e9d3 Merge: c5f0813 5e07e8d Author: X2Go Release Manager <git-admin@x2go.org> Date: Sun Feb 3 00:53:38 2019 +0100 Merge branch 'master' into build-main COPYING | 6 +- Makefile | 62 +- Makefile.docupload | 27 +- bin/x2gobroker | 78 ++- bin/x2gobroker-testauth | 34 +- debian/changelog | 170 +++++ debian/control | 154 +++-- debian/copyright | 14 +- debian/python-x2gobroker-doc.doc-base | 10 + debian/python-x2gobroker-doc.docs | 1 + debian/python-x2gobroker-doc.links | 3 + debian/python-x2gobroker.docs | 4 - debian/python-x2gobroker.install | 6 - ...gobroker.default => python3-x2gobroker.default} | 0 ...hon-x2gobroker.dirs => python3-x2gobroker.dirs} | 0 debian/python3-x2gobroker.docs | 3 + debian/python3-x2gobroker.install | 2 + ...broker.postinst => python3-x2gobroker.postinst} | 2 +- ...x2gobroker.postrm => python3-x2gobroker.postrm} | 0 ...gobroker.preinst => python3-x2gobroker.preinst} | 2 +- debian/rules | 19 +- debian/x2gobroker-agent.install | 5 +- debian/x2gobroker-agent.manpages | 1 - debian/x2gobroker-agent.postinst | 2 +- debian/x2gobroker-authservice.install | 8 +- debian/x2gobroker-authservice.manpages | 1 - debian/x2gobroker-authservice.postinst | 2 +- debian/x2gobroker-common.install | 5 + debian/x2gobroker-daemon.install | 7 +- debian/x2gobroker-daemon.manpages | 2 - debian/x2gobroker-daemon.postinst | 2 +- debian/x2gobroker-loadchecker.install | 8 +- debian/x2gobroker-loadchecker.manpages | 1 - debian/x2gobroker-loadchecker.postinst | 4 +- debian/x2gobroker-ssh.install | 5 +- debian/x2gobroker-ssh.manpages | 1 - debian/x2gobroker-ssh.postinst | 2 +- debian/x2gobroker-ssh.prerm | 19 +- debian/x2gobroker-wsgi.install | 6 +- debian/x2gobroker-wsgi.postinst | 2 +- debian/x2gobroker.docs | 1 + debian/x2gobroker.install | 12 +- debian/x2gobroker.manpages | 4 - docs/Makefile | 228 +++++++ .../README.x2goclient+broker.getting-started.md | 39 +- .../source/_static/.placeholder | 0 .../source/_templates/.placeholder | 0 docs/source/conf.py | 442 ++++++++++++ docs/source/index.rst | 109 +++ docs/source/modules.rst | 7 + docs/source/x2gobroker.agent.rst | 7 + docs/source/x2gobroker.authmechs.base_authmech.rst | 7 + .../x2gobroker.authmechs.https_get_authmech.rst | 7 + docs/source/x2gobroker.authmechs.none_authmech.rst | 7 + docs/source/x2gobroker.authmechs.pam_authmech.rst | 7 + docs/source/x2gobroker.authmechs.rst | 21 + .../x2gobroker.authmechs.testsuite_authmech.rst | 7 + docs/source/x2gobroker.authservice.rst | 7 + docs/source/x2gobroker.basicauth.rst | 7 + docs/source/x2gobroker.brokers.base_broker.rst | 7 + docs/source/x2gobroker.brokers.inifile_broker.rst | 7 + docs/source/x2gobroker.brokers.rst | 19 + docs/source/x2gobroker.brokers.zeroconf_broker.rst | 7 + docs/source/x2gobroker.client.plain.rst | 7 + docs/source/x2gobroker.client.rst | 17 + docs/source/x2gobroker.config.rst | 7 + docs/source/x2gobroker.defaults.rst | 7 + docs/source/x2gobroker.loadchecker.rst | 7 + docs/source/x2gobroker.loggers.rst | 7 + .../x2gobroker.nameservices.base_nameservice.rst | 7 + .../x2gobroker.nameservices.libnss_nameservice.rst | 7 + docs/source/x2gobroker.nameservices.rst | 19 + ...gobroker.nameservices.testsuite_nameservice.rst | 7 + .../x2gobroker.optional_scripts.base_script.rst | 7 + docs/source/x2gobroker.optional_scripts.rst | 17 + docs/source/x2gobroker.rst | 38 ++ docs/source/x2gobroker.uccsjson.rst | 7 + docs/source/x2gobroker.utils.rst | 7 + docs/source/x2gobroker.web.extras.rst | 7 + docs/source/x2gobroker.web.json.rst | 7 + docs/source/x2gobroker.web.plain.rst | 7 + docs/source/x2gobroker.web.rst | 20 + docs/source/x2gobroker.web.uccs.rst | 7 + docs/source/x2gobroker.x2gobroker_exceptions.rst | 7 + etc/broker/x2gobroker-authservice-logger.conf | 4 +- etc/broker/x2gobroker-loadchecker-logger.conf | 4 +- etc/broker/x2gobroker-loggers.conf | 4 +- etc/x2gobroker-wsgi.apache.conf | 13 +- etc/x2gobroker-wsgi.apache.vhost | 12 +- etc/x2gobroker.conf | 12 +- init/x2gobroker-authservice.init | 2 +- init/x2gobroker-daemon.init | 2 +- init/x2gobroker-loadchecker.init | 2 +- lib/x2gobroker-agent.pl | 11 +- man/man1/x2gobroker-testauth.1 | 3 +- man/man1/x2gobroker.1 | 3 +- man/man8/x2gobroker-authservice.8 | 3 +- man/man8/x2gobroker-daemon-debug.8 | 3 +- man/man8/x2gobroker-keygen.8 | 3 +- man/man8/x2gobroker-loadchecker.8 | 3 +- man/man8/x2gobroker-pubkeyauthorizer.8 | 3 +- man/man8/x2gobroker-testagent.8 | 3 +- .../python26_debian-squeeze_asyncore.patch | 41 -- sbin/x2gobroker-authservice | 90 +-- sbin/x2gobroker-daemon-debug | 5 +- sbin/x2gobroker-keygen | 23 +- sbin/x2gobroker-loadchecker | 46 +- sbin/x2gobroker-pubkeyauthorizer | 120 ++-- sbin/x2gobroker-testagent | 119 ++-- setup.py | 13 +- src/x2gobroker-agent.c | 23 +- src/x2gobroker-ssh.c | 23 +- test.py | 7 +- tmpfiles.d/x2gobroker-authservice.conf | 2 + tmpfiles.d/x2gobroker-daemon.conf | 2 + tmpfiles.d/x2gobroker-loadchecker.conf | 2 + x2gobroker-loadchecker.service | 6 +- x2gobroker.spec | 447 ++++++------- x2gobroker/__init__.py | 5 +- x2gobroker/_paramiko.py | 43 +- x2gobroker/agent.py | 380 ++++++----- x2gobroker/authmechs/__init__.py | 4 +- x2gobroker/authmechs/base_authmech.py | 33 +- x2gobroker/authmechs/https_get_authmech.py | 61 +- x2gobroker/authmechs/none_authmech.py | 32 +- x2gobroker/authmechs/pam_authmech.py | 53 +- x2gobroker/authmechs/testsuite_authmech.py | 35 +- x2gobroker/authservice.py | 158 ++++- x2gobroker/basicauth.py | 32 +- x2gobroker/brokers/__init__.py | 3 +- x2gobroker/brokers/base_broker.py | 739 +++++++++++---------- x2gobroker/brokers/inifile_broker.py | 106 ++- x2gobroker/brokers/zeroconf_broker.py | 110 +-- x2gobroker/client/__init__.py | 3 +- x2gobroker/client/plain.py | 84 ++- x2gobroker/config.py | 172 ++--- x2gobroker/defaults.py | 325 +++++---- x2gobroker/loadchecker.py | 203 ++++-- x2gobroker/loggers.py | 48 +- x2gobroker/nameservices/__init__.py | 3 +- x2gobroker/nameservices/base_nameservice.py | 106 ++- x2gobroker/nameservices/libnss_nameservice.py | 59 +- x2gobroker/nameservices/testsuite_nameservice.py | 70 +- x2gobroker/optional_scripts/__init__.py | 3 +- x2gobroker/optional_scripts/base_script.py | 40 +- x2gobroker/tests/__init__.py | 3 +- x2gobroker/tests/runalltests.py | 3 +- x2gobroker/tests/test_broker_agent.py | 48 +- x2gobroker/tests/test_broker_base.py | 434 +++++++----- x2gobroker/tests/test_broker_inifile.py | 215 +++--- x2gobroker/tests/test_broker_zeroconf.py | 85 +-- x2gobroker/tests/test_client_plain_base.py | 16 +- x2gobroker/tests/test_uccsjson.py | 2 + x2gobroker/tests/test_utils.py | 15 +- x2gobroker/tests/test_web_plain_base.py | 61 +- x2gobroker/tests/test_web_plain_inifile.py | 3 +- x2gobroker/tests/test_web_plain_zeroconf.py | 15 +- x2gobroker/tests/test_web_uccs_zeroconf.py | 62 +- x2gobroker/uccsjson.py | 290 +++++--- x2gobroker/utils.py | 236 ++++++- x2gobroker/web/__init__.py | 3 +- x2gobroker/web/extras.py | 20 +- x2gobroker/web/json.py | 87 ++- x2gobroker/web/plain.py | 98 ++- x2gobroker/web/uccs.py | 121 +++- x2gobroker/x2gobroker_exceptions.py | 26 +- 166 files changed, 5299 insertions(+), 2375 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git