diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-13 02:13:22 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-13 02:13:22 +0000 |
| commit | 702e0f1e71351b11014ee43c16a8ab790776cf80 (patch) | |
| tree | dd2fc59d1a2d6d5f3eb95c3e72984dc07ebe5f9e /gnome-base/orbit/files | |
| parent | Stable for HPPA (bug #455766). (diff) | |
| download | gentoo-2-702e0f1e71351b11014ee43c16a8ab790776cf80.tar.gz gentoo-2-702e0f1e71351b11014ee43c16a8ab790776cf80.tar.bz2 gentoo-2-702e0f1e71351b11014ee43c16a8ab790776cf80.zip | |
Update patch to upstreamed version.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'gnome-base/orbit/files')
| -rw-r--r-- | gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch index c7b80326002c..2344935f46d2 100644 --- a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch +++ b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch @@ -1,4 +1,4 @@ -From 244ff588863a18d1eff4aec1e8df22fa8e001444 Mon Sep 17 00:00:00 2001 +From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetromino@gentoo.org> Date: Tue, 12 Feb 2013 00:27:41 -0500 Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some @@ -7,26 +7,20 @@ Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one, by setting hints.ai_family before calling getaddrinfo(). -Note that we only set hints.ai_family if proto->family == AF_INET, -because in a check below, link_protocol_is_local_ipv46() explicitly -treats the "proto->family!=AF_INET but local_addr->ai_family!=AF_INET6" -case as non-local. - https://bugzilla.gnome.org/show_bug.cgi?id=693636 --- - linc2/src/linc-protocols.c | 2 ++ - 1 file changed, 2 insertions(+) + linc2/src/linc-protocols.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c -index e6895f4..711fb79 100644 +index e6895f4..22a77aa 100644 --- a/linc2/src/linc-protocols.c +++ b/linc2/src/linc-protocols.c -@@ -383,6 +383,8 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto, +@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto, memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; -+ if (proto->family == AF_INET) -+ hints.ai_family = AF_INET; ++ hints.ai_family = proto->family; if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) { if (!warned++) |