From nobody Sun Aug 25 08:18:01 2024 X-Original-To: dev-commits-ports-all@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 4Ws6BK3HbDz5VYpY; Sun, 25 Aug 2024 08:18:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ws6BK1n9yz3x4M; Sun, 25 Aug 2024 08:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724573881; 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=OhKPbMzl03xwhbpNtusPhqnkR91KbUFxSVGNm1AXAK0=; b=IUHo/Xi2Xieftwx83uK3Ca++CE3hfsVnWJRiVZGIH49/3QGeEHw6mHeyo/Rxxmsiy5uOlY 5HqsZggfuG2eHu15ZseDoseow1uJJ0gX4RO++LZEYl+Qw6FUph6mzbSh1WDkJMb/7iSZQx 5qPWnyBHL2BDm21ljl3cLiYKmYcnfrsUX4ewN/81pTsuYuBcSX9WgAjVs2WlvcN07wF8pZ LXYRD1tOtn0gDcsjFyFCKaxTktJQ3ZO1/azjbeaWRrFj3XSssSxni6hr8x3+WVVGGemVFb /mZAWOwriADssLlZqL/m+x/0qInOx1ztE6Qnxd+s7F2o75b7dExeUEQ7s7VPxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724573881; a=rsa-sha256; cv=none; b=oQ/STmwSBNsPLuRW6DBTrAf3C40sknkt1wNi7oikJWFKMguD+nO9xrwtUp2DulvdZ6K0uc sX4IoJqqayUB+aKPTqYRqnp0TwaDqyAc6unWWDXUvnOi3RcPUCO+ISKRqqlbvrDs5Npf5y GUeXjhgr86D1+/FwbAoMwXJyxwKPGggnrngbcg4raeQP3VRCvXUMlDjobsq1nb3EOtfzcI 6S71LIaTpiPjfIKlEtD+DdzEhbJ1SA9uoLoVKNFHgXmcf9l99gIfvXRPhyXeyBe4my+clt jKzrudBqVO66e/MmDPFAzD2CKEHAcJpxDaBix6orbShbC9Yw+nRTyRp/DNTzWw== 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=1724573881; 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=OhKPbMzl03xwhbpNtusPhqnkR91KbUFxSVGNm1AXAK0=; b=MnfjiR1fxqjtEmSLqMIP26JTSLChFA13tpRjkrF11L7bQXTqrquaeH5Ar9KCvwzw2BLbmf mQMLz95/k00VyVToqI/rpkmR7TvxLe2bL1NA4hB0fe9wKI8B5Os3V17OoF1CsizREL1z8J 5Fbzh06P3LrXn2kdB0Fs0okwY2EYe1FklumnVpiFjJF169L70q+x6dwV4ZutJlrAPNF+3n KDJ2COBRdigwNMldEfbc+rgCACGaZEKKDE83k0idA6e6RAJS820swhmWJSYZ23jJV8hEhO n35PRDI35elCKQSthjL6fP4ilBSfvB3aNEshBsvvb6rEYhy3xinBQ43kSnPD5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ws6BK1P97zFJV; Sun, 25 Aug 2024 08:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47P8I1Jl098165; Sun, 25 Aug 2024 08:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47P8I1S5098162; Sun, 25 Aug 2024 08:18:01 GMT (envelope-from git) Date: Sun, 25 Aug 2024 08:18:01 GMT Message-Id: <202408250818.47P8I1S5098162@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: a5b6e01d999e - main - security/libssh: Update 0.11.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5b6e01d999eb59b3e638b4470727fa2fd13a898 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5b6e01d999eb59b3e638b4470727fa2fd13a898 commit a5b6e01d999eb59b3e638b4470727fa2fd13a898 Author: Daniel Engberg AuthorDate: 2024-08-25 08:10:13 +0000 Commit: Daniel Engberg CommitDate: 2024-08-25 08:17:31 +0000 security/libssh: Update 0.11.0 * Switch from PORTVERSION to DISTVERSION * Enable "make test" (disable tests that uses hardcoded paths) * Clean up and modernize Makefile * Remove unnecessary CMAKE_ARGS * Drop (lib)gcrypt support (deprecated upstream) Changelog: https://gitlab.com/libssh/libssh-mirror/-/tags/libssh-0.11.0 PR: 280720 Approved by: portmgr (maintainer timeout, 2+ weeks) --- security/libssh/Makefile | 64 +++++++++------------- security/libssh/distinfo | 6 +- security/libssh/files/patch-src_libcrypto-compat.h | 11 ---- security/libssh/pkg-plist | 5 +- 4 files changed, 33 insertions(+), 53 deletions(-) diff --git a/security/libssh/Makefile b/security/libssh/Makefile index 7c550fc55e23..e824d389136f 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -1,7 +1,7 @@ PORTNAME= libssh -PORTVERSION= 0.10.6 +DISTVERSION= 0.11.0 CATEGORIES= security devel -MASTER_SITES= https://www.libssh.org/files/${PORTVERSION:R}/ +MASTER_SITES= https://www.libssh.org/files/${DISTVERSION:R}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library implementing the SSH2 protocol @@ -10,51 +10,41 @@ WWW= https://www.libssh.org/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake cpe pathfix tar:xz +TEST_DEPENDS= cmocka>=0:sysutils/cmocka -CMAKE_OFF= CLIENT_TESTING \ - FUZZ_TESTING \ - PICKY_DEVELOPER \ - SERVER_TESTING \ - UNIT_TESTING \ - WITH_ABI_BREAK \ - WITH_BENCHMARKS \ - WITH_BLOWFISH_CIPHER \ +USES= cmake:testing cpe pathfix tar:xz +USE_LDCONFIG= yes + +CMAKE_TESTING_ON= UNIT_TESTING + +CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen \ WITH_DEBUG_CALLTRACE \ - WITH_DEBUG_CRYPTO \ - WITH_DEBUG_PACKET \ - WITH_DSA \ WITH_EXAMPLES \ - WITH_INSECURE_NONE \ - WITH_INTERNAL_DOC \ - WITH_MBEDTLS \ - WITH_NACL \ - WITH_PKCS11_URI -CMAKE_ON= BUILD_SHARED_LIBS \ - BUILD_STATIC_LIB \ - WITH_GEX \ - WITH_PCAP \ - WITH_SERVER \ - WITH_SFTP \ WITH_SYMBOL_VERSIONING -USE_LDCONFIG= yes -OPTIONS_DEFINE= GSSAPI ZLIB -OPTIONS_RADIO= CRYPTO -OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL -OPTIONS_DEFAULT=GSSAPI OPENSSL ZLIB +CMAKE_ARGS= -DGLOBAL_BIND_CONFIG=${PREFIX}/etc/ssh/libssh_server_config \ + -DGLOBAL_CLIENT_CONFIG=${PREFIX}/etc/ssh/ssh_config \ + -DCMAKE_CTEST_ARGUMENTS="-E;'torture_config|torture_misc'" + +OPTIONS_DEFINE= GSSAPI STATIC +OPTIONS_RADIO= CRYPTO +OPTIONS_RADIO_CRYPTO= MBEDTLS OPENSSL +OPTIONS_DEFAULT= GSSAPI OPENSSL +OPTIONS_SUB= yes + +CRYPTO_DESC= Crypto backend -GCRYPT_CMAKE_BOOL= WITH_GCRYPT -GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error GSSAPI_CMAKE_BOOL= WITH_GSSAPI + +MBEDTLS_LIB_DEPENDS= libmbedcrypto.so:security/mbedtls +MBEDTLS_CMAKE_BOOL= WITH_MBEDTLS + OPENSSL_USES= ssl -ZLIB_CMAKE_BOOL= WITH_ZLIB +OPENSSL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL:BOOL=True -post-patch: - @${RM} ${WRKSRC}/cmake/Modules/UseDoxygen.cmake +STATIC_CMAKE_BOOL= BUILD_STATIC_LIB -post-install: +post-install-STATIC-on: ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/ .include diff --git a/security/libssh/distinfo b/security/libssh/distinfo index 31da40238534..50a7a0d27b5f 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703227816 -SHA256 (libssh-0.10.6.tar.xz) = 1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1 -SIZE (libssh-0.10.6.tar.xz) = 561036 +TIMESTAMP = 1723158351 +SHA256 (libssh-0.11.0.tar.xz) = 860e814579e7606f3fc3db98c5807bef2ab60f793ec871d81bcd23acdcdd3e91 +SIZE (libssh-0.11.0.tar.xz) = 626648 diff --git a/security/libssh/files/patch-src_libcrypto-compat.h b/security/libssh/files/patch-src_libcrypto-compat.h deleted file mode 100644 index aebef255f03a..000000000000 --- a/security/libssh/files/patch-src_libcrypto-compat.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libcrypto-compat.h.orig 2022-07-07 13:53:51 UTC -+++ src/libcrypto-compat.h -@@ -7,7 +7,7 @@ - #define NISTP384 "P-384" - #define NISTP521 "P-521" - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20700000L) - - #include - #include diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist index c5c1824fd8b4..160cf89cdfa5 100644 --- a/security/libssh/pkg-plist +++ b/security/libssh/pkg-plist @@ -5,12 +5,13 @@ include/libssh/libssh_version.h include/libssh/libsshpp.hpp include/libssh/server.h include/libssh/sftp.h +include/libssh/sftpserver.h include/libssh/ssh2.h lib/cmake/libssh/libssh-config-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libssh/libssh-config-version.cmake lib/cmake/libssh/libssh-config.cmake -lib/libssh.a +%%STATIC%%lib/libssh.a lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.9.6 +lib/libssh.so.4.10.0 libdata/pkgconfig/libssh.pc