From c1f6ca6d1dd810d10e66042f820b19094e7cede9 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 27 Mar 2018 14:20:53 -0400 Subject: [PATCH] Fix the pynacl dependency Signed-off-by: Jeremy Cline --- ...h => Pin-pynacl-to-a-reasonable-version.patch | 16 ++++++++-------- matrix-synapse.spec | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) rename 0001-Remove-the-strict-version-requirement-for-pynacl.patch => Pin-pynacl-to-a-reasonable-version.patch (65%) diff --git a/0001-Remove-the-strict-version-requirement-for-pynacl.patch b/Pin-pynacl-to-a-reasonable-version.patch similarity index 65% rename from 0001-Remove-the-strict-version-requirement-for-pynacl.patch rename to Pin-pynacl-to-a-reasonable-version.patch index d8ba562..61ab84f 100644 --- a/0001-Remove-the-strict-version-requirement-for-pynacl.patch +++ b/Pin-pynacl-to-a-reasonable-version.patch @@ -1,7 +1,7 @@ -From 992a2483be7778954fa5004d74a9fb1d93c5e2bc Mon Sep 17 00:00:00 2001 +From 11348bffe7510cc7e880cff7f99cd3db9f95ec4a Mon Sep 17 00:00:00 2001 From: Jeremy Cline -Date: Mon, 3 Apr 2017 21:21:28 +0000 -Subject: [PATCH] Remove the strict version requirement for pynacl +Date: Tue, 27 Mar 2018 14:17:42 -0400 +Subject: [PATCH] Pin pynacl to a reasonable version Signed-off-by: Jeremy Cline --- @@ -9,18 +9,18 @@ Signed-off-by: Jeremy Cline 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py -index 7817b0cd..3f17f47a 100644 +index 91179ce53..0a810fb92 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py -@@ -22,7 +22,7 @@ REQUIREMENTS = { +@@ -24,7 +24,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], -- "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], -+ "pynacl": ["nacl", "nacl.bindings"], +- "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], ++ "pynacl>=1.2.0": ["nacl>=1.2.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- -2.12.2 +2.16.2 diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 86e93db..af28049 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -8,6 +8,7 @@ License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz Source1: synapse.sysconfig +Patch0: Pin-pynacl-to-a-reasonable-version.patch BuildArch: noarch BuildRequires: python2-devel @@ -33,7 +34,7 @@ BuildRequires: python2-psutil >= 2.0.0 BuildRequires: python2-pyasn1 BuildRequires: python2-pydenticon BuildRequires: python2-pymacaroons-pynacl -BuildRequires: python2-pynacl >= 1.2.1 +BuildRequires: python2-pynacl >= 1.2.0 BuildRequires: python2-pysaml2 >= 3.0.0 BuildRequires: python2-service-identity >= 1.0.0 BuildRequires: python2-signedjson >= 1.0.0 @@ -65,7 +66,7 @@ Requires: python2-psutil >= 2.0.0 Requires: python2-pyasn1 Requires: python2-pydenticon Requires: python2-pymacaroons-pynacl -Requires: python2-pynacl >= 1.2.1 +Requires: python2-pynacl >= 1.2.0 Requires: python2-pysaml2 >= 3.0.0 Requires: python2-service-identity >= 1.0.0 Requires: python2-signedjson >= 1.0.0