Merge branch 'master' into develop
4 files changed, 27 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index b4d91b2793..88b053897e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,18 @@ Synapse 1.59.0
The non-standard `m.login.jwt` login type has been removed from Synapse. It can be replaced with `org.matrix.login.jwt` for identical behaviour. This is only used if `jwt_config.enabled` is set to `true` in the configuration.
+Synapse 1.58.1 (2022-05-05)
+===========================
+
+This patch release includes a fix to the Debian packages, installing the
+`systemd` and `cache_memory` extra package groups, which were incorrectly
+omitted in v1.58.0. This primarily prevented Synapse from starting
+when the `systemd.journal.JournalHandler` log handler was configured.
+See [#12631](https://github.com/matrix-org/synapse/issues/12631) for further information.
+
+Otherwise, no significant changes since 1.58.0.
+
+
Synapse 1.58.0 (2022-05-03)
===========================
diff --git a/debian/build_virtualenv b/debian/build_virtualenv
index b068792592..d2955f7628 100755
--- a/debian/build_virtualenv
+++ b/debian/build_virtualenv
@@ -37,7 +37,12 @@ python3 -m venv "$TEMP_VENV"
source "$TEMP_VENV/bin/activate"
pip install -U pip
pip install poetry==1.2.0b1
-poetry export --extras all --extras test -o exported_requirements.txt
+poetry export \
+ --extras all \
+ --extras test \
+ --extras systemd \
+ --extras cache_memory \
+ -o exported_requirements.txt
deactivate
rm -rf "$TEMP_VENV"
diff --git a/debian/changelog b/debian/changelog
index 53b2387776..5440f91bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+matrix-synapse-py3 (1.58.1) stable; urgency=medium
+
+ * Include python dependencies from the `systemd` and `cache_memory` extras package groups, which
+ were incorrectly omitted from the 1.58.0 package.
+ * New Synapse release 1.58.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 05 May 2022 14:58:23 +0100
+
matrix-synapse-py3 (1.58.0) stable; urgency=medium
* New Synapse release 1.58.0.
diff --git a/pyproject.toml b/pyproject.toml
index cf3982d124..446895711b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
[tool.poetry]
name = "matrix-synapse"
-version = "1.58.0"
+version = "1.58.1"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "Apache-2.0"
|
