diff --git a/chat/matrix-synapse/Makefile b/chat/matrix-synapse/Makefile index 5440f90d3d1b..46c27db4f288 100644 --- a/chat/matrix-synapse/Makefile +++ b/chat/matrix-synapse/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.51 2022/06/16 11:49:08 gdt Exp $ +# $NetBSD: Makefile,v 1.52 2022/06/16 12:06:25 gdt Exp $ -DISTNAME= matrix-synapse-1.58.1 +DISTNAME= matrix-synapse-1.61.0 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} GITHUB_PROJECT= synapse diff --git a/chat/matrix-synapse/PLIST b/chat/matrix-synapse/PLIST index 085ec266c1bd..b2ccd4fa8681 100644 --- a/chat/matrix-synapse/PLIST +++ b/chat/matrix-synapse/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2022/06/16 11:49:08 gdt Exp $ +@comment $NetBSD: PLIST,v 1.27 2022/06/16 12:06:25 gdt Exp $ bin/export_signing_key bin/generate_config bin/generate_log_config @@ -138,8 +138,6 @@ ${PYSITELIB}/synapse/config/experimental.py ${PYSITELIB}/synapse/config/experimental.pyc ${PYSITELIB}/synapse/config/federation.py ${PYSITELIB}/synapse/config/federation.pyc -${PYSITELIB}/synapse/config/groups.py -${PYSITELIB}/synapse/config/groups.pyc ${PYSITELIB}/synapse/config/homeserver.py ${PYSITELIB}/synapse/config/homeserver.pyc ${PYSITELIB}/synapse/config/jwt.py @@ -252,18 +250,8 @@ ${PYSITELIB}/synapse/federation/transport/server/_base.py ${PYSITELIB}/synapse/federation/transport/server/_base.pyc ${PYSITELIB}/synapse/federation/transport/server/federation.py ${PYSITELIB}/synapse/federation/transport/server/federation.pyc -${PYSITELIB}/synapse/federation/transport/server/groups_local.py -${PYSITELIB}/synapse/federation/transport/server/groups_local.pyc -${PYSITELIB}/synapse/federation/transport/server/groups_server.py -${PYSITELIB}/synapse/federation/transport/server/groups_server.pyc ${PYSITELIB}/synapse/federation/units.py ${PYSITELIB}/synapse/federation/units.pyc -${PYSITELIB}/synapse/groups/__init__.py -${PYSITELIB}/synapse/groups/__init__.pyc -${PYSITELIB}/synapse/groups/attestations.py -${PYSITELIB}/synapse/groups/attestations.pyc -${PYSITELIB}/synapse/groups/groups_server.py -${PYSITELIB}/synapse/groups/groups_server.pyc ${PYSITELIB}/synapse/handlers/__init__.py ${PYSITELIB}/synapse/handlers/__init__.pyc ${PYSITELIB}/synapse/handlers/account.py @@ -300,8 +288,6 @@ ${PYSITELIB}/synapse/handlers/federation.py ${PYSITELIB}/synapse/handlers/federation.pyc ${PYSITELIB}/synapse/handlers/federation_event.py ${PYSITELIB}/synapse/handlers/federation_event.pyc -${PYSITELIB}/synapse/handlers/groups_local.py -${PYSITELIB}/synapse/handlers/groups_local.pyc ${PYSITELIB}/synapse/handlers/identity.py ${PYSITELIB}/synapse/handlers/identity.pyc ${PYSITELIB}/synapse/handlers/initial_sync.py @@ -318,6 +304,8 @@ ${PYSITELIB}/synapse/handlers/presence.py ${PYSITELIB}/synapse/handlers/presence.pyc ${PYSITELIB}/synapse/handlers/profile.py ${PYSITELIB}/synapse/handlers/profile.pyc +${PYSITELIB}/synapse/handlers/push_rules.py +${PYSITELIB}/synapse/handlers/push_rules.pyc ${PYSITELIB}/synapse/handlers/read_marker.py ${PYSITELIB}/synapse/handlers/read_marker.pyc ${PYSITELIB}/synapse/handlers/receipts.py @@ -432,8 +420,6 @@ ${PYSITELIB}/synapse/notifier.py ${PYSITELIB}/synapse/notifier.pyc ${PYSITELIB}/synapse/push/__init__.py ${PYSITELIB}/synapse/push/__init__.pyc -${PYSITELIB}/synapse/push/action_generator.py -${PYSITELIB}/synapse/push/action_generator.pyc ${PYSITELIB}/synapse/push/baserules.py ${PYSITELIB}/synapse/push/baserules.pyc ${PYSITELIB}/synapse/push/bulk_push_rule_evaluator.py @@ -509,8 +495,6 @@ ${PYSITELIB}/synapse/replication/slave/storage/events.py ${PYSITELIB}/synapse/replication/slave/storage/events.pyc ${PYSITELIB}/synapse/replication/slave/storage/filtering.py ${PYSITELIB}/synapse/replication/slave/storage/filtering.pyc -${PYSITELIB}/synapse/replication/slave/storage/groups.py -${PYSITELIB}/synapse/replication/slave/storage/groups.pyc ${PYSITELIB}/synapse/replication/slave/storage/keys.py ${PYSITELIB}/synapse/replication/slave/storage/keys.pyc ${PYSITELIB}/synapse/replication/slave/storage/profile.py @@ -607,8 +591,6 @@ ${PYSITELIB}/synapse/rest/admin/event_reports.py ${PYSITELIB}/synapse/rest/admin/event_reports.pyc ${PYSITELIB}/synapse/rest/admin/federation.py ${PYSITELIB}/synapse/rest/admin/federation.pyc -${PYSITELIB}/synapse/rest/admin/groups.py -${PYSITELIB}/synapse/rest/admin/groups.pyc ${PYSITELIB}/synapse/rest/admin/media.py ${PYSITELIB}/synapse/rest/admin/media.pyc ${PYSITELIB}/synapse/rest/admin/registration_tokens.py @@ -645,8 +627,6 @@ ${PYSITELIB}/synapse/rest/client/events.py ${PYSITELIB}/synapse/rest/client/events.pyc ${PYSITELIB}/synapse/rest/client/filter.py ${PYSITELIB}/synapse/rest/client/filter.pyc -${PYSITELIB}/synapse/rest/client/groups.py -${PYSITELIB}/synapse/rest/client/groups.pyc ${PYSITELIB}/synapse/rest/client/initial_sync.py ${PYSITELIB}/synapse/rest/client/initial_sync.pyc ${PYSITELIB}/synapse/rest/client/keys.py @@ -818,6 +798,14 @@ ${PYSITELIB}/synapse/storage/_base.py ${PYSITELIB}/synapse/storage/_base.pyc ${PYSITELIB}/synapse/storage/background_updates.py ${PYSITELIB}/synapse/storage/background_updates.pyc +${PYSITELIB}/synapse/storage/controllers/__init__.py +${PYSITELIB}/synapse/storage/controllers/__init__.pyc +${PYSITELIB}/synapse/storage/controllers/persist_events.py +${PYSITELIB}/synapse/storage/controllers/persist_events.pyc +${PYSITELIB}/synapse/storage/controllers/purge_events.py +${PYSITELIB}/synapse/storage/controllers/purge_events.pyc +${PYSITELIB}/synapse/storage/controllers/state.py +${PYSITELIB}/synapse/storage/controllers/state.pyc ${PYSITELIB}/synapse/storage/database.py ${PYSITELIB}/synapse/storage/database.pyc ${PYSITELIB}/synapse/storage/databases/__init__.py @@ -936,12 +924,8 @@ ${PYSITELIB}/synapse/storage/engines/sqlite.py ${PYSITELIB}/synapse/storage/engines/sqlite.pyc ${PYSITELIB}/synapse/storage/keys.py ${PYSITELIB}/synapse/storage/keys.pyc -${PYSITELIB}/synapse/storage/persist_events.py -${PYSITELIB}/synapse/storage/persist_events.pyc ${PYSITELIB}/synapse/storage/prepare_database.py ${PYSITELIB}/synapse/storage/prepare_database.pyc -${PYSITELIB}/synapse/storage/purge_events.py -${PYSITELIB}/synapse/storage/purge_events.pyc ${PYSITELIB}/synapse/storage/push_rule.py ${PYSITELIB}/synapse/storage/push_rule.pyc ${PYSITELIB}/synapse/storage/roommember.py @@ -1261,6 +1245,8 @@ ${PYSITELIB}/synapse/storage/schema/main/delta/68/06_msc3202_add_device_list_app ${PYSITELIB}/synapse/storage/schema/main/delta/69/01as_txn_seq.py ${PYSITELIB}/synapse/storage/schema/main/delta/69/01as_txn_seq.pyc ${PYSITELIB}/synapse/storage/schema/main/delta/69/01device_list_oubound_by_room.sql +${PYSITELIB}/synapse/storage/schema/main/delta/69/02cache_invalidation_index.sql +${PYSITELIB}/synapse/storage/schema/main/delta/70/01clean_table_purged_rooms.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 @@ -1288,6 +1274,7 @@ ${PYSITELIB}/synapse/storage/schema/state/delta/47/state_group_seq.py ${PYSITELIB}/synapse/storage/schema/state/delta/47/state_group_seq.pyc ${PYSITELIB}/synapse/storage/schema/state/delta/56/state_group_room_idx.sql ${PYSITELIB}/synapse/storage/schema/state/delta/61/02state_groups_state_n_distinct.sql.postgres +${PYSITELIB}/synapse/storage/schema/state/delta/70/08_state_group_edges_unique.sql ${PYSITELIB}/synapse/storage/schema/state/full_schemas/54/full.sql ${PYSITELIB}/synapse/storage/schema/state/full_schemas/54/sequence.sql.postgres ${PYSITELIB}/synapse/storage/state.py diff --git a/chat/matrix-synapse/distinfo b/chat/matrix-synapse/distinfo index 220ba0c1b8e6..4239e4737fdb 100644 --- a/chat/matrix-synapse/distinfo +++ b/chat/matrix-synapse/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.37 2022/06/16 11:49:08 gdt Exp $ +$NetBSD: distinfo,v 1.38 2022/06/16 12:06:25 gdt Exp $ -BLAKE2s (matrix-synapse-1.58.1.tar.gz) = 7825bc72223975fa79ad3b21fd570d016716c8b70020adc5a52dceb8951550ca -SHA512 (matrix-synapse-1.58.1.tar.gz) = fe86e64ee6e9ba6f25aadee8d88019fafc2ec7c8112a8dfef1ced8a0409fd72b9553114799592da00d90a3a2e0020b2c0741362ad381cb66a12029bbf925dac2 -Size (matrix-synapse-1.58.1.tar.gz) = 7881275 bytes -SHA1 (patch-pyproject.toml) = 5d3d616f72bc2ca5ac46a8cb913cb65d019ff6df +BLAKE2s (matrix-synapse-1.61.0.tar.gz) = 5f568ce040edefe1469a24540027c49f5291dbf109e90db12f84b80b565d4115 +SHA512 (matrix-synapse-1.61.0.tar.gz) = 24d390bd1715c5cbc1e468c363287626e3be9da55cad98d73cdd7caaf9ccd6218a26925882367ec95fb3a82ffb5da6a6388d8e4317adde20db28ab620afe4bfc +Size (matrix-synapse-1.61.0.tar.gz) = 7879924 bytes +SHA1 (patch-pyproject.toml) = 252503c60c6c1ee1b8655f2265944d9788402bf4 SHA1 (patch-synapse_handlers_room.py) = f9a62add7171898ec0ea76360f0a4c9969609537 diff --git a/chat/matrix-synapse/patches/patch-pyproject.toml b/chat/matrix-synapse/patches/patch-pyproject.toml index 626a72e6ec41..b1c3a2ffbe88 100644 --- a/chat/matrix-synapse/patches/patch-pyproject.toml +++ b/chat/matrix-synapse/patches/patch-pyproject.toml @@ -1,13 +1,13 @@ -$NetBSD: patch-pyproject.toml,v 1.1 2022/06/16 11:49:08 gdt Exp $ +$NetBSD: patch-pyproject.toml,v 1.2 2022/06/16 12:06:25 gdt 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. ---- pyproject.toml.orig 2022-05-05 14:15:32.000000000 +0000 +--- pyproject.toml.orig 2022-06-14 10:56:45.000000000 +0000 +++ pyproject.toml -@@ -146,7 +146,7 @@ bleach = ">=1.4.3" - typing-extensions = ">=3.10.0" +@@ -147,7 +147,7 @@ bleach = ">=1.4.3" + typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7"