This one remove the RDEP for setuptools_rust On 1/30/26 9:28 AM, Renaud Allard wrote:
On 1/30/26 9:26 AM, Landry Breuil wrote:Le Fri, Jan 30, 2026 at 09:13:05AM +0100, Renaud Allard a écrit :Hello, Here is a diff for net/synapse 1.146.0 The build type has changed since last update. I have been running it on amd64 for about 2 days. Tests are as usual: skips=416, failures=3, successes=4085 Best Regards-BUILD_DEPENDS += devel/py-setuptools-rust>=1.3.0 +BUILD_DEPENDS += devel/maturin \ + devel/py-setuptools-rust>=1.3.0i think that change isnt needed, per python.port.mk: . elif ${MODPY_PYBUILD} == maturin BUILD_DEPENDS += devel/maturinAh indeed, I forgot to remove it. Do I need to send you a new version?
? .claude
? synapse-1.146.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/synapse/Makefile,v
diff -u -p -r1.113 Makefile
--- Makefile 16 Dec 2025 07:53:06 -0000 1.113
+++ Makefile 30 Jan 2026 09:28:44 -0000
@@ -1,6 +1,6 @@
COMMENT = open network for secure, decentralized communication
-MODPY_DISTV = 1.144.0
+MODPY_DISTV = 1.146.0
GH_ACCOUNT = element-hq
GH_PROJECT = synapse
@@ -14,16 +14,16 @@ MAINTAINER = Renaud Allard <renaud@allar
# AGPLv3 only
PERMIT_PACKAGE = Yes
-MODULES = devel/cargo \
- lang/python
+MODULES = lang/python
WANTLIB += ${MODCARGO_WANTLIB} m
-MODPY_PYBUILD = poetry-core
+MODPY_PYBUILD = maturin
MODCARGO_BUILD = No
MODCARGO_INSTALL = No
MODCARGO_TEST = No
+MODCARGO_CARGOTOML = ${WRKSRC}/rust/Cargo.toml
MAKE_ENV += ${MODCARGO_ENV}
@@ -67,20 +67,23 @@ RUN_DEPENDS += devel/py-setuptools
# optional section
RUN_DEPENDS += textproc/py-lxml
# not listed but used in some scripts/ files
-RUN_DEPENDS += www/py-requests
+RUN_DEPENDS += www/py-requests \
+ devel/py-parsing
+
TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
devel/py-mock \
devel/py-parameterized \
+ devel/py-parsing \
+ devel/py-pyrsistent \
www/py-jwt
do-configure:
@${MODCARGO_configure}
-# this symlink makes sure that the rust library is found, since by default the source is used to run the tests
-# another option would be to rm -Rf ${WRKSRC}/synapse/ to make sure the one under build/ is used
+# remove source synapse directory so tests use the installed package from fake
pre-test:
- ln -sf ${WRKSRC}/build/lib.openbsd-${OSREV}-${ARCH}-cpython-${MODPY_MAJORMINOR}/synapse/synapse_rust.abi3.so ${WRKSRC}/synapse/
+ rm -rf ${WRKSRC}/synapse
do-test:
cd ${MODPY_TEST_DIR} && ${SETENV} ${ALL_TEST_ENV} ${MODPY_BIN} -m twisted.trial tests
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/synapse/distinfo,v
diff -u -p -r1.85 distinfo
--- distinfo 16 Dec 2025 07:53:06 -0000 1.85
+++ distinfo 30 Jan 2026 09:28:44 -0000
@@ -71,7 +71,7 @@ SHA256 (cargo/lazy_static-1.5.0.tar.gz)
SHA256 (cargo/libc-0.2.174.tar.gz) = EXFpMpMJmZLhnN3qTouEmWTphG9KzuEbOUi8wze+h3Y=
SHA256 (cargo/libm-0.2.15.tar.gz) = +fu8q1EFL+EE615dNRz3KNMKW+H+FNm+ijsJdIH7l94=
SHA256 (cargo/litemap-0.8.0.tar.gz) = JB6u9f0SyIcFoB/BBmxIxLNuDdQ3fc3H7DlCzqemmVY=
-SHA256 (cargo/log-0.4.28.tar.gz) = NAgFBe+o5FpLgWw0lSXr4yfOqoVZdW8DVsupfvO/dDI=
+SHA256 (cargo/log-0.4.29.tar.gz) = XlAy4kAZBFx2LTwPKPW2uLvzhWOmWQg4m/eXh1iSCJc=
SHA256 (cargo/lru-slab-0.1.2.tar.gz) = ESs5zsCymLbBmZ/uPjFCf3T2duTLmHntGhIbQ2YaQVQ=
SHA256 (cargo/memchr-2.7.5.tar.gz) = MqKC2mX6rzgobPO+mDIT/PHS4qWHAOgI+D9OqaSAS8A=
SHA256 (cargo/memoffset-0.9.1.tar.gz) = SIAWv65FewNtmWCS9stEhndhHOREnpcM6vQmlSA/IYo=
@@ -104,7 +104,7 @@ SHA256 (cargo/rand_core-0.9.3.tar.gz) =
SHA256 (cargo/regex-1.12.2.tar.gz) = hDvAGR918+ImUa5fHnKTmrL3KkvDD6gKBmvWbt78JNQ=
SHA256 (cargo/regex-automata-0.4.13.tar.gz) = UnbK8lrIbI2BAiKz27k45RLFXGgxoQ8+btHJO4QEHxw=
SHA256 (cargo/regex-syntax-0.8.5.tar.gz) = KxXEMYa+Z6T9Y77lDQMDr//O84FJLr4sXYfzJOG4gVw=
-SHA256 (cargo/reqwest-0.12.24.tar.gz) = nQlGQQufewgqQn5O9cj/VBqIs1e8bGN8QNs6aKxwo28=
+SHA256 (cargo/reqwest-0.12.26.tar.gz) = O0wUstmvympgJ3CGsMxqauC1aPb3kWyUOozcefi+JA8=
SHA256 (cargo/ring-0.17.14.tar.gz) = pGiebCKU2B6I3GJhx2i2O8T824Ur5tE1JJixFPYTg7c=
SHA256 (cargo/rustc-hash-2.1.1.tar.gz) = NXcD1BNltLJ8WQ4+2R6rsbZj8HxMCECV5gy+1DYt/w0=
SHA256 (cargo/rustls-0.23.31.tar.gz) = wOvL0vA94PwRIq2bsksSelps1R1yYEo/PFCsRZditsw=
@@ -143,7 +143,7 @@ SHA256 (cargo/tokio-1.48.0.tar.gz) = /zY
SHA256 (cargo/tokio-rustls-0.26.2.tar.gz) = jnJ7NqGg6LdMN2rCIR5AwsivCftAE8YNkQSVgQ8Ajps=
SHA256 (cargo/tokio-util-0.7.15.tar.gz) = ZqU5qa1tXSgVENW9NoyXPWNsAtv4pnMAv7a5UGlq198=
SHA256 (cargo/tower-0.5.2.tar.gz) = 0DmtkVnJi3Ds/VQLJXO5f39Sw+jZ+K1XokuRalNpdfk=
-SHA256 (cargo/tower-http-0.6.6.tar.gz) = rcgv1z3iqXIqxdp0fxI4PSv9uTWR7mxYSG4Al4kPBfI=
+SHA256 (cargo/tower-http-0.6.8.tar.gz) = 1OZVnVPMJo5QMc2EKdBUFbxMtK78SqXWzDX79bkkofg=
SHA256 (cargo/tower-layer-0.3.3.tar.gz) = EhwqbNpGmAuw/NFkf/r2zT/HmgE94oh4KDb235xIeA4=
SHA256 (cargo/tower-service-0.3.3.tar.gz) = jfm24T8tMskbm9cZwA0ZWIN7x97EdNlJUnmMyOae7sM=
SHA256 (cargo/tracing-0.1.41.tar.gz) = eE4KxTXetFBFXL+iim8N8UXqG7euUbghz155J/3PvdA=
@@ -194,7 +194,7 @@ SHA256 (cargo/zeroize-1.8.1.tar.gz) = zt
SHA256 (cargo/zerotrie-0.2.2.tar.gz) = NvC71HhYP3ntrZeLQHkU9hspcvWvb6CJaGAWvo+a9ZU=
SHA256 (cargo/zerovec-0.11.2.tar.gz) = SgXrCA4BW6OcyeI7vl5/sE1fsEA1D5nzTjONX90pRCg=
SHA256 (cargo/zerovec-derive-0.11.1.tar.gz) = W5YjfvoMh4xkvYnENvZhvk5GsvPv8eu5dvfvIyHS9Y8=
-SHA256 (synapse-1.144.0.tar.gz) = XeLQz6oqcaxqHQD3m9b9gsLCDyIXwUNbS5Nc0/lJi7E=
+SHA256 (synapse-1.146.0.tar.gz) = d5Hw7kVlnuoZwFfLmgCpvB9R1xu4zDtM+hgLjNtOBDg=
SIZE (cargo/aho-corasick-1.1.3.tar.gz) = 183311
SIZE (cargo/anyhow-1.0.100.tar.gz) = 54059
SIZE (cargo/arc-swap-1.7.1.tar.gz) = 68512
@@ -268,7 +268,7 @@ SIZE (cargo/lazy_static-1.5.0.tar.gz) =
SIZE (cargo/libc-0.2.174.tar.gz) = 779933
SIZE (cargo/libm-0.2.15.tar.gz) = 156108
SIZE (cargo/litemap-0.8.0.tar.gz) = 34344
-SIZE (cargo/log-0.4.28.tar.gz) = 51131
+SIZE (cargo/log-0.4.29.tar.gz) = 51515
SIZE (cargo/lru-slab-0.1.2.tar.gz) = 9090
SIZE (cargo/memchr-2.7.5.tar.gz) = 97603
SIZE (cargo/memoffset-0.9.1.tar.gz) = 9032
@@ -301,7 +301,7 @@ SIZE (cargo/rand_core-0.9.3.tar.gz) = 24
SIZE (cargo/regex-1.12.2.tar.gz) = 163843
SIZE (cargo/regex-automata-0.4.13.tar.gz) = 625250
SIZE (cargo/regex-syntax-0.8.5.tar.gz) = 357541
-SIZE (cargo/reqwest-0.12.24.tar.gz) = 159974
+SIZE (cargo/reqwest-0.12.26.tar.gz) = 156458
SIZE (cargo/ring-0.17.14.tar.gz) = 1502610
SIZE (cargo/rustc-hash-2.1.1.tar.gz) = 14154
SIZE (cargo/rustls-0.23.31.tar.gz) = 371259
@@ -340,7 +340,7 @@ SIZE (cargo/tokio-1.48.0.tar.gz) = 84343
SIZE (cargo/tokio-rustls-0.26.2.tar.gz) = 31655
SIZE (cargo/tokio-util-0.7.15.tar.gz) = 124255
SIZE (cargo/tower-0.5.2.tar.gz) = 109417
-SIZE (cargo/tower-http-0.6.6.tar.gz) = 133515
+SIZE (cargo/tower-http-0.6.8.tar.gz) = 135827
SIZE (cargo/tower-layer-0.3.3.tar.gz) = 6180
SIZE (cargo/tower-service-0.3.3.tar.gz) = 6950
SIZE (cargo/tracing-0.1.41.tar.gz) = 82448
@@ -391,4 +391,4 @@ SIZE (cargo/zeroize-1.8.1.tar.gz) = 2002
SIZE (cargo/zerotrie-0.2.2.tar.gz) = 74423
SIZE (cargo/zerovec-0.11.2.tar.gz) = 124500
SIZE (cargo/zerovec-derive-0.11.1.tar.gz) = 21294
-SIZE (synapse-1.144.0.tar.gz) = 9204917
+SIZE (synapse-1.146.0.tar.gz) = 9234403
Index: modules.inc
===================================================================
RCS file: /cvs/ports/net/synapse/modules.inc,v
diff -u -p -r1.48 modules.inc
--- modules.inc 16 Dec 2025 07:53:06 -0000 1.48
+++ modules.inc 30 Jan 2026 09:28:44 -0000
@@ -71,7 +71,7 @@ MODCARGO_CRATES += lazy_static 1.5.0 # M
MODCARGO_CRATES += libc 0.2.174 # MIT OR Apache-2.0
MODCARGO_CRATES += libm 0.2.15 # MIT
MODCARGO_CRATES += litemap 0.8.0 # Unicode-3.0
-MODCARGO_CRATES += log 0.4.28 # MIT OR Apache-2.0
+MODCARGO_CRATES += log 0.4.29 # MIT OR Apache-2.0
MODCARGO_CRATES += lru-slab 0.1.2 # MIT OR Apache-2.0 OR Zlib
MODCARGO_CRATES += memchr 2.7.5 # Unlicense OR MIT
MODCARGO_CRATES += memoffset 0.9.1 # MIT
@@ -104,7 +104,7 @@ MODCARGO_CRATES += rand_core 0.9.3 # MIT
MODCARGO_CRATES += regex 1.12.2 # MIT OR Apache-2.0
MODCARGO_CRATES += regex-automata 0.4.13 # MIT OR Apache-2.0
MODCARGO_CRATES += regex-syntax 0.8.5 # MIT OR Apache-2.0
-MODCARGO_CRATES += reqwest 0.12.24 # MIT OR Apache-2.0
+MODCARGO_CRATES += reqwest 0.12.26 # MIT OR Apache-2.0
MODCARGO_CRATES += ring 0.17.14 # Apache-2.0 AND ISC
MODCARGO_CRATES += rustc-hash 2.1.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += rustls 0.23.31 # Apache-2.0 OR ISC OR MIT
@@ -143,7 +143,7 @@ MODCARGO_CRATES += tokio 1.48.0 # MIT
MODCARGO_CRATES += tokio-rustls 0.26.2 # MIT OR Apache-2.0
MODCARGO_CRATES += tokio-util 0.7.15 # MIT
MODCARGO_CRATES += tower 0.5.2 # MIT
-MODCARGO_CRATES += tower-http 0.6.6 # MIT
+MODCARGO_CRATES += tower-http 0.6.8 # MIT
MODCARGO_CRATES += tower-layer 0.3.3 # MIT
MODCARGO_CRATES += tower-service 0.3.3 # MIT
MODCARGO_CRATES += tracing 0.1.41 # MIT
Index: patches/patch-pyproject_toml
===================================================================
RCS file: patches/patch-pyproject_toml
diff -N patches/patch-pyproject_toml
--- patches/patch-pyproject_toml 16 Dec 2025 07:53:06 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-ndex: pyproject.toml
---- pyproject.toml.orig
-+++ pyproject.toml
-@@ -381,7 +381,7 @@ sqlglot = ">=28.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>=2.0.0,<=2.1.3", "setuptools_rust>=1.3,<=1.11.1"]
-+requires = ["poetry-core>=2.0.0", "setuptools_rust>=1.3"]
- build-backend = "poetry.core.masonry.api"
Index: patches/patch-synapse_util_check_dependencies_py
===================================================================
RCS file: patches/patch-synapse_util_check_dependencies_py
diff -N patches/patch-synapse_util_check_dependencies_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-synapse_util_check_dependencies_py 30 Jan 2026 09:28:44 -0000
@@ -0,0 +1,18 @@
+Fix setuptools-rust name comparison.
+
+The requirement name from METADATA is "setuptools-rust" (with hyphen),
+but the code compared against "setuptools_rust" (with underscore),
+so the skip logic never triggered.
+
+Index: synapse/util/check_dependencies.py
+--- synapse/util/check_dependencies.py.orig
++++ synapse/util/check_dependencies.py
+@@ -96,7 +96,7 @@ def _should_ignore_runtime_requirement(req: Requiremen
+ # In any case, workaround this by ignoring setuptools_rust here. (It might be
+ # slightly cleaner to put `setuptools_rust` in a `build` extra or similar, but for
+ # now let's do something quick and dirty.
+- if req.name == "setuptools_rust":
++ if req.name == "setuptools-rust":
+ return True
+ return False
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
diff -u -p -r1.73 PLIST
--- pkg/PLIST 16 Dec 2025 07:53:06 -0000 1.73
+++ pkg/PLIST 30 Jan 2026 09:28:44 -0000
@@ -135,6 +135,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}appservice.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}client_reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}client_reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}complement_fork_proxied_reactor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}complement_fork_proxied_reactor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}complement_fork_starter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}complement_fork_starter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}event_creator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -163,6 +165,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/app/admin_cmd.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/appservice.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/client_reader.py
+lib/python${MODPY_VERSION}/site-packages/synapse/app/complement_fork_proxied_reactor.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/complement_fork_starter.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/event_creator.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/federation_reader.py
@@ -2211,7 +2214,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/92/09_thread_subscriptions_update.sql.postgres
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/01_add_delayed_events.sql
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/02_sliding_sync_members.sql
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/03_sss_pos_last_used.sql
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/04_make_delayed_event_content_text.py
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/${MODPY_PYCACHE}04_make_delayed_event_content_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/93/${MODPY_PYCACHE}04_make_delayed_event_content_text.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/72/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/72/full.sql.postgres
smime.p7s
Description: S/MIME Cryptographic Signature
