[arch-commits] Commit in matrix-synapse/repos/community-any (12 files)

Johannes Löthberg demize at archlinux.org
Mon Jul 6 15:09:54 UTC 2020


    Date: Monday, July 6, 2020 @ 15:09:53
  Author: demize
Revision: 658026

archrelease: copy trunk to community-any

Added:
  matrix-synapse/repos/community-any/PKGBUILD
    (from rev 658025, matrix-synapse/trunk/PKGBUILD)
  matrix-synapse/repos/community-any/prometheus-client-bound-bump.patch
    (from rev 658025, matrix-synapse/trunk/prometheus-client-bound-bump.patch)
  matrix-synapse/repos/community-any/synapse.install
    (from rev 658025, matrix-synapse/trunk/synapse.install)
  matrix-synapse/repos/community-any/synapse.service
    (from rev 658025, matrix-synapse/trunk/synapse.service)
  matrix-synapse/repos/community-any/sysusers-synapse.conf
    (from rev 658025, matrix-synapse/trunk/sysusers-synapse.conf)
  matrix-synapse/repos/community-any/tmpfiles-synapse.conf
    (from rev 658025, matrix-synapse/trunk/tmpfiles-synapse.conf)
Deleted:
  matrix-synapse/repos/community-any/PKGBUILD
  matrix-synapse/repos/community-any/prometheus-client-bound-bump.patch
  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-any/tmpfiles-synapse.conf

------------------------------------+
 PKGBUILD                           |  148 +++++++++++++++++------------------
 prometheus-client-bound-bump.patch |   22 ++---
 synapse.install                    |   76 ++++++++---------
 synapse.service                    |   36 ++++----
 sysusers-synapse.conf              |    2 
 tmpfiles-synapse.conf              |    2 
 6 files changed, 143 insertions(+), 143 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-06 15:09:42 UTC (rev 658025)
+++ PKGBUILD	2020-07-06 15:09:53 UTC (rev 658026)
@@ -1,74 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Ivan Shapovalov <intelfx at intelfx.name>
-
-pkgname=matrix-synapse
-pkgver=1.15.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'
-         'python-service-identity' 'python-msgpack'
-         'python-phonenumbers' 'python-prometheus_client'
-         'python-attrs' 'python-netaddr' 'python-sortedcontainers'
-         'python-treq' 'python-idna' 'python-jinja'
-         'python-bleach' 'python-typing_extensions' 'systemd')
-checkdepends=('python-lxml' 'python-mock' 'python-parameterized')
-optdepends=('perl: sync_room_to_group.pl'
-            'python-psycopg2: PostgreSQL support'
-            'python-lxml: URL previewing'
-            'python-psutil: metrics'
-            'python-pyjwt: jwt')
-
-source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz"
-        'synapse.service'
-        'sysusers-synapse.conf'
-        'tmpfiles-synapse.conf'
-        'prometheus-client-bound-bump.patch')
-
-md5sums=('7a805082217699784621d7ffd2b3b88d'
-         'fb196dee4f38a4b19e0a160f45574032'
-         'ecd9f66fb57fe1a2e1e2df07a460a35b'
-         'e961c9ecad84a70345a57a7e9e6d5b09'
-         '4cb91413c521e8e25216249040d3a2db')
-
-backup=('etc/synapse/log_config.yaml')
-install=synapse.install
-
-prepare() {
-	cd synapse-$pkgver
-	patch -p1 <"$srcdir"/prometheus-client-bound-bump.patch
-}
-
-build() {
-	cd synapse-$pkgver
-	python setup.py build
-}
-
-## OIDC test is unconditionally run but requires authlib which isn't packaged yet, and trial doesn't have a way to specify tests to skip.
-#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
-	install -Dm644 "$srcdir"/tmpfiles-synapse.conf "$pkgdir"/usr/lib/tmpfiles.d/synapse.conf
-}

Copied: matrix-synapse/repos/community-any/PKGBUILD (from rev 658025, matrix-synapse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-06 15:09:53 UTC (rev 658026)
@@ -0,0 +1,74 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Ivan Shapovalov <intelfx at intelfx.name>
+
+pkgname=matrix-synapse
+pkgver=1.15.2
+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-idna' 'python-jinja'
+         'python-bleach' 'python-typing_extensions' 'systemd')
+checkdepends=('python-lxml' 'python-mock' 'python-parameterized')
+optdepends=('perl: sync_room_to_group.pl'
+            'python-psycopg2: PostgreSQL support'
+            'python-lxml: URL previewing'
+            'python-psutil: metrics'
+            'python-pyjwt: jwt')
+
+source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz"
+        'synapse.service'
+        'sysusers-synapse.conf'
+        'tmpfiles-synapse.conf'
+        'prometheus-client-bound-bump.patch')
+
+md5sums=('cc2029c5fcce3258af9a497d51aa5b8e'
+         'fb196dee4f38a4b19e0a160f45574032'
+         'ecd9f66fb57fe1a2e1e2df07a460a35b'
+         'e961c9ecad84a70345a57a7e9e6d5b09'
+         '4cb91413c521e8e25216249040d3a2db')
+
+backup=('etc/synapse/log_config.yaml')
+install=synapse.install
+
+prepare() {
+	cd synapse-$pkgver
+	patch -p1 <"$srcdir"/prometheus-client-bound-bump.patch
+}
+
+build() {
+	cd synapse-$pkgver
+	python setup.py build
+}
+
+## OIDC test is unconditionally run but requires authlib which isn't packaged yet, and trial doesn't have a way to specify tests to skip.
+#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
+	install -Dm644 "$srcdir"/tmpfiles-synapse.conf "$pkgdir"/usr/lib/tmpfiles.d/synapse.conf
+}

