diff --git a/security/libssh/Makefile b/security/libssh/Makefile index 15a4a9cd63c9..38b550a93dc0 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -1,36 +1,36 @@ PORTNAME= libssh -PORTVERSION= 0.9.6 +PORTVERSION= 0.10.1 CATEGORIES= security devel MASTER_SITES= https://www.libssh.org/files/${PORTVERSION:R}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library implementing the SSH2 protocol LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake cpe tar:xz CMAKE_OFF= WITH_EXAMPLES CMAKE_ON= BUILD_STATIC_LIB USE_LDCONFIG= yes OPTIONS_DEFINE= GSSAPI ZLIB OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL OPTIONS_DEFAULT=GSSAPI OPENSSL ZLIB GCRYPT_CMAKE_BOOL= WITH_GCRYPT GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error GSSAPI_CMAKE_BOOL= WITH_GSSAPI OPENSSL_USES= ssl ZLIB_CMAKE_BOOL= WITH_ZLIB post-patch: @${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/ .include diff --git a/security/libssh/distinfo b/security/libssh/distinfo index e9f01696fd42..85d4913bd42c 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632036902 -SHA256 (libssh-0.9.6.tar.xz) = 86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b -SIZE (libssh-0.9.6.tar.xz) = 1053056 +TIMESTAMP = 1661950826 +SHA256 (libssh-0.10.1.tar.xz) = da2b3337a0dd1d1e3788376ee471548520cad91a4f3f23ea3f50c5a73a7e69a5 +SIZE (libssh-0.10.1.tar.xz) = 553808 diff --git a/security/libssh/files/patch-src_libcrypto-compat.h b/security/libssh/files/patch-src_libcrypto-compat.h index 449c9c26cfdd..aebef255f03a 100644 --- a/security/libssh/files/patch-src_libcrypto-compat.h +++ b/security/libssh/files/patch-src_libcrypto-compat.h @@ -1,12 +1,11 @@ ---- src/libcrypto-compat.h 2018-10-19 05:11:14 UTC +--- src/libcrypto-compat.h.orig 2022-07-07 13:53:51 UTC +++ src/libcrypto-compat.h -@@ -2,7 +2,8 @@ - #define LIBCRYPTO_COMPAT_H +@@ -7,7 +7,7 @@ + #define NISTP384 "P-384" + #define NISTP521 "P-521" - #include -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20700000L) ++#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 43b210c05d32..055597ad8d43 100644 --- a/security/libssh/pkg-plist +++ b/security/libssh/pkg-plist @@ -1,16 +1,16 @@ include/libssh/callbacks.h include/libssh/legacy.h include/libssh/libssh.h include/libssh/libssh_version.h include/libssh/libsshpp.hpp include/libssh/server.h include/libssh/sftp.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 lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.8.7 +lib/libssh.so.4.9.1 libdata/pkgconfig/libssh.pc