diff options
| author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-07-19 19:29:57 +0200 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-07-30 08:46:41 +0200 |
| commit | 3e85c8c4859384b2e7860512dee265c8d18ec370 (patch) | |
| tree | 7651bef4ad238b7146bfcac02f06ae99e39c6046 /dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch | |
| parent | 85215a443760d327556e220a6fa9ed04dad55ea9 (diff) | |
| download | gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.gz gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.bz2 gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.zip | |
dev-db/*: remove unused patches.
Squash all commit messages into a single one.
Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch')
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch deleted file mode 100644 index ad131b781ace..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch +++ /dev/null @@ -1,51 +0,0 @@ -Last-Update: 2014-10-07 -Forwarded: not-needed -From: Alfredo Kojima -Bug-Upstream: http://bugs.mysql.com/bug.php?id=74223 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763971 -Description: fix connectivity through SSH tunnel. - -=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py' ---- a/plugins/wb.admin/backend/wb_admin_ssh.py -+++ b/plugins/wb.admin/backend/wb_admin_ssh.py -@@ -84,10 +84,14 @@ - m = Message() - m.add_byte(chr(MSG_CHANNEL_OPEN)) - m.add_string(kind) - m.add_int(chanid) -- m.add_int(self.window_size) -- m.add_int(self.max_packet_size) -+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0): -+ m.add_int(self.window_size) -+ m.add_int(self.max_packet_size) -+ else: -+ m.add_int(self.default_window_size) -+ m.add_int(self.default_max_packet_size) - if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'): - m.add_string(dest_addr[0]) - m.add_int(dest_addr[1]) - m.add_string(src_addr[0]) -@@ -99,9 +103,12 @@ - self._channels.put(chanid, chan) - self.channel_events[chanid] = event = threading.Event() - self.channels_seen[chanid] = True - chan._set_transport(self) -- chan._set_window(self.window_size, self.max_packet_size) -+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0): -+ chan._set_window(self.window_size, self.max_packet_size) -+ else: -+ chan._set_window(self.default_window_size, self.default_max_packet_size) - finally: - self.lock.release() - self._send_user_message(m) - ts = time.time() + OPEN_CHANNEL_TIMEOUT if (timeout is None) else timeout -@@ -669,8 +676,9 @@ - - read_timeout = 10 - - if self.client is not None: -+ chan = None - transport = self.client.get_transport() - try: - spawn_process = False - if 'nohup' in cmd: |