From 0f90218942f776d99b6ea63dd8a65c91c5edb45c Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Wed, 6 Jan 2021 15:02:15 +0000 Subject: [PATCH] MFH: r560527 mail/dovecot: update 2.3.11.3 -> 2.3.13, fix CVE in non-default config mail/dovecot-pigeonhole: update 0.5.11 -> 0.5.13 - please note: option VPOPMAIl was removed from upstream PR: 252415 Submitted by: Evilham Reviewed by: fluffy Approved by: ler (maintainer) Relnotes: https://dovecot.org/pipermail/dovecot-news/2021-January/000448.html https://dovecot.org/pipermail/dovecot-news/2021-January/000449.html Security: CVE-2020-24386, CVE-2020-25275 Approved by: ports-secteam (fluffy) --- UPDATING | 14 ++++++++++++++ mail/dovecot-fts-xapian/Makefile | 1 + mail/dovecot-pigeonhole/Makefile | 2 +- mail/dovecot-pigeonhole/distinfo | 6 +++--- mail/dovecot/Makefile | 9 ++------- mail/dovecot/distinfo | 6 +++--- mail/dovecot/pkg-plist | 10 ++++++---- 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/UPDATING b/UPDATING index 1bbf6a5cc90a..51d69e37d556 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20210106: + AFFECTS: mail/dovecot + AUTHOR: pi@FreeBSD.org + + The VPOPMAIL option was removed, because it was dropped upstream, + so please check your config bevor upgrading. + +20210106: + AFFECTS: sysutils/graylog + AUTHOR: dch@FreeBSD.org + + graylog 4.0 and higher now use a new license, the SSPL. For more + details, see https://www.graylog.org/post/graylog-v4-0-licensing-sspl + 20210102: AFFECTS: x11/libexo, XFCE4 desktop users AUTHOR: madpilot@FreeBSD.org diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile index c88da167e674..d3cbeb919a0f 100644 --- a/mail/dovecot-fts-xapian/Makefile +++ b/mail/dovecot-fts-xapian/Makefile @@ -2,6 +2,7 @@ PORTNAME= fts-xapian PORTVERSION= 1.4.4 +PORTREVISION= 1 CATEGORIES= mail PKGNAMEPREFIX= dovecot- diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile index 8b3878bdc56f..52f753240a2b 100644 --- a/mail/dovecot-pigeonhole/Makefile +++ b/mail/dovecot-pigeonhole/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.11 +PORTVERSION= 0.5.13 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 b1425394cd5a..97537214af42 100644 --- a/mail/dovecot-pigeonhole/distinfo +++ b/mail/dovecot-pigeonhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597360057 -SHA256 (dovecot-2.3-pigeonhole-0.5.11.tar.gz) = 0b972a441f680545ddfacd2f41fb2a705fb03249d46ed5ce7e01fe68b6cfb5f0 -SIZE (dovecot-2.3-pigeonhole-0.5.11.tar.gz) = 1912411 +TIMESTAMP = 1609775237 +SHA256 (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17 +SIZE (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 1908839 diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 236435c4875a..2561914108bc 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -8,8 +8,7 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.3.11.3 -PORTREVISION= 1 +PORTVERSION= 2.3.13 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ @@ -37,7 +36,7 @@ INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} -OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES +OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 DOCS EXAMPLES OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes @@ -49,7 +48,6 @@ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT LZ4_DESC= LZ4 compression support -VPOPMAIL_DESC= vpopmail support DB_DESC= Database support CDB_DESC= CDB database support @@ -78,9 +76,6 @@ LUA_USES= lua LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -VPOPMAIL_BUILD_DEPENDS= vpopmail>=0:mail/vpopmail -VPOPMAIL_CONFIGURE_WITH=vpopmail - # Databases CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 846a350d8fbe..aa3436fe4e25 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597259906 -SHA256 (dovecot-2.3.11.3.tar.gz) = d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc -SIZE (dovecot-2.3.11.3.tar.gz) = 7353412 +TIMESTAMP = 1609941410 +SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4 +SIZE (dovecot-2.3.13.tar.gz) = 7456073 diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist index f246fb483015..3d1fc870e88c 100644 --- a/mail/dovecot/pkg-plist +++ b/mail/dovecot/pkg-plist @@ -37,10 +37,10 @@ %%ETCDIR%%/example-config/conf.d/auth-sql.conf.ext %%ETCDIR%%/example-config/conf.d/auth-static.conf.ext %%ETCDIR%%/example-config/conf.d/auth-system.conf.ext -%%ETCDIR%%/example-config/conf.d/auth-vpopmail.conf.ext %%ETCDIR%%/example-config/dovecot-dict-auth.conf.ext %%ETCDIR%%/example-config/dovecot-dict-sql.conf.ext %%ETCDIR%%/example-config/dovecot-ldap.conf.ext +%%ETCDIR%%/example-config/dovecot-oauth2.conf.ext %%ETCDIR%%/example-config/dovecot-sql.conf.ext %%ETCDIR%%/example-config/dovecot.conf %%ETCDIR%%/README @@ -92,8 +92,8 @@ include/dovecot/auth-master-connection.h include/dovecot/auth-master.h include/dovecot/auth-penalty.h include/dovecot/auth-policy.h -include/dovecot/auth-request-handler.h include/dovecot/auth-request-handler-private.h +include/dovecot/auth-request-handler.h include/dovecot/auth-request-stats.h include/dovecot/auth-request-var-expand.h include/dovecot/auth-request.h @@ -164,6 +164,8 @@ include/dovecot/dsync-brain.h include/dovecot/dsync-ibc.h include/dovecot/eacces-error.h include/dovecot/env-util.h +include/dovecot/event-filter-parser.h +include/dovecot/event-filter-private.h include/dovecot/event-filter.h include/dovecot/event-log.h include/dovecot/execv-const.h @@ -470,7 +472,7 @@ include/dovecot/mdbox-storage-rebuild.h include/dovecot/mdbox-storage.h include/dovecot/mdbox-sync.h include/dovecot/mech-digest-md5-private.h -include/dovecot/mech-otp-skey-common.h +include/dovecot/mech-otp-common.h include/dovecot/mech-plain-common.h include/dovecot/mech-scram.h include/dovecot/mech.h @@ -637,6 +639,7 @@ include/dovecot/submission-settings.h include/dovecot/subscription-file.h include/dovecot/syslog-util.h include/dovecot/test-common.h +include/dovecot/test-subprocess.h include/dovecot/time-util.h include/dovecot/unichar.h include/dovecot/unix-socket-create.h @@ -645,7 +648,6 @@ include/dovecot/unlink-old-files.h include/dovecot/uri-util.h include/dovecot/userdb-blocking.h include/dovecot/userdb-template.h -include/dovecot/userdb-vpopmail.h include/dovecot/userdb.h include/dovecot/utc-mktime.h include/dovecot/utc-offset.h