rpms/telepathy-gabble/OLPC-2 gabble-lower-max-stanza-size.patch, NONE, 1.1 telepathy-gabble.spec, 1.50, 1.51

[Robert McQueen (robot101)]

Author: robot101

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27546

Modified Files:
	telepathy-gabble.spec 
Added Files:
	gabble-lower-max-stanza-size.patch 
Log Message:
* Fri Dec 07 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.7.1-0.6.ol
pc2
- dev.laptop.org #5018: Add patch from upstream to lower maximum stanza size in
  MUC bytestreams (used for Tubes) to avoid producing packets over 64k which
  are rejected by ejabberd.


gabble-lower-max-stanza-size.patch:

--- NEW FILE gabble-lower-max-stanza-size.patch ---
diff -rN -up old-telepathy-gabble/src/bytestream-muc.c new-telepathy-gabble/src/bytestream-muc.c
--- old-telepathy-gabble/src/bytestream-muc.c	2007-11-20 13:57:59.611552656 -0500
+++ new-telepathy-gabble/src/bytestream-muc.c	2007-11-20 13:58:00.111582849 -0500
@@ -44,8 +44,9 @@
 #include "namespaces.h"
 #include "util.h"
 
-/* 64k is probably a really big default value as XEP 0047 recommends 4k  */
-#define MAX_BLOCK_SIZE (1024 * 64)
+/* 45k gives us 60k after base64 encoding, allowing 4k of header before we hit
+ * ejabberd's default 64k maximum stanza size */
+#define MAX_BLOCK_SIZE (1024 * 45)
 
 static void
 bytestream_iface_init (gpointer g_iface, gpointer iface_data);



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- telepathy-gabble.spec	5 Dec 2007 17:24:32 -0000	1.50
+++ telepathy-gabble.spec	7 Dec 2007 21:38:11 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:           telepathy-gabble
 Version:        0.7.1
-Release:        0.5%{?dist}
+Release:        0.6%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -13,6 +13,7 @@
 Patch0:         gabble-olpc-no-dbus-uid-check.patch
 Patch1:         gabble-pep-notifications.patch
 Patch2:         gabble-muc-properties.patch
+Patch3:         gabble-lower-max-stanza-size.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,8 +38,9 @@
 # -n %{name}-%{version}-%{alphatag}
 #%patch0 -p1 -b .no-Werror
 %patch0 -p1 -b .dbus-uid
-%patch1 -p1 -b .pep
+%patch1 -p1 -b .pep-notifications
 %patch2 -p1 -b .muc-props
+%patch3 -p1 -b .stanza-size
 
 %build
 %configure
@@ -64,6 +66,11 @@
 
 
 %changelog
+* Fri Dec 07 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.7.1-0.6.olpc2
+- dev.laptop.org #5018: Add patch from upstream to lower maximum stanza size in
+  MUC bytestreams (used for Tubes) to avoid producing packets over 64k which
+  are rejected by ejabberd.
+
 * Wed Dec 05 2007 Dafydd Harries <dafydd.harries at collabora.co.uk> - 0.7.1-0.5.olpc2
 - dev.laptop.org #5223: Add patch from upstream so that echoed PEP
   notifications are ignored.