From 338d2e8dd8d64a7ea7e47cd20c3c53e6a36845f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:28 +0100 Subject: [PATCH 1/9] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- matrix-synapse.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 278fa70..0f42ded 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -7,7 +7,7 @@ Name: matrix-%{srcname} Version: 1.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} @@ -135,6 +135,10 @@ exit 0 %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.26.0-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Thu Jan 28 2021 Kai A. Hiller - 1.26.0-1 - Update to v1.26.0 From bb3a27918024156c9aa2a2394fe03ededd30c6cd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:11:18 +0200 Subject: [PATCH 2/9] Rebuilt for Python 3.10 --- matrix-synapse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 0f42ded..17156c0 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -7,7 +7,7 @@ Name: matrix-%{srcname} Version: 1.26.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} @@ -135,6 +135,9 @@ exit 0 %changelog +* Fri Jun 04 2021 Python Maint - 1.26.0-3 +- Rebuilt for Python 3.10 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.26.0-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 18ca30d293889dff36404f1b3b1d252d08d87a6e Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 9 Jul 2021 20:18:43 +0200 Subject: [PATCH 3/9] Update to v1.38.0 --- matrix-synapse.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 17156c0..a50a7e4 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -6,8 +6,8 @@ %{?python_enable_dependency_generator} Name: matrix-%{srcname} -Version: 1.26.0 -Release: 3%{?dist} +Version: 1.38.0 +Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} @@ -26,14 +26,17 @@ BuildRequires: /usr/bin/openssl # Package dependencies #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 @@ -135,6 +138,9 @@ exit 0 %changelog +* Wed Jul 14 2021 Kai A. Hiller - 1.38.0-1 +- Update to v1.38.0 + * Fri Jun 04 2021 Python Maint - 1.26.0-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index d2e5190..ae6f93e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.26.0.tar.gz) = 82ca85aa4dc1e3220f89e7f6815786135fa9bd0b33a1055f63b309b1fa193eeb993f832db573586945191e7195e42926c5342776b249dbc8e83daf4c196f00a4 +SHA512 (synapse-1.38.0.tar.gz) = d6da8a2ef7bd281b3117ec51743e984f21c9a7aaeaab4f81880e612d201874c0fd366fc18793ae351c168e1f985530fdbb4a6edfcaf9c8d93001bd92cd043f6c From d1eb576c71c6508a17ac57f6bfcb3283834e1b82 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 17 Apr 2021 20:35:05 +0200 Subject: [PATCH 4/9] Fix #1910740 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Václav Nováček for the suggestion --- synapse.service | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse.service b/synapse.service index d0ffe60..4b0624f 100644 --- a/synapse.service +++ b/synapse.service @@ -11,6 +11,7 @@ ExecStart=/usr/bin/python3 -m synapse.app.homeserver --config-path=/etc/synapse/ ExecReload=/bin/kill -HUP $MAINPID # EnvironmentFile=-/etc/sysconfig/synapse # Can be used to e.g. set SYNAPSE_CACHE_FACTOR SyslogIdentifier=synapse +After=network-online.target postgresql.service [Install] WantedBy=multi-user.target From 05bab657ef535793f714f7892565c2f054987671 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sun, 18 Jul 2021 17:02:04 +1000 Subject: [PATCH 5/9] changelog and rev bump for previous commit --- matrix-synapse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index a50a7e4..dbd51ab 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -7,7 +7,7 @@ Name: matrix-%{srcname} Version: 1.38.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} @@ -138,6 +138,9 @@ exit 0 %changelog +* Sun Jul 18 2021 Dan Callaghan - 1.38.0-2 +- fix startup ordering of synapse.service (RHBZ#1910740) + * Wed Jul 14 2021 Kai A. Hiller - 1.38.0-1 - Update to v1.38.0 From 5dcb251ed2d78e6911d9b1f2c1c1b09f7a5595f7 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sun, 18 Jul 2021 17:02:27 +1000 Subject: [PATCH 6/9] relax version requirement on python3-cryptography We only have 3.4.6 in F34, intentionally. OpenSSL is up to date so it's not a problem. --- ...raphy-dependency-version-requirement.patch | 31 +++++++++++++++++++ matrix-synapse.spec | 3 ++ 2 files changed, 34 insertions(+) create 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 new file mode 100644 index 0000000..8b1b4eb --- /dev/null +++ b/0001-relax-cryptography-dependency-version-requirement.patch @@ -0,0 +1,31 @@ +From 4bdcf996757a5d13df63f7891a1dd4c7186c20dc 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 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 + diff --git a/matrix-synapse.spec b/matrix-synapse.spec index dbd51ab..4175a5d 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -14,6 +14,8 @@ URL: https://github.com/matrix-org/%{srcname} Source0: %{url}/archive/v%{version}%{rcx}/%{srcname}-%{version}%{rcx}.tar.gz Source1: synapse.sysconfig Source2: 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 @@ -140,6 +142,7 @@ exit 0 %changelog * Sun Jul 18 2021 Dan Callaghan - 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 - 1.38.0-1 - Update to v1.38.0 From aab90fe6a3616196bee7afed4b18985dc3751b37 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sun, 18 Jul 2021 17:27:36 +1000 Subject: [PATCH 7/9] move After= to correct section in synapse.service --- synapse.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse.service b/synapse.service index 4b0624f..7ab8671 100644 --- a/synapse.service +++ b/synapse.service @@ -1,5 +1,6 @@ [Unit] Description=Synapse Matrix homeserver +After=network-online.target postgresql.service [Service] Type=notify @@ -11,7 +12,6 @@ ExecStart=/usr/bin/python3 -m synapse.app.homeserver --config-path=/etc/synapse/ ExecReload=/bin/kill -HUP $MAINPID # EnvironmentFile=-/etc/sysconfig/synapse # Can be used to e.g. set SYNAPSE_CACHE_FACTOR SyslogIdentifier=synapse -After=network-online.target postgresql.service [Install] WantedBy=multi-user.target From 167105048fc9aedbf1440a74ecdc051c52f09e84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:52:29 +0000 Subject: [PATCH 8/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- matrix-synapse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 4175a5d..abf2581 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -7,7 +7,7 @@ Name: matrix-%{srcname} Version: 1.38.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} @@ -140,6 +140,9 @@ exit 0 %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.38.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jul 18 2021 Dan Callaghan - 1.38.0-2 - fix startup ordering of synapse.service (RHBZ#1910740) - relax version requirement for python3-cryptography From 4cb09f381588c2f1c87c7b6c96447588dd96a41e Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 23 Jul 2021 15:30:17 +0200 Subject: [PATCH 9/9] Update to v1.38.1 --- matrix-synapse.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index abf2581..10c06c5 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -6,8 +6,8 @@ %{?python_enable_dependency_generator} Name: matrix-%{srcname} -Version: 1.38.0 -Release: 3%{?dist} +Version: 1.38.1 +Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} @@ -140,6 +140,9 @@ exit 0 %changelog +* Fri Jul 23 2021 Kai A. Hiller - 1.38.1-1 +- Update to v1.38.1 + * Thu Jul 22 2021 Fedora Release Engineering - 1.38.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index ae6f93e..e8c542a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.38.0.tar.gz) = d6da8a2ef7bd281b3117ec51743e984f21c9a7aaeaab4f81880e612d201874c0fd366fc18793ae351c168e1f985530fdbb4a6edfcaf9c8d93001bd92cd043f6c +SHA512 (synapse-1.38.1.tar.gz) = 3b6c68f47f8a4cb2083c9ee29ec5f253fc3d86ba9971ff6d106b99b939d4603e97a899dbd0dfb8557fc203caa2d1908ebde743090c1440f9fd1be0ecb9357d51