From nobody Tue Apr 7 13:08:59 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 4fqmjm0FTKz6YDhn for ; Tue, 07 Apr 2026 13:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqmjl6fN1z3QWB for ; Tue, 07 Apr 2026 13:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775567340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I9nYAI5TAZwGT7ixzBBe81nUOg6pciYI2ET05XIubhs=; b=dOGvesl7lLkwAC6qHkcEg9VFM166ZZpsrOoDbzdtthjefBUaYw5ejgRSY8CnhX57SiU5cl 5wfD/ZTBPUqu3hCtbd5L4I6MrSRU1Q+O11lLRgk/5AUyQtutKazwjlPWXFkbxsFnowINP5 FWqKfp8OOuCxLHYTRqapasdY4P7YLFbT+bLU3/nKstQNwFvyHZeMbsTnQhT06MYO79eL3J mHsr0mcQ6yCA27tmxgYF+BKy4hPtbF1Jp2aVFngNAbyygn9l3CPL4Eip/Nx/zmiw9WGKzn 4zLGRPFT2SEg7lvYCBZrIKIbO128FPzFD+pAn5ossjsvIoVy1DDwWUSKAqec7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775567340; a=rsa-sha256; cv=none; b=FXoE7RZ1hU7LUvlby6JkJQzqUp8BpvNwpNVWb7+Pqbk4F/8TdIbzmTcqoO2mGoX4fhmNI2 0u2W2O0Rb75SSnIw0SElXY+yXnNXY72/VLp2hwJvqr/q+EILrDWETLQecMMOBaiJf1o7cj Q/Uc3S/zysd02VU0Ypcl53KGTiOK9HpXf0Bs0kQuiBgKFsALRbkavXStKctjR7gDjapPxz Zjo5xlI6yoIB51EHPO/tc/gXRvB5KtneYL7kj55NRJiWI+jAMbb89zsGvzLFaDs2ei9bbq 9S73gQyY9Nn73jpaks4WRDXLsrwXdjw2hW/C869da6KUlvE9haAFkGMwDSaerQ== 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=1775567340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I9nYAI5TAZwGT7ixzBBe81nUOg6pciYI2ET05XIubhs=; b=x9uc1vRO66+gYXt8/UvVNMn9eFsDrh7x5H8LP0zDnmiyvMTYBjEE7V9wxmaghd5lD+Vh4c KjQZqny6V33AfFeZd+rcUVv8eKdljPYfNNXXKNG8oj51xeJkDkGwhyaK7Ne8fxQPBVKUFT bMJ2OowTUtUQRQe0GjCC6rq1/7NtGevin8ahpxpcm2oZFhWYmNmbZ9VmLs3i9s/MYoyvj0 YjGptvJ8BWbKH1jn8VqDhHNprmS+MB2fs4oFyfx0Sha+jvFZTYsYuBxHRLdVoIC5Kks/g4 nuzTlQGU6FHpb8fTgK1+eo16qvZQiraY9WsoR5rrwFv705nc21r5Nq7vt7NWVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqmjl6FV7zhH4 for ; Tue, 07 Apr 2026 13:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 13:08:59 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 08397e80c892 - main - security/libssh: Fix build on FreeBSD 15+ with OpenSSL from base system 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08397e80c8929b63765d853dfc0286327ac8276d Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 13:08:59 +0000 Message-Id: <69d501eb.345b8.37f29980@gitrepo.freebsd.org> The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=08397e80c8929b63765d853dfc0286327ac8276d commit 08397e80c8929b63765d853dfc0286327ac8276d Author: Po-Chuan Hsieh AuthorDate: 2026-04-07 13:08:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2026-04-07 13:08:56 +0000 security/libssh: Fix build on FreeBSD 15+ with OpenSSL from base system openssl/ml_kem.h is missing from the OpenSSL 3.5 in the base system. Add a workaround to disable MLKEM support on such systems temporarily. --- security/libssh/Makefile | 9 ++++++--- security/libssh/files/extra-patch-mlkem | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/security/libssh/Makefile b/security/libssh/Makefile index 10ebb693d642..3da478bcaef1 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -13,9 +13,6 @@ 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 @@ -72,6 +69,12 @@ OPENSSL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenSSL OPENSSL_USES= ssl STATIC_CMAKE_BOOL= BUILD_STATIC_LIB +.include + +.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} == base && !exists(/usr/include/openssl/ml_kem.h) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-mlkem +.endif + post-install-STATIC-on: ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/ diff --git a/security/libssh/files/extra-patch-mlkem b/security/libssh/files/extra-patch-mlkem new file mode 100644 index 000000000000..cc530f2e900a --- /dev/null +++ b/security/libssh/files/extra-patch-mlkem @@ -0,0 +1,11 @@ +--- ConfigureChecks.cmake.orig 2026-02-10 09:36:24 UTC ++++ ConfigureChecks.cmake +@@ -106,8 +106,6 @@ if (OPENSSL_FOUND) + + # Check for ML-KEM availability (OpenSSL 3.5+) + if (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.5.0") +- set(HAVE_OPENSSL_MLKEM 1) +- set(HAVE_MLKEM1024 1) + endif () + + unset(CMAKE_REQUIRED_INCLUDES)