From b8b172466fe1605e29e8a4642fcce47ecf2ca7f0 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 15 Feb 2021 15:30:16 +0000 Subject: [PATCH 1/3] Add rustc to Docker image build environment (#9405) This is needed to build the cryptography library, since it does not provide wheels for ARMv7. Fixes #9403 Signed-off-by: Dan Callahan --- changelog.d/9405.misc | 1 + docker/Dockerfile | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 changelog.d/9405.misc diff --git a/changelog.d/9405.misc b/changelog.d/9405.misc new file mode 100644 index 000000000..d82c3b832 --- /dev/null +++ b/changelog.d/9405.misc @@ -0,0 +1 @@ +Add rustc as a dependency when building Docker images. diff --git a/docker/Dockerfile b/docker/Dockerfile index afd896ffc..d619ee08e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,11 +28,13 @@ RUN apt-get update && apt-get install -y \ libwebp-dev \ libxml++2.6-dev \ libxslt1-dev \ + rustc \ zlib1g-dev \ && rm -rf /var/lib/apt/lists/* # Build dependencies that are not available as wheels, to speed up rebuilds RUN pip install --prefix="/install" --no-warn-script-location \ + cryptography \ frozendict \ jaeger-client \ opentracing \ From a27c1fd74b47499870ed23f17d958bf92a6a11ad Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 16 Feb 2021 13:12:02 +0000 Subject: [PATCH 2/3] 1.27.0 --- CHANGES.md | 23 ++++++++++++++++------- changelog.d/9405.misc | 1 - debian/changelog | 8 ++++++-- synapse/__init__.py | 2 +- 4 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 changelog.d/9405.misc diff --git a/CHANGES.md b/CHANGES.md index b71d4641b..adde0b031 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,19 @@ +Synapse 1.27.0 (2021-02-16) +=========================== + +Note that this release includes a change in Synapse to use Redis as a cache ─ as well as a pub/sub mechanism ─ if Redis support is enabled for workers. No action is needed by server administrators, and we do not expect resource usage of the Redis instance to change dramatically. + +This release also changes the callback URI for OpenID Connect (OIDC) identity providers. If your server is configured to use single sign-on via an OIDC/OAuth2 IdP, you may need to make configuration changes. Please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. + +This release also changes escaping of variables in the HTML templates for SSO or email notifications. If you have customised these templates, please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. + + +Internal Changes +---------------- + +- Add rustc as a dependency when building Docker images. ([\#9405](https://github.com/matrix-org/synapse/issues/9405)) + + Synapse 1.27.0rc2 (2021-02-11) ============================== @@ -23,13 +39,6 @@ Improved Documentation Synapse 1.27.0rc1 (2021-02-02) ============================== -Note that this release includes a change in Synapse to use Redis as a cache ─ as well as a pub/sub mechanism ─ if Redis support is enabled for workers. No action is needed by server administrators, and we do not expect resource usage of the Redis instance to change dramatically. - -This release also changes the callback URI for OpenID Connect (OIDC) identity providers. If your server is configured to use single sign-on via an OIDC/OAuth2 IdP, you may need to make configuration changes. Please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. - -This release also changes escaping of variables in the HTML templates for SSO or email notifications. If you have customised these templates, please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. - - Features -------- diff --git a/changelog.d/9405.misc b/changelog.d/9405.misc deleted file mode 100644 index d82c3b832..000000000 --- a/changelog.d/9405.misc +++ /dev/null @@ -1 +0,0 @@ -Add rustc as a dependency when building Docker images. diff --git a/debian/changelog b/debian/changelog index 1a421a85b..aa83d4e13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -matrix-synapse-py3 (1.26.0+nmu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.27.0) stable; urgency=medium + [ Dan Callahan ] * Fix build on Ubuntu 16.04 LTS (Xenial). - -- Dan Callahan Thu, 28 Jan 2021 16:21:03 +0000 + [ Synapse Packaging team ] + * New synapse release 1.27.0. + + -- Synapse Packaging team Tue, 16 Feb 2021 13:11:28 +0000 matrix-synapse-py3 (1.26.0) stable; urgency=medium diff --git a/synapse/__init__.py b/synapse/__init__.py index 283d6ffef..359276427 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.27.0rc2" +__version__ = "1.27.0" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when From 6600f0bd572500f9b85bfeed424eff0300e2fa59 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 16 Feb 2021 13:16:17 +0000 Subject: [PATCH 3/3] Fixup CHANGES --- CHANGES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index adde0b031..d9afcaa52 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,10 +8,10 @@ This release also changes the callback URI for OpenID Connect (OIDC) identity pr This release also changes escaping of variables in the HTML templates for SSO or email notifications. If you have customised these templates, please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. -Internal Changes ----------------- +Bugfixes +-------- -- Add rustc as a dependency when building Docker images. ([\#9405](https://github.com/matrix-org/synapse/issues/9405)) +- Fix building Docker images for armv7. ([\#9405](https://github.com/matrix-org/synapse/issues/9405)) Synapse 1.27.0rc2 (2021-02-11)