Attachment 247023 Details for Bug 275417 – Update diff v2

[patch] Update diff v2

0001-net-im-py-matrix-synapse-Update-to-1.98.0.patch (text/plain), 11.42 KB, created by Ashish SHUKLA on 2023-12-13 09:24:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2023-12-13 09:24:10 UTC

Size: 11.42 KB

patch

obsolete

>From ea2e78718b5c538cdc0e597c0f9c0fe3597d130d Mon Sep 17 00:00:00 2001
>From: Ashish SHUKLA <ashish@FreeBSD.org>
>Date: Tue, 12 Dec 2023 17:57:29 +0000
>Subject: [PATCH] net-im/py-matrix-synapse: Update to 1.98.0
>
>---
> net-im/py-matrix-synapse/Makefile             |  5 +-
> net-im/py-matrix-synapse/Makefile.crates      | 26 ++++-----
> net-im/py-matrix-synapse/distinfo             | 58 +++++++++----------
> .../files/patch-pyproject.toml                |  9 ---
> 4 files changed, 44 insertions(+), 54 deletions(-)
>
>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index e7f3501e..2ea1e370 100644
>--- a/net-im/py-matrix-synapse/Makefile
>+++ b/net-im/py-matrix-synapse/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	matrix-synapse
>-DISTVERSION=	1.96.1
>-PORTREVISION=	2
>+DISTVERSION=	1.98.0
> CATEGORIES=	net-im python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +12,7 @@ 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} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.8.1: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} \
>diff --git a/net-im/py-matrix-synapse/Makefile.crates b/net-im/py-matrix-synapse/Makefile.crates
>index 9e9ac911..d131015e 100644
>--- a/net-im/py-matrix-synapse/Makefile.crates
>+++ b/net-im/py-matrix-synapse/Makefile.crates
>@@ -9,8 +9,9 @@ CARGO_CRATES=	aho-corasick-1.0.2 \
> 		crypto-common-0.1.6 \
> 		digest-0.10.5 \
> 		generic-array-0.14.6 \
>+		heck-0.4.1 \
> 		hex-0.4.3 \
>-		indoc-1.0.7 \
>+		indoc-2.0.4 \
> 		itoa-1.0.4 \
> 		lazy_static-1.4.0 \
> 		libc-0.2.135 \
>@@ -22,13 +23,13 @@ CARGO_CRATES=	aho-corasick-1.0.2 \
> 		parking_lot-0.12.1 \
> 		parking_lot_core-0.9.3 \
> 		proc-macro2-1.0.64 \
>-		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 \
>+		pyo3-0.20.0 \
>+		pyo3-build-config-0.20.0 \
>+		pyo3-ffi-0.20.0 \
>+		pyo3-log-0.9.0 \
>+		pyo3-macros-0.20.0 \
>+		pyo3-macros-backend-0.20.0 \
>+		pythonize-0.20.0 \
> 		quote-1.0.29 \
> 		redox_syscall-0.2.16 \
> 		regex-1.9.6 \
>@@ -36,17 +37,16 @@ CARGO_CRATES=	aho-corasick-1.0.2 \
> 		regex-syntax-0.7.5 \
> 		ryu-1.0.11 \
> 		scopeguard-1.1.0 \
>-		serde-1.0.190 \
>-		serde_derive-1.0.190 \
>-		serde_json-1.0.107 \
>+		serde-1.0.193 \
>+		serde_derive-1.0.193 \
>+		serde_json-1.0.108 \
> 		smallvec-1.10.0 \
> 		subtle-2.4.1 \
>-		syn-1.0.104 \
> 		syn-2.0.28 \
> 		target-lexicon-0.12.4 \
> 		typenum-1.15.0 \
> 		unicode-ident-1.0.5 \
>-		unindent-0.1.10 \
>+		unindent-0.2.3 \
> 		version_check-0.9.4 \
> 		windows-sys-0.36.1 \
> 		windows_aarch64_msvc-0.36.1 \
>diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
>index 6144041b..4409fd5a 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1700330179
>-SHA256 (matrix_synapse-1.96.1.tar.gz) = 3a0db6f4cd2bfeb882edc0fea6ae0fedaa3efcbff4124f87fefa25287054dd4e
>-SIZE (matrix_synapse-1.96.1.tar.gz) = 3319394
>+TIMESTAMP = 1702403918
>+SHA256 (matrix_synapse-1.98.0.tar.gz) = 02df99a2fec53777f76f2cbd275b4d13b719d67b9c2737188392a225fed5424f
>+SIZE (matrix_synapse-1.98.0.tar.gz) = 3340328
> 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
>@@ -23,10 +23,12 @@ SHA256 (rust/crates/digest-0.10.5.crate) = adfbc57365a37acbd2ebf2b64d7e69bb766e2
> SIZE (rust/crates/digest-0.10.5.crate) = 19503
> SHA256 (rust/crates/generic-array-0.14.6.crate) = bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9
> SIZE (rust/crates/generic-array-0.14.6.crate) = 15889
>+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
>+SIZE (rust/crates/heck-0.4.1.crate) = 11567
> SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
> SIZE (rust/crates/hex-0.4.3.crate) = 13299
>-SHA256 (rust/crates/indoc-1.0.7.crate) = adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3
>-SIZE (rust/crates/indoc-1.0.7.crate) = 13716
>+SHA256 (rust/crates/indoc-2.0.4.crate) = 1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8
>+SIZE (rust/crates/indoc-2.0.4.crate) = 14311
> SHA256 (rust/crates/itoa-1.0.4.crate) = 4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc
> SIZE (rust/crates/itoa-1.0.4.crate) = 10601
> SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
>@@ -49,20 +51,20 @@ 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.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/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/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/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/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
>@@ -77,18 +79,16 @@ SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66e
> 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.190.crate) = 91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7
>-SIZE (rust/crates/serde-1.0.190.crate) = 76455
>-SHA256 (rust/crates/serde_derive-1.0.190.crate) = 67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3
>-SIZE (rust/crates/serde_derive-1.0.190.crate) = 55676
>-SHA256 (rust/crates/serde_json-1.0.107.crate) = 6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65
>-SIZE (rust/crates/serde_json-1.0.107.crate) = 146458
>+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/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.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567
> SIZE (rust/crates/syn-2.0.28.crate) = 241635
> SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1
>@@ -97,8 +97,8 @@ SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99f
> SIZE (rust/crates/typenum-1.15.0.crate) = 40741
> SHA256 (rust/crates/unicode-ident-1.0.5.crate) = 6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3
> SIZE (rust/crates/unicode-ident-1.0.5.crate) = 35455
>-SHA256 (rust/crates/unindent-0.1.10.crate) = 58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112
>-SIZE (rust/crates/unindent-0.1.10.crate) = 7703
>+SHA256 (rust/crates/unindent-0.2.3.crate) = c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce
>+SIZE (rust/crates/unindent-0.2.3.crate) = 7306
> SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
> SIZE (rust/crates/version_check-0.9.4.crate) = 14895
> SHA256 (rust/crates/windows-sys-0.36.1.crate) = ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
>diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>index 5c134bfd..a2641882 100644
>--- a/net-im/py-matrix-synapse/files/patch-pyproject.toml
>+++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>@@ -18,12 +18,3 @@
>  # 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.8.0"]
>-+requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.8.1"]
>- build-backend = "poetry.core.masonry.api"
>- 
>- 
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 275417: 246647 | 247023