git: 21a797ec8c62 - main - mail/dovecot-*: update 2.3.13 -> 2.3.15 and related ports
Kurt Jaeger
pi at FreeBSD.org
Sat Jul 3 10:09:32 UTC 2021
The branch main has been updated by pi:
URL: https://cgit.FreeBSD.org/ports/commit/?id=21a797ec8c62a66c2e44c7e99acbf3063ec113aa
commit 21a797ec8c62a66c2e44c7e99acbf3063ec113aa
Author: Juraj Lutter <otis at FreeBSD.org>
AuthorDate: 2021-07-03 10:04:00 +0000
Commit: Kurt Jaeger <pi at FreeBSD.org>
CommitDate: 2021-07-03 10:09:08 +0000
mail/dovecot-*: update 2.3.13 -> 2.3.15 and related ports
PR: 256860
Approved by: fluffy (ports-secteam)
Submitted by: otis
Relnotes: https://dovecot.org/pipermail/dovecot-news/2021-June/000457.html
https://dovecot.org/pipermail/dovecot-news/2021-March/000455.html
https://dovecot.org/pipermail/dovecot-news/2021-March/000456.html
https://dovecot.org/pipermail/dovecot-news/2021-June/000458.html
Security: CVE-2021-29157, CVE-2021-33515, CVE-2020-28200
Differential Revision: https://reviews.freebsd.org/D30866
MFH: 2021Q3
---
mail/dovecot-fts-xapian/Makefile | 3 +--
mail/dovecot-fts-xapian/distinfo | 6 ++---
mail/dovecot-pigeonhole/Makefile | 2 +-
mail/dovecot-pigeonhole/distinfo | 6 ++---
mail/dovecot/Makefile | 21 +++++++++------
mail/dovecot/distinfo | 6 ++---
mail/dovecot/files/patch-configure | 13 ++--------
.../patch-src_plugins_fts-solr_solr-connection.c | 11 --------
.../files/patch-src_plugins_fts_fts-parser-tika.c | 11 --------
mail/dovecot/files/pkg-message.in | 7 +++++
mail/dovecot/pkg-plist | 30 ++++++++++++----------
11 files changed, 50 insertions(+), 66 deletions(-)
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index 5479a380c04c..bc30e0de3913 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -1,6 +1,5 @@
PORTNAME= fts-xapian
-DISTVERSION= 1.4.9
-DISTVERSIONSUFFIX= b
+DISTVERSION= 1.4.10
CATEGORIES= mail
PKGNAMEPREFIX= dovecot-
diff --git a/mail/dovecot-fts-xapian/distinfo b/mail/dovecot-fts-xapian/distinfo
index a5699d483a66..ee311af99b94 100644
--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619805639
-SHA256 (grosjo-fts-xapian-1.4.9b_GH0.tar.gz) = d610cbd2e7b16a43fa27179494a9df4506e94612ba99a25839094e6aae033570
-SIZE (grosjo-fts-xapian-1.4.9b_GH0.tar.gz) = 278187
+TIMESTAMP = 1625002292
+SHA256 (grosjo-fts-xapian-1.4.10_GH0.tar.gz) = d016bf9ebba0f48ac238aee8a12d50627f5d0778d74101fbdbde682099dc9c98
+SIZE (grosjo-fts-xapian-1.4.10_GH0.tar.gz) = 1258473
diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index d8cfcf00a84d..a3c7939801ea 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -1,7 +1,7 @@
# Created by: Nils Vogels <nivo+kw+ports.bfa274 at is-root.com>
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}
diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
index 97537214af42..bad4e9424055 100644
--- a/mail/dovecot-pigeonhole/distinfo
+++ b/mail/dovecot-pigeonhole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609775237
-SHA256 (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
-SIZE (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 1908839
+TIMESTAMP = 1624433329
+SHA256 (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+SIZE (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = 1935601
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 528fbb02a25a..05a75e474853 100644
--- a/mail/dovecot/Makefile
+++ b/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 @@ USE_RC_SUBR= dovecot
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 @@ INSTALL_TARGET= install-strip
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_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal
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
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index aa3436fe4e25..0d4e8ecb3689 100644
--- a/mail/dovecot/distinfo
+++ b/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
diff --git a/mail/dovecot/files/patch-configure b/mail/dovecot/files/patch-configure
index 89691f439d56..824adb1e9291 100644
--- a/mail/dovecot/files/patch-configure
+++ b/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
diff --git a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c b/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c
deleted file mode 100644
index e6991bbf7900..000000000000
--- a/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;
diff --git a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c b/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c
deleted file mode 100644
index 2be6cae9aa32..000000000000
--- a/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;
diff --git a/mail/dovecot/files/pkg-message.in b/mail/dovecot/files/pkg-message.in
index 0a9eb2c59acf..f018371c9b65 100644
--- a/mail/dovecot/files/pkg-message.in
+++ b/mail/dovecot/files/pkg-message.in
@@ -38,4 +38,11 @@
%%ETCDIR%%/examples-config/
EOM
}
+{
+ type: remove
+ message: <<EOM
+If you are removing dovecot permanently, you should 'rm -rf /var/db/dovecot' to
+clear out any remaining data.
+EOM
+}
]
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index a60d7a5c3f12..a4a01ed8cbbf 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -1,4 +1,3 @@
- at postunexec echo "If you are removing dovecot permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
%%DATADIR%%/stopwords/stopwords_da.txt
%%DATADIR%%/stopwords/stopwords_de.txt
%%DATADIR%%/stopwords/stopwords_en.txt
@@ -18,6 +17,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 +54,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 +135,8 @@ include/dovecot/config-parser.h
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 +217,7 @@ include/dovecot/fts-tokenizer-generic-private.h
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 +652,7 @@ include/dovecot/submission-settings.h
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 +675,6 @@ lib/dovecot/auth/libauthdb_imap.a
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 +692,10 @@ lib/dovecot/lib05_mail_crypt_acl_plugin.a
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 +704,8 @@ lib/dovecot/lib11_trash_plugin.a
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
More information about the dev-commits-ports-all
mailing list