Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A30547A2D6 for ; Wed, 14 Dec 2016 15:48:11 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 51646855DE; Wed, 14 Dec 2016 15:48:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D4B7B855D9 for ; Wed, 14 Dec 2016 15:48:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Tfgh6w0zFZ_l for ; Wed, 14 Dec 2016 15:48:10 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EF22A84CFB for ; Wed, 14 Dec 2016 15:48:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id ED048FBA6; Wed, 14 Dec 2016 15:48:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148173048968630" MIME-Version: 1.0 Date: Wed, 14 Dec 2016 15:48:09 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/mail/dovecot2 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20161214154809.ED048FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148173048968630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Wed Dec 14 15:48:09 UTC 2016 Modified Files: pkgsrc/mail/dovecot2: Makefile.common PLIST buildlink3.mk distinfo pkgsrc/mail/dovecot2/patches: patch-src_stats_mail-stats.h Log Message: Changes 2.2.27: * dovecot.list.index.log rotation sizes/times were changed so that the .log file stays smaller and .log.2 is deleted sooner. + Added mail_crypt plugin that allows encryption of stored emails. See http://wiki2.dovecot.org/Plugins/MailCrypt + stats: Global stats can be sent to Carbon server by setting stats_carbon_server=ip:port + imap/pop3 proxy: If passdb returns proxy_not_trusted, don't send ID/XCLIENT + Added generic hash modifier for %variables: %{;rounds=,truncate=,salt=s>:field} Hash algorithm is any of the supported ones, e.g. md5, sha1, sha256. Also "pkcs5" is supported using SHA256. For example: %{sha256:user} or %{md5;truncate=32:user}. + Added support for SHA3-256 and SHA3-512 hashes. + config: Support DNS wildcards in local_name, e.g. local_name *.example.com { .. } matches anything.example.com, but not multiple.anything.example.com. + config: Support multiple names in local_name, e.g. local_name "1.example.com 2.example.com" { .. } - Fixed crash in auth process when auth-policy was configured and authentication was aborted/failed without a username set. - director: If two users had different tags but the same hash, the users may have been redirected to the wrong tag's hosts. - Index files may have been thought incorrectly lost, causing "Missing middle file seq=.." to be logged and index rebuild. This happened more easily with IMAP hibernation enabled. - Various fixes to restoring state correctly in un-hibernation. - dovecot.index files were commonly 4 bytes per email too large. This is because 3 bytes per email were being wasted that could have been used for IMAP keywords. - Various fixes to handle dovecot.list.index corruption better. - lib-fts: Fixed assert-crash in address tokenizer with specific input. - Fixed assert-crash in HTML to text parsing with specific input (e.g. for FTS indexing or snippet generation) - doveadm sync -1: Fixed handling mailbox GUID conflicts. - sdbox, mdbox: Perform full index rebuild if corruption is detected inside lib-index, which runs index fsck. - quota: Don't skip quota checks when moving mails between different quota roots. - search: Multiple sequence sets or UID sets in search parameters weren't handled correctly. They were incorrectly merged together. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/dovecot2/Makefile.common cvs rdiff -u -r1.50 -r1.51 pkgsrc/mail/dovecot2/PLIST cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/dovecot2/buildlink3.mk cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/dovecot2/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/mail/dovecot2/patches/patch-src_stats_mail-stats.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148173048968630 Content-Disposition: inline Content-Length: 8076 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/dovecot2/Makefile.common diff -u pkgsrc/mail/dovecot2/Makefile.common:1.3 pkgsrc/mail/dovecot2/Makefile.common:1.4 --- pkgsrc/mail/dovecot2/Makefile.common:1.3 Sat Nov 12 11:21:45 2016 +++ pkgsrc/mail/dovecot2/Makefile.common Wed Dec 14 15:48:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2016/11/12 11:21:45 adam Exp $ +# $NetBSD: Makefile.common,v 1.4 2016/12/14 15:48:09 adam Exp $ # # when updating to a new release, update ABI depends in # the buildlink3.mk file as well, since the plugins' version @@ -9,9 +9,9 @@ # used by mail/dovecot2-mysql/Makefile # used by mail/dovecot2-pgsql/Makefile -DISTNAME= dovecot-2.2.26.0 +DISTNAME= dovecot-2.2.27 CATEGORIES= mail -MASTER_SITES= http://www.dovecot.org/releases/${PKGVERSION_NOREV:R:R}/ +MASTER_SITES= http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.dovecot.org/ @@ -46,5 +46,6 @@ CONFIGURE_ENV.SunOS+= ac_cv_func_inotify MAKE_JOBS_SAFE= no .include "../../archivers/bzip2/buildlink3.mk" +.include "../../archivers/lz4/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" Index: pkgsrc/mail/dovecot2/PLIST diff -u pkgsrc/mail/dovecot2/PLIST:1.50 pkgsrc/mail/dovecot2/PLIST:1.51 --- pkgsrc/mail/dovecot2/PLIST:1.50 Sat Nov 12 16:12:08 2016 +++ pkgsrc/mail/dovecot2/PLIST Wed Dec 14 15:48:09 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.50 2016/11/12 16:12:08 taca Exp $ +@comment $NetBSD: PLIST,v 1.51 2016/12/14 15:48:09 adam Exp $ bin/doveadm bin/doveconf bin/dsync @@ -81,6 +81,7 @@ include/dovecot/dict-sql.h include/dovecot/dict-transaction-memory.h include/dovecot/dict.h include/dovecot/dns-lookup.h +include/dovecot/dns-util.h include/dovecot/doveadm-cmd.h include/dovecot/doveadm-dsync.h include/dovecot/doveadm-dump.h @@ -493,8 +494,10 @@ include/dovecot/seq-range-array.h include/dovecot/service-settings.h include/dovecot/settings-parser.h include/dovecot/settings.h +include/dovecot/sha-common.h include/dovecot/sha1.h include/dovecot/sha2.h +include/dovecot/sha3.h include/dovecot/shared-storage.h include/dovecot/smtp-client.h include/dovecot/sort.h @@ -536,13 +539,16 @@ lib/dovecot/doveadm/lib10_doveadm_acl_pl lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la +lib/dovecot/doveadm/libdoveadm_mail_crypt_plugin.la lib/dovecot/dovecot-config lib/dovecot/lib01_acl_plugin.la lib/dovecot/lib02_imap_acl_plugin.la lib/dovecot/lib02_lazy_expunge_plugin.la +lib/dovecot/lib05_mail_crypt_acl_plugin.la lib/dovecot/lib05_pop3_migration_plugin.la lib/dovecot/lib05_snarf_plugin.la lib/dovecot/lib10_last_login_plugin.la +lib/dovecot/lib10_mail_crypt_plugin.la lib/dovecot/lib10_mail_filter_plugin.la lib/dovecot/lib10_quota_plugin.la lib/dovecot/lib11_imap_quota_plugin.la @@ -574,6 +580,8 @@ lib/dovecot/libdovecot-sql.la lib/dovecot/libdovecot-storage.la lib/dovecot/libdovecot.la lib/dovecot/libfs_compress.la +lib/dovecot/libfs_crypt.la +lib/dovecot/libfs_mail_crypt.la ${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la lib/dovecot/stats/libstats_auth.la lib/dovecot/stats/libstats_mail.la @@ -637,6 +645,7 @@ man/man1/doveadm-index.1 man/man1/doveadm-instance.1 man/man1/doveadm-kick.1 man/man1/doveadm-log.1 +man/man1/doveadm-mailbox-cryptokey.1 man/man1/doveadm-mailbox.1 man/man1/doveadm-mount.1 man/man1/doveadm-move.1 @@ -838,6 +847,7 @@ share/doc/dovecot/wiki/Pigeonhole.Sieve. share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.txt share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Extdata.txt share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Extprograms.txt +share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.IMAPSieve.txt share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Pipe.txt share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.txt share/doc/dovecot/wiki/Pigeonhole.Sieve.Troubleshooting.txt @@ -854,10 +864,12 @@ share/doc/dovecot/wiki/Plugins.FTS.txt share/doc/dovecot/wiki/Plugins.LastLogin.txt share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt share/doc/dovecot/wiki/Plugins.Listescape.txt +share/doc/dovecot/wiki/Plugins.MailCrypt.txt share/doc/dovecot/wiki/Plugins.MailFilter.txt share/doc/dovecot/wiki/Plugins.MailLog.txt share/doc/dovecot/wiki/Plugins.MailboxAlias.txt share/doc/dovecot/wiki/Plugins.Notify.txt +share/doc/dovecot/wiki/Plugins.PushNotification.txt share/doc/dovecot/wiki/Plugins.QuotaClone.txt share/doc/dovecot/wiki/Plugins.Snarf.txt share/doc/dovecot/wiki/Plugins.Stats.txt Index: pkgsrc/mail/dovecot2/buildlink3.mk diff -u pkgsrc/mail/dovecot2/buildlink3.mk:1.19 pkgsrc/mail/dovecot2/buildlink3.mk:1.20 --- pkgsrc/mail/dovecot2/buildlink3.mk:1.19 Sat Nov 12 16:15:12 2016 +++ pkgsrc/mail/dovecot2/buildlink3.mk Wed Dec 14 15:48:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2016/11/12 16:15:12 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2016/12/14 15:48:09 adam Exp $ BUILDLINK_TREE+= dovecot @@ -7,7 +7,7 @@ DOVECOT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.dovecot+= dovecot>=2.2.0 # must match current package version for plugins to load -BUILDLINK_ABI_DEPENDS.dovecot+= dovecot>=2.2.26.0 +BUILDLINK_ABI_DEPENDS.dovecot+= dovecot>=2.2.27 BUILDLINK_PKGSRCDIR.dovecot?= ../../mail/dovecot2 pkgbase:= dovecot Index: pkgsrc/mail/dovecot2/distinfo diff -u pkgsrc/mail/dovecot2/distinfo:1.68 pkgsrc/mail/dovecot2/distinfo:1.69 --- pkgsrc/mail/dovecot2/distinfo:1.68 Sat Nov 12 16:12:08 2016 +++ pkgsrc/mail/dovecot2/distinfo Wed Dec 14 15:48:09 2016 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.68 2016/11/12 16:12:08 taca Exp $ +$NetBSD: distinfo,v 1.69 2016/12/14 15:48:09 adam Exp $ -SHA1 (dovecot-2.2.26.0.tar.gz) = b2b555473ce9099b3e13e5c61c234ad16549b93c -RMD160 (dovecot-2.2.26.0.tar.gz) = 7f5ca42490e67a4e908d98cf8eac7a05c86c7373 -SHA512 (dovecot-2.2.26.0.tar.gz) = 7b4c170efd964eabbd9a0166164e53b7964b90fc245bab1c3328bf199c4880288c89811dcfd9833f899057921eefb4451c561f3b3d725df9ea346df8fde82a3d -Size (dovecot-2.2.26.0.tar.gz) = 5687576 bytes +SHA1 (dovecot-2.2.27.tar.gz) = e007081c43b06fa2670d556de7a62bbb87fc637c +RMD160 (dovecot-2.2.27.tar.gz) = 8cda1656b7ece5818550160d347f760e091fdb3c +SHA512 (dovecot-2.2.27.tar.gz) = faab441bb2afa1e6de3e6ec6207c92a333773941bbc10c4761483ef6ccc193d3a4983de1acc73325122c22b197ea25c1e54886cccfb6b060ede90936a69b71f2 +Size (dovecot-2.2.27.tar.gz) = 5794668 bytes SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656 @@ -12,4 +12,4 @@ SHA1 (patch-src_lib-ldap_ldap-private.h) SHA1 (patch-src_lib_buffer.h) = d75017a1093c1ca34827d01ec85b06e6b03105d2 SHA1 (patch-src_lib_connection.h) = c749dd1517902b6602f81e41bb90c6288a571487 SHA1 (patch-src_plugins_quota_quota-fs.c) = c69305eb065a2417df1e8cd6ccbc1d317aee5d00 -SHA1 (patch-src_stats_mail-stats.h) = 90645c2aab956a0119630da4b71905db704bffda +SHA1 (patch-src_stats_mail-stats.h) = 36af4c9931953bf23c97d08fe50e0c299fe6c2c3 Index: pkgsrc/mail/dovecot2/patches/patch-src_stats_mail-stats.h diff -u pkgsrc/mail/dovecot2/patches/patch-src_stats_mail-stats.h:1.1 pkgsrc/mail/dovecot2/patches/patch-src_stats_mail-stats.h:1.2 --- pkgsrc/mail/dovecot2/patches/patch-src_stats_mail-stats.h:1.1 Sun Mar 15 09:19:24 2015 +++ pkgsrc/mail/dovecot2/patches/patch-src_stats_mail-stats.h Wed Dec 14 15:48:09 2016 @@ -1,12 +1,12 @@ -$NetBSD: patch-src_stats_mail-stats.h,v 1.1 2015/03/15 09:19:24 tron Exp $ +$NetBSD: patch-src_stats_mail-stats.h,v 1.2 2016/12/14 15:48:09 adam Exp $ Fix build under NetBSD (at least amd64 7.0_BETA). ---- src/stats/mail-stats.h.orig 2015-03-05 15:19:20.000000000 +0000 -+++ src/stats/mail-stats.h 2015-03-15 09:13:07.000000000 +0000 -@@ -5,6 +5,10 @@ - #include "guid.h" - #include "stats.h" +--- src/stats/mail-stats.h.orig 2016-12-03 17:13:21.000000000 +0000 ++++ src/stats/mail-stats.h +@@ -9,6 +9,10 @@ + + struct stats_send_ctx; +#ifdef __NetBSD__ +#include --_----------=_148173048968630--