Import patches from debian

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

5 files changed, 152 insertions, 5 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 1eb5a82d0e10..9dfffbd4b911 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,14 @@
 # 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.88 2009/06/17 22:09:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.89 2009/07/05 17:13:31 tester Exp $
+
+*loudmouth-1.4.3-r1 (05 Jul 2009)
+
+  05 Jul 2009; Olivier Crête <tester@gentoo.org>
+  +files/loudmouth-1.4.3-drop-stanzas-on-fail.patch,
+  +files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch,
+  +loudmouth-1.4.3-r1.ebuild:
+  Import patches from debian
 
   17 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -loudmouth-1.2.3.ebuild, -loudmouth-1.4.2.ebuild,
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index fa05e1077405..a10af985dff9 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 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 1714 RMD160 0b4d9ddb9eb5cb5fafd9706e34772a1429456b99 SHA1 e9475000fb04c300d684fb03d1d79f6c4acfa758 SHA256 d8654300b7ab6e76d6109d55c87ac79d2b8d03fb6a4e99fc07cc599944862a4a
 EBUILD loudmouth-1.4.3.ebuild 1334 RMD160 750f3dad9aabe86fda435f6329f3256b020eb80e SHA1 e6cf49368cb4428f0d2148e8c52cb3fbd52c3cd0 SHA256 69de54a0810b0a389046d70c0058155b60265037ecb3b339dd759a957674af52
-MISC ChangeLog 11214 RMD160 70110809cb3a7371b6cbab140d14145d7f99b8ef SHA1 5fe61ed37b8ec21ebf999163064aa10319012338 SHA256 15d14b547f77579d2b2caab777e52a43eca8db4982bb16b52b5cab364c2a9d74
+MISC ChangeLog 11471 RMD160 95bb4daa8dc5d63b6dbdfcb3676646314e6c5197 SHA1 39d7867bf5f4e5e19dd76302eee6dd3271176f2a SHA256 3b0423b0cfc8e71f8c4fd1b7241793116a3b4302daff1bfa099ab96a79c93c0f
 MISC metadata.xml 258 RMD160 85cf4588f19fabaeb6fe13f58c6ae1fb6e51e798 SHA1 bced822ded5aef8c673d7e65f1cdc727fe3711c4 SHA256 0db8d15e4fd277e63ff3200516092f2cc3ab46da07da76e5e7baf37937a734c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko5hdEACgkQ1fmVwcYIWAYaugCeMnHAdGflWle0nKFCPtIlm9yL
-5XsAn2lPkH6YrCUNYodYDJZEIw7ft6ss
-=50gJ
+iEYEARECAAYFAkpQ30YACgkQmOfEJZHYOKfIlgCfVR6AY0PBnezHYGuBMRle84fQ
+sTYAnRKbkVBjgPmjg7NQr5sQA7sV+bgL
+=Sktl
 -----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch
new file mode 100644
index 000000000000..05c76c590b58
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch
@@ -0,0 +1,47 @@
+
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c |   15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext  *context,
+ 		if (!m) {
+ 			g_warning ("Couldn't create message: %s\n",
+ 				   parser->cur_root->name);
+-			return;
+-		}
+-
+-		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++		} else {
++			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ 		       "Have a new message\n");
+-		if (parser->function) {
+-			(* parser->function) (parser, m, parser->user_data);
++			if (parser->function) {
++				(* parser->function) (parser, m, parser->user_data);
++			}
++			lm_message_unref (m);
+ 		}
+ 
+-		lm_message_unref (m);
+ 		lm_message_node_unref (parser->cur_root);
+-		
+-			
+ 		parser->cur_node = parser->cur_root = NULL;
+ 	} else {
+ 		LmMessageNode *tmp_node;
+-- 
+1.5.6.5
+
+
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch
new file mode 100644
index 000000000000..5bca69c0c15e
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch
@@ -0,0 +1,24 @@
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 21c1bc2..ae8de94 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection      *connection,
+ 	connection->effective_jid = g_strdup_printf ("%s/%s", 
+ 		connection->jid, connection->resource);
+ 
+ 	if (connection->use_sasl) {
++		gchar *domain = NULL;
++
++		if (!connection_get_server_from_jid (connection->jid, &domain)) {
++			domain = g_strdup (connection->server);
++		}
++
+ 		lm_sasl_authenticate (connection->sasl,
+ 				      username, password,
+-				      connection->server,
++				      domain,
+ 				      connection_sasl_auth_finished);
++		g_free (domain);
+ 
+ 		connection->features_cb  =
+ 			lm_message_handler_new (connection_features_cb,
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..761a4e842007
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.1 2009/07/05 17:13:31 tester Exp $
+
+inherit autotools gnome2
+
+DESCRIPTION="Lightweight C Jabber library"
+HOMEPAGE="http://www.loudmouth-project.org/"
+SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="asyncns doc ssl debug test"
+
+RDEPEND=">=dev-libs/glib-2.4
+	ssl? ( >=net-libs/gnutls-1.4.0 )
+	asyncns? ( net-libs/libasyncns )"
+# FIXME:
+#   openssl dropped because of bug #216705
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=dev-util/gtk-doc-am-1"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable debug)"
+
+	if use ssl; then
+		G2CONF="${G2CONF} --with-ssl=gnutls"
+	else
+		G2CONF="${G2CONF} --with-ssl=no"
+	fi
+
+	if use asyncns; then
+		G2CONF="${G2CONF} --with-asyncns=system"
+	else
+		G2CONF="${G2CONF}  --without-asyncns"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Use system libasyncns, bug #236844
+	epatch "${FILESDIR}/${P}-asyncns-system.patch"
+
+	# Fix detection of gnutls-2.8, bug #272027
+	epatch "${FILESDIR}/${P}-gnutls28.patch"
+
+ 	# Fix digest auth with SRV (or similar)
+	# Upstream: http://loudmouth.lighthouseapp.com/projects/17276-libloudmouth/tickets/44-md5-digest-uri-not-set-correctly-when-using-srv
+	epatch "${FILESDIR}/${P}-fix-sasl-md5-digest-uri.patch"
+
+	# Drop stanzas when failing to convert them to LmMessages
+	# From debian..
+	epatch "${FILESDIR}/${P}-drop-stanzas-on-fail.patch"
+	
+	eautoreconf
+}