Tue Jun 17 01:08:59 2014 UTC ()
better handling for 64bit time_t issue.


(obache)
diff -r1.19 -r1.20 pkgsrc/mail/cyrus-imapd24/distinfo
diff -r1.5 -r1.6 pkgsrc/mail/cyrus-imapd24/patches/patch-aq
diff -r1.2 -r1.3 pkgsrc/mail/cyrus-imapd24/patches/patch-imap_mailbox.c
cvs diff -r1.19 -r1.20 pkgsrc/mail/cyrus-imapd24/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd24/distinfo 2014/06/17 00:32:10 1.19
+++ pkgsrc/mail/cyrus-imapd24/distinfo 2014/06/17 01:08:59 1.20
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.19 2014/06/17 00:32:10 obache Exp $ 1$NetBSD: distinfo,v 1.20 2014/06/17 01:08:59 obache Exp $
2 2
3SHA1 (cyrus-imapd-2.4.17.tar.gz) = cc869dea08ad663fc32d9ab628992a1711cfbb1b 3SHA1 (cyrus-imapd-2.4.17.tar.gz) = cc869dea08ad663fc32d9ab628992a1711cfbb1b
4RMD160 (cyrus-imapd-2.4.17.tar.gz) = c28e971515130eea23067b7015047a120edba86f 4RMD160 (cyrus-imapd-2.4.17.tar.gz) = c28e971515130eea23067b7015047a120edba86f
5Size (cyrus-imapd-2.4.17.tar.gz) = 2486355 bytes 5Size (cyrus-imapd-2.4.17.tar.gz) = 2486355 bytes
6SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323 6SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
7SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9 7SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
8SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151 8SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
9SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1 9SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
10SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474 10SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
11SHA1 (patch-aq) = 3e2121ed05aa7c5b875a0139bdbcaf573a217c39 11SHA1 (patch-aq) = 101f5d253dae303f187e15eca28aa687f846ba6b
12SHA1 (patch-imap_mailbox.c) = 2a00d97525edb0768cbf4cfd2e1ad5e5f915bc62 12SHA1 (patch-imap_mailbox.c) = 9a000763a153863f6c40f8939fe19eab41973cea
cvs diff -r1.5 -r1.6 pkgsrc/mail/cyrus-imapd24/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd24/patches/patch-aq 2014/06/17 00:32:10 1.5
+++ pkgsrc/mail/cyrus-imapd24/patches/patch-aq 2014/06/17 01:08:59 1.6
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1$NetBSD: patch-aq,v 1.5 2014/06/17 00:32:10 obache Exp $ 1$NetBSD: patch-aq,v 1.6 2014/06/17 01:08:59 obache Exp $
2 2
3* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long). 3* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
4 https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376 4 https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
5 5
6--- imap/sync_client.c.orig 2012-12-01 19:57:54.000000000 +0000 6--- imap/sync_client.c.orig 2012-12-01 19:57:54.000000000 +0000
7+++ imap/sync_client.c 7+++ imap/sync_client.c
8@@ -573,7 +573,7 @@ static int folder_unannotation(const cha 8@@ -573,7 +573,7 @@ static int folder_unannotation(const cha
9 /* ====================================================================== */ 9 /* ====================================================================== */
10  10
11 static int sieve_upload(const char *userid, const char *filename, 11 static int sieve_upload(const char *userid, const char *filename,
12- unsigned long last_update) 12- unsigned long last_update)
13+ time_t last_update) 13+ time_t last_update)
14 { 14 {
15 const char *cmd = "SIEVE"; 15 const char *cmd = "SIEVE";
16 struct dlist *kl; 16 struct dlist *kl;
17@@ -915,7 +915,7 @@ static void log_record(const char *name, 17@@ -913,9 +913,9 @@ static void log_record(const char *name,
 18 struct index_record *record)
 19 {
18 syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " " 20 syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " "
19 "last_updated:%lu internaldate:%lu flags:(%s)", 21- "last_updated:%lu internaldate:%lu flags:(%s)",
 22+ "last_updated:" MODSEQ_FMT " internaldate:" MODSEQ_FMT " flags:(%s)",
20 name, record->uid, record->modseq, 23 name, record->uid, record->modseq,
21- record->last_updated, record->internaldate, 24- record->last_updated, record->internaldate,
22+ (unsigned long)record->last_updated, (unsigned long)record->internaldate, 25+ (modseq_t)record->last_updated, (modseq_t)record->internaldate,
23 make_flags(mailbox, record)); 26 make_flags(mailbox, record));
24 } 27 }
25  28
cvs diff -r1.2 -r1.3 pkgsrc/mail/cyrus-imapd24/patches/patch-imap_mailbox.c (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd24/patches/patch-imap_mailbox.c 2012/03/12 13:40:12 1.2
+++ pkgsrc/mail/cyrus-imapd24/patches/patch-imap_mailbox.c 2014/06/17 01:08:59 1.3
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1$NetBSD: patch-imap_mailbox.c,v 1.2 2012/03/12 13:40:12 obache Exp $ 1$NetBSD: patch-imap_mailbox.c,v 1.3 2014/06/17 01:08:59 obache Exp $
2 2
3* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long). 3* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
4 https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376 4 https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
5 5
6--- imap/mailbox.c.orig 2012-03-12 11:47:51.000000000 +0000 6--- imap/mailbox.c.orig 2012-12-01 19:57:54.000000000 +0000
7+++ imap/mailbox.c 7+++ imap/mailbox.c
8@@ -1954,9 +1954,9 @@ bit32 make_sync_crc(struct mailbox *mail 8@@ -1960,10 +1960,10 @@ bit32 make_sync_crc(struct mailbox *mail
 9 flagcrc ^= crc32_cstring(buf);
9 } 10 }
10  11
11 snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s", 12- snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
12- record->uid, record->modseq, record->last_updated, 13- record->uid, record->modseq, record->last_updated,
13+ record->uid, record->modseq, (unsigned long)record->last_updated, 14+ snprintf(buf, 4096, "%u " MODSEQ_FMT " " MODSEQ_FMT " (%u) " MODSEQ_FMT " %s",
 15+ record->uid, record->modseq, (modseq_t)record->last_updated,
14 flagcrc, 16 flagcrc,
15- record->internaldate, 17- record->internaldate,
16+ (unsigned long)record->internaldate, 18+ (modseq_t)record->internaldate,
17 message_guid_encode(&record->guid)); 19 message_guid_encode(&record->guid));
18  20
19 return crc32_cstring(buf); 21 return crc32_cstring(buf);