From c069246d256f836a4228bcdf714301e45570f6c5 Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Sat, 25 May 2013 00:32:33 -0400 Subject: debian/patches/*: Removed hostkey patch that caused problems The initial patch was by NMU and later reported as not fixing the problem so I'm reverting it. Thanks: Lars Noschinski --- debian/patches/hostkey.patch | 17 ----------------- debian/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 debian/patches/hostkey.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/hostkey.patch b/debian/patches/hostkey.patch deleted file mode 100644 index 6997d8a..0000000 --- a/debian/patches/hostkey.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: paramiko-1.7.7.1/paramiko/client.py -=================================================================== ---- paramiko-1.7.7.1.orig/paramiko/client.py 2011-05-22 01:57:09.000000000 +0000 -+++ paramiko-1.7.7.1/paramiko/client.py 2012-07-05 00:38:50.000000000 +0000 -@@ -303,11 +303,7 @@ - - server_key = t.get_remote_server_key() - keytype = server_key.get_name() -- -- if port == SSH_PORT: -- server_hostkey_name = hostname -- else: -- server_hostkey_name = "[%s]:%d" % (hostname, port) -+ server_hostkey_name = hostname - our_server_key = self._system_host_keys.get(server_hostkey_name, {}).get(keytype, None) - if our_server_key is None: - our_server_key = self._host_keys.get(server_hostkey_name, {}).get(keytype, None) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 3ad788b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -hostkey.patch -- cgit v1.2.3