py-paramiko: updated to 2.10.4

2.10.4 2022-04-25

[Bug]: Servers offering certificate variants of hostkey algorithms (eg ssh-rsa-cert-v01@openssh.com) could not have their host keys verified by Paramiko clients, as it only ever considered non-cert key types for that part of connection handshaking. This has been fixed.
[Bug]: PKey instances’ __eq__ did not have the usual safety guard in place to ensure they were being compared to another PKey object, causing occasional spurious BadHostKeyException (among other things). This has been fixed. Thanks to Shengdun Hua for the original report/patch and to Christopher Papke for the final version of the fix.
[Support]: Update camelCase method calls against the threading module to be snake_case; this and related tweaks should fix some deprecation warnings under Python 3.10. Thanks to Karthikeyan Singaravelan for the report, @Narendra-Neerukonda for the patch, and to Thomas Grainger and Jun Omae for patch workshopping.

3 files changed, 12 insertions, 9 deletions

diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index a30bcd44805..dbfaeb1d636 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2022/04/21 11:00:01 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2022/05/05 17:59:35 adam Exp $
 
-DISTNAME=	paramiko-2.8.1
+DISTNAME=	paramiko-2.10.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/paramiko/}
 
@@ -13,7 +12,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
 DEPENDS+=	${PYPKGPREFIX}-nacl>=1.0.1:../../security/py-nacl
-TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+DEPENDS+=	${PYPKGPREFIX}-six>0:../../lang/py-six
+#TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-relaxed-[0-9]*:../../devel/py-test-relaxed
 
 PYTHON_VERSIONED_DEPENDENCIES+=	test:test
diff --git a/security/py-paramiko/PLIST b/security/py-paramiko/PLIST
index a5f94a8befe..04029436772 100644
--- a/security/py-paramiko/PLIST
+++ b/security/py-paramiko/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/06/10 08:42:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2022/05/05 17:59:35 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -136,6 +136,9 @@ ${PYSITELIB}/paramiko/transport.pyo
 ${PYSITELIB}/paramiko/util.py
 ${PYSITELIB}/paramiko/util.pyc
 ${PYSITELIB}/paramiko/util.pyo
+${PYSITELIB}/paramiko/win_openssh.py
+${PYSITELIB}/paramiko/win_openssh.pyc
+${PYSITELIB}/paramiko/win_openssh.pyo
 ${PYSITELIB}/paramiko/win_pageant.py
 ${PYSITELIB}/paramiko/win_pageant.pyc
 ${PYSITELIB}/paramiko/win_pageant.pyo
diff --git a/security/py-paramiko/distinfo b/security/py-paramiko/distinfo
index e776f6e69dd..00dfde82536 100644
--- a/security/py-paramiko/distinfo
+++ b/security/py-paramiko/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2021/11/29 09:33:19 adam Exp $
+$NetBSD: distinfo,v 1.29 2022/05/05 17:59:35 adam Exp $
 
-BLAKE2s (paramiko-2.8.1.tar.gz) = 9e888506771d21939211445998131c75d6e402f7d4c53254fa606e8c41506963
-SHA512 (paramiko-2.8.1.tar.gz) = 6514a4eb415f0745bea5640e263b2db18422b1ded933ae55dae1693ea574258e26f5629b44b585b86180cc31e27a24bfeaf7f8530599bbc5c522727aba70ec1f
-Size (paramiko-2.8.1.tar.gz) = 1057497 bytes
+BLAKE2s (paramiko-2.10.4.tar.gz) = 5273f92df30dc34c939c13aedc3d232735adeb923218656a21da4f3fc24ec587
+SHA512 (paramiko-2.10.4.tar.gz) = bd467e5115f9abc9dac09c4de7a2d57173caf42b01585ee71846b8634df39048fb27bf549fa8cdf46a5c3bae781e43287f57ff3eb67ee5f37732d02cccd947a7
+Size (paramiko-2.10.4.tar.gz) = 1068156 bytes