Attachment #242637 for bug #271787

Lines 1-5 Link Here

(-)b/net-im/py-matrix-synapse/Makefile (-2 / +2 lines)
1	PORTNAME= matrix-synapse	1	PORTNAME= matrix-synapse
2	DISTVERSION= 1.82.0	2	DISTVERSION= 1.85.0
3	CATEGORIES= net-im python	3	CATEGORIES= net-im python
4	MASTER_SITES= PYPI	4	MASTER_SITES= PYPI
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 12-18 WWW= https://www.matrix.org Link Here
12	LICENSE= APACHE20	12	LICENSE= APACHE20
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} \	15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.6.0:devel/py-poetry-core@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3:devel/py-setuptools-rust@${PY_FLAVOR}	16	${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3:devel/py-setuptools-rust@${PY_FLAVOR}
17		17
18	# Keep the RUN_DEPENDS layout similar to the pyproject.toml file	18	# Keep the RUN_DEPENDS layout similar to the pyproject.toml file




CARGO_CRATES=	aho-corasick-0.7.19 \
		anyhow-1.0.71 \
		arc-swap-1.5.1 \
		autocfg-1.1.0 \
		bitflags-1.3.2 \

		lazy_static-1.4.0 \
		libc-0.2.135 \
		lock_api-0.4.9 \
		log-0.4.18 \
		memchr-2.5.0 \
		memoffset-0.6.5 \
		once_cell-1.15.0 \

		regex-syntax-0.6.29 \
		ryu-1.0.11 \
		scopeguard-1.1.0 \
		serde-1.0.163 \
		serde_derive-1.0.163 \
		serde_json-1.0.96 \
		smallvec-1.10.0 \
		subtle-2.4.1 \




TIMESTAMP = 1686046860
SHA256 (matrix_synapse-1.85.0.tar.gz) = a88850c699cb1266fba54cd2547476a34540ab9c7bcabdcedda55b48e47c29d0
SIZE (matrix_synapse-1.85.0.tar.gz) = 3199174
SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e
SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070
SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8
SIZE (rust/crates/anyhow-1.0.71.crate) = 43808
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

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.18.crate) = 518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de
SIZE (rust/crates/log-0.4.18.crate) = 38339
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

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.163.crate) = 2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2
SIZE (rust/crates/serde-1.0.163.crate) = 77030
SHA256 (rust/crates/serde_derive-1.0.163.crate) = 8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e
SIZE (rust/crates/serde_derive-1.0.163.crate) = 54447
SHA256 (rust/crates/serde_json-1.0.96.crate) = 057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1
SIZE (rust/crates/serde_json-1.0.96.crate) = 144652
SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0




