[arch-commits] Commit in matrix-synapse/repos/community-any (8 files)
Johannes Löthberg
demize at archlinux.org
Thu Jan 10 18:55:34 UTC 2019
Date: Thursday, January 10, 2019 @ 18:55:33
Author: demize
Revision: 422033
archrelease: copy trunk to community-any
Added:
matrix-synapse/repos/community-any/0001-Bump-python_dependencies.patch
(from rev 422032, matrix-synapse/trunk/0001-Bump-python_dependencies.patch)
matrix-synapse/repos/community-any/PKGBUILD
(from rev 422032, matrix-synapse/trunk/PKGBUILD)
matrix-synapse/repos/community-any/synapse.install
(from rev 422032, matrix-synapse/trunk/synapse.install)
matrix-synapse/repos/community-any/synapse.service
(from rev 422032, matrix-synapse/trunk/synapse.service)
matrix-synapse/repos/community-any/sysusers-synapse.conf
(from rev 422032, matrix-synapse/trunk/sysusers-synapse.conf)
Deleted:
matrix-synapse/repos/community-any/PKGBUILD
matrix-synapse/repos/community-any/synapse.install
matrix-synapse/repos/community-any/sysusers-synapse.conf
-------------------------------------+
0001-Bump-python_dependencies.patch | 35 +++++++++
PKGBUILD | 130 ++++++++++++++++++----------------
synapse.install | 50 ++++++-------
synapse.service | 18 ++++
sysusers-synapse.conf | 2
5 files changed, 149 insertions(+), 86 deletions(-)
Copied: matrix-synapse/repos/community-any/0001-Bump-python_dependencies.patch (from rev 422032, matrix-synapse/trunk/0001-Bump-python_dependencies.patch)
===================================================================
--- 0001-Bump-python_dependencies.patch (rev 0)
+++ 0001-Bump-python_dependencies.patch 2019-01-10 18:55:33 UTC (rev 422033)
@@ -0,0 +1,35 @@
+From 3afc953a1b7447ae19a563269b316a86afa38215 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at 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 <johannes at kyriasis.com>
+---
+ synapse/python_dependencies.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
+index 69c5f9fe2..68bae2398 100644
+--- a/synapse/python_dependencies.py
++++ b/synapse/python_dependencies.py
+@@ -53,12 +53,12 @@ REQUIREMENTS = [
+ "sortedcontainers>=1.4.4",
+ "psutil>=2.0.0",
+ "pymacaroons-pynacl>=0.9.3",
+- "msgpack-python>=0.4.2",
++ "msgpack>=0.4.2",
+ "phonenumbers>=8.2.0",
+ "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.6.0",
+ # we use attr.s(slots), which arrived in 16.0.0
+ "attrs>=16.0.0",
+ "netaddr>=0.7.18",
+--
+2.20.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-10 18:55:26 UTC (rev 422032)
+++ PKGBUILD 2019-01-10 18:55:33 UTC (rev 422033)
@@ -1,60 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Ivan Shapovalov <intelfx at intelfx.name>
-
-pkgname=matrix-synapse
-pkgver=0.34.0
-pkgrel=1
-
-pkgdesc="Matrix reference homeserver"
-url="https://github.com/matrix-org/synapse"
-arch=('any')
-license=('Apache')
-
-depends=('python2-jsonschema' 'python2-twisted' 'python2-service-identity'
- 'python2-pyopenssl' 'python2-yaml' 'python2-pyasn1' 'python2-pynacl'
- 'python2-daemonize' 'python2-bcrypt' 'python2-frozendict'
- 'python2-pillow' 'python2-ujson'
- 'python2-pysaml2' 'python2-setuptools'
- 'python2-systemd' 'python2-unpaddedbase64' 'python2-canonicaljson'
- 'python2-signedjson' 'python2-pymacaroons-pynacl'
- 'python2-service-identity' 'python2-msgpack'
- 'python2-phonenumbers' 'python2-prometheus_client'
- 'python2-attrs' 'python2-netaddr' 'python2-sortedcontainers'
- 'python2-treq' 'python2-psutil'
- 'systemd')
-makedepends=('python2-mock')
-checkdepends=('python2-lxml' 'python2-jinja')
-optdepends=('python2-psycopg2: PostgreSQL support'
- 'python2-lxml: URL previewing'
- 'python2-jinja: e-mail notifications'
- 'python2-bleach: e-mail notifications'
- 'python2-psutil: metrics')
-
-source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz"
- 'sysusers-synapse.conf')
-
-md5sums=('799994bc5a17e9a1ec45a9b6de034c0c'
- 'ecd9f66fb57fe1a2e1e2df07a460a35b')
-
-backup=('etc/synapse/log_config.yaml')
-install=synapse.install
-
-build() {
- cd synapse-$pkgver
- python2 setup.py build
-}
-
-#check() {
-# cd synapse-$pkgver
-# PYTHONPATH=. trial tests
-#}
-
-package() {
- cd synapse-$pkgver
- python2 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 contrib/systemd/synapse.service "$pkgdir"/usr/lib/systemd/system/synapse.service
- install -Dm644 "$srcdir"/sysusers-synapse.conf "$pkgdir"/usr/lib/sysusers.d/synapse.conf
-}
Copied: matrix-synapse/repos/community-any/PKGBUILD (from rev 422032, matrix-synapse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-01-10 18:55:33 UTC (rev 422033)
@@ -0,0 +1,70 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Ivan Shapovalov <intelfx at intelfx.name>
+
+pkgname=matrix-synapse
+pkgver=0.34.1.1
+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-pynacl'
+ 'python-service-identity' 'python-msgpack'
+ 'python-phonenumbers' 'python-prometheus_client'
+ 'python-attrs' 'python-netaddr' 'python-sortedcontainers'
+ 'python-treq' 'python-psutil'
+ 'systemd')
+makedepends=('python-mock')
+checkdepends=('python-lxml' 'python-jinja')
+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=('629ce375abd1fd20d45039a0debe3e92'
+ '276a99050f40601089255ea168bb7620'
+ 'ecd9f66fb57fe1a2e1e2df07a460a35b'
+ '6a7ed53d1891acd37b13422b78f1cfbb')
+
+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
+}
Deleted: synapse.install
===================================================================
--- synapse.install 2019-01-10 18:55:26 UTC (rev 422032)
+++ synapse.install 2019-01-10 18:55:33 UTC (rev 422033)
@@ -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 python2 -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.
- Unless you have python2-matrix-angular-sdk installed this will make
- synapse fail to start. Either disable it, or install
- python2-matrix-angular-sdk.
- EOF
- install -dm700 -o 198 -g 198 /var/lib/synapse
- fi
-}
Copied: matrix-synapse/repos/community-any/synapse.install (from rev 422032, matrix-synapse/trunk/synapse.install)
===================================================================
--- synapse.install (rev 0)
+++ synapse.install 2019-01-10 18:55:33 UTC (rev 422033)
@@ -0,0 +1,25 @@
+#!/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 python2 -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.
+ Unless you have python2-matrix-angular-sdk installed this will make
+ synapse fail to start. Either disable it, or install
+ python2-matrix-angular-sdk.
+ EOF
+ install -dm700 -o 198 -g 198 /var/lib/synapse
+ fi
+}
Copied: matrix-synapse/repos/community-any/synapse.service (from rev 422032, matrix-synapse/trunk/synapse.service)
===================================================================
--- synapse.service (rev 0)
+++ synapse.service 2019-01-10 18:55:33 UTC (rev 422033)
@@ -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-01-10 18:55:26 UTC (rev 422032)
+++ sysusers-synapse.conf 2019-01-10 18:55:33 UTC (rev 422033)
@@ -1 +0,0 @@
-u synapse 198 "Matrix Synapse user" /var/lib/synapse
Copied: matrix-synapse/repos/community-any/sysusers-synapse.conf (from rev 422032, matrix-synapse/trunk/sysusers-synapse.conf)
===================================================================
--- sysusers-synapse.conf (rev 0)
+++ sysusers-synapse.conf 2019-01-10 18:55:33 UTC (rev 422033)
@@ -0,0 +1 @@
+u synapse 198 "Matrix Synapse user" /var/lib/synapse
More information about the arch-commits
mailing list