Date: Fri, 11 Aug 2017 21:48:58 +0000 (UTC) From: Sofian Brabez <sbz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447809 - in head/security/py-paramiko: . files Message-ID: <201708112148.v7BLmwgH006226@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbz Date: Fri Aug 11 21:48:57 2017 New Revision: 447809 URL: https://svnweb.freebsd.org/changeset/ports/447809 Log: - Update to 2.2.1 PR: 216533 Submitted by: pi Added: head/security/py-paramiko/files/ head/security/py-paramiko/files/patch-paramiko_client.py (contents, props changed) Modified: head/security/py-paramiko/Makefile head/security/py-paramiko/distinfo Modified: head/security/py-paramiko/Makefile ============================================================================== --- head/security/py-paramiko/Makefile Fri Aug 11 21:39:27 2017 (r447808) +++ head/security/py-paramiko/Makefile Fri Aug 11 21:48:57 2017 (r447809) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= paramiko -PORTVERSION= 2.0.5 +PORTVERSION= 2.2.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa -USES= python +USES?= python USE_PYTHON= autoplist concurrent distutils CONFLICTS_INSTALL= py??-paramiko1-* Modified: head/security/py-paramiko/distinfo ============================================================================== --- head/security/py-paramiko/distinfo Fri Aug 11 21:39:27 2017 (r447808) +++ head/security/py-paramiko/distinfo Fri Aug 11 21:48:57 2017 (r447809) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487797591 -SHA256 (paramiko-2.0.5.tar.gz) = 9fd9381326465ede02b5447d7d3b77332e7719e2ee82f39eb4cd342b8437bfe8 -SIZE (paramiko-2.0.5.tar.gz) = 1191546 +TIMESTAMP = 1501425369 +SHA256 (paramiko-2.2.1.tar.gz) = ff94ae65379914ec3c960de731381f49092057b6dd1d24d18842ead5a2eb2277 +SIZE (paramiko-2.2.1.tar.gz) = 1205818 Added: head/security/py-paramiko/files/patch-paramiko_client.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-paramiko/files/patch-paramiko_client.py Fri Aug 11 21:48:57 2017 (r447809) @@ -0,0 +1,44 @@ +--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708112148.v7BLmwgH006226>