Date: Friday, June 14, 2019 @ 09:12:19 Author: demize Revision: 481410
archrelease: copy trunk to community-testing-any Added: matrix-synapse/repos/community-testing-any/0001-Bump-python_dependencies.patch (from rev 481409, matrix-synapse/trunk/0001-Bump-python_dependencies.patch) matrix-synapse/repos/community-testing-any/PKGBUILD (from rev 481409, matrix-synapse/trunk/PKGBUILD) matrix-synapse/repos/community-testing-any/synapse.install (from rev 481409, matrix-synapse/trunk/synapse.install) matrix-synapse/repos/community-testing-any/synapse.service (from rev 481409, matrix-synapse/trunk/synapse.service) matrix-synapse/repos/community-testing-any/sysusers-synapse.conf (from rev 481409, matrix-synapse/trunk/sysusers-synapse.conf) Deleted: matrix-synapse/repos/community-testing-any/0001-Bump-python_dependencies.patch matrix-synapse/repos/community-testing-any/PKGBUILD matrix-synapse/repos/community-testing-any/synapse.install matrix-synapse/repos/community-testing-any/synapse.service matrix-synapse/repos/community-testing-any/sysusers-synapse.conf -------------------------------------+ 0001-Bump-python_dependencies.patch | 58 ++++++------- PKGBUILD | 142 +++++++++++++++++----------------- synapse.install | 60 ++++++++------ synapse.service | 36 ++++---- sysusers-synapse.conf | 2 5 files changed, 156 insertions(+), 142 deletions(-) Deleted: 0001-Bump-python_dependencies.patch =================================================================== --- 0001-Bump-python_dependencies.patch 2019-06-14 09:12:10 UTC (rev 481409) +++ 0001-Bump-python_dependencies.patch 2019-06-14 09:12:19 UTC (rev 481410) @@ -1,29 +0,0 @@ -From c1a7db468d4dbb3958f5b480fcde760566962ba4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> -Date: Tue, 8 Jan 2019 20:09:50 +0100 -Subject: [PATCH] Bump python_dependencies -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> ---- - synapse/python_dependencies.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py -index f71e21ff4..b49873781 100644 ---- a/synapse/python_dependencies.py -+++ b/synapse/python_dependencies.py -@@ -62,7 +62,7 @@ REQUIREMENTS = [ - "six>=1.10", - # prometheus_client 0.4.0 changed the format of counter metrics - # (cf https://github.com/matrix-org/synapse/issues/4001) -- "prometheus_client>=0.0.18,<0.4.0", -+ "prometheus_client>=0.0.18,<0.7.0", - - # we use attr.s(slots), which arrived in 16.0.0 - # Twisted 18.7.0 requires attrs>=17.4.0 --- -2.21.0 - Copied: matrix-synapse/repos/community-testing-any/0001-Bump-python_dependencies.patch (from rev 481409, matrix-synapse/trunk/0001-Bump-python_dependencies.patch) =================================================================== --- 0001-Bump-python_dependencies.patch (rev 0) +++ 0001-Bump-python_dependencies.patch 2019-06-14 09:12:19 UTC (rev 481410) @@ -0,0 +1,29 @@ +From c1a7db468d4dbb3958f5b480fcde760566962ba4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> +Date: Tue, 8 Jan 2019 20:09:50 +0100 +Subject: [PATCH] Bump python_dependencies +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> +--- + synapse/python_dependencies.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py +index f71e21ff4..b49873781 100644 +--- a/synapse/python_dependencies.py ++++ b/synapse/python_dependencies.py +@@ -62,7 +62,7 @@ REQUIREMENTS = [ + "six>=1.10", + # prometheus_client 0.4.0 changed the format of counter metrics + # (cf https://github.com/matrix-org/synapse/issues/4001) +- "prometheus_client>=0.0.18,<0.4.0", ++ "prometheus_client>=0.0.18,<0.7.0", + + # we use attr.s(slots), which arrived in 16.0.0 + # Twisted 18.7.0 requires attrs>=17.4.0 +-- +2.21.0 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-06-14 09:12:10 UTC (rev 481409) +++ PKGBUILD 2019-06-14 09:12:19 UTC (rev 481410) @@ -1,69 +0,0 @@ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Ivan Shapovalov <inte...@intelfx.name> - -pkgname=matrix-synapse -pkgver=1.0.0 -pkgrel=1 - -pkgdesc="Matrix reference homeserver" -url="https://github.com/matrix-org/synapse" -arch=('any') -license=('Apache') - -depends=('python-jsonschema' 'python-twisted' 'python-service-identity' - 'python-pyopenssl' 'python-yaml' 'python-pyasn1' 'python-pynacl' - 'python-daemonize' 'python-bcrypt' 'python-frozendict' - 'python-pillow' 'python-ujson' - 'python-pysaml2' 'python-setuptools' - 'python-systemd' 'python-unpaddedbase64' 'python-canonicaljson' - 'python-signedjson' 'python-pymacaroons' - 'python-service-identity' 'python-msgpack' - 'python-phonenumbers' 'python-prometheus_client' - 'python-attrs' 'python-netaddr' 'python-sortedcontainers' - 'python-treq' 'python-psutil' 'python-idna' - 'systemd') -checkdepends=('python-lxml' 'python-jinja' 'python-bleach' 'python-mock' 'python-parameterized') -optdepends=('python-psycopg2: PostgreSQL support' - 'python-lxml: URL previewing' - 'python-jinja: e-mail notifications' - 'python-bleach: e-mail notifications' - 'python-psutil: metrics') - -source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz" - 'synapse.service' - 'sysusers-synapse.conf' - '0001-Bump-python_dependencies.patch') - -md5sums=('cfb7afff9560ee30fb5d0ad68bf140e2' - '276a99050f40601089255ea168bb7620' - 'ecd9f66fb57fe1a2e1e2df07a460a35b' - 'ad2900abb04351778e577175cedf6edc') - -backup=('etc/synapse/log_config.yaml') -install=synapse.install - -prepare() { - cd synapse-$pkgver - patch -p1 <"$srcdir"/0001-Bump-python_dependencies.patch -} - -build() { - cd synapse-$pkgver - python setup.py build -} - -check() { - cd synapse-$pkgver - PYTHONPATH=. trial3 tests -} - -package() { - install -Dm644 synapse.service "$pkgdir"/usr/lib/systemd/system/synapse.service - - cd synapse-$pkgver - python setup.py install --root "$pkgdir" --optimize=1 --skip-build - - install -dm755 -o 198 -g 198 "$pkgdir"/etc/synapse - install -Dm644 contrib/systemd/log_config.yaml "$pkgdir"/etc/synapse/log_config.yaml - install -Dm644 "$srcdir"/sysusers-synapse.conf "$pkgdir"/usr/lib/sysusers.d/synapse.conf -} Copied: matrix-synapse/repos/community-testing-any/PKGBUILD (from rev 481409, matrix-synapse/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-06-14 09:12:19 UTC (rev 481410) @@ -0,0 +1,73 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Ivan Shapovalov <inte...@intelfx.name> + +pkgname=matrix-synapse +pkgver=1.0.0 +pkgrel=1 + +pkgdesc="Matrix reference homeserver" +url="https://github.com/matrix-org/synapse" +arch=('any') +license=('Apache') + +depends=('python-jsonschema' 'python-twisted' 'python-service-identity' + 'python-pyopenssl' 'python-yaml' 'python-pyasn1' 'python-pynacl' + 'python-daemonize' 'python-bcrypt' 'python-frozendict' + 'python-pillow' 'python-ujson' + 'python-pysaml2' 'python-setuptools' + 'python-systemd' 'python-unpaddedbase64' 'python-canonicaljson' + 'python-signedjson' 'python-pymacaroons' + 'python-service-identity' 'python-msgpack' + 'python-phonenumbers' 'python-prometheus_client' + 'python-attrs' 'python-netaddr' 'python-sortedcontainers' + 'python-treq' 'python-psutil' 'python-idna' + 'systemd') +checkdepends=('python-lxml' 'python-jinja' 'python-bleach' 'python-mock' 'python-parameterized') +optdepends=('python-psycopg2: PostgreSQL support' + 'python-lxml: URL previewing' + 'python-jinja: e-mail notifications' + 'python-bleach: e-mail notifications' + 'python-psutil: metrics') + +source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz" + 'synapse.service' + 'sysusers-synapse.conf' + '0001-Bump-python_dependencies.patch') + +md5sums=('cfb7afff9560ee30fb5d0ad68bf140e2' + '276a99050f40601089255ea168bb7620' + 'ecd9f66fb57fe1a2e1e2df07a460a35b' + 'ad2900abb04351778e577175cedf6edc') + +backup=('etc/synapse/log_config.yaml') +install=synapse.install + +prepare() { + cd synapse-$pkgver + patch -p1 <"$srcdir"/0001-Bump-python_dependencies.patch +} + +build() { + cd synapse-$pkgver + python setup.py build +} + +check() { + cd synapse-$pkgver +# PYTHONPATH=. trial3 tests +} + +package() { + install -Dm644 synapse.service "$pkgdir"/usr/lib/systemd/system/synapse.service + + cd synapse-$pkgver + python setup.py install --root "$pkgdir" --optimize=1 --skip-build + + install -dm755 -o 198 -g 198 "$pkgdir"/etc/synapse + install -dm700 -o 198 -g 198 "$pkgdir"/var/lib/synapse/ + cp -a synapse/res/ "$pkgdir"/var/lib/synapse/ + chown -R 198:198 "$pkgdir"/var/lib/synapse/res + + install -Dm644 contrib/systemd/log_config.yaml "$pkgdir"/etc/synapse/log_config.yaml + install -Dm644 "$srcdir"/sysusers-synapse.conf "$pkgdir"/usr/lib/sysusers.d/synapse.conf +} Deleted: synapse.install =================================================================== --- synapse.install 2019-06-14 09:12:10 UTC (rev 481409) +++ synapse.install 2019-06-14 09:12:19 UTC (rev 481410) @@ -1,25 +0,0 @@ -#!/bin/bash - -# arg 1: the new package version -post_install() { - if [[ ! -e /etc/synapse/homeserver.yaml ]]; then - cat <<-EOF - ==> A synapse configuration file needs to be generated before you can - start synapse, and you should make sure that it's readable by the - synapse user. - - cd /var/lib/synapse - sudo -u synapse python -m synapse.app.homeserver \\ - --server-name my.domain.name \\ - --config-path /etc/synapse/homeserver.yaml \\ - --generate-config \\ - --report-stats=yes - - N.B.: The default synapse config enables the webclient feature. - You need to either disable it, install the syweb python package - from matrix-angular-sdk, or set 'web_client_location' to a path - to make synapse not try to serve it using syweb. - EOF - install -dm700 -o 198 -g 198 /var/lib/synapse - fi -} Copied: matrix-synapse/repos/community-testing-any/synapse.install (from rev 481409, matrix-synapse/trunk/synapse.install) =================================================================== --- synapse.install (rev 0) +++ synapse.install 2019-06-14 09:12:19 UTC (rev 481410) @@ -0,0 +1,35 @@ +#!/bin/bash + +# arg 1: the new package version +post_install() { + if [[ ! -e /etc/synapse/homeserver.yaml ]]; then + cat <<-EOF + ==> A synapse configuration file needs to be generated before you can + start synapse, and you should make sure that it's readable by the + synapse user. + + cd /var/lib/synapse + sudo -u synapse python -m synapse.app.homeserver \\ + --server-name my.domain.name \\ + --config-path /etc/synapse/homeserver.yaml \\ + --generate-config \\ + --report-stats=yes + + N.B.: The default synapse config enables the webclient feature. + You need to either disable it, install the syweb python package + from matrix-angular-sdk, or set 'web_client_location' to a path + to make synapse not try to serve it using syweb. + EOF + install -dm700 -o 198 -g 198 /var/lib/synapse + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [[ "$(vercmp "$2" 1.0.0-1)" -lt 0 ]]; then + cat <<-EOF + ==> Upstream email templates are now available in /var/lib/synapse/res/templates. + EOF + fi +} Deleted: synapse.service =================================================================== --- synapse.service 2019-06-14 09:12:10 UTC (rev 481409) +++ synapse.service 2019-06-14 09:12:19 UTC (rev 481410) @@ -1,18 +0,0 @@ -[Unit] -Description=Synapse Matrix homeserver -After=network-online.target -Requires=network-online.target - -[Service] -Type=simple -User=synapse -Group=synapse -SyslogIdentifier=synapse -Environment=LANG=en_US.UTF-8 -WorkingDirectory=/var/lib/synapse -ExecStart=/usr/bin/python3.7 -m synapse.app.homeserver --config-path=/etc/synapse/homeserver.yaml -ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml -EnvironmentFile=-/etc/default/synapse - -[Install] -WantedBy=multi-user.target Copied: matrix-synapse/repos/community-testing-any/synapse.service (from rev 481409, matrix-synapse/trunk/synapse.service) =================================================================== --- synapse.service (rev 0) +++ synapse.service 2019-06-14 09:12:19 UTC (rev 481410) @@ -0,0 +1,18 @@ +[Unit] +Description=Synapse Matrix homeserver +After=network-online.target +Requires=network-online.target + +[Service] +Type=simple +User=synapse +Group=synapse +SyslogIdentifier=synapse +Environment=LANG=en_US.UTF-8 +WorkingDirectory=/var/lib/synapse +ExecStart=/usr/bin/python3.7 -m synapse.app.homeserver --config-path=/etc/synapse/homeserver.yaml +ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml +EnvironmentFile=-/etc/default/synapse + +[Install] +WantedBy=multi-user.target Deleted: sysusers-synapse.conf =================================================================== --- sysusers-synapse.conf 2019-06-14 09:12:10 UTC (rev 481409) +++ sysusers-synapse.conf 2019-06-14 09:12:19 UTC (rev 481410) @@ -1 +0,0 @@ -u synapse 198 "Matrix Synapse user" /var/lib/synapse Copied: matrix-synapse/repos/community-testing-any/sysusers-synapse.conf (from rev 481409, matrix-synapse/trunk/sysusers-synapse.conf) =================================================================== --- sysusers-synapse.conf (rev 0) +++ sysusers-synapse.conf 2019-06-14 09:12:19 UTC (rev 481410) @@ -0,0 +1 @@ +u synapse 198 "Matrix Synapse user" /var/lib/synapse