- 0.9.3

Changed files:
    telepathy-gabble.spec -> 1.20
    wocky-sasl.patch -> 1.2

diff --git a/telepathy-gabble.spec b/telepathy-gabble.spec
index 4c856263c1dcc939e9b2c2dc4b6f1d69072f97a7..1a9a89b3fd026b28ec8d6a52211302f33d21d52c 100644 (file)
--- a/telepathy-gabble.spec
+++ b/telepathy-gabble.spec
@@ -1,14 +1,13 @@
 Summary:       A Telepathy connection manager for Jabber/XMPP
 Summary(pl.UTF-8):     Zarządca połączeń Telepathy dla Jabbera/XMPP
 Name:          telepathy-gabble
-Version:       0.9.2
+Version:       0.9.3
 Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{version}.tar.gz
-# Source0-md5: e862fb46c0a895c6b37339459edc8ae1
+# Source0-md5: 1755f785f84ec99fba2a406845d1df5d
 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,9 +33,6 @@ Zarządca połączeń pozwalający połączyć się Telepathy z Jabberem/XMPP.
 
 %prep
 %setup -q
-cd lib/ext/wocky
-%patch0 -p1
-cd ../../..
 
 %build
 %{__libtoolize}

diff --git a/wocky-sasl.patch b/wocky-sasl.patch
deleted file mode 100644 (file)
index d787497..0000000
--- a/wocky-sasl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Vivek Dasmohapatra <vivek@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');