From owner-svn-ports-all@freebsd.org Mon May 4 08:42:21 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61AEE2C9591;
Mon, 4 May 2020 08:42:21 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 49FxDs0Pnjz3Pq8;
Mon, 4 May 2020 08:42:21 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 092102179E;
Mon, 4 May 2020 08:42:21 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0448gKA8015773;
Mon, 4 May 2020 08:42:20 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0448gJ2U015766;
Mon, 4 May 2020 08:42:19 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <202005040842.0448gJ2U015766@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Mon, 4 May 2020 08:42:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r533906 - in head/mail: . cyrus-imapd32
cyrus-imapd32/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: ume
X-SVN-Commit-Paths: in head/mail: . cyrus-imapd32 cyrus-imapd32/files
X-SVN-Commit-Revision: 533906
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 May 2020 08:42:21 -0000
Author: ume
Date: Mon May 4 08:42:19 2020
New Revision: 533906
URL: https://svnweb.freebsd.org/changeset/ports/533906
Log:
Cyrus IMAP 3.2.0 was released.
Added:
head/mail/cyrus-imapd32/files/patch-imap__http_cgi.c (contents, props changed)
head/mail/cyrus-imapd32/files/patch-lib__cyr_qsort_r.c (contents, props changed)
Deleted:
head/mail/cyrus-imapd32/files/patch-Makefile.in
head/mail/cyrus-imapd32/files/patch-imap__sync_support.c
Modified:
head/mail/Makefile
head/mail/cyrus-imapd32/Makefile
head/mail/cyrus-imapd32/distinfo
head/mail/cyrus-imapd32/files/patch-lib__imapoptions
head/mail/cyrus-imapd32/pkg-plist
Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile Mon May 4 08:39:56 2020 (r533905)
+++ head/mail/Makefile Mon May 4 08:42:19 2020 (r533906)
@@ -81,6 +81,7 @@
SUBDIR += cyrus-imapd24
SUBDIR += cyrus-imapd25
SUBDIR += cyrus-imapd30
+ SUBDIR += cyrus-imapd32
SUBDIR += cyrus2courier
SUBDIR += cyrus2dovecot
SUBDIR += davmail
Modified: head/mail/cyrus-imapd32/Makefile
==============================================================================
--- head/mail/cyrus-imapd32/Makefile Mon May 4 08:39:56 2020 (r533905)
+++ head/mail/cyrus-imapd32/Makefile Mon May 4 08:42:19 2020 (r533906)
@@ -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 \
Modified: head/mail/cyrus-imapd32/distinfo
==============================================================================
--- head/mail/cyrus-imapd32/distinfo Mon May 4 08:39:56 2020 (r533905)
+++ head/mail/cyrus-imapd32/distinfo Mon May 4 08:42:19 2020 (r533906)
@@ -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
Added: head/mail/cyrus-imapd32/files/patch-imap__http_cgi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/cyrus-imapd32/files/patch-imap__http_cgi.c Mon May 4 08:42:19 2020 (r533906)
@@ -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"
Added: head/mail/cyrus-imapd32/files/patch-lib__cyr_qsort_r.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/cyrus-imapd32/files/patch-lib__cyr_qsort_r.c Mon May 4 08:42:19 2020 (r533906)
@@ -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;
Modified: head/mail/cyrus-imapd32/files/patch-lib__imapoptions
==============================================================================
--- head/mail/cyrus-imapd32/files/patch-lib__imapoptions Mon May 4 08:39:56 2020 (r533905)
+++ head/mail/cyrus-imapd32/files/patch-lib__imapoptions Mon May 4 08:42:19 2020 (r533906)
@@ -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. */
Modified: head/mail/cyrus-imapd32/pkg-plist
==============================================================================
--- head/mail/cyrus-imapd32/pkg-plist Mon May 4 08:39:56 2020 (r533905)
+++ head/mail/cyrus-imapd32/pkg-plist Mon May 4 08:42:19 2020 (r533906)
@@ -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