Update patch to upstreamed version.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 20 insertions, 22 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index f0728ef15b61..d4f28930d8b1 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.186 2013/02/12 06:53:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.187 2013/02/13 02:13:22 tetromino Exp $
+
+  13 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  files/orbit-2.14.19-link_protocol_is_local.patch:
+  Update patch to upstreamed version.
 
 *orbit-2.14.19-r2 (12 Feb 2013)
 
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index e676e8e53cfc..4ec9f95040b8 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX orbit-2.14.19-link_protocol_is_local.patch 1298 SHA256 c7ecf49691138ff9875df0a46a980992d017b1b918437b9436189349b4948cdb SHA512 3cf9b87a621a692f19b27d4be5412ac559c7e5eacd1dcf30e69d27fa098a68c08d9d3c71830e0f82f36febbbcf9d3f60dc9854f1eed5352f143e610c25d40f25 WHIRLPOOL 46353a69f915f5022cbd871f847013b70b5bf758c3c49c399a64b96bad3b2d6c01ee236dd28ac9eb7a9805636038397cfa0485469c58eb716036db1e4ad76978
+AUX orbit-2.14.19-link_protocol_is_local.patch 1006 SHA256 d173885258c5dfb2ddbc6238f239535a49955bbd633b0acf58efcb503af33c97 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8 WHIRLPOOL 4231e42249a9a29a3a6ad51514ebb0585a112ac894aeae416e2540972b887264410e88a39dfaf9154bc059609c9c81f4b3d7ce566f97d8cced802aaf7f8e8c02
 DIST ORBit2-2.14.19.tar.bz2 764820 SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e WHIRLPOOL ed9dffba86ab5a5409fbdfcbe8017ae3251ca261aa57b3ee1089ddfad0422f73e848ed72d3881d664ffe88a3582a8c4652394517ab814c4f0983d446891a1306
 EBUILD orbit-2.14.19-r1.ebuild 2162 SHA256 4bd96c02bf169eb61960ceee0bd66f1c3ae7ef06f13ebbdb704d8f7058a9dfb8 SHA512 f7240b69f05434392eeb791746629391f0f1163385fdee4c3ebd001655721eb409ef9d682937e94b8941586939ea72ae3c9f4970cd1f647a29b4407f7e30a4c6 WHIRLPOOL 123acc04f4f9924410d9f97e4953f0b79f4cba282eddf4dd4daf62d2dc20654c1c5d4e299ec6a82a63ed538d95b171e9737e8d61a97ac56feecbc9e159786b98
 EBUILD orbit-2.14.19-r2.ebuild 2289 SHA256 d2f073ac9d09c2dc86e13b6b21ade9d019be1e246e501867e0bdadc1a5e93397 SHA512 d3de565b80b49bb267d189d9bbebcf6b810eea6d0ec63e24699ae3cafe2447ff5fccc33688a3682fba20c86e1110e6b6d383690490a14ec77da4bfdb210cc4f8 WHIRLPOOL 12b3269e5b1b04a1390b93e4040091baa0ed84b21419696d960a5bf456f568d476ec13df7aed65f8c8fd5aee518affb8089981fda3cf7a8f5e808b860e217c8c
-MISC ChangeLog 23499 SHA256 08562cfc703357b27ceb453decdbf7b5fdd7bb0c7c984639343f2b4f4f162f04 SHA512 4f1bcb522acfff0efc41aa09b997e62105e3449a18ee2dc0cd75857a267971ae585d8ee3e496c66bfed26986935b32cf5c56ec4aae4447138c2850feb0ee75ed WHIRLPOOL 4e789618528b09c3d644a84381305d463cdfa0d38ec710edaeb6df0d1ce842490a64441d708a534f0ed84d5f2977065c160b0f14a70c4272e7f7587cc2de7802
+MISC ChangeLog 23649 SHA256 211b09b9e13aaa95533397547a1f79a123d0b3aa10982772ce41da13e4a9d4c5 SHA512 0caebb738f091fc6db95fdc1409283cd9531b2a2ac45eee5d199a00270d57d8ac27a0c66f7de546306c8cb0872a8bba52000d05131b5db5917f2a5e3d77c1816 WHIRLPOOL 1d0d8597f35eb8fc713bb2d425a4a237391303cf38d6a87e7ba9c4fcc2d617a9335aae7e4c953ab718795ff508ac89cf8e0b895945bfb96311e10656a6c1b943
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRGecIAAoJEJ0WA1zPCt1h2CkH/j7qPt0NZbWsAPNLERXiNsLp
-BZfKFTb3VCF6A8v0VO/8o0ic2kdIJhl930ueAUXiJ/Ht7/wQSp6yLuwHO9SiloKy
-/6BeFePGRQ677wAbLJYW0AjUTfFZSVP41Tkm+1U/EhQaxB48rb0Yqr0fujR8UFpU
-OunBSLyNKcZt4Ht80jg7hFirXbj6ZasEWAt1DZ8WF0VhFe+GLi1jlO6tNHooZOv8
-iAI7UXw38KU396dy4rPjFWfeoih3jw4s5ev8jJSEDTD8EKJ8Bkxp2Nib6AErZW32
-f8MS1VQvOMU3TVhBibT+4ZlB+TGqwJqXRKUceCxTjgDG3uGJRuoRNBQsLSNgs8U=
-=V/aE
+iQEcBAEBCAAGBQJRGvbDAAoJEJ0WA1zPCt1h+REIAK+I2c/H44sgGzU1XjcsbBOS
+h52pIL2FF7erPBUmVcNseY5Z+7LtwNKndFSmVSYZB8SrBs+T2gZ+hAAE8CwEDijZ
+J8bvAcQpP2MxB7xgqx1a3i2+GCV0U0AOu9xJ3hUdjLZ0wI9fqXhNFjQ+T0XSsP68
+uV5yQpESn2HSKbo5tmUSVoQOmf+4ylwLaW1czhn65EgjufUY5oahEDl38hWsxgco
+ZHo48jGYS6QhujawaCeiQAhrOnG19lrjZSK2mXj4mggO5FbneoZYk52ENaWJFxcy
+CRfHoRlIYzgWPNWUgtzBNuOpC91ZIz4eC4ZoCDPbyldwmto6Hh7b7TQEIXJel70=
+=8pc0
 -----END PGP SIGNATURE-----
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++)