From 924db7fb291d06515b6ab7fcd4cddc52f20e6099 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jcollie@fedoraproject.org>
Date: Nov 02 2009 13:12:38 +0000
Subject: - v1.7.6 (Fanny) 1nov09

- ---------------------
- * fixed bugs 411099 (sftp chdir isn't unicode-safe), 363163 & 411910
    (more
- IPv6 problems on windows), 413850 (race when server closes the channel),
- 426925 (support port numbers in host keys)

---

diff --git a/.cvsignore b/.cvsignore
index 3a90760..e35dacc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-paramiko-1.7.5.tar.gz
+paramiko-1.7.6.tar.gz
diff --git a/paramiko-channel-race.patch b/paramiko-channel-race.patch
deleted file mode 100644
index 9c43e63..0000000
--- a/paramiko-channel-race.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: paramiko/channel.py
-===================================================================
---- paramiko/channel.py	(revision 16146)
-+++ paramiko/channel.py	(working copy)
-@@ -90,6 +90,7 @@
-         self.logger = util.get_logger('paramiko.transport')
-         self._pipe = None
-         self.event = threading.Event()
-+        self.event_ready = False
-         self.combine_stderr = False
-         self.exit_status = -1
-         self.origin_addr = None
-@@ -152,7 +153,7 @@
-         # pixel height, width (usually useless)
-         m.add_int(0).add_int(0)
-         m.add_string('')
--        self.event.clear()
-+        self._event_pending()
-         self.transport._send_user_message(m)
-         self._wait_for_event()
- 
-@@ -179,7 +180,7 @@
-         m.add_int(self.remote_chanid)
-         m.add_string('shell')
-         m.add_boolean(1)
--        self.event.clear()
-+        self._event_pending()
-         self.transport._send_user_message(m)
-         self._wait_for_event()
- 
-@@ -207,7 +208,7 @@
-         m.add_string('exec')
-         m.add_boolean(True)
-         m.add_string(command)
--        self.event.clear()
-+        self._event_pending()
-         self.transport._send_user_message(m)
-         self._wait_for_event()
- 
-@@ -234,7 +235,7 @@
-         m.add_string('subsystem')
-         m.add_boolean(True)
-         m.add_string(subsystem)
--        self.event.clear()
-+        self._event_pending()
-         self.transport._send_user_message(m)
-         self._wait_for_event()
- 
-@@ -261,7 +262,7 @@
-         m.add_int(width)
-         m.add_int(height)
-         m.add_int(0).add_int(0)
--        self.event.clear()
-+        self._event_pending()
-         self.transport._send_user_message(m)
-         self._wait_for_event()
- 
-@@ -374,7 +375,7 @@
-         m.add_string(auth_protocol)
-         m.add_string(auth_cookie)
-         m.add_int(screen_number)
--        self.event.clear()
-+        self._event_pending()
-         self.transport._send_user_message(m)
-         self._wait_for_event()
-         self.transport._set_x11_handler(handler)
-@@ -917,9 +918,10 @@
-         self.out_max_packet_size = max(max_packet_size, MIN_PACKET_SIZE)
-         self.active = 1
-         self._log(DEBUG, 'Max packet out: %d bytes' % max_packet_size)
--
-+        
-     def _request_success(self, m):
-         self._log(DEBUG, 'Sesch channel %d request ok' % self.chanid)
-+        self.event_ready = True
-         self.event.set()
-         return
- 
-@@ -1067,14 +1069,19 @@
-     def _log(self, level, msg, *args):
-         self.logger.log(level, "[chan " + self._name + "] " + msg, *args)
- 
-+    def _event_pending(self):
-+        self.event.clear()
-+        self.event_ready = False
-+
-     def _wait_for_event(self):
-         self.event.wait()
-         assert self.event.isSet()
--        if self.closed:
--            e = self.transport.get_exception()
--            if e is None:
--                e = SSHException('Channel closed.')
--            raise e
-+        if self.event_ready:
-+            return
-+        e = self.transport.get_exception()
-+        if e is None:
-+            e = SSHException('Channel closed.')
-+        raise e
- 
-     def _set_closed(self):
-         # you are holding the lock.
diff --git a/python-paramiko.spec b/python-paramiko.spec
index 774f53e..edef68b 100644
--- a/python-paramiko.spec
+++ b/python-paramiko.spec
@@ -3,8 +3,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.7.5
-Release:        2%{?dist}
+Version:        1.7.6
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -12,7 +12,6 @@ Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.lag.net/paramiko/
 Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.tar.gz
-Patch0: 	paramiko-channel-race.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +36,6 @@ encrypted tunnel. (This is how sftp works, for example.)
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p0 -b .race
 %{__chmod} a-x demos/*
 %{__sed} -i -e '/^#!/,1d' demos/* paramiko/rng*
 
@@ -57,6 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Mon Nov  2 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.6-1
+- v1.7.6 (Fanny) 1nov09
+- ---------------------
+-  * fixed bugs 411099 (sftp chdir isn't unicode-safe), 363163 & 411910 (more
+-    IPv6 problems on windows), 413850 (race when server closes the channel),
+-    426925 (support port numbers in host keys)
+
 * Tue Oct 13 2009 Jeremy Katz <katzj@fedoraproject.org> - 1.7.5-2
 - Fix race condition (#526341)
 
diff --git a/sources b/sources
index 002a1b1..e127415 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7eac2199bea086cc22966eb223c64e7f  paramiko-1.7.5.tar.gz
+fa144ab46f1dc639b05ab948c30efac4  paramiko-1.7.6.tar.gz