diff --git a/_service b/_service
index 937d7d2..596c529 100644
--- a/_service
+++ b/_service
@@ -4,11 +4,11 @@
@PARENT_TAG@
https://github.com/matrix-org/synapse.git
git
- v1.96.1
+ v1.97.0
v(.*)
\1
diff --git a/bump-dependencies.patch b/bump-dependencies.patch
index 964911f..f21eaf3 100644
--- a/bump-dependencies.patch
+++ b/bump-dependencies.patch
@@ -2,12 +2,12 @@ Index: synapse/pyproject.toml
===================================================================
--- synapse.orig/pyproject.toml
+++ synapse/pyproject.toml
-@@ -146,7 +146,7 @@ pymacaroons = ">=0.13.0"
+@@ -190,7 +190,7 @@ pymacaroons = ">=0.13.0"
msgpack = ">=0.5.2"
phonenumbers = ">=8.2.0"
# we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
-prometheus-client = ">=0.4.0"
+prometheus-client = ">=0.13.1"
# we use `order`, which arrived in attrs 19.2.0.
- # Note: 21.1.0 broke `/sync`, see #9936
+ # Note: 21.1.0 broke `/sync`, see https://github.com/matrix-org/synapse/issues/9936
attrs = ">=19.2.0,!=21.1.0"
diff --git a/cargo_config b/cargo_config
deleted file mode 100644
index 97852b5..0000000
--- a/cargo_config
+++ /dev/null
@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch
index 4b994ac..120d947 100644
--- a/matrix-synapse-1.4.1-paths.patch
+++ b/matrix-synapse-1.4.1-paths.patch
@@ -37,7 +37,7 @@ Index: synapse/synapse/config/logger.py
===================================================================
--- synapse.orig/synapse/config/logger.py
+++ synapse/synapse/config/logger.py
-@@ -150,7 +150,7 @@ class LoggingConfig(Config):
+@@ -149,7 +149,7 @@ class LoggingConfig(Config):
def generate_config_section(
self, config_dir_path: str, server_name: str, **kwargs: Any
) -> str:
@@ -50,7 +50,7 @@ Index: synapse/synapse/config/server.py
===================================================================
--- synapse.orig/synapse/config/server.py
+++ synapse/synapse/config/server.py
-@@ -742,7 +742,7 @@ class ServerConfig(Config):
+@@ -793,7 +793,7 @@ class ServerConfig(Config):
bind_port = 8448
unsecure_port = 8008
diff --git a/matrix-synapse-1.96.1.obscpio b/matrix-synapse-1.96.1.obscpio
deleted file mode 100644
index e0c679c..0000000
--- a/matrix-synapse-1.96.1.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:886de8daebd4ce08ef2f3f9baa963e484f70cf3d30b154596478211302b78750
-size 35760653
diff --git a/matrix-synapse-1.97.0.obscpio b/matrix-synapse-1.97.0.obscpio
new file mode 100644
index 0000000..afc6d50
--- /dev/null
+++ b/matrix-synapse-1.97.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff42d8c1f876293a0a3d0e48726c724e54748c525c4c934c10f33cd213fb445f
+size 35915789
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index f0ffbd1..88dfadc 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -27,7 +27,7 @@
%define pkgname matrix-synapse
Name: %{pkgname}-test
-Version: 1.96.1
+Version: 1.97.0
Release: 0
Summary: Test package for %{pkgname}
License: Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 8a596d9..ddf22be 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Tue Nov 28 15:22:31 UTC 2023 - Marcus Rueckert
+
+- Update to 1.97.0
+ Synapse will soon be forked by Element under an AGPLv3.0 licence (with CLA, for
+ proprietary dual licensing). You can read more about this here:
+
+ https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/
+ https://element.io/blog/element-to-adopt-agplv3/
+ The Matrix.org Foundation copy of the project will be archived. Any changes needed
+ by server administrators will be communicated via our usual announcements channels,
+ but we are striving to make this as seamless as possible.
+
+ - Features
+ - Add support for asynchronous uploads as defined by MSC2246.
+ Contributed by @sumnerevans at @beeper. (#15503)
+ - Improve the performance of some operations in multi-worker
+ deployments. (#16613, #16616)
+ - Bugfixes
+ - Fix a long-standing bug where some queries updated the same
+ row twice. Introduced in Synapse 1.57.0. (#16609)
+ - Fix a long-standing bug where Synapse would not unbind
+ third-party identifiers for Application Service users when
+ deactivated and would not emit a compliant response. (#16617)
+ - Fix sending out of order POSITION over replication, causing
+ additional database load. (#16639)
+ - Improved Documentation
+ - Note that the option outbound_federation_restricted_to was
+ added in Synapse 1.89.0, and fix a nearby formatting error.
+ (#16628)
+ - Update parameter information for the /timestamp_to_event
+ admin API. (#16631)
+ - Provide an example for a common encrypted media response from
+ the admin user media API and mention possible null values.
+ (#16654)
+ - Internal Changes
+ - Remove whole table locks on push rule modifications.
+ Contributed by Nick @ Beeper (@Fizzadar). (#16051)
+ - Support reactor tick timings on more types of event loops.
+ (#16532)
+ - Improve type hints. (#16564, #16611, #16612)
+ - Avoid executing no-op queries. (#16583)
+ - Simplify persistence code to be per-room. (#16584)
+ - Use standard SQL helpers in persistence code. (#16585)
+ - Avoid updating the stream cache unnecessarily. (#16586)
+ - Improve performance when using opentracing. (#16589)
+ - Run push rule evaluator setup in parallel. (#16590)
+ - Improve tests of the SQL generator. (#16596)
+ - Use more generic database methods. (#16615)
+ - Use dbname instead of the deprecated database connection
+ parameter for psycopg2. (#16618)
+ - Add an internal Admin API endpoint to temporarily grant the
+ ability to update an existing cross-signing key without UIA.
+ (#16634)
+ - Improve references to GitHub issues. (#16637, #16638)
+ - More efficiently handle no-op POSITION over replication.
+ (#16640, #16655)
+ - Speed up deleting of device messages when deleting a device.
+ (#16643)
+ - Speed up persisting large number of outliers. (#16649)
+ - Reduce max concurrency of background tasks, reducing
+ potential max DB load. (#16656, #16660)
+ - Speed up purge room by adding an index to event_push_summary.
+ (#16657)
+- refresh patches:
+ bump-dependencies.patch
+ matrix-synapse-1.4.1-paths.patch
+
-------------------------------------------------------------------
Fri Nov 17 23:44:47 UTC 2023 - Marcus Rueckert
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index 32a31cd..5f16a44 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,4 +1,4 @@
name: matrix-synapse
-version: 1.96.1
-mtime: 1700226073
-commit: c4f5522189687c1e739d63246b5a6668d89b2d5f
+version: 1.97.0
+mtime: 1701180561
+commit: d75d6d65d1681889db05b077e97fc2ddf123b757
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 6fbeecd..b85b7da 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -24,6 +24,7 @@
# TODO: 10.1.0
%global Pillow_version 10.0.1
%global PyYAML_version 6.0.1
+# TODO: 23.10
%global Twisted_version 22.10.0
%global attrs_version 23.1.0
%global bcrypt_version 4.0.1
@@ -41,7 +42,7 @@
%global netaddr_version 0.9.0
# TODO: 8.13.23
%global phonenumbers_version 8.13.18
-# TODO: 0.17.1
+# TODO: 0.18.0
%global prometheus_client_version 0.17.0
%global psutil_version 2.0.0
%global pyOpenSSL_version 23.0.0
@@ -54,6 +55,7 @@
%global sortedcontainers_version 2.4.0
%global systemd_version 234
%global typing_extensions_version 4.1.1
+# TODO: 23.11
%global treq_version 22.2.0
%global unpaddedbase64_version 2.1.0
%global matrix_synapse_ldap3_version 0.3.0
@@ -73,6 +75,7 @@
%global txredisapi_version 1.4.9
%global Pympler_version 1.0.1
%global pydantic_version 1.9.1
+# TODO: 2.12
%global pyicu_version 2.11
%else
# some version locks based on poetry.lock
@@ -156,7 +159,7 @@
%define pkgname matrix-synapse
%define eggname matrix_synapse
Name: %{pkgname}
-Version: 1.96.1
+Version: 1.97.0
Release: 0
Summary: Matrix protocol reference homeserver
License: Apache-2.0
@@ -164,7 +167,6 @@ Group: Productivity/Networking/Instant Messenger
URL: https://github.com/matrix-org/synapse
Source0: %{pkgname}-%{version}.tar.xz
Source1: vendor.tar.zst
-Source2: cargo_config
Source47: matrix-synapse-user.conf
Source48: README.SUSE
Source49: matrix-synapse.tmpfiles.d
@@ -194,7 +196,7 @@ BuildRequires: (%{use_python}-poetry-core >= 1.1.0 with %{use_python}-poetry-co
%{?systemd_ordering}
%{sysusers_requires}
%requires_peq %{use_python}-base
-BuildRequires: (%{use_python}-setuptools-rust >= 1.3 with %{use_python}-setuptools-rust =< 1.8.0)
+BuildRequires: (%{use_python}-setuptools-rust >= 1.3 with %{use_python}-setuptools-rust =< 1.8.1)
# NOTE: Keep this is in the same order as pyproject.toml.
# some version locks based on poetry.lock
BuildRequires: %{use_python}-Jinja2 >= %{Jinja2_version}
@@ -309,7 +311,6 @@ Matrix. Matrix is a system for federated Instant Messaging and VoIP.
%prep
%autosetup -p1 -a1
-install -m 0644 -D %{SOURCE2} .cargo/config
# Remove all un-needed #!-lines.
find synapse/ -type f -not -path './vendor/**' -exec sed -i '1{/^#!/d}' {} \;
diff --git a/vendor.tar.zst b/vendor.tar.zst
index e4d2790..ccbe8f4 100644
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2a192aadf763dcde9373b322c54a6c10c23384e2d081e24e84185edf2497c1fa
-size 5743907
+oid sha256:e4b0800d0e02384f0b8ad9f1303c00a755e2a6c59aacd05648382924f29a4244
+size 5742479