summaryrefslogtreecommitdiff
path: root/mail/dovecot2
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dovecot2')
-rw-r--r--mail/dovecot2/Makefile4
-rw-r--r--mail/dovecot2/Makefile.common8
-rw-r--r--mail/dovecot2/PLIST10
-rw-r--r--mail/dovecot2/buildlink3.mk6
-rw-r--r--mail/dovecot2/distinfo12
-rw-r--r--mail/dovecot2/options.mk13
-rw-r--r--mail/dovecot2/patches/patch-aa4
-rw-r--r--mail/dovecot2/patches/patch-src_lib_ostream-file.c18
8 files changed, 45 insertions, 30 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index af172cf1172..4bbb2d46678 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile,v 1.97.6.1 2019/09/08 17:11:50 bsiegert Exp $
.include "../../mail/dovecot2/Makefile.common"
@@ -32,8 +32,6 @@ INSTALLATION_DIRS+= share/examples/dovecot share/examples/dovecot/conf.d
OWN_DIRS= ${PKG_SYSCONFDIR}/dovecot/
OWN_DIRS+= ${PKG_SYSCONFDIR}/dovecot/conf.d
-BUILD_DEFS+= VARBASE
-
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index c26c6299121..2729da19cef 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2019/06/09 22:10:45 nia Exp $
+# $NetBSD: Makefile.common,v 1.29.2.1 2019/09/08 17:11:50 bsiegert Exp $
#
# when updating to a new release, update ABI depends in
# the buildlink3.mk file as well, since the plugins' version
@@ -11,9 +11,9 @@
# used by mail/dovecot2-pgsql/Makefile
# used by mail/dovecot2-sqlite/Makefile
-DISTNAME= dovecot-2.3.6
+DISTNAME= dovecot-2.3.7.2
CATEGORIES= mail
-MASTER_SITES= https://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
+MASTER_SITES= https://dovecot.org/releases/${PKGVERSION_NOREV:R:R}/
MAINTAINER= adam@NetBSD.org
HOMEPAGE= https://www.dovecot.org/
@@ -27,6 +27,8 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config rpcgen
GNU_CONFIGURE= yes
+BUILD_DEFS+= VARBASE
+
.include "../../mk/bsd.prefs.mk"
.if "${PKGPATH}" != "mail/dovecot2"
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 98b936f8276..f212e9b3cf8 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2019/04/30 15:21:05 taca Exp $
+@comment $NetBSD: PLIST,v 1.65.2.1 2019/09/08 17:11:50 bsiegert Exp $
bin/doveadm
bin/doveconf
bin/dsync
@@ -19,7 +19,6 @@ include/dovecot/auth-cache.h
include/dovecot/auth-client-connection.h
include/dovecot/auth-client-interface.h
include/dovecot/auth-client-private.h
-include/dovecot/auth-client-request.h
include/dovecot/auth-client.h
include/dovecot/auth-common.h
include/dovecot/auth-fields.h
@@ -32,7 +31,6 @@ include/dovecot/auth-request-handler.h
include/dovecot/auth-request-stats.h
include/dovecot/auth-request-var-expand.h
include/dovecot/auth-request.h
-include/dovecot/auth-server-connection.h
include/dovecot/auth-settings.h
include/dovecot/auth-stats.h
include/dovecot/auth-token.h
@@ -298,6 +296,11 @@ include/dovecot/lib-event.h
include/dovecot/lib-signals.h
include/dovecot/lib.h
include/dovecot/llist.h
+include/dovecot/lmtp-client.h
+include/dovecot/lmtp-commands.h
+include/dovecot/lmtp-common.h
+include/dovecot/lmtp-recipient.h
+include/dovecot/lmtp-settings.h
include/dovecot/log-throttle.h
include/dovecot/login-common.h
include/dovecot/login-proxy-state.h
@@ -1020,6 +1023,7 @@ share/dovecot/stopwords/stopwords_pt.txt
share/dovecot/stopwords/stopwords_ro.txt
share/dovecot/stopwords/stopwords_ru.txt
share/dovecot/stopwords/stopwords_sv.txt
+share/dovecot/stopwords/stopwords_tr.txt
share/examples/dovecot/conf.d/10-auth.conf
share/examples/dovecot/conf.d/10-director.conf
share/examples/dovecot/conf.d/10-logging.conf
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index b7780b6efaa..1377da0a644 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2019/03/05 17:05:46 hauke Exp $
+# $NetBSD: buildlink3.mk,v 1.30.4.1 2019/09/08 17:11:50 bsiegert Exp $
BUILDLINK_TREE+= dovecot
@@ -7,15 +7,13 @@ 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.5
+BUILDLINK_ABI_DEPENDS.dovecot+= dovecot>=2.3.7
BUILDLINK_PKGSRCDIR.dovecot?= ../../mail/dovecot2
pkgbase:= dovecot
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.dovecot:Mssl)
. include "../../security/openssl/buildlink3.mk"
-.elif !empty(PKG_BUILD_OPTIONS.dovecot:Mgnutls)
-. include "../../security/gnutls/buildlink3.mk"
.endif
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 1d429884f0b..8e1f4a7227e 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.92 2019/04/30 15:21:06 taca Exp $
+$NetBSD: distinfo,v 1.92.2.1 2019/09/08 17:11:50 bsiegert Exp $
-SHA1 (dovecot-2.3.6.tar.gz) = 7b939bb83bca6d2bbc932d33d5b450bd66d9d124
-RMD160 (dovecot-2.3.6.tar.gz) = 584e72ed6d8901960aa2ba48c0d3716db4222e95
-SHA512 (dovecot-2.3.6.tar.gz) = ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
-Size (dovecot-2.3.6.tar.gz) = 6980135 bytes
-SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
+SHA1 (dovecot-2.3.7.2.tar.gz) = cceb5ec832c73275423ec2fe16381073aa798b0c
+RMD160 (dovecot-2.3.7.2.tar.gz) = 22b84d79fa580fc73d9fc810ad4b1328471e942c
+SHA512 (dovecot-2.3.7.2.tar.gz) = 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
+Size (dovecot-2.3.7.2.tar.gz) = 7076231 bytes
+SHA1 (patch-aa) = 3af01aa4a8cea1a3fb840b6243a744de77069611
SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b
SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
diff --git a/mail/dovecot2/options.mk b/mail/dovecot2/options.mk
index 2c8c7702440..023b6a33f7c 100644
--- a/mail/dovecot2/options.mk
+++ b/mail/dovecot2/options.mk
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.11 2018/11/30 18:43:09 adam Exp $
+# $NetBSD: options.mk,v 1.11.6.1 2019/09/08 17:11:50 bsiegert Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS= kqueue pam tcpwrappers
-PKG_OPTIONS_OPTIONAL_GROUPS=ssl
-PKG_OPTIONS_GROUP.ssl= gnutls ssl
+PKG_SUPPORTED_OPTIONS= kqueue pam ssl tcpwrappers
PKG_SUGGESTED_OPTIONS= pam ssl tcpwrappers
.if defined(PKG_HAVE_KQUEUE)
@@ -14,7 +12,7 @@ PLIST_VARS+= ssl tcpwrappers
.include "../../mk/bsd.options.mk"
###
-### Build with OpenSSL or GNU TLS as the underlying crypto library
+### Build with OpenSSL as the underlying crypto library
###
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --with-ssl=openssl
@@ -23,11 +21,6 @@ CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto"
BUILDLINK_API_DEPENDS.openssl+=openssl>=0.9.8a
. include "../../security/openssl/buildlink3.mk"
PLIST.ssl= yes
-.elif !empty(PKG_OPTIONS:Mgnutls)
-CONFIGURE_ARGS+= --with-ssl=gnutls
-. include "../../security/gnutls/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-ssl
.endif
###
diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa
index 456e6b96800..afb2634f93a 100644
--- a/mail/dovecot2/patches/patch-aa
+++ b/mail/dovecot2/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2013/05/23 19:45:50 adam Exp $
+$NetBSD: patch-aa,v 1.6.52.1 2019/09/08 17:11:50 bsiegert Exp $
+
+* Make the example directory pkgsrc compliant.
--- doc/example-config/Makefile.in.orig 2013-05-19 23:04:29.000000000 +0000
+++ doc/example-config/Makefile.in
diff --git a/mail/dovecot2/patches/patch-src_lib_ostream-file.c b/mail/dovecot2/patches/patch-src_lib_ostream-file.c
new file mode 100644
index 00000000000..6015d5ea6c3
--- /dev/null
+++ b/mail/dovecot2/patches/patch-src_lib_ostream-file.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_ostream-file.c,v 1.2.2.2 2019/09/08 17:11:50 bsiegert Exp $
+
+Silence Error: file_ostream.net_set_tcp_nodelay(, TRUE) failed
+
+Patch from upstream -head via FreeBSD
+<https://svnweb.freebsd.org/ports/head/mail/dovecot/files/patch-src_lib_ostream-file.c?view=markup&pathrev=506487>
+
+--- src/lib/ostream-file.c.orig 2019-07-12 10:46:25.000000000 +0000
++++ src/lib/ostream-file.c
+@@ -334,7 +334,7 @@ static void o_stream_tcp_flush_via_nodel
+ {
+ if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) {
+ if (errno != ENOTSUP && errno != ENOTSOCK &&
+- errno != ENOPROTOOPT) {
++ errno != ENOPROTOOPT && errno != EINVAL) {
+ i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m",
+ o_stream_get_name(&fstream->ostream.ostream));
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 13:56:59 +0000