better handling for 64bit time_t issue.

3 files changed, 18 insertions, 13 deletions

diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 2f59155a897..8c5a1295183 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2014/06/17 00:32:10 obache Exp $
+$NetBSD: distinfo,v 1.20 2014/06/17 01:08:59 obache Exp $
 
 SHA1 (cyrus-imapd-2.4.17.tar.gz) = cc869dea08ad663fc32d9ab628992a1711cfbb1b
 RMD160 (cyrus-imapd-2.4.17.tar.gz) = c28e971515130eea23067b7015047a120edba86f
@@ -8,5 +8,5 @@ SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
 SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
-SHA1 (patch-aq) = 3e2121ed05aa7c5b875a0139bdbcaf573a217c39
-SHA1 (patch-imap_mailbox.c) = 2a00d97525edb0768cbf4cfd2e1ad5e5f915bc62
+SHA1 (patch-aq) = 101f5d253dae303f187e15eca28aa687f846ba6b
+SHA1 (patch-imap_mailbox.c) = 9a000763a153863f6c40f8939fe19eab41973cea
diff --git a/mail/cyrus-imapd24/patches/patch-aq b/mail/cyrus-imapd24/patches/patch-aq
index 1569d2e5c4d..458c35ce7c2 100644
--- a/mail/cyrus-imapd24/patches/patch-aq
+++ b/mail/cyrus-imapd24/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.5 2014/06/17 00:32:10 obache Exp $
+$NetBSD: patch-aq,v 1.6 2014/06/17 01:08:59 obache Exp $
 
 * cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
   https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
@@ -14,12 +14,15 @@ $NetBSD: patch-aq,v 1.5 2014/06/17 00:32:10 obache Exp $
  {
      const char *cmd = "SIEVE";
      struct dlist *kl;
-@@ -915,7 +915,7 @@ static void log_record(const char *name,
+@@ -913,9 +913,9 @@ static void log_record(const char *name,
+ 		       struct index_record *record)
+ {
      syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " "
- 	  "last_updated:%lu internaldate:%lu flags:(%s)",
+-	  "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,
-+	   (unsigned long)record->last_updated, (unsigned long)record->internaldate,
++	   (modseq_t)record->last_updated, (modseq_t)record->internaldate,
  	   make_flags(mailbox, record));
  }
  
diff --git a/mail/cyrus-imapd24/patches/patch-imap_mailbox.c b/mail/cyrus-imapd24/patches/patch-imap_mailbox.c
index f28818b8094..0180a3ff164 100644
--- a/mail/cyrus-imapd24/patches/patch-imap_mailbox.c
+++ b/mail/cyrus-imapd24/patches/patch-imap_mailbox.c
@@ -1,19 +1,21 @@
-$NetBSD: patch-imap_mailbox.c,v 1.2 2012/03/12 13:40:12 obache Exp $
+$NetBSD: patch-imap_mailbox.c,v 1.3 2014/06/17 01:08:59 obache Exp $
 
 * cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
   https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
 
---- imap/mailbox.c.orig	2012-03-12 11:47:51.000000000 +0000
+--- imap/mailbox.c.orig	2012-12-01 19:57:54.000000000 +0000
 +++ imap/mailbox.c
-@@ -1954,9 +1954,9 @@ bit32 make_sync_crc(struct mailbox *mail
+@@ -1960,10 +1960,10 @@ bit32 make_sync_crc(struct mailbox *mail
+ 	flagcrc ^= crc32_cstring(buf);
      }
  
-     snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
+-    snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
 -	    record->uid, record->modseq, record->last_updated,
-+	    record->uid, record->modseq, (unsigned long)record->last_updated,
++    snprintf(buf, 4096, "%u " MODSEQ_FMT " " MODSEQ_FMT " (%u) " MODSEQ_FMT " %s",
++	    record->uid, record->modseq, (modseq_t)record->last_updated,
  	    flagcrc,
 -	    record->internaldate,
-+	    (unsigned long)record->internaldate,
++	    (modseq_t)record->internaldate,
  	    message_guid_encode(&record->guid));
  
      return crc32_cstring(buf);