diff --git a/_service b/_service
index 02cbe37..ce23957 100644
--- a/_service
+++ b/_service
@@ -4,11 +4,11 @@
@PARENT_TAG@
https://github.com/element-hq/synapse.git
git
- v1.114.0
+ v1.115.0
v(.*)
\1
diff --git a/bump-dependencies.patch b/bump-dependencies.patch
index f21eaf3..25b81b3 100644
--- a/bump-dependencies.patch
+++ b/bump-dependencies.patch
@@ -2,7 +2,7 @@ Index: synapse/pyproject.toml
===================================================================
--- synapse.orig/pyproject.toml
+++ synapse/pyproject.toml
-@@ -190,7 +190,7 @@ pymacaroons = ">=0.13.0"
+@@ -191,7 +191,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.
diff --git a/matrix-synapse-1.114.0.obscpio b/matrix-synapse-1.114.0.obscpio
deleted file mode 100644
index 854d859..0000000
--- a/matrix-synapse-1.114.0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ca30e5576a8dfe93534758716ec01c3fd356a5a1a44f9365615f88728e52bb3
-size 37705229
diff --git a/matrix-synapse-1.115.0.obscpio b/matrix-synapse-1.115.0.obscpio
new file mode 100644
index 0000000..e0bdf71
--- /dev/null
+++ b/matrix-synapse-1.115.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0317a22a7d06ed656e0a5f39bf252baae8cda33eb3fdb441318502ec8093254
+size 38100493
diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch
index 120d947..6fd6fb1 100644
--- a/matrix-synapse-1.4.1-paths.patch
+++ b/matrix-synapse-1.4.1-paths.patch
@@ -15,7 +15,7 @@ Index: synapse/synapse/config/key.py
===================================================================
--- synapse.orig/synapse/config/key.py
+++ synapse/synapse/config/key.py
-@@ -110,7 +110,7 @@ class KeyConfig(Config):
+@@ -117,7 +117,7 @@ class KeyConfig(Config):
signing_key_path = config.get("signing_key_path")
if signing_key_path is None:
signing_key_path = os.path.join(
@@ -24,7 +24,7 @@ Index: synapse/synapse/config/key.py
)
self.signing_key = self.read_signing_keys(signing_key_path, "signing_key")
-@@ -183,7 +183,7 @@ class KeyConfig(Config):
+@@ -190,7 +190,7 @@ class KeyConfig(Config):
generate_secrets: bool = False,
**kwargs: Any,
) -> str:
@@ -37,20 +37,20 @@ Index: synapse/synapse/config/logger.py
===================================================================
--- synapse.orig/synapse/config/logger.py
+++ synapse/synapse/config/logger.py
-@@ -149,7 +149,7 @@ class LoggingConfig(Config):
+@@ -156,7 +156,7 @@ class LoggingConfig(Config):
def generate_config_section(
self, config_dir_path: str, server_name: str, **kwargs: Any
) -> str:
- log_config = os.path.join(config_dir_path, server_name + ".log.config")
+ log_config = os.path.join('/etc/matrix-synapse/', server_name + ".log.config")
- return (
- """\
+ return """\
log_config: "%(log_config)s"
+ """ % locals()
Index: synapse/synapse/config/server.py
===================================================================
--- synapse.orig/synapse/config/server.py
+++ synapse/synapse/config/server.py
-@@ -793,7 +793,7 @@ class ServerConfig(Config):
+@@ -799,7 +799,7 @@ class ServerConfig(Config):
bind_port = 8448
unsecure_port = 8008
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index 2414dd2..daea830 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -27,7 +27,7 @@
%define pkgname matrix-synapse
Name: %{pkgname}-test
-Version: 1.114.0
+Version: 1.115.0
Release: 0
Summary: Test package for %{pkgname}
License: AGPL-3.0-or-later
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 1382b8d..8bd9b64 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,73 @@
+-------------------------------------------------------------------
+Tue Sep 17 14:41:36 UTC 2024 - Marcus Rueckert
+
+- Update to 1.115.0
+ - Features
+ - Improve cross-signing upload when using MSC3861 to use a
+ custom UIA flow stage, with web fallback support. (#17509)
+ - Bugfixes
+ - Return 400 M_BAD_JSON upon attempting to complete various
+ room actions with a non-local user ID and unknown room ID,
+ rather than an internal server error. (#17607)
+ - Fix authenticated media responses using a wrong limit when
+ following redirects over federation. (#17626)
+ - Fix bug where we returned the wrong bump_stamp for invites in
+ sliding sync response, causing incorrect ordering of invites
+ in the room list. (#17674)
+ - Improved Documentation
+ - Clarify that the admin api resource is only loaded on the
+ main process and not workers. (#17590)
+ - Fixed typo in saml2_config config example. (#17594)
+ - Deprecations and Removals
+ - Stabilise MSC4156 by removing the msc4156_enabled config
+ setting and defaulting it to true. (#17650)
+ - Internal Changes
+ - Pre-populate room data used in experimental MSC3575 Sliding
+ Sync /sync endpoint for quick filtering/sorting. (#17652)
+ - Speed up sliding sync by reducing amount of data pulled out
+ of the database for large rooms. (#17683)
+ - Update MSC3861 implementation: load the issuer and account
+ management URLs from OIDC discovery. (#17407)
+ - Pre-populate room data used in experimental MSC3575 Sliding
+ Sync /sync endpoint for quick filtering/sorting. (#17512,
+ #17632, #17633, #17634, #17635, #17636, #17641, #17654,
+ #17673)
+ - Store sliding sync per-connection state in the database.
+ (#17599, #17631)
+ - Make the sliding sync PerConnectionState class immutable.
+ (#17600)
+ - Replace isort and black with ruff. (#17620, #17643)
+ - Sliding Sync: Split up
+ get_room_membership_for_user_at_to_token. (#17629)
+ - Use new database tables for sliding sync. (#17630, #17649)
+ - Prevent duplicate tags being added to Sliding Sync traces.
+ (#17655)
+ - Get bump_stamp from new sliding sync tables which should be
+ faster. (#17658)
+ - Speed up incremental Sliding Sync requests by avoiding extra
+ work. (#17665)
+ - Small performance improvement in speeding up sliding sync.
+ (#17666, #17670, #17672)
+ - Speed up sliding sync by reducing number of database calls.
+ (#17684)
+ - Speed up sync by pulling out fewer events from the database.
+ (#17688)
+ - Updates to locked dependencies
+ - Bump authlib from 1.3.1 to 1.3.2. (#17679)
+ - Bump idna from 3.7 to 3.8. (#17682)
+ - Bump ruff from 0.6.2 to 0.6.4. (#17680)
+ - Bump towncrier from 24.7.1 to 24.8.0. (#17645)
+ - Bump twisted from 24.7.0rc1 to 24.7.0. (#17647)
+ - Bump types-pillow from 10.2.0.20240520 to 10.2.0.20240822.
+ (#17644)
+ - Bump types-psycopg2 from 2.9.21.20240417 to 2.9.21.20240819.
+ (#17646)
+ - Bump types-setuptools from 71.1.0.20240818 to
+ 74.1.0.20240907. (#17681)
+- refresh patches:
+ bump-dependencies.patch
+ matrix-synapse-1.4.1-paths.patch
+
-------------------------------------------------------------------
Mon Sep 2 19:24:17 UTC 2024 - Marcus Rueckert
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index ec7bf27..e3d0928 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,4 +1,4 @@
name: matrix-synapse
-version: 1.114.0
-mtime: 1725293314
-commit: 5eec67b6ef4b76caa2324a80e01e361bfa84a929
+version: 1.115.0
+mtime: 1726579949
+commit: d10872ee755b133750fa12905fec978fb59e9c25
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 5919676..1a753e0 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -20,6 +20,8 @@
# NOTE: Keep this is in the same order as pyproject.toml.
%if %{with use_poetry_for_dependencies}
+# TODO: 24.7.0
+%global Twisted_version 24.3.0
%global Jinja2_version 3.1.4
%global Pillow_version 10.4.0
# TODO: 6.0.2
@@ -30,7 +32,7 @@
%global canonicaljson_version 2.0.0
%global cryptography_version 43.0.0
%global immutabledict_version 4.2.0
-%global idna_version 3.7
+%global idna_version 3.8
%global ijson_version 3.3.0
%global jsonschema_version 4.20.0
%global matrix_common_version 1.3.0
@@ -38,8 +40,7 @@
%global msgpack_version 1.0.8
# TODO 1.3.0
%global netaddr_version 1.2.1
-# TODO 8.13.44
-%global phonenumbers_version 8.13.39
+%global phonenumbers_version 8.13.44
%global prometheus_client_version 0.20.0
%global psutil_version 2.0.0
%global pyOpenSSL_version 24.2.1
@@ -58,6 +59,7 @@
%global packaging_version 24.0
%global psycopg2_version 2.9.9
%global pysaml2_version 7.3.1
+# TODO: 1.3.2
%global Authlib_version 1.3.1
# TODO 5.3.0
%global lxml_version 5.2.2
@@ -155,7 +157,7 @@
%define pkgname matrix-synapse
%define eggname matrix_synapse
Name: %{pkgname}
-Version: 1.114.0
+Version: 1.115.0
Release: 0
Summary: Matrix protocol reference homeserver
License: AGPL-3.0-or-later
diff --git a/vendor.tar.zst b/vendor.tar.zst
index 2f5d6bf..5e7b3d2 100644
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:87d43a1ae29ef0be416730d4765189d904505ee047e99780202657f6d8284389
-size 7122019
+oid sha256:899623f0293805ebf4e012f81ce1d14cc842f1ff801031d91c14ce645fa5761f
+size 7122899