Pullup ticket #6136 - requested by taca

mail/dovecot2: security fix

Revisions pulled up:
- mail/dovecot2-ldap/Makefile                                   1.5-1.6
- mail/dovecot2-pigeonhole/Makefile                             1.55
- mail/dovecot2/Makefile                                        1.102-1.103
- mail/dovecot2/Makefile.common                                 1.38
- mail/dovecot2/buildlink3.mk                                   1.33
- mail/dovecot2/distinfo                                        1.102

---
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Sat Jan 18 21:51:16 UTC 2020

   Modified Files:
   	pkgsrc/mail/dovecot2: Makefile buildlink3.mk
   	pkgsrc/mail/dovecot2-ldap: Makefile
   	pkgsrc/mail/dovecot2-pigeonhole: Makefile

   Log Message:
   *: Recursive revision bump for openssl 1.1.1.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Feb 12 14:01:59 UTC 2020

   Modified Files:
   	pkgsrc/mail/dovecot2: Makefile Makefile.common distinfo
   	pkgsrc/mail/dovecot2-ldap: Makefile

   Log Message:
   mail/dovecot2: update to 2.3.9.3

   Update dovecot2 to 2.3.9.3, security release.

   v2.3.9.3 2019-02-12  Aki Tuomi <aki.tuomi@open-xchange.com>

   	* CVE-2020-7046: Truncated UTF-8 can be used to DoS
   	  submission-login and lmtp processes.
   	* CVE-2020-7957: Specially crafted mail can crash snippet generation.

4 files changed, 11 insertions, 10 deletions

diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 7ab0bda4e60..eeddc3d37a6 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2019/12/05 09:37:35 adam Exp $
+# $NetBSD: Makefile,v 1.54.4.1 2020/02/22 19:37:30 bsiegert Exp $
 
 DISTNAME=	dovecot-2.3-pigeonhole-0.5.9
 PKGNAME=	${DISTNAME:S/-2.3-/-/}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/2.3/
 
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index a19798ce748..d5a3dce6883 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2019/12/13 15:32:15 taca Exp $
+# $NetBSD: Makefile.common,v 1.37.4.1 2020/02/22 19:37:30 bsiegert Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
@@ -11,7 +11,7 @@
 # used by mail/dovecot2-pgsql/Makefile
 # used by mail/dovecot2-sqlite/Makefile
 
-DISTNAME=	dovecot-2.3.9.2
+DISTNAME=	dovecot-2.3.9.3
 CATEGORIES=	mail
 MASTER_SITES=	https://dovecot.org/releases/${PKGVERSION_NOREV:R:R}/
 
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index eea8b838c89..6a2f5df9e63 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2019/07/18 13:38:18 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.32.6.1 2020/02/22 19:37:30 bsiegert 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.3.7
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.3.9.2nb1
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 7974165a6d7..9b994e084b7 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.101 2019/12/13 15:32:15 taca Exp $
+$NetBSD: distinfo,v 1.101.4.1 2020/02/22 19:37:30 bsiegert Exp $
 
-SHA1 (dovecot-2.3.9.2.tar.gz) = 6b240aa941ba19f6b8b943603414adfc51a44cfa
-RMD160 (dovecot-2.3.9.2.tar.gz) = 2be8d3ce58c173bc5d9e9adf1f5be0edb8a61e08
-SHA512 (dovecot-2.3.9.2.tar.gz) = 36e8270bfa33e2bd6aa89017e65c7d1650c494c79ff297759a4b01c026aebcfdf5b1b542d4357e1f9dc2bb8169ef67064f0699b17ca36d658deb70b4c800b253
-Size (dovecot-2.3.9.2.tar.gz) = 7182306 bytes
+SHA1 (dovecot-2.3.9.3.tar.gz) = b1ab4fc2dcb6f4854b6f0cab535e35ac0bb977f5
+RMD160 (dovecot-2.3.9.3.tar.gz) = 970d17c225e1cd480b9cf7ab0420cd12f44852a5
+SHA512 (dovecot-2.3.9.3.tar.gz) = e39dc825a03f009928b67d01747bb70487fbec155e6be5109037db67b78301aa761db432f7355e96d927abf30c68f0116a5f2cf518b9eebf7f5c7806ac00ae41
+Size (dovecot-2.3.9.3.tar.gz) = 7181682 bytes
 SHA1 (patch-aa) = 3af01aa4a8cea1a3fb840b6243a744de77069611
 SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
 SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b