View | Details | Raw Unified | Return to bug 270737 | Differences between
and this patch

Collapse All | Expand All

(-)b/net-im/py-matrix-synapse/Makefile (-56 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	matrix-synapse
1
PORTNAME=	matrix-synapse
2
DISTVERSION=	1.80.0
2
DISTVERSION=	1.81.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 64-124 CARGO_BUILD= no Link Here
64
CARGO_TEST=	no
64
CARGO_TEST=	no
65
CARGO_INSTALL=	no
65
CARGO_INSTALL=	no
66
CARGO_CARGOTOML=	${WRKSRC}/rust/Cargo.toml
66
CARGO_CARGOTOML=	${WRKSRC}/rust/Cargo.toml
67
CARGO_CRATES=	aho-corasick-0.7.19 \
68
		anyhow-1.0.70 \
69
		arc-swap-1.5.1 \
70
		autocfg-1.1.0 \
71
		bitflags-1.3.2 \
72
		blake2-0.10.6 \
73
		block-buffer-0.10.3 \
74
		cfg-if-1.0.0 \
75
		crypto-common-0.1.6 \
76
		digest-0.10.5 \
77
		generic-array-0.14.6 \
78
		hex-0.4.3 \
79
		indoc-1.0.7 \
80
		itoa-1.0.4 \
81
		lazy_static-1.4.0 \
82
		libc-0.2.135 \
83
		lock_api-0.4.9 \
84
		log-0.4.17 \
85
		memchr-2.5.0 \
86
		memoffset-0.6.5 \
87
		once_cell-1.15.0 \
88
		parking_lot-0.12.1 \
89
		parking_lot_core-0.9.3 \
90
		proc-macro2-1.0.52 \
91
		pyo3-0.17.3 \
92
		pyo3-build-config-0.17.3 \
93
		pyo3-ffi-0.17.3 \
94
		pyo3-log-0.8.1 \
95
		pyo3-macros-0.17.3 \
96
		pyo3-macros-backend-0.17.3 \
97
		pythonize-0.17.0 \
98
		quote-1.0.26 \
99
		redox_syscall-0.2.16 \
100
		regex-1.7.1 \
101
		regex-syntax-0.6.27 \
102
		ryu-1.0.11 \
103
		scopeguard-1.1.0 \
104
		serde-1.0.157 \
105
		serde_derive-1.0.157 \
106
		serde_json-1.0.94 \
107
		smallvec-1.10.0 \
108
		subtle-2.4.1 \
109
		syn-1.0.104 \
110
		syn-2.0.2 \
111
		target-lexicon-0.12.4 \
112
		typenum-1.15.0 \
113
		unicode-ident-1.0.5 \
114
		unindent-0.1.10 \
115
		version_check-0.9.4 \
116
		windows-sys-0.36.1 \
117
		windows_aarch64_msvc-0.36.1 \
118
		windows_i686_gnu-0.36.1 \
119
		windows_i686_msvc-0.36.1 \
120
		windows_x86_64_gnu-0.36.1 \
121
		windows_x86_64_msvc-0.36.1
122
67
123
SUB_FILES=	pkg-message log.config
68
SUB_FILES=	pkg-message log.config
124
SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS}
69
SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS}
(-)b/net-im/py-matrix-synapse/Makefile.crates (+55 lines)
Added Link Here
1
CARGO_CRATES=	aho-corasick-0.7.19 \
2
		anyhow-1.0.70 \
3
		arc-swap-1.5.1 \
4
		autocfg-1.1.0 \
5
		bitflags-1.3.2 \
6
		blake2-0.10.6 \
7
		block-buffer-0.10.3 \
8
		cfg-if-1.0.0 \
9
		crypto-common-0.1.6 \
10
		digest-0.10.5 \
11
		generic-array-0.14.6 \
12
		hex-0.4.3 \
13
		indoc-1.0.7 \
14
		itoa-1.0.4 \
15
		lazy_static-1.4.0 \
16
		libc-0.2.135 \
17
		lock_api-0.4.9 \
18
		log-0.4.17 \
19
		memchr-2.5.0 \
20
		memoffset-0.6.5 \
21
		once_cell-1.15.0 \
22
		parking_lot-0.12.1 \
23
		parking_lot_core-0.9.3 \
