packages: telepathy-gabble/telepathy-gabble.spec, telepathy-gabble/wocky-sa...

[patrys]

Author: patrys                       Date: Mon Nov  2 15:46:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add wocky patch to fix SASL auth on jabberd2

---- Files affected:
packages/telepathy-gabble:
   telepathy-gabble.spec (1.18 -> 1.19) , wocky-sasl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/telepathy-gabble/telepathy-gabble.spec
diff -u packages/telepathy-gabble/telepathy-gabble.spec:1.18 packages/telepathy-gabble/telepathy-gabble.spec:1.19
--- packages/telepathy-gabble/telepathy-gabble.spec:1.18	Mon Nov  2 14:56:50 2009
+++ packages/telepathy-gabble/telepathy-gabble.spec	Mon Nov  2 16:46:39 2009
@@ -9,6 +9,7 @@
 Source0:	http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{version}.tar.gz
 # Source0-md5:	e862fb46c0a895c6b37339459edc8ae1
 URL:		http://telepathy.freedesktop.org/wiki/
+Patch0:		wocky-sasl.patch
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-devel >= 1.1.0
@@ -34,6 +35,9 @@
 
 %prep
 %setup -q
+cd lib/ext/wocky
+%patch0 -p1
+cd ../../..
 
 %build
 %{__libtoolize}
@@ -73,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2009/11/02 15:46:39  patrys
+- add wocky patch to fix SASL auth on jabberd2
+
 Revision 1.18  2009/11/02 13:56:50  patrys
 - more BR:
 - force gnutls

================================================================
Index: packages/telepathy-gabble/wocky-sasl.patch
diff -u /dev/null packages/telepathy-gabble/wocky-sasl.patch:1.1
--- /dev/null	Mon Nov  2 16:46:45 2009
+++ packages/telepathy-gabble/wocky-sasl.patch	Mon Nov  2 16:46:39 2009
@@ -0,0 +1,42 @@
+From: Vivek Dasmohapatra <vivek at collabora.co.uk>
+Date: Mon, 2 Nov 2009 15:37:50 +0000 (+0000)
+Subject: SASL challenge tokens may be separated by optional whitespace, cope with these.
+X-Git-Url: http://git.collabora.co.uk/?p=user%2Fvivek%2Fwocky.git;a=commitdiff_plain;h=a3f332952c94e59d49c7d265f91cacc04eab424d
+
+SASL challenge tokens may be separated by optional whitespace, cope with these.
+---
+
+diff --git a/wocky/wocky-sasl-auth.c b/wocky/wocky-sasl-auth.c
+index a010370..925db62 100644
+--- a/wocky/wocky-sasl-auth.c
++++ b/wocky/wocky-sasl-auth.c
+@@ -429,6 +429,10 @@ digest_md5_challenge_to_hash (const gchar * challenge)
+     keyend = c;
+     c++;
+ 
++    /* eat any whitespace between the '=' and the '"' */
++    for (; isspace (*c); c++)
++      ;
++
+     if (*c == '"')
+       {
+         c++;
+@@ -450,10 +454,18 @@ digest_md5_challenge_to_hash (const gchar * challenge)
+         val = g_strndup (valstart, c - valstart);
+       }
+ 
++    /* the key is unguarded by '"' delimiters so any whitespace *
++     * at either end should be discarded as irrelevant          */
+     key = g_strndup (keystart, keyend - keystart);
++    key = g_strstrip (key);
+ 
++    DEBUG ("challenge '%s' = '%s'", key, val);
+     g_hash_table_insert (result, key, val);
+ 
++    /* eat any whitespace between the '"' and the next ',' */
++    for (; isspace (*c); c++)
++      ;
++
+     if (*c == ',')
+       c++;
+   } while (*c != '\0');
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/telepathy-gabble/telepathy-gabble.spec?r1=1.18&r2=1.19&f=u