Accepting request 1286434 from network:messaging:matrix

Forwarded request #1286433 from darix

- Update to 1.132.0

OBS-URL: https://build.opensuse.org/request/show/1286434
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/matrix-synapse?expand=0&rev=133

_service

@@ -4,11 +4,11 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">https://github.com/element-hq/synapse.git</param>
     <param name="scm">git</param>
-    <param name="revision">v1.114.0</param>
+    <param name="revision">v1.132.0</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <!--
-    <param name="revision">v1.115.0rc1</param>
+    <param name="revision">v1.133.0rc1</param>
     <param name="versionrewrite-pattern">v([\.\d]+)(rc.*)</param>
     <param name="versionrewrite-replacement">\1~\2</param>
     -->

bump-dependencies.patch

@@ -2,7 +2,7 @@ Index: synapse/pyproject.toml
 ===================================================================
 --- synapse.orig/pyproject.toml
 +++ synapse/pyproject.toml
-@@ -190,7 +190,7 @@ pymacaroons = ">=0.13.0"
+@@ -191,7 +191,7 @@ pymacaroons = ">=0.13.0"
  msgpack = ">=0.5.2"
  phonenumbers = ">=8.2.0"
  # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.

matrix-synapse-1.114.0.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ca30e5576a8dfe93534758716ec01c3fd356a5a1a44f9365615f88728e52bb3
-size 37705229

matrix-synapse-1.132.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc3752e61759ade4d753ecfb8153585d97308bc692d7cca8016dee31500d5c04
+size 39460877

matrix-synapse-1.4.1-paths.patch

@@ -15,7 +15,7 @@ Index: synapse/synapse/config/key.py
 ===================================================================
 --- synapse.orig/synapse/config/key.py
 +++ synapse/synapse/config/key.py
-@@ -110,7 +110,7 @@ class KeyConfig(Config):
+@@ -117,7 +117,7 @@ class KeyConfig(Config):
              signing_key_path = config.get("signing_key_path")
              if signing_key_path is None:
                  signing_key_path = os.path.join(
@@ -24,7 +24,7 @@ Index: synapse/synapse/config/key.py
                  )
  
              self.signing_key = self.read_signing_keys(signing_key_path, "signing_key")
-@@ -183,7 +183,7 @@ class KeyConfig(Config):
+@@ -190,7 +190,7 @@ class KeyConfig(Config):
          generate_secrets: bool = False,
          **kwargs: Any,
      ) -> str:
@@ -37,20 +37,20 @@ Index: synapse/synapse/config/logger.py
 ===================================================================
 --- synapse.orig/synapse/config/logger.py
 +++ synapse/synapse/config/logger.py
-@@ -149,7 +149,7 @@ class LoggingConfig(Config):
+@@ -156,7 +156,7 @@ class LoggingConfig(Config):
      def generate_config_section(
          self, config_dir_path: str, server_name: str, **kwargs: Any
      ) -> str:
 -        log_config = os.path.join(config_dir_path, server_name + ".log.config")
 +        log_config = os.path.join('/etc/matrix-synapse/', server_name + ".log.config")
