From 7b75922020f308a30f0d93c56bd37d0560aba8bd Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Aug 2024 15:35:18 +0100
Subject: [PATCH] 1.114.0rc2

---
 CHANGES.md                | 42 +++++++++++++++++++++++++++++++++++++++
 changelog.d/17194.bugfix  |  1 -
 changelog.d/17407.misc    |  1 -
 changelog.d/17509.feature |  1 -
 changelog.d/17532.bugfix  |  1 -
 changelog.d/17543.bugfix  |  1 -
 changelog.d/17595.misc    |  1 -
 changelog.d/17599.misc    |  1 -
 changelog.d/17600.misc    |  1 -
 changelog.d/17604.misc    |  1 -
 changelog.d/17606.misc    |  1 -
 changelog.d/17608.feature |  1 -
 changelog.d/17617.misc    |  1 -
 changelog.d/17620.misc    |  1 -
 changelog.d/17622.misc    |  1 -
 debian/changelog          |  6 ++++++
 pyproject.toml            |  2 +-
 17 files changed, 49 insertions(+), 15 deletions(-)
 delete mode 100644 changelog.d/17194.bugfix
 delete mode 100644 changelog.d/17407.misc
 delete mode 100644 changelog.d/17509.feature
 delete mode 100644 changelog.d/17532.bugfix
 delete mode 100644 changelog.d/17543.bugfix
 delete mode 100644 changelog.d/17595.misc
 delete mode 100644 changelog.d/17599.misc
 delete mode 100644 changelog.d/17600.misc
 delete mode 100644 changelog.d/17604.misc
 delete mode 100644 changelog.d/17606.misc
 delete mode 100644 changelog.d/17608.feature
 delete mode 100644 changelog.d/17617.misc
 delete mode 100644 changelog.d/17620.misc
 delete mode 100644 changelog.d/17622.misc

