Date: Tuesday, February 5, 2019 @ 19:43:35
Author: demize
Revision: 429669
db-move: moved matrix-synapse from [community-testing] to [community] (any)
Added:
matrix-synapse/repos/community-any/0001-Bump-python_dependencies.patch
(from rev 429668,
matrix-synapse/repos/community-testing-any/0001-Bump-python_dependencies.patch)
matrix-synapse/repos/community-any/PKGBUILD
(from rev 429668, matrix-synapse/repos/community-testing-any/PKGBUILD)
matrix-synapse/repos/community-any/synapse.install
(from rev 429668,
matrix-synapse/repos/community-testing-any/synapse.install)
matrix-synapse/repos/community-any/synapse.service
(from rev 429668,
matrix-synapse/repos/community-testing-any/synapse.service)
matrix-synapse/repos/community-any/sysusers-synapse.conf
(from rev 429668,
matrix-synapse/repos/community-testing-any/sysusers-synapse.conf)
Deleted:
matrix-synapse/repos/community-any/0001-Bump-python_dependencies.patch
matrix-synapse/repos/community-any/PKGBUILD
matrix-synapse/repos/community-any/synapse.install
matrix-synapse/repos/community-any/synapse.service
matrix-synapse/repos/community-any/sysusers-synapse.conf
matrix-synapse/repos/community-testing-any/
---------------------------------------------------+
/0001-Bump-python_dependencies.patch | 29 ++++++++
/PKGBUILD | 70 ++++++++++++++++++++
/synapse.install | 25 +++++++
/synapse.service | 18 +++++
/sysusers-synapse.conf | 1
community-any/0001-Bump-python_dependencies.patch | 35 ----------
community-any/PKGBUILD | 70 --------------------
community-any/synapse.install | 25 -------
community-any/synapse.service | 18 -----
community-any/sysusers-synapse.conf | 1
10 files changed, 143 insertions(+), 149 deletions(-)
Deleted: community-any/0001-Bump-python_dependencies.patch
===================================================================
--- community-any/0001-Bump-python_dependencies.patch 2019-02-05 19:42:54 UTC
(rev 429668)
+++ community-any/0001-Bump-python_dependencies.patch 2019-02-05 19:43:35 UTC
(rev 429669)
@@ -1,35 +0,0 @@
-From 3afc953a1b7447ae19a563269b316a86afa38215 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 | 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
-
Copied: matrix-synapse/repos/community-any/0001-Bump-python_dependencies.patch
(from rev 429668,
matrix-synapse/repos/community-testing-any/0001-Bump-python_dependencies.patch)
===================================================================
--- community-any/0001-Bump-python_dependencies.patch
(rev 0)
+++ community-any/0001-Bump-python_dependencies.patch 2019-02-05 19:43:35 UTC
(rev 429669)
@@ -0,0 +1,29 @@
+From 0ffec97c70515e3ea3c2717a8eaa657fdd8fdf18 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 756721e30..f8ee9e53f 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.6.0",
+
+ # we use attr.s(slots), which arrived in 16.0.0
+ # Twisted 18.7.0 requires attrs>=17.4.0
+--
+2.20.1
+
Deleted: community-any/PKGBUILD
===================================================================
--- community-any/PKGBUILD 2019-02-05 19:42:54 UTC (rev 429668)
+++ community-any/PKGBUILD 2019-02-05 19:43:35 UTC (rev 429669)
@@ -1,70 +0,0 @@
-# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
-# Contributor: Ivan Shapovalov <inte...@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
-}
Copied: matrix-synapse/repos/community-any/PKGBUILD (from rev 429668,
matrix-synapse/repos/community-testing-any/PKGBUILD)
===================================================================
--- community-any/PKGBUILD (rev 0)
+++ community-any/PKGBUILD 2019-02-05 19:43:35 UTC (rev 429669)
@@ -0,0 +1,70 @@
+# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
+# Contributor: Ivan Shapovalov <inte...@intelfx.name>
+
+pkgname=matrix-synapse
+pkgver=0.99.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'
+ '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=('038d087aa4b813b61ae7a0c0ea27abde'
+ '276a99050f40601089255ea168bb7620'
+ 'ecd9f66fb57fe1a2e1e2df07a460a35b'
+ '62b94bdcd227ec2d097ba2eb28fe36df')
+
+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: community-any/synapse.install
===================================================================
--- community-any/synapse.install 2019-02-05 19:42:54 UTC (rev 429668)
+++ community-any/synapse.install 2019-02-05 19:43:35 UTC (rev 429669)
@@ -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 429668,
matrix-synapse/repos/community-testing-any/synapse.install)
===================================================================
--- community-any/synapse.install (rev 0)
+++ community-any/synapse.install 2019-02-05 19:43:35 UTC (rev 429669)
@@ -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
+}
Deleted: community-any/synapse.service
===================================================================
--- community-any/synapse.service 2019-02-05 19:42:54 UTC (rev 429668)
+++ community-any/synapse.service 2019-02-05 19:43:35 UTC (rev 429669)
@@ -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-any/synapse.service (from rev 429668,
matrix-synapse/repos/community-testing-any/synapse.service)
===================================================================
--- community-any/synapse.service (rev 0)
+++ community-any/synapse.service 2019-02-05 19:43:35 UTC (rev 429669)
@@ -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: community-any/sysusers-synapse.conf
===================================================================
--- community-any/sysusers-synapse.conf 2019-02-05 19:42:54 UTC (rev 429668)
+++ community-any/sysusers-synapse.conf 2019-02-05 19:43:35 UTC (rev 429669)
@@ -1 +0,0 @@
-u synapse 198 "Matrix Synapse user" /var/lib/synapse
Copied: matrix-synapse/repos/community-any/sysusers-synapse.conf (from rev
429668, matrix-synapse/repos/community-testing-any/sysusers-synapse.conf)
===================================================================
--- community-any/sysusers-synapse.conf (rev 0)
+++ community-any/sysusers-synapse.conf 2019-02-05 19:43:35 UTC (rev 429669)
@@ -0,0 +1 @@
+u synapse 198 "Matrix Synapse user" /var/lib/synapse
