summaryrefslogtreecommitdiff
path: root/mail/dovecot2
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dovecot2')
-rw-r--r--mail/dovecot2/Makefile.common8
-rw-r--r--mail/dovecot2/Makefile.plugin5
-rw-r--r--mail/dovecot2/PLIST5
-rw-r--r--mail/dovecot2/buildlink3.mk4
-rw-r--r--mail/dovecot2/distinfo11
-rw-r--r--mail/dovecot2/patches/patch-src_lib_buffer.h13
6 files changed, 18 insertions, 28 deletions
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index ea18c5dda30..4b1d275a675 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2017/08/25 08:29:04 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2017/10/12 10:34:28 adam Exp $
#
# when updating to a new release, update ABI depends in
# the buildlink3.mk file as well, since the plugins' version
@@ -6,12 +6,10 @@
#
# used by mail/dovecot2/Makefile
# used by mail/dovecot2/Makefile.plugin
-# used by mail/dovecot2-mysql/Makefile
-# used by mail/dovecot2-pgsql/Makefile
-DISTNAME= dovecot-2.2.32
+DISTNAME= dovecot-2.2.33.1
CATEGORIES= mail
-MASTER_SITES= https://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
+MASTER_SITES= https://www.dovecot.org/releases/${PKGVERSION_NOREV:R:R}/
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.dovecot.org/
diff --git a/mail/dovecot2/Makefile.plugin b/mail/dovecot2/Makefile.plugin
index 767d0f5aa0f..3e984a4da42 100644
--- a/mail/dovecot2/Makefile.plugin
+++ b/mail/dovecot2/Makefile.plugin
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.plugin,v 1.1 2016/07/18 15:03:05 fhajny Exp $
+# $NetBSD: Makefile.plugin,v 1.2 2017/10/12 10:34:28 adam Exp $
#
+# used by mail/dovecot2-gssapi/Makefile
+# used by mail/dovecot2-ldap/Makefile
# used by mail/dovecot2-mysql/Makefile
# used by mail/dovecot2-pgsql/Makefile
+# used by mail/dovecot2-sqlite/Makefile
.include "../../mail/dovecot2/Makefile.common"
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index cf69bc3f8d3..1a06eb14e59 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2017/08/25 08:29:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.57 2017/10/12 10:34:28 adam Exp $
bin/doveadm
bin/doveconf
bin/dsync
@@ -271,6 +271,7 @@ include/dovecot/istream-header-filter.h
include/dovecot/istream-jsonstr.h
include/dovecot/istream-mail.h
include/dovecot/istream-metawrap.h
+include/dovecot/istream-multiplex.h
include/dovecot/istream-nonuls.h
include/dovecot/istream-private.h
include/dovecot/istream-qp.h
@@ -433,6 +434,7 @@ include/dovecot/ostream-failure-at.h
include/dovecot/ostream-file-private.h
include/dovecot/ostream-hash.h
include/dovecot/ostream-metawrap.h
+include/dovecot/ostream-multiplex.h
include/dovecot/ostream-null.h
include/dovecot/ostream-private.h
include/dovecot/ostream-rawlog.h
@@ -575,6 +577,7 @@ lib/dovecot/lib20_fts_plugin.la
lib/dovecot/lib20_listescape_plugin.la
lib/dovecot/lib20_mail_log_plugin.la
lib/dovecot/lib20_mailbox_alias_plugin.la
+lib/dovecot/lib20_notify_status_plugin.la
lib/dovecot/lib20_push_notification_plugin.la
lib/dovecot/lib20_quota_clone_plugin.la
lib/dovecot/lib20_replication_plugin.la
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index 225cb6ed92f..c162b2122dc 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2017/08/25 08:29:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2017/10/12 10:34:28 adam 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.2.32
+BUILDLINK_ABI_DEPENDS.dovecot+= dovecot>=2.2.33
BUILDLINK_PKGSRCDIR.dovecot?= ../../mail/dovecot2
pkgbase:= dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 2401f86cc57..7f62936a853 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.77 2017/08/25 08:29:04 adam Exp $
+$NetBSD: distinfo,v 1.78 2017/10/12 10:34:28 adam Exp $
-SHA1 (dovecot-2.2.32.tar.gz) = 783f545163a763becfc83c70bfa68529ce7c4da0
-RMD160 (dovecot-2.2.32.tar.gz) = ff583c903b774e1e691718088ec9ab305b342cdb
-SHA512 (dovecot-2.2.32.tar.gz) = a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c
-Size (dovecot-2.2.32.tar.gz) = 6100268 bytes
+SHA1 (dovecot-2.2.33.1.tar.gz) = f63338e5743873cf9226722a73a371367462c52e
+RMD160 (dovecot-2.2.33.1.tar.gz) = c1f4347105e339a6a251c5fedacd20e4ec1c0b17
+SHA512 (dovecot-2.2.33.1.tar.gz) = 46760a1d52f8d64c36bd4f589f7f240a13d66500c93e47ce479551647e8e4ef7322fc0c325c418c3e0495910292abae105ca5680cd4b0fcd78746723f1549b71
+Size (dovecot-2.2.33.1.tar.gz) = 6131180 bytes
SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
SHA1 (patch-src_imap_imap-client.h) = 1a2bf95ab6af57d88862a1512624bf263f4c2ce7
SHA1 (patch-src_lib-ldap_ldap-private.h) = 2d5ce32330ad4164cc75f8d209ba499d37ed01fc
-SHA1 (patch-src_lib_buffer.h) = d75017a1093c1ca34827d01ec85b06e6b03105d2
SHA1 (patch-src_lib_connection.h) = c749dd1517902b6602f81e41bb90c6288a571487
SHA1 (patch-src_plugins_quota_quota-fs.c) = c69305eb065a2417df1e8cd6ccbc1d317aee5d00
SHA1 (patch-src_stats_mail-stats.h) = 36af4c9931953bf23c97d08fe50e0c299fe6c2c3
diff --git a/mail/dovecot2/patches/patch-src_lib_buffer.h b/mail/dovecot2/patches/patch-src_lib_buffer.h
deleted file mode 100644
index 863ebf44c08..00000000000
--- a/mail/dovecot2/patches/patch-src_lib_buffer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_lib_buffer.h,v 1.2 2015/10/17 07:45:43 adam Exp $
-
---- src/lib/buffer.h.orig 2015-09-24 17:30:28.000000000 +0000
-+++ src/lib/buffer.h
-@@ -20,7 +20,7 @@ void buffer_create_from_const_data(buffe
- const void *data, size_t size);
- #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 401
- #define buffer_create_from_data(b,d,s) ({ \
-- (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) < ((s)?(s):1)); \
-+ (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) != 0 && __builtin_object_size((d),1) < ((s)?(s):1)); \
- buffer_create_from_data((b), (d), (s)); })
- #define buffer_create_from_const_data(b,d,s) ({ \
- (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) < ((s)?(s):1)); \