[arch-commits] Commit in loudmouth/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Tue Jul 20 13:22:05 UTC 2010
Date: Tuesday, July 20, 2010 @ 09:22:04
Author: jgc
Revision: 85826
upgpkg: loudmouth 1.4.3-2
Add some more recommended patches. Downloaded from Debian
Added:
loudmouth/trunk/01-fix-sasl-md5-digest-uri.patch
loudmouth/trunk/03-drop-stanzas-on-fail.patch
Modified:
loudmouth/trunk/PKGBUILD
----------------------------------+
01-fix-sasl-md5-digest-uri.patch | 24 +++++++++++++++++++
03-drop-stanzas-on-fail.patch | 45 +++++++++++++++++++++++++++++++++++++
PKGBUILD | 8 +++++-
3 files changed, 76 insertions(+), 1 deletion(-)
Added: 01-fix-sasl-md5-digest-uri.patch
===================================================================
--- 01-fix-sasl-md5-digest-uri.patch (rev 0)
+++ 01-fix-sasl-md5-digest-uri.patch 2010-07-20 13:22:04 UTC (rev 85826)
@@ -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,
Added: 03-drop-stanzas-on-fail.patch
===================================================================
--- 03-drop-stanzas-on-fail.patch (rev 0)
+++ 03-drop-stanzas-on-fail.patch 2010-07-20 13:22:04 UTC (rev 85826)
@@ -0,0 +1,45 @@
+From: Sjoerd Simons <sjoerd.simons at 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
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-20 13:09:20 UTC (rev 85825)
+++ PKGBUILD 2010-07-20 13:22:04 UTC (rev 85826)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.3 2003/11/06 08:27:17 dorphell Exp
+ $Id: PKGBUILD,v 1.3 2003/11/06 08:27:17 dorphell Exp
# Maintainer: Jan de Groot <jgc at archlinux.org>
# Contributor: damir <damir at archlinux.org>
# Contributor: Brice Carpentier <brice.carpentier at orange.fr>
@@ -14,12 +14,18 @@
options=('!libtool')
makedepends=('intltool' 'pkgconfig' 'gtk-doc')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
+ 01-fix-sasl-md5-digest-uri.patch
+ 03-drop-stanzas-on-fail.patch
04-use-pkg-config-for-gnutls.patch)
md5sums=('55339ca42494690c3942ee1465a96937'
+ 'dc799cea18b24847b1e008c7424010a3'
+ 'b7b2d81b01a5eee5fd5e21cae67b4af7'
'bffb25b9551df43255fe1706588582f3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch"
+ patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch"
patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
libtoolize --force
autoreconf
More information about the arch-commits
mailing list