net-im/py-matrix-synapse: Update to 1.95.1

PR:		274758
Approved by:	Sascha Biberhofer <ports@skyforge.at> (maintainer)

net-im/py-matrix-synapse/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	matrix-synapse
-DISTVERSION=	1.93.0
+DISTVERSION=	1.95.1
 CATEGORIES=	net-im python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +12,8 @@ WWW=		https://www.matrix.org
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<1.7.0_99:devel/py-poetry-core@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<1.7.0_99:devel/py-setuptools-rust@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.7.0_99:devel/py-poetry-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<=1.8.1_99:devel/py-setuptools-rust@${PY_FLAVOR}
 # Keep the RUN_DEPENDS layout similar to the pyproject.toml file
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}immutabledict>=2.0:devel/py-immutabledict@${PY_FLAVOR} \
@@ -41,7 +41,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0.1:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ijson>=3.1.4:devel/py-ijson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matrix-common>=1.3.0<2.0.0:devel/py-matrix-common@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}packaging>=16.1:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=1.7.4:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.0:security/py-pysaml2@${PY_FLAVOR} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

net-im/py-matrix-synapse/Makefile.crates

@@ -17,27 +17,27 @@ CARGO_CRATES=	aho-corasick-1.0.2 \
 		lock_api-0.4.9 \
 		log-0.4.20 \
 		memchr-2.6.3 \
-		memoffset-0.6.5 \
+		memoffset-0.9.0 \
 		once_cell-1.15.0 \
 		parking_lot-0.12.1 \
 		parking_lot_core-0.9.3 \
 		proc-macro2-1.0.64 \
-		pyo3-0.17.3 \
-		pyo3-build-config-0.17.3 \
-		pyo3-ffi-0.17.3 \
-		pyo3-log-0.8.3 \
-		pyo3-macros-0.17.3 \
-		pyo3-macros-backend-0.17.3 \
-		pythonize-0.17.0 \
+		pyo3-0.19.2 \
+		pyo3-build-config-0.19.2 \
+		pyo3-ffi-0.19.2 \
+		pyo3-log-0.8.4 \
+		pyo3-macros-0.19.2 \
+		pyo3-macros-backend-0.19.2 \
+		pythonize-0.19.0 \
 		quote-1.0.29 \
 		redox_syscall-0.2.16 \
-		regex-1.9.5 \
-		regex-automata-0.3.8 \
+		regex-1.9.6 \
+		regex-automata-0.3.9 \
 		regex-syntax-0.7.5 \
 		ryu-1.0.11 \
 		scopeguard-1.1.0 \
-		serde-1.0.188 \
-		serde_derive-1.0.188 \
+		serde-1.0.189 \
+		serde_derive-1.0.189 \
 		serde_json-1.0.107 \
 		smallvec-1.10.0 \
 		subtle-2.4.1 \

net-im/py-matrix-synapse/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1695770761
-SHA256 (matrix_synapse-1.93.0.tar.gz) = 3807bcf75c66af7cead04d5fdf79ec8c40843305d9220feb055a6f08a2dd36b7
-SIZE (matrix_synapse-1.93.0.tar.gz) = 3288967
+TIMESTAMP = 1698767291
+SHA256 (matrix_synapse-1.95.1.tar.gz) = 08e5b0eba1d18f5086d6f68ed8f86e38283b327b3ca0179b6fdcb1917e0eecc9
+SIZE (matrix_synapse-1.95.1.tar.gz) = 3304725
 SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41
 SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694
 SHA256 (rust/crates/anyhow-1.0.75.crate) = a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6
@@ -39,8 +39,8 @@ SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c74
 SIZE (rust/crates/log-0.4.20.crate) = 38307
 SHA256 (rust/crates/memchr-2.6.3.crate) = 8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c
 SIZE (rust/crates/memchr-2.6.3.crate) = 94377
-SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
-SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
+SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
+SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
 SHA256 (rust/crates/once_cell-1.15.0.crate) = e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1
 SIZE (rust/crates/once_cell-1.15.0.crate) = 31460
 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
@@ -49,38 +49,38 @@ SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e
 SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
 SHA256 (rust/crates/proc-macro2-1.0.64.crate) = 78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da
 SIZE (rust/crates/proc-macro2-1.0.64.crate) = 44848