24
		proc-macro2-1.0.52 \
25
		pyo3-0.17.3 \
26
		pyo3-build-config-0.17.3 \
27
		pyo3-ffi-0.17.3 \
28
		pyo3-log-0.8.1 \
29
		pyo3-macros-0.17.3 \
30
		pyo3-macros-backend-0.17.3 \
31
		pythonize-0.17.0 \
32
		quote-1.0.26 \
33
		redox_syscall-0.2.16 \
34
		regex-1.7.3 \
35
		regex-syntax-0.6.29 \
36
		ryu-1.0.11 \
37
		scopeguard-1.1.0 \
38
		serde-1.0.159 \
39
		serde_derive-1.0.159 \
40
		serde_json-1.0.95 \
41
		smallvec-1.10.0 \
42
		subtle-2.4.1 \
43
		syn-1.0.104 \
44
		syn-2.0.10 \
45
		target-lexicon-0.12.4 \
46
		typenum-1.15.0 \
47
		unicode-ident-1.0.5 \
48
		unindent-0.1.10 \
49
		version_check-0.9.4 \
50
		windows-sys-0.36.1 \
51
		windows_aarch64_msvc-0.36.1 \
52
		windows_i686_gnu-0.36.1 \
53
		windows_i686_msvc-0.36.1 \
54
		windows_x86_64_gnu-0.36.1 \
55
		windows_x86_64_msvc-0.36.1
(-)b/net-im/py-matrix-synapse/distinfo (-15 / +15 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1680052681
1
TIMESTAMP = 1682112983
2
SHA256 (matrix_synapse-1.80.0.tar.gz) = 16c6df16dfa0d3061bfd9ebee8b6e6935756d35cee32f08ffd831db4624cf031
2
SHA256 (matrix_synapse-1.81.0.tar.gz) = 28074fe1f3cabcaa97004a4c625416d48875ca22b8729b515cbe006dc43696cf
3
SIZE (matrix_synapse-1.80.0.tar.gz) = 3167250
3
SIZE (matrix_synapse-1.81.0.tar.gz) = 3184130
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.70.crate) = 7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4
Lines 67-94 SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554 Link Here
67
SIZE (rust/crates/quote-1.0.26.crate) = 28397
67
SIZE (rust/crates/quote-1.0.26.crate) = 28397
68
SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
68
SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
69
SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
69
SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
70
SHA256 (rust/crates/regex-1.7.1.crate) = 48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733
70
SHA256 (rust/crates/regex-1.7.3.crate) = 8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d
71
SIZE (rust/crates/regex-1.7.1.crate) = 239648
71
SIZE (rust/crates/regex-1.7.3.crate) = 239886
72
SHA256 (rust/crates/regex-syntax-0.6.27.crate) = a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244
72
SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
73
SIZE (rust/crates/regex-syntax-0.6.27.crate) = 297300
73
SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
74
SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
74
SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
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.157.crate) = 707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca
78
SHA256 (rust/crates/serde-1.0.159.crate) = 3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065
79
SIZE (rust/crates/serde-1.0.157.crate) = 77012
79
SIZE (rust/crates/serde-1.0.159.crate) = 77014
80
SHA256 (rust/crates/serde_derive-1.0.157.crate) = 78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5
80
SHA256 (rust/crates/serde_derive-1.0.159.crate) = 4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585
81
SIZE (rust/crates/serde_derive-1.0.157.crate) = 54958
81
SIZE (rust/crates/serde_derive-1.0.159.crate) = 55039
82
SHA256 (rust/crates/serde_json-1.0.94.crate) = 1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea
82
SHA256 (rust/crates/serde_json-1.0.95.crate) = d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744
83
SIZE (rust/crates/serde_json-1.0.94.crate) = 144406
83
SIZE (rust/crates/serde_json-1.0.95.crate) = 144618
84
SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
84
SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
85
SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
85
SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
86
SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
86
SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
87
SIZE (rust/crates/subtle-2.4.1.crate) = 12630
87
SIZE (rust/crates/subtle-2.4.1.crate) = 12630
88
SHA256 (rust/crates/syn-1.0.104.crate) = 4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce
88
SHA256 (rust/crates/syn-1.0.104.crate) = 4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce
89
SIZE (rust/crates/syn-1.0.104.crate) = 236683
89
SIZE (rust/crates/syn-1.0.104.crate) = 236683
90
SHA256 (rust/crates/syn-2.0.2.crate) = 59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045
90
SHA256 (rust/crates/syn-2.0.10.crate) = 5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40
91
SIZE (rust/crates/syn-2.0.2.crate) = 240038
91
SIZE (rust/crates/syn-2.0.10.crate) = 240095
92
SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1
92
SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1
93
SIZE (rust/crates/target-lexicon-0.12.4.crate) = 23020
93
SIZE (rust/crates/target-lexicon-0.12.4.crate) = 23020
94
SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987
94
SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987
(-)b/net-im/py-matrix-synapse/files/patch-pyproject.toml (-34 / +6 lines)
Lines 1-38 Link Here
1
--- pyproject.toml.orig	2023-03-28 10:30:20 UTC
1
--- pyproject.toml.orig	2023-04-21 21:40:26 UTC
2
+++ pyproject.toml
2
+++ pyproject.toml
3
@@ -156,7 +156,7 @@ jsonschema = ">=3.0.0"
3
@@ -219,7 +219,6 @@ pydantic = ">=1.7.4"
4
 # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
