From 934bc2eca717ae665e09e3e6b705f9c731bc9ca4 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 20 May 2026 11:44:07 +0000
Subject: [PATCH] Update to cyrus-imapd-3.13.4 to work with libical >= 4. This
 is a development version but it's a good time to test, we have full release
 cycle ahead.

---
 mail/cyrus-imapd/Makefile                     |  44 +-
 mail/cyrus-imapd/distinfo                     |   4 +-
 mail/cyrus-imapd/patches/patch-configure_ac   |  14 +
 .../patch-doc_examples_cyrus_conf_normal_conf |   6 +-
 .../patch-doc_legacy_install-upgrade_html     |  12 -
 .../patches/patch-imap_backupcyrusd_c         |  23 +
 .../cyrus-imapd/patches/patch-imap_http_jwt_c |  27 +
 mail/cyrus-imapd/patches/patch-imap_http_ws_c |   2 +-
 mail/cyrus-imapd/patches/patch-imap_httpd_c   |   2 +-
 .../patches/patch-imap_jmap_mail_query_c      |  19 +
 mail/cyrus-imapd/patches/patch-imap_tls_c     |  12 -
 mail/cyrus-imapd/patches/patch-lib_buf_h      |  11 +
 .../cyrus-imapd/patches/patch-lib_imapoptions |  30 -
 .../patches/patch-lib_mappedfile_h            |  11 +
 mail/cyrus-imapd/patches/patch-lib_twom_c     |  12 +
 mail/cyrus-imapd/patches/patch-lib_util_h     |  22 +
 .../patches/patch-man_imapd_conf_5            |  30 -
 .../patches/patch-tools_masssievec            |   2 +-
 mail/cyrus-imapd/patches/patch-tools_rehash   |   8 +-
 .../patches/patch-tools_translatesieve        |   2 +-
 mail/cyrus-imapd/pkg/PLIST                    | 649 ++----------------
 21 files changed, 237 insertions(+), 705 deletions(-)
 create mode 100644 mail/cyrus-imapd/patches/patch-configure_ac
 delete mode 100644 mail/cyrus-imapd/patches/patch-doc_legacy_install-upgrade_html
 create mode 100644 mail/cyrus-imapd/patches/patch-imap_backupcyrusd_c
 create mode 100644 mail/cyrus-imapd/patches/patch-imap_http_jwt_c
 create mode 100644 mail/cyrus-imapd/patches/patch-imap_jmap_mail_query_c
 delete mode 100644 mail/cyrus-imapd/patches/patch-imap_tls_c
 create mode 100644 mail/cyrus-imapd/patches/patch-lib_buf_h
 delete mode 100644 mail/cyrus-imapd/patches/patch-lib_imapoptions
 create mode 100644 mail/cyrus-imapd/patches/patch-lib_mappedfile_h
 create mode 100644 mail/cyrus-imapd/patches/patch-lib_twom_c
 create mode 100644 mail/cyrus-imapd/patches/patch-lib_util_h
 delete mode 100644 mail/cyrus-imapd/patches/patch-man_imapd_conf_5

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 681edbea99f..b00aa20e1ca 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -2,7 +2,7 @@ PORTROACH=		limitw:1,even
 
 COMMENT=		Cyrus IMAP server
 
-V=			3.12.2
+V=			3.13.4
 DISTNAME=		cyrus-imapd-${V}
 
 SHARED_LIBS +=  cyrus_min            0.0      # unknown
@@ -20,21 +20,29 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=		Yes
 
 WANTLIB += ${COMPILER_LIBCXX} brotlicommon brotlienc c com_err
-WANTLIB += crypto db db_cxx execinfo ical icalss icalvcal iconv
-WANTLIB += icudata icui18n icuuc jansson m nghttp2 pcre2-8 pcre2-posix
-WANTLIB += perl sasl2 shp sqlite3 srs2 ssl uuid wslay xapian xml2
-WANTLIB += z zstd
+WANTLIB += crypto execinfo ical icalvcard iconv icudata icui18n
+WANTLIB += icuuc jansson m nghttp2 pcre2-8 pcre2-posix perl sasl2
+WANTLIB += shp sqlite3 srs2 ssl uuid wslay xapian xml2 z zstd
 
-SITES=			https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-${V}/
+GH_ACCOUNT=		cyrusimap
+GH_PROJECT=		cyrus-imapd
+GH_TAGNAME=		cyrus-imapd-${V}
+#SITES=			https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-${V}/
 
 COMPILER=		base-clang ports-gcc base-gcc
 USE_GMAKE=		Yes
 
+YACC=			bison -y
+
+BUILD_DEPENDS=		devel/bison \
+			devel/p5-App-Cmd \
+			devel/p5-Type-Tiny
+
 # xapian support, needed to for compacting databases
 BUILD_DEPENDS +=	net/rsync
 RUN_DEPENDS +=		net/rsync
 
-# xxd(1), needed for caldav support
+# xxd(1), needed for http/caldav support
 BUILD_DEPENDS +=	vim-*|vim-classic-*:editors/vim
 
 LIB_DEPENDS=		archivers/brotli \
@@ -52,7 +60,9 @@ LIB_DEPENDS=		archivers/brotli \
 			www/nghttp2 \
 			www/wslay
 
-CONFIGURE_STYLE=	gnu
+AUTOCONF_VERSION=	2.72
+AUTOMAKE_VERSION=	1.18
+CONFIGURE_STYLE=	autoreconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=		--bindir=${PREFIX}/cyrus/bin \
@@ -63,10 +73,8 @@ CONFIGURE_ARGS=		--bindir=${PREFIX}/cyrus/bin \
 			--with-syslogfacility=MAIL \
 			--without-chardet \
 			--without-sphinx-build \
-			--without-zeroskip \
 			--disable-gssapi \
 			--enable-autocreate \
-			--enable-backup \
 			--enable-calalarmd \
 			--enable-http \
 			--enable-idled \
@@ -86,6 +94,15 @@ DEBUG_PACKAGES=		${BUILD_PACKAGES}
 # --mandir is overriden by the ports infrastructure
 FAKE_FLAGS=		mandir=${PREFIX}/cyrus/man
 
+pre-configure:
+# XXX cannot use a patch because ./tools/imapoptions.pl iterates over the file
+# names and breaks with:
+# foo.orig.port: name must match filename at ./tools/lib/Cyrus/IMAPOptions/Option.pm line 119.
+	sed -i \
+		-e "s,/usr/lib/sendmail,/usr/sbin/sendmail,g" \
+		-e "s,/usr/sieve,/var/sieve,g" \
+		${WRKSRC}/lib/imapoptions/{sendmail,sievedir}
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/cyrus-imapd
 	cp -R ${WRKSRC}/doc/[!examples]* ${PREFIX}/share/doc/cyrus-imapd
