Attachment 184846 Details for Bug 216533 – update to 2.2.1, add github 473 fix

[patch] update to 2.2.1, add github 473 fix

para.diff (text/plain), 3.14 KB, created by Kurt Jaeger on 2017-07-30 14:46:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2017-07-30 14:46:18 UTC

Size: 3.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 446909)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	paramiko
>-PORTVERSION=	2.0.5
>+PORTVERSION=	2.2.1
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 446909)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-paramiko_client.py
>===================================================================
>--- files/patch-paramiko_client.py	(nonexistent)
>+++ files/patch-paramiko_client.py	(working copy)
>@@ -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
>
>Property changes on: files/patch-paramiko_client.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

pi: maintainer-approval?

Actions: View | Diff

Attachments on bug 216533: 184846