Kolab Groupware OBS

cyrus-imapd.spec Changed

@@ -38,13 +38,13 @@
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 Version:            2.5
-Release:            0.1.dev20140829.gitb2ef80be%{?dist}
+Release:            0.1.dev20140829.git1907cfc2%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
 
 # Upstream sources
-# From b2ef80bee2102d0eadf280c6c23b5759920d1752
+# From 1907cfc24b5b3bee0e4f81f87ba5ab3be3a8a418
 Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{_name}-%{real_version}%{?dot_snapshot_version}.tar.gz
 Source1:            cyrus-imapd.imap-2.3.x-conf
 Source2:            cyrus-imapd.cvt_cyrusdb_all
@@ -738,6 +738,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Thu Sep 25 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-10.git
+- Fix event notifications
+
 * Fri Aug 29 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-9.git
 - Snapshot of (b2ef80be)
 - Merge enhanced Sieve Date and Index extension

cyrus-imapd-2.5.tar.gz/imap/mboxevent.c Changed

@@ -103,33 +103,34 @@
 static struct mboxevent event_template =
 { 0,
   /* ordered to optimize the parsing of the notification message */
-  { { EVENT_TIMESTAMP, "timestamp", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_SERVICE, "service", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_SERVER_ADDRESS, "serverAddress", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_CLIENT_ADDRESS, "clientAddress", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_OLD_MAILBOX_ID, "oldMailboxID", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_OLD_UIDSET, "vnd.cmu.oldUidset", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_MAILBOX_ID, "mailboxID", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_URI, "uri", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_MODSEQ, "modseq", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_DISK_QUOTA, "diskQuota", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_DISK_USED, "diskUsed", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_MAX_MESSAGES, "maxMessages", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_ACL_SUBJECT, "aclSubject", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_ACL_RIGHTS, "aclRights", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_MESSAGES, "messages", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_UNSEEN_MESSAGES, "vnd.cmu.unseenMessages", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_UIDNEXT, "uidnext", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_UIDSET, "uidset", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_MIDSET, "vnd.cmu.midset", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_FLAG_NAMES, "flagNames", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_PID, "pid", EVENT_PARAM_INT, 0, 0 },
-    { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
+  {
+    /*  0 */ { EVENT_TIMESTAMP, "timestamp", EVENT_PARAM_STRING, 0, 0 },
+    /*  1 */ { EVENT_SERVICE, "service", EVENT_PARAM_STRING, 0, 0 },
+    /*  2 */ { EVENT_SERVER_ADDRESS, "serverAddress", EVENT_PARAM_STRING, 0, 0 },
+    /*  3 */ { EVENT_CLIENT_ADDRESS, "clientAddress", EVENT_PARAM_STRING, 0, 0 },
+    /*  4 */ { EVENT_OLD_MAILBOX_ID, "oldMailboxID", EVENT_PARAM_STRING, 0, 0 },
+    /*  5 */ { EVENT_OLD_UIDSET, "vnd.cmu.oldUidset", EVENT_PARAM_STRING, 0, 0 },
+    /*  6 */ { EVENT_MAILBOX_ID, "mailboxID", EVENT_PARAM_STRING, 0, 0 },
+    /*  7 */ { EVENT_URI, "uri", EVENT_PARAM_STRING, 0, 0 },
+    /*  8 */ { EVENT_MODSEQ, "modseq", EVENT_PARAM_INT, 0, 0 },
+    /*  9 */ { EVENT_DISK_QUOTA, "diskQuota", EVENT_PARAM_INT, 0, 0 },
+    /* 10 */ { EVENT_DISK_USED, "diskUsed", EVENT_PARAM_INT, 0, 0 },
+    /* 11 */ { EVENT_MAX_MESSAGES, "maxMessages", EVENT_PARAM_INT, 0, 0 },
+    /* 12 */ { EVENT_MESSAGES, "messages", EVENT_PARAM_INT, 0, 0 },
+    /* 13 */ { EVENT_UNSEEN_MESSAGES, "vnd.cmu.unseenMessages", EVENT_PARAM_INT, 0, 0 },
+    /* 14 */ { EVENT_UIDNEXT, "uidnext", EVENT_PARAM_INT, 0, 0 },
+    /* 15 */ { EVENT_UIDSET, "uidset", EVENT_PARAM_STRING, 0, 0 },
+    /* 16 */ { EVENT_MIDSET, "vnd.cmu.midset", EVENT_PARAM_STRING, 0, 0 },
+    /* 17 */ { EVENT_FLAG_NAMES, "flagNames", EVENT_PARAM_STRING, 0, 0 },
+    /* 18 */ { EVENT_PID, "pid", EVENT_PARAM_INT, 0, 0 },
+    /* 19 */ { EVENT_ACL_SUBJECT, "aclSubject", EVENT_PARAM_STRING, 0, 0 },
+    /* 20 */ { EVENT_ACL_RIGHTS, "aclRights", EVENT_PARAM_STRING, 0, 0 },
+    /* 21 */ { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
+    /* 22 */ { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
+    /* 23 */ { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
+    /* 24 */ { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
     /* always at end to let the parser to easily truncate this part */
-    { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
-    { EVENT_MESSAGE_CONTENT, "messageContent", EVENT_PARAM_STRING, 0, 0 }
+    /* 25 */ { EVENT_MESSAGE_CONTENT, "messageContent", EVENT_PARAM_STRING, 0, 0 }
   },
   STRARRAY_INITIALIZER, { 0, 0 }, NULL, STRARRAY_INITIALIZER, NULL, NULL, NULL
 };

cyrus-imapd-2.5.tar.gz/imap/mboxevent.h Changed

@@ -86,42 +86,46 @@
 /* The number representing the last available position in
  * event_param, which should always be messageContent.
  */
-#define MAX_PARAM 23
+#define MAX_PARAM 25
 
 /*
  * event parameters defined in RFC 5423 - Internet Message Store Events
  *
  * ordered to optimize the parsing of the notification message
+ *
+ * NOTE that the order here needs to be the exact same as the order in
+ * mboxevent.c's event_template mboxevent struct
  */
 enum event_param {
-    EVENT_TIMESTAMP,
-    EVENT_SERVICE,
-    EVENT_SERVER_ADDRESS, /* gather serverDomain and serverPort together */
-    EVENT_CLIENT_ADDRESS, /* gather clientIP and clientPort together */
-    EVENT_OLD_MAILBOX_ID,
-    EVENT_OLD_UIDSET,
-    EVENT_MAILBOX_ID,
-    EVENT_URI,
-    EVENT_MODSEQ,
-    EVENT_DISK_QUOTA,
-    EVENT_DISK_USED,
-    EVENT_MAX_MESSAGES,
-    EVENT_MESSAGES,
-    EVENT_UNSEEN_MESSAGES,
-    EVENT_UIDNEXT,
-    EVENT_UIDSET,
-    EVENT_MIDSET,
-    EVENT_FLAG_NAMES,
-    EVENT_PID,
-    EVENT_ACL_SUBJECT,
-    EVENT_ACL_RIGHTS,
-    EVENT_USER,
-    EVENT_MESSAGE_SIZE,
-    EVENT_ENVELOPE,
-    EVENT_BODYSTRUCTURE,
-    EVENT_MESSAGE_CONTENT
+    /*  0 */ EVENT_TIMESTAMP,
+    /*  1 */ EVENT_SERVICE,
+    /*  2 */ EVENT_SERVER_ADDRESS, /* gather serverDomain and serverPort together */
+    /*  3 */ EVENT_CLIENT_ADDRESS, /* gather clientIP and clientPort together */
+    /*  4 */ EVENT_OLD_MAILBOX_ID,
+    /*  5 */ EVENT_OLD_UIDSET,
+    /*  6 */ EVENT_MAILBOX_ID,
+    /*  7 */ EVENT_URI,
+    /*  8 */ EVENT_MODSEQ,
+    /*  9 */ EVENT_DISK_QUOTA,
+    /* 10 */ EVENT_DISK_USED,
+    /* 11 */ EVENT_MAX_MESSAGES,
+    /* 12 */ EVENT_MESSAGES,
+    /* 13 */ EVENT_UNSEEN_MESSAGES,
+    /* 14 */ EVENT_UIDNEXT,
+    /* 15 */ EVENT_UIDSET,
+    /* 16 */ EVENT_MIDSET,
+    /* 17 */ EVENT_FLAG_NAMES,
+    /* 18 */ EVENT_PID,
+    /* 19 */ EVENT_ACL_SUBJECT,
+    /* 20 */ EVENT_ACL_RIGHTS,
+    /* 21 */ EVENT_USER,
+    /* 22 */ EVENT_MESSAGE_SIZE,
+    /* 23 */ EVENT_ENVELOPE,
+    /* 24 */ EVENT_BODYSTRUCTURE,
+    /* 25 */ EVENT_MESSAGE_CONTENT
 };
 
+
 enum event_param_type {
     EVENT_PARAM_INT,
     EVENT_PARAM_STRING,

cyrus-imapd-2.5.tar.gz/sieve/sieve.y Changed

cyrus-imapd.dsc Changed

debian.changelog Changed

Changes of Revision 97