@@ -94,11 +111,6 @@ post-install:
 	cp -R ${WRKSRC}/tools ${PREFIX}/share/examples/cyrus-imapd/
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${PREFIX}/share/examples/cyrus-imapd/
-	rm -r ${PREFIX}/libdata/perl5/${MACHINE_ARCH}-openbsd \
-		${PREFIX}/share/doc/cyrus-imapd/text
-# cleanup
-	rm -r ${PREFIX}/share/doc/cyrus-imapd/html/{_*,.buildinfo}
-	find ${PREFIX}/share/{doc,examples}/cyrus-imapd -name '.gitignore' -or \
-		-name '*.orig' -exec rm '{}' \+
+	rm -r ${PREFIX}/libdata/perl5/${MACHINE_ARCH}-openbsd
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 3b1286eb518..f3a825d7709 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cyrus-imapd-3.12.2.tar.gz) = aByldIOz3Z7pHxceEeXuIWhNHahyYuJ+pv+b0HbpUU0=
-SIZE (cyrus-imapd-3.12.2.tar.gz) = 11497817
+SHA256 (cyrus-imapd-3.13.4.tar.gz) = y5kGmnV7vR6jnT35gyvr2qEO0M8eLno0wLgA5ssvASU=
+SIZE (cyrus-imapd-3.13.4.tar.gz) = 5387207
diff --git a/mail/cyrus-imapd/patches/patch-configure_ac b/mail/cyrus-imapd/patches/patch-configure_ac
new file mode 100644
index 00000000000..e9f7abbd022
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-configure_ac
@@ -0,0 +1,14 @@
+Use LibreSSL.
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -1184,7 +1184,7 @@ SASL_SET_GSSAPI_LIBS
+ dnl
+ dnl Check for OpenSSL library, needed for TLS support
+ dnl
+-PKG_CHECK_MODULES([SSL], [openssl >= 3.0], [],
++PKG_CHECK_MODULES([SSL], [openssl], [],
+                   AC_MSG_ERROR([openssl is required]))
+ dnl call AC_SUBST macro to support pkg-config version older than 0.24
+ AC_SUBST([SSL_LIBS])
diff --git a/mail/cyrus-imapd/patches/patch-doc_examples_cyrus_conf_normal_conf b/mail/cyrus-imapd/patches/patch-doc_examples_cyrus_conf_normal_conf
index bac3221c733..b1d9ce2fa4e 100644
--- a/mail/cyrus-imapd/patches/patch-doc_examples_cyrus_conf_normal_conf
+++ b/mail/cyrus-imapd/patches/patch-doc_examples_cyrus_conf_normal_conf
@@ -41,13 +41,13 @@ Index: doc/examples/cyrus_conf/normal.conf
  }
  
  EVENTS {
-@@ -47,9 +47,12 @@ EVENTS {
+@@ -55,9 +55,12 @@ EVENTS {
  
    # this is only necessary if caching TLS sessions
-   tlsprune      cmd="tls_prune" at=0400
+   tlsprune      cmd="tls_prune" cron="00 04 * * *"
 +
 +  # create SQUAT indexes for all mailboxes
-+#  squatter	cmd="squatter -s -r -i user" at=0540
++#  squatter    cmd="squatter -s -r -i user" at=0540
  }
  
  DAEMON {
diff --git a/mail/cyrus-imapd/patches/patch-doc_legacy_install-upgrade_html b/mail/cyrus-imapd/patches/patch-doc_legacy_install-upgrade_html
deleted file mode 100644
index c6135fc27ad..00000000000
--- a/mail/cyrus-imapd/patches/patch-doc_legacy_install-upgrade_html
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: doc/legacy/install-upgrade.html
---- doc/legacy/install-upgrade.html.orig
-+++ doc/legacy/install-upgrade.html
-@@ -725,7 +725,7 @@ regular basis to purge old netnews posts.
- <ul>
- <li> Upgrading from the Cyrus IMAP server version 1.6.13 or earlier:
- if you use Sieve, you should run the "<tt>tools/upgradesieve</tt>"
--script, as the format of the "<tt>/usr/sieve</tt>" directory has
-+script, as the format of the "<tt>/var/sieve</tt>" directory has
- changed slightly.
- 
- <p>timsieved, included in this release, will handle maintenance of Sieve
diff --git a/mail/cyrus-imapd/patches/patch-imap_backupcyrusd_c b/mail/cyrus-imapd/patches/patch-imap_backupcyrusd_c
new file mode 100644
index 00000000000..668a9f55945
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-imap_backupcyrusd_c
@@ -0,0 +1,23 @@
+64bit time_t
+
+Index: imap/backupcyrusd.c
+--- imap/backupcyrusd.c.orig
++++ imap/backupcyrusd.c
+@@ -353,7 +353,7 @@ static void send_file(const char *name, const char *mb
+         map_refresh(fd, 1, &base, &len, sbuf.st_size, fname, 0);
+         prot_puts(bcd_out, "DATA ");
+         puturistring(bcd_out, name);
+-        prot_printf(bcd_out, " %lu %lu %lu\n", len, sbuf.st_mtim.tv_sec, sbuf.st_ino);
++        prot_printf(bcd_out, " %lu %lld %lu\n", len, sbuf.st_mtim.tv_sec, sbuf.st_ino);
+         prot_write(bcd_out, base, len);
+         struct message_guid guid = MESSAGE_GUID_INITIALIZER;
+         message_guid_generate(&guid, base, len);
+@@ -370,7 +370,7 @@ static void send_file(const char *name, const char *mb
+             prot_putc(' ', bcd_out);
+         }
+         puturistring(bcd_out, name);
+-        prot_printf(bcd_out, " %lu %lu %lu\n", sbuf.st_size, sbuf.st_mtim.tv_sec, sbuf.st_ino);
++        prot_printf(bcd_out, " %lu %lld %lu\n", sbuf.st_size, sbuf.st_mtim.tv_sec, sbuf.st_ino);
+     }
+ }
+ 
diff --git a/mail/cyrus-imapd/patches/patch-imap_http_jwt_c b/mail/cyrus-imapd/patches/patch-imap_http_jwt_c
new file mode 100644
index 00000000000..272f4930afe
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-imap_http_jwt_c
@@ -0,0 +1,27 @@
+Build with LibreSSL.
+
+Index: imap/http_jwt.c
+--- imap/http_jwt.c.orig
++++ imap/http_jwt.c
+@@ -82,7 +82,7 @@ static EVP_PKEY *read_public_key(struct buf *pem)
+     EVP_PKEY *pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL);
+ 
+     if (pkey) {
+-        if (!EVP_PKEY_is_a(pkey, "RSA")) {
++        if (!(EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA)) {
+             xsyslog(LOG_ERR, "Unsupported public key", NULL);
+             EVP_PKEY_free(pkey);
+             pkey = NULL;
+@@ -287,10 +287,10 @@ static int validate_pkey_type(struct jwt *jwt, EVP_PKE
+     if (!jwt->nid)
+         return 0;
+ 
+-    if (jwt->nid == EVP_PKEY_HMAC && EVP_PKEY_is_a(pkey, "HMAC"))
++    if (jwt->nid == EVP_PKEY_HMAC && (EVP_PKEY_base_id(pkey) == EVP_PKEY_HMAC))
+         return 1;
+ 
+-    if (jwt->nid == EVP_PKEY_RSA && EVP_PKEY_is_a(pkey, "RSA"))
++    if (jwt->nid == EVP_PKEY_RSA && (EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA))
+         return 1;
+ 
+     return 0;
diff --git a/mail/cyrus-imapd/patches/patch-imap_http_ws_c b/mail/cyrus-imapd/patches/patch-imap_http_ws_c
index 354ccc48318..6fe565a6473 100644
--- a/mail/cyrus-imapd/patches/patch-imap_http_ws_c
+++ b/mail/cyrus-imapd/patches/patch-imap_http_ws_c
@@ -3,7 +3,7 @@
 Index: imap/http_ws.c
 --- imap/http_ws.c.orig
 +++ imap/http_ws.c
-@@ -390,7 +390,7 @@ static void on_frame_recv_start_cb(wslay_event_context
+@@ -309,7 +309,7 @@ static void on_frame_recv_start_cb(wslay_event_context
                                     void *user_data __attribute__((unused)))
  {
      xsyslog(LOG_DEBUG, "WS frame start",
diff --git a/mail/cyrus-imapd/patches/patch-imap_httpd_c b/mail/cyrus-imapd/patches/patch-imap_httpd_c
index a61469734bb..7d1226d87b2 100644
--- a/mail/cyrus-imapd/patches/patch-imap_httpd_c
+++ b/mail/cyrus-imapd/patches/patch-imap_httpd_c
@@ -1,7 +1,7 @@
 Index: imap/httpd.c
 --- imap/httpd.c.orig
 +++ imap/httpd.c
-@@ -1286,7 +1286,9 @@ static void _shutdown_tls(struct http_connection *conn
+@@ -1240,7 +1240,9 @@ static void _shutdown_tls(struct http_connection *conn
  
  static int tls_init(int client_auth, struct buf *serverinfo)
  {
diff --git a/mail/cyrus-imapd/patches/patch-imap_jmap_mail_query_c b/mail/cyrus-imapd/patches/patch-imap_jmap_mail_query_c
new file mode 100644
index 00000000000..8b84b67d4ae
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-imap_jmap_mail_query_c
@@ -0,0 +1,19 @@
+64bit time_t
+
+Index: imap/jmap_mail_query.c
+--- imap/jmap_mail_query.c.orig
++++ imap/jmap_mail_query.c
+@@ -901,11 +901,11 @@ static void _matchmime_query_serialize(matchmime_query
+         break;
+     case MATCHMIME_OP_BEFORE:
+         buf_appendcstr(buf, "BEFORE");
+-        buf_printf(buf, "{%ld}", q->v.time);
++        buf_printf(buf, "{%lld}", q->v.time);
+         break;
+     case MATCHMIME_OP_AFTER:
+         buf_appendcstr(buf, "AFTER");
+-        buf_printf(buf, "{%ld}", q->v.time);
++        buf_printf(buf, "{%lld}", q->v.time);
+         break;
+     case MATCHMIME_OP_CONVKEYWORD_ALL:
+         buf_appendcstr(buf, "CONVKEYWORD_ALL");
diff --git a/mail/cyrus-imapd/patches/patch-imap_tls_c b/mail/cyrus-imapd/patches/patch-imap_tls_c
deleted file mode 100644
index 29db18b6684..00000000000
--- a/mail/cyrus-imapd/patches/patch-imap_tls_c
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: imap/tls.c
---- imap/tls.c.orig
-+++ imap/tls.c
-@@ -258,7 +258,7 @@ static DH *get_dh1024(void)
-     dh = DH_new();
-     if (!dh) return NULL;
- 
--    p = get_rfc2409_prime_1024(NULL);
-+    p = BN_get_rfc2409_prime_1024(NULL);
-     BN_dec2bn(&g, "2");
- 
-     if (DH_set0_pqg(dh, p, NULL, g))
diff --git a/mail/cyrus-imapd/patches/patch-lib_buf_h b/mail/cyrus-imapd/patches/patch-lib_buf_h
new file mode 100644
index 00000000000..74994701e3e
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-lib_buf_h
@@ -0,0 +1,11 @@
+Index: lib/buf.h
+--- lib/buf.h.orig
++++ lib/buf.h
+@@ -5,6 +5,7 @@
+ #ifndef INCLUDED_BUF_H
+ #define INCLUDED_BUF_H
+ 
++#include <stdarg.h> /* va_list */
+ #include <stdint.h>
+ #include <stdio.h>
+ 
diff --git a/mail/cyrus-imapd/patches/patch-lib_imapoptions b/mail/cyrus-imapd/patches/patch-lib_imapoptions
deleted file mode 100644
index bfb186723d0..00000000000
--- a/mail/cyrus-imapd/patches/patch-lib_imapoptions
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: lib/imapoptions
---- lib/imapoptions.orig
-+++ lib/imapoptions
-@@ -815,7 +815,7 @@ Blank lines and lines beginning with ``#'' are ignored
-    is a C format string that gets 3 options: the first is the name of the
-    executable (as specified in the cmd parameter in cyrus.conf). The second
-    is the pid (integer) and the third is the service ID.
--   Example: /usr/local/bin/gdb /usr/cyrus/bin/%s %d */
-+   Example: /usr/bin/gdb /usr/local/cyrus/bin/%s %d */
- 
- { "debug_log_sync_partition_choice", 0, SWITCH, "3.8.0" }
- /* If enabled, replication will log which partition it chose for staging.
-@@ -2591,7 +2591,7 @@ If all partitions are over that limit, this feature is
- { "seenstate_db", "twoskip", STRINGLIST("flat", "skiplist", "twoskip", "zeroskip"), "3.1.6" }
- /* The cyrusdb backend to use for the seen state. */
- 
--{ "sendmail", "/usr/lib/sendmail", STRING, "2.3.17" }
-+{ "sendmail", "/usr/sbin/sendmail", STRING, "2.3.17" }
- /* The pathname of the sendmail executable.  Sieve invokes sendmail
-    for sending rejections, redirects and vacation responses. */
- 
-@@ -2728,7 +2728,7 @@ product version in the capabilities
-    For backward compatibility, if no unit is specified, seconds is
-    assumed. */
- 
--{ "sievedir", "/usr/sieve", STRING, "2.3.17" }
-+{ "sievedir", "/var/sieve", STRING, "2.3.17" }
- /* If sieveusehomedir is false, this directory is searched for Sieve
-    scripts. */
- 
diff --git a/mail/cyrus-imapd/patches/patch-lib_mappedfile_h b/mail/cyrus-imapd/patches/patch-lib_mappedfile_h
new file mode 100644
index 00000000000..e90c15920d3
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-lib_mappedfile_h
@@ -0,0 +1,11 @@
+Index: lib/mappedfile.h
+--- lib/mappedfile.h.orig
++++ lib/mappedfile.h
+@@ -7,6 +7,7 @@
+ 
+ // includes
+ #include "buf.h"
++#include <sys/time.h> /* timeval */
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ 
diff --git a/mail/cyrus-imapd/patches/patch-lib_twom_c b/mail/cyrus-imapd/patches/patch-lib_twom_c
new file mode 100644
index 00000000000..05ce18e2e6f
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-lib_twom_c
@@ -0,0 +1,12 @@
+Index: lib/twom.c
+--- lib/twom.c.orig
++++ lib/twom.c
+@@ -25,6 +25,8 @@
+ #include <unistd.h>
+ #include <uuid/uuid.h>
+ 
++#define UUID_STR_LEN 36 /* from OpenBSD uuid.h */
++
+ #include "twom.h"
+ 
+ #define XXH_STATIC_LINKING_ONLY /* access advanced declarations */
diff --git a/mail/cyrus-imapd/patches/patch-lib_util_h b/mail/cyrus-imapd/patches/patch-lib_util_h
new file mode 100644
index 00000000000..396717fc887
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-lib_util_h
@@ -0,0 +1,22 @@
+./lib/util.h:472:22: error: alias must point to a defined variable or function
+  472 | __attribute__((weak, alias("wrap_clock_gettime"), visibility("default")))
+
+Index: lib/util.h
+--- lib/util.h.orig
++++ lib/util.h
+@@ -465,11 +465,15 @@ enum xsyslog_ev_arg_type {
+  * We need this shim because, unlike gettimeofday, clock_gettime itself is
+  * not a weak alias, so it can't be overridden directly.
+  */
++#ifdef __cplusplus
++extern "C" int cyrus_gettime(clockid_t, struct timespec *);
++#else
+ static int wrap_clock_gettime(clockid_t id, struct timespec *ts)
+ {
+     return clock_gettime(id, ts);
+ }
+ __attribute__((weak, alias("wrap_clock_gettime"), visibility("default")))
+ extern int cyrus_gettime(clockid_t, struct timespec *);
++#endif
+ 
+ #endif /* INCLUDED_UTIL_H */
diff --git a/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 b/mail/cyrus-imapd/patches/patch-man_imapd_conf_5
deleted file mode 100644
index 642c2a55868..00000000000
--- a/mail/cyrus-imapd/patches/patch-man_imapd_conf_5
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: man/imapd.conf.5
---- man/imapd.conf.5.orig
-+++ man/imapd.conf.5
-@@ -1301,7 +1301,7 @@ Debug command to be used by processes started with \-D
- is a C format string that gets 3 options: the first is the name of the
- executable (as specified in the cmd parameter in cyrus.conf). The second
- is the pid (integer) and the third is the service ID.
--Example: /usr/local/bin/gdb /usr/cyrus/bin/%s %d
-+Example: /usr/bin/gdb /usr/local/cyrus/bin/%s %d
- .UNINDENT
- .UNINDENT
- .sp
-@@ -4302,7 +4302,7 @@ Allowed values: \fIflat\fP, \fIskiplist\fP, \fItwoskip
- .UNINDENT
- .UNINDENT
- .sp
--\fBsendmail:\fP /usr/lib/sendmail
-+\fBsendmail:\fP /usr/sbin/sendmail
- .INDENT 0.0
- .INDENT 3.5
- The pathname of the sendmail executable.  Sieve invokes sendmail
-@@ -4521,7 +4521,7 @@ assumed.
- .UNINDENT
- .UNINDENT
- .sp
--\fBsievedir:\fP /usr/sieve
-+\fBsievedir:\fP /var/sieve
- .INDENT 0.0
- .INDENT 3.5
- If sieveusehomedir is false, this directory is searched for Sieve
diff --git a/mail/cyrus-imapd/patches/patch-tools_masssievec b/mail/cyrus-imapd/patches/patch-tools_masssievec
index 802bc5fbce4..725ca130f0d 100644
--- a/mail/cyrus-imapd/patches/patch-tools_masssievec
+++ b/mail/cyrus-imapd/patches/patch-tools_masssievec
@@ -1,7 +1,7 @@
 Index: tools/masssievec
 --- tools/masssievec.orig
 +++ tools/masssievec
-@@ -59,7 +59,7 @@ if(!defined($imapdconf)) {
+@@ -22,7 +22,7 @@ if(!defined($imapdconf)) {
      $imapdconf = "/etc/imapd.conf";
  }
  
diff --git a/mail/cyrus-imapd/patches/patch-tools_rehash b/mail/cyrus-imapd/patches/patch-tools_rehash
index 44c6ee55dc0..be658bab3d8 100644
--- a/mail/cyrus-imapd/patches/patch-tools_rehash
+++ b/mail/cyrus-imapd/patches/patch-tools_rehash
@@ -1,7 +1,7 @@
-Index: tools/rehash
---- tools/rehash.orig
-+++ tools/rehash
-@@ -69,7 +69,7 @@ my @configs = ($imapdconf);
+Index: tools/rehash.in
+--- tools/rehash.in.orig
++++ tools/rehash.in
+@@ -32,7 +32,7 @@ my @configs = ($imapdconf);
  my $confdir = "/var/imap";
  my @parts;
  my $yn = "y";
diff --git a/mail/cyrus-imapd/patches/patch-tools_translatesieve b/mail/cyrus-imapd/patches/patch-tools_translatesieve
index bd412563cee..20c0f8979d0 100644
--- a/mail/cyrus-imapd/patches/patch-tools_translatesieve
+++ b/mail/cyrus-imapd/patches/patch-tools_translatesieve
@@ -1,7 +1,7 @@
 Index: tools/translatesieve
 --- tools/translatesieve.orig
 +++ tools/translatesieve
-@@ -72,7 +72,7 @@ $| = 1;
+@@ -35,7 +35,7 @@ $| = 1;
  # change ownership as appropriate?
  die "must not run as root" if ($< == 0);
  
diff --git a/mail/cyrus-imapd/pkg/PLIST b/mail/cyrus-imapd/pkg/PLIST
index 6a6b90bcc1b..acd72fddabc 100644
--- a/mail/cyrus-imapd/pkg/PLIST
+++ b/mail/cyrus-imapd/pkg/PLIST
@@ -10,7 +10,6 @@ cyrus/
 cyrus/bin/
 cyrus/bin/httptest
 @bin cyrus/bin/imtest
-cyrus/bin/installsieve
 cyrus/bin/lmtptest
 cyrus/bin/mupdatetest
 cyrus/bin/nntptest
@@ -20,6 +19,7 @@ cyrus/bin/sivtest
 cyrus/bin/smtptest
 cyrus/bin/synctest
 cyrus/libexec/
+@bin cyrus/libexec/backupcyrusd
 @bin cyrus/libexec/calalarmd
 @bin cyrus/libexec/fud
 @bin cyrus/libexec/httpd
@@ -40,10 +40,10 @@ cyrus/libexec/proxyd
 @bin cyrus/libexec/timsieved
 @mandir cyrus/man/
 cyrus/man/man1/
+@man cyrus/man/man1/cyradm.1
 @man cyrus/man/man1/dav_reconstruct.1
 @man cyrus/man/man1/httptest.1
 @man cyrus/man/man1/imtest.1
-@man cyrus/man/man1/installsieve.1
 @man cyrus/man/man1/lmtptest.1
 @man cyrus/man/man1/mupdatetest.1
 @man cyrus/man/man1/nntptest.1
@@ -79,7 +79,6 @@ cyrus/man/man8/
 @man cyrus/man/man8/cyr_userseen.8
 @man cyrus/man/man8/cyr_virusscan.8
 @man cyrus/man/man8/cyr_withlock_run.8
-@man cyrus/man/man8/cyradm.8
 @man cyrus/man/man8/cyrdump.8
 @man cyrus/man/man8/deliver.8
 @man cyrus/man/man8/fetchnews.8
@@ -147,10 +146,12 @@ cyrus/sbin/cyr_cd.sh
 @bin cyrus/sbin/mbexamine
 @bin cyrus/sbin/mbpath
 @bin cyrus/sbin/mbtool
+cyrus/sbin/mkimap
 @bin cyrus/sbin/ptdump
 @bin cyrus/sbin/ptexpire
 @bin cyrus/sbin/quota
 @bin cyrus/sbin/reconstruct
+cyrus/sbin/rehash
 @bin cyrus/sbin/relocate_by_id
 @bin cyrus/sbin/sievec
 @bin cyrus/sbin/sieved
@@ -167,9 +168,11 @@ include/cyrus/auth.h
 include/cyrus/bitvector.h
 include/cyrus/bloom.h
 include/cyrus/bsearch.h
+include/cyrus/buf.h
 include/cyrus/charset.h
 include/cyrus/command.h
 include/cyrus/crc32.h
+include/cyrus/cron.h
 include/cyrus/cyr_lock.h
 include/cyrus/cyr_qsort_r.h
 include/cyrus/cyrusdb.h
@@ -179,13 +182,17 @@ include/cyrus/gmtoff.h
 include/cyrus/hash.h
 include/cyrus/hashset.h
 include/cyrus/hashu64.h
+include/cyrus/imap/
+include/cyrus/imap/message_guid.h
 include/cyrus/imapopts.h
 include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/iostat.h
 include/cyrus/iptostring.h
+include/cyrus/libconfig.h
 include/cyrus/libcyr_cfg.h
+include/cyrus/logfmt.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/mappedfile.h
@@ -210,6 +217,7 @@ include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/times.h
 include/cyrus/tok.h
+include/cyrus/twom.h
 include/cyrus/wildmat.h
 include/cyrus/xmalloc.h
 include/cyrus/xsha1.h
@@ -237,12 +245,27 @@ libdata/perl5/site_perl/Cyrus/Annotator/Daemon.pm
 libdata/perl5/site_perl/Cyrus/Annotator/Message.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/AccountSync.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Backup/
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Backup.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Backup/Restore.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Backup/State.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Backup/Tar.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/CacheFile.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/DList.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/HeaderFile.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Admin.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Shell.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/ImapClone.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IndexFile.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Mbentry.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/Mbname.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/managesieve.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SyncProto.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/cyradm.pl
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/
@@ -250,605 +273,28 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/managesieve/
 @so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/managesieve/managesieve.so
-@man man/man1/cyradm.1
+@man man/man3p/Cyrus::AccountSync.3p
 @man man/man3p/Cyrus::Annotator::Daemon.3p
 @man man/man3p/Cyrus::Annotator::Message.3p
+@man man/man3p/Cyrus::CacheFile.3p
+@man man/man3p/Cyrus::HeaderFile.3p
 @man man/man3p/Cyrus::IMAP.3p
 @man man/man3p/Cyrus::IMAP::Admin.3p
 @man man/man3p/Cyrus::IMAP::Shell.3p
+@man man/man3p/Cyrus::ImapClone.3p
+@man man/man3p/Cyrus::IndexFile.3p
 @man man/man3p/Cyrus::SIEVE::managesieve.3p
+@man man/man3p/Cyrus::SyncProto.3p
 share/doc/cyrus-imapd/
 share/doc/cyrus-imapd/COPYING
 share/doc/cyrus-imapd/README.autocreate
 share/doc/cyrus-imapd/README.autosievefolder
 share/doc/cyrus-imapd/README.cyrusdb.md
 share/doc/cyrus-imapd/README.docs
+share/doc/cyrus-imapd/README.twom.md
 share/doc/cyrus-imapd/README.xapian
-share/doc/cyrus-imapd/html/
-share/doc/cyrus-imapd/html/contribute.html
-share/doc/cyrus-imapd/html/developers.html
-share/doc/cyrus-imapd/html/download.html
-share/doc/cyrus-imapd/html/genindex.html
-share/doc/cyrus-imapd/html/glossary.html
-share/doc/cyrus-imapd/html/imap/
-share/doc/cyrus-imapd/html/imap/concepts/
-share/doc/cyrus-imapd/html/imap/concepts/deployment/
-share/doc/cyrus-imapd/html/imap/concepts/deployment.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/authentication_and_authorization.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/databases.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/deployment_scenarios.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/known_protocol_limitations.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/mailbox_creation_distribution.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/performance_recommendations.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/storage.html
-share/doc/cyrus-imapd/html/imap/concepts/deployment/supported-platforms.html
-share/doc/cyrus-imapd/html/imap/concepts/features/
-share/doc/cyrus-imapd/html/imap/concepts/features.html
-share/doc/cyrus-imapd/html/imap/concepts/features/access-control.html
-share/doc/cyrus-imapd/html/imap/concepts/features/archiving.html
-share/doc/cyrus-imapd/html/imap/concepts/features/authentication-kerberos.html
-share/doc/cyrus-imapd/html/imap/concepts/features/authentication-ldap.html
-share/doc/cyrus-imapd/html/imap/concepts/features/authentication-sql.html
-share/doc/cyrus-imapd/html/imap/concepts/features/automatic-creation-of-mailboxes.html
-share/doc/cyrus-imapd/html/imap/concepts/features/caldav-collections.html
-share/doc/cyrus-imapd/html/imap/concepts/features/carddav.html
-share/doc/cyrus-imapd/html/imap/concepts/features/dav-collection-mgmt.html
-share/doc/cyrus-imapd/html/imap/concepts/features/dav-components.html
-share/doc/cyrus-imapd/html/imap/concepts/features/delayed-delete.html
-share/doc/cyrus-imapd/html/imap/concepts/features/delayed-expunge.html
-share/doc/cyrus-imapd/html/imap/concepts/features/duplicate-message-delivery-suppression.html
-share/doc/cyrus-imapd/html/imap/concepts/features/event-notifications.html
-share/doc/cyrus-imapd/html/imap/concepts/features/mail-spool-partitions.html
-share/doc/cyrus-imapd/html/imap/concepts/features/mailbox-annotations.html
-share/doc/cyrus-imapd/html/imap/concepts/features/mailbox-distribution.html
-share/doc/cyrus-imapd/html/imap/concepts/features/mailbox-metadata-partitions.html
-share/doc/cyrus-imapd/html/imap/concepts/features/message-annotations.html
-share/doc/cyrus-imapd/html/imap/concepts/features/namespaces.html
-share/doc/cyrus-imapd/html/imap/concepts/features/quota.html
-share/doc/cyrus-imapd/html/imap/concepts/features/sealed-system.html
-share/doc/cyrus-imapd/html/imap/concepts/features/server-aggregation.html
-share/doc/cyrus-imapd/html/imap/concepts/features/server-side-filtering.html
-share/doc/cyrus-imapd/html/imap/concepts/features/shared-seen-state.html
-share/doc/cyrus-imapd/html/imap/concepts/features/single-instance-store.html
-share/doc/cyrus-imapd/html/imap/concepts/features/virtual-domains.html
-share/doc/cyrus-imapd/html/imap/concepts/overview_and_concepts.html
-share/doc/cyrus-imapd/html/imap/developer/
-share/doc/cyrus-imapd/html/imap/developer.html
-share/doc/cyrus-imapd/html/imap/developer/API/
-share/doc/cyrus-imapd/html/imap/developer/API.html
-share/doc/cyrus-imapd/html/imap/developer/API/cyrusdb.html
-share/doc/cyrus-imapd/html/imap/developer/API/cyrusdb2.html
-share/doc/cyrus-imapd/html/imap/developer/API/index-api.html
-share/doc/cyrus-imapd/html/imap/developer/API/mailbox-api.html
-share/doc/cyrus-imapd/html/imap/developer/compiling.html
-share/doc/cyrus-imapd/html/imap/developer/coverage.html
-share/doc/cyrus-imapd/html/imap/developer/cyrusworks.html
-share/doc/cyrus-imapd/html/imap/developer/developer-testing.html
-share/doc/cyrus-imapd/html/imap/developer/documentation.html
-share/doc/cyrus-imapd/html/imap/developer/github-guide.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/
-share/doc/cyrus-imapd/html/imap/developer/guidance.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/hacking.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/internationalization.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/locking.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/mailbox-format.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/namelocks.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/prot.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/replication_examples.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/replication_protocol.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/special_chars.html
-share/doc/cyrus-imapd/html/imap/developer/guidance/var_directory_structure.html
-share/doc/cyrus-imapd/html/imap/developer/install-xapian.html
-share/doc/cyrus-imapd/html/imap/developer/jmap.html
-share/doc/cyrus-imapd/html/imap/developer/libraries/
-share/doc/cyrus-imapd/html/imap/developer/libraries.html
-share/doc/cyrus-imapd/html/imap/developer/libraries/imclient.html
-share/doc/cyrus-imapd/html/imap/developer/major-releasing.html
-share/doc/cyrus-imapd/html/imap/developer/namespaces.html
-share/doc/cyrus-imapd/html/imap/developer/overview.html
-share/doc/cyrus-imapd/html/imap/developer/process.html
-share/doc/cyrus-imapd/html/imap/developer/releasing.html
-share/doc/cyrus-imapd/html/imap/developer/snapshot-releasing.html
-share/doc/cyrus-imapd/html/imap/developer/thoughts/
-share/doc/cyrus-imapd/html/imap/developer/thoughts.html
-share/doc/cyrus-imapd/html/imap/developer/thoughts/bytecode.html
-share/doc/cyrus-imapd/html/imap/developer/thoughts/caldav_scheduling_flowchart.html
-share/doc/cyrus-imapd/html/imap/developer/thoughts/notes.html
-share/doc/cyrus-imapd/html/imap/developer/thoughts/prot-events.html
-share/doc/cyrus-imapd/html/imap/developer/unit-tests.html
-share/doc/cyrus-imapd/html/imap/download/
-share/doc/cyrus-imapd/html/imap/download/getcyrus.html
-share/doc/cyrus-imapd/html/imap/download/installation/
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/centos.html
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/debian.html
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/fedora.html
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/opensuse.html
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/rhel.html
-share/doc/cyrus-imapd/html/imap/download/installation/distributions/ubuntu.html
-share/doc/cyrus-imapd/html/imap/download/installation/http/
-share/doc/cyrus-imapd/html/imap/download/installation/http/caldav.html
-share/doc/cyrus-imapd/html/imap/download/installation/http/carddav.html
-share/doc/cyrus-imapd/html/imap/download/installation/http/jmap.html
-share/doc/cyrus-imapd/html/imap/download/installation/http/rss.html
-share/doc/cyrus-imapd/html/imap/download/installation/http/webdav.html
-share/doc/cyrus-imapd/html/imap/download/installation/manage-dav.html
-share/doc/cyrus-imapd/html/imap/download/installation/mta/
-share/doc/cyrus-imapd/html/imap/download/installation/mta/configuration.html
-share/doc/cyrus-imapd/html/imap/download/installation/virus.html
-share/doc/cyrus-imapd/html/imap/download/packagers.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/
-share/doc/cyrus-imapd/html/imap/download/release-notes/1/
-share/doc/cyrus-imapd/html/imap/download/release-notes/1/1.x.x.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.0/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.0/2.0.x.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.1/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.1/2.1.x.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.2/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.2/2.2.x.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.10.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.11.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.12.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.13.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.14.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.15.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.16.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.17.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.18.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.19.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.20.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.3/x/2.3.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta10.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta11.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4-dav/x/2.4.17-caldav-beta9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.10.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.11.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.12.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.13.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.14.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.15.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.16.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.17.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.18.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.19.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.20.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.21.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.22.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.4/x/2.4.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.10.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.11.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.12.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.13.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.15.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.16.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.17.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/2.5/x/2.5.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-beta3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-beta4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-beta5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-beta6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-rc2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-rc3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0-rc4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.10.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.11.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.12.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.13.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.14.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.15.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.16.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.17.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.18.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.0/x/3.0.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.0-dev.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.1/x/3.1.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.0-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.0-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.0-rc2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.10/x/3.10.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.11/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.11/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.11/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.11/x/3.11.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.0-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.0-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.12/x/3.12.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.13/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.13/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.13/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.13/x/3.13.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.0-beta3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.0-beta4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.0.html
-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.10.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.11.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.12.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/3.2/x/3.2.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.2/x/3.2.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.3/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.3/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.3/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.3/x/3.3.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.3/x/3.3.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.0-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.0-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.0-beta3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.8.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.9.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/x/3.5.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-beta3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-rc2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.7.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/x/3.7.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.0-alpha0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.0-beta1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.0-beta2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.0-rc1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.0.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.1.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.2.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.3.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.4.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.5.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.8/x/3.8.6.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.9/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.9/index.html
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.9/x/
-share/doc/cyrus-imapd/html/imap/download/release-notes/3.9/x/3.9.0-alpha0.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
-share/doc/cyrus-imapd/html/imap/quickstart/
-share/doc/cyrus-imapd/html/imap/quickstart/introduction.html
-share/doc/cyrus-imapd/html/imap/reference/
-share/doc/cyrus-imapd/html/imap/reference/admin/
-share/doc/cyrus-imapd/html/imap/reference/admin.html
-share/doc/cyrus-imapd/html/imap/reference/admin/access-control/
-share/doc/cyrus-imapd/html/imap/reference/admin/access-control.html
-share/doc/cyrus-imapd/html/imap/reference/admin/access-control/combining-rights.html
-share/doc/cyrus-imapd/html/imap/reference/admin/access-control/defaults.html
-share/doc/cyrus-imapd/html/imap/reference/admin/access-control/identifiers.html
-share/doc/cyrus-imapd/html/imap/reference/admin/access-control/rights-reference.html
-share/doc/cyrus-imapd/html/imap/reference/admin/config-mailboxdistribution.html
-share/doc/cyrus-imapd/html/imap/reference/admin/eventsource.html
-share/doc/cyrus-imapd/html/imap/reference/admin/locations/
-share/doc/cyrus-imapd/html/imap/reference/admin/locations.html
-share/doc/cyrus-imapd/html/imap/reference/admin/locations/archive-partitions.html
-share/doc/cyrus-imapd/html/imap/reference/admin/locations/configuration-state.html
-share/doc/cyrus-imapd/html/imap/reference/admin/locations/hashing.html
-share/doc/cyrus-imapd/html/imap/reference/admin/locations/mailspool.html
-share/doc/cyrus-imapd/html/imap/reference/admin/locations/searchtiers.html
-share/doc/cyrus-imapd/html/imap/reference/admin/monitoring.html
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/murder-concepts.html
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/murder-failure-modes.html
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/murder-installation.html
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/murder-mail-delivery.html
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/murder-mupdate-details.html
-share/doc/cyrus-imapd/html/imap/reference/admin/murder/murder.html
-share/doc/cyrus-imapd/html/imap/reference/admin/nntp.html
-share/doc/cyrus-imapd/html/imap/reference/admin/ports/
-share/doc/cyrus-imapd/html/imap/reference/admin/ports-sockets.html
-share/doc/cyrus-imapd/html/imap/reference/admin/ports/services.html
-share/doc/cyrus-imapd/html/imap/reference/admin/ports/sockets.html
-share/doc/cyrus-imapd/html/imap/reference/admin/protlayer.html
-share/doc/cyrus-imapd/html/imap/reference/admin/quotas/
-share/doc/cyrus-imapd/html/imap/reference/admin/quotas.html
-share/doc/cyrus-imapd/html/imap/reference/admin/quotas/quotaroots.html
-share/doc/cyrus-imapd/html/imap/reference/admin/quotas/quotatypes.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sieve.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/
-share/doc/cyrus-imapd/html/imap/reference/admin/sop.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/administration-running.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/altnamespace.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/deleting.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/mailbox-operations.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/mailbox-quota.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/reconstructing.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/reloading.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/replication.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/splitting-metadata.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/squatter.html
-share/doc/cyrus-imapd/html/imap/reference/admin/sop/userdeny.html
-share/doc/cyrus-imapd/html/imap/reference/admin/tweaking.html
-share/doc/cyrus-imapd/html/imap/reference/architecture.html
-share/doc/cyrus-imapd/html/imap/reference/faq.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/
-share/doc/cyrus-imapd/html/imap/reference/faqs/feature-database-backend.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/feature-duplicate-delivery.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/install-compilationerrors.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/install-install-help.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/install-linkerwarnings.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/interop-8bit.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/interop-barenewlines.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/interop-sieve-exim.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/interop-slow-delivery.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-acls.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-annotations.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-configdir-tempfs.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-coredump.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-delete-mailbox.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-deleted-expired-expunged-purged.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-deliverdb-size.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-freezes.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-gdb.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-mailbox-doesnotexist.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-mixedcase.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-otherdatabases.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-pop3slow.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-reconstruct.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-sharedfilesystem-gpfs.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-telemetry.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-toomanyprocesses.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-unable-join-environment.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/o-vacation-mailfrom.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/r-murder-ha.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/r-pop3-logging.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/r-publicssharedfolders.html
-share/doc/cyrus-imapd/html/imap/reference/faqs/r-subfolders.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/
-share/doc/cyrus-imapd/html/imap/reference/manpages/configs/
-share/doc/cyrus-imapd/html/imap/reference/manpages/configs/cyrus.conf.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/configs/imapd.conf.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/index.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/arbitron.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/calalarmd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/chk_cyrus.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ctl_conversationsdb.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ctl_cyrusdb.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ctl_deliver.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ctl_mboxlist.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ctl_zoneinfo.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cvt_cyrusdb.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cvt_xlist_specialuse.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_buildinfo.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_dbtool.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_deny.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_df.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_expire.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_info.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_ls.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_synclog.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_userseen.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_virusscan.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_withlock_run.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyradm.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyrdump.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/deliver.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/fetchnews.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/fud.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/httpd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/idled.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/imapd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ipurge.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/lmtpd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/lmtpproxyd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/masssievec.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/master.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/mbexamine.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/mbpath.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/mbtool.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/mkimap.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/mknewsgroups.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/mupdate.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/nntpd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/notifyd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/pop3d.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/pop3proxyd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/promstatsd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/proxyd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ptdump.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ptexpire.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ptloader.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/quota.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/reconstruct.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/rehash.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/relocate_by_id.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sievec.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sieved.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/smmapd.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/squatter.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sync_client.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sync_reset.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sync_server.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/timsieved.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/tls_prune.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/translatesieve.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/unexpunge.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/arbitronsort.pl.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/dav_reconstruct.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/httptest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/imtest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/installsieve.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/lmtptest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/mupdatetest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/nntptest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/pop3test.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/sieveshell.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/sivtest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/smtptest.html
-share/doc/cyrus-imapd/html/imap/reference/manpages/usercommands/synctest.html
-share/doc/cyrus-imapd/html/imap/rfc-support.html
-share/doc/cyrus-imapd/html/imap/support/
-share/doc/cyrus-imapd/html/imap/support/feedback-bugs.html
-share/doc/cyrus-imapd/html/imap/support/feedback-mailing-lists.html
-share/doc/cyrus-imapd/html/imap/support/feedback-meetings.html
-share/doc/cyrus-imapd/html/index.html
-share/doc/cyrus-imapd/html/objects.inv
-share/doc/cyrus-imapd/html/operations.html
-share/doc/cyrus-imapd/html/overview/
-share/doc/cyrus-imapd/html/overview.html
-share/doc/cyrus-imapd/html/overview/about_cyrus.html
-share/doc/cyrus-imapd/html/overview/cyrus_bylaws.html
-share/doc/cyrus-imapd/html/overview/cyrus_history.html
-share/doc/cyrus-imapd/html/overview/cyrus_roadmap.html
-share/doc/cyrus-imapd/html/overview/what_is_cyrus.html
-share/doc/cyrus-imapd/html/overview/who_is_cyrus.html
-share/doc/cyrus-imapd/html/preface.html
-share/doc/cyrus-imapd/html/quickstart.html
-share/doc/cyrus-imapd/html/search.html
-share/doc/cyrus-imapd/html/searchindex.js
-share/doc/cyrus-imapd/html/setup.html
-share/doc/cyrus-imapd/html/sitemap.html
-share/doc/cyrus-imapd/html/sitemap.xml
-share/doc/cyrus-imapd/html/styles.html
-share/doc/cyrus-imapd/html/support.html
 share/doc/cyrus-imapd/internal/
-share/doc/cyrus-imapd/internal/bytecode.html
-share/doc/cyrus-imapd/internal/caldav_scheduling_flowchart.html
-share/doc/cyrus-imapd/internal/cyrus.css
-share/doc/cyrus-imapd/internal/cyrusdb-api.html
-share/doc/cyrus-imapd/internal/hacking
-share/doc/cyrus-imapd/internal/index-api.html
-share/doc/cyrus-imapd/internal/index-format-history.txt
-share/doc/cyrus-imapd/internal/index.html
-share/doc/cyrus-imapd/internal/internationalization.html
-share/doc/cyrus-imapd/internal/locking.txt
-share/doc/cyrus-imapd/internal/mailbox-api.html
-share/doc/cyrus-imapd/internal/mailbox-format.html
-share/doc/cyrus-imapd/internal/master-state-machine.fig
-share/doc/cyrus-imapd/internal/namelocks.html
-share/doc/cyrus-imapd/internal/notes.html
-share/doc/cyrus-imapd/internal/prot-events
-share/doc/cyrus-imapd/internal/prot.html
-share/doc/cyrus-imapd/internal/replication_examples.html
-share/doc/cyrus-imapd/internal/replication_protocol.html
-share/doc/cyrus-imapd/internal/specials.html
-share/doc/cyrus-imapd/internal/var_directory_structure.html
+share/doc/cyrus-imapd/internal/replication_protocol.md
 share/examples/cyrus-imapd/
 share/examples/cyrus-imapd/cyrus_conf/
 share/examples/cyrus-imapd/cyrus_conf/cmu-backend.conf
@@ -866,7 +312,6 @@ share/examples/cyrus-imapd/imapd.conf
 @sample ${SYSCONFDIR}/imapd.conf
 share/examples/cyrus-imapd/imapd_conf/
 share/examples/cyrus-imapd/imapd_conf/README.md
-share/examples/cyrus-imapd/imapd_conf/imapd.conf.sample
 share/examples/cyrus-imapd/imapd_conf/murder-backend.conf
 share/examples/cyrus-imapd/imapd_conf/murder-frontend.conf
 share/examples/cyrus-imapd/imapd_conf/murder-mupdate.conf
@@ -878,17 +323,37 @@ share/examples/cyrus-imapd/libcyrus/example_libcyrus.c
 share/examples/cyrus-imapd/libcyrus/example_libcyrus_min.c
 share/examples/cyrus-imapd/tools/
 share/examples/cyrus-imapd/tools/arbitronsort.pl
+share/examples/cyrus-imapd/tools/cassandane-history-rewrite.sh
+share/examples/cyrus-imapd/tools/clang-format-everything
 share/examples/cyrus-imapd/tools/compile_st.pl
-share/examples/cyrus-imapd/tools/config2header
-share/examples/cyrus-imapd/tools/config2rst
-share/examples/cyrus-imapd/tools/config2sample
+share/examples/cyrus-imapd/tools/find-fixme-markers
 share/examples/cyrus-imapd/tools/fixsearchpath.pl
 share/examples/cyrus-imapd/tools/git-version.sh
+share/examples/cyrus-imapd/tools/gperf-build-prop-set.pl
+share/examples/cyrus-imapd/tools/hard-tab-tool
+share/examples/cyrus-imapd/tools/imapoptions.pl
+share/examples/cyrus-imapd/tools/lib/
+share/examples/cyrus-imapd/tools/lib/Cyrus/
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/AllowedValues.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/bitfields.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/cheader.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/csource.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/docs.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/manrst.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/App/Command/sample.pm
+share/examples/cyrus-imapd/tools/lib/Cyrus/IMAPOptions/Option.pm
 share/examples/cyrus-imapd/tools/masssievec
 share/examples/cyrus-imapd/tools/mkimap
+share/examples/cyrus-imapd/tools/mkimap.in
 share/examples/cyrus-imapd/tools/mknewsgroups
 share/examples/cyrus-imapd/tools/perl2rst
 share/examples/cyrus-imapd/tools/rehash
+share/examples/cyrus-imapd/tools/rehash.in
 share/examples/cyrus-imapd/tools/translatesieve
 @mode 750
 @owner _cyrus