From 18ba38092252b779f0c886499f13b49c557eab9f Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Thu, 21 Apr 2022 10:25:14 +1000 Subject: [PATCH 01/12] 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 From e7c61e994bd2f755a9a64f57ecc8a223a6de2433 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Thu, 20 Jan 2022 16:26:04 +0100 Subject: [PATCH 02/12] Conform to new Python packaging guidelines --- matrix-synapse.spec | 68 ++++++++------------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 4c1994c..f705829 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -3,8 +3,6 @@ # Version suffix in URL when building release candidates %global rcx %{nil} -%{?python_enable_dependency_generator} - Name: matrix-%{srcname} Version: 1.57.0 Release: 1%{?dist} @@ -18,56 +16,8 @@ Source3: matrix-synapse.sysusers BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools - -# Test dependencies -BuildRequires: python3-parameterized >= 0.7.0 BuildRequires: /usr/bin/openssl - -# Package dependencies -#BuildRequires: python3-txacme >= 0.9.2 -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 -BuildRequires: python3-cryptography >= 3.4.7 -BuildRequires: (python3-frozendict without python3-frozendict = 2.1.2) -BuildRequires: python3-idna >= 2.5 -BuildRequires: python3-ijson -BuildRequires: python3-jinja2 -BuildRequires: python3-jsonschema -BuildRequires: python3-jwt -BuildRequires: python3-lxml -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 -BuildRequires: python3-pyOpenSSL >= 16.0.0 -BuildRequires: python3-pyasn1 >= 0.1.9 -BuildRequires: python3-pyasn1-modules >= 0.0.7 -BuildRequires: python3-pymacaroons-pynacl >= 0.13.0 -BuildRequires: python3-pynacl >= 1.2.1 -BuildRequires: python3-pysaml2 >= 4.5.0 -BuildRequires: python3-pyyaml >= 3.11 -BuildRequires: python3-service-identity >= 18.1.0 -BuildRequires: python3-signedjson >= 1.1.0 -BuildRequires: python3-sortedcontainers >= 1.4.4 -BuildRequires: python3-systemd >= 231 -BuildRequires: python3-treq >= 15.1 -BuildRequires: python3-twisted >= 18.9.0 -BuildRequires: python3-typing-extensions -BuildRequires: python3-unpaddedbase64 >= 1.1.0 -BuildRequires: systemd -BuildRequires: xmlsec1 - -Requires(pre): shadow-utils -Requires: systemd -%{?systemd_requires} +BuildRequires: systemd-rpm-macros %description Matrix is an ambitious new ecosystem for open federated Instant Messaging and @@ -85,12 +35,17 @@ the ecosystem. rm -rf synapse/static +%generate_buildrequires +%pyproject_buildrequires -x test,systemd + + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files %{srcname} # Synapse includes some benchmarks in a separate Python package named "synmark" # which is installed by default. Remove it to avoid shipping it in the Fedora @@ -111,22 +66,23 @@ PYTHONPATH=. trial-3 tests %pre %sysusers_create_compat %{SOURCE3} + %post %systemd_post synapse.service + %preun %systemd_preun synapse.service + %postun %systemd_postun_with_restart synapse.service -%files +%files -f %{pyproject_files} %license LICENSE %doc *.rst %config(noreplace) %{_sysconfdir}/sysconfig/synapse -%{python3_sitelib}/synapse/ -%{python3_sitelib}/matrix_synapse*.egg-info/ %{_bindir}/* %{_unitdir}/synapse.service %attr(755,synapse,synapse) %dir %{_sharedstatedir}/synapse From 801f429df424eed6eec36e9469510f5d2190ee04 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Wed, 4 May 2022 12:31:35 +0200 Subject: [PATCH 03/12] Update to v1.58.0 --- matrix-synapse.spec | 11 +++++------ sources | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index f705829..d998b96 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.57.0 +Version: 1.58.0 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -45,13 +45,9 @@ rm -rf synapse/static %install %pyproject_install +%py3_shebang_fix %{buildroot}%{python3_sitelib}/%{srcname}/_scripts %pyproject_save_files %{srcname} -# Synapse includes some benchmarks in a separate Python package named "synmark" -# which is installed by default. Remove it to avoid shipping it in the Fedora -# package, since it is unlikely to be useful to end users. -rm -r %{buildroot}%{python3_sitelib}/synmark/ - install -p -D -T -m 0644 contrib/systemd/log_config.yaml %{buildroot}%{_sysconfdir}/synapse/log_config.yaml install -p -D -T -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/synapse install -p -D -T -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/synapse.service @@ -92,6 +88,9 @@ PYTHONPATH=. trial-3 tests %changelog +* Wed May 04 2022 Kai A. Hiller - 1.58.0-1 +- Update to v1.58.0 + * Thu Apr 21 2022 Dan Callaghan - 1.57.0-1 - Update to v1.57.0 diff --git a/sources b/sources index cdb5fdf..3f042cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.57.0.tar.gz) = ce2392fed9a7dd7056d39877da8f417b86d5c7701aaff08e4a68561cfb3d61129d29b6903e1a7cafd9f1ec0ffcbe063a8d9f6c1c90318d0a813faec754536b77 +SHA512 (synapse-1.58.0.tar.gz) = 82a8fda57f972363b1c9112a4a4d53379b50c9e6baaeef894eb0633f76dfd4c51c7c29f833c373db77b8cb5a00453ff49010480c6da6216c8b07572974e76666 From 1789dec058c215c972bb41988851c3747db8a88e Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 21 Jan 2022 20:41:56 +0100 Subject: [PATCH 04/12] Run tests for installed module --- matrix-synapse.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index d998b96..9d1ae6a 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -56,7 +56,7 @@ install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf %check -PYTHONPATH=. trial-3 tests +PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}:$PWD trial-3 tests %pre From ebbe65d4a2456b8f3a701da331acc9613a1d76a9 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 21 Jan 2022 22:37:04 +0100 Subject: [PATCH 05/12] Add available python extras subpackages --- matrix-synapse.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 9d1ae6a..69182ed 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -15,9 +15,15 @@ Source2: synapse.service Source3: matrix-synapse.sysusers BuildArch: noarch +Recommends: %{name}+postgres +Recommends: %{name}+systemd + BuildRequires: python3-devel BuildRequires: /usr/bin/openssl BuildRequires: systemd-rpm-macros +# Workaround missing python-saml2 dependencies in f35 and f36. +BuildRequires: xmlsec1 +BuildRequires: xmlsec1-openssl %description Matrix is an ambitious new ecosystem for open federated Instant Messaging and @@ -27,6 +33,8 @@ to showcase the concept of Matrix and let folks see the spec in the context of a coded base and let you run your own homeserver and generally help bootstrap the ecosystem. +%pyproject_extras_subpkg -n %{name} matrix-synapse-ldap3 postgres saml2 oidc systemd url_preview jwt cache_memory + %prep %autosetup -p1 -n %{srcname}-%{version}%{rcx} @@ -36,7 +44,9 @@ rm -rf synapse/static %generate_buildrequires -%pyproject_buildrequires -x test,systemd +# Missing: sentry,opentracing,redis +%pyproject_buildrequires -x test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url_preview,jwt,cache_memory + %build From 8ae5dec1db026ed45fd7a98a641e15fc3b372250 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 21 Jan 2022 22:41:41 +0100 Subject: [PATCH 06/12] Guard against tests being skipped --- matrix-synapse.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 69182ed..15b6bc7 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -66,7 +66,19 @@ install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf %check -PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}:$PWD trial-3 tests +set -o pipefail +PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}:$PWD trial-3 tests | tee trial.stdout + +# Guard against new types of tests being skipped. +WHITELIST="Requires hiredis +Requires jaeger_client +Requires Postgres" +REASONS=$(cat trial.stdout | sed -n '/^\[SKIPPED\]$/{n;p;}') +SKIPPED=$(comm -23 <(echo "$REASONS" | sort | uniq) <(echo "$WHITELIST" | sort | uniq)) +if [ ! -z "$SKIPPED" ]; then + echo -e "Failing, because tests were skipped:\n$SKIPPED" + exit 1 +fi %pre From 33211b79235fc24c9a354fe61d80c2668a581132 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Wed, 18 May 2022 12:15:16 +0200 Subject: [PATCH 07/12] Update to v1.59.0 --- matrix-synapse.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 15b6bc7..51469c3 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.58.0 +Version: 1.59.0 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -110,6 +110,9 @@ fi %changelog +* Wed May 18 2022 Kai A. Hiller - 1.59.0-1 +- Update to v1.59.0 + * Wed May 04 2022 Kai A. Hiller - 1.58.0-1 - Update to v1.58.0 diff --git a/sources b/sources index 3f042cb..58d9199 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.58.0.tar.gz) = 82a8fda57f972363b1c9112a4a4d53379b50c9e6baaeef894eb0633f76dfd4c51c7c29f833c373db77b8cb5a00453ff49010480c6da6216c8b07572974e76666 +SHA512 (synapse-1.59.0.tar.gz) = c0f03c229d570d5f54f7765f8857c4f8acced1fdec5e70c74506a26c800ea8a120eccf79afa783fdfabdc0141f007227886d03c34e72f87f8fb184da92d287cc From 159861ff825aed33b383e9c27026c652d7e62d99 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Thu, 19 May 2022 22:52:38 +0200 Subject: [PATCH 08/12] Update to v1.59.1 --- matrix-synapse.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 51469c3..d63f7d8 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.59.0 +Version: 1.59.1 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -110,6 +110,9 @@ fi %changelog +* Thu May 19 2022 Kai A. Hiller - 1.59.1-1 +- Update to v1.59.1 + * Wed May 18 2022 Kai A. Hiller - 1.59.0-1 - Update to v1.59.0 diff --git a/sources b/sources index 58d9199..e753075 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.59.0.tar.gz) = c0f03c229d570d5f54f7765f8857c4f8acced1fdec5e70c74506a26c800ea8a120eccf79afa783fdfabdc0141f007227886d03c34e72f87f8fb184da92d287cc +SHA512 (synapse-1.59.1.tar.gz) = 0243241faac141b875924c260d416d25d3d07337e1a08c461e67bfc80f1075bf4b5c017f483e73f1cbd330c4b4fd8a255ebabc48637360886b1d0a32418aae0f From 47f550275198e3626d1c34c685529557561d1858 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 10 Jun 2022 11:41:19 +0200 Subject: [PATCH 09/12] Update to v1.60.0 --- matrix-synapse.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index d63f7d8..3bd512e 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.59.1 +Version: 1.60.0 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -72,7 +72,8 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}:$PWD t # Guard against new types of tests being skipped. WHITELIST="Requires hiredis Requires jaeger_client -Requires Postgres" +Requires Postgres +\`BaseFederationServlet\` does not support cancellation yet." REASONS=$(cat trial.stdout | sed -n '/^\[SKIPPED\]$/{n;p;}') SKIPPED=$(comm -23 <(echo "$REASONS" | sort | uniq) <(echo "$WHITELIST" | sort | uniq)) if [ ! -z "$SKIPPED" ]; then @@ -110,6 +111,9 @@ fi %changelog +* Thu Jun 09 2022 Kai A. Hiller - 1.60.0-1 +- Update to v1.60.0 + * Thu May 19 2022 Kai A. Hiller - 1.59.1-1 - Update to v1.59.1 diff --git a/sources b/sources index e753075..2492eda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.59.1.tar.gz) = 0243241faac141b875924c260d416d25d3d07337e1a08c461e67bfc80f1075bf4b5c017f483e73f1cbd330c4b4fd8a255ebabc48637360886b1d0a32418aae0f +SHA512 (synapse-1.60.0.tar.gz) = 60c3d76fb61640ee915b618119e3b1416f2e91052174ed9261ddcf5c966ac855ed5c94b7f5404cf05e8f6688a2d5ac8df791c3d979769ba099e399c578b6e470 From 95722cc58b8b263211e3d7fde0df30c1103b97b9 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Tue, 14 Jun 2022 16:07:34 +0200 Subject: [PATCH 10/12] Update to v1.61.0 --- matrix-synapse.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 3bd512e..74a0c21 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.60.0 +Version: 1.61.0 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -111,6 +111,9 @@ fi %changelog +* Tue Jun 14 2022 Kai A. Hiller - 1.61.0-1 +- Update to v1.61.0 + * Thu Jun 09 2022 Kai A. Hiller - 1.60.0-1 - Update to v1.60.0 diff --git a/sources b/sources index 2492eda..8005f5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.60.0.tar.gz) = 60c3d76fb61640ee915b618119e3b1416f2e91052174ed9261ddcf5c966ac855ed5c94b7f5404cf05e8f6688a2d5ac8df791c3d979769ba099e399c578b6e470 +SHA512 (synapse-1.61.0.tar.gz) = 24d390bd1715c5cbc1e468c363287626e3be9da55cad98d73cdd7caaf9ccd6218a26925882367ec95fb3a82ffb5da6a6388d8e4317adde20db28ab620afe4bfc From a142d9680cab543070d1e08b51c8e1bf91defcf6 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Wed, 29 Jun 2022 10:08:54 +0200 Subject: [PATCH 11/12] Update to v1.61.1 Fix CVE-2022-31052 --- matrix-synapse.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 74a0c21..86d52f8 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.61.0 +Version: 1.61.1 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -111,6 +111,10 @@ fi %changelog +* Wed Jun 29 2022 Kai A. Hiller - 1.61.1-1 +- Update to v1.61.1 +- Fix CVE-2022-31052 + * Tue Jun 14 2022 Kai A. Hiller - 1.61.0-1 - Update to v1.61.0 diff --git a/sources b/sources index 8005f5b..f7e91dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.61.0.tar.gz) = 24d390bd1715c5cbc1e468c363287626e3be9da55cad98d73cdd7caaf9ccd6218a26925882367ec95fb3a82ffb5da6a6388d8e4317adde20db28ab620afe4bfc +SHA512 (synapse-1.61.1.tar.gz) = 5cebfa66f74b518fc3a2c818af57386c85bb7a91001de1b0378d55a667c8f2c5a506c6e77ab4954f003cae166f2da3d755b498e403b168ee7f55f0943dd870d8 From 3fd3d881f83a83f79e03d03f617a50e637a3afea Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Sun, 17 Jul 2022 17:02:56 +0200 Subject: [PATCH 12/12] Update to v1.62.0 --- matrix-synapse.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 86d52f8..bc0919c 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -4,7 +4,7 @@ %global rcx %{nil} Name: matrix-%{srcname} -Version: 1.61.1 +Version: 1.62.0 Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 @@ -111,6 +111,9 @@ fi %changelog +* Thu Jul 14 2022 Kai A. Hiller - 1.62.0-1 +- Update to v1.62.0 + * Wed Jun 29 2022 Kai A. Hiller - 1.61.1-1 - Update to v1.61.1 - Fix CVE-2022-31052 diff --git a/sources b/sources index f7e91dd..60c2367 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-1.61.1.tar.gz) = 5cebfa66f74b518fc3a2c818af57386c85bb7a91001de1b0378d55a667c8f2c5a506c6e77ab4954f003cae166f2da3d755b498e403b168ee7f55f0943dd870d8 +SHA512 (synapse-1.62.0.tar.gz) = 2bf9264f08fab29e8707317b69c52a4234bb25443c342ba43a27e06c506bcca1a9bdb211a99802abbca551e4f4288f68775d4629493b39d58dfcc8d8d1ca8ab8