Date: Mon, 6 Apr 2026 18:12:14 +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: <28b58316-b472-4cba-a458-1deae223a455@FreeBSD.org> In-Reply-To: <69d3acd9.315eb.2e00dff0@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
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
[-- Attachment #2 --]
<html><head><meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"></head><body><div id="CanaryBody">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 <diizzy@FreeBSD.org> <br>AuthorDate: 2026-04-06 12:45:14 +0000 <br>Commit: Daniel Engberg <diizzy@FreeBSD.org> <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>=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></div></body></html>
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?28b58316-b472-4cba-a458-1deae223a455>