gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.21, 1.32.2.22

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
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)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.21
retrieving revision 1.32.2.22
diff -u -d -r1.32.2.21 -r1.32.2.22
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 08:34:39 -0000	1.32.2.21
+++ horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 09:51:12 -0000	1.32.2.22
@@ -28314,6 +28314,1064 @@
     correctly.
     
     REF: https://issues.kolab.org/issue3656
+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
[...1033 lines suppressed...]
++				/* 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)
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php