Update to cyrus-imapd-2.5.11.

mail/cyrus-imapd/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.101 2017/02/06 20:28:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.102 2017/05/09 07:33:33 ajacoutot Exp $
 
 # WARNING: mmap(2) is not fully POSIX on OpenBSD so cyrus needs to
 # map_refresh on every lock which will incure a performance penalty
@@ -7,8 +7,7 @@
 
 COMMENT=	Cyrus IMAP server
 
-V=		2.5.10
-REVISION=	0
+V=		2.5.11
 DISTNAME=	cyrus-imapd-${V}
 
 SHARED_LIBS +=	cyrus                     0.0 # 0.0

mail/cyrus-imapd/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cyrus-imapd-2.5.10.tar.gz) = s49P1yglopisR0JtzSpQyEN8KUeGS6UNeamlP+mEXF8=
-SIZE (cyrus-imapd-2.5.10.tar.gz) = 3103914
+SHA256 (cyrus-imapd-2.5.11.tar.gz) = NqeRF7Mgx41ivGhCwwJNlw077HqhKQj4Ytks8dYzl9U=
+SIZE (cyrus-imapd-2.5.11.tar.gz) = 3109188

mail/cyrus-imapd/patches/patch-configure

@@ -1,7 +1,8 @@
-$OpenBSD: patch-configure,v 1.29 2016/10/18 07:20:17 ajacoutot Exp $
---- configure.orig	Tue Oct 18 00:15:29 2016
-+++ configure	Tue Oct 18 09:05:58 2016
-@@ -13786,9 +13786,7 @@ CFLAGS=$save_CFLAGS
+$OpenBSD: patch-configure,v 1.30 2017/05/09 07:33:33 ajacoutot Exp $
+Index: configure
+--- configure.orig
++++ configure
+@@ -13788,9 +13788,7 @@ CFLAGS=$save_CFLAGS
  fi
  
  if test "$ac_cv_fpic" = "yes"; then
@@ -12,7 +13,7 @@ $OpenBSD: patch-configure,v 1.29 2016/10/18 07:20:17 ajacoutot Exp $
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
  $as_echo "$ac_cv_fpic" >&6; }
-@@ -15233,7 +15231,7 @@ fi
+@@ -15235,7 +15233,7 @@ fi
  
  
  
@@ -21,7 +22,7 @@ $OpenBSD: patch-configure,v 1.29 2016/10/18 07:20:17 ajacoutot Exp $
    CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
  
  $as_echo "#define HAVE_BDB /**/" >>confdefs.h
-@@ -20555,7 +20553,7 @@ $as_echo "$as_me: WARNING: Perl not found: Administrat
+@@ -20628,7 +20626,7 @@ $as_echo "$as_me: WARNING: Perl not found: Administrat
  elif test "${with_perl}" != "no"; then
      PERL="${with_perl}"
      case "${target_os}" in

mail/cyrus-imapd/patches/patch-imap_mailbox_c

@@ -1,20 +0,0 @@
-$OpenBSD: patch-imap_mailbox_c,v 1.14 2016/10/18 07:20:17 ajacoutot Exp $
-
-https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
-
---- imap/mailbox.c.orig	Mon Oct 17 23:01:04 2016
-+++ imap/mailbox.c	Tue Oct 18 09:05:58 2016
-@@ -2255,10 +2255,10 @@ static uint32_t crc_basic(const struct mailbox *mailbo
- 	flagcrc ^= crc32_cstring(buf);
-     }
- 
--    snprintf(buf, sizeof(buf), "%u " MODSEQ_FMT " %lu (%u) %lu %s",
--	    record->uid, record->modseq, record->last_updated,
-+    snprintf(buf, sizeof(buf), "%u " MODSEQ_FMT " " MODSEQ_FMT " (%u) " MODSEQ_FMT " %s", 
-+	    record->uid, record->modseq, (modseq_t)record->last_updated,
- 	    flagcrc,
--	    record->internaldate,
-+	    (modseq_t)record->internaldate,
- 	    message_guid_encode(&record->guid));
- 
-     return crc32_cstring(buf);

mail/cyrus-imapd/patches/patch-imap_mbexamine_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-imap_mbexamine_c,v 1.5 2017/05/09 07:33:33 ajacoutot Exp $
+
+64 bit time_t
+
+Index: imap/mbexamine.c
+--- imap/mbexamine.c.orig
++++ imap/mbexamine.c
+@@ -264,7 +264,7 @@ static int do_examine(char *name,
+     }
+     printf("\n");
+     printf("  Last POP3 Login: (%ld) %s", mailbox->i.pop3_last_login,
+-	   ctime((const long *) &mailbox->i.pop3_last_login));
++	   ctime((const long long *) &mailbox->i.pop3_last_login));
+     printf("  Highest Mod Sequence: " MODSEQ_FMT "\n",
+ 	   mailbox->i.highestmodseq);
+ 

mail/cyrus-imapd/patches/patch-imap_sync_client_c

@@ -1,27 +0,0 @@
-$OpenBSD: patch-imap_sync_client_c,v 1.5 2016/10/18 07:20:17 ajacoutot Exp $
-
-https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
-
---- imap/sync_client.c.orig	Mon Oct 17 23:01:04 2016
-+++ imap/sync_client.c	Tue Oct 18 09:05:58 2016
-@@ -630,7 +630,7 @@ static int folder_unannotation(const char *mboxname, c
- /* ====================================================================== */
- 
- static int sieve_upload(const char *userid, const char *filename,
--			unsigned long last_update)
-+			time_t last_update)
- {
-     const char *cmd = "SIEVE";
-     struct dlist *kl;
-@@ -997,9 +997,9 @@ static void log_record(const char *name, struct mailbo
- 		       struct index_record *record)
- {
-     syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " "
--	  "last_updated:%lu internaldate:%lu flags:(%s)",
-+	  "last_updated:" MODSEQ_FMT " internaldate:" MODSEQ_FMT " flags:(%s)",
- 	   name, record->uid, record->modseq,
--	   record->last_updated, record->internaldate,
-+	   (modseq_t)record->last_updated, (modseq_t)record->internaldate,
- 	   make_flags(mailbox, record));
- }
-