Import anopatch for asyncns crash from debian

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 54 insertions, 4 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 9dfffbd4b911..4df399d56f94 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/loudmouth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.89 2009/07/05 17:13:31 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.90 2009/08/31 21:38:05 tester Exp $
+
+  31 Aug 2009; Olivier Crête <tester@gentoo.org> loudmouth-1.4.3-r1.ebuild,
+  +files/loudmouth-1.4.3-async-fix.patch:
+  Import anopatch for asyncns crash from debian
 
 *loudmouth-1.4.3-r1 (05 Jul 2009)
 
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index bef7ed57832e..b47b79b9d03e 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX loudmouth-1.4.3-async-fix.patch 971 RMD160 f4287b8c87187e614e646cfa7d111578d505d3d4 SHA1 c7edd56ee0b60524e1cdd3c7d1971e9773024e7e SHA256 3d5bf6f38c0f6bfff1e3f1ac2dc3becac55e48f44760c7296a230658b2f8dd65
 AUX loudmouth-1.4.3-asyncns-system.patch 2597 RMD160 5e93e7e1bd1971f6f2f343d85a7866c7af063811 SHA1 7916119f99f4301413c8771a35db22d4ff3084b6 SHA256 80c853318b7e7111682128361acace88b496fa4b5b360d618762eb8aec1bde09
 AUX loudmouth-1.4.3-drop-stanzas-on-fail.patch 1413 RMD160 b3f2f17ef410507ca04379160bf1aa3c94620def SHA1 6da9ef9e9dd472956ab6ca3335e033bdbcb632a5 SHA256 9bc2a0e7bf84c904f78e5d8ddf06a2c61214bae935ae3e498a690945040394d0
 AUX loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch 794 RMD160 811c552ebce72853133b2dbad5bd7ffc49f13f60 SHA1 c38f70d5b9d4fa66520cab9350e6a8d51efd76df SHA256 d5aadd091a826597e8f9bdbe413de70093f92aa734c7888840f7314de7dae978
 AUX loudmouth-1.4.3-gnutls28.patch 703 RMD160 efd8db33c1bedc818ae2c6aef5cd94d8c4cebd03 SHA1 18c45db10cd3a4f185b73d84f97d9f75f88a7784 SHA256 6b74102efa1673fd57fbad52682cd002e4676768c5a8eb49c489f5618727b275
 DIST loudmouth-1.4.3.tar.bz2 366818 RMD160 59852d085f73d68b3c061b7192a484527843e67d SHA1 55dd0475760f98ff0ba1f5c712c52ab776b432be SHA256 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3
-EBUILD loudmouth-1.4.3-r1.ebuild 1716 RMD160 7eaed9b92392388b788092b89df02f65be436e4a SHA1 2d495bcef1500127f87966247913dd14570b1cb3 SHA256 5ff437ec2b19dff09a2b5363a10b10516ea4aa80c6f9b6f222ae396dcf367026
+EBUILD loudmouth-1.4.3-r1.ebuild 1838 RMD160 9e92055c0d4aca8b4c4dca3b1c7678631666f495 SHA1 fc7f1629b5dc5252f310ef0794ee77aef06f5cde SHA256 668bf3b35db2dc251066fc5e6eac05e126c17e0ee5f93a236dc6e6014e14a68d
 EBUILD loudmouth-1.4.3.ebuild 1334 RMD160 750f3dad9aabe86fda435f6329f3256b020eb80e SHA1 e6cf49368cb4428f0d2148e8c52cb3fbd52c3cd0 SHA256 69de54a0810b0a389046d70c0058155b60265037ecb3b339dd759a957674af52
-MISC ChangeLog 11471 RMD160 95bb4daa8dc5d63b6dbdfcb3676646314e6c5197 SHA1 39d7867bf5f4e5e19dd76302eee6dd3271176f2a SHA256 3b0423b0cfc8e71f8c4fd1b7241793116a3b4302daff1bfa099ab96a79c93c0f
+MISC ChangeLog 11639 RMD160 bc7e035024e1ec031f3b85580b4e28c7661bb415 SHA1 6cc2025d9fdf1e848453315314712d53bc8d27fa SHA256 28c0f673d955d15c5ab47b31fc2d1beed5f1b8e090147e0584e69f52bcc6b6fd
 MISC metadata.xml 258 RMD160 85cf4588f19fabaeb6fe13f58c6ae1fb6e51e798 SHA1 bced822ded5aef8c673d7e65f1cdc727fe3711c4 SHA256 0db8d15e4fd277e63ff3200516092f2cc3ab46da07da76e5e7baf37937a734c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqcQsMACgkQmOfEJZHYOKdWIQCgs0gpXXUNy/vvqoQH3d0s3Qzy
+hTkAnjJHD/06q97rRoHGWsvCzh7ybnNb
+=BJo/
+-----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch
new file mode 100644
index 000000000000..3213d72865aa
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch
@@ -0,0 +1,30 @@
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -1022,7 +1022,7 @@ _lm_socket_create_phase2 (LmSocket *socket, struct addrinfo *ans)
+ 		if (socket->connect_func) {
+ 			(socket->connect_func) (socket, FALSE, socket->user_data;
+ 		}
+-		g_free (socket->connect_data);
++                g_free (socket->connect_data);
+ 		socket->connect_data = NULL;
+ 		return;
+ 	}
+@@ -1107,6 +1107,10 @@ lm_socket_create (GMainContext      *context,
+ 		_lm_socket_create_phase1 (socket, NULL, 0);
+ 	}
+ 
++#ifndef HAVE_ASYNCNS
++        /* Only do this check if we are not using asyncns or it will crash.
++         * Report and patch by Senko.
++         */
+ 	if (socket->connect_data == NULL) {
+ 		/* Open failed synchronously, probably a DNS lookup problem */
+ 		lm_socket_unref(socket);
+@@ -1118,6 +1122,7 @@ lm_socket_create (GMainContext      *context,
+ 		
+ 		return NULL;
+ 	}
++#endif /* HAVE_ASYNCNS */
+ 		
+ 
+ 	/* If the connection fails synchronously, we don't want to call the
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
index 815ea8dc6a3e..56eed74c3b4f 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild,v 1.2 2009/07/06 03:36:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild,v 1.3 2009/08/31 21:38:05 tester Exp $
 
 inherit autotools gnome2
 
@@ -61,5 +61,10 @@ src_unpack() {
 	# From debian..
 	epatch "${FILESDIR}/${P}-drop-stanzas-on-fail.patch"
 
+	# Don't check for sync dns problems when using asyncns [#33]
+	# From debian..
+	epatch "${FILESDIR}/${P}-async-fix.patch"
+	
+
 	eautoreconf
 }