aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot2-antispam-plugin/Makefile2
-rw-r--r--mail/dovecot2-pigeonhole/Makefile2
-rw-r--r--mail/dovecot2/Makefile5
-rw-r--r--mail/dovecot2/distinfo6
-rw-r--r--mail/dovecot2/files/patch-fix-ntlm_auth36
-rw-r--r--mail/dovecot2/pkg-plist1
6 files changed, 8 insertions, 44 deletions
diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index d118e45ab8c8..2e87a7d08db3 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dovecot2-antispam-plugin
PORTVERSION= 20130429
-PORTREVISION= 26
+PORTREVISION= 27
CATEGORIES= mail
MASTER_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \
LOCAL/olgeni
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 93c27c3482dc..00cb6f262767 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dovecot-pigeonhole
PORTVERSION= 0.4.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index d4797e1e208e..fcae55c44d0a 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -13,10 +13,9 @@
######################################################################
PORTNAME= dovecot
-PORTVERSION= 2.2.29.1
-PORTREVISION= 2
+PORTVERSION= 2.2.30
CATEGORIES= mail ipv6
-MASTER_SITES= https://www.dovecot.org/releases/${PORTVERSION:R:R}/
+MASTER_SITES= https://www.dovecot.org/releases/${PORTVERSION:R}/
PKGNAMESUFFIX= 2
MAINTAINER= adamw@FreeBSD.org
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 372956b8ced2..092e10d150db 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492013710
-SHA256 (dovecot-2.2.29.1.tar.gz) = ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388
-SIZE (dovecot-2.2.29.1.tar.gz) = 5972119
+TIMESTAMP = 1496174499
+SHA256 (dovecot-2.2.30.tar.gz) = 126b07cbf4c313e8fc6df273282f60710b453a7a678f502fd45c2fa7192127f3
+SIZE (dovecot-2.2.30.tar.gz) = 6006654
diff --git a/mail/dovecot2/files/patch-fix-ntlm_auth b/mail/dovecot2/files/patch-fix-ntlm_auth
deleted file mode 100644
index 28e104058b23..000000000000
--- a/mail/dovecot2/files/patch-fix-ntlm_auth
+++ /dev/null
@@ -1,36 +0,0 @@
-From a319c3201bff1ea7bae3e7ab1fae42e9c4759056 Mon Sep 17 00:00:00 2001
-From: Andriy Syrovenko <andriys@gmail.com>
-Date: Mon, 17 Apr 2017 01:14:02 +0300
-Subject: [PATCH] auth: Fixed dovecot/auth hanging when child ntlm_auth crashes
- while processing an authentication request
-
----
- src/auth/mech-winbind.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/auth/mech-winbind.c b/src/auth/mech-winbind.c
-index 4a65696..c12fb5e 100644
---- src/auth/mech-winbind.c
-+++ src/auth/mech-winbind.c
-@@ -187,12 +187,18 @@ do_auth_continue(struct auth_request *auth_request,
- request->continued = FALSE;
-
- while ((answer = i_stream_read_next_line(in_pipe)) == NULL) {
-- if (in_pipe->stream_errno != 0)
-+ if (in_pipe->stream_errno != 0 || in_pipe->eof)
- break;
- }
- if (answer == NULL) {
-- auth_request_log_error(auth_request, AUTH_SUBSYS_MECH,
-- "read(in_pipe) failed: %m");
-+ if (in_pipe->stream_errno != 0) {
-+ auth_request_log_error(auth_request, AUTH_SUBSYS_MECH,
-+ "read(in_pipe) failed: %m");
-+ } else {
-+ auth_request_log_error(auth_request, AUTH_SUBSYS_MECH,
-+ "read(in_pipe) failed: "
-+ "unexpected end of file");
-+ }
- return HR_RESTART;
- }
-
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index d2d8a41a3d4a..d919e1adcafd 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -229,6 +229,7 @@ include/dovecot/imap-seqset.h
include/dovecot/imap-settings.h
include/dovecot/imap-state.h
include/dovecot/imap-status.h
+include/dovecot/imap-sync-private.h
include/dovecot/imap-sync.h
include/dovecot/imap-url.h
include/dovecot/imap-urlauth-backend.h