Bump; update {opt,check}depends; allow using prometheus_client==0.8.0

4 files changed, 67 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e183d20c4052..ef15c1d7e43d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = matrix-synapse-git
 	pkgdesc = Matrix reference homeserver
-	pkgver = 1.14.0rc1.r2.g98483890e
+	pkgver = 1.14.0.r1.g38c1fdb14
 	pkgrel = 1
 	url = https://github.com/matrix-org/synapse
 	install = synapse.install
@@ -9,6 +9,7 @@ pkgbase = matrix-synapse-git
 	checkdepends = python-lxml
 	checkdepends = python-mock
 	checkdepends = python-parameterized
+	checkdepends = python-authlib
 	makedepends = git
 	depends = python-jsonschema
 	depends = python-twisted
@@ -43,17 +44,30 @@ pkgbase = matrix-synapse-git
 	depends = python-bleach
 	depends = python-psutil
 	depends = python-typing-extensions
+	depends = python-idna
+	depends = python-pyasn1-modules
+	depends = python-six
 	depends = systemd
+	optdepends = python-matrix-synapse-ldap3: LDAP3 auth provider
 	optdepends = python-psycopg2: PostgreSQL support
+	optdepends = python-txacme: ACME support (Let's Encrypt)
+	optdepends = python-pysaml2: SAML2 support
+	optdepends = python-authlib: OIDC support
 	optdepends = python-lxml: URL previewing
+	optdepends = python-sentry_sdk: Sentry support
+	optdepends = python-pyjwt: JWT support
+	optdepends = python-txredisapi: worker communication via Redis
+	optdepends = python-hiredis: worker communication via Redis (faster)
 	provides = matrix-synapse
 	conflicts = matrix-synapse
 	replaces = matrix-synapse-py3-git
 	backup = etc/synapse/log_config.yaml
-	source = git+https://github.com/matrix-org/synapse.git#branch=develop
+	source = git+https://github.com/matrix-org/synapse.git#branch=master
+	source = 0001-synapse-python_dependencies.py-permit-prometheus_cli.patch
 	source = synapse.service
 	source = sysusers-synapse.conf
 	md5sums = SKIP
+	md5sums = bcbaf40db1116b0c4ec4e1dc8f5e89b6
 	md5sums = c4352682c5fb5eb0440ceb54a20ac4cb
 	md5sums = ecd9f66fb57fe1a2e1e2df07a460a35b
 
diff --git a/0001-Bump-python_dependencies.patch b/0001-Bump-python_dependencies.patch
deleted file mode 100644
index fefcbff6266b..000000000000
--- a/0001-Bump-python_dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d4bc2cdd2dfdef1abd36a0c00fc0c5d528b85fa6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@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@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 13698d963..f2b4259b2 100644
---- a/synapse/python_dependencies.py
-+++ b/synapse/python_dependencies.py
-@@ -67,7 +67,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
-     "attrs>=17.4.0",
--- 
-2.22.0
-
diff --git a/0001-synapse-python_dependencies.py-permit-prometheus_cli.patch b/0001-synapse-python_dependencies.py-permit-prometheus_cli.patch
new file mode 100644
index 000000000000..6d2e559bf3d3
--- /dev/null
+++ b/0001-synapse-python_dependencies.py-permit-prometheus_cli.patch
@@ -0,0 +1,26 @@
+From 34f80c8bd96660aa19fe0fda61ed515099887ca3 Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Thu, 4 Jun 2020 15:43:52 +0300
+Subject: [PATCH] synapse: python_dependencies.py: permit prometheus_client
+ 0.8.x
+
+---
+ 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 8b4312e5a..f0ed8ab55 100644
+--- 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",
+-- 
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 70d3b174fb46..24b5953dac4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Johannes Löthberg <johannes@kyriasis.com>
 
 pkgname=matrix-synapse-git
-pkgver=1.14.0rc1.r2.g98483890e
+pkgver=1.14.0.r1.g38c1fdb14
 pkgrel=1
 
 pkgdesc="Matrix reference homeserver"
@@ -22,17 +22,29 @@ depends=('python-jsonschema' 'python-twisted' 'python-service-identity'
          'python-attrs' 'python-netaddr' 'python-sortedcontainers'
          'python-treq' 'python-psutil' 'python-sdnotify' 'python-jinja'
          'python-bleach' 'python-psutil' 'python-typing-extensions'
+         'python-idna' 'python-pyasn1-modules' 'python-six'
          'systemd')
 makedepends=('git')
-checkdepends=('python-lxml' 'python-mock' 'python-parameterized')
-optdepends=('python-psycopg2: PostgreSQL support'
-            'python-lxml: URL previewing')
+checkdepends=('python-lxml' 'python-mock' 'python-parameterized' 'python-authlib')
+optdepends=('python-matrix-synapse-ldap3: LDAP3 auth provider'
+            'python-psycopg2: PostgreSQL support'
+            "python-txacme: ACME support (Let's Encrypt)"
+            'python-pysaml2: SAML2 support'
+            'python-authlib: OIDC support'
+            'python-lxml: URL previewing'
+            'python-sentry_sdk: Sentry support'
+            'python-pyjwt: JWT support'
+            'python-txredisapi: worker communication via Redis'
+            'python-hiredis: worker communication via Redis (faster)')
 
 source=("git+https://github.com/matrix-org/synapse.git#branch=master"
+        '0001-synapse-python_dependencies.py-permit-prometheus_cli.patch'
         'synapse.service'
         'sysusers-synapse.conf')
 
+
 md5sums=('SKIP'
+         'bcbaf40db1116b0c4ec4e1dc8f5e89b6'
          'c4352682c5fb5eb0440ceb54a20ac4cb'
          'ecd9f66fb57fe1a2e1e2df07a460a35b')
 
@@ -48,6 +60,15 @@ pkgver() {
 	git describe --long --tags | sed 's/^v//;s/-rc/rc/;s/-r/./;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+        cd synapse
+        for p in "${source[@]}"; do
+                if [[ $p == *.patch ]]; then
+                        git apply -3 "$srcdir/$p"
+                fi
+        done
+}
+
 build() {
 	cd synapse
 	python setup.py build