- Update devel/courier-unicode to 2.0

- Update mail/cone to 0.96
- Update mail/courier-imap to 4.18.0 [1]
- Update mail/maildrop to 2.9.0
- Update mail/sqwebmail to 5.9.0 [1]
- Update security/courier-authlib (and slaves) to 0.68.0 [1]

On request from oliver@, take maintainership of the courier-authlib
ports and the courier-imap port.

Approved by:		oliver@ (maintainer) [1]
Differential Revision:	https://reviews.freebsd.org/D11467

10 files changed, 22 insertions, 32 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index e3ed9613b796..40a19984abd7 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cone
-PORTVERSION=	0.94
+PORTVERSION=	0.96
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index c72f5d0943a1..bfb1fa6dc384 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483020625
-SHA256 (cone-0.94.tar.bz2) = c52be25ca3547baf1d7ed6fdfdb2aaec3224ea6183b8fc8eeb53f3e615694f49
-SIZE (cone-0.94.tar.bz2) = 3749999
+TIMESTAMP = 1499031560
+SHA256 (cone-0.96.tar.bz2) = 657b16002deae701d5a9ca5572bfe9c05ba40c0da523ecebb8171f48863f6a8e
+SIZE (cone-0.96.tar.bz2) = 3752115
diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index 253650e691c1..d01475be0beb 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-vchkpw
 
 COMMENT=	Vpopmail/vchkpw support for the Courier authentication library
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 492eaf9907e9..2be42ce68f6b 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.16.2
-PORTREVISION=	2
+PORTVERSION=	4.18.0
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 
-MAINTAINER=	oliver@FreeBSD.org
+MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
 BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index fd00f3a6bd20..477dd0e92ffd 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (courier-imap-4.16.2.tar.bz2) = 3be244b3c4d3d5c5e33efb37e4cf712ae83cbe21e43c31725e0d996ab4acc387
-SIZE (courier-imap-4.16.2.tar.bz2) = 3028445
+TIMESTAMP = 1499031625
+SHA256 (courier-imap-4.18.0.tar.bz2) = fa8c2e3b71295c9fa124dfad350f688263ddf7f2b15709f2d44d0f9722de7c52
+SIZE (courier-imap-4.18.0.tar.bz2) = 3202389
diff --git a/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c b/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c
deleted file mode 100644
index f3f5035cb9b7..000000000000
--- a/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libs/tcpd/libcouriertls.c.orig	2015-06-10 00:08:23 UTC
-+++ libs/tcpd/libcouriertls.c
-@@ -74,7 +74,9 @@ struct proto_ops op_list[] =
-     { "TLSv1",     &TLSv1_method,   SSL_OP_ALL },
-     { "TLS1",      &TLSv1_method,   SSL_OP_ALL },
-     { "SSL3+",     &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2 },
-+#ifdef HAVE_SSLV3_METHOD
-     { "SSL3",      &SSLv3_method,   SSL_OP_ALL },
-+#endif
-     { "SSL23",     &SSLv23_method,  SSL_OP_ALL },
-     { "",          &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
-     { NULL,        &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 26cf7c8930b8..cbed5e239f2a 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -16,7 +16,7 @@
 # MAILDROP_MBOX_DIR=<dir>	Specify DEFAULT mailbox location
 
 PORTNAME=	maildrop
-PORTVERSION=	2.8.5
+PORTVERSION=	2.9.0
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 065e3f05a5ef..af588631828e 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484728651
-SHA256 (maildrop-2.8.5.tar.bz2) = c21174ef882aeb169031bb5886b55959687074415153232f4c60695405fcddb1
-SIZE (maildrop-2.8.5.tar.bz2) = 2072987
+TIMESTAMP = 1499009130
+SHA256 (maildrop-2.9.0.tar.bz2) = 6f1b2db822a34d8256d9cc2a011e5a2c6b7e6dd01ed66881cd6fce6f4eb5981c
+SIZE (maildrop-2.9.0.tar.bz2) = 2075698
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index cd29a927fb02..c1033f0fb8cf 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	sqwebmail
-PORTVERSION=	5.8.3
-PORTREVISION=	1
+PORTVERSION=	5.9.0
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
 
-BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base \
+		gpg:security/gnupg
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
+		gpg:security/gnupg
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcourier-unicode.so:devel/courier-unicode
 
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index be44aec5a92a..40a5de0ef7ec 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,2 +1,3 @@
-SHA256 (sqwebmail-5.8.3.tar.bz2) = 92b30599dc52ca815357f9c540d9ab69d1d975bb7a41c787c3a4a1066d12855c
-SIZE (sqwebmail-5.8.3.tar.bz2) = 3520773
+TIMESTAMP = 1499031751
+SHA256 (sqwebmail-5.9.0.tar.bz2) = 2729440716c5c39babe061dc45c5acd47fcf5e559858cc932c59c9c93b5d47ca
+SIZE (sqwebmail-5.9.0.tar.bz2) = 3648976