From nobody Mon Apr 6 15:12:14 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqCVS6yjmz6YBF5; Mon, 06 Apr 2026 15:12:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqCVS4h6Cz3t7X; Mon, 06 Apr 2026 15:12:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775488336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Lp9YDjRaXryoSQOhz54zd/c3/fZgsCuvgInPUe3F2Io=; b=V5S3o+aoX7DVu/ba8mieFEvk8m210VBZ307+CdBl3OZe4y4MawJrh4Fo9yKMkFW+FcvkW5 5o5hR3RB6asQg3RK0OTM+b02oW2AVCl2o+zQWAKihLfPT+gI7BwLJfT0SWlULX9+2HxH2X CL7sXZvxVytJUvontpWbIU4LlTgoCpGMebbxnn2j9UYguQIGzXkmMoWyBAdvemEV8CDSIZ uNuYbAO5XTsM5K9m5Ixwy7aEoIt/yq29tgmjPvLfzTcViICh11DhOTm/pYqxTgYu+oFTR9 ZNg1CBUF/9G4CGtLNgMTexyhZW0lP9oP7zoSMXABMMx9CL3N+oP9QaE7COYWZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775488336; a=rsa-sha256; cv=none; b=NXp5NbRKdvCUEUrmPFChak6LVxqrzms6HrL9IJ0VqRjN/2IK3rO5B22xKostfM3xgErZUa Kp8muRhPDS98XFEd34lxYjn3CQnHIsYrCueiRio1PwG0WZKF8A2vvPJh3bBe8PQ6OnwC5H MdXmM0wlrYi8H+dHxtQL1do/X5rJEDMBRgOCTyb9DxMlSsTBRxD5YYCiU7b3Ki70nEy0Po Wa+vR+fykfISXmm8Bt3rpwFLdmpK89sfiA0BYRsluOG4Zlt9Y/u6MNGGKN6if3S6fznCJb vbVLYQVGg5+gzVyXpHRHSmzUalOacjSHxcY7o/XYCtjlXorxQJtQSa9Ne0rzvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775488336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Lp9YDjRaXryoSQOhz54zd/c3/fZgsCuvgInPUe3F2Io=; b=dRi+0xay3ZKcJswicEARIf8X34L7ciWK1e+PhxfXM/qF+cx1EW/VDKgfZZFPoQRpnCJU3i 0MInGA1+qLjeR5kcyud3FwZKuPql+AUeLkj6RiIt3448sIdYBUMnGf167MypmbZDEUWOlZ q/T5f6P80kT/PVSiwIF8b453GMeckxcLU4Soa/KDZY/h8psNgP0qpBdh1/QXzvZ/JtXqHC /5eZkhCIgX3bXkAg8ZA1Cbev7aZxKVjID13pOd1UN66RgkBMyFILWiQvu4JbAVhGixNSCB jPK8iHbinysNvp3zVHWUpMtWvgl48xXz2Ab+hm0iBK9nk3eIW91pEk1AD+JNNg== Received: from [2a05:3580:e727:cd00::10:0] (unknown [IPv6:2a05:3580:e727:cd00:6028:73dc:5e69:9ca0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: fluffy) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fqCVR715yz1983; Mon, 06 Apr 2026 15:12:15 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Date: Mon, 6 Apr 2026 18:12:14 +0300 From: Dima Panov To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org, Daniel Engberg Message-ID: <28b58316-b472-4cba-a458-1deae223a455@FreeBSD.org> In-Reply-To: <69d3acd9.315eb.2e00dff0@gitrepo.freebsd.org> References: <69d3acd9.315eb.2e00dff0@gitrepo.freebsd.org> Subject: git: 4211f99a216d - main - security/libssh: Mark BROKEN on 15+ and add backup for MASTER_SITES List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="69d3cd4e_6b8b4567_d40a" --69d3cd4e_6b8b4567_d40a Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello! There is another solution -- force check for openssl 3.6 to enable ML-KEM extension diff --git a/security/libssh/Makefile b/security/libssh/Makefile index cbec0cfe7b..2f1224e3be 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -67,6 +68,10 @@ OPENSSL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenSSL OPENSSL_USES= ssl STATIC_CMAKE_BOOL= BUILD_STATIC_LIB +post-patch: + ${REINPLACE_CMD} -e '/OPENSSL_VERSION/s,3.5.0,3.6.0,g' \ + ${WRKSRC}/ConfigureChecks.cmake + post-install-STATIC-on: ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/ On 06.04.2026 15:53, Daniel Engberg wrote: > The branch main has been updated by diizzy: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=4211f99a216d4f440b3b804a1e6db475087e3ed2 > > commit 4211f99a216d4f440b3b804a1e6db475087e3ed2 > Author: Daniel Engberg > AuthorDate: 2026-04-06 12:45:14 +0000 > Commit: Daniel Engberg > CommitDate: 2026-04-06 12:53:21 +0000 > > security/libssh: Mark BROKEN on 15+ and add backup for MASTER_SITES > > Fails to build on 15+, > src/mlkem_crypto.c:31:10: fatal error: 'openssl/ml_kem.h' file not found > > Add temporary backup for MASTER_SITES to avoid build failures on other > versions and of consumers as main upstream site current truncates > downloads > > Thanks to eduardo@ for verifying build issues on -CURRENT > > PR: 294268 > Approved by: blanket, just fix it > --- > security/libssh/Makefile | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/security/libssh/Makefile b/security/libssh/Makefile > index cbec0cfe7b55..10ebb693d642 100644 > --- a/security/libssh/Makefile > +++ b/security/libssh/Makefile > @@ -1,7 +1,9 @@ > PORTNAME= libssh > PORTVERSION= 0.12.0 > +PORTREVISION= 1 > CATEGORIES= security devel > -MASTER_SITES= https://www.libssh.org/files/${PORTVERSION:R}/ > +MASTER_SITES= https://www.libssh.org/files/${PORTVERSION:R}/ \ > + https://ftp.openbsd.org/pub/OpenBSD/distfiles/ > > MAINTAINER= sunpoet@FreeBSD.org > COMMENT= Library implementing the SSH2 protocol > @@ -11,6 +13,9 @@ WWW= https://www.libssh.org/ \ > LICENSE= LGPL21 > LICENSE_FILE= ${WRKSRC}/COPYING > > +BROKEN_FreeBSD_15= src/mlkem_crypto.c:31:10: fatal error: 'openssl/ml_kem.h' file not found > +BROKEN_FreeBSD_16= src/mlkem_crypto.c:31:10: fatal error: 'openssl/ml_kem.h' file not found > + > TEST_DEPENDS= cmocka>=0:sysutils/cmocka > > USES= cmake:testing cpe tar:xz > -- Sincerely, Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org) (desktop, kde, x11, office, ports-secteam)@FreeBSD team --69d3cd4e_6b8b4567_d40a Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline
Hello=21

There is another solution -- force check fo= r openssl 3.6 to enable ML-KEM extension


diff --git a/secur= ity/libssh/Makefile b/security/libssh/Makefile
index cbec0cfe7b..2f12= 24e3be 100644
--- a/security/libssh/Makefile
+++ b/security/libss= h/Makefile
=40=40 -67,6 +68,10 =40=40 OPENSSL=5FCMAKE=5FBOOL=5FO=46=46= =3D CMAKE=5FDISABLE=5F=46IND=5FPACKAGE=5FOpenSSL
OPENSSL=5FUSES=3D s= sl
STATIC=5FCMAKE=5FBOOL=3D BUILD=5FSTATIC=5FLIB

+post-patc= h:
+ =24=7BREINPLACE=5FCMD=7D -e '/OPENSSL=5FVERSION/s,3.5.0,3.6.0,g'= =5C
+ =24=7BWRKSRC=7D/ConfigureChecks.cmake
+
post-install-= STATIC-on:
=24=7BINSTALL=5FDATA=7D =24=7BINSTALL=5FWRKSRC=7D/src/lib= ssh.a =24=7BSTAGEDIR=7D=24=7BPRE=46IX=7D/lib/


On 06.04.2026= 15:53, Daniel Engberg wrote:
The branc= h main has been updated by diizzy:

URL: https://cgit.=46reeBSD.o= rg/ports/commit/=3Fid=3D4211f99a216d4f440b3b804a1e6db475087e3ed2
commit 4211f99a216d4f440b3b804a1e6db475087e3ed2
Author: Daniel Engbe= rg <diizzy=40=46reeBSD.org>
AuthorDate: 2026-04-06 12:45:14 +00= 00
Commit: Daniel Engberg <diizzy=40=46reeBSD.org>
CommitDa= te: 2026-04-06 12:53:21 +0000

security/libssh: Mark BROKEN on 15= + and add backup for MASTER=5FSITES

=46ails to build on 15+, src/mlkem=5Fcrypto.c:31:10: fatal error: 'openssl/ml=5Fkem.h' file not f= ound

Add temporary backup for MASTER=5FSITES to avoid build fail= ures on other
versions and of consumers as main upstream site current= truncates
downloads

Thanks to eduardo=40 for verifying buil= d issues on -CURRENT

PR: 294268
Approved by: blanket, just f= ix it
---
security/libssh/Makefile =7C 7 ++++++-
1 file chang= ed, 6 insertions(+), 1 deletion(-)

diff --git a/security/libssh/= Makefile b/security/libssh/Makefile
index cbec0cfe7b55..10ebb693d642 = 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makef= ile
=40=40 -1,7 +1,9 =40=40
PORTNAME=3D libssh
PORTVERSION=3D= 0.12.0
+PORTREVISION=3D 1
CATEGORIES=3D security devel
-MAST= ER=5FSITES=3D https://www.libssh.org/files/=24=7BPORTVERSION:R=7D/
+M= ASTER=5FSITES=3D https://www.libssh.org/files/=24=7BPORTVERSION:R=7D/ =5C=
+ https://ftp.openbsd.org/pub/OpenBSD/distfiles/

MAINTAINER= =3D sunpoet=40=46reeBSD.org
COMMENT=3D Library implementing the SSH2 = protocol
=40=40 -11,6 +13,9 =40=40 WWW=3D https://www.libssh.org/ =5C=
LICENSE=3D LGPL21
LICENSE=5F=46ILE=3D =24=7BWRKSRC=7D/COPYING
+BROKEN=5F=46reeBSD=5F15=3D src/mlkem=5Fcrypto.c:31:10: fatal erro= r: 'openssl/ml=5Fkem.h' file not found
+BROKEN=5F=46reeBSD=5F16=3D sr= c/mlkem=5Fcrypto.c:31:10: fatal error: 'openssl/ml=5Fkem.h' file not foun= d
+
TEST=5FDEPENDS=3D cmocka>=3D0:sysutils/cmocka

USE= S=3D cmake:testing cpe tar:xz


--
Sincerely= ,
Dima (fluffy=40=46reeBSD.org, https://t.me/=46luffyBSD, =40fluffy:m= atrix-dev.freebsd.org)
(desktop, kde, x11, office, ports-secteam)=40=46= reeBSD team

--69d3cd4e_6b8b4567_d40a--