diff --git a/CHANGES.md b/CHANGES.md
index 0a57cfb90..16995224e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,45 @@
+# Synapse 1.114.0rc2 (2024-08-30)
+
+### Features
+
+- Improve cross-signing upload when using [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) to use a custom UIA flow stage, with web fallback support. ([\#17509](https://github.com/element-hq/synapse/issues/17509))
+- Make `hash_password` accept password input from stdin. ([\#17608](https://github.com/element-hq/synapse/issues/17608))
+
+### Bugfixes
+
+- Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven). ([\#17194](https://github.com/element-hq/synapse/issues/17194))
+- Fix content-length on federation /thumbnail responses. ([\#17532](https://github.com/element-hq/synapse/issues/17532))
+- Fix authenticated media responses using a wrong limit when following redirects over federation. ([\#17543](https://github.com/element-hq/synapse/issues/17543))
+
+### Internal Changes
+
+- MSC3861: load the issuer and account management URLs from OIDC discovery. ([\#17407](https://github.com/element-hq/synapse/issues/17407))
+- Refactor sliding sync class into multiple files. ([\#17595](https://github.com/element-hq/synapse/issues/17595))
+- Store sliding sync per-connection state in the database. ([\#17599](https://github.com/element-hq/synapse/issues/17599))
+- Make the sliding sync `PerConnectionState` class immutable. ([\#17600](https://github.com/element-hq/synapse/issues/17600))
+- Add support to `@tag_args` for standalone functions. ([\#17604](https://github.com/element-hq/synapse/issues/17604))
+- Speed up incremental syncs in sliding sync by adding some more caching. ([\#17606](https://github.com/element-hq/synapse/issues/17606))
+- Always return the user's own read receipts in sliding sync. ([\#17617](https://github.com/element-hq/synapse/issues/17617))
+- Replace `isort` and `black with `ruff`. ([\#17620](https://github.com/element-hq/synapse/issues/17620))
+- Refactor sliding sync code to move room list logic out into a separate class. ([\#17622](https://github.com/element-hq/synapse/issues/17622))
+
+
+
+### Updates to locked dependencies
+
+* Bump attrs from 23.2.0 to 24.2.0. ([\#17609](https://github.com/element-hq/synapse/issues/17609))
+* Bump cryptography from 42.0.8 to 43.0.0. ([\#17584](https://github.com/element-hq/synapse/issues/17584))
+* Bump phonenumbers from 8.13.43 to 8.13.44. ([\#17610](https://github.com/element-hq/synapse/issues/17610))
+* Bump pygithub from 2.3.0 to 2.4.0. ([\#17612](https://github.com/element-hq/synapse/issues/17612))
+* Bump pyyaml from 6.0.1 to 6.0.2. ([\#17611](https://github.com/element-hq/synapse/issues/17611))
+* Bump sentry-sdk from 2.12.0 to 2.13.0. ([\#17585](https://github.com/element-hq/synapse/issues/17585))
+* Bump serde from 1.0.206 to 1.0.208. ([\#17581](https://github.com/element-hq/synapse/issues/17581))
+* Bump serde from 1.0.208 to 1.0.209. ([\#17613](https://github.com/element-hq/synapse/issues/17613))
+* Bump serde_json from 1.0.124 to 1.0.125. ([\#17582](https://github.com/element-hq/synapse/issues/17582))
+* Bump serde_json from 1.0.125 to 1.0.127. ([\#17614](https://github.com/element-hq/synapse/issues/17614))
+* Bump types-jsonschema from 4.23.0.20240712 to 4.23.0.20240813. ([\#17583](https://github.com/element-hq/synapse/issues/17583))
+* Bump types-setuptools from 71.1.0.20240726 to 71.1.0.20240818. ([\#17586](https://github.com/element-hq/synapse/issues/17586))
+
 # Synapse 1.114.0rc1 (2024-08-20)
 
 ### Features
diff --git a/changelog.d/17194.bugfix b/changelog.d/17194.bugfix
deleted file mode 100644
index 29ac56cea..000000000
--- a/changelog.d/17194.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven).
diff --git a/changelog.d/17407.misc b/changelog.d/17407.misc
deleted file mode 100644
index 9ed6e61a5..000000000
--- a/changelog.d/17407.misc
+++ /dev/null
@@ -1 +0,0 @@
-MSC3861: load the issuer and account management URLs from OIDC discovery.
diff --git a/changelog.d/17509.feature b/changelog.d/17509.feature
deleted file mode 100644
index 6d639ceb9..000000000
--- a/changelog.d/17509.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve cross-signing upload when using [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) to use a custom UIA flow stage, with web fallback support.
diff --git a/changelog.d/17532.bugfix b/changelog.d/17532.bugfix
deleted file mode 100644
index 5b05f0f9b..000000000
--- a/changelog.d/17532.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix content-length on federation /thumbnail responses.
diff --git a/changelog.d/17543.bugfix b/changelog.d/17543.bugfix
deleted file mode 100644
index 152b305e5..000000000
--- a/changelog.d/17543.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix authenticated media responses using a wrong limit when following redirects over federation.
\ No newline at end of file
diff --git a/changelog.d/17595.misc b/changelog.d/17595.misc
deleted file mode 100644
index c8e040d87..000000000
--- a/changelog.d/17595.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor sliding sync class into multiple files.
diff --git a/changelog.d/17599.misc b/changelog.d/17599.misc
deleted file mode 100644
index 2f81356d1..000000000
--- a/changelog.d/17599.misc
+++ /dev/null
@@ -1 +0,0 @@
-Store sliding sync per-connection state in the database.
diff --git a/changelog.d/17600.misc b/changelog.d/17600.misc
deleted file mode 100644
index a81c67f6d..000000000
--- a/changelog.d/17600.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make the sliding sync `PerConnectionState` class immutable.
diff --git a/changelog.d/17604.misc b/changelog.d/17604.misc
deleted file mode 100644
index 96cb213bb..000000000
--- a/changelog.d/17604.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add support to `@tag_args` for standalone functions.
diff --git a/changelog.d/17606.misc b/changelog.d/17606.misc
deleted file mode 100644
index 47634b130..000000000
--- a/changelog.d/17606.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up incremental syncs in sliding sync by adding some more caching.
diff --git a/changelog.d/17608.feature b/changelog.d/17608.feature
deleted file mode 100644
index adf9ac553..000000000
--- a/changelog.d/17608.feature
+++ /dev/null
@@ -1 +0,0 @@
-Make `hash_password` accept password input from stdin.
\ No newline at end of file
diff --git a/changelog.d/17617.misc b/changelog.d/17617.misc
deleted file mode 100644
index ba0564896..000000000
--- a/changelog.d/17617.misc
+++ /dev/null
@@ -1 +0,0 @@
-Always return the user's own read receipts in sliding sync.
diff --git a/changelog.d/17620.misc b/changelog.d/17620.misc
deleted file mode 100644
index f583cdcb3..000000000
--- a/changelog.d/17620.misc
+++ /dev/null
@@ -1 +0,0 @@
-Replace `isort` and `black with `ruff`.
diff --git a/changelog.d/17622.misc b/changelog.d/17622.misc
deleted file mode 100644
index af064f7e1..000000000
--- a/changelog.d/17622.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor sliding sync code to move room list logic out into a separate class.
diff --git a/debian/changelog b/debian/changelog
index f32dcc045..b09a914d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.114.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.114.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 30 Aug 2024 15:35:13 +0100
+
 matrix-synapse-py3 (1.114.0~rc1) stable; urgency=medium
 
   * New synapse release 1.114.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 058c35c82..bbe5eb791 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.114.0rc1"
+version = "1.114.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"