Index: head/security/py-paramiko/files/patch-paramiko_client.py =================================================================== --- head/security/py-paramiko/files/patch-paramiko_client.py (revision 450846) +++ head/security/py-paramiko/files/patch-paramiko_client.py (nonexistent) @@ -1,44 +0,0 @@ ---- paramiko/client.py.orig 2017-07-30 14:38:18 UTC -+++ paramiko/client.py -@@ -331,6 +331,30 @@ class SSHClient (ClosingContextManager): - t = self._transport = Transport( - sock, gss_kex=gss_kex, gss_deleg_creds=gss_deleg_creds) - t.use_compression(compress=compress) -+ -+ if port == SSH_PORT: -+ server_hostkey_name = hostname -+ else: -+ server_hostkey_name = "[%s]:%d" % (hostname, port) -+ -+ # if we already have a host key stored, change our key preference -+ known_host_keys = {} -+ known_host_keys.update( -+ self._system_host_keys.get(server_hostkey_name, {}) -+ ) -+ known_host_keys.update( -+ self.get_host_keys().get(server_hostkey_name, {}) -+ ) -+ -+ if known_host_keys: -+ # order the keys as follows: known keys in preferred-keys order, -+ # then unknown keys in preferred-keys order -+ valid_known_keys = [k for k in t._preferred_keys -+ if k in known_host_keys] -+ t._preferred_keys = (valid_known_keys -+ + [k for k in t._preferred_keys -+ if k not in valid_known_keys]) -+ - if gss_kex and gss_host is None: - t.set_gss_host(hostname) - elif gss_kex and gss_host is not None: -@@ -344,10 +368,6 @@ class SSHClient (ClosingContextManager): - if auth_timeout is not None: - t.auth_timeout = auth_timeout - -- if port == SSH_PORT: -- server_hostkey_name = hostname -- else: -- server_hostkey_name = "[%s]:%d" % (hostname, port) - our_server_keys = None - - # If GSS-API Key Exchange is performed we are not required to check the Property changes on: head/security/py-paramiko/files/patch-paramiko_client.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/py-paramiko/Makefile =================================================================== --- head/security/py-paramiko/Makefile (revision 450846) +++ head/security/py-paramiko/Makefile (revision 450847) @@ -1,32 +1,32 @@ # Created by: Ulf Lilleengen # $FreeBSD$ PORTNAME= paramiko -PORTVERSION= 2.2.1 +PORTVERSION= 2.3.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sbz@FreeBSD.org COMMENT= Python SSH2 protocol library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt \ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \ ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl USES?= python USE_PYTHON= autoplist concurrent distutils CONFLICTS_INSTALL= py??-paramiko1-* OPTIONS_DEFINE= EXAMPLES do-test: extract @(cd ${WRKSRC} && ${PYTHON_CMD} test.py) .include Index: head/security/py-paramiko/distinfo =================================================================== --- head/security/py-paramiko/distinfo (revision 450846) +++ head/security/py-paramiko/distinfo (revision 450847) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501425369 -SHA256 (paramiko-2.2.1.tar.gz) = ff94ae65379914ec3c960de731381f49092057b6dd1d24d18842ead5a2eb2277 -SIZE (paramiko-2.2.1.tar.gz) = 1205818 +TIMESTAMP = 1506598600 +SHA256 (paramiko-2.3.1.tar.gz) = fa6b4f5c9d88f27c60fd9578146ff24e99d4b9f63391ff1343305bfd766c4660 +SIZE (paramiko-2.3.1.tar.gz) = 1244407