Re: cyrus-imapd upstreamed patches and improvements

Antoine, Stuart,

cyrus-imapd 3.2.5 was just released.

I'm attaching an updated patch that also includes the SHA256 and the version
bump + everything else from my initial mail, which is needed to accommodate the
cross-platform changes and upstreamed port's patches that are included in this
release (and the explanations for each change are in my initial mail).

Regards,
Anatoli



diff --git Makefile Makefile
index bfee0b835b1..d738a1ca91b 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ 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
diff --git distinfo distinfo
index 2c825c1a02a..367870468fe 100644
--- distinfo
+++ distinfo
@@ -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
diff --git Makefile Makefile
index c7fb05ebcee..bfee0b835b1 100644
--- Makefile
+++ Makefile
@@ -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 \
diff --git patches/patch-imap_conversations_c patches/patch-imap_conversations_c
deleted file mode 100644
index 9eab9396e0d..00000000000
--- patches/patch-imap_conversations_c
+++ /dev/null
@@ -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,
diff --git patches/patch-imap_fud_c patches/patch-imap_fud_c
deleted file mode 100644
index cc6a8f8d327..00000000000
--- patches/patch-imap_fud_c
+++ /dev/null
@@ -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 */
-+