Index: head/mail/cyrus-imapd30/files/patch-imap__sync_support.c
===================================================================
--- head/mail/cyrus-imapd30/files/patch-imap__sync_support.c	(revision 439084)
+++ head/mail/cyrus-imapd30/files/patch-imap__sync_support.c	(revision 439085)
@@ -1,20 +1,30 @@
---- imap/sync_support.c.orig	2015-08-04 05:50:45 UTC
+--- imap/sync_support.c.orig	2017-04-20 01:56:00 UTC
 +++ imap/sync_support.c
-@@ -3099,7 +3099,7 @@ int sync_apply_message(struct dlist *kin
+@@ -60,7 +60,9 @@
+ #include <limits.h>
+ 
+ #include "assert.h"
++#ifdef USE_CALALARMD
+ #include "caldav_alarm.h"
++#endif
+ #include "global.h"
+ #include "imap_proxy.h"
+ #include "mboxlist.h"
+@@ -3479,7 +3481,7 @@ int sync_apply_message(struct dlist *kin
          const char *fname;
  
          /* XXX - complain more? */
 -        if (!dlist_tofile(ki, &part, &guid, (ulong *) &size, &fname))
 +        if (!dlist_tofile(ki, &part, &guid, (unsigned long *) &size, &fname))
              continue;
  
          part_list = sync_reserve_partlist(reserve_list, part);
-@@ -3806,7 +3806,7 @@ static int fetch_file(struct mailbox *ma
+@@ -4534,7 +4536,7 @@ static int fetch_file(struct mailbox *ma
          return r;
      }
  
 -    if (!dlist_tofile(kin->head, NULL, &guid, (ulong *) &size, &fname)) {
 +    if (!dlist_tofile(kin->head, NULL, &guid, (unsigned long *) &size, &fname)) {
          r = IMAP_MAILBOX_NONEXISTENT;
          syslog(LOG_ERR, "IOERROR: fetch_file failed tofile %s", error_message(r));
          goto done;