Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 6 Apr 2026 18:18:40 +0300
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,  dev-commits-ports-main@FreeBSD.org, Daniel Engberg <diizzy@FreeBSD.org>
Subject:   git: 4211f99a216d - main - security/libssh: Mark BROKEN on 15+ and add backup for MASTER_SITES
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>
index | next in thread | previous in thread | raw e-mail 

[-- Attachment #1 --]
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 <diizzy@FreeBSD.org>
> > AuthorDate: 2026-04-06 12:45:14 +0000
> > Commit: Daniel Engberg <diizzy@FreeBSD.org>
> > 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


[-- Attachment #2 --]
<html><head><meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"></head><body><div id="CanaryBody">BTW, we have missed corresponding include file in base openssl since it was merged with 3.5.x <br> <br>diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile <br>index 9d484e9d48..f57f53a8c7 100644 <br>--- a/secure/lib/libcrypto/Makefile <br>+++ b/secure/lib/libcrypto/Makefile <br>@@ -635,7 +635,7 @@ INCS+= des.h dh.h dherr.h dsa.h <br> INCS+= dsaerr.h <br> INCS+= dtls1.h e_os2.h e_ostime.h ebcdic.h ec.h ecdh.h ecdsa.h ecerr.h encoder.h encodererr.h <br> 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 <br>-INCS+= kdf.h kdferr.h lhash.h macros.h md2.h md4.h md5.h mdc2.h modes.h obj_mac.h <br>+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 <br> INCS+= objects.h objectserr.h ocsp.h ocsperr.h opensslconf.h opensslv.h <br> INCS+= ossl_typ.h param_build.h params.h pem.h pem2.h pemerr.h pkcs12.h pkcs12err.h pkcs7.h <br> INCS+= pkcs7err.h prov_ssl.h proverr.h provider.h quic.h rand.h randerr.h rc2.h rc4.h rc5.h ripemd.h <br> <br> <br> <br>On 06.04.2026 18:12, Dima Panov wrote: <br><blockquote type="cite">Hello! <br> <br>There is another solution -- force check for openssl 3.6 to enable ML-KEM extension <br> <br> <br>diff --git a/security/libssh/Makefile b/security/libssh/Makefile <br>index cbec0cfe7b..2f1224e3be 100644 <br>--- a/security/libssh/Makefile <br>+++ b/security/libssh/Makefile <br>@@ -67,6 +68,10 @@ OPENSSL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenSSL <br>OPENSSL_USES= ssl <br>STATIC_CMAKE_BOOL= BUILD_STATIC_LIB <br> <br>+post-patch: <br>+ ${REINPLACE_CMD} -e '/OPENSSL_VERSION/s,3.5.0,3.6.0,g' \ <br>+ ${WRKSRC}/ConfigureChecks.cmake <br>+ <br>post-install-STATIC-on: <br>${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/ <br> <br> <br>On 06.04.2026 15:53, Daniel Engberg wrote: <br><blockquote type="cite">The branch main has been updated by diizzy: <br> <br>URL: https://cgit.FreeBSD.org/ports/commit/?id=4211f99a216d4f440b3b804a1e6db475087e3ed2 <br> <br>commit 4211f99a216d4f440b3b804a1e6db475087e3ed2 <br>Author: Daniel Engberg &lt;diizzy@FreeBSD.org&gt; <br>AuthorDate: 2026-04-06 12:45:14 +0000 <br>Commit: Daniel Engberg &lt;diizzy@FreeBSD.org&gt; <br>CommitDate: 2026-04-06 12:53:21 +0000 <br> <br>security/libssh: Mark BROKEN on 15+ and add backup for MASTER_SITES <br> <br>Fails to build on 15+, <br>src/mlkem_crypto.c:31:10: fatal error: 'openssl/ml_kem.h' file not found <br> <br>Add temporary backup for MASTER_SITES to avoid build failures on other <br>versions and of consumers as main upstream site current truncates <br>downloads <br> <br>Thanks to eduardo@ for verifying build issues on -CURRENT <br> <br>PR: 294268 <br>Approved by: blanket, just fix it <br>--- <br>security/libssh/Makefile | 7 ++++++- <br>1 file changed, 6 insertions(+), 1 deletion(-) <br> <br>diff --git a/security/libssh/Makefile b/security/libssh/Makefile <br>index cbec0cfe7b55..10ebb693d642 100644 <br>--- a/security/libssh/Makefile <br>+++ b/security/libssh/Makefile <br>@@ -1,7 +1,9 @@ <br>PORTNAME= libssh <br>PORTVERSION= 0.12.0 <br>+PORTREVISION= 1 <br>CATEGORIES= security devel <br>-MASTER_SITES= https://www.libssh.org/files/${PORTVERSION:R}/ <br>+MASTER_SITES= https://www.libssh.org/files/${PORTVERSION:R}/ \ <br>+ https://ftp.openbsd.org/pub/OpenBSD/distfiles/ <br> <br>MAINTAINER= sunpoet@FreeBSD.org <br>COMMENT= Library implementing the SSH2 protocol <br>@@ -11,6 +13,9 @@ WWW= https://www.libssh.org/ \ <br>LICENSE= LGPL21 <br>LICENSE_FILE= ${WRKSRC}/COPYING <br> <br>+BROKEN_FreeBSD_15= src/mlkem_crypto.c:31:10: fatal error: 'openssl/ml_kem.h' file not found <br>+BROKEN_FreeBSD_16= src/mlkem_crypto.c:31:10: fatal error: 'openssl/ml_kem.h' file not found <br>+ <br>TEST_DEPENDS= cmocka&gt;=0:sysutils/cmocka <br> <br>USES= cmake:testing cpe tar:xz <br> <br></blockquote> <br>-- <br>Sincerely, <br>Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org) <br>(desktop, kde, x11, office, ports-secteam)@FreeBSD team <br> <br></blockquote> <br>-- <br>Sincerely, <br>Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org) <br>(desktop, kde, x11, office, ports-secteam)@FreeBSD team <br> <br></div></body></html>
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9456e6a6-45c6-4102-b827-866c9f0f6e43>