[project @ robey@lag.net-20061119205558-p5p2tmqx0xt7hq9r]

bump version to 1.6.4 (yanma) and trim the README changes-history a bit

5 files changed, 19 insertions, 70 deletions

diff --git a/Makefile b/Makefile
index efebcfca..2051cf4d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@
 # vulpix (10jul06) - 1.6.1
 # weedle (16aug06) - 1.6.2
 # xatu (14oct06) - 1.6.3
+# yanma (19nov06) - 1.6.4
 
 
 ifeq ($(wildcard /sbin/md5),/sbin/md5)
diff --git a/README b/README
index 92c1ce12..2c864cda 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-paramiko 1.6.3
-"xatu" release, 14 oct 2006
+paramiko 1.6.4
+"yanma" release, 19 nov 2006
 
 Copyright (c) 2003-2006 Robey Pointer <robey@lag.net>
 
@@ -151,6 +151,15 @@ which will verify that most of the core components are working correctly.
 
 highlights of what's new in each release:
 
+v1.6.4 YANMA
+* fix setup.py on osx (oops!)
+* (bug 69330) check for the existence of RSA/DSA keys before trying to open
+  them in SFTPClient
+* (bug 69222) catch EAGAIN in socket code to workaround a bug in recent
+  Linux 2.6 kernels
+* (bug 70398) improve dict emulation in HostKeys objects
+* try harder to make sure all worker threads are joined on Transport.close()
+
 v1.6.3 XATU
 * fixed bug where HostKeys.__setitem__ wouldn't always do the right thing
 * fixed bug in SFTPClient.chdir and SFTPAttributes.__str__ [patch from
@@ -183,67 +192,6 @@ v1.6 UMBREON
 * SFTP readv() now yields results as it gets them
 * several APIs changed to throw an exception instead of "False" on failure
 
-v1.5.4 TENTACOOL
-* fixed HostKeys to more correctly emulate a python dict
-* fixed a bug where file read buffering was too aggressive
-* improved prefetching so that out-of-order reads still use the prefetch
-  buffer
-* added experimental SFTPFile.readv() call
-* more unit tests
-
-v1.5.3 SQUIRTLE
-* a few performance enhancements
-* added HostKeys, for dealing with openssh style "known_hosts" files, and
-  added support for hashed hostnames
-* added Transport.atfork() for dealing with forked children
-* added SFTPClient.truncate, SFTPFile.chmod, SFTPFile.chown, SFTPFile.utime,
-  and SFTPFile.truncate
-* improved windows demos [patch from mike looijmans], added an sftp demo, and
-  moved demos to the demos/ folder
-* fixed a few interoperability bugs
-* cleaned up logging a bit
-* fixed a bug where EOF on a Channel might not be detected by select [found
-  by thomas steinacher]
-* fixed python 2.4-ism that crept in [patch by jan hudec]
-* fixed a few reference loops that could have interacted badly with the python
-  garbage collector
-* fixed a bunch of pychecker warnings, some of which were bugs
-
-v1.5.2 RHYDON
-* compression support (opt-in via Transport.use_compression)
-* sftp files may be opened with mode flag 'x' for O_EXCL (exclusive-open)
-  behavior, which has no direct python equivalent
-* added experimental util functions for parsing openssh config files
-* fixed a few bugs (and potential deadlocks) with key renegotiation
-* fixed a bug that caused SFTPFile.prefetch to occasionally lock up
-* fixed an sftp bug which affected van dyke sftp servers
-* fixed the behavior of select()ing on a closed channel, such that it will
-  always trigger as readable
-
-v1.5.1 QUILAVA
-* SFTPFile.prefetch() added to dramatically speed up downloads (automatically
-  turned on in SFTPClient.get())
-* fixed bug where garbage-collected Channels could trigger the Transport to
-  close the session (reported by gordon good)
-* fixed a deadlock in rekeying (reported by wendell wood)
-* fixed some windows bugs and SFTPAttributes.__str__() (reported by grzegorz
-  makarewicz)
-* better sftp error reporting by adding fake "errno" info to IOErrors
-
-v1.5 PARAS
-* added support for "keyboard-interactive" authentication
-* added mode (on by default) where password authentication will try to
-  fallback to "keyboard-interactive" if it's supported
-* added pipelining to SFTPFile.write and SFTPClient.put
-* fixed bug with SFTPFile.close() not guarding against being called more
-  than once (thanks to Nathaniel Smith)
-* fixed broken 'a' flag in SFTPClient.file() (thanks to Nathaniel Smith)
-* fixed up epydocs to look nicer
-* reorganized auth_transport into auth_handler, which seems to be a cleaner
-  separation
-* demo scripts fixed to have a better chance of loading the host keys
-  correctly on windows/cygwin
-
 
 ***  MISSING LINKS
 
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 41fdc1fa..f6fb45c4 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -47,7 +47,7 @@ released under the GNU Lesser General Public License (LGPL).
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.6.3 (xatu)
+@version: 1.6.4 (yanma)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -60,9 +60,9 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "14 Oct 2006"
-__version__ = "1.6.3 (xatu)"
-__version_info__ = (1, 6, 3)
+__date__ = "19 Nov 2006"
+__version__ = "1.6.4 (yanma)"
+__version_info__ = (1, 6, 4)
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index a5d342aa..762781b2 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -149,7 +149,7 @@ class Transport (threading.Thread):
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.6.3'
+    _CLIENT_ID = 'paramiko_1.6.4'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )
diff --git a/setup.py b/setup.py
index 6e7ec38a..d9301b01 100644
--- a/setup.py
+++ b/setup.py
@@ -48,13 +48,13 @@ if sys.platform == 'darwin':
 
 
 setup(name = "paramiko",
-      version = "1.6.3",
+      version = "1.6.4",
       description = "SSH2 protocol library",
       author = "Robey Pointer",
       author_email = "robey@lag.net",
       url = "http://www.lag.net/paramiko/",
       packages = [ 'paramiko' ],
-      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.6.3.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.6.4.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',