diff --git a/17886.patch b/17886.patch deleted file mode 100644 index 5f5831d..0000000 --- a/17886.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 0f73c759ea142adfe5e200fb19685e1ef4a2f9c4 Mon Sep 17 00:00:00 2001 -From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> -Date: Mon, 28 Oct 2024 10:26:52 +0000 -Subject: [PATCH 1/3] Bump twisted from 24.7.0 to 24.10.0 - -Bumps [twisted](https://github.com/twisted/twisted) from 24.7.0 to 24.10.0. -- [Release notes](https://github.com/twisted/twisted/releases) -- [Changelog](https://github.com/twisted/twisted/blob/trunk/NEWS.rst) -- [Commits](https://github.com/twisted/twisted/compare/twisted-24.7.0...twisted-24.10.0) - ---- -updated-dependencies: -- dependency-name: twisted - dependency-type: direct:production - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] ---- - poetry.lock | 39 +++++++++++++++++++-------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/poetry.lock b/poetry.lock -index 9ca72814a4..60dcb97486 100644 ---- a/poetry.lock -+++ b/poetry.lock -@@ -49,18 +49,17 @@ cryptography = "*" - - [[package]] - name = "automat" --version = "22.10.0" -+version = "24.8.1" - description = "Self-service finite-state machines for the programmer on the go." - optional = false --python-versions = "*" -+python-versions = ">=3.8" - files = [ -- {file = "Automat-22.10.0-py2.py3-none-any.whl", hash = "sha256:c3164f8742b9dc440f3682482d32aaff7bb53f71740dd018533f9de286b64180"}, -- {file = "Automat-22.10.0.tar.gz", hash = "sha256:e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e"}, -+ {file = "Automat-24.8.1-py3-none-any.whl", hash = "sha256:bf029a7bc3da1e2c24da2343e7598affaa9f10bf0ab63ff808566ce90551e02a"}, -+ {file = "automat-24.8.1.tar.gz", hash = "sha256:b34227cf63f6325b8ad2399ede780675083e439b20c323d376373d8ee6306d88"}, - ] - - [package.dependencies] --attrs = ">=19.2.0" --six = "*" -+typing-extensions = {version = "*", markers = "python_version < \"3.10\""} - - [package.extras] - visualize = ["Twisted (>=16.1.1)", "graphviz (>0.5.1)"] -@@ -2633,18 +2632,18 @@ urllib3 = ">=1.26.0" - - [[package]] - name = "twisted" --version = "24.7.0" -+version = "24.10.0" - description = "An asynchronous networking framework written in Python" - optional = false - python-versions = ">=3.8.0" - files = [ -- {file = "twisted-24.7.0-py3-none-any.whl", hash = "sha256:734832ef98108136e222b5230075b1079dad8a3fc5637319615619a7725b0c81"}, -- {file = "twisted-24.7.0.tar.gz", hash = "sha256:5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394"}, -+ {file = "twisted-24.10.0-py3-none-any.whl", hash = "sha256:67aa7c8aa94387385302acf44ade12967c747858c8bcce0f11d38077a11c5326"}, -+ {file = "twisted-24.10.0.tar.gz", hash = "sha256:02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e"}, - ] - - [package.dependencies] --attrs = ">=21.3.0" --automat = ">=0.8.0" -+attrs = ">=22.2.0" -+automat = ">=24.8.0" - constantly = ">=15.1" - hyperlink = ">=17.1.1" - idna = {version = ">=2.4", optional = true, markers = "extra == \"tls\""} -@@ -2655,19 +2654,19 @@ typing-extensions = ">=4.2.0" - zope-interface = ">=5" - - [package.extras] --all-non-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.0,<5.0)", "h2 (>=3.0,<5.0)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] -+all-non-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] - conch = ["appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)"] --dev = ["coverage (>=7.5,<8.0)", "cython-test-exception-raiser (>=1.0.2,<2)", "hypothesis (>=6.56)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "python-subunit (>=1.4,<2.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)"] -+dev = ["coverage (>=7.5,<8.0)", "cython-test-exception-raiser (>=1.0.2,<2)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "python-subunit (>=1.4,<2.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)"] - dev-release = ["pydoctor (>=23.9.0,<23.10.0)", "pydoctor (>=23.9.0,<23.10.0)", "sphinx (>=6,<7)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "towncrier (>=23.6,<24.0)"] --gtk-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.0,<5.0)", "h2 (>=3.0,<5.0)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pygobject", "pygobject", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] --http2 = ["h2 (>=3.0,<5.0)", "priority (>=1.1.0,<2.0)"] --macos-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.0,<5.0)", "h2 (>=3.0,<5.0)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] --mypy = ["appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "coverage (>=7.5,<8.0)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.0,<5.0)", "hypothesis (>=6.56)", "idna (>=2.4)", "mypy (>=1.8,<2.0)", "mypy-zope (>=1.0.3,<1.1.0)", "priority (>=1.1.0,<2.0)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "python-subunit (>=1.4,<2.0)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)", "types-pyopenssl", "types-setuptools"] --osx-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.0,<5.0)", "h2 (>=3.0,<5.0)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] -+gtk-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pygobject", "pygobject", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] -+http2 = ["h2 (>=3.2,<5.0)", "priority (>=1.1.0,<2.0)"] -+macos-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] -+mypy = ["appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "coverage (>=7.5,<8.0)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "idna (>=2.4)", "mypy (==1.10.1)", "mypy-zope (==1.0.6)", "priority (>=1.1.0,<2.0)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "python-subunit (>=1.4,<2.0)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)", "types-pyopenssl", "types-setuptools"] -+osx-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"] - serial = ["pyserial (>=3.0)", "pywin32 (!=226)"] --test = ["cython-test-exception-raiser (>=1.0.2,<2)", "hypothesis (>=6.56)", "pyhamcrest (>=2)"] -+test = ["cython-test-exception-raiser (>=1.0.2,<2)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "pyhamcrest (>=2)"] - tls = ["idna (>=2.4)", "pyopenssl (>=21.0.0)", "service-identity (>=18.1.0)"] --windows-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.0,<5.0)", "h2 (>=3.0,<5.0)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)", "twisted-iocpsupport (>=1.0.2)", "twisted-iocpsupport (>=1.0.2)"] -+windows-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)", "twisted-iocpsupport (>=1.0.2)", "twisted-iocpsupport (>=1.0.2)"] - - [[package]] - name = "txredisapi" - -From 4a9891444e4fe6e9f283e1942a818d21db3b85d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E4=BA=88=E7=BA=BE?= -Date: Wed, 30 Oct 2024 10:36:32 +0800 -Subject: [PATCH 2/3] feat: adapt to Twisted 24.10.0rc1 - ---- - synapse/http/proxy.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/synapse/http/proxy.py b/synapse/http/proxy.py -index 97aa429e7d..5115ffd1a7 100644 ---- a/synapse/http/proxy.py -+++ b/synapse/http/proxy.py -@@ -30,7 +30,7 @@ - from twisted.python import failure - from twisted.python.failure import Failure - from twisted.web.client import ResponseDone --from twisted.web.http_headers import Headers -+from twisted.web.http_headers import Headers, _nameEncoder - from twisted.web.iweb import IResponse - from twisted.web.resource import IResource - from twisted.web.server import Request, Site -@@ -65,11 +65,14 @@ - if hasattr(Headers, "_canonicalNameCaps"): - # Twisted < 24.7.0rc1 - _canonicalHeaderName = Headers()._canonicalNameCaps # type: ignore[attr-defined] --else: -- # Twisted >= 24.7.0rc1 -+elif hasattr(Headers, "_encodeName"): -+ # 24.7.0rc1 <= Twisted < 24.10.0rc1 - # But note that `_encodeName` still exists on prior versions, - # it just encodes differently - _canonicalHeaderName = Headers()._encodeName -+else: -+ # Twisted >= 24.10.0rc1 -+ _canonicalHeaderName = _nameEncoder.encode - - - def parse_connection_header_value( - -From 643e7908ad941fdc7aa942b644bf218024848a6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E4=BA=88=E7=BA=BE?= -Date: Wed, 30 Oct 2024 10:46:14 +0800 -Subject: [PATCH 3/3] chore: create 17886.misc - ---- - changelog.d/17886.misc | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 changelog.d/17886.misc - -diff --git a/changelog.d/17886.misc b/changelog.d/17886.misc -new file mode 100644 -index 0000000000..d8c77e2f4e ---- /dev/null -+++ b/changelog.d/17886.misc -@@ -0,0 +1 @@ -+Adapt to Twisted 24.10.0rc1. diff --git a/_service b/_service index e55e860..d55e512 100644 --- a/_service +++ b/_service @@ -4,11 +4,11 @@ @PARENT_TAG@ https://github.com/element-hq/synapse.git git - v1.118.0 + v1.119.0 v(.*) \1 diff --git a/matrix-synapse-1.118.0.obscpio b/matrix-synapse-1.118.0.obscpio deleted file mode 100644 index 57d7e6f..0000000 --- a/matrix-synapse-1.118.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:857e57f8690065299a925fe4c44d88542d3e3593682ef22e4e7d9f08f763acc9 -size 38415885 diff --git a/matrix-synapse-1.119.0.obscpio b/matrix-synapse-1.119.0.obscpio new file mode 100644 index 0000000..4f104a4 --- /dev/null +++ b/matrix-synapse-1.119.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3adb47bf2a9816aea1b1f7318e7ab62af5bc719f4be40e5f3c7f410a6d008ca4 +size 38509581 diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch index 6fd6fb1..58f932b 100644 --- a/matrix-synapse-1.4.1-paths.patch +++ b/matrix-synapse-1.4.1-paths.patch @@ -50,7 +50,7 @@ Index: synapse/synapse/config/server.py =================================================================== --- synapse.orig/synapse/config/server.py +++ synapse/synapse/config/server.py -@@ -799,7 +799,7 @@ class ServerConfig(Config): +@@ -810,7 +810,7 @@ class ServerConfig(Config): bind_port = 8448 unsecure_port = 8008 diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec index 4c59f2f..513443c 100644 --- a/matrix-synapse-test.spec +++ b/matrix-synapse-test.spec @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.118.0 +Version: 1.119.0 Release: 0 Summary: Test package for %{pkgname} License: AGPL-3.0-or-later diff --git a/matrix-synapse.changes b/matrix-synapse.changes index 1fec96a..dc42567 100644 --- a/matrix-synapse.changes +++ b/matrix-synapse.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Wed Nov 13 15:53:23 UTC 2024 - Marcus Rueckert + +- drop 17886.patch +- refresh matrix-synapse-1.4.1-paths.patch to apply cleanly again +- Update to 1.119.0 + Python 3.8 is end-of-life and is no longer supported by Synapse. + The minimum supported Python version is now 3.9. + + If you are running Synapse with Python 3.8, please upgrade to + Python 3.9 (or greater) before upgrading Synapse. + + - Features + - Support MSC4151's stable report room API. (#17374) + - Add experimental support for MSC4222 (Adding state_after to + sync v2). (#17888) + - Bugfixes + - Fix bug with sliding sync where $LAZY-loading room members + would not return required_state membership in incremental + syncs. (#17809) + - Check if user has membership in a room before tagging it. + Contributed by Lama Alosaimi. (#17839) + - Fix a bug in the admin redact endpoint where the background + task would not run if a worker was specified in + - the config option run_background_tasks_on. (#17847) + - Fix bug where some presence and typing timeouts can expire + early. (#17850) + - Fix detection when the built Rust library was outdated when + using source installations. (#17861) + - Fix a long-standing bug in Synapse which could cause one-time + keys to be issued in the incorrect order, causing message + decryption failures. (#17903) + - Fix experimental support for MSC4222 (Adding state_after to + sync v2) where we would return the full state on incremental + syncs when using lazy loaded members and there were no new + events in the timeline. (#17915) + - Internal Changes + - Remove support for python 3.8. (#17908) + - Add a test for downloading and thumbnailing a CMYK JPEG. + (#17786) + - Refactor database calls to remove Generator usage. (#17813, + #17814, #17815, #17816, #17817, #17818, #17890) + - Include the destination in the error of 'Destination + mismatch' on federation requests. (#17830) + - The nix flake inside the repository no longer tracks + nixpkgs/master to not catch the latest bugs from a PR merged + 5 minutes ago. (#17852) + - Minor speed-up of sliding sync by computing extensions + results in parallel. (#17884) + - Bump the default Python version in the Synapse Dockerfile + from 3.11 -> 3.12. (#17887) + - Remove usage of internal header encoding API. (#17894) + - Use unique name for each os.arch variant when uploading Wheel + artifacts. (#17905) + - Fix tests to run with latest Twisted. (#17906, #17907, + #17911) + - Update version constraint to allow the latest poetry-core + 1.9.1. (#17902) + - Update the portdb CI to use Python 3.13 and Postgres 17 as + latest dependencies. (#17909) + - Add an index to current_state_delta_stream table. (#17912) + - Fix building and attaching release artifacts during the + release process. (#17921) + - Updates to locked dependencies + - Bump actions/download-artifact & actions/upload-artifact from + 3 to 4 in /.github/workflows. (#17657) + - Bump anyhow from 1.0.89 to 1.0.92. (#17858, #17876, #17901) + - Bump bytes from 1.7.2 to 1.8.0. (#17877) + - Bump cryptography from 43.0.1 to 43.0.3. (#17853) + - Bump mypy-zope from 1.0.7 to 1.0.8. (#17898) + - Bump phonenumbers from 8.13.47 to 8.13.49. (#17880, #17899) + - Bump python-multipart from 0.0.12 to 0.0.16. (#17879) + - Bump regex from 1.11.0 to 1.11.1. (#17874) + - Bump ruff from 0.6.9 to 0.7.2. (#17868, #17897) + - Bump serde from 1.0.210 to 1.0.214. (#17875, #17900) + - Bump serde_json from 1.0.128 to 1.0.132. (#17857) + - Bump types-psycopg2 from 2.9.21.20240819 to 2.9.21.20241019. + (#17855) + - Bump types-setuptools from 75.1.0.20241014 to + 75.2.0.20241019. (#17856) + ------------------------------------------------------------------- Wed Oct 30 19:12:19 UTC 2024 - Marcus Rueckert diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo index a9dbb73..c3f13f5 100644 --- a/matrix-synapse.obsinfo +++ b/matrix-synapse.obsinfo @@ -1,4 +1,4 @@ name: matrix-synapse -version: 1.118.0 -mtime: 1730217922 -commit: 4be3bd41fddd3d6bf3b772be9cf23b16899e089d +version: 1.119.0 +mtime: 1731506298 +commit: 850ff14613040d733ab28373a54c95e20182cd1c diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 617a430..6bf8152 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -23,13 +23,12 @@ %global Twisted_version 24.7.0 %global Jinja2_version 3.1.4 %global Pillow_version 10.4.0 -# TODO: 6.0.2 -%global PyYAML_version 6.0.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 cryptography_version 43.0.3 %global immutabledict_version 4.2.0 %global idna_version 3.8 %global ijson_version 3.3.0 @@ -39,8 +38,8 @@ %global msgpack_version 1.1.0 # TODO 1.3.0 %global netaddr_version 1.2.1 -# TODO 8.13.46 -%global phonenumbers_version 8.13.44 +# TODO 8.13.49 +%global phonenumbers_version 8.13.48 %global prometheus_client_version 0.20.0 %global psutil_version 2.0.0 %global pyOpenSSL_version 24.2.1 @@ -59,10 +58,8 @@ %global packaging_version 24.0 %global psycopg2_version 2.9.9 %global pysaml2_version 7.3.1 -# TODO: 1.3.2 -%global Authlib_version 1.3.1 -# TODO 5.3.0 -%global lxml_version 5.2.2 +%global Authlib_version 1.3.2 +%global lxml_version 5.3.0 %global sentry_sdk_version 2.13.0 %global PyJWT_version 2.6.0 %global jaeger_client_version 4.8.0 @@ -78,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 @@ -157,7 +154,7 @@ %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.118.0 +Version: 1.119.0 Release: 0 Summary: Matrix protocol reference homeserver License: AGPL-3.0-or-later @@ -176,8 +173,6 @@ Source51: matrix-synapse-generate-config.sh Source99: series Patch0: matrix-synapse-1.4.1-paths.patch Patch1: bump-dependencies.patch -# from https://patch-diff.githubusercontent.com/raw/element-hq/synapse/pull/17886.patch -Patch2: 17886.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 @@ -196,7 +191,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 with %{use_python}-setuptools-rust =< 1.9.1) # NOTE: Keep this is in the same order as pyproject.toml. # some version locks based on poetry.lock BuildRequires: %{use_python}-Jinja2 >= %{Jinja2_version} diff --git a/vendor.tar.zst b/vendor.tar.zst index e65a1fb..89e67f7 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18480a64ad104c828ec83399cd1445ee4e5736e0f4fffbbfe5cdb82c434c9485 -size 7155317 +oid sha256:e22fc7e535d9fe59f83c757e8d2cffa4fdc5622aa3614b46b8857d36e9581eff +size 7151956