git: ed349e276bf0 - main - net-im/py-matrix-synapse: Update to 1.33.1

[Rainer Hurling]

The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ed349e276bf0beb5708cfcb8fe37e8b5ed0cebde

commit ed349e276bf0beb5708cfcb8fe37e8b5ed0cebde
Author:     Sascha Biberhofer <ports at skyforge.at>
AuthorDate: 2021-05-09 17:00:37 +0000
Commit:     Rainer Hurling <rhurlin at FreeBSD.org>
CommitDate: 2021-05-09 17:00:37 +0000

    net-im/py-matrix-synapse: Update to 1.33.1
    
    Changelog: https://github.com/matrix-org/synapse/releases
    
    PR:             255727
    
    Co-authored-by: Rainer Hurling <rhurlin at FreeBSD.org>
---
 net-im/py-matrix-synapse/Makefile                              | 10 +++++-----
 net-im/py-matrix-synapse/distinfo                              |  6 +++---
 .../files/patch-synapse_python__dependencies.py                |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index f287f83a1e97..373e4488cc4b 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	matrix-synapse
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.32.2
+DISTVERSION=	1.33.1
 CATEGORIES=	net-im python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -35,7 +35,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.4.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}attrs>19.1.0:devel/py-attrs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}attrs>19.1.0<21.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} \
@@ -87,9 +87,6 @@ REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_F
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 URLPREVIEW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=3.5.0:devel/py-lxml@${PY_FLAVOR}
 
-do-test:
-	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
-
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample
@@ -98,4 +95,7 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
+do-test:
+	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
+
 .include <bsd.port.mk>
diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
index e58dbcbd84da..1db56589b5ab 100644
--- a/net-im/py-matrix-synapse/distinfo
+++ b/net-im/py-matrix-synapse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619640492
-SHA256 (matrix-org-synapse-v1.32.2_GH0.tar.gz) = 7f378c25467f7073216736ba14f465af10e82cb2c9bd8a052b0c9270b44c0552
-SIZE (matrix-org-synapse-v1.32.2_GH0.tar.gz) = 7258293
+TIMESTAMP = 1620379126
+SHA256 (matrix-org-synapse-v1.33.1_GH0.tar.gz) = fd074ebcb443d28989c0f49e50c4f27bc6d0fe6b454923a9df67be5951b01b16
+SIZE (matrix-org-synapse-v1.33.1_GH0.tar.gz) = 7274431
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
index bfcb8085bac3..126fbad7dbf9 100644
--- a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
+++ b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
@@ -1,11 +1,11 @@
---- synapse/python_dependencies.py.orig	2021-04-07 20:22:25 UTC
+--- synapse/python_dependencies.py.orig	2021-05-07 09:20:49 UTC
 +++ synapse/python_dependencies.py
-@@ -85,7 +85,7 @@ REQUIREMENTS = [
+@@ -86,7 +86,7 @@ REQUIREMENTS = [
      "typing-extensions>=3.7.4",
      # We enforce that we have a `cryptography` version that bundles an `openssl`
      # with the latest security patches.
--    "cryptography>=3.4.7;python_version>='3.6'",
-+    #"cryptography>=3.4.7;python_version>='3.6'",
+-    "cryptography>=3.4.7",
++    #"cryptography>=3.4.7",
  ]
  
  CONDITIONAL_REQUIREMENTS = {