--- pyproject.toml.orig	2023-05-09 16:38:29 UTC
+++ pyproject.toml
@@ -209,17 +209,6 @@ importlib_metadata = { version = ">=1.4", python = "<3
 # This is the most recent version of Pydantic with available on common distros.
 pydantic = ">=1.7.4"
 
-# This is for building the rust components during "poetry install", which
-# currently ignores the `build-system.requires` directive (c.f.
-# https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
-# `poetry build` do the right thing without this explicit dependency.
-#
-# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
-# but the alternative is to add it to the main list of deps where it isn't
-# needed.
-setuptools_rust = ">=1.3"
-
-
 # Optional Dependencies
 # ---------------------

Lines 1-6 Link Here

(-)b/net-im/py-matrix-synapse/files/patch-setup.py (-3 / +2 lines)
1	--- setup.py.orig 2023-04-21 21:41:33 UTC	1	--- setup.py.orig 1970-01-01 00:00:00 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -170,7 +170,6 @@ install_requires = \	3	@@ -169,7 +169,6 @@ install_requires = \
4	'pydantic>=1.7.4',	4	'pydantic>=1.7.4',
5	'pymacaroons>=0.13.0',	5	'pymacaroons>=0.13.0',
6	'service-identity>=18.1.0',	6	'service-identity>=18.1.0',
7	-

Return to bug 271787

Lines 1-5 Link Here

(-)b/net-im/py-matrix-synapse/Makefile.crates (-4 / +4 lines)
1	CARGO_CRATES= aho-corasick-0.7.19 \	1	CARGO_CRATES= aho-corasick-0.7.19 \
2	anyhow-1.0.70 \	2	anyhow-1.0.71 \
3	arc-swap-1.5.1 \	3	arc-swap-1.5.1 \
4	autocfg-1.1.0 \	4	autocfg-1.1.0 \
5	bitflags-1.3.2 \	5	bitflags-1.3.2 \
Lines 15-21 CARGO_CRATES= aho-corasick-0.7.19 \ Link Here
15	lazy_static-1.4.0 \	15	lazy_static-1.4.0 \
16	libc-0.2.135 \	16	libc-0.2.135 \
17	lock_api-0.4.9 \	17	lock_api-0.4.9 \
18	log-0.4.17 \	18	log-0.4.18 \
19	memchr-2.5.0 \	19	memchr-2.5.0 \
20	memoffset-0.6.5 \	20	memoffset-0.6.5 \
21	once_cell-1.15.0 \	21	once_cell-1.15.0 \
Lines 35-42 CARGO_CRATES= aho-corasick-0.7.19 \ Link Here
35	regex-syntax-0.6.29 \	35	regex-syntax-0.6.29 \
36	ryu-1.0.11 \	36	ryu-1.0.11 \
37	scopeguard-1.1.0 \	37	scopeguard-1.1.0 \
38	serde-1.0.160 \	38	serde-1.0.163 \
39	serde_derive-1.0.160 \	39	serde_derive-1.0.163 \
40	serde_json-1.0.96 \	40	serde_json-1.0.96 \
41	smallvec-1.10.0 \	41	smallvec-1.10.0 \
42	subtle-2.4.1 \	42	subtle-2.4.1 \

Lines 1-10 Link Here

(-)b/net-im/py-matrix-synapse/distinfo (-11 / +11 lines)
1	TIMESTAMP = 1682497261	1	TIMESTAMP = 1686046860
2	SHA256 (matrix_synapse-1.82.0.tar.gz) = 593a72fbb6d18100a6dc837aa8420128ebdd32ffd77a9c2daaf4eb550a6358e7	2	SHA256 (matrix_synapse-1.85.0.tar.gz) = a88850c699cb1266fba54cd2547476a34540ab9c7bcabdcedda55b48e47c29d0
3	SIZE (matrix_synapse-1.82.0.tar.gz) = 3158269	3	SIZE (matrix_synapse-1.85.0.tar.gz) = 3199174
4	SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e	4	SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e
5	SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070	5	SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070
6	SHA256 (rust/crates/anyhow-1.0.70.crate) = 7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4	6	SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8
7	SIZE (rust/crates/anyhow-1.0.70.crate) = 43803	7	SIZE (rust/crates/anyhow-1.0.71.crate) = 43808
8	SHA256 (rust/crates/arc-swap-1.5.1.crate) = 983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164	8	SHA256 (rust/crates/arc-swap-1.5.1.crate) = 983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164
9	SIZE (rust/crates/arc-swap-1.5.1.crate) = 66157	9	SIZE (rust/crates/arc-swap-1.5.1.crate) = 66157
10	SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa	10	SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
Lines 35-42 SHA256 (rust/crates/libc-0.2.135.crate) = 68783febc7782c6c5cb401fbda4de5a9898be1 Link Here
35	SIZE (rust/crates/libc-0.2.135.crate) = 604591	35	SIZE (rust/crates/libc-0.2.135.crate) = 604591
36	SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df	36	SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df
37	SIZE (rust/crates/lock_api-0.4.9.crate) = 25685	37	SIZE (rust/crates/lock_api-0.4.9.crate) = 25685
38	SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e	38	SHA256 (rust/crates/log-0.4.18.crate) = 518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de
39	SIZE (rust/crates/log-0.4.17.crate) = 38028	39	SIZE (rust/crates/log-0.4.18.crate) = 38339
40	SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d	40	SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
41	SIZE (rust/crates/memchr-2.5.0.crate) = 65812	41	SIZE (rust/crates/memchr-2.5.0.crate) = 65812
42	SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce	42	SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
Lines 75-84 SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66e Link Here
75	SIZE (rust/crates/ryu-1.0.11.crate) = 47007	75	SIZE (rust/crates/ryu-1.0.11.crate) = 47007
76	SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd	76	SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
77	SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470	77	SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
78	SHA256 (rust/crates/serde-1.0.160.crate) = bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c	78	SHA256 (rust/crates/serde-1.0.163.crate) = 2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2
79	SIZE (rust/crates/serde-1.0.160.crate) = 77010	79	SIZE (rust/crates/serde-1.0.163.crate) = 77030
80	SHA256 (rust/crates/serde_derive-1.0.160.crate) = 291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df	80	SHA256 (rust/crates/serde_derive-1.0.163.crate) = 8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e
81	SIZE (rust/crates/serde_derive-1.0.160.crate) = 55081	81	SIZE (rust/crates/serde_derive-1.0.163.crate) = 54447
82	SHA256 (rust/crates/serde_json-1.0.96.crate) = 057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1	82	SHA256 (rust/crates/serde_json-1.0.96.crate) = 057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1
83	SIZE (rust/crates/serde_json-1.0.96.crate) = 144652	83	SIZE (rust/crates/serde_json-1.0.96.crate) = 144652
84	SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0	84	SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0

Lines 1-9 Link Here

(-)b/net-im/py-matrix-synapse/files/patch-pyproject.toml (-4 / +14 lines)
1	--- pyproject.toml.orig 2023-04-21 21:40:26 UTC	1	--- pyproject.toml.orig 2023-05-09 16:38:29 UTC
2	+++ pyproject.toml	2	+++ pyproject.toml
3	@@ -219,7 +219,6 @@ pydantic = ">=1.7.4"	3	@@ -209,17 +209,6 @@ importlib_metadata = { version = ">=1.4", python = "<3
4	# needed.	4	# This is the most recent version of Pydantic with available on common distros.
5	setuptools_rust = ">=1.3"	5	pydantic = ">=1.7.4"
6		6
		7	-# This is for building the rust components during "poetry install", which
		8	-# currently ignores the `build-system.requires` directive (c.f.
		9	-# https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
		10	-# `poetry build` do the right thing without this explicit dependency.
		11	-#
		12	-# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
		13	-# but the alternative is to add it to the main list of deps where it isn't
		14	-# needed.
		15	-setuptools_rust = ">=1.3"
		16	-
7	-	17	-
8	# Optional Dependencies	18	# Optional Dependencies
9	# ---------------------	19	# ---------------------