diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile index 2da108318e84..fe7f1e10a818 100644 --- a/security/libssh2/Makefile +++ b/security/libssh2/Makefile @@ -1,49 +1,43 @@ PORTNAME= libssh2 -PORTVERSION= 1.11.0 -PORTREVISION= 1 +DISTVERSION= 1.11.1 PORTEPOCH= 3 CATEGORIES= security devel -MASTER_SITES= https://www.libssh2.org/download/ \ - LOCAL/sbz +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \ + https://www.libssh2.org/download/ MAINTAINER= sbz@FreeBSD.org COMMENT= Library implementing the SSH2 protocol WWW= https://www.libssh2.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c11 cpe libtool pathfix +USES= cmake:testing cpe pathfix pkgconfig tar:xz USE_LDCONFIG= yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -INSTALL_TARGET= install-strip -TEST_TARGET= check -OPTIONS_DEFINE= GCRYPT TRACE ZLIB -OPTIONS_DEFAULT= ZLIB +CMAKE_OFF= BUILD_EXAMPLES \ + BUILD_TESTING \ + RUN_DOCKER_TESTS \ + RUN_SSHD_TESTS -TRACE_DESC= Enable debug packet traces +CMAKE_ON= ENABLE_ZLIB_COMPRESSION + +OPTIONS_DEFINE= STATIC TRACE +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GCRYPT OPENSSL +OPTIONS_DEFAULT= OPENSSL ZLIB +OPTIONS_SUB= yes + +TRACE_DESC= Enable debug packet traces GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -GCRYPT_USES_OFF= ssl -GCRYPT_CONFIGURE_ON= --with-crypto=libgcrypt -GCRYPT_CONFIGURE_OFF= --with-crypto=openssl -GCRYPT_CPPFLAGS= -I${LOCALBASE}/include -GCRYPT_LIBS= -L${LOCALBASE}/lib -TRACE_CONFIGURE_ENABLE= debug -ZLIB_CONFIGURE_WITH= libz - -.include - -post-patch: - @${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \ - ${WRKSRC}/libssh2.pc.in -.if ! ${PORT_OPTIONS:MGCRYPT} -. if ${SSL_DEFAULT} == base - @${REINPLACE_CMD} -e 's/LIBSREQUIRED="$$LIBSREQUIRED$${LIBSREQUIRED:+ }libssl libcrypto"/LIBS="$$LIBS -lssl -lcrypto"/' \ - ${WRKSRC}/configure -. endif -.endif - -.include +GCRYPT_CMAKE_ON= -DCRYPTO_BACKEND=Libgcrypt + +OPENSSL_USES= ssl +OPENSSL_CMAKE_ON= -DCRYPTO_BACKEND=OpenSSL + +STATIC_CMAKE_BOOL= BUILD_STATIC_LIBS + +TRACE_CMAKE_BOOL= ENABLE_DEBUG_LOGGING + +.include diff --git a/security/libssh2/distinfo b/security/libssh2/distinfo index 90ed42c342f2..b41509a91849 100644 --- a/security/libssh2/distinfo +++ b/security/libssh2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685548702 -SHA256 (libssh2-1.11.0.tar.gz) = 3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461 -SIZE (libssh2-1.11.0.tar.gz) = 1053562 +TIMESTAMP = 1729096176 +SHA256 (libssh2-1.11.1.tar.xz) = 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769 +SIZE (libssh2-1.11.1.tar.xz) = 721700 diff --git a/security/libssh2/pkg-plist b/security/libssh2/pkg-plist index 151d702b731d..b998144cf0b9 100644 --- a/security/libssh2/pkg-plist +++ b/security/libssh2/pkg-plist @@ -1,191 +1,201 @@ include/libssh2.h include/libssh2_publickey.h include/libssh2_sftp.h -lib/libssh2.a +lib/cmake/libssh2/FindLibgcrypt.cmake +lib/cmake/libssh2/FindMbedTLS.cmake +lib/cmake/libssh2/FindWolfSSL.cmake +lib/cmake/libssh2/libssh2-config-version.cmake +lib/cmake/libssh2/libssh2-config.cmake +lib/cmake/libssh2/libssh2-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libssh2/libssh2-targets.cmake +%%STATIC%%lib/libssh2.a lib/libssh2.so lib/libssh2.so.1 lib/libssh2.so.1.0.1 share/man/man3/libssh2_agent_connect.3.gz share/man/man3/libssh2_agent_disconnect.3.gz share/man/man3/libssh2_agent_free.3.gz share/man/man3/libssh2_agent_get_identity.3.gz share/man/man3/libssh2_agent_get_identity_path.3.gz share/man/man3/libssh2_agent_init.3.gz share/man/man3/libssh2_agent_list_identities.3.gz share/man/man3/libssh2_agent_set_identity_path.3.gz share/man/man3/libssh2_agent_sign.3.gz share/man/man3/libssh2_agent_userauth.3.gz share/man/man3/libssh2_banner_set.3.gz share/man/man3/libssh2_base64_decode.3.gz share/man/man3/libssh2_channel_close.3.gz share/man/man3/libssh2_channel_direct_streamlocal_ex.3.gz share/man/man3/libssh2_channel_direct_tcpip.3.gz share/man/man3/libssh2_channel_direct_tcpip_ex.3.gz share/man/man3/libssh2_channel_eof.3.gz share/man/man3/libssh2_channel_exec.3.gz share/man/man3/libssh2_channel_flush.3.gz share/man/man3/libssh2_channel_flush_ex.3.gz share/man/man3/libssh2_channel_flush_stderr.3.gz share/man/man3/libssh2_channel_forward_accept.3.gz share/man/man3/libssh2_channel_forward_cancel.3.gz share/man/man3/libssh2_channel_forward_listen.3.gz share/man/man3/libssh2_channel_forward_listen_ex.3.gz share/man/man3/libssh2_channel_free.3.gz share/man/man3/libssh2_channel_get_exit_signal.3.gz share/man/man3/libssh2_channel_get_exit_status.3.gz share/man/man3/libssh2_channel_handle_extended_data.3.gz share/man/man3/libssh2_channel_handle_extended_data2.3.gz share/man/man3/libssh2_channel_ignore_extended_data.3.gz share/man/man3/libssh2_channel_open_ex.3.gz share/man/man3/libssh2_channel_open_session.3.gz share/man/man3/libssh2_channel_process_startup.3.gz share/man/man3/libssh2_channel_read.3.gz share/man/man3/libssh2_channel_read_ex.3.gz share/man/man3/libssh2_channel_read_stderr.3.gz share/man/man3/libssh2_channel_receive_window_adjust.3.gz share/man/man3/libssh2_channel_receive_window_adjust2.3.gz share/man/man3/libssh2_channel_request_auth_agent.3.gz share/man/man3/libssh2_channel_request_pty.3.gz share/man/man3/libssh2_channel_request_pty_ex.3.gz share/man/man3/libssh2_channel_request_pty_size.3.gz share/man/man3/libssh2_channel_request_pty_size_ex.3.gz share/man/man3/libssh2_channel_send_eof.3.gz share/man/man3/libssh2_channel_set_blocking.3.gz share/man/man3/libssh2_channel_setenv.3.gz share/man/man3/libssh2_channel_setenv_ex.3.gz share/man/man3/libssh2_channel_shell.3.gz share/man/man3/libssh2_channel_signal_ex.3.gz share/man/man3/libssh2_channel_subsystem.3.gz share/man/man3/libssh2_channel_wait_closed.3.gz share/man/man3/libssh2_channel_wait_eof.3.gz share/man/man3/libssh2_channel_window_read.3.gz share/man/man3/libssh2_channel_window_read_ex.3.gz share/man/man3/libssh2_channel_window_write.3.gz share/man/man3/libssh2_channel_window_write_ex.3.gz share/man/man3/libssh2_channel_write.3.gz share/man/man3/libssh2_channel_write_ex.3.gz share/man/man3/libssh2_channel_write_stderr.3.gz share/man/man3/libssh2_channel_x11_req.3.gz share/man/man3/libssh2_channel_x11_req_ex.3.gz share/man/man3/libssh2_crypto_engine.3.gz share/man/man3/libssh2_exit.3.gz share/man/man3/libssh2_free.3.gz share/man/man3/libssh2_hostkey_hash.3.gz share/man/man3/libssh2_init.3.gz share/man/man3/libssh2_keepalive_config.3.gz share/man/man3/libssh2_keepalive_send.3.gz share/man/man3/libssh2_knownhost_add.3.gz share/man/man3/libssh2_knownhost_addc.3.gz share/man/man3/libssh2_knownhost_check.3.gz share/man/man3/libssh2_knownhost_checkp.3.gz share/man/man3/libssh2_knownhost_del.3.gz share/man/man3/libssh2_knownhost_free.3.gz share/man/man3/libssh2_knownhost_get.3.gz share/man/man3/libssh2_knownhost_init.3.gz share/man/man3/libssh2_knownhost_readfile.3.gz share/man/man3/libssh2_knownhost_readline.3.gz share/man/man3/libssh2_knownhost_writefile.3.gz share/man/man3/libssh2_knownhost_writeline.3.gz share/man/man3/libssh2_poll.3.gz share/man/man3/libssh2_poll_channel_read.3.gz share/man/man3/libssh2_publickey_add.3.gz share/man/man3/libssh2_publickey_add_ex.3.gz share/man/man3/libssh2_publickey_init.3.gz share/man/man3/libssh2_publickey_list_fetch.3.gz share/man/man3/libssh2_publickey_list_free.3.gz share/man/man3/libssh2_publickey_remove.3.gz share/man/man3/libssh2_publickey_remove_ex.3.gz share/man/man3/libssh2_publickey_shutdown.3.gz share/man/man3/libssh2_scp_recv.3.gz share/man/man3/libssh2_scp_recv2.3.gz share/man/man3/libssh2_scp_send.3.gz share/man/man3/libssh2_scp_send64.3.gz share/man/man3/libssh2_scp_send_ex.3.gz share/man/man3/libssh2_session_abstract.3.gz share/man/man3/libssh2_session_banner_get.3.gz share/man/man3/libssh2_session_banner_set.3.gz share/man/man3/libssh2_session_block_directions.3.gz share/man/man3/libssh2_session_callback_set.3.gz +share/man/man3/libssh2_session_callback_set2.3.gz share/man/man3/libssh2_session_disconnect.3.gz share/man/man3/libssh2_session_disconnect_ex.3.gz share/man/man3/libssh2_session_flag.3.gz share/man/man3/libssh2_session_free.3.gz share/man/man3/libssh2_session_get_blocking.3.gz share/man/man3/libssh2_session_get_read_timeout.3.gz share/man/man3/libssh2_session_get_timeout.3.gz share/man/man3/libssh2_session_handshake.3.gz share/man/man3/libssh2_session_hostkey.3.gz share/man/man3/libssh2_session_init.3.gz share/man/man3/libssh2_session_init_ex.3.gz share/man/man3/libssh2_session_last_errno.3.gz share/man/man3/libssh2_session_last_error.3.gz share/man/man3/libssh2_session_method_pref.3.gz share/man/man3/libssh2_session_methods.3.gz share/man/man3/libssh2_session_set_blocking.3.gz share/man/man3/libssh2_session_set_last_error.3.gz share/man/man3/libssh2_session_set_read_timeout.3.gz share/man/man3/libssh2_session_set_timeout.3.gz share/man/man3/libssh2_session_startup.3.gz share/man/man3/libssh2_session_supported_algs.3.gz share/man/man3/libssh2_sftp_close.3.gz share/man/man3/libssh2_sftp_close_handle.3.gz share/man/man3/libssh2_sftp_closedir.3.gz share/man/man3/libssh2_sftp_fsetstat.3.gz share/man/man3/libssh2_sftp_fstat.3.gz share/man/man3/libssh2_sftp_fstat_ex.3.gz share/man/man3/libssh2_sftp_fstatvfs.3.gz share/man/man3/libssh2_sftp_fsync.3.gz share/man/man3/libssh2_sftp_get_channel.3.gz share/man/man3/libssh2_sftp_init.3.gz share/man/man3/libssh2_sftp_last_error.3.gz share/man/man3/libssh2_sftp_lstat.3.gz share/man/man3/libssh2_sftp_mkdir.3.gz share/man/man3/libssh2_sftp_mkdir_ex.3.gz share/man/man3/libssh2_sftp_open.3.gz share/man/man3/libssh2_sftp_open_ex.3.gz share/man/man3/libssh2_sftp_open_ex_r.3.gz share/man/man3/libssh2_sftp_open_r.3.gz share/man/man3/libssh2_sftp_opendir.3.gz +share/man/man3/libssh2_sftp_posix_rename.3.gz +share/man/man3/libssh2_sftp_posix_rename_ex.3.gz share/man/man3/libssh2_sftp_read.3.gz share/man/man3/libssh2_sftp_readdir.3.gz share/man/man3/libssh2_sftp_readdir_ex.3.gz share/man/man3/libssh2_sftp_readlink.3.gz share/man/man3/libssh2_sftp_realpath.3.gz share/man/man3/libssh2_sftp_rename.3.gz share/man/man3/libssh2_sftp_rename_ex.3.gz share/man/man3/libssh2_sftp_rewind.3.gz share/man/man3/libssh2_sftp_rmdir.3.gz share/man/man3/libssh2_sftp_rmdir_ex.3.gz share/man/man3/libssh2_sftp_seek.3.gz share/man/man3/libssh2_sftp_seek64.3.gz share/man/man3/libssh2_sftp_setstat.3.gz share/man/man3/libssh2_sftp_shutdown.3.gz share/man/man3/libssh2_sftp_stat.3.gz share/man/man3/libssh2_sftp_stat_ex.3.gz share/man/man3/libssh2_sftp_statvfs.3.gz share/man/man3/libssh2_sftp_symlink.3.gz share/man/man3/libssh2_sftp_symlink_ex.3.gz share/man/man3/libssh2_sftp_tell.3.gz share/man/man3/libssh2_sftp_tell64.3.gz share/man/man3/libssh2_sftp_unlink.3.gz share/man/man3/libssh2_sftp_unlink_ex.3.gz share/man/man3/libssh2_sftp_write.3.gz share/man/man3/libssh2_sign_sk.3.gz share/man/man3/libssh2_trace.3.gz share/man/man3/libssh2_trace_sethandler.3.gz share/man/man3/libssh2_userauth_authenticated.3.gz share/man/man3/libssh2_userauth_banner.3.gz share/man/man3/libssh2_userauth_hostbased_fromfile.3.gz share/man/man3/libssh2_userauth_hostbased_fromfile_ex.3.gz share/man/man3/libssh2_userauth_keyboard_interactive.3.gz share/man/man3/libssh2_userauth_keyboard_interactive_ex.3.gz share/man/man3/libssh2_userauth_list.3.gz share/man/man3/libssh2_userauth_password.3.gz share/man/man3/libssh2_userauth_password_ex.3.gz share/man/man3/libssh2_userauth_publickey.3.gz share/man/man3/libssh2_userauth_publickey_fromfile.3.gz share/man/man3/libssh2_userauth_publickey_fromfile_ex.3.gz share/man/man3/libssh2_userauth_publickey_frommemory.3.gz share/man/man3/libssh2_userauth_publickey_sk.3.gz share/man/man3/libssh2_version.3.gz libdata/pkgconfig/libssh2.pc