From 02aa7adf4c3f3bf71ddfcd4bd80d6adcf74a444c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 26 Nov 2024 07:45:18 +0000
Subject: [PATCH 1/2] Fix `delete_old_otks` job on worker deployments (#17960)

In a worker-mode deployment, the `E2eKeysHandler` is not necessarily
loaded, which means the handler for the `delete_old_otks` task will not
be registered. Make sure we load the handler.

Introduced in https://github.com/element-hq/synapse/pull/17934
---
 changelog.d/17960.bugfix | 1 +
 synapse/server.py        | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/17960.bugfix

diff --git a/changelog.d/17960.bugfix b/changelog.d/17960.bugfix
new file mode 100644
index 0000000000..767085320d
--- /dev/null
+++ b/changelog.d/17960.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse v1.120rc1 which would cause the newly-introduced `delete_old_otks` job to fail in worker-mode deployments.
diff --git a/synapse/server.py b/synapse/server.py
index c7b4918813..462e15cc2f 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -254,6 +254,7 @@ class HomeServer(metaclass=abc.ABCMeta):
         "auth",
         "deactivate_account",
         "delayed_events",
+        "e2e_keys",  # for the `delete_old_otks` scheduled-task handler
         "message",
         "pagination",
         "profile",

From 8c653e1dd6c8f18f2f9e2d78d37877a70dba1b2d Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Tue, 26 Nov 2024 14:11:12 +0100
Subject: [PATCH 2/2] 1.120.0

---
 CHANGES.md               | 9 +++++++++
 changelog.d/17960.bugfix | 1 -
 debian/changelog         | 6 ++++++
 pyproject.toml           | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/17960.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 31d9914b39..0caac3f89e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# Synapse 1.120.0 (2024-11-26)
+
+### Bugfixes
+
+- Fix a bug introduced in Synapse v1.120rc1 which would cause the newly-introduced `delete_old_otks` job to fail in worker-mode deployments. ([\#17960](https://github.com/element-hq/synapse/issues/17960))
+
+
+
+
 # Synapse 1.120.0rc1 (2024-11-20)
 
 This release enables the enforcement of authenticated media by default, with exemptions for media that is already present in the
diff --git a/changelog.d/17960.bugfix b/changelog.d/17960.bugfix
deleted file mode 100644
index 767085320d..0000000000
--- a/changelog.d/17960.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse v1.120rc1 which would cause the newly-introduced `delete_old_otks` job to fail in worker-mode deployments.
diff --git a/debian/changelog b/debian/changelog
index d7cec3fa8a..bd4466d7aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.120.0) stable; urgency=medium
+
+  * New synapse release 1.120.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 26 Nov 2024 13:10:23 +0000
+
 matrix-synapse-py3 (1.120.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.120.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index f0a4b682de..5fd1d7c198 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.120.0rc1"
+version = "1.120.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"