git: df613bcdc2f2 - main - mail/stalwart016: Fix fetch of the OpenTelemetry fork

From: Oleksii Samorukov <samm_at_FreeBSD.org>
Date: Sat, 14 Nov 2026 16:12:58 UTC
The branch main has been updated by samm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df613bcdc2f2890b9ffabb13279638b022741b1c

commit df613bcdc2f2890b9ffabb13279638b022741b1c
Author:     Oleksii Samorukov <samm@FreeBSD.org>
AuthorDate: 2026-11-14 16:12:10 +0000
Commit:     Oleksii Samorukov <samm@FreeBSD.org>
CommitDate: 2026-11-14 16:12:49 +0000

    mail/stalwart016: Fix fetch of the OpenTelemetry fork
    
    Stalwart 0.16.27 pins OpenTelemetry to commit ae66e97b of the
    stalwartlabs/opentelemetry-rust fork, which upstream has deleted, so
    the distfile can no longer be fetched. The commit is still available
    from the parent repository open-telemetry/opentelemetry-rust, and the
    tarball is byte-identical (same SHA256 and size).
    
    PR: 300642
---
 mail/stalwart016/Makefile        | 6 ++++++
 mail/stalwart016/Makefile.crates | 2 +-
 mail/stalwart016/distinfo        | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mail/stalwart016/Makefile b/mail/stalwart016/Makefile
index 6b95100173e8..3438d279bb6c 100644
--- a/mail/stalwart016/Makefile
+++ b/mail/stalwart016/Makefile
@@ -77,6 +77,12 @@ SQLITE_VARS=		CARGO_FEATURES+=sqlite
 USERS=	stalwart
 GROUPS=	stalwart
 
+# The stalwartlabs/opentelemetry-rust fork was deleted upstream; the pinned
+# commit is still available from the parent repository.
+post-patch:
+	@${REINPLACE_CMD} 's|stalwartlabs/opentelemetry-rust|open-telemetry/opentelemetry-rust|' \
+		${WRKSRC}/Cargo.lock ${WRKSRC}/crates/common/Cargo.toml
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}/var/db/stalwart
diff --git a/mail/stalwart016/Makefile.crates b/mail/stalwart016/Makefile.crates
index 31d13df97745..eeab8e8214e9 100644
--- a/mail/stalwart016/Makefile.crates
+++ b/mail/stalwart016/Makefile.crates
@@ -900,5 +900,5 @@ CARGO_CRATES=	RustyXML-0.3.0 \
 		zstd-safe-7.3.0 \
 		zstd-sys-2.1.1+zstd.1.5.7 \
 		zxcvbn-3.1.1 \
-		opentelemetry,opentelemetry-http,opentelemetry-otlp,opentelemetry-proto,opentelemetry-semantic-conventions,opentelemetry_sdk@git+https://github.com/stalwartlabs/opentelemetry-rust\#ae66e97b140f70e477ab710686aafce665cc2f8b \
+		opentelemetry,opentelemetry-http,opentelemetry-otlp,opentelemetry-proto,opentelemetry-semantic-conventions,opentelemetry_sdk@git+https://github.com/open-telemetry/opentelemetry-rust\#ae66e97b140f70e477ab710686aafce665cc2f8b \
 		hickory-net,hickory-proto,hickory-resolver@git+https://github.com/stalwartlabs/hickory-dns?branch=stalwart%2F0.26\#f8b92b17fa6c7d09a6959672592106ca1410937b
diff --git a/mail/stalwart016/distinfo b/mail/stalwart016/distinfo
index 276f1cfd94dc..e23925611c14 100644
--- a/mail/stalwart016/distinfo
+++ b/mail/stalwart016/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1792354354
+TIMESTAMP = 1794288165
 SHA256 (rust/crates/RustyXML-0.3.0.crate) = 8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5
 SIZE (rust/crates/RustyXML-0.3.0.crate) = 17517
 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa
@@ -1803,8 +1803,8 @@ SHA256 (rust/crates/zstd-sys-2.1.1+zstd.1.5.7.crate) = aeec9eaf2dffbbd09201e23bd
 SIZE (rust/crates/zstd-sys-2.1.1+zstd.1.5.7.crate) = 785210
 SHA256 (rust/crates/zxcvbn-3.1.1.crate) = f9eaee90f4a795d1eb4ba6c51e1c1721d4784d550e8efa7b2600f29c867365e0
 SIZE (rust/crates/zxcvbn-3.1.1.crate) = 436261
-SHA256 (stalwartlabs-opentelemetry-rust-ae66e97b140f70e477ab710686aafce665cc2f8b_GH0.tar.gz) = cc9d74ba518d6ee6812d5032e68a9f8d9f9355a20f192af73fb15b002f1ff121
-SIZE (stalwartlabs-opentelemetry-rust-ae66e97b140f70e477ab710686aafce665cc2f8b_GH0.tar.gz) = 818388
+SHA256 (open-telemetry-opentelemetry-rust-ae66e97b140f70e477ab710686aafce665cc2f8b_GH0.tar.gz) = cc9d74ba518d6ee6812d5032e68a9f8d9f9355a20f192af73fb15b002f1ff121
+SIZE (open-telemetry-opentelemetry-rust-ae66e97b140f70e477ab710686aafce665cc2f8b_GH0.tar.gz) = 818388
 SHA256 (stalwartlabs-hickory-dns-f8b92b17fa6c7d09a6959672592106ca1410937b_GH0.tar.gz) = 8547de14919de6ef6c8221f19affc6f216fa1a80ad1bcf2144830a3acbd9df96
 SIZE (stalwartlabs-hickory-dns-f8b92b17fa6c7d09a6959672592106ca1410937b_GH0.tar.gz) = 1684811
 SHA256 (stalwartlabs-stalwart-v0.16.27_GH0.tar.gz) = 24f7e8aa8e35cd985c1c66a74b7aaa072f773397293a8473159be78e7815321e