Compare commits
32 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 5933611775 | |||
| 2a1a975be1 | |||
| 2662e3e695 | |||
| 3cb9cd5d25 | |||
| 3e17fefda6 | |||
| 33eec6b91c | |||
| b7078adbe3 | |||
| 60d136545d | |||
| c3b1bcb1d6 | |||
| d523c74e62 | |||
| b053144bae | |||
| 6611298b65 | |||
| 0bd34b9854 | |||
| d366943768 | |||
| a9291159fc | |||
| d18424da1c | |||
| 52e314ac70 | |||
| 2476a807c7 | |||
| 416d37506f | |||
| 005d66a620 | |||
| d3e2d38f64 | |||
| 044a3918e8 | |||
| 553d11ee45 | |||
| 047596c791 | |||
| 6a251a63c0 | |||
| f6087c103b | |||
| 8a01b7c920 | |||
| 4e9f8d23c4 | |||
| a66793ccaa | |||
| 358ea44e2c | |||
| dab555ed5c | |||
| 1930d2b680 |
4
_service
4
_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.132.0</param>
|
||||
<param name="revision">v1.145.0</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
<!--
|
||||
<param name="revision">v1.133.0rc1</param>
|
||||
<param name="revision">v1.146.0rc1</param>
|
||||
<param name="versionrewrite-pattern">v([\.\d]+)(rc.*)</param>
|
||||
<param name="versionrewrite-replacement">\1~\2</param>
|
||||
-->
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: synapse/pyproject.toml
|
||||
===================================================================
|
||||
--- synapse.orig/pyproject.toml
|
||||
+++ synapse/pyproject.toml
|
||||
@@ -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.
|
||||
-prometheus-client = ">=0.4.0"
|
||||
+prometheus-client = ">=0.13.1"
|
||||
# we use `order`, which arrived in attrs 19.2.0.
|
||||
# Note: 21.1.0 broke `/sync`, see https://github.com/matrix-org/synapse/issues/9936
|
||||
attrs = ">=19.2.0,!=21.1.0"
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dc3752e61759ade4d753ecfb8153585d97308bc692d7cca8016dee31500d5c04
|
||||
size 39460877
|
||||
3
matrix-synapse-1.145.0.obscpio
Normal file
3
matrix-synapse-1.145.0.obscpio
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a3a9cef51bb9e983d1bf0aa0fe29fe8aa43449d8053bc0c154adf0a567132de8
|
||||
size 40746509
|
||||
@@ -15,7 +15,7 @@ Index: synapse/synapse/config/key.py
|
||||
===================================================================
|
||||
--- synapse.orig/synapse/config/key.py
|
||||
+++ synapse/synapse/config/key.py
|
||||
@@ -117,7 +117,7 @@ class KeyConfig(Config):
|
||||
@@ -131,7 +131,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")
|
||||
@@ -190,7 +190,7 @@ class KeyConfig(Config):
|
||||
@@ -232,7 +232,7 @@ class KeyConfig(Config):
|
||||
generate_secrets: bool = False,
|
||||
**kwargs: Any,
|
||||
) -> str:
|
||||
@@ -37,7 +37,7 @@ Index: synapse/synapse/config/logger.py
|
||||
===================================================================
|
||||
--- synapse.orig/synapse/config/logger.py
|
||||
+++ synapse/synapse/config/logger.py
|
||||
@@ -156,7 +156,7 @@ class LoggingConfig(Config):
|
||||
@@ -157,7 +157,7 @@ class LoggingConfig(Config):
|
||||
def generate_config_section(
|
||||
self, config_dir_path: str, server_name: str, **kwargs: Any
|
||||
) -> str:
|
||||
@@ -50,12 +50,12 @@ Index: synapse/synapse/config/server.py
|
||||
===================================================================
|
||||
--- synapse.orig/synapse/config/server.py
|
||||
+++ synapse/synapse/config/server.py
|
||||
@@ -810,7 +810,7 @@ class ServerConfig(Config):
|
||||
bind_port = 8448
|
||||
unsecure_port = 8008
|
||||
|
||||
@@ -931,7 +931,7 @@ class ServerConfig(Config):
|
||||
listeners: list[dict] | None = None,
|
||||
**kwargs: Any,
|
||||
) -> str:
|
||||
- pid_file = os.path.join(data_dir_path, "homeserver.pid")
|
||||
+ pid_file = os.path.join("/run/matrix-synapse", "homeserver.pid")
|
||||
|
||||
secure_listeners = []
|
||||
unsecure_listeners = []
|
||||
http_bindings = "[]"
|
||||
private_addresses = ["::1", "127.0.0.1"]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package matrix-synapse-test
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# 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.132.0
|
||||
Version: 1.145.0
|
||||
Release: 0
|
||||
Summary: Test package for %{pkgname}
|
||||
License: AGPL-3.0-or-later
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
name: matrix-synapse
|
||||
version: 1.132.0
|
||||
mtime: 1750162617
|
||||
commit: d1139ebfc11b13417aaf9acb289d7a0d0d93482b
|
||||
version: 1.145.0
|
||||
mtime: 1768318694
|
||||
commit: 27223a349c0cb5268782dc07b20f3450580165dc
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package matrix-synapse
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -23,24 +23,27 @@
|
||||
%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 PyYAML_version 6.0.3
|
||||
%global attrs_version 25.4.0
|
||||
# TODO: 5.0.0
|
||||
%global bcrypt_version 4.3.0
|
||||
%global bleach_version 6.1.0
|
||||
%global canonicaljson_version 2.0.0
|
||||
%global cryptography_version 43.0.3
|
||||
# TODO 46.0.3
|
||||
%global cryptography_version 46.0.2
|
||||
%global immutabledict_version 4.2.1
|
||||
%global idna_version 3.8
|
||||
%global ijson_version 3.3.0
|
||||
%global jsonschema_version 4.20.0
|
||||
%global idna_version 3.11
|
||||
%global ijson_version 3.4.0.post0
|
||||
%global jsonschema_version 4.25.1
|
||||
%global matrix_common_version 1.3.0
|
||||
%global matrix_common_max_version 2
|
||||
%global msgpack_version 1.1.0
|
||||
%global msgpack_version 1.1.2
|
||||
%global netaddr_version 1.3.0
|
||||
%global phonenumbers_version 8.13.52
|
||||
%global prometheus_client_version 0.20.0
|
||||
%global phonenumbers_version 9.0.15
|
||||
# TODO: 0.23.1
|
||||
%global prometheus_client_version 0.21.0
|
||||
%global psutil_version 2.0.0
|
||||
%global pyOpenSSL_version 25.0.0
|
||||
%global pyOpenSSL_version 25.3.0
|
||||
%global pyasn1_version 0.6.0
|
||||
%global pyasn1_modules_version 0.3.0
|
||||
%global pymacaroons_version 0.13.0
|
||||
@@ -56,27 +59,61 @@
|
||||
%global packaging_version 24.0
|
||||
%global psycopg2_version 2.9.9
|
||||
%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 Authlib_version 1.6.5
|
||||
%global lxml_version 6.0.2
|
||||
# TODO: 2.46.0
|
||||
%global sentry_sdk_version 2.39.0
|
||||
%global PyJWT_version 2.6.0
|
||||
%global jaeger_client_version 4.8.0
|
||||
%global opentracing_version 2.4.0
|
||||
# TODO: 3.0.0
|
||||
%global hiredis_version 2.3.2
|
||||
%global hiredis_version 3.3.0
|
||||
# TODO: 1.4.11
|
||||
%global txredisapi_version 1.4.10
|
||||
%global Pympler_version 1.0.1
|
||||
%global pydantic_version 2.7.1
|
||||
%global pyicu_version 2.13.1
|
||||
%global python_multipart_version 0.0.9
|
||||
# TODO: 0.30.0
|
||||
%global rpds_py_verison 0.27.0
|
||||
## indirect dependencies which need to be guarded for matrix-synapse to work
|
||||
# pysaml2
|
||||
%global defusedxml_version 0.7.1
|
||||
%global pytz_version 2025.2
|
||||
# Transitive dependency constraints
|
||||
# These dependencies aren't directly required by Synapse.
|
||||
# However, in order for Synapse to build, Synapse requires a higher minimum version
|
||||
# for these dependencies than the minimum specified by the direct dependency.
|
||||
# We should periodically check to see if these dependencies are still necessary and
|
||||
# remove any that are no longer required.
|
||||
# via cryptography
|
||||
%global cffi_version 2.0.0
|
||||
# via signedjson
|
||||
%global pynacl_version 1.6.1
|
||||
# packaging
|
||||
%global pyparsing_version 2.4
|
||||
# jsonschema
|
||||
%global pyrsistent_version 0.20.0
|
||||
# 2.16.0+ no longer vendors urllib3, avoiding Python 3.10+ incompatibility
|
||||
%global requests_version 2.16.0
|
||||
# via treq; 1.26.5 fixes Python 3.10+ collections.abc compatibility
|
||||
# TODO 2.6.0
|
||||
%global urllib3_version 2.5.0
|
||||
# 5.2 is the current version in Debian oldstable. If we don't care to support that, then 5.4 is
|
||||
# the minimum version from Ubuntu 22.04 and RHEL 9. (as of 2025-12)
|
||||
# When bumping this version to 6.2 or above, refer to https://github.com/element-hq/synapse/pull/19274
|
||||
# for details of Synapse improvements that may be unlocked. Particularly around the use of `|`
|
||||
# syntax with zope interface types.
|
||||
# via twisted
|
||||
%global zope_interface_version 5.2
|
||||
# via jaeger-client
|
||||
%global thrift_version 0.10
|
||||
# via jaeger-client
|
||||
%global tornado_version 6.0
|
||||
%else
|
||||
# some version locks based on poetry.lock
|
||||
%global Jinja2_version 3.0
|
||||
%global Pillow_version 10.0.1
|
||||
%global PyYAML_version 5.3
|
||||
%global Twisted_version 18.9.0
|
||||
%global Twisted_version 21.2.0
|
||||
%global attrs_version 21.1.1
|
||||
%global bcrypt_version 3.1.7
|
||||
%global bleach_version 1.4.3
|
||||
@@ -91,19 +128,19 @@
|
||||
%global msgpack_version 0.5.2
|
||||
%global netaddr_version 0.7.18
|
||||
%global phonenumbers_version 8.13.37
|
||||
%global prometheus_client_version 0.4.0
|
||||
%global prometheus_client_version 0.6.0
|
||||
%global psutil_version 2.0.0
|
||||
%global pyOpenSSL_version 16.0.0
|
||||
%global pyOpenSSL_version 16.2.0
|
||||
%global pyasn1_version 0.1.9
|
||||
%global pyasn1_modules_version 0.0.7
|
||||
%global pymacaroons_version 0.13.0
|
||||
%global service_identity_version 18.1.0
|
||||
%global signedjson_version 1.1.0
|
||||
%global signedjson_max_version 2
|
||||
%global sortedcontainers_version 1.5.2
|
||||
%global sortedcontainers_version 2.0.5
|
||||
%global systemd_version 231
|
||||
%global typing_extensions_version 3.10.0
|
||||
%global treq_version 15.1
|
||||
%global treq_version 21.5.0
|
||||
%global unpaddedbase64_version 2.1.0
|
||||
%global matrix_synapse_ldap3_version 0.2.1
|
||||
%global packaging_version 20.0
|
||||
@@ -113,14 +150,46 @@
|
||||
%global lxml_version 4.8.0
|
||||
%global sentry_sdk_version 1.5.11
|
||||
%global PyJWT_version 1.6.4
|
||||
%global jaeger_client_version 4.0.0
|
||||
%global jaeger_client_version 4.2.0
|
||||
%global opentracing_version 2.2.0
|
||||
%global hiredis_version 2.0.0
|
||||
%global txredisapi_version 1.4.7
|
||||
%global Pympler_version 1.0.1
|
||||
%global pydantic_version 1.7.4
|
||||
%global pyicu_version 2.10.2
|
||||
%global python_multipart_version 0.0.9
|
||||
## indirect dependencies which need to be guarded for matrix-synapse to work
|
||||
# pysaml2
|
||||
%global defusedxml_version 0.7.1
|
||||
%global pytz_version 2018.3
|
||||
# Transitive dependency constraints
|
||||
# These dependencies aren't directly required by Synapse.
|
||||
# However, in order for Synapse to build, Synapse requires a higher minimum version
|
||||
# for these dependencies than the minimum specified by the direct dependency.
|
||||
# We should periodically check to see if these dependencies are still necessary and
|
||||
# remove any that are no longer required.
|
||||
# via cryptography
|
||||
%global cffi_version 1.15
|
||||
# via signedjson
|
||||
%global pynacl_version 1.3
|
||||
# packaging
|
||||
%global pyparsing_version 2.4
|
||||
# jsonschema
|
||||
%global pyrsistent_version 0.18.0
|
||||
# 2.16.0+ no longer vendors urllib3, avoiding Python 3.10+ incompatibility
|
||||
%global requests_version 2.16.0
|
||||
# via treq; 1.26.5 fixes Python 3.10+ collections.abc compatibility
|
||||
%global urllib3_version 1.26.5
|
||||
# 5.2 is the current version in Debian oldstable. If we don't care to support that, then 5.4 is
|
||||
# the minimum version from Ubuntu 22.04 and RHEL 9. (as of 2025-12)
|
||||
# When bumping this version to 6.2 or above, refer to https://github.com/element-hq/synapse/pull/19274
|
||||
# for details of Synapse improvements that may be unlocked. Particularly around the use of `|`
|
||||
# syntax with zope interface types.
|
||||
# via twisted
|
||||
%global zope_interface_version 5.2
|
||||
# via jaeger-client
|
||||
%global thrift_version 0.10
|
||||
# via jaeger-client
|
||||
%global tornado_version 6.0
|
||||
%endif
|
||||
|
||||
%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")
|
||||
@@ -158,7 +227,7 @@
|
||||
%define pkgname matrix-synapse
|
||||
%define eggname matrix_synapse
|
||||
Name: %{pkgname}
|
||||
Version: 1.132.0
|
||||
Version: 1.145.0
|
||||
Release: 0
|
||||
Summary: Matrix protocol reference homeserver
|
||||
License: AGPL-3.0-or-later
|
||||
@@ -176,7 +245,6 @@ Source51: matrix-synapse-generate-config.sh
|
||||
# to clean up your working copy afterwards: git reset --hard ; rm -rv .pc patches
|
||||
Source99: series
|
||||
Patch0: matrix-synapse-1.4.1-paths.patch
|
||||
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
|
||||
@@ -273,6 +341,8 @@ BuildRequires: %{use_python}-treq >= %{treq_version}
|
||||
%requires_peq %{use_python}-treq
|
||||
BuildRequires: %{use_python}-unpaddedbase64 >= %{unpaddedbase64_version}
|
||||
%requires_peq %{use_python}-unpaddedbase64
|
||||
BuildRequires: %{use_python}-rpds-py >= %{rpds_py_verison}
|
||||
%requires_peq %{use_python}-rpds-py
|
||||
# Specify all CONDITIONAL_REQUIREMENTS (we Require them to avoid no-recommends
|
||||
# breaking very commonly-used bits of matrix-synapse such as postgresql).
|
||||
%if %{with synapse_ldap}
|
||||
@@ -302,6 +372,10 @@ BuildRequires: %{use_python}-jaeger-client >= %{jaeger_client_version}
|
||||
%requires_peq %{use_python}-jaeger-client
|
||||
BuildRequires: %{use_python}-opentracing >= %{opentracing_version}
|
||||
%requires_peq %{use_python}-opentracing
|
||||
BuildRequires: %{use_python}-tornado >= %{tornado_version}
|
||||
%requires_peq %{use_python}-tornado
|
||||
BuildRequires: %{use_python}-thrift >= %{thrift_version}
|
||||
%requires_peq %{use_python}-thrift
|
||||
%endif
|
||||
%if %{with synapse_redis}
|
||||
BuildRequires: %{use_python}-hiredis >= %{hiredis_version}
|
||||
@@ -311,8 +385,27 @@ BuildRequires: %{use_python}-txredisapi >= %{txredisapi_version}
|
||||
%endif
|
||||
BuildRequires: %{use_python}-Pympler >= %{Pympler_version}
|
||||
%requires_peq %{use_python}-Pympler
|
||||
BuildRequires: %{use_python}-PyICU >= %{pyicu_version}
|
||||
%requires_peq %{use_python}-PyICU
|
||||
## indirect dependencies which need to be guarded for matrix-synapse to work
|
||||
BuildRequires: %{use_python}-defusedxml >= %{defusedxml_version}
|
||||
%requires_peq %{use_python}-defusedxml
|
||||
BuildRequires: %{use_python}-pytz >= %{pytz_version}
|
||||
%requires_peq %{use_python}-pytz
|
||||
BuildRequires: %{use_python}-cffi >= %{cffi_version}
|
||||
%requires_peq %{use_python}-cffi
|
||||
BuildRequires: %{use_python}-PyNaCl >= %{pynacl_version}
|
||||
%requires_peq %{use_python}-PyNaCl
|
||||
BuildRequires: %{use_python}-pyparsing >= %{pyparsing_version}
|
||||
%requires_peq %{use_python}-pyparsing
|
||||
BuildRequires: %{use_python}-pyrsistent >= %{pyrsistent_version}
|
||||
%requires_peq %{use_python}-pyrsistent
|
||||
BuildRequires: %{use_python}-requests >= %{requests_version}
|
||||
%requires_peq %{use_python}-requests
|
||||
BuildRequires: %{use_python}-urllib3 >= %{urllib3_version}
|
||||
%requires_peq %{use_python}-urllib3
|
||||
BuildRequires: %{use_python}-zope.interface >= %{zope_interface_version}
|
||||
%requires_peq %{use_python}-zope.interface
|
||||
# BuildRequires: %%{use_python}- >= %{}
|
||||
# %%requires_peq %%{use_python}-
|
||||
# We only provide/obsolete python2 to ensure that users upgrade.
|
||||
Obsoletes: python2-matrix-synapse < %{version}-%{release}
|
||||
Provides: python2-matrix-synapse = %{version}-%{release}
|
||||
@@ -348,6 +441,9 @@ cp %{S:48} README.SUSE
|
||||
install -d -m 0755 %{buildroot}%{_libexecdir}/%{pkgname}
|
||||
%pyproject_install
|
||||
|
||||
perl -p -i -e 's|Requires-Dist: setuptools-rust.*\n||g' \
|
||||
%{buildroot}%{python_sitearch}/%{eggname}-*-info/METADATA
|
||||
|
||||
install -d -m 0755 %{buildroot}%{_bindir} %{buildroot}%{_libexecdir}/%{pkgname}/
|
||||
# move scripts to the old place.
|
||||
mv %{buildroot}%{_bindir}/* %{buildroot}%{_libexecdir}/%{pkgname}/
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5612f692b8d4a9ebcfffdd938430815b3d22cdc99ef5de4fb2d544d2c1d8eacb
|
||||
size 4451699
|
||||
oid sha256:05d8c018fb2bbc5a21c3efcd376ab5247c4e670b7eb21172a890313f4beb5b21
|
||||
size 26474614
|
||||
|
||||
Reference in New Issue
Block a user