aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/hostkey.patch17
-rw-r--r--debian/patches/series1
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 38c3c0e..b6948a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+paramiko (1.7.7.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix broken host key handling when port != 22 (Closes: 668239)
+
+ -- Luk Claes <luk@debian.org> Thu, 05 Jul 2012 00:38:56 +0000
+
paramiko (1.7.7.1-2) unstable; urgency=low
* debian/*: Update build to use dh_python2 (Closes: #637379)
diff --git a/debian/patches/hostkey.patch b/debian/patches/hostkey.patch
new file mode 100644
index 0000000..6997d8a
--- /dev/null
+++ b/debian/patches/hostkey.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..3ad788b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hostkey.patch