From nobody Mon Apr 6 15:18:40 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 4fqCdv2Xkwz6YBys; Mon, 06 Apr 2026 15:18:43 +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 4fqCdv1rp2z3tx7; Mon, 06 Apr 2026 15:18:43 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775488723; 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=ciZMcdBdl4LgatJZy8QzTmnmyj0oiw0FZjYaj4Daxec=; b=N9EeEQ+gyzY28Wi9LUacEf52DbHqnRb0FQM8jViSCvHZh1F+y+A7cOFmaTOTwbCWpw1+yB LyZxuhRwaVwCIsDRrhGSzZTmO3+5NnaKdgJCzHOCduf6j8kH/FH1xLH2/13T6he+5Lh7Ab AOagBkJRCtRaOts6zoeOqgoPQCLQsvZFx4yLQIRgb+sGmCeHDK/nBbA/t0CIN2QJRG2Dk1 cfT8fmQnF3wT6YNJvYt8wMWGAlWBiz69V/bwWOWBO7G+nI+k7RJ1NZ8iwFadpZrI6W1FUi pXBoJfsTtqrgBw4zOrtpnNNYawvGsdMCb1wnT00746tnUzlM0rtSlHaw6PU4kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775488723; a=rsa-sha256; cv=none; b=ryhtE36WnPxPUOQg6XR3vIvCOaCtzgQTAnhCiDUJjvJNONhjXYdj9TyCBXSRQZpt3aj5uz L/Ush4tk5FsjwT2+rz6kZwpZMBgzE1GxjKb0EX9e18RZCNpLvWXWV3/pWSQZNjKhg9TFzh ZmXdoz3veLaC1+csMqO7o6QE64XHrBU3x0M056kmafbdeIndKY3JUBybeHPhoP9pZVLB3H wmgY7Sga7p/OVr2V/N1tAU4ji4WqMu+uUhXcUH7GuxTNvHcqRTVuyZz271gRN47fLfRN9F pq4Xl6VtFkCjqH1liXv9ac9sB5PA4JHywGt2dKA1R68lsYstIOiz0OqOBnheOg== 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=1775488723; 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=ciZMcdBdl4LgatJZy8QzTmnmyj0oiw0FZjYaj4Daxec=; b=aC0FRNvSozhEzr/1gByggr6kncmnWhB2mizrT/GYQoSeAuqoVCbdPAcVOY4b6FUNFeJjF8 6e0lo7FTFUKbK531zdH+7zY7BrADZ8eMkyUs1LHi/6K9//QexEb39N1iNL3GwpOMFn93Rj YTEIYyuahYAoHo3J3Ehaa0oXOPEo9NYtfnW6uV81vioc+D2RRXYI+h0GnsLskOkzXfjYfz Vipj3Y8zc03/hRpn6swUEVqSGYexarBIMMgLeNQtMT+72X2nOF5VXNzEKat6gvZpOqCVEU R2DS6ko2e5+UyTHOMD5k+ct39XBiRWtIr0LG5vOuhJEp2KiML9pjkN3Cf+OsOQ== 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 4fqCdt40Qmz19b5; Mon, 06 Apr 2026 15:18:42 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Date: Mon, 6 Apr 2026 18:18:40 +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: <9456e6a6-45c6-4102-b827-866c9f0f6e43@FreeBSD.org> In-Reply-To: <28b58316-b472-4cba-a458-1deae223a455@FreeBSD.org> References: <69d3acd9.315eb.2e00dff0@gitrepo.freebsd.org> <28b58316-b472-4cba-a458-1deae223a455@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="69d3ced0_66334873_d40a" --69d3ced0_66334873_d40a Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline BTW, we have missed corresponding include file in base openssl since it was merged with 3.5.x diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 9d484e9d48..f57f53a8c7 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -635,7 +635,7 @@ INCS+= des.h dh.h dherr.h dsa.h INCS+= dsaerr.h INCS+= dtls1.h e_os2.h e_ostime.h ebcdic.h ec.h ecdh.h ecdsa.h ecerr.h encoder.h encodererr.h INCS+= engine.h engineerr.h err.h ess.h esserr.h evp.h evperr.h fips_names.h fipskey.h hmac.h hpke.h http.h httperr.h idea.h indicator.h -INCS+= kdf.h kdferr.h lhash.h macros.h md2.h md4.h md5.h mdc2.h modes.h obj_mac.h +INCS+= kdf.h kdferr.h lhash.h macros.h md2.h md4.h md5.h mdc2.h ml_kem.h modes.h obj_mac.h INCS+= objects.h objectserr.h ocsp.h ocsperr.h opensslconf.h opensslv.h INCS+= ossl_typ.h param_build.h params.h pem.h pem2.h pemerr.h pkcs12.h pkcs12err.h pkcs7.h INCS+= pkcs7err.h prov_ssl.h proverr.h provider.h quic.h rand.h randerr.h rc2.h rc4.h rc5.h ripemd.h On 06.04.2026 18:12, Dima Panov wrote: > 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 > -- Sincerely, Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org) (desktop, kde, x11, office, ports-secteam)@FreeBSD team --69d3ced0_66334873_d40a Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline
BTW, we have missed corresponding include file in base openss= l since it was merged with 3.5.x

