Attachment 244617 Details for Bug 272614 – net-im/py-matrix-synapse: Update to 1.91.0

[patch] net-im/py-matrix-synapse: Update to 1.91.0

py-matrix-synapse-1.91.0.patch (text/plain), 15.03 KB, created by Sascha Biberhofer on 2023-09-03 19:26:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Biberhofer

Created: 2023-09-03 19:26:08 UTC

Size: 15.03 KB

patch

obsolete

>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index 7671525d2a43..bbf15ec07eef 100644
>--- a/net-im/py-matrix-synapse/Makefile
>+++ b/net-im/py-matrix-synapse/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	matrix-synapse
>-DISTVERSION=	1.87.0
>+DISTVERSION=	1.91.0
> CATEGORIES=	net-im python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -52,7 +52,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F
> 		${PYTHON_PKGNAMEPREFIX}authlib>=0.15.1:security/py-authlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR}
> 
>-USES=		python pycryptography:run cargo
>+USES=		python:3.8+ pycryptography:run cargo
> USE_PYTHON=	autoplist distutils
> USE_RC_SUBR=	synapse
> WRKSRC=		${WRKDIR}/${PORTNAME:S/-/_/}-${DISTVERSION}
>diff --git a/net-im/py-matrix-synapse/Makefile.crates b/net-im/py-matrix-synapse/Makefile.crates
>index 8f15f8fa7ac8..1b14cfed9317 100644
>--- a/net-im/py-matrix-synapse/Makefile.crates
>+++ b/net-im/py-matrix-synapse/Makefile.crates
>@@ -1,5 +1,5 @@
> CARGO_CRATES=	aho-corasick-1.0.2 \
>-		anyhow-1.0.71 \
>+		anyhow-1.0.72 \
> 		arc-swap-1.5.1 \
> 		autocfg-1.1.0 \
> 		bitflags-1.3.2 \
>@@ -15,33 +15,34 @@ CARGO_CRATES=	aho-corasick-1.0.2 \
> 		lazy_static-1.4.0 \
> 		libc-0.2.135 \
> 		lock_api-0.4.9 \
>-		log-0.4.19 \
>+		log-0.4.20 \
> 		memchr-2.5.0 \
> 		memoffset-0.6.5 \
> 		once_cell-1.15.0 \
> 		parking_lot-0.12.1 \
> 		parking_lot_core-0.9.3 \
>-		proc-macro2-1.0.52 \
>+		proc-macro2-1.0.64 \
> 		pyo3-0.17.3 \
> 		pyo3-build-config-0.17.3 \
> 		pyo3-ffi-0.17.3 \
>-		pyo3-log-0.8.2 \
>+		pyo3-log-0.8.3 \
> 		pyo3-macros-0.17.3 \
> 		pyo3-macros-backend-0.17.3 \
> 		pythonize-0.17.0 \
>-		quote-1.0.26 \
>+		quote-1.0.29 \
> 		redox_syscall-0.2.16 \
>-		regex-1.8.4 \
>-		regex-syntax-0.7.2 \
>+		regex-1.9.3 \
>+		regex-automata-0.3.6 \
>+		regex-syntax-0.7.4 \
> 		ryu-1.0.11 \
> 		scopeguard-1.1.0 \
>-		serde-1.0.164 \
>-		serde_derive-1.0.164 \
>-		serde_json-1.0.99 \
>+		serde-1.0.184 \
>+		serde_derive-1.0.184 \
>+		serde_json-1.0.104 \
> 		smallvec-1.10.0 \
> 		subtle-2.4.1 \
> 		syn-1.0.104 \
>-		syn-2.0.10 \
>+		syn-2.0.28 \
> 		target-lexicon-0.12.4 \
> 		typenum-1.15.0 \
> 		unicode-ident-1.0.5 \
>diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
>index 4725b297ca24..0af84715fbdd 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,10 +1,10 @@
>-TIMESTAMP = 1688493981
>-SHA256 (matrix_synapse-1.87.0.tar.gz) = 6bdd836512f0c96158af8eef9870e75c6420e465c3becc4f2c504b76261f83e5
>-SIZE (matrix_synapse-1.87.0.tar.gz) = 3216171
>+TIMESTAMP = 1693421632
>+SHA256 (matrix_synapse-1.91.0.tar.gz) = 913d78566edcc3c6e5e28199492aab87150c73b52b7f639ac25888de0df3cc13
>+SIZE (matrix_synapse-1.91.0.tar.gz) = 3275709
> 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.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8
>-SIZE (rust/crates/anyhow-1.0.71.crate) = 43808
>+SHA256 (rust/crates/anyhow-1.0.72.crate) = 3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854
>+SIZE (rust/crates/anyhow-1.0.72.crate) = 43837
> SHA256 (rust/crates/arc-swap-1.5.1.crate) = 983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164
> SIZE (rust/crates/arc-swap-1.5.1.crate) = 66157
> SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
>@@ -35,8 +35,8 @@ SHA256 (rust/crates/libc-0.2.135.crate) = 68783febc7782c6c5cb401fbda4de5a9898be1
> SIZE (rust/crates/libc-0.2.135.crate) = 604591
> SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df
> SIZE (rust/crates/lock_api-0.4.9.crate) = 25685
>-SHA256 (rust/crates/log-0.4.19.crate) = b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4
>-SIZE (rust/crates/log-0.4.19.crate) = 38073
>+SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
>+SIZE (rust/crates/log-0.4.20.crate) = 38307
> SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
> SIZE (rust/crates/memchr-2.5.0.crate) = 65812
> SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
>@@ -47,48 +47,50 @@ SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff49129
> SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
> SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929
> SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
>-SHA256 (rust/crates/proc-macro2-1.0.52.crate) = 1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224
>-SIZE (rust/crates/proc-macro2-1.0.52.crate) = 42982
>+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.2.crate) = c94ff6535a6bae58d7d0b85e60d4c53f7f84d0d0aa35d6a28c3f3e70bfe51444
>-SIZE (rust/crates/pyo3-log-0.8.2.crate) = 14254
>+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/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc
>-SIZE (rust/crates/quote-1.0.26.crate) = 28397
>+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.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f
>-SIZE (rust/crates/regex-1.8.4.crate) = 249562
>-SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78
>-SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778
>+SHA256 (rust/crates/regex-1.9.3.crate) = 81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a
>+SIZE (rust/crates/regex-1.9.3.crate) = 252676
>+SHA256 (rust/crates/regex-automata-0.3.6.crate) = fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69
>+SIZE (rust/crates/regex-automata-0.3.6.crate) = 607174
>+SHA256 (rust/crates/regex-syntax-0.7.4.crate) = e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2
>+SIZE (rust/crates/regex-syntax-0.7.4.crate) = 343365
> 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.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d
>-SIZE (rust/crates/serde-1.0.164.crate) = 77057
>-SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68
>-SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789
>-SHA256 (rust/crates/serde_json-1.0.99.crate) = 46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3
>-SIZE (rust/crates/serde_json-1.0.99.crate) = 145102
>+SHA256 (rust/crates/serde-1.0.184.crate) = 2c911f4b04d7385c9035407a4eff5903bf4fe270fa046fda448b69e797f4fff0
>+SIZE (rust/crates/serde-1.0.184.crate) = 77331
>+SHA256 (rust/crates/serde_derive-1.0.184.crate) = c1df27f5b29406ada06609b2e2f77fb34f6dbb104a457a671cc31dbed237e09e
>+SIZE (rust/crates/serde_derive-1.0.184.crate) = 55843
>+SHA256 (rust/crates/serde_json-1.0.104.crate) = 076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c
>+SIZE (rust/crates/serde_json-1.0.104.crate) = 146130
> SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
> SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
> SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
> SIZE (rust/crates/subtle-2.4.1.crate) = 12630
> SHA256 (rust/crates/syn-1.0.104.crate) = 4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce
> SIZE (rust/crates/syn-1.0.104.crate) = 236683
>-SHA256 (rust/crates/syn-2.0.10.crate) = 5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40
>-SIZE (rust/crates/syn-2.0.10.crate) = 240095
>+SHA256 (rust/crates/syn-2.0.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567
>+SIZE (rust/crates/syn-2.0.28.crate) = 241635
> SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1
> SIZE (rust/crates/target-lexicon-0.12.4.crate) = 23020
> SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987
>diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>index ffcc044afac2..6a82f26bcdc7 100644
>--- a/net-im/py-matrix-synapse/files/patch-pyproject.toml
>+++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>@@ -1,6 +1,6 @@
>---- pyproject.toml.orig	2023-07-04 15:35:46 UTC
>-+++ pyproject.toml
>-@@ -210,17 +210,6 @@ importlib_metadata = { version = ">=1.4", python = "<3
>+--- pyproject.toml.orig	2023-08-30 18:21:32.688339700 +0800
>++++ pyproject.toml	2023-08-31 02:55:41.490241000 +0800
>+@@ -207,17 +207,6 @@
>  # We are currently incompatible with >=2.0.0: (https://github.com/matrix-org/synapse/issues/15858)
>  pydantic = "^1.7.4"
>  
>@@ -18,11 +18,11 @@
>  # Optional Dependencies
>  # ---------------------
>  matrix-synapse-ldap3 = { version = ">=0.1", optional = true }
>-@@ -370,7 +359,7 @@ furo = ">=2022.12.7,<2024.0.0"
>+@@ -367,7 +356,7 @@
>  # 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.6.0", "setuptools_rust>=1.3,<=1.6.0"]
>+-requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.6.0"]
> +requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.7.0"]
>  build-backend = "poetry.core.masonry.api"
>  
>diff --git a/net-im/py-matrix-synapse/files/patch-synapse_media_thumbnailer.py b/net-im/py-matrix-synapse/files/patch-synapse_media_thumbnailer.py
>deleted file mode 100644
>index 64fb9363aad5..000000000000
>--- a/net-im/py-matrix-synapse/files/patch-synapse_media_thumbnailer.py
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- synapse/media/thumbnailer.py.orig  2023-07-11 08:10:15 UTC
>-+++ synapse/media/thumbnailer.py
>-@@ -131,7 +131,7 @@ class Thumbnailer:
>-             else:
>-                 with self.image:
>-                     self.image = self.image.convert("RGB")
>--        return self.image.resize((width, height), Image.ANTIALIAS)
>-+        return self.image.resize((width, height), Image.LANCZOS)
>- 
>-     def scale(self, width: int, height: int, output_type: str) -> BytesIO:
>-         """Rescales the image to the given dimensions.
>diff --git a/net-im/py-matrix-synapse/files/pkg-message.in b/net-im/py-matrix-synapse/files/pkg-message.in
>index 0be9a350bed2..b5412a90654e 100644
>--- a/net-im/py-matrix-synapse/files/pkg-message.in
>+++ b/net-im/py-matrix-synapse/files/pkg-message.in
>@@ -18,69 +18,11 @@ instructions at %%DOCSDIR%%/UPGRADE.rst
> EOM
> }
> { type: upgrade
>-  maximum_version: 1.51.0
>+  maximum_version: 1.88.0
>   message: <<EOM
>-Synapse 1.51.0 deprecates webclient listeners and non-HTTP(S)
>-web_client_location settings. Please update your homeserver configurations
>-accordingly.
>-
>-Additionally, if you run your own turn server for WebRTC and
>-use Let's Encrypt certificates, be advised that some Android and iOS clients
>-may be unable to connect. Please see upstream's turn-howto[0] for additional
>-details on this issue.
>-
>-[0] https://matrix-org.github.io/synapse/latest/turn-howto.html
>-
>-EOM
>-}
>-{ type: upgrade
>-  maximum_version: 1.55.0
>-  message: <<EOM
>-The default room version of synapse has been increased to version 9. Consider
>-changing this if interoperability with other matrix servers is an issue.
>-
>-If you're using Mjolnir, be advised that this version of synapse is
>-incompatible with Mjolnir 1.3.1 and earlier.
>-
>-EOM
>-}
>-{
>-  message: <<EOM
>-Running synapse with the sqlite backend is only recommended for testing purposes.
>-Future versions of synapse will disable federation by default if sqlite is used.
>-EOM
>-}
>-{ type: upgrade
>-  message: <<EOM
>-If you're currently using synapse with sqlite and would like to switch to postgres,
>-please read the instructions at %%DOCSDIR%%/postgres.md
>-EOM
>-}
>-{ type: upgrade
>-  maximum_version: 1.55.2
>-  message: <<EOM
>-Synapse will now refuse to start up if open registration is enabled, in order to help
>-mitigate abuse across the federation. If you would like to provide registration to
>-anyone, consider adding email, recaptcha or token-based verification in order to
>-prevent automated registration from bad actors. This check can be disabled by setting
>-the enable_registration_without_verification option in your homeserver configuration
>-file to true. More details are available in the upgrade notes[0].
>-
>-Synapse will additionally now refuse to start when using PostgreSQL with a non-C values
>-for COLLATE and CTYPE, unless the config flag allow_unsafe_locale, found in the database
>-section of the configuration file, is set to true. See the upgrade notes[1] for details.
>-
>-[0] https://matrix-org.github.io/synapse/v1.56/upgrade.html#open-registration-without-verification-is-now-disabled-by-default
>-[1] https://matrix-org.github.io/synapse/v1.56/upgrade#change-in-behaviour-for-postgresql-databases-with-unsafe-locale
>-EOM
>-}
>-{ type: upgrade
>-  maximum_version: 1.62.0
>-  message: <<EOM
>-Starting with synapse 1.62.0, this port will no longer ship with sqlite support
>-by default. If you rely on sqlite for your setup, please either migrate to
>-postgresql, install the sqlite dependency manually or build a custom flavor of the
>-port.
>+Starting with synapse 1.88.0, the old worker replication configuration has been
>+deprecated. Please read the official upgrade instructions on how to migrate your
>+configuration.
> EOM
> }
> ]

Flags:

ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 272614: 243500 | 243807 | 244117 | 244487 | 244617