gunnar: server/horde-framework Kolab-Kolab-IMAP-cclient.php.patch, NONE, 1.1 horde-framework-kolab.spec, 1.3, 1.4 ChangeLog, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv14500

Modified Files:
	horde-framework-kolab.spec ChangeLog 
Added Files:
	Kolab-Kolab-IMAP-cclient.php.patch 
Log Message:
	* horde-framework-kolab.spec: 

	Added Kolab-Kolab-IMAP-cclient.php.patch since Kolab-2.1
	still has a segfaulting PHP. See
	https://www.intevation.de/roundup/kolab/issue1673


--- NEW FILE: Kolab-Kolab-IMAP-cclient.php.patch ---
Index: Kolab/Kolab/IMAP/cclient.php
===================================================================
--- Kolab/Kolab/IMAP/cclient.php	(Revision 2512)
+++ Kolab/Kolab/IMAP/cclient.php	(Arbeitskopie)
@@ -436,9 +436,13 @@
     function setAnnotation($entries, $values, $mailbox_name)
     {
         foreach ($values as $key => $value) {
-            $result = @imap_setannotation($this->_imap, $mailbox_name, $entries, $key, $value);
-            if (!$result) {
-                return PEAR::raiseError(sprintf(_("IMAP error. Folder: %s. Error: %s"), $mailbox_name, @imap_last_error()));
+            // Necessary fix until imap_(get/set)annotation works right
+            // See https://www.intevation.de/roundup/kolab/issue1673
+            if ($value != "") {
+                $result = @imap_setannotation($this->_imap, $mailbox_name, $entries, $key, $value);
+                if (!$result) {
+                    return PEAR::raiseError(sprintf(_("IMAP error. Folder: %s. Error: %s"), $mailbox_name, @imap_last_error()));
+                }
             }
         }
         return true;

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-framework-kolab.spec	29 May 2007 20:35:18 -0000	1.3
+++ horde-framework-kolab.spec	29 May 2007 22:17:31 -0000	1.4
@@ -30,6 +30,14 @@
 #   to get fixed to be able to remove this patch.
 Patch0:         Prefs-Prefs-kolab.php.patch
 
+##################################################
+# PATCH COMMENT
+#
+#   Required as long as we use the broken 
+#   php-patch. See issue 
+#   https://www.intevation.de/roundup/kolab/issue1673
+Patch1:         Kolab-Kolab-IMAP-cclient.php.patch
+
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
@@ -48,6 +56,7 @@
 %prep
 	%setup -n framework
 	%patch -p0 -P 0
+	%patch -p0 -P 1
 
 %build
 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-framework/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:37 -0000	1.1
+++ ChangeLog	29 May 2007 22:17:31 -0000	1.2
@@ -1,3 +1,11 @@
+2007-05-30  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-framework-kolab.spec: 
+
+	Added Kolab-Kolab-IMAP-cclient.php.patch since Kolab-2.1
+	still has a segfaulting PHP. See
+	https://www.intevation.de/roundup/kolab/issue1673
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-framework-kolab.spec: Added package to Kolab CVS.