diff --git a/secure/lib/libcryp= to/Makefile b/secure/lib/libcrypto/Makefile
index 9d484e9d48..f57f53a= 8c7 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/l= ibcrypto/Makefile
=40=40 -635,7 +635,7 =40=40 INCS+=3D des.h dh.h dhe= rr.h dsa.h
INCS+=3D dsaerr.h
INCS+=3D dtls1.h e=5Fos2.h e=5Fost= ime.h ebcdic.h ec.h ecdh.h ecdsa.h ecerr.h encoder.h encodererr.h
IN= CS+=3D engine.h engineerr.h err.h ess.h esserr.h evp.h evperr.h fips=5Fna= mes.h fipskey.h hmac.h hpke.h http.h httperr.h idea.h indicator.h
-IN= CS+=3D kdf.h kdferr.h lhash.h macros.h md2.h md4.h md5.h mdc2.h modes.h o= bj=5Fmac.h
+INCS+=3D kdf.h kdferr.h lhash.h macros.h md2.h md4.h md5.= h mdc2.h ml=5Fkem.h modes.h obj=5Fmac.h
INCS+=3D objects.h objectser= r.h ocsp.h ocsperr.h opensslconf.h opensslv.h
INCS+=3D ossl=5Ftyp.h = param=5Fbuild.h params.h pem.h pem2.h pemerr.h pkcs12.h pkcs12err.h pkcs7= .h
INCS+=3D pkcs7err.h prov=5Fssl.h proverr.h provider.h quic.h rand= .h randerr.h rc2.h rc4.h rc5.h ripemd.h



On 06.04.2026 = 18:12, Dima Panov wrote:
Hello=21
=
There is another solution -- force check for openssl 3.6 to enable ML= -KEM extension


diff --git a/security/libssh/Makefile b/secu= rity/libssh/Makefile
index cbec0cfe7b..2f1224e3be 100644
--- a/se= curity/libssh/Makefile
+++ b/security/libssh/Makefile
=40=40 -67,= 6 +68,10 =40=40 OPENSSL=5FCMAKE=5FBOOL=5FO=46=46=3D CMAKE=5FDISABLE=5F=46= IND=5FPACKAGE=5FOpenSSL
OPENSSL=5FUSES=3D ssl
STATIC=5FCMAKE=5FBO= OL=3D BUILD=5FSTATIC=5FLIB

+post-patch:
+ =24=7BREINPLACE=5F= CMD=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/libssh.a =24=7BSTAGEDIR=7D=24=7B= PRE=46IX=7D/lib/


On 06.04.2026 15:53, Daniel Engberg wrote:=
The branch main has been updated by di= izzy:

URL: https://cgit.=46reeBSD.org/ports/commit/=3Fid=3D4211f= 99a216d4f440b3b804a1e6db475087e3ed2

commit 4211f99a216d4f440b3b8= 04a1e6db475087e3ed2
Author: Daniel Engberg <diizzy=40=46reeBSD.org= >
AuthorDate: 2026-04-06 12:45:14 +0000
Commit: Daniel Engberg= <diizzy=40=46reeBSD.org>
CommitDate: 2026-04-06 12:53:21 +0000=

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

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

Add temporary ba= ckup for MASTER=5FSITES to avoid build failures on other
versions and= of consumers as main upstream site current truncates
downloads
=
Thanks to eduardo=40 for verifying build issues on -CURRENT

= PR: 294268
Approved by: blanket, just fix it
---
security/lib= ssh/Makefile =7C 7 ++++++-
1 file changed, 6 insertions(+), 1 deletio= n(-)

diff --git a/security/libssh/Makefile b/security/libssh/Mak= efile
index cbec0cfe7b55..10ebb693d642 100644
--- a/security/libs= sh/Makefile
+++ b/security/libssh/Makefile
=40=40 -1,7 +1,9 =40=40=
PORTNAME=3D libssh
PORTVERSION=3D 0.12.0
+PORTREVISION=3D 1 =
CATEGORIES=3D security devel
-MASTER=5FSITES=3D https://www.libss= h.org/files/=24=7BPORTVERSION:R=7D/
+MASTER=5FSITES=3D https://www.li= bssh.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
LICE= NSE=5F=46ILE=3D =24=7BWRKSRC=7D/COPYING

+BROKEN=5F=46reeBSD=5F15= =3D src/mlkem=5Fcrypto.c:31:10: fatal error: 'openssl/ml=5Fkem.h' file no= t found
+BROKEN=5F=46reeBSD=5F16=3D src/mlkem=5Fcrypto.c:31:10: fatal= error: 'openssl/ml=5Fkem.h' file not found
+
TEST=5FDEPENDS=3D c= mocka>=3D0:sysutils/cmocka

USES=3D cmake:testing cpe tar:xz <= br>

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


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

--69d3ced0_66334873_d40a--