Index: mail/dovecot-fts-xapian/Makefile =================================================================== --- mail/dovecot-fts-xapian/Makefile +++ mail/dovecot-fts-xapian/Makefile @@ -1,6 +1,13 @@ +####################################################################### +# Every time you update mail/dovecot, also check for updates +# of mail/dovecot-fts-xapian +# See mail/dovecot/Makefile for details +####################################################################### + PORTNAME= fts-xapian DISTVERSION= 1.4.9 DISTVERSIONSUFFIX= b +PORTREVISION= 1 CATEGORIES= mail PKGNAMEPREFIX= dovecot- Index: mail/dovecot-pigeonhole/Makefile =================================================================== --- mail/dovecot-pigeonhole/Makefile +++ mail/dovecot-pigeonhole/Makefile @@ -1,7 +1,7 @@ # Created by: Nils Vogels PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.13 +PORTVERSION= 0.5.15 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} Index: mail/dovecot/Makefile =================================================================== --- mail/dovecot/Makefile +++ mail/dovecot/Makefile @@ -7,8 +7,7 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.3.13 -PORTREVISION= 1 +PORTVERSION= 2.3.15 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ @@ -25,10 +24,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ - --with-statedir=/var/db/dovecot \ - --without-shadow \ + --with-docs \ --with-ssl=openssl \ - --with-docs + --with-statedir=/var/db/dovecot \ + --with-shadow=no \ + --with-systemd=no USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip @@ -36,7 +36,7 @@ USERS= dovecot dovenull GROUPS= ${USERS} -OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 DOCS EXAMPLES +OPTIONS_DEFINE= LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes @@ -62,14 +62,19 @@ GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 # General options -LIBSODIUM_DESC= support libsodium based crypts (ARGON2I/ARGON2ID) +LIBSODIUM_DESC= Support libsodium based crypts (ARGON2I/ARGON2ID) LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_CONFIGURE_WITH= sodium +LIBUNWIND_CONFIGURE_ON= --with-libunwind=yes +LIBUNWIND_CONFIGURE_OFF= --with-libunwind=no +LIBUNWIND_DESC= Get backtraces using libunwind +LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind + LIBWRAP_CONFIGURE_WITH= libwrap LUA_CONFIGURE_WITH= lua -LUA_USES= lua +LUA_USES= lua:51,53 LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 Index: mail/dovecot/distinfo =================================================================== --- mail/dovecot/distinfo +++ mail/dovecot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609941410 -SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4 -SIZE (dovecot-2.3.13.tar.gz) = 7456073 +TIMESTAMP = 1624366601 +SHA256 (dovecot-2.3.15.tar.gz) = 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590 +SIZE (dovecot-2.3.15.tar.gz) = 7608561 Index: mail/dovecot/files/patch-configure =================================================================== --- mail/dovecot/files/patch-configure +++ mail/dovecot/files/patch-configure @@ -1,15 +1,6 @@ ---- configure.orig 2020-12-22 13:27:02 UTC +--- configure.orig 2021-06-22 13:00:25 UTC +++ configure -@@ -26053,7 +26053,7 @@ fi - $as_echo "$with_lua" >&6; } - - if test "x$with_lua" != "xno"; then : -- for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do -+ for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -@@ -29355,13 +29355,13 @@ fi +@@ -29748,13 +29748,13 @@ fi if test $want_stemmer != no; then Index: mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c =================================================================== --- mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/fts-solr/solr-connection.c.orig 2020-08-12 12:20:41 UTC -+++ src/plugins/fts-solr/solr-connection.c -@@ -103,7 +103,7 @@ int solr_connection_init(const struct fts_solr_setting - http_set.ssl = ssl_client_set; - http_set.debug = solr_set->debug; - http_set.rawlog_dir = solr_set->rawlog_dir; -- solr_http_client = http_client_init(&http_set); -+ solr_http_client = http_client_init_private(&http_set); - } - - *conn_r = conn; Index: mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c =================================================================== --- mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/fts/fts-parser-tika.c.orig 2019-01-02 22:11:26 UTC -+++ src/plugins/fts/fts-parser-tika.c -@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struc - http_set.request_timeout_msecs = 60*1000; - http_set.ssl = &ssl_set; - http_set.debug = user->mail_debug; -- tika_http_client = http_client_init(&http_set); -+ tika_http_client = http_client_init_private(&http_set); - } - *http_url_r = tuser->http_url; - return 0; Index: mail/dovecot/pkg-plist =================================================================== --- mail/dovecot/pkg-plist +++ mail/dovecot/pkg-plist @@ -18,6 +18,7 @@ %%ETCDIR%%/example-config/conf.d/10-logging.conf %%ETCDIR%%/example-config/conf.d/10-mail.conf %%ETCDIR%%/example-config/conf.d/10-master.conf +%%ETCDIR%%/example-config/conf.d/10-metrics.conf %%ETCDIR%%/example-config/conf.d/10-ssl.conf %%ETCDIR%%/example-config/conf.d/15-lda.conf %%ETCDIR%%/example-config/conf.d/15-mailboxes.conf @@ -54,10 +55,23 @@ %%LUA%%lib/dovecot/lib01_mail_lua_plugin.so %%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.a %%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.so +%%LUA%%lib/dovecot/libdovecot-lua.a +%%LUA%%lib/dovecot/libdovecot-lua.so +%%LUA%%lib/dovecot/libdovecot-lua.so.0 +%%LUA%%lib/dovecot/libdovecot-lua.so.0.0.0 +%%LUA%%lib/dovecot/libdovecot-storage-lua.a +%%LUA%%lib/dovecot/libdovecot-storage-lua.so +%%LUA%%lib/dovecot/libdovecot-storage-lua.so.0 +%%LUA%%lib/dovecot/libdovecot-storage-lua.so.0.0.0 +%%LUA%%include/dovecot/dict-lua-private.h +%%LUA%%include/dovecot/dict-lua.h +%%LUA%%include/dovecot/dlua-compat.h %%LUA%%include/dovecot/dlua-script-private.h %%LUA%%include/dovecot/dlua-script.h +%%LUA%%include/dovecot/dlua-wrapper.h %%LUA%%include/dovecot/mail-lua-plugin.h %%LUA%%include/dovecot/mail-storage-lua.h +%%LUA%%include/dovecot/mail-storage-lua-private.h %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a @@ -122,9 +136,8 @@ include/dovecot/config-request.h include/dovecot/config.h include/dovecot/connection.h +include/dovecot/cpu-limit.h include/dovecot/crc32.h -include/dovecot/cydir-storage.h -include/dovecot/cydir-sync.h include/dovecot/data-stack.h include/dovecot/db-checkpassword.h include/dovecot/db-dict.h @@ -205,6 +218,7 @@ include/dovecot/fts-tokenizer-private.h include/dovecot/fts-tokenizer.h include/dovecot/fts-user.h +include/dovecot/fuzzer.h include/dovecot/guid.h include/dovecot/hash-decl.h include/dovecot/hash-format.h @@ -639,6 +653,7 @@ include/dovecot/subscription-file.h include/dovecot/syslog-util.h include/dovecot/test-common.h +include/dovecot/test-mail-storage-common.h include/dovecot/test-subprocess.h include/dovecot/time-util.h include/dovecot/unichar.h @@ -661,8 +676,6 @@ lib/dovecot/auth/libauthdb_imap.so lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so -lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a -lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a @@ -680,14 +693,10 @@ lib/dovecot/lib05_mail_crypt_acl_plugin.so lib/dovecot/lib05_pop3_migration_plugin.a lib/dovecot/lib05_pop3_migration_plugin.so -lib/dovecot/lib05_snarf_plugin.a -lib/dovecot/lib05_snarf_plugin.so lib/dovecot/lib10_last_login_plugin.a lib/dovecot/lib10_last_login_plugin.so lib/dovecot/lib10_mail_crypt_plugin.a lib/dovecot/lib10_mail_crypt_plugin.so -lib/dovecot/lib10_mail_filter_plugin.a -lib/dovecot/lib10_mail_filter_plugin.so lib/dovecot/lib10_quota_plugin.a lib/dovecot/lib10_quota_plugin.so lib/dovecot/lib11_imap_quota_plugin.a @@ -696,12 +705,8 @@ lib/dovecot/lib11_trash_plugin.so lib/dovecot/lib15_notify_plugin.a lib/dovecot/lib15_notify_plugin.so -lib/dovecot/lib20_autocreate_plugin.a -lib/dovecot/lib20_autocreate_plugin.so lib/dovecot/lib20_charset_alias_plugin.a lib/dovecot/lib20_charset_alias_plugin.so -lib/dovecot/lib20_expire_plugin.a -lib/dovecot/lib20_expire_plugin.so lib/dovecot/lib20_fts_plugin.a lib/dovecot/lib20_fts_plugin.so lib/dovecot/lib20_listescape_plugin.a