From 18ba38092252b779f0c886499f13b49c557eab9f Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Thu, 21 Apr 2022 10:25:14 +1000 Subject: [PATCH] Update to v1.57.0 --- ...raphy-dependency-version-requirement.patch | 31 ------------------- matrix-synapse.spec | 14 ++++----- sources | 2 +- 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 0001-relax-cryptography-dependency-version-requirement.patch diff --git a/0001-relax-cryptography-dependency-version-requirement.patch b/0001-relax-cryptography-dependency-version-requirement.patch deleted file mode 100644 index 6c61df7..0000000 --- a/0001-relax-cryptography-dependency-version-requirement.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4e39aa55098734f27f83f4ade53fbb71879255dc Mon Sep 17 00:00:00 2001 -From: Dan Callaghan -Date: Sun, 18 Jul 2021 13:18:10 +1000 -Subject: [PATCH] relax cryptography dependency version requirement - -In Fedora, python-cryptography does not bundle OpenSSL, so it's always -up to date. This strict version requirement is not necessary. See: - -https://bugzilla.redhat.com/show_bug.cgi?id=1978949 ---- - synapse/python_dependencies.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py -index 1dd39f06cf..2b83353b76 100644 ---- a/synapse/python_dependencies.py -+++ b/synapse/python_dependencies.py -@@ -78,9 +78,7 @@ REQUIREMENTS = [ - "bleach>=1.4.3", - # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. - "typing-extensions>=3.10.0", -- # We enforce that we have a `cryptography` version that bundles an `openssl` -- # with the latest security patches. -- "cryptography>=3.4.7", -+ "cryptography>=3.4", - # ijson 3.1.4 fixes a bug with "." in property names - "ijson>=3.1.4", - "matrix-common~=1.1.0", --- -2.35.1 - diff --git a/matrix-synapse.spec b/matrix-synapse.spec index d1d0f3b..4c1994c 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -6,7 +6,7 @@ %{?python_enable_dependency_generator} Name: matrix-%{srcname} -Version: 1.56.0 +Version: 1.57.0 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -15,8 +15,6 @@ Source0: %{url}/archive/v%{version}%{rcx}/%{srcname}-%{version}%{rcx}.tar.gz Source1: synapse.sysconfig Source2: synapse.service Source3: matrix-synapse.sysusers -# non-upstreamable patch to accept any version of python-cryptography, see RHBZ#1978949 -Patch1: 0001-relax-cryptography-dependency-version-requirement.patch BuildArch: noarch BuildRequires: python3-devel @@ -33,9 +31,7 @@ BuildRequires: python3-authlib BuildRequires: python3-bcrypt >= 3.1.0 BuildRequires: python3-bleach >= 1.4.3 BuildRequires: python3-canonicaljson >= 1.4.0 -# v3.4.7 affects only the binary distribution, so using v3.4.6 is fine. -BuildRequires: python3-cryptography >= 3.4.6 -BuildRequires: python3-daemonize >= 2.3.1 +BuildRequires: python3-cryptography >= 3.4.7 BuildRequires: (python3-frozendict without python3-frozendict = 2.1.2) BuildRequires: python3-idna >= 2.5 BuildRequires: python3-ijson @@ -47,6 +43,7 @@ BuildRequires: python3-matrix-common BuildRequires: python3-matrix-synapse-ldap3 >= 0.1 BuildRequires: python3-msgpack >= 0.5.2 BuildRequires: python3-netaddr >= 0.7.18 +BuildRequires: python3-packaging >= 16.1 BuildRequires: python3-phonenumbers >= 8.2.0 BuildRequires: python3-pillow BuildRequires: python3-prometheus_client @@ -139,7 +136,10 @@ PYTHONPATH=. trial-3 tests %changelog -* Thu Apr 05 2022 Kai A. Hiller - 1.56.0-1 +* Thu Apr 21 2022 Dan Callaghan - 1.57.0-1 +- Update to v1.57.0 + +* Tue Apr 05 2022 Kai A. Hiller - 1.56.0-1 - Update to v1.56.0 * Thu Mar 24 2022 Kai A. Hiller - 1.55.0-1 diff --git a/sources b/sources index 98d37a0..cdb5fdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.56.0.tar.gz) = da8233008adc92bbb5975a110e2825c8add5a38db3c21a378f9f1a7b4bf826fc13b6230e69c2b9d400e33d276d5fd781e176623bdf4d44a1e768211e2013e5f1 +SHA512 (synapse-1.57.0.tar.gz) = ce2392fed9a7dd7056d39877da8f417b86d5c7701aaff08e4a68561cfb3d61129d29b6903e1a7cafd9f1ec0ffcbe063a8d9f6c1c90318d0a813faec754536b77