gunnar: server/patches/horde-webmail/1.2.0/tg t_SyncML_HK_GW_DoubleSyncFix.diff, NONE, 1.1.2.1 t_SyncML_UV_message_size_p1i.diff, NONE, 1.1.2.1 series, 1.5.2.12, 1.5.2.13

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv29387/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_SyncML_HK_GW_DoubleSyncFix.diff 
	t_SyncML_UV_message_size_p1i.diff 
Log Message:
 kolab/issue3237 (Double Sync with SyncML when using external client),  kolab/issue3238 (Double Entries with SyncML when the folder uid validity changes),  kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

--- NEW FILE: t_SyncML_HK_GW_DoubleSyncFix.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/SyncML/HK/GW/DoubleSyncFix

When the uid validity of an IMAP folder changes this confuses the Kolab storage
driver and leads to double entries. The attached patch has been proposed by
Univention and should be applied after some cleanup.

REF: https://issues.kolab.org/issue3238

Horde is currently agnostic of external clients to the storage backend used by
Horde/Kolab. For SyncML any storage changes need to get logged in order to be
exchanged with the mobile clients.

Currently the Kolab drivers within Horde will create the necessary changelog.
But this currently only happens after Synchronization started. Which means that
you need to sync twice in order to get changes from an external client if you
did not log in via Horde after changing something with an external client.

The attached patch has been provided by Univention but needs some cleanup to go
[...980 lines suppressed...]

    Fix patch for newer Kolab_Storage library.

commit 3ea975a913f3db5ee5ee511cf4280eb811f23c91
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:48:03 2009 +0100

    Remove stray file.

commit 308c073c0765af8979d1c511201f99f8d1b88046
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:47:17 2009 +0100

     kolab/issue3237 (Double Sync with SyncML when using external client)

commit a24c1cd0702833a1fa658b58bddb67971250f86d
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:41:07 2009 +0100

     kolab/issue3237 (Double Sync with SyncML when using external client)

--- NEW FILE: t_SyncML_UV_message_size_p1i.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/SyncML/UV/message/size/p1i

The attached patch was necessary to make the SE P1i mobile phone work with SyncML.

REF: https://issues.kolab.org/issue3892

Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>

---
 horde-webmail/lib/SyncML/Sync.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/horde-webmail/lib/SyncML/Sync.php b/horde-webmail/lib/SyncML/Sync.php
index 57e233b..66113a6 100644
--- a/horde-webmail/lib/SyncML/Sync.php
+++ b/horde-webmail/lib/SyncML/Sync.php
@@ -217,7 +217,9 @@ class SyncML_Sync {
                  * sends an item with length n and size tag=n+1 and expects us
                  * the accept it. Happens in test 1301.  So ignore this to be
                  * conformant (and wrong). */
-                strlen($item->content) + 1 != $item->size) {
+				/* The Sony Ericsson P1i sends a message with 'n+2':
+				   http://thread.gmane.org/gmane.comp.horde.sync/1842 */
+                strlen($item->content) + 1 != $item->size && strlen($item->content) + 2 != $item->size) {
                 $item->responseCode = RESPONSE_SIZE_MISMATCH;
                 $backend->logMessage(
                     'Item size mismatch. Size reported as ' . $item->size
-- 
tg: (3ea975a..) t/SyncML/UV/message/size/p1i (depends on: t/SyncML/HK/GW/DoubleSyncFix)
-- 
TOPGIT patch commit log
=======================

commit 9c4774daeda478381852c36f7d53c8f3b2d68756
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:51:20 2009 +0100

     kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -d -r1.5.2.12 -r1.5.2.13
--- series	24 Nov 2009 07:04:45 -0000	1.5.2.12
+++ series	24 Nov 2009 09:51:13 -0000	1.5.2.13
@@ -76,4 +76,6 @@
 t_kronolith_HK_UV_dateInputFieldOrder.diff -p1
 t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff -p1
 t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff -p1
-t_kronolith_HK_GW_HandleEmptyDates.diff -p1
\ No newline at end of file
+t_kronolith_HK_GW_HandleEmptyDates.diff -p1
+t_SyncML_HK_GW_DoubleSyncFix.diff -p1
+t_SyncML_UV_message_size_p1i.diff -p1
\ No newline at end of file