Attachment 250009 Details for Bug 276766 – Update diff v3

[patch] Update diff v3

0001-net-im-py-matrix-synapse-Update-to-1.105.0.patch (text/plain), 13.30 KB, created by Ashish SHUKLA on 2024-04-16 18:20:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2024-04-16 18:20:35 UTC

Size: 13.30 KB

patch

obsolete

>From a4351a8d8e173fe7c0813673c919ee6ee79a6004 Mon Sep 17 00:00:00 2001
>From: Ashish SHUKLA <ashish@FreeBSD.org>
>Date: Sat, 13 Apr 2024 12:38:22 +0000
>Subject: [PATCH] net-im/py-matrix-synapse: Update to 1.105.0
>
>---
> net-im/py-matrix-synapse/Makefile             |  9 ++-
> net-im/py-matrix-synapse/Makefile.crates      | 33 ++++-----
> net-im/py-matrix-synapse/distinfo             | 72 ++++++++++---------
> .../files/patch-pyproject.toml                | 11 +--
> net-im/py-matrix-synapse/files/patch-setup.py |  2 +-
> 5 files changed, 60 insertions(+), 67 deletions(-)
>
>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index 87559ca4958e..4e435619ef8c 100644
>--- a/net-im/py-matrix-synapse/Makefile
>+++ b/net-im/py-matrix-synapse/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	matrix-synapse
>-DISTVERSION=	1.98.0
>-PORTREVISION=	3
>+DISTVERSION=	1.105.0
> CATEGORIES=	net-im python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -10,11 +9,11 @@ MAINTAINER=	ports@skyforge.at
> COMMENT=	Matrix protocol reference homeserver
> WWW=		https://www.matrix.org
> 
>-LICENSE=	APACHE20
>+LICENSE=	AGPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<1.9.0_99:devel/py-poetry-core@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<1.9.0_99:devel/py-setuptools-rust@${PY_FLAVOR}
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.9.0:devel/py-poetry-core@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<=1.9.0: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} \
>diff --git a/net-im/py-matrix-synapse/Makefile.crates b/net-im/py-matrix-synapse/Makefile.crates
>index d131015e2235..4c89ce41510a 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.75 \
>+		anyhow-1.0.81 \
> 		arc-swap-1.5.1 \
> 		autocfg-1.1.0 \
> 		bitflags-1.3.2 \
>@@ -16,33 +16,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.20 \
>+		log-0.4.21 \
> 		memchr-2.6.3 \
> 		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.20.0 \
>-		pyo3-build-config-0.20.0 \
>-		pyo3-ffi-0.20.0 \
>+		portable-atomic-1.6.0 \
>+		proc-macro2-1.0.76 \
>+		pyo3-0.20.3 \
>+		pyo3-build-config-0.20.3 \
>+		pyo3-ffi-0.20.3 \
> 		pyo3-log-0.9.0 \
>-		pyo3-macros-0.20.0 \
>-		pyo3-macros-backend-0.20.0 \
>+		pyo3-macros-0.20.3 \
>+		pyo3-macros-backend-0.20.3 \
> 		pythonize-0.20.0 \
>-		quote-1.0.29 \
>+		quote-1.0.35 \
> 		redox_syscall-0.2.16 \
>-		regex-1.9.6 \
>-		regex-automata-0.3.9 \
>-		regex-syntax-0.7.5 \
>+		regex-1.10.4 \
>+		regex-automata-0.4.4 \
>+		regex-syntax-0.8.2 \
> 		ryu-1.0.11 \
> 		scopeguard-1.1.0 \
>-		serde-1.0.193 \
>-		serde_derive-1.0.193 \
>-		serde_json-1.0.108 \
>+		serde-1.0.197 \
>+		serde_derive-1.0.197 \
>+		serde_json-1.0.115 \
> 		smallvec-1.10.0 \
> 		subtle-2.4.1 \
>-		syn-2.0.28 \
>+		syn-2.0.48 \
> 		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 4409fd5a088b..d3170eebe4de 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,10 +1,10 @@
>-TIMESTAMP = 1702403918
>-SHA256 (matrix_synapse-1.98.0.tar.gz) = 02df99a2fec53777f76f2cbd275b4d13b719d67b9c2737188392a225fed5424f
>-SIZE (matrix_synapse-1.98.0.tar.gz) = 3340328
>+TIMESTAMP = 1713284272
>+SHA256 (matrix_synapse-1.105.0.tar.gz) = a58ea8ca79eb7fb2e52b4fb198cab8e2ea51c7fead284ac12c8872b242be153a
>+SIZE (matrix_synapse-1.105.0.tar.gz) = 3381674
> 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
>-SIZE (rust/crates/anyhow-1.0.75.crate) = 43901
>+SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
>+SIZE (rust/crates/anyhow-1.0.81.crate) = 45142
> 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
>@@ -37,8 +37,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.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
>-SIZE (rust/crates/log-0.4.20.crate) = 38307
>+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
>+SIZE (rust/crates/log-0.4.21.crate) = 43442
> SHA256 (rust/crates/memchr-2.6.3.crate) = 8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c
> SIZE (rust/crates/memchr-2.6.3.crate) = 94377
> SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
>@@ -49,48 +49,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.64.crate) = 78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da
>-SIZE (rust/crates/proc-macro2-1.0.64.crate) = 44848
>-SHA256 (rust/crates/pyo3-0.20.0.crate) = 04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b
>-SIZE (rust/crates/pyo3-0.20.0.crate) = 431766
>-SHA256 (rust/crates/pyo3-build-config-0.20.0.crate) = a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5
>-SIZE (rust/crates/pyo3-build-config-0.20.0.crate) = 29534
>-SHA256 (rust/crates/pyo3-ffi-0.20.0.crate) = 214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b
>-SIZE (rust/crates/pyo3-ffi-0.20.0.crate) = 64220
>+SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0
>+SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689
>+SHA256 (rust/crates/proc-macro2-1.0.76.crate) = 95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c
>+SIZE (rust/crates/proc-macro2-1.0.76.crate) = 45660
>+SHA256 (rust/crates/pyo3-0.20.3.crate) = 53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233
>+SIZE (rust/crates/pyo3-0.20.3.crate) = 434673
>+SHA256 (rust/crates/pyo3-build-config-0.20.3.crate) = deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7
>+SIZE (rust/crates/pyo3-build-config-0.20.3.crate) = 30060
>+SHA256 (rust/crates/pyo3-ffi-0.20.3.crate) = 62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa
>+SIZE (rust/crates/pyo3-ffi-0.20.3.crate) = 65024
> SHA256 (rust/crates/pyo3-log-0.9.0.crate) = 4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd
> SIZE (rust/crates/pyo3-log-0.9.0.crate) = 14370
>-SHA256 (rust/crates/pyo3-macros-0.20.0.crate) = dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b
>-SIZE (rust/crates/pyo3-macros-0.20.0.crate) = 7678
>-SHA256 (rust/crates/pyo3-macros-backend-0.20.0.crate) = 7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424
>-SIZE (rust/crates/pyo3-macros-backend-0.20.0.crate) = 49383
>+SHA256 (rust/crates/pyo3-macros-0.20.3.crate) = 7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158
>+SIZE (rust/crates/pyo3-macros-0.20.3.crate) = 7920
>+SHA256 (rust/crates/pyo3-macros-backend-0.20.3.crate) = 7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185
>+SIZE (rust/crates/pyo3-macros-backend-0.20.3.crate) = 49797
> SHA256 (rust/crates/pythonize-0.20.0.crate) = ffd1c3ef39c725d63db5f9bc455461bafd80540cb7824c61afb823501921a850
> SIZE (rust/crates/pythonize-0.20.0.crate) = 11500
>-SHA256 (rust/crates/quote-1.0.29.crate) = 573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105
>-SIZE (rust/crates/quote-1.0.29.crate) = 28345
>+SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
>+SIZE (rust/crates/quote-1.0.35.crate) = 28136
> 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.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/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
>+SIZE (rust/crates/regex-1.10.4.crate) = 253191
>+SHA256 (rust/crates/regex-automata-0.4.4.crate) = 3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a
>+SIZE (rust/crates/regex-automata-0.4.4.crate) = 617294
>+SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
>+SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
> 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.193.crate) = 25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89
>-SIZE (rust/crates/serde-1.0.193.crate) = 76863
>-SHA256 (rust/crates/serde_derive-1.0.193.crate) = 43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3
>-SIZE (rust/crates/serde_derive-1.0.193.crate) = 55692
>-SHA256 (rust/crates/serde_json-1.0.108.crate) = 3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b
>-SIZE (rust/crates/serde_json-1.0.108.crate) = 146476
>+SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
>+SIZE (rust/crates/serde-1.0.197.crate) = 77087
>+SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
>+SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
>+SHA256 (rust/crates/serde_json-1.0.115.crate) = 12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd
>+SIZE (rust/crates/serde_json-1.0.115.crate) = 147100
> 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-2.0.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567
>-SIZE (rust/crates/syn-2.0.28.crate) = 241635
>+SHA256 (rust/crates/syn-2.0.48.crate) = 0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f
>+SIZE (rust/crates/syn-2.0.48.crate) = 250566
> 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 0289fd6dd633..796a5b71b1de 100644
>--- a/net-im/py-matrix-synapse/files/patch-pyproject.toml
>+++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>@@ -1,4 +1,4 @@
>---- pyproject.toml.orig	2023-12-12 15:52:05 UTC
>+--- pyproject.toml.orig	2024-03-05 15:15:09 UTC
> +++ pyproject.toml
> @@ -216,17 +216,6 @@ pydantic = ">=1.7.4, <3"
>  # See https://github.com/matrix-org/synapse/issues/15858
>@@ -18,12 +18,3 @@
>  # Optional Dependencies
>  # ---------------------
>  matrix-synapse-ldap3 = { version = ">=0.1", optional = true }
>-@@ -382,7 +371,7 @@ furo = ">=2022.12.7,<2024.0.0"
>- # runtime errors caused by build 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.8.1", "setuptools_rust>=1.3,<=1.8.1"]
>-+requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3,<=1.9.0"]
>- build-backend = "poetry.core.masonry.api"
>- 
>- 
>diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py
>index 7b58e4d5030c..8e70aec77b2b 100644
>--- a/net-im/py-matrix-synapse/files/patch-setup.py
>+++ b/net-im/py-matrix-synapse/files/patch-setup.py
>@@ -1,6 +1,6 @@
> --- setup.py.orig	1970-01-01 00:00:00 UTC
> +++ setup.py
>-@@ -172,7 +172,6 @@ install_requires = \
>+@@ -174,7 +174,6 @@ install_requires = \
>   'pydantic>=1.7.4,<3',
>   'pymacaroons>=0.13.0',
>   'service-identity>=18.1.0',
>-- 
>2.44.0
>

Flags:

ashish: maintainer-approval?

Actions: View | Diff

Attachments on bug 276766: 248115 | 249137 | 249948 | 250009