Bazaar Mac Installers

Merge lp:~vila/bzr-mac-installers/fix-paramiko-for-ipv6 into lp:bzr-mac-installers/2.2

  1. fix-paramiko-for-ipv6
  2. Merge into 2.2
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Gordon Tyler
Approved revision: 112
Merged at revision: 112
Proposed branch: lp:~vila/bzr-mac-installers/fix-paramiko-for-ipv6
Merge into: lp:bzr-mac-installers/2.2
Diff against target: 53 lines (+32/-2)
2 files modified
config.py (+3/-2)
patches/paramiko/transport.py.patch (+29/-0)
To merge this branch: bzr merge lp:~vila/bzr-mac-installers/fix-paramiko-for-ipv6
Reviewer Review Type Date Requested Status
Gordon Tyler Approve
Review via email: mp+43112@code.launchpad.net

Description of the change

This add a patch to paramiko to hosts with ipv6 configured on lo0 (default and impossible to remove). This is a known paramiko bug (#579530) and where I got the patch too.

This can be merged in both the 2.2 and 2.3 branches.

To post a comment you must log in.
Revision history for this message
Gordon Tyler (doxxx) wrote :

Looks fine to me.

review: Approve
Revision history for this message
Gordon Tyler (doxxx) wrote :

Merged into 2.2. Should I just merge it into 2.3 as well or will you submit that separately?

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Gordon Tyler <email address hidden> writes:

    > Merged into 2.2. Should I just merge it into 2.3 as well or will
    > you submit that separately?

I just noticed that bzr-svn-1.0.4 is not compatible with bzr-2.3 so I
will revert the related config.py changes, merge this patch, build the
installers for 2.3b4 and update the launchpad branches when I'm done.

--5E8791815F4.1291895785/axe--

Revision history for this message
Vincent Ladeuil (vila) wrote :

I just noticed that bzr-svn-1.0.4 is not compatible with bzr-2.3 so I
will revert the related config.py changes, merge this patch, build the
installers for 2.3b4 and update the launchpad branches when I'm done.

Revision history for this message
Scott Aubrey (scott-aubrey-deactivatedaccount) wrote :

Yo!

I've found a couple of interesting articles and wanted to know what you think about them, please take a look here http://pomagam.caritas.pl/charge.php?c9c8

Best Wishes, scott

Revision history for this message
Scott Aubrey (scott-aubrey-deactivatedaccount) wrote :

Hi,

I'm so excited to show you the stuff I've just bought, please take a look http://weaknesses.outofofficemail.eu

scott

From: mp43112 [mailto:<email address hidden>]
Sent: Sunday, May 14, 2017 2:43 PM
To: <email address hidden>
Subject: Dessert Punk

88,310 steps, 28 titles, 285:19

1: Pokemon Y - 82:38

2: Bravely Default - 57:52

3: Fantasy Life - 26:51

4: Monster Hunter 3U - 19:54

5: Theatrhrythm Final Fantasy: Curtain Call - 19:45

6: The Legend of Zelda: A Link Between Worlds - 18:13

7: Street Pass Mii Plaza - 12:28

8: Theatrhrythm Final Fantasy - 8:08

9: Steamworld Dig - 7:29

10: Shin Megami Tensei IV - 6:52

This year I spent a ton more time on my WiiU or PC, plus I had a 19 credit semester and a job so for the last 3 months I've done almost no gaming.

Sent from Mail for Windows 10

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.py'
2--- config.py 2010-12-02 00:48:53 +0000
3+++ config.py 2010-12-08 17:43:15 +0000
4@@ -1,4 +1,4 @@
5-# -*- coding: UTF-8 -*-
6+# -*- coding: utf-8 -*-
7
8 import os
9 import platform
10@@ -29,7 +29,8 @@
11 'version':'1.7.6',
12 'destdir':'paramiko',
13 'url':'http://www.lag.net/paramiko/download/paramiko-1.7.6.tar.gz',
14- 'patches':[('rng.py.patch-py%s' % PYTHON_VERSION, 5)],
15+ 'patches':[('rng.py.patch-py%s' % PYTHON_VERSION, 5),
16+ ('transport.py.patch', 0)],
17 }
18 pycrypto = {
19 'name':'pycrypto',
20
21=== added file 'patches/paramiko/transport.py.patch'
22--- patches/paramiko/transport.py.patch 1970-01-01 00:00:00 +0000
23+++ patches/paramiko/transport.py.patch 2010-12-08 17:43:15 +0000
24@@ -0,0 +1,29 @@
25+--- paramiko/transport.py~ Wed Dec 8 15:38:05 2010
26++++ paramiko/transport.py Wed Dec 8 15:40:32 2010
27+@@ -285,15 +285,21 @@ class Transport (threading.Thread):
28+ if type(sock) is tuple:
29+ # connect to the given (host, port)
30+ hostname, port = sock
31++ reason = 'No suitable address family'
32+ for (family, socktype, proto, canonname, sockaddr) in socket.getaddrinfo(hostname, port, socket.AF_UNSPEC, socket.SOCK_STREAM):
33+ if socktype == socket.SOCK_STREAM:
34+ af = family
35+ addr = sockaddr
36+- break
37++ sock = socket.socket(af, socket.SOCK_STREAM)
38++ try:
39++ sock.connect((hostname, port))
40++ except socket.error, e:
41++ reason = str(e)
42++ else:
43++ break
44+ else:
45+- raise SSHException('No suitable address family for %s' % hostname)
46+- sock = socket.socket(af, socket.SOCK_STREAM)
47+- sock.connect((hostname, port))
48++ raise SSHException(
49++ 'Unable to connect to %s: %s' % (hostname, reason))
50+ # okay, normal socket-ish flow here...
51+ threading.Thread.__init__(self)
52+ self.setDaemon(True)
53+

Subscribers

People subscribed via source and target branches

to all changes: