git: a5b6e01d999e - main - security/libssh: Update 0.11.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 25 Aug 2024 08:18:01 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a5b6e01d999eb59b3e638b4470727fa2fd13a898
commit a5b6e01d999eb59b3e638b4470727fa2fd13a898
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-08-25 08:10:13 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
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 <bsd.port.mk>
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 <openssl/rsa.h>
- #include <openssl/dsa.h>
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