Update to cyrus-imapd-3.2.5.
from "Anatoli" who also worked with upstream to allow getting rid of most patches; thanks!
This commit is contained in:
ajacoutot
parent
b8beb5f4cd
commit
5e429985a1
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.129 2020/10/09 08:47:57 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.130 2020/12/04 12:23:57 ajacoutot Exp $
|
||||
|
||||
PORTROACH= limitw:1,even
|
||||
|
||||
COMMENT= Cyrus IMAP server
|
||||
|
||||
V= 3.2.4
|
||||
V= 3.2.5
|
||||
DISTNAME= cyrus-imapd-${V}
|
||||
|
||||
SHARED_LIBS += cyrus 0.0 # 0.0
|
||||
@ -39,8 +39,7 @@ LIB_DEPENDS= databases/sqlite3 \
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
cyrus_cv_sse42=no
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CONFIGURE_ARGS= --bindir=${PREFIX}/cyrus/bin \
|
||||
--libexec=${PREFIX}/cyrus/libexec \
|
||||
--sbindir=${PREFIX}/cyrus/sbin \
|
||||
@ -48,17 +47,12 @@ CONFIGURE_ARGS= --bindir=${PREFIX}/cyrus/bin \
|
||||
--with-cyrus-user=_cyrus \
|
||||
--with-syslogfacility=MAIL \
|
||||
--without-chardet \
|
||||
--without-cld2 \
|
||||
--without-sphinx-build \
|
||||
--without-zeroskip \
|
||||
--disable-gssapi \
|
||||
--enable-autocreate \
|
||||
--enable-idled \
|
||||
--enable-murder \
|
||||
--enable-nntp
|
||||
|
||||
# XXX FLAVOR
|
||||
CONFIGURE_ARGS += --without-snmp
|
||||
--enable-murder
|
||||
|
||||
# XXX notyet; FLAVOR
|
||||
CONFIGURE_ARGS += --without-clamav \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (cyrus-imapd-3.2.4.tar.gz) = UWEmLDgqpaeMKLGk9eolRQne4eet6DH37JsUB4+0LyM=
|
||||
SIZE (cyrus-imapd-3.2.4.tar.gz) = 12270070
|
||||
SHA256 (cyrus-imapd-3.2.5.tar.gz) = zDhqdU4kOJtSr4NzdrO7YFW+pwV/U+yHq8oGqOjWlWM=
|
||||
SIZE (cyrus-imapd-3.2.5.tar.gz) = 12237158
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-imap_conversations_c,v 1.3 2020/05/14 12:26:39 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: imap/conversations.c
|
||||
--- imap/conversations.c.orig
|
||||
+++ imap/conversations.c
|
||||
@@ -567,7 +567,7 @@ static int _conversations_set_key(struct conversations
|
||||
if (i) buf_putc(&buf, ',');
|
||||
buf_printf(&buf, CONV_FMT, cid);
|
||||
}
|
||||
- buf_printf(&buf, " %lu", stamp);
|
||||
+ buf_printf(&buf, " %lld", stamp);
|
||||
|
||||
r = cyrusdb_store(state->db,
|
||||
key, keylen,
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-imap_fud_c,v 1.2 2020/08/28 09:53:04 ajacoutot Exp $
|
||||
|
||||
Index: imap/fud.c
|
||||
--- imap/fud.c.orig
|
||||
+++ imap/fud.c
|
||||
@@ -96,8 +96,10 @@ static void send_reply(struct sockaddr *sfrom, socklen
|
||||
|
||||
static int soc = 0; /* inetd (master) has handed us the port as stdin */
|
||||
|
||||
-#ifndef MAXDOMNAME
|
||||
+#ifndef MAXLOGNAME
|
||||
#define MAXLOGNAME 16 /* should find out for real */
|
||||
+#endif
|
||||
+#ifndef MAXDOMNAME
|
||||
#define MAXDOMNAME 20 /* should find out for real */
|
||||
#endif
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-imap_mailbox_c,v 1.19 2020/05/30 10:09:27 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: imap/mailbox.c
|
||||
--- imap/mailbox.c.orig
|
||||
+++ imap/mailbox.c
|
||||
@@ -2899,7 +2899,7 @@ static uint32_t crc_basic(const struct mailbox *mailbo
|
||||
flagcrc ^= crc32_cstring(buf);
|
||||
}
|
||||
|
||||
- snprintf(buf, sizeof(buf), "%u " MODSEQ_FMT " %lu (%u) %lu %s",
|
||||
+ snprintf(buf, sizeof(buf), "%u " MODSEQ_FMT " %lld (%u) %lld %s",
|
||||
record->uid, record->modseq, record->last_updated,
|
||||
flagcrc,
|
||||
record->internaldate,
|
||||
@@ -2959,7 +2959,7 @@ static uint32_t crc_virtannot(struct mailbox *mailbox,
|
||||
}
|
||||
|
||||
if (record->savedate && mailbox->i.minor_version >= 15) {
|
||||
- buf_printf(&buf, "%lu", record->savedate);
|
||||
+ buf_printf(&buf, "%lld", record->savedate);
|
||||
crc ^= crc_annot(record->uid, IMAP_ANNOT_NS "savedate", "", &buf);
|
||||
buf_reset(&buf);
|
||||
}
|
||||
@@ -4520,7 +4520,7 @@ static int mailbox_index_repack(struct mailbox *mailbo
|
||||
if (mailbox->i.minor_version >= 15 && repack->newmailbox.i.minor_version < 15) {
|
||||
if (record->savedate) {
|
||||
buf_reset(&buf);
|
||||
- buf_printf(&buf, "%lu", record->savedate);
|
||||
+ buf_printf(&buf, "%lld", record->savedate);
|
||||
r = annotate_state_writesilent(astate, IMAP_ANNOT_NS "savedate", "", &buf);
|
||||
if (r) goto done;
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
$OpenBSD: patch-imap_mbexamine_c,v 1.12 2020/05/30 10:09:27 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: imap/mbexamine.c
|
||||
--- imap/mbexamine.c.orig
|
||||
+++ imap/mbexamine.c
|
||||
@@ -231,7 +231,7 @@ static int do_examine(struct findall_data *data, void
|
||||
mailbox->i.start_offset, mailbox->i.record_size);
|
||||
printf(" Number of Messages: %u Mailbox Size: " QUOTA_T_FMT " bytes Annotations Size: " QUOTA_T_FMT " bytes\n",
|
||||
mailbox->i.exists, mailbox->i.quota_mailbox_used, mailbox->i.quota_annot_used);
|
||||
- printf(" Last Append Date: (%lu) %s",
|
||||
+ printf(" Last Append Date: (%lld) %s",
|
||||
mailbox->i.last_appenddate, ctime(&mailbox->i.last_appenddate));
|
||||
printf(" UIDValidity: %u Last UID: %u\n",
|
||||
mailbox->i.uidvalidity, mailbox->i.last_uid);
|
||||
@@ -255,8 +255,8 @@ static int do_examine(struct findall_data *data, void
|
||||
}
|
||||
}
|
||||
printf("\n");
|
||||
- printf(" Last POP3 Login: (%ld) %s", mailbox->i.pop3_last_login,
|
||||
- ctime((const long *) &mailbox->i.pop3_last_login));
|
||||
+ printf(" Last POP3 Login: (%lld) %s", mailbox->i.pop3_last_login,
|
||||
+ ctime((const long long *) &mailbox->i.pop3_last_login));
|
||||
printf(" Highest Mod Sequence: " MODSEQ_FMT "\n",
|
||||
mailbox->i.highestmodseq);
|
||||
|
||||
@@ -277,10 +277,10 @@ static int do_examine(struct findall_data *data, void
|
||||
}
|
||||
|
||||
printf("%06u> UID:%08u"
|
||||
- " INT_DATE:%lu SENTDATE:%lu SAVEDATE:%lu SIZE:%-6u\n",
|
||||
+ " INT_DATE:%lld SENTDATE:%lld SAVEDATE:%lld SIZE:%-6u\n",
|
||||
msgno, record->uid, record->internaldate,
|
||||
record->sentdate, record->savedate, record->size);
|
||||
- printf(" > HDRSIZE:%-6u LASTUPD :%lu SYSFLAGS:%08X",
|
||||
+ printf(" > HDRSIZE:%-6u LASTUPD :%lld SYSFLAGS:%08X",
|
||||
record->header_size, record->last_updated,
|
||||
record->system_flags);
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-imap_seen_db_c,v 1.3 2018/05/18 11:16:43 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: imap/seen_db.c
|
||||
--- imap/seen_db.c.orig
|
||||
+++ imap/seen_db.c
|
||||
@@ -295,7 +295,7 @@ EXPORTED int seen_write(struct seen *seendb, const cha
|
||||
seendb->user, uniqueid);
|
||||
}
|
||||
|
||||
- snprintf(data, sz, "%d %lu %u %lu %s", SEEN_VERSION,
|
||||
+ snprintf(data, sz, "%d %lld %u %lld %s", SEEN_VERSION,
|
||||
sd->lastread, sd->lastuid,
|
||||
sd->lastchange, sd->seenuids);
|
||||
datalen = strlen(data);
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-imap_sync_support_c,v 1.4 2020/05/14 12:26:39 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: imap/sync_support.c
|
||||
--- imap/sync_support.c.orig
|
||||
+++ imap/sync_support.c
|
||||
@@ -4963,7 +4963,7 @@ 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) cid:" CONV_FMT,
|
||||
+ "last_updated:%lld internaldate:%lld flags:(%s) cid:" CONV_FMT,
|
||||
name, record->uid, record->modseq,
|
||||
record->last_updated, record->internaldate,
|
||||
make_flags(mailbox, record), record->cid);
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-imtest_imtest_c,v 1.5 2020/10/09 08:47:57 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: imtest/imtest.c
|
||||
--- imtest/imtest.c.orig
|
||||
+++ imtest/imtest.c
|
||||
@@ -1980,7 +1980,7 @@ static void send_recv_test(void)
|
||||
|
||||
end=time(NULL);
|
||||
|
||||
- printf("took %ld seconds\n", end - start);
|
||||
+ printf("took %lld seconds\n", end - start);
|
||||
}
|
||||
|
||||
/*********************************** POP3 ************************************/
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-lib_auth_pts_c,v 1.3 2018/05/18 11:16:43 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: lib/auth_pts.c
|
||||
--- lib/auth_pts.c.orig
|
||||
+++ lib/auth_pts.c
|
||||
@@ -400,7 +400,7 @@ static int ptload(const char *identifier, struct auth_
|
||||
|
||||
syslog(LOG_DEBUG,
|
||||
"ptload(): fetched cache record (%s)" \
|
||||
- "(mark %ld, current %ld, limit %ld)", identifier,
|
||||
+ "(mark %lld, current %lld, limit %lld)", identifier,
|
||||
fetched->mark, now, now - timeout);
|
||||
|
||||
if (fetched->mark > (now - timeout)) {
|
||||
@ -1,25 +0,0 @@
|
||||
$OpenBSD: patch-lib_prot_c,v 1.4 2020/05/14 12:26:39 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: lib/prot.c
|
||||
--- lib/prot.c.orig
|
||||
+++ lib/prot.c
|
||||
@@ -816,7 +816,7 @@ EXPORTED int prot_fill(struct protstream *s)
|
||||
char timebuf[20];
|
||||
|
||||
time(&newtime);
|
||||
- snprintf(timebuf, sizeof(timebuf), "<%ld<", newtime);
|
||||
+ snprintf(timebuf, sizeof(timebuf), "<%lld<", newtime);
|
||||
n = write(s->logfd, timebuf, strlen(timebuf));
|
||||
|
||||
left = s->cnt;
|
||||
@@ -879,7 +879,7 @@ static void prot_flush_log(struct protstream *s)
|
||||
char timebuf[20];
|
||||
|
||||
time(&newtime);
|
||||
- snprintf(timebuf, sizeof(timebuf), ">%ld>", newtime);
|
||||
+ snprintf(timebuf, sizeof(timebuf), ">%lld>", newtime);
|
||||
n = write(s->logfd, timebuf, strlen(timebuf));
|
||||
|
||||
do {
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-master_master_c,v 1.2 2020/05/14 12:26:39 ajacoutot Exp $
|
||||
|
||||
warning: format specifies type 'long' but the argument has type 'rlim_t' (aka 'unsigned long long') [-Wformat]
|
||||
|
||||
Index: master/master.c
|
||||
--- master/master.c.orig
|
||||
+++ master/master.c
|
||||
@@ -1983,13 +1983,13 @@ static void limit_fds(rlim_t x)
|
||||
}
|
||||
|
||||
if (verbose > 1) {
|
||||
- syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld",
|
||||
+ syslog(LOG_DEBUG, "set maximum file descriptors to %llu/%llu",
|
||||
rl.rlim_cur, rl.rlim_max);
|
||||
}
|
||||
|
||||
if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) {
|
||||
syslog(LOG_ERR,
|
||||
- "setrlimit: Unable to set file descriptors limit to %ld: %m",
|
||||
+ "setrlimit: Unable to set file descriptors limit to %llu: %m",
|
||||
rl.rlim_cur);
|
||||
}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-notifyd_notify_mailto_c,v 1.3 2018/05/18 11:16:43 ajacoutot Exp $
|
||||
|
||||
64 bit time_t
|
||||
|
||||
Index: notifyd/notify_mailto.c
|
||||
--- notifyd/notify_mailto.c.orig
|
||||
+++ notifyd/notify_mailto.c
|
||||
@@ -110,7 +110,7 @@ char* notify_mailto(const char *class,
|
||||
return strdup("NO mailto could not spawn sendmail process");
|
||||
|
||||
t = time(NULL);
|
||||
- snprintf(outmsgid, sizeof(outmsgid), "<cmu-sieve-%d-%lu-%d@%s>",
|
||||
+ snprintf(outmsgid, sizeof(outmsgid), "<cmu-sieve-%d-%lld-%d@%s>",
|
||||
(int) sm_pid, t, global_outgoing_count++, config_servername);
|
||||
|
||||
fprintf(sm, "Message-ID: %s\r\n", outmsgid);
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-sieve_sieved_c,v 1.1 2020/08/28 09:53:04 ajacoutot Exp $
|
||||
|
||||
sieve/sieved.c:161:61: warning: format specifies type 'unsigned long' but the argument has type 'unsigned long long' [-Wformat]
|
||||
sieve/sieved.c:176:29: warning: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
|
||||
|
||||
Index: sieve/sieved.c
|
||||
--- sieve/sieved.c.orig
|
||||
+++ sieve/sieved.c
|
||||
@@ -158,7 +158,7 @@ static void print_stringlist(const char *label, strarr
|
||||
|
||||
static void print_time(uint64_t t)
|
||||
{
|
||||
- printf(" %02lu:%02lu:%02lu", t / 3600, (t % 3600) / 60, t % 60);
|
||||
+ printf(" %02llu:%02llu:%02llu", t / 3600, (t % 3600) / 60, t % 60);
|
||||
}
|
||||
|
||||
static void print_vallist(const char *label, arrayu64_t *list,
|
||||
@@ -173,7 +173,7 @@ static void print_vallist(const char *label, arrayu64_
|
||||
|
||||
if (!(x % 5)) printf("\n\t\t");
|
||||
if (print_cb) print_cb(i);
|
||||
- else printf(" %lu", i);
|
||||
+ else printf(" %llu", i);
|
||||
}
|
||||
printf("\n\t]");
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.38 2020/10/09 08:47:57 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.39 2020/12/04 12:23:57 ajacoutot Exp $
|
||||
@pkgpath mail/cyrus-imapd,-main,kerberos
|
||||
@pkgpath mail/cyrus-imapd,-main
|
||||
@pkgpath mail/cyrus-imapd,-perl
|
||||
@ -28,7 +28,6 @@ cyrus/libexec/
|
||||
cyrus/libexec/lmtpproxyd
|
||||
@bin cyrus/libexec/master
|
||||
@bin cyrus/libexec/mupdate
|
||||
@bin cyrus/libexec/nntpd
|
||||
@bin cyrus/libexec/notifyd
|
||||
@bin cyrus/libexec/pop3d
|
||||
cyrus/libexec/pop3proxyd
|
||||
@ -74,7 +73,6 @@ cyrus/man/man8/
|
||||
@man cyrus/man/man8/cyr_synclog.8
|
||||
@man cyrus/man/man8/cyr_virusscan.8
|
||||
@man cyrus/man/man8/deliver.8
|
||||
@man cyrus/man/man8/fetchnews.8
|
||||
@man cyrus/man/man8/fud.8
|
||||
@man cyrus/man/man8/idled.8
|
||||
@man cyrus/man/man8/imapd.8
|
||||
@ -84,7 +82,6 @@ cyrus/man/man8/
|
||||
@man cyrus/man/man8/mbexamine.8
|
||||
@man cyrus/man/man8/mbpath.8
|
||||
@man cyrus/man/man8/mbtool.8
|
||||
@man cyrus/man/man8/nntpd.8
|
||||
@man cyrus/man/man8/notifyd.8
|
||||
@man cyrus/man/man8/pop3d.8
|
||||
@man cyrus/man/man8/quota.8
|
||||
@ -116,7 +113,6 @@ cyrus/sbin/
|
||||
@bin cyrus/sbin/cyr_virusscan
|
||||
@bin cyrus/sbin/cyrdump
|
||||
@bin cyrus/sbin/deliver
|
||||
@bin cyrus/sbin/fetchnews
|
||||
@bin cyrus/sbin/ipurge
|
||||
@bin cyrus/sbin/mbexamine
|
||||
@bin cyrus/sbin/mbpath
|
||||
@ -490,6 +486,7 @@ share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.1.html
|
||||
share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.2.html
|
||||
share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.3.html
|
||||
share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.4.html
|
||||
share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.5.html
|
||||
share/doc/cyrus-imapd/html/imap/download/release-notes/index.html
|
||||
share/doc/cyrus-imapd/html/imap/download/upgrade.html
|
||||
share/doc/cyrus-imapd/html/imap/installing.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user