forked from pool/matrix-synapse
Compare commits
66 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 047596c791 | |||
| 6a251a63c0 | |||
| f6087c103b | |||
| 8a01b7c920 | |||
| 4e9f8d23c4 | |||
| a66793ccaa | |||
| 358ea44e2c | |||
| dab555ed5c | |||
| 1930d2b680 | |||
| 98b23fa973 | |||
| 738623d144 | |||
| 66c3f756af | |||
| 9a5e47f6ff | |||
| 3105fe2976 | |||
| 4eb98131da | |||
| b73b1114d9 | |||
| 1016083bcf | |||
| 3558e8d8cb | |||
| e8c49d0206 | |||
| 19cbf3ce69 | |||
| e522f07487 | |||
| b6edc4d16f | |||
|
6621b132a6 | ||
| 6219594931 | |||
|
|
68827335a4 | ||
| f2ac0f47aa | |||
| 7fcf96c07b | |||
| 2c64585e4f | |||
| 301e83f74f | |||
| 95e89ed4b0 | |||
| acecdd444e | |||
| 432bc7ef9f | |||
| 3c03953634 | |||
| e3d1419515 | |||
| de954397e0 | |||
| e4291a8db8 | |||
| 8cf915e893 | |||
| 6fecbbafc9 | |||
| 2a9fb3954c | |||
| a6b95a5fdf | |||
| 5f7deceb2b | |||
| 8778bdbcb5 | |||
| 2352946053 | |||
| 2ddfac5fd1 | |||
| 67c6282f9d | |||
| 10fea8bb40 | |||
| 89daaf12d7 | |||
| 423a198e24 | |||
| e764601768 | |||
| 5142e4b77e | |||
| 6d99cfb6bf | |||
| 5405e72559 | |||
| 704c1a5d4f | |||
| 57fe3bc8cc | |||
| 029fd6c091 | |||
| d79f9d4447 | |||
| ebbd60c00d | |||
| c0db88c8b7 | |||
| 0650895cc1 | |||
| 076d93de10 | |||
| 6ca5960d97 | |||
| 3414e2e462 | |||
| 9a1ef1175b | |||
| 7374a2875b | |||
| 156ee92a69 | |||
| 76788b44fd |
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.114.0</param>
|
||||
<param name="revision">v1.136.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.137.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
|
||||
@@ -190,7 +190,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:8ca30e5576a8dfe93534758716ec01c3fd356a5a1a44f9365615f88728e52bb3
|
||||
size 37705229
|
||||
3
matrix-synapse-1.136.0.obscpio
Normal file
3
matrix-synapse-1.136.0.obscpio
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b37cca2f7ec18717ba2ff0c68176c63bedd12a6a4e6bde5ff22ee72b6dcc5bcd
|
||||
size 40179213
|
||||
@@ -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):
|
||||
@@ -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")
|
||||
@@ -183,7 +183,7 @@ class KeyConfig(Config):
|
||||
@@ -232,7 +232,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):
|
||||
@@ -158,7 +158,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):
|
||||
@@ -813,7 +813,7 @@ class ServerConfig(Config):
|
||||
bind_port = 8448
|
||||
unsecure_port = 8008
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package matrix-synapse-test
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 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.114.0
|
||||
Version: 1.136.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.114.0
|
||||
mtime: 1725293314
|
||||
commit: 5eec67b6ef4b76caa2324a80e01e361bfa84a929
|
||||
version: 1.136.0
|
||||
mtime: 1755001198
|
||||
commit: e8c6cb3d9e4cc5a20c40f9b6d79d5bfdfa73fcab
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package matrix-synapse
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 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
|
||||
@@ -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 jsonschema_version 4.25.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 9.0.10
|
||||
%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,27 +55,28 @@
|
||||
%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
|
||||
# TOOD: 1.6.1
|
||||
%global Authlib_version 1.6.0
|
||||
%global lxml_version 6.0.0
|
||||
# TODO: 2.34.1
|
||||
%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
|
||||
%global pyicu_version 2.13.1
|
||||
%global python_multipart_version 0.0.9
|
||||
%else
|
||||
# some version locks based on poetry.lock
|
||||
%global Jinja2_version 3.0
|
||||
%global Pillow_version 10.0.1
|
||||
%global PyYAML_version 3.13
|
||||
%global Twisted_version 18.9.0
|
||||
%global PyYAML_version 5.3
|
||||
%global Twisted_version 21.2.0
|
||||
%global attrs_version 21.1.1
|
||||
%global bcrypt_version 3.1.7
|
||||
%global bleach_version 1.4.3
|
||||
@@ -92,7 +91,7 @@
|
||||
%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 pyasn1_version 0.1.9
|
||||
@@ -104,7 +103,7 @@
|
||||
%global sortedcontainers_version 1.5.2
|
||||
%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
|
||||
@@ -120,13 +119,16 @@
|
||||
%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
|
||||
%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")
|
||||
|
||||
%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 +157,7 @@
|
||||
%define pkgname matrix-synapse
|
||||
%define eggname matrix_synapse
|
||||
Name: %{pkgname}
|
||||
Version: 1.114.0
|
||||
Version: 1.136.0
|
||||
Release: 0
|
||||
Summary: Matrix protocol reference homeserver
|
||||
License: AGPL-3.0-or-later
|
||||
@@ -173,16 +175,28 @@ 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
|
||||
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 +206,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}
|
||||
@@ -295,8 +309,6 @@ 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
|
||||
# We only provide/obsolete python2 to ensure that users upgrade.
|
||||
Obsoletes: python2-matrix-synapse < %{version}-%{release}
|
||||
Provides: python2-matrix-synapse = %{version}-%{release}
|
||||
@@ -382,12 +394,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}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:87d43a1ae29ef0be416730d4765189d904505ee047e99780202657f6d8284389
|
||||
size 7122019
|
||||
oid sha256:e97424f9e8056d8576af60075a32e5c049a85d4ca5a4bc56e5969540b0e4cb7a
|
||||
size 22421551
|
||||
|
||||
Reference in New Issue
Block a user