tags 668239 + pending
thanks

Dear maintainer,

I've prepared an NMU for paramiko (versioned as 1.7.7.1-2.1) and
will have it uploaded soon.

Cheers

Luk
diff -Nru paramiko-1.7.7.1/debian/changelog paramiko-1.7.7.1/debian/changelog
--- paramiko-1.7.7.1/debian/changelog	2011-10-02 19:47:51.000000000 +0200
+++ paramiko-1.7.7.1/debian/changelog	2012-07-05 02:45:26.000000000 +0200
@@ -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 <l...@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 -Nru paramiko-1.7.7.1/debian/patches/hostkey.patch paramiko-1.7.7.1/debian/patches/hostkey.patch
--- paramiko-1.7.7.1/debian/patches/hostkey.patch	1970-01-01 01:00:00.000000000 +0100
+++ paramiko-1.7.7.1/debian/patches/hostkey.patch	2012-07-05 02:48:07.000000000 +0200
@@ -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 -Nru paramiko-1.7.7.1/debian/patches/series paramiko-1.7.7.1/debian/patches/series
--- paramiko-1.7.7.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ paramiko-1.7.7.1/debian/patches/series	2012-07-05 02:30:28.000000000 +0200
@@ -0,0 +1 @@
+hostkey.patch

Reply via email to