9 files changed, 59 insertions, 60 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 59c93794e935..077d10fb6198 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -81,6 +81,7 @@
     SUBDIR += cyrus-imapd24
     SUBDIR += cyrus-imapd25
     SUBDIR += cyrus-imapd30
+    SUBDIR += cyrus-imapd32
     SUBDIR += cyrus2courier
     SUBDIR += cyrus2dovecot
     SUBDIR += davmail
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index 6dfba3eab7d3..c95d3ee00150 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.0.13
-PORTREVISION=	2
-#PORTREVISION=	0
+PORTVERSION=	3.2.0
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
-PKGNAMESUFFIX=	30
+PKGNAMESUFFIX=	32
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -38,10 +36,14 @@ CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
+USES+=		shebangfix
+SHEBANG_FILES=	imap/promdatagen snmp/snmpgen tools/config2header \
+		tools/mkimap
+
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
-OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \
+OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
 			MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \
 			DOCS
 OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT
@@ -69,9 +71,6 @@ IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
-LMDB_DESC=		Use LMDB backend
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
-LMDB_CONFIGURE_WITH=	lmdb
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
 MURDER_MAKE_ENV=	PTHREAD_LIBS="-lpthread"
@@ -189,8 +188,9 @@ post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
-		${STAGEDIR}${EXAMPLESDIR}
+	${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
+		${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
+		> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 		${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
diff --git a/mail/cyrus-imapd32/distinfo b/mail/cyrus-imapd32/distinfo
index f22adb808711..cb2043b5080b 100644
--- a/mail/cyrus-imapd32/distinfo
+++ b/mail/cyrus-imapd32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576499698
-SHA256 (cyrus-imapd-3.0.13.tar.gz) = 6965aafbd2fd8f621f6ed5a3df2f609eb2874951a25facd516f5774232ced3bd
-SIZE (cyrus-imapd-3.0.13.tar.gz) = 10840005
+TIMESTAMP = 1588576064
+SHA256 (cyrus-imapd-3.2.0.tar.gz) = 811b765f5df32b4ca1e9b0507b4b6dda068ec45d5cdf07e5668de641de6f1dc6
+SIZE (cyrus-imapd-3.2.0.tar.gz) = 12171038
diff --git a/mail/cyrus-imapd32/files/patch-Makefile.in b/mail/cyrus-imapd32/files/patch-Makefile.in
deleted file mode 100644
index 5b076a756884..000000000000
--- a/mail/cyrus-imapd32/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2019-11-14 23:10:03 UTC
-+++ Makefile.in
-@@ -2254,7 +2254,7 @@ backup_libcyrus_backup_la_SOURCES = \
-     backup/lcb_sqlconsts.h \
-     backup/lcb_verify.c
- 
--backup_libcyrus_backup_la_LIBADD = $(LD_BASIC_ADD)
-+backup_libcyrus_backup_la_LIBADD = $(LD_BASIC_ADD) -lm
- backup_backupd_SOURCES = \
-     imap/mutex_fake.c \
-     imap/sync_support.c \
diff --git a/mail/cyrus-imapd32/files/patch-imap__http_cgi.c b/mail/cyrus-imapd32/files/patch-imap__http_cgi.c
new file mode 100644
index 000000000000..a9fcef6302f6
--- /dev/null
+++ b/mail/cyrus-imapd32/files/patch-imap__http_cgi.c
@@ -0,0 +1,11 @@
+--- imap/http_cgi.c.orig	2020-03-11 03:10:59 UTC
++++ imap/http_cgi.c
+@@ -60,6 +60,8 @@
+ #include "util.h"
+ #include "version.h"
+ 
++extern char **environ;
++
+ /* generated headers are not necessarily in current directory */
+ #include "imap/http_err.h"
+ #include "imap/imap_err.h"
diff --git a/mail/cyrus-imapd32/files/patch-imap__sync_support.c b/mail/cyrus-imapd32/files/patch-imap__sync_support.c
deleted file mode 100644
index 6d83ad39f62c..000000000000
--- a/mail/cyrus-imapd32/files/patch-imap__sync_support.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- imap/sync_support.c.orig	2017-06-22 03:05:45 UTC
-+++ imap/sync_support.c
-@@ -3491,7 +3491,7 @@ int sync_apply_message(struct dlist *kin
-         const char *fname;
- 
-         /* XXX - complain more? */
--        if (!dlist_tofile(ki, &part, &guid, (ulong *) &size, &fname))
-+        if (!dlist_tofile(ki, &part, &guid, (unsigned long *) &size, &fname))
-             continue;
- 
-         part_list = sync_reserve_partlist(reserve_list, part);
-@@ -4546,7 +4546,7 @@ static int fetch_file(struct mailbox *ma
-         return r;
-     }
- 
--    if (!dlist_tofile(kin->head, NULL, &guid, (ulong *) &size, &fname)) {
-+    if (!dlist_tofile(kin->head, NULL, &guid, (unsigned long *) &size, &fname)) {
-         r = IMAP_MAILBOX_NONEXISTENT;
-         syslog(LOG_ERR, "IOERROR: fetch_file failed tofile %s", error_message(r));
-         goto done;
diff --git a/mail/cyrus-imapd32/files/patch-lib__cyr_qsort_r.c b/mail/cyrus-imapd32/files/patch-lib__cyr_qsort_r.c
new file mode 100644
index 000000000000..536076a6a530
--- /dev/null
+++ b/mail/cyrus-imapd32/files/patch-lib__cyr_qsort_r.c
@@ -0,0 +1,19 @@
+--- lib/cyr_qsort_r.c.orig	2019-12-04 02:17:01 UTC
++++ lib/cyr_qsort_r.c
+@@ -18,14 +18,14 @@ EXPORTED void cyr_qsort_r(void *base, size_t nmemb, si
+ // NOTE: this is kinda ugly, but it's OK if you're not multithreaded
+ 
+ static void *qsort_r_thunk;
+-static int (*qsort_r_compar)(const void *, const void *, void *);
++static int (*qsort_r_compar)QSORT_R_COMPAR_ARGS(const void *, const void *, void *);
+ static int qsort_r_compar_func(const void *a, const void *b)
+ {
+     return qsort_r_compar(a, b, qsort_r_thunk);
+ }
+ 
+ EXPORTED void cyr_qsort_r(void *base, size_t nmemb, size_t size,
+-                          int (*compar)(const void *, const void *, void *),
++                          int (*compar)QSORT_R_COMPAR_ARGS(const void *, const void *, void *),
+                           void *thunk)
+ {
+     qsort_r_thunk = thunk;
diff --git a/mail/cyrus-imapd32/files/patch-lib__imapoptions b/mail/cyrus-imapd32/files/patch-lib__imapoptions
index 8c79e3b2e8f4..6fd98f52abd1 100644
--- a/mail/cyrus-imapd32/files/patch-lib__imapoptions
+++ b/mail/cyrus-imapd32/files/patch-lib__imapoptions
@@ -1,22 +1,20 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	2008-10-12 21:22:03.000000000 +0900
-+++ lib/imapoptions	2008-10-12 21:23:33.000000000 +0900
-@@ -893,7 +893,7 @@
- { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
+--- lib/imapoptions.orig	2020-02-06 22:38:20 UTC
++++ lib/imapoptions
+@@ -2230,7 +2230,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 }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
+-{ "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. */
  
-@@ -956,7 +956,7 @@
- /* If enabled, timsieved will expect a capability response after a successful
-    SASL authentication, per draft-martin-mangesieve-12.txt . */
+@@ -2363,7 +2363,7 @@ product version in the capabilities
+    For backward compatibility, if no unit is specified, seconds is
+    assumed. */
  
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
+-{ "sievedir", "/usr/sieve", STRING, "2.3.17" }
++{ "sievedir", "/var/imap/sieve", STRING, "2.3.17" }
  /* If sieveusehomedir is false, this directory is searched for Sieve
     scripts. */
  
diff --git a/mail/cyrus-imapd32/pkg-plist b/mail/cyrus-imapd32/pkg-plist
index d387a659b066..76d2eb557b65 100644
--- a/mail/cyrus-imapd32/pkg-plist
+++ b/mail/cyrus-imapd32/pkg-plist
@@ -22,6 +22,7 @@ cyrus/libexec/master
 cyrus/libexec/notifyd
 cyrus/libexec/pop3d
 cyrus/libexec/pop3proxyd
+cyrus/libexec/promstatsd
 cyrus/libexec/proxyd
 cyrus/libexec/smmapd
 cyrus/libexec/timsieved
@@ -87,11 +88,12 @@ include/cyrus/command.h
 include/cyrus/crc32.h
 include/cyrus/crc32c.h
 include/cyrus/cyr_lock.h
+include/cyrus/cyr_qsort_r.h
 include/cyrus/cyrusdb.h
-include/cyrus/exitcodes.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
 include/cyrus/hash.h
+include/cyrus/hashset.h
 include/cyrus/hashu64.h
 include/cyrus/imapopts.h
 include/cyrus/imapurl.h
@@ -117,7 +119,6 @@ include/cyrus/sqldb.h
 include/cyrus/strarray.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
-include/cyrus/sysexits.h
 include/cyrus/times.h
 include/cyrus/tok.h
 include/cyrus/vparse.h
@@ -153,4 +154,4 @@ libdata/pkgconfig/libcyrus_imap.pc
 libdata/pkgconfig/libcyrus_min.pc
 libdata/pkgconfig/libcyrus_sieve.pc
 @sample %%EXAMPLESDIR%%/imapd.conf etc/imapd.conf
-@sample %%EXAMPLESDIR%%/normal.conf etc/cyrus.conf
+@sample %%EXAMPLESDIR%%/cyrus.conf etc/cyrus.conf