-SHA256 (rust/crates/pyo3-0.17.3.crate) = 268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543
-SIZE (rust/crates/pyo3-0.17.3.crate) = 408939
-SHA256 (rust/crates/pyo3-build-config-0.17.3.crate) = 28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8
-SIZE (rust/crates/pyo3-build-config-0.17.3.crate) = 29230
-SHA256 (rust/crates/pyo3-ffi-0.17.3.crate) = 0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc
-SIZE (rust/crates/pyo3-ffi-0.17.3.crate) = 62854
-SHA256 (rust/crates/pyo3-log-0.8.3.crate) = f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605
-SIZE (rust/crates/pyo3-log-0.8.3.crate) = 14324
-SHA256 (rust/crates/pyo3-macros-0.17.3.crate) = 94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28
-SIZE (rust/crates/pyo3-macros-0.17.3.crate) = 7257
-SHA256 (rust/crates/pyo3-macros-backend-0.17.3.crate) = c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f
-SIZE (rust/crates/pyo3-macros-backend-0.17.3.crate) = 49992
-SHA256 (rust/crates/pythonize-0.17.0.crate) = 0f7f0c136f5fbc01868185eef462800e49659eb23acca83b9e884367a006acb6
-SIZE (rust/crates/pythonize-0.17.0.crate) = 10949
+SHA256 (rust/crates/pyo3-0.19.2.crate) = e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38
+SIZE (rust/crates/pyo3-0.19.2.crate) = 418228
+SHA256 (rust/crates/pyo3-build-config-0.19.2.crate) = 076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5
+SIZE (rust/crates/pyo3-build-config-0.19.2.crate) = 29206
+SHA256 (rust/crates/pyo3-ffi-0.19.2.crate) = e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9
+SIZE (rust/crates/pyo3-ffi-0.19.2.crate) = 66500
+SHA256 (rust/crates/pyo3-log-0.8.4.crate) = c09c2b349b6538d8a73d436ca606dab6ce0aaab4dad9e6b7bdd57a4f556c3bc3
+SIZE (rust/crates/pyo3-log-0.8.4.crate) = 14329
+SHA256 (rust/crates/pyo3-macros-0.19.2.crate) = dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1
+SIZE (rust/crates/pyo3-macros-0.19.2.crate) = 7173
+SHA256 (rust/crates/pyo3-macros-backend-0.19.2.crate) = 947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536
+SIZE (rust/crates/pyo3-macros-backend-0.19.2.crate) = 49962
+SHA256 (rust/crates/pythonize-0.19.0.crate) = 8e35b716d430ace57e2d1b4afb51c9e5b7c46d2bce72926e07f9be6a98ced03e
+SIZE (rust/crates/pythonize-0.19.0.crate) = 11647
 SHA256 (rust/crates/quote-1.0.29.crate) = 573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105
 SIZE (rust/crates/quote-1.0.29.crate) = 28345
 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
 SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
-SHA256 (rust/crates/regex-1.9.5.crate) = 697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47
-SIZE (rust/crates/regex-1.9.5.crate) = 253883
-SHA256 (rust/crates/regex-automata-0.3.8.crate) = c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795
-SIZE (rust/crates/regex-automata-0.3.8.crate) = 610113
+SHA256 (rust/crates/regex-1.9.6.crate) = ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff
+SIZE (rust/crates/regex-1.9.6.crate) = 254981
+SHA256 (rust/crates/regex-automata-0.3.9.crate) = 59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9
+SIZE (rust/crates/regex-automata-0.3.9.crate) = 610489
 SHA256 (rust/crates/regex-syntax-0.7.5.crate) = dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da
 SIZE (rust/crates/regex-syntax-0.7.5.crate) = 343366
 SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
 SIZE (rust/crates/ryu-1.0.11.crate) = 47007
 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
 SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
-SHA256 (rust/crates/serde-1.0.188.crate) = cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e
-SIZE (rust/crates/serde-1.0.188.crate) = 76230
-SHA256 (rust/crates/serde_derive-1.0.188.crate) = 4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2
-SIZE (rust/crates/serde_derive-1.0.188.crate) = 55563
+SHA256 (rust/crates/serde-1.0.189.crate) = 8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537
+SIZE (rust/crates/serde-1.0.189.crate) = 76276
+SHA256 (rust/crates/serde_derive-1.0.189.crate) = 1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5
+SIZE (rust/crates/serde_derive-1.0.189.crate) = 55708
 SHA256 (rust/crates/serde_json-1.0.107.crate) = 6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65
 SIZE (rust/crates/serde_json-1.0.107.crate) = 146458
 SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0

net-im/py-matrix-synapse/files/patch-pyproject.toml

@@ -1,8 +1,8 @@
---- pyproject.toml.orig	2023-09-26 15:01:12 UTC
+--- pyproject.toml.orig	2023-10-31 14:05:31 UTC
 +++ pyproject.toml
-@@ -215,17 +215,6 @@ packaging = ">=16.1"
- # We are currently incompatible with >=2.0.0: (https://github.com/matrix-org/synapse/issues/15858)
- pydantic = "^1.7.4"
+@@ -216,17 +216,6 @@ packaging = ">=20.0"
+ # See https://github.com/matrix-org/synapse/issues/15858
+ pydantic = ">=1.7.4, <3"
 
 -# This is for building the rust components during "poetry install", which
 -# currently ignores the `build-system.requires` directive (c.f.
@@ -18,3 +18,12 @@
  # Optional Dependencies
  # ---------------------
  matrix-synapse-ldap3 = { version = ">=0.1", optional = true }
+@@ -381,7 +370,7 @@ furo = ">=2022.12.7,<2024.0.0"
+ # system changes.
+ # We are happy to raise these upper bounds upon request,
+ # provided we check that it's safe to do so (i.e. that CI passes).
+-requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.7.0"]
++requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.8.1"]
+ build-backend = "poetry.core.masonry.api"
+
+

net-im/py-matrix-synapse/files/patch-setup.py

@@ -1,7 +1,7 @@
 --- setup.py.orig	1970-01-01 00:00:00 UTC
 +++ setup.py
-@@ -169,7 +169,6 @@ install_requires = \
-  'pydantic>=1.7.4',
+@@ -175,7 +175,6 @@ install_requires = \
+  'pydantic>=1.7.4,<3',
   'pymacaroons>=0.13.0',
   'service-identity>=18.1.0',
 - 'setuptools_rust>=1.3',