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

3 files changed, 16 insertions, 11 deletions

diff --git a/matrix-synapse/.footprint b/matrix-synapse/.footprint
index 85e6ea23f..05765a1d8 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.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/matrix_synapse-1.63.1.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.63.1.dist-info/LICENSE
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.63.1.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.63.1.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.63.1.dist-info/WHEEL
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_synapse-1.63.1.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__/
@@ -89,6 +89,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/admin_cmd.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/appservice.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/client_reader.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/complement_fork_starter.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/event_creator.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/federation_reader.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/federation_sender.cpython-310.opt-2.pyc
@@ -104,6 +105,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/app/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/admin_cmd.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/appservice.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/client_reader.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/complement_fork_starter.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/event_creator.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/federation_reader.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/app/federation_sender.py
@@ -515,6 +517,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/_
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/__pycache__/push.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/__pycache__/register.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/__pycache__/send_event.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/__pycache__/state.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/__pycache__/streams.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/_base.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/account_data.py
@@ -526,6 +529,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/_
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/push.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/register.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/send_event.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/state.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/http/streams.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/synapse/replication/slave/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/synapse/replication/slave/__init__.py
@@ -1452,6 +1456,7 @@ 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/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/01add_room_type_to_state_stats.sql
 -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/
diff --git a/matrix-synapse/.signature b/matrix-synapse/.signature
index 00be659cc..a7d10ca9e 100644
--- a/matrix-synapse/.signature
+++ b/matrix-synapse/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35qlLEuo0dgah8zNqG2VjVVivNNwu2zmtB5sYA722hy4VTrnjCdW1ia4RlFvB585lwoOFoyHAsntfSzEVF9++gs=
-SHA256 (Pkgfile) = 1022fcaf01a06ab4c40381b0e4f55a61bdc73d58f28a728ef92254d08794adf0
-SHA256 (.footprint) = 19344518cb1e8b5e7218633bb7efc49b0f1f5c8c54539b8eae41c82ac03de7c5
-SHA256 (matrix-synapse-1.62.0.tar.gz) = 395a5ebaefe6a027149017bfc110b11fbae1e9fb3f6165272406ab00334b1515
+RWSagIOpLGJF35eQ0e3S753SEr2lcZRkE/UxVmaqVi125UDFO5jiVJZ3u0Zz5GmUqiw2VsEyDyzjgAJNwCuw/2qQbPuj8APNvg0=
+SHA256 (Pkgfile) = 93fa295ddde1e55cbf4eea6ae998aa1efff13d7fd058ac2b74b2b237feea4cba
+SHA256 (.footprint) = c78e7cbd3911d067ffdbf6ff0042090b82c77d3aa0189c36ac3d652e9807beef
+SHA256 (matrix-synapse-1.63.1.tar.gz) = 0fd9c80d3b6e0075c93ac595baf40c19684879dbaf8ec7671acaf7f6baebee35
 SHA256 (synapse.service) = 6507699b1b562cb7fe449e2c3868847794fb38bd6a58e6ddd7e72af55f38abc3
diff --git a/matrix-synapse/Pkgfile b/matrix-synapse/Pkgfile
index 2715fca0c..a99e55711 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.62.0
+version=1.63.1
 release=1
 source=(https://github.com/matrix-org/synapse/archive/v$version/$name-$version.tar.gz
   synapse.service)