py-paramiko: updated to 2.6.0

2.6.0:
Add a new keyword argument to SSHClient.connect and Transport, disabled_algorithms, which allows selectively disabling one or more kex/key/cipher/etc algorithms. This can be useful when disabling algorithms your target server (or client) does not support cleanly, or to work around unpatched bugs in Paramiko’s own implementation thereof.

SSHClient.exec_command previously returned a naive ChannelFile object for its stdin value; such objects don’t know to properly shut down the remote end’s stdin when they .close(). This lead to issues (such as hangs) when running remote commands that read from stdin.

Add backwards-compatible support for the gssapi GSSAPI library, as the previous backend (python-gssapi) has since become defunct. This change also includes tests for the GSSAPI functionality.

Tweak many exception classes so their string representations are more human-friendly; this also includes incidental changes to some super() calls.

3 files changed, 9 insertions, 27 deletions

diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index b2840ac93ae..3df37134102 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2019/06/10 08:42:57 adam Exp $
+# $NetBSD: Makefile,v 1.36 2019/07/02 04:31:13 adam Exp $
 
-DISTNAME=	paramiko-2.5.0
+DISTNAME=	paramiko-2.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/paramiko/}
@@ -10,16 +10,15 @@ HOMEPAGE=	http://www.paramiko.org/
 COMMENT=	SSH2 protocol library
 LICENSE=	gnu-lgpl-v2.1
 
-DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.7:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
-DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.5:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-nacl>=1.0.1:../../security/py-nacl
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-relaxed-[0-9]*:../../devel/py-test-relaxed
 
 do-test:
-	cd ${WRKSRC} && py.test-${PYVERSSUFFIX} tests
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-paramiko/distinfo b/security/py-paramiko/distinfo
index 48427454e70..80d2f6a449f 100644
--- a/security/py-paramiko/distinfo
+++ b/security/py-paramiko/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.21 2019/06/10 08:42:57 adam Exp $
+$NetBSD: distinfo,v 1.22 2019/07/02 04:31:13 adam Exp $
 
-SHA1 (paramiko-2.5.0.tar.gz) = 5ad28a844ca67deb14aed54e9739d86dd2c4eeb8
-RMD160 (paramiko-2.5.0.tar.gz) = b7a503a6df1d76ab993bb645796b94276aa3a0f7
-SHA512 (paramiko-2.5.0.tar.gz) = db371ff9f05916b1957ff01bb46cdb8e5aa08b5f9a75d4bfccbf7c16da373b65ef70d8e82bebbc208724b1371448e1b4306fac68c437be433da53a015467d1af
-Size (paramiko-2.5.0.tar.gz) = 1224952 bytes
-SHA1 (patch-paramiko_ssh__gss.py) = e6f42443ee6e96c344ed84779f81a5a133eb06d5
+SHA1 (paramiko-2.6.0.tar.gz) = b3ece8385409624d67dd503c48c6d71b0a3907a5
+RMD160 (paramiko-2.6.0.tar.gz) = 82c1bec4374aa9d2de56ced753d65bcdf3642f7a
+SHA512 (paramiko-2.6.0.tar.gz) = a54ec36ebef3d1bfbdc0fe4de07fe73ca7177dbf5fd4683a408d8c7f174bf4e4d7c9f119aa5c450fb932d6a9e09002547451579726296e2712aa1e2e9f4d0431
+Size (paramiko-2.6.0.tar.gz) = 1018679 bytes
diff --git a/security/py-paramiko/patches/patch-paramiko_ssh__gss.py b/security/py-paramiko/patches/patch-paramiko_ssh__gss.py
deleted file mode 100644
index 6363718bd76..00000000000
--- a/security/py-paramiko/patches/patch-paramiko_ssh__gss.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-paramiko_ssh__gss.py,v 1.2 2018/09/21 11:04:16 adam Exp $
-
-Paramiko does not work with current py-gssapi.
-https://github.com/paramiko/paramiko/issues/1069
-
---- paramiko/ssh_gss.py.orig	2018-09-19 04:21:52.000000000 +0000
-+++ paramiko/ssh_gss.py
-@@ -50,7 +50,7 @@ from pyasn1.codec.der import encoder, de
- _API = "MIT"
- 
- try:
--    import gssapi
-+    import gssapi_fails
- 
-     GSS_EXCEPTIONS = (gssapi.GSSException,)
- except (ImportError, OSError):