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

0001-relax-cryptography-dependency-version-requirement.patch

@@ -0,0 +1,31 @@
+From 4bdcf996757a5d13df63f7891a1dd4c7186c20dc Mon Sep 17 00:00:00 2001
+From: Dan Callaghan <djc@djc.id.au>
+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 271c17c22..e8a71d477 100644
+--- a/synapse/python_dependencies.py
++++ b/synapse/python_dependencies.py
+@@ -82,9 +82,7 @@
+     "Jinja2>=2.9",
+     "bleach>=1.4.3",
+     "typing-extensions>=3.7.4",
+-    # 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.0",
+ ]
+ 
+-- 
+2.31.1
+

matrix-synapse.spec

@@ -23,6 +23,9 @@ Source1:    synapse.sysconfig
 Source2:    synapse.service
 Source3:    synapse-homeserver
 Source4:    synapse@.service
+
+# 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
@@ -36,14 +39,17 @@ BuildRequires:  /usr/bin/openssl
 # Package dependencies
 BuildRequires:  python3-ijson
 #BuildRequires:  python3-txacme >= 0.9.2
-BuildRequires:  python3-attrs >= 19.1.0
+BuildRequires:  (python3-attrs >= 19.2.0 without python3-attrs = 21.1.0)
 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-frozendict >= 1.0
 BuildRequires:  python3-idna >= 2.5
+BuildRequires:  python3-ijson
 BuildRequires:  python3-jinja2 >= 2.9
 BuildRequires:  python3-jsonschema >= 2.5.1
 BuildRequires:  python3-jwt
@@ -90,7 +96,7 @@ echo %{rcv}
 %autosetup -p1 -n %{srcname}-%{ghversion}%{rcx}
 
 # Worlaround fedora not having the right version of python crypto yet.
-sed --debug -i "s/cryptography>=3.4.7/cryptography>=3.4.6/" synapse/python_dependencies.py
+#sed --debug -i "s/cryptography>=3.4.7/cryptography>=3.4.6/" synapse/python_dependencies.py
 
 # We don't support the built-in client so remove all the bundled JS.
 rm -rf synapse/static
@@ -154,6 +160,26 @@ exit 0
 
 
 %changelog
+* Fri Jul 23 2021 Kai A. Hiller <V02460@gmail.com> - 1.38.1-1
+- Update to v1.38.1
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.38.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun Jul 18 2021 Dan Callaghan <djc@djc.id.au> - 1.38.0-2
+- fix startup ordering of synapse.service (RHBZ#1910740)
+- relax version requirement for python3-cryptography
+
+* Wed Jul 14 2021 Kai A. Hiller <V02460@gmail.com> - 1.38.0-1
+- Update to v1.38.0
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.26.0-3
+- Rebuilt for Python 3.10
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.26.0-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
 * Thu Jan 28 2021 Kai A. Hiller <V02460@gmail.com> - 1.26.0-1
 - Update to v1.26.0
 

sources

@@ -0,0 +1 @@
+SHA512 (synapse-1.38.1.tar.gz) = 3b6c68f47f8a4cb2083c9ee29ec5f253fc3d86ba9971ff6d106b99b939d4603e97a899dbd0dfb8557fc203caa2d1908ebde743090c1440f9fd1be0ecb9357d51

synapse.service

@@ -1,5 +1,6 @@
 [Unit]
 Description=Synapse Matrix homeserver
+After=network-online.target postgresql.service
 
 [Service]
 Type=notify