4 files changed, 16 insertions, 30 deletions
diff --git a/chat/matrix-synapse/Makefile b/chat/matrix-synapse/Makefile
index 944b3ecc829..67366d5a7ae 100644
--- a/chat/matrix-synapse/Makefile
+++ b/chat/matrix-synapse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2022/01/30 11:17:10 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2022/02/25 16:18:36 js Exp $
 
-DISTNAME=	matrix-synapse-1.51.0
-PKGREVISION=	1
+DISTNAME=	matrix-synapse-1.53.0
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=	matrix_synapse-${PKGVERSION_NOREV}
diff --git a/chat/matrix-synapse/PLIST b/chat/matrix-synapse/PLIST
index 21c0cfd5a72..a085528ffba 100644
--- a/chat/matrix-synapse/PLIST
+++ b/chat/matrix-synapse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2022/01/30 10:14:16 js Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/02/25 16:18:36 js Exp $
 bin/export_signing_key
 bin/generate_config
 bin/generate_log_config
@@ -1674,6 +1674,10 @@ ${PYSITELIB}/synapse/storage/schema/main/delta/65/07_arbitrary_relations.sql
 ${PYSITELIB}/synapse/storage/schema/main/delta/65/08_device_inbox_background_updates.sql
 ${PYSITELIB}/synapse/storage/schema/main/delta/65/10_expirable_refresh_tokens.sql
 ${PYSITELIB}/synapse/storage/schema/main/delta/65/11_devices_auth_provider_session.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/67/01drop_public_room_list_stream.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/68/01event_columns.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/68/02_msc2409_add_device_id_appservice_stream_type.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/68/03_delete_account_data_for_deactivated_accounts.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/application_services.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/event_edges.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/event_signatures.sql
@@ -1842,9 +1846,6 @@ ${PYSITELIB}/synapse/util/templates.pyo
 ${PYSITELIB}/synapse/util/threepids.py
 ${PYSITELIB}/synapse/util/threepids.pyc
 ${PYSITELIB}/synapse/util/threepids.pyo
-${PYSITELIB}/synapse/util/versionstring.py
-${PYSITELIB}/synapse/util/versionstring.pyc
-${PYSITELIB}/synapse/util/versionstring.pyo
 ${PYSITELIB}/synapse/util/wheel_timer.py
 ${PYSITELIB}/synapse/util/wheel_timer.pyc
 ${PYSITELIB}/synapse/util/wheel_timer.pyo
diff --git a/chat/matrix-synapse/distinfo b/chat/matrix-synapse/distinfo
index abf62f58b80..1f7c83bafb1 100644
--- a/chat/matrix-synapse/distinfo
+++ b/chat/matrix-synapse/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2022/01/30 11:17:10 wiz Exp $
+$NetBSD: distinfo,v 1.32 2022/02/25 16:18:36 js Exp $
 
-BLAKE2s (matrix-synapse-1.51.0.tar.gz) = d29dfd91e95584096ceff17fea2095b1f1aaa7cb9bc88e0a71c5d4ff5cca3689
-SHA512 (matrix-synapse-1.51.0.tar.gz) = 52b96c4ee74894934fdaf683c8a3f0e9f4d6eb227ad916d94aaefd878c70cdc4fc0edbf44082dcbd5de5930fe279501207614a2bd6c28e2b2c64425ce74f137a
-Size (matrix-synapse-1.51.0.tar.gz) = 7665238 bytes
+BLAKE2s (matrix-synapse-1.53.0.tar.gz) = 9c6942a9de01469c46629e96a77443ddbec20bda43281397b22631afa8274cdc
+SHA512 (matrix-synapse-1.53.0.tar.gz) = a6ab6219f8ab3da37968e7480e59677fe640b4b2741bdfc75e407fd11deeed47a36efa7bb3c04ae1022fb07ad401763b7d747860d127cfb785a79433dfbcc4b7
+Size (matrix-synapse-1.53.0.tar.gz) = 7696244 bytes
 SHA1 (patch-synapse_handlers_room.py) = f9a62add7171898ec0ea76360f0a4c9969609537
-SHA1 (patch-synapse_python_dependencies.py) = ed198e743148c50c2066f2e20310ca6f5e29b19a
+SHA1 (patch-synapse_python_dependencies.py) = f6f12aa43f8739d83a9b31e169eb97b47f4a2cc5
diff --git a/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py b/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
index c0c777fc528..4fd3dfef093 100644
--- a/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
+++ b/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
@@ -1,23 +1,12 @@
-$NetBSD: patch-synapse_python_dependencies.py,v 1.5 2022/01/30 11:17:10 wiz Exp $
+$NetBSD: patch-synapse_python_dependencies.py,v 1.6 2022/02/25 16:18:36 js Exp $
 
 Patch out cryptography check: It doesn't need a version this high and it was
 added by upstream as an ugly hack to force a patched OpenSSL, in case it is
 linked statically.
 
-Relax other restrictions since pkgsrc has/will have newer versions.
-
---- synapse/python_dependencies.py.orig	2022-01-25 11:42:32.000000000 +0000
+--- synapse/python_dependencies.py.orig	2022-02-22 11:32:11.000000000 +0000
 +++ synapse/python_dependencies.py
-@@ -51,7 +51,7 @@ REQUIREMENTS = [
-     # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
-     "jsonschema>=3.0.0",
-     # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
--    "frozendict>=1,<2.1.2",
-+    "frozendict>=1",
-     "unpaddedbase64>=1.1.0",
-     "canonicaljson>=1.4.0",
-     # we use the type definitions added in signedjson 1.1.
-@@ -84,11 +84,8 @@ REQUIREMENTS = [
+@@ -84,9 +84,6 @@ REQUIREMENTS = [
      "Jinja2>=2.9",
      "bleach>=1.4.3",
      "typing-extensions>=3.7.4",
@@ -25,8 +14,5 @@ Relax other restrictions since pkgsrc has/will have newer versions.
 -    # with the latest security patches.
 -    "cryptography>=3.4.7",
      "ijson>=3.1",
--    "matrix-common==1.0.0",
-+    "matrix-common",
+     "matrix-common~=1.1.0",
  ]
- 
- CONDITIONAL_REQUIREMENTS = {