aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/dovecot-fts-xapian/Makefile1
-rw-r--r--mail/dovecot-pigeonhole/Makefile2
-rw-r--r--mail/dovecot/Makefile2
-rw-r--r--mail/dovecot/distinfo6
-rw-r--r--mail/dovecot/files/patch-src_lib_net.c20
-rw-r--r--mail/dovecot/pkg-plist7
6 files changed, 11 insertions, 27 deletions
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index b3ac58f2ce99..10433e94db67 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fts-xapian
PORTVERSION= 1.2.10
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMEPREFIX= dovecot-
diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index 626a9c890e47..2f536f17f9de 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dovecot-pigeonhole
PORTVERSION= 0.5.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 46eff9108096..4293ab046e84 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -8,7 +8,7 @@
######################################################################
PORTNAME= dovecot
-PORTVERSION= 2.3.9.3
+PORTVERSION= 2.3.10
CATEGORIES= mail
MASTER_SITES= https://dovecot.org/releases/2.3/
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index eac6685e6d63..d67258e0401b 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581553128
-SHA256 (dovecot-2.3.9.3.tar.gz) = f89fb69423fc5bdc05955c8fc0607eab9e33511f9a643b721763db6156c49651
-SIZE (dovecot-2.3.9.3.tar.gz) = 7181682
+TIMESTAMP = 1583508975
+SHA256 (dovecot-2.3.10.tar.gz) = 473184723d854a4d1dbd99c11a7b9f65156ca5fe6ecf85d9a44b5127e6f871c5
+SIZE (dovecot-2.3.10.tar.gz) = 7222241
diff --git a/mail/dovecot/files/patch-src_lib_net.c b/mail/dovecot/files/patch-src_lib_net.c
deleted file mode 100644
index 19e53f86a206..000000000000
--- a/mail/dovecot/files/patch-src_lib_net.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lib/net.c.orig 2019-12-04 17:29:36 UTC
-+++ src/lib/net.c
-@@ -1068,13 +1068,17 @@ enum net_hosterror_type net_get_hosterror_type(int err
- int error;
- enum net_hosterror_type type;
- } error_map[] = {
-+#ifdef EAI_ADDRFAMILY
- { EAI_ADDRFAMILY, NET_HOSTERROR_TYPE_NOT_FOUND },
-+#endif
- { EAI_AGAIN, NET_HOSTERROR_TYPE_NAMESERVER },
- { EAI_BADFLAGS, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
- { EAI_FAIL, NET_HOSTERROR_TYPE_NAMESERVER },
- { EAI_FAMILY, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
- { EAI_MEMORY, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
-+#ifdef EAI_NODATA
- { EAI_NODATA, NET_HOSTERROR_TYPE_NOT_FOUND },
-+#endif
- { EAI_NONAME, NET_HOSTERROR_TYPE_NOT_FOUND },
- { EAI_SERVICE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
- { EAI_SOCKTYPE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index fb6674898f9a..111306a9eb95 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -1,3 +1,4 @@
+@postunexec echo "If you are removing dovecot permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
%%DATADIR%%/stopwords/stopwords_da.txt
%%DATADIR%%/stopwords/stopwords_de.txt
%%DATADIR%%/stopwords/stopwords_en.txt
@@ -49,7 +50,6 @@
%%LDAP%%lib/dovecot/libdovecot-ldap.so.0
%%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0
%%LIBWRAP%%libexec/dovecot/tcpwrap
-libexec/dovecot/health-check.sh
%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.a
%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.so
%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%22_push_notification_lua_plugin.a
@@ -66,6 +66,7 @@ libexec/dovecot/health-check.sh
%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so
bin/doveadm
bin/doveconf
+bin/dovecot-sysreport
bin/dsync
include/dovecot/access-lookup.h
include/dovecot/acl-api-private.h
@@ -469,6 +470,7 @@ include/dovecot/mdbox-storage.h
include/dovecot/mdbox-sync.h
include/dovecot/mech-otp-skey-common.h
include/dovecot/mech-plain-common.h
+include/dovecot/mech-scram.h
include/dovecot/mech.h
include/dovecot/memarea.h
include/dovecot/mempool.h
@@ -786,6 +788,7 @@ libexec/dovecot/dns-client
libexec/dovecot/doveadm-server
libexec/dovecot/dovecot-lda
libexec/dovecot/gdbhelper
+libexec/dovecot/health-check.sh
libexec/dovecot/imap
libexec/dovecot/imap-hibernate
libexec/dovecot/imap-login
@@ -855,9 +858,9 @@ man/man1/doveadm-who.1.gz
man/man1/doveadm.1.gz
man/man1/doveconf.1.gz
man/man1/dovecot-lda.1.gz
+man/man1/dovecot-sysreport.1.gz
man/man1/dovecot.1.gz
man/man1/dsync.1.gz
man/man7/doveadm-search-query.7.gz
sbin/dovecot
share/aclocal/dovecot.m4
-@postunexec echo "If you are removing dovecot permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."