libssh2: updated to 1.10.0

libssh2 1.10

This release includes the following enhancements and bugfixes:

 o adds agent forwarding support
 o adds OpenSSH Agent support on Windows
 o adds ECDSA key support using the Mbed TLS backend
 o adds ECDSA cert authentication
 o adds diffie-hellman-group14-sha256, diffie-hellman-group16-sha512,
   diffie-hellman-group18-sha512 key exchanges
 o adds support for PKIX key reading when using ed25519 with OpenSSL
 o adds support for EWOULDBLOCK on VMS systems
 o adds support for building with OpenSSL 3
 o adds support for using FIPS mode in OpenSSL
 o adds debug symbols when building with MSVC
 o adds support for building on the 3DS
 o adds unicode build support on Windows
 o restores os400 building
 o increases min, max and opt Diffie Hellman group values
 o improves portiablity of the make file
 o improves timeout behavior with 2FA keyboard auth
 o various improvements to the Wincng backend
 o fixes reading parital packet replies when using an agent
 o fixes Diffie Hellman key exchange on Windows 1903+ builds
 o fixes building tests with older versions of OpenSSL
 o fixes possible multiple definition warnings
 o fixes potential cast issues _libssh2_ecdsa_key_get_curve_type()
 o fixes potential use after free if libssh2_init() is called twice
 o improved linking when using Mbed TLS
 o fixes call to libssh2_crypto_exit() if crypto hasn't been initialized
 o fixes crash when loading public keys with no id
 o fixes possible out of bounds read when exchanging keys
 o fixes possible out of bounds read when reading packets
 o fixes possible out of bounds read when opening an X11 connection
 o fixes possible out of bounds read when ecdh host keys
 o fixes possible hang when trying to read a disconnected socket
 o fixes a crash when using the delayed compression option
 o fixes read error with large known host entries
 o fixes various warnings
 o fixes various small memory leaks
 o improved error handling, various detailed errors will now be reported
 o builds are now using OSS-Fuzz
 o builds now use autoreconf instead of a custom build script
 o cmake now respects install directory
 o improved CI backend
 o updated HACKING-CRYPTO documentation
 o use markdown file extensions
 o improved unit tests

3 files changed, 9 insertions, 29 deletions

diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index e493e5bd9fe..1671a10d250 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2020/05/10 17:27:27 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2021/08/30 16:43:19 adam Exp $
 
-DISTNAME=	libssh2-1.9.0
-PKGREVISION=	1
+DISTNAME=	libssh2-1.10.0
 CATEGORIES=	security
 MASTER_SITES=	https://www.libssh2.org/download/
 
@@ -10,12 +9,10 @@ HOMEPAGE=	https://www.libssh2.org/
 COMMENT=	SSH2 protocol library
 LICENSE=	modified-bsd
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libz=${BUILDLINK_PREFIX.zlib:Q}
 CONFIGURE_ARGS+=	--disable-examples-build
-
 PKGCONFIG_OVERRIDE+=	libssh2.pc.in
 TEST_TARGET=		check
 
diff --git a/security/libssh2/distinfo b/security/libssh2/distinfo
index d180bc6b6b8..3382e84ee95 100644
--- a/security/libssh2/distinfo
+++ b/security/libssh2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2020/03/12 17:46:22 wiz Exp $
+$NetBSD: distinfo,v 1.15 2021/08/30 16:43:19 adam Exp $
 
-SHA1 (libssh2-1.9.0.tar.gz) = 21e98282b103307a16792e5e2d4c99beaf0b3b9c
-RMD160 (libssh2-1.9.0.tar.gz) = eb3553a9b2c05d5b6a24159db8a1478f9aea3877
-SHA512 (libssh2-1.9.0.tar.gz) = 41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
-Size (libssh2-1.9.0.tar.gz) = 888551 bytes
-SHA1 (patch-Makefile.in) = 98dc16d73db4b99adfcea02bc597666a7c747847
+SHA1 (libssh2-1.10.0.tar.gz) = 2ebb3bc5c944090ade840f3a0ada9874eced979b
+RMD160 (libssh2-1.10.0.tar.gz) = b3af89cc5974dbffbcba0dd80dcd521e6e60b39d
+SHA512 (libssh2-1.10.0.tar.gz) = e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
+Size (libssh2-1.10.0.tar.gz) = 965044 bytes
diff --git a/security/libssh2/patches/patch-Makefile.in b/security/libssh2/patches/patch-Makefile.in
deleted file mode 100644
index f8e6ea6dcf6..00000000000
--- a/security/libssh2/patches/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2020/03/12 17:46:22 wiz Exp $
-
-Fix unportable test(1) operator.
-https://github.com/libssh2/libssh2/pull/459
-
---- Makefile.in.orig	2019-06-20 06:19:26.000000000 +0000
-+++ Makefile.in
-@@ -1028,7 +1028,7 @@ $(DSP): win32/msvcproj.head win32/msvcpr
- 	for file in $$sorted_hdrs; do \
- 		echo "# Begin Source File"; \
- 		echo ""; \
--		if [ "$$file" == "libssh2_config.h" ]; \
-+		if [ "$$file" = "libssh2_config.h" ]; \
- 		then \
- 			echo "SOURCE=.\\"$$file; \
- 		else \