4
 # needed.
5
 # We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this
5
 setuptools_rust = ">=1.3"
6
 # because frozendict has been more trouble than it's worth; we would like to move to immutabledict.
7
-frozendict = ">=1,!=2.1.2,<2.3.5"
8
+frozendict = ">=1"
9
 # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0
10
 unpaddedbase64 = ">=2.1.0"
11
 # We require 1.5.0 to work around an issue when running against the C implementation of
12
@@ -199,7 +199,7 @@ bleach = ">=1.4.3"
13
 typing-extensions = ">=3.10.0.1"
14
 # We enforce that we have a `cryptography` version that bundles an `openssl`
15
 # with the latest security patches.
16
-cryptography = ">=3.4.7"
17
+cryptography = "*"
18
 # ijson 3.1.4 fixes a bug with "." in property names
19
 ijson = ">=3.1.4"
20
 matrix-common = "^1.3.0"
21
@@ -210,17 +210,6 @@ packaging = ">=16.1"
22
 importlib_metadata = { version = ">=1.4", python = "<3.8" }
23
 # This is the most recent version of Pydantic with available on common distros.
24
 pydantic = ">=1.7.4"
25
-
26
-# This is for building the rust components during "poetry install", which
27
-# currently ignores the `build-system.requires` directive (c.f.
28
-# https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
29
-# `poetry build` do the right thing without this explicit dependency.
30
-#
31
-# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
32
-# but the alternative is to add it to the main list of deps where it isn't
33
-# needed.
34
-setuptools_rust = ">=1.3"
35
-
36
 
6
 
7
-
37
 # Optional Dependencies
8
 # Optional Dependencies
38
 # ---------------------
9
 # ---------------------
10
 matrix-synapse-ldap3 = { version = ">=0.1", optional = true }
(-)b/net-im/py-matrix-synapse/files/patch-setup.py (-13 / +1 lines)
Lines 1-16 Link Here
1
--- setup.py.orig	1970-01-01 00:00:00 UTC
1
--- setup.py.orig	2023-04-21 21:41:33 UTC
2
+++ setup.py
2
+++ setup.py
3
@@ -154,8 +154,8 @@ install_requires = \
4
  'bcrypt>=3.1.7',
5
  'bleach>=1.4.3',
6
  'canonicaljson>=1.5.0,<2.0.0',
7
- 'cryptography>=3.4.7',
8
- 'frozendict>=1,!=2.1.2,<2.3.5',
9
+ 'cryptography',
10
+ 'frozendict>=1',
11
  'ijson>=3.1.4',
12
  'jsonschema>=3.0.0',
13
  'matrix-common>=1.3.0,<2.0.0',
14
@@ -170,7 +170,6 @@ install_requires = \
3
@@ -170,7 +170,6 @@ install_requires = \
15
  'pydantic>=1.7.4',
4
  'pydantic>=1.7.4',
16
  'pymacaroons>=0.13.0',
5
  'pymacaroons>=0.13.0',
17
- 

Return to bug 270737