alex/copr-matrix-synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/rawhide' into alex

Browse source
This commit is contained in:
Alex Manning 2022-04-16 11:21:55 +01:00
parent 4310789310 356f79beea
commit 8639064d06
Signed by: alex
GPG key ID: AD1011E427DB0062
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
0001-relax-cryptography-dependency-version-requirement.patch
View file

@ -1,4 +1,4 @@
From 2f194c0773550f263136ab6ed1f01bf2611e1049 Mon Sep 17 00:00:00 2001 From 4e39aa55098734f27f83f4ade53fbb71879255dc Mon Sep 17 00:00:00 2001
From: Dan Callaghan <djc@djc.id.au> From: Dan Callaghan <djc@djc.id.au>
Date: Sun, 18 Jul 2021 13:18:10 +1000 Date: Sun, 18 Jul 2021 13:18:10 +1000
Subject: [PATCH] relax cryptography dependency version requirement Subject: [PATCH] relax cryptography dependency version requirement
@ -12,14 +12,13 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1978949
1 file changed, 1 insertion(+), 3 deletions(-) 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index b40a7bbb76..e32c2c5901 100644 index 1dd39f06cf..2b83353b76 100644
--- a/synapse/python_dependencies.py --- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -77,9 +77,7 @@ REQUIREMENTS = [ @@ -78,9 +78,7 @@ REQUIREMENTS = [
"Jinja2>=3.0",
"bleach>=1.4.3", "bleach>=1.4.3",
# We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0.
"typing-extensions>=3.7.4", "typing-extensions>=3.10.0",
- # We enforce that we have a `cryptography` version that bundles an `openssl` - # We enforce that we have a `cryptography` version that bundles an `openssl`
- # with the latest security patches. - # with the latest security patches.
- "cryptography>=3.4.7", - "cryptography>=3.4.7",

10
matrix-synapse.spec
View file

@ -48,7 +48,7 @@ BuildRequires: python3-daemonize >= 2.3.1
BuildRequires: (python3-frozendict without python3-frozendict = 2.1.2) BuildRequires: (python3-frozendict without python3-frozendict = 2.1.2)
BuildRequires: python3-idna >= 2.5 BuildRequires: python3-idna >= 2.5
BuildRequires: python3-ijson BuildRequires: python3-ijson
BuildRequires: python3-jinja2 >= 2.9 BuildRequires: python3-jinja2
BuildRequires: python3-jsonschema BuildRequires: python3-jsonschema
BuildRequires: python3-jwt BuildRequires: python3-jwt
BuildRequires: python3-lxml BuildRequires: python3-lxml
@ -72,7 +72,7 @@ BuildRequires: python3-sortedcontainers >= 1.4.4
BuildRequires: python3-systemd >= 231 BuildRequires: python3-systemd >= 231
BuildRequires: python3-treq >= 15.1 BuildRequires: python3-treq >= 15.1
BuildRequires: python3-twisted >= 18.9.0 BuildRequires: python3-twisted >= 18.9.0
BuildRequires: python3-typing-extensions >= 3.7.4 BuildRequires: python3-typing-extensions
BuildRequires: python3-unpaddedbase64 >= 1.1.0 BuildRequires: python3-unpaddedbase64 >= 1.1.0
BuildRequires: systemd BuildRequires: systemd
BuildRequires: xmlsec1 BuildRequires: xmlsec1
@ -154,6 +154,12 @@ PYTHONPATH=. trial-3 tests
%changelog %changelog
* Thu Apr 05 2022 Kai A. Hiller <V02460@gmail.com> - 1.56.0-1
- Update to v1.56.0
* Thu Mar 24 2022 Kai A. Hiller <V02460@gmail.com> - 1.55.0-1
- Update to v1.55.0
* Tue Mar 08 2022 Kai A. Hiller <V02460@gmail.com> - 1.54.0-1 * Tue Mar 08 2022 Kai A. Hiller <V02460@gmail.com> - 1.54.0-1
- Update to v1.54.0 - Update to v1.54.0