Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 23 insertions, 13 deletions

diff --git a/matrix-synapse/.footprint b/matrix-synapse/.footprint
index da231eae0..34ed8755a 100644
--- a/matrix-synapse/.footprint
+++ b/matrix-synapse/.footprint
@@ -18,12 +18,12 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.61.1.dist-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.61.1.dist-info/LICENSE
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.61.1.dist-info/METADATA
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.61.1.dist-info/RECORD
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.61.1.dist-info/WHEEL
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.61.1.dist-info/entry_points.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.62.0.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.62.0.dist-info/LICENSE
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.62.0.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.62.0.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.62.0.dist-info/WHEEL
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.62.0.dist-info/entry_points.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/__pycache__/
@@ -144,6 +144,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/emailconfig.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/experimental.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/federation.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/groups.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/homeserver.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/jwt.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__/key.cpython-310.opt-1.pyc
@@ -189,6 +190,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/config/__pycache__
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/emailconfig.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/experimental.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/federation.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/groups.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/homeserver.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/jwt.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/config/key.py
@@ -825,6 +827,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/clien
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/__pycache__/pick_idp.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/__pycache__/pick_username.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/__pycache__/sso_register.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/__pycache__/unsubscribe.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/new_user_consent.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/oidc/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/oidc/__init__.py
@@ -844,6 +847,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/clien
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/saml2/metadata_resource.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/saml2/response_resource.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/sso_register.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/synapse/client/unsubscribe.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/rest/well_known.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/server.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/server_notices/
@@ -940,7 +944,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/events_forward_extremities.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/events_worker.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/filtering.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/group_server.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/keys.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/lock.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/__pycache__/media_repository.cpython-310.opt-1.pyc
@@ -988,7 +991,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/events_forward_extremities.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/events_worker.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/filtering.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/group_server.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/keys.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/lock.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/databases/main/media_repository.py
@@ -1444,6 +1446,14 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/mai
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/69/__pycache__/01as_txn_seq.cpython-310.opt-1.pyc
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/70/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/70/01clean_table_purged_rooms.sql
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/71/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/71/01rebuild_event_edges.sql.postgres
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/71/01rebuild_event_edges.sql.sqlite
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/71/01remove_noop_background_updates.sql
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/71/02event_push_summary_unique.sql
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/72/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/72/01event_push_summary_receipt.sql
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/delta/72/02event_push_actions_index.sql
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/full_schemas/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/full_schemas/16/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/storage/schema/main/full_schemas/16/application_services.sql
diff --git a/matrix-synapse/.signature b/matrix-synapse/.signature
index 9815f03f4..9ba1158ef 100644
--- a/matrix-synapse/.signature
+++ b/matrix-synapse/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xsB9nCesCYbrOApb3hv26c3S57jGrnfwn+/Fw+Mj8I50bLa3km09HfKMa171dXyxbzYBTA4huiV0tfOnqR0pA0=
-SHA256 (Pkgfile) = 0e424d357be1deab88a3b0e22561e56fbfd9e7b0da32314094b1797e3e9a2d22
-SHA256 (.footprint) = 4fc7c0b8464e3727f8b733a8357c00a9b57d7946f9cb031e3a14c8aada4b68ab
-SHA256 (matrix-synapse-1.61.1.tar.gz) = 79b216330a22711521d0ff6694c9f12e40de7e7345a1601bac22021fcace36fc
+RWSagIOpLGJF3y+EB6m1BEzOnct1VSXzTOD0ynKEh4Y+v1XPufUkN6vtb10Xo9EuJ1BjuF7t1nNZgbvyRagHIa/5o1GgDzBP5g4=
+SHA256 (Pkgfile) = 050710de53064190a6379401bd819a6e7d1bf655d5ffd5e56cc2306af50310ba
+SHA256 (.footprint) = 0cd1a618c289b79367785bb063c0392fab0bef929f76a7900912c509185136c4
+SHA256 (matrix-synapse-1.62.0.tar.gz) = 395a5ebaefe6a027149017bfc110b11fbae1e9fb3f6165272406ab00334b1515
 SHA256 (synapse.service) = 6507699b1b562cb7fe449e2c3868847794fb38bd6a58e6ddd7e72af55f38abc3
diff --git a/matrix-synapse/Pkgfile b/matrix-synapse/Pkgfile
index 9226a9943..71b09b450 100644
--- a/matrix-synapse/Pkgfile
+++ b/matrix-synapse/Pkgfile
@@ -5,7 +5,7 @@
 # Optional: python3-hiredis python3-lxml python3-psutil python3-psycopg2 python3-pyjwt python3-txredisapi psycopg2
 
 name=matrix-synapse
-version=1.61.1
+version=1.62.0
 release=1
 source=(https://github.com/matrix-org/synapse/archive/v$version/$name-$version.tar.gz
   synapse.service)