Deleted: prometheus-client-bound-bump.patch
===================================================================
--- prometheus-client-bound-bump.patch	2020-07-06 15:09:42 UTC (rev 658025)
+++ prometheus-client-bound-bump.patch	2020-07-06 15:09:53 UTC (rev 658026)
@@ -1,11 +0,0 @@
---- a/synapse/python_dependencies.py
-+++ b/synapse/python_dependencies.py
-@@ -67,7 +67,7 @@ REQUIREMENTS = [
-     "msgpack>=0.5.2",
-     "phonenumbers>=8.2.0",
-     "six>=1.10",
--    "prometheus_client>=0.0.18,<0.8.0",
-+    "prometheus_client>=0.0.18,<0.9.0",
-     # we use attr.s(slots), which arrived in 16.0.0
-     # Twisted 18.7.0 requires attrs>=17.4.0
-     "attrs>=17.4.0",

Copied: matrix-synapse/repos/community-any/prometheus-client-bound-bump.patch (from rev 658025, matrix-synapse/trunk/prometheus-client-bound-bump.patch)
===================================================================
--- prometheus-client-bound-bump.patch	                        (rev 0)
+++ prometheus-client-bound-bump.patch	2020-07-06 15:09:53 UTC (rev 658026)
@@ -0,0 +1,11 @@
+--- a/synapse/python_dependencies.py
++++ b/synapse/python_dependencies.py
+@@ -67,7 +67,7 @@ REQUIREMENTS = [
+     "msgpack>=0.5.2",
+     "phonenumbers>=8.2.0",
+     "six>=1.10",
+-    "prometheus_client>=0.0.18,<0.8.0",
++    "prometheus_client>=0.0.18,<0.9.0",
+     # we use attr.s(slots), which arrived in 16.0.0
+     # Twisted 18.7.0 requires attrs>=17.4.0
+     "attrs>=17.4.0",

Deleted: synapse.install
===================================================================
--- synapse.install	2020-07-06 15:09:42 UTC (rev 658025)
+++ synapse.install	2020-07-06 15:09:53 UTC (rev 658026)
@@ -1,38 +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
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [[ "$(vercmp "$2" 1.4.0-2)" -lt 0 ]]; then
-		cat <<-EOF
-		==> Upstream email templates are no longer available in /var/lib/synapse/res/templates.
-
-		    If you want to customize the templates, you can copy the default ones from
-		    /usr/lib/python3.x/site-packages/synapse/res/templates/
-		EOF
-	fi
-}

Copied: matrix-synapse/repos/community-any/synapse.install (from rev 658025, matrix-synapse/trunk/synapse.install)
===================================================================
--- synapse.install	                        (rev 0)
+++ synapse.install	2020-07-06 15:09:53 UTC (rev 658026)
@@ -0,0 +1,38 @@
+#!/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.4.0-2)" -lt 0 ]]; then
+		cat <<-EOF
+		==> Upstream email templates are no longer available in /var/lib/synapse/res/templates.
+
+		    If you want to customize the templates, you can copy the default ones from
+		    /usr/lib/python3.x/site-packages/synapse/res/templates/
+		EOF
+	fi
+}

Deleted: synapse.service
===================================================================
--- synapse.service	2020-07-06 15:09:42 UTC (rev 658025)
+++ synapse.service	2020-07-06 15:09:53 UTC (rev 658026)
@@ -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 -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 658025, matrix-synapse/trunk/synapse.service)
===================================================================
--- synapse.service	                        (rev 0)
+++ synapse.service	2020-07-06 15:09:53 UTC (rev 658026)
@@ -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 -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	2020-07-06 15:09:42 UTC (rev 658025)
+++ sysusers-synapse.conf	2020-07-06 15:09:53 UTC (rev 658026)
@@ -1 +0,0 @@
-u synapse 198 "Matrix Synapse user" /var/lib/synapse

Copied: matrix-synapse/repos/community-any/sysusers-synapse.conf (from rev 658025, matrix-synapse/trunk/sysusers-synapse.conf)
===================================================================
--- sysusers-synapse.conf	                        (rev 0)
+++ sysusers-synapse.conf	2020-07-06 15:09:53 UTC (rev 658026)
@@ -0,0 +1 @@
+u synapse 198 "Matrix Synapse user" /var/lib/synapse

Deleted: tmpfiles-synapse.conf
===================================================================
--- tmpfiles-synapse.conf	2020-07-06 15:09:42 UTC (rev 658025)
+++ tmpfiles-synapse.conf	2020-07-06 15:09:53 UTC (rev 658026)
@@ -1 +0,0 @@
-d /var/lib/synapse 0700 synapse synapse -

Copied: matrix-synapse/repos/community-any/tmpfiles-synapse.conf (from rev 658025, matrix-synapse/trunk/tmpfiles-synapse.conf)
===================================================================
--- tmpfiles-synapse.conf	                        (rev 0)
+++ tmpfiles-synapse.conf	2020-07-06 15:09:53 UTC (rev 658026)
@@ -0,0 +1 @@
+d /var/lib/synapse 0700 synapse synapse -


More information about the arch-commits mailing list