-         return (
-             """\
+         return """\
          log_config: "%(log_config)s"
+         """ % locals()
 Index: synapse/synapse/config/server.py
 ===================================================================
 --- synapse.orig/synapse/config/server.py
 +++ synapse/synapse/config/server.py
-@@ -793,7 +793,7 @@ class ServerConfig(Config):
+@@ -810,7 +810,7 @@ class ServerConfig(Config):
              bind_port = 8448
              unsecure_port = 8008
  

matrix-synapse-test.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package matrix-synapse-test
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.114.0
+Version:        1.132.0
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        AGPL-3.0-or-later

matrix-synapse.obsinfo

@@ -1,4 +1,4 @@
 name: matrix-synapse
-version: 1.114.0
-mtime: 1725293314
-commit: 5eec67b6ef4b76caa2324a80e01e361bfa84a929
+version: 1.132.0
+mtime: 1750162617
+commit: d1139ebfc11b13417aaf9acb289d7a0d0d93482b

matrix-synapse.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package matrix-synapse
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,29 +20,27 @@
 
 # NOTE: Keep this is in the same order as pyproject.toml.
 %if %{with use_poetry_for_dependencies}
-%global Jinja2_version                3.1.4
-%global Pillow_version                10.4.0
-# TODO: 6.0.2
-%global PyYAML_version                6.0.1
+%global Twisted_version               24.7.0
+%global Jinja2_version                3.1.5
+%global Pillow_version                11.2.1
+%global PyYAML_version                6.0.2
 %global attrs_version                 23.2.0
 %global bcrypt_version                4.2.0
 %global bleach_version                6.1.0
 %global canonicaljson_version         2.0.0
-%global cryptography_version          43.0.0
-%global immutabledict_version         4.2.0
-%global idna_version                  3.7
+%global cryptography_version          43.0.3
+%global immutabledict_version         4.2.1
+%global idna_version                  3.8
 %global ijson_version                 3.3.0
 %global jsonschema_version            4.20.0
 %global matrix_common_version         1.3.0
 %global matrix_common_max_version     2
-%global msgpack_version               1.0.8
-# TODO 1.3.0
-%global netaddr_version               1.2.1
-# TODO 8.13.44
-%global phonenumbers_version          8.13.39
+%global msgpack_version               1.1.0
+%global netaddr_version               1.3.0
+%global phonenumbers_version          8.13.52
 %global prometheus_client_version     0.20.0
 %global psutil_version                2.0.0
-%global pyOpenSSL_version             24.2.1
+%global pyOpenSSL_version             25.0.0
 %global pyasn1_version                0.6.0
 %global pyasn1_modules_version        0.3.0
 %global pymacaroons_version           0.13.0
@@ -57,16 +55,17 @@
 %global matrix_synapse_ldap3_version  0.3.0
 %global packaging_version             24.0
 %global psycopg2_version              2.9.9
-%global pysaml2_version               7.3.1
-%global Authlib_version               1.3.1
-# TODO 5.3.0
-%global lxml_version                  5.2.2
-%global sentry_sdk_version            2.13.0
+%global pysaml2_version               7.5.0
+%global Authlib_version               1.5.2
+# TODO: 5.4.0
+%global lxml_version                  5.3.0
+%global sentry_sdk_version            2.20.0
 %global PyJWT_version                 2.6.0
 %global jaeger_client_version         4.8.0
 %global opentracing_version           2.4.0
-# todo: 3.0.0
+# TODO: 3.0.0
 %global hiredis_version               2.3.2
+# TODO: 1.4.11
 %global txredisapi_version            1.4.10
 %global Pympler_version               1.0.1
 %global pydantic_version              2.7.1
@@ -76,7 +75,7 @@
 # some version locks based on poetry.lock
 %global Jinja2_version                3.0
 %global Pillow_version                10.0.1
-%global PyYAML_version                3.13
+%global PyYAML_version                5.3
 %global Twisted_version               18.9.0
 %global attrs_version                 21.1.1
 %global bcrypt_version                3.1.7
@@ -126,7 +125,11 @@
 
 %define requires_peq() %(echo '%*' | LC_ALL=C xargs -r rpm -q --whatprovides --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%define use_python python3
+%if 0%{?suse_version} >= 1600
+%define use_python %{primary_python}
+%else
+%define use_python python311
+%endif
 
 %define pythons %{use_python}
 
@@ -155,7 +158,7 @@
 %define         pkgname matrix-synapse
 %define         eggname matrix_synapse
 Name:           %{pkgname}
-Version:        1.114.0
+Version:        1.132.0
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        AGPL-3.0-or-later
@@ -177,12 +180,25 @@ Patch1:         bump-dependencies.patch
 # https://github.com/matrix-org/synapse/pull/10719
 # disable by marking as source until we get a decision upstream
 Source100:      10719-Fix-instert-of-duplicate-key-into-event_json.patch
-BuildRequires:  %{use_python}-base >= 3.8
+BuildRequires:  %{use_python}-base >= 3.11
 BuildRequires:  %{use_python}-pip
 BuildRequires:  %{use_python}-poetry-core >= 1.1.0
 BuildRequires:  %{use_python}-setuptools
 BuildRequires:  %{use_python}-wheel
+#global rust_version 1.84
+%if "%{?rust_version}" == ""
 BuildRequires:  cargo
+%else
+# workaround for:
+# zypper in cargo1.79 cargo cargo-packaging
+# Problem: 1: the to be installed cargo-1.81.0-150500.27.21.1.x86_64 obsoletes 'cargo1.79' provided by the to be installed cargo1.79-1.79.0-150500.11.3.1.x86_64
+#   Solution 1: do not install cargo1.79-1.79.0-150500.11.3.1.x86_64
+#   Solution 2: do not install cargo-1.81.0-150500.27.21.1.x86_64
+#
+#!BuildIgnore: cargo
+#!BuildIgnore: rust
+BuildRequires:  cargo%{rust_version}
+%endif
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  systemd-rpm-macros
@@ -192,7 +208,7 @@ BuildRequires:  unzip
 %{?systemd_ordering}
 %{sysusers_requires}
 %requires_peq   %{use_python}-base
-BuildRequires:  (%{use_python}-setuptools-rust >= 1.3 with %{use_python}-setuptools-rust =< 1.9.0)
+BuildRequires:  %{use_python}-setuptools-rust >= 1.3
 # NOTE: Keep this is in the same order as pyproject.toml.
 # some version locks based on poetry.lock
 BuildRequires:  %{use_python}-Jinja2 >= %{Jinja2_version}
@@ -382,12 +398,12 @@ install -d -m 0750 %{buildroot}%{_localstatedir}/log/%{pkgname}
 
 %files -n %{pkgname}
 %doc *.rst CHANGES.md README.SUSE
-%license LICENSE
+%license LICENSE*
 %config(noreplace) %attr(-,root,synapse) %{_sysconfdir}/%{pkgname}/
 %dir %attr(0750,%{modname},%{modname}) %{_localstatedir}/lib/%{pkgname}
 %dir %attr(0750,%{modname},%{modname}) %{_localstatedir}/log/%{pkgname}
-%{python3_sitearch}/%{modname}
-%{python3_sitearch}/%{eggname}-*-info
+%{python_sitearch}/%{modname}
+%{python_sitearch}/%{eggname}-*-info
 # Python helper scripts.
 %{_bindir}/synctl
 %{_libexecdir}/%{pkgname}

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87d43a1ae29ef0be416730d4765189d904505ee047e99780202657f6d8284389
-size 7122019
+oid sha256:5612f692b8d4a9ebcfffdd938430815b3d22cdc99ef5de4fb2d544d2c1d8eacb
+size 4451699