4 files changed, 19 insertions, 16 deletions
diff --git a/chat/matrix-synapse/Makefile b/chat/matrix-synapse/Makefile
index 0b5e86c3f00..6f244a73712 100644
--- a/chat/matrix-synapse/Makefile
+++ b/chat/matrix-synapse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2021/05/24 19:49:14 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2021/06/05 15:28:02 js Exp $
 
-DISTNAME=	matrix-synapse-1.34.0
-PKGREVISION=	1
+DISTNAME=	matrix-synapse-1.35.1
 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 f0e58f0c679..7ba84460139 100644
--- a/chat/matrix-synapse/PLIST
+++ b/chat/matrix-synapse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2021/05/20 09:09:32 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.13 2021/06/05 15:28:02 js Exp $
 bin/export_signing_key
 bin/generate_config
 bin/generate_log_config
@@ -439,6 +439,9 @@ ${PYSITELIB}/synapse/handlers/saml.pyo
 ${PYSITELIB}/synapse/handlers/search.py
 ${PYSITELIB}/synapse/handlers/search.pyc
 ${PYSITELIB}/synapse/handlers/search.pyo
+${PYSITELIB}/synapse/handlers/send_email.py
+${PYSITELIB}/synapse/handlers/send_email.pyc
+${PYSITELIB}/synapse/handlers/send_email.pyo
 ${PYSITELIB}/synapse/handlers/set_password.py
 ${PYSITELIB}/synapse/handlers/set_password.pyc
 ${PYSITELIB}/synapse/handlers/set_password.pyo
@@ -706,9 +709,6 @@ ${PYSITELIB}/synapse/replication/slave/storage/registration.pyo
 ${PYSITELIB}/synapse/replication/slave/storage/room.py
 ${PYSITELIB}/synapse/replication/slave/storage/room.pyc
 ${PYSITELIB}/synapse/replication/slave/storage/room.pyo
-${PYSITELIB}/synapse/replication/slave/storage/transactions.py
-${PYSITELIB}/synapse/replication/slave/storage/transactions.pyc
-${PYSITELIB}/synapse/replication/slave/storage/transactions.pyo
 ${PYSITELIB}/synapse/replication/tcp/__init__.py
 ${PYSITELIB}/synapse/replication/tcp/__init__.pyc
 ${PYSITELIB}/synapse/replication/tcp/__init__.pyo
@@ -1585,6 +1585,7 @@ ${PYSITELIB}/synapse/storage/schema/main/delta/59/11drop_thumbnail_constraint.sq
 ${PYSITELIB}/synapse/storage/schema/main/delta/59/12account_validity_token_used_ts_ms.sql
 ${PYSITELIB}/synapse/storage/schema/main/delta/59/12presence_stream_instance.sql
 ${PYSITELIB}/synapse/storage/schema/main/delta/59/12presence_stream_instance_seq.sql.postgres
+${PYSITELIB}/synapse/storage/schema/main/delta/59/13users_to_send_full_presence_to.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
@@ -1647,6 +1648,9 @@ ${PYSITELIB}/synapse/util/__init__.pyo
 ${PYSITELIB}/synapse/util/async_helpers.py
 ${PYSITELIB}/synapse/util/async_helpers.pyc
 ${PYSITELIB}/synapse/util/async_helpers.pyo
+${PYSITELIB}/synapse/util/batching_queue.py
+${PYSITELIB}/synapse/util/batching_queue.pyc
+${PYSITELIB}/synapse/util/batching_queue.pyo
 ${PYSITELIB}/synapse/util/caches/__init__.py
 ${PYSITELIB}/synapse/util/caches/__init__.pyc
 ${PYSITELIB}/synapse/util/caches/__init__.pyo
diff --git a/chat/matrix-synapse/distinfo b/chat/matrix-synapse/distinfo
index 24f0d9e15e1..e3ec998fad8 100644
--- a/chat/matrix-synapse/distinfo
+++ b/chat/matrix-synapse/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2021/05/20 09:09:32 jperkin Exp $
+$NetBSD: distinfo,v 1.17 2021/06/05 15:28:02 js Exp $
 
-SHA1 (matrix-synapse-1.34.0.tar.gz) = 22270050a22c44be8abd4519a2e51177cfdbb483
-RMD160 (matrix-synapse-1.34.0.tar.gz) = 0cd153221e3508a376daa60549d52bab21d161cd
-SHA512 (matrix-synapse-1.34.0.tar.gz) = 3b67725ac6ebc4b3b42bd46228f49d400eb41a71fd8b9dbbc8b1efad05e04c38ba6b51758c43d3d3c56df136ff91b59c22283d5766f4774d8d8e10ba8c5fa986
-Size (matrix-synapse-1.34.0.tar.gz) = 7284678 bytes
-SHA1 (patch-synapse_python_dependencies.py) = ef4e01283c4e3dab2cbb042b1a54c5fc21c20195
+SHA1 (matrix-synapse-1.35.1.tar.gz) = db4bda55f94b523176a2322665390b637d75618d
+RMD160 (matrix-synapse-1.35.1.tar.gz) = 3493881a1038319eae27a5b6f8e161a214294f69
+SHA512 (matrix-synapse-1.35.1.tar.gz) = 02a7a23f8d004c3e7d1af6904f4fac5d403335a7f089b80af367a833c292d0f970938f62a87f87a94ebee5acb41c87d50e337a8a38b0294657731155e7bfa3b3
+Size (matrix-synapse-1.35.1.tar.gz) = 7301793 bytes
+SHA1 (patch-synapse_python_dependencies.py) = 914ae3a34a9367b2d479d393ddc7a07cbff65b36
diff --git a/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py b/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
index 55d2346da93..d98954cc123 100644
--- a/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
+++ b/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-synapse_python_dependencies.py,v 1.2 2021/05/20 09:09:32 jperkin Exp $
+$NetBSD: patch-synapse_python_dependencies.py,v 1.3 2021/06/05 15:28:02 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.
 
---- synapse/python_dependencies.py.orig	2021-05-17 11:00:28.000000000 +0000
+--- synapse/python_dependencies.py.orig	2021-06-03 12:24:19.000000000 +0000
 +++ synapse/python_dependencies.py
 @@ -84,9 +84,6 @@ REQUIREMENTS = [
      "Jinja2>=2.9",
@@ -13,6 +13,6 @@ linked statically.
 -    # We enforce that we have a `cryptography` version that bundles an `openssl`
 -    # with the latest security patches.
 -    "cryptography>=3.4.7",
+     "ijson>=3.0",
  ]
  
- CONDITIONAL_REQUIREMENTS = {