MFH: r542468 r544604 r545291 r549046

net-im/py-matrix-synapse: update to 1.17.0

PR:		248016
Submitted by:	Sascha Biberhofer <ports@skyforge.at> (maintainer)

net-im/py-matrix-synapse: Update to 1.18.0

PR:		248566
Submitted by:	Sascha Biberhofer <ports@skyforge.at> (maintainer)

net-im/py-matrix-synapse: Update to 1.19.0

PR:		248719
Submitted by:	Sascha Biberhofer <ports@skyforge.at> (maintainer)

net-im/py-matrix-synapse: Update to 1.19.3

Changelog:	https://github.com/matrix-org/synapse/blob/v1.19.3/CHANGES.md

PR:		249375
Submitted by:	Sascha Biberhofer <ports@skyforge.at> (maintainer)
Event:		September 2020 Bugathon

Approved by:	ports-secteam (fluffy)

4 files changed, 18 insertions, 20 deletions

diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index cc3742cbce66..c54e5c37bdfb 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	matrix-synapse
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.15.2
+DISTVERSION=	1.19.3
 CATEGORIES=	net-im python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}frozendict>=1:devel/py-frozendict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.2.0:devel/py-canonicaljson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0:security/py-signedjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
@@ -28,7 +28,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \
@@ -36,9 +35,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
 		${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.2.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}attrs>17.4.0:devel/py-attrs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}attrs>19.1.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
@@ -50,7 +48,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F
 		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parameterized>=0:devel/py-parameterized@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.7.0:www/py-pyjwt@${PY_FLAVOR}
 
diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
index 08d98a8886ad..95eb65d8924a 100644
--- a/net-im/py-matrix-synapse/distinfo
+++ b/net-im/py-matrix-synapse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593704135
-SHA256 (matrix-org-synapse-v1.15.2_GH0.tar.gz) = 15c198c296159730f9e5bc2e777ce94892b1ad93da0d101613e957792a76ea17
-SIZE (matrix-org-synapse-v1.15.2_GH0.tar.gz) = 6717409
+TIMESTAMP = 1600536738
+SHA256 (matrix-org-synapse-v1.19.3_GH0.tar.gz) = 50573233efc56c2222e6de35ad7d2eeafe16af0c1dde0dc216c16d4737d47015
+SIZE (matrix-org-synapse-v1.19.3_GH0.tar.gz) = 6778524
diff --git a/net-im/py-matrix-synapse/files/patch-python_dependencies.py b/net-im/py-matrix-synapse/files/patch-python_dependencies.py
deleted file mode 100644
index 78b8f8397767..000000000000
--- a/net-im/py-matrix-synapse/files/patch-python_dependencies.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- synapse/python_dependencies.py.orig	2019-07-25 21:31:46.581498307 +0200
-+++ synapse/python_dependencies.py	2019-07-25 21:31:57.254468848 +0200
-@@ -65,7 +65,7 @@
-     "msgpack>=0.5.2",
-     "phonenumbers>=8.2.0",
-     "six>=1.10",
--    "prometheus_client>=0.0.18,<0.8.0",
-+    "prometheus_client>=0.0.18",
-     # we use attr.s(slots), which arrived in 16.0.0
-     # Twisted 18.7.0 requires attrs>=17.4.0
-     "attrs>=17.4.0",
diff --git a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
new file mode 100644
index 000000000000..9aa015c1bed6
--- /dev/null
+++ b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
@@ -0,0 +1,11 @@
+--- synapse/python_dependencies.py.orig	2020-07-15 20:12:36 UTC
++++ synapse/python_dependencies.py
+@@ -66,7 +66,7 @@ REQUIREMENTS = [
+     "pymacaroons>=0.13.0",
+     "msgpack>=0.5.2",
+     "phonenumbers>=8.2.0",
+-    "prometheus_client>=0.0.18,<0.9.0",
++    "prometheus_client>=0.0.18",
+     # we use attr.validators.deep_iterable, which arrived in 19.1.0
+     "attrs>=19.1.0",
+     "netaddr>=0.7.18",