summaryrefslogtreecommitdiff
path: root/mail/dovecot2
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dovecot2')
-rw-r--r--mail/dovecot2/Makefile6
-rw-r--r--mail/dovecot2/PLIST63
-rw-r--r--mail/dovecot2/distinfo9
-rw-r--r--mail/dovecot2/patches/patch-ah16
4 files changed, 58 insertions, 36 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 3598d41bcb5..a6cff81703a 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2012/01/08 09:43:47 adam Exp $
+# $NetBSD: Makefile,v 1.18 2012/02/23 09:53:05 ghen Exp $
-DISTNAME= dovecot-2.0.17
+DISTNAME= dovecot-2.1.1
CATEGORIES= mail
-MASTER_SITES= http://www.dovecot.org/releases/2.0/
+MASTER_SITES= http://www.dovecot.org/releases/2.1/
MAINTAINER= ghen@NetBSD.org
HOMEPAGE= http://www.dovecot.org/
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 54e140bfdb5..46fdfda1dc2 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/01/08 09:43:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/02/23 09:53:05 ghen Exp $
bin/doveadm
bin/doveconf
bin/dsync
@@ -19,6 +19,7 @@ include/dovecot/auth-common.h
include/dovecot/auth-master-connection.h
include/dovecot/auth-master.h
include/dovecot/auth-penalty.h
+include/dovecot/auth-postfix-connection.h
include/dovecot/auth-request-handler.h
include/dovecot/auth-request.h
include/dovecot/auth-server-connection.h
@@ -66,6 +67,7 @@ include/dovecot/duplicate.h
include/dovecot/eacces-error.h
include/dovecot/env-util.h
include/dovecot/execv-const.h
+include/dovecot/fail-mail-storage.h
include/dovecot/failures.h
include/dovecot/fd-close-on-exec.h
include/dovecot/fd-set-nonblock.h
@@ -80,6 +82,7 @@ include/dovecot/fs-api-private.h
include/dovecot/fs-api.h
include/dovecot/fs-sis-common.h
include/dovecot/fsync-mode.h
+include/dovecot/guid.h
include/dovecot/hash-format.h
include/dovecot/hash-method.h
include/dovecot/hash.h
@@ -87,6 +90,7 @@ include/dovecot/hash2.h
include/dovecot/hex-binary.h
include/dovecot/hex-dec.h
include/dovecot/hmac-md5.h
+include/dovecot/hmac-sha1.h
include/dovecot/home-expand.h
include/dovecot/hostpid.h
include/dovecot/imap-arg.h
@@ -113,10 +117,19 @@ include/dovecot/imap-status.h
include/dovecot/imap-sync.h
include/dovecot/imap-utf7.h
include/dovecot/imap-util.h
+include/dovecot/imapc-client-private.h
+include/dovecot/imapc-client.h
+include/dovecot/imapc-connection.h
+include/dovecot/imapc-list.h
+include/dovecot/imapc-mail.h
+include/dovecot/imapc-msgmap.h
+include/dovecot/imapc-settings.h
+include/dovecot/imapc-storage.h
+include/dovecot/imapc-sync.h
include/dovecot/imem.h
include/dovecot/index-attachment.h
include/dovecot/index-mail.h
-include/dovecot/index-mailbox-list.h
+include/dovecot/index-search-private.h
include/dovecot/index-search-result.h
include/dovecot/index-sort-private.h
include/dovecot/index-sort.h
@@ -124,11 +137,15 @@ include/dovecot/index-storage.h
include/dovecot/index-sync-changes.h
include/dovecot/index-sync-private.h
include/dovecot/index-thread-private.h
-include/dovecot/ioloop-internal.h
include/dovecot/ioloop-iolist.h
include/dovecot/ioloop-notify-fd.h
+include/dovecot/ioloop-private.h
include/dovecot/ioloop.h
-include/dovecot/iostream-internal.h
+include/dovecot/iostream-openssl.h
+include/dovecot/iostream-private.h
+include/dovecot/iostream-rawlog-private.h
+include/dovecot/iostream-rawlog.h
+include/dovecot/iostream-ssl.h
include/dovecot/ipc-client.h
include/dovecot/ipc-server.h
include/dovecot/ipwd.h
@@ -138,9 +155,10 @@ include/dovecot/istream-concat.h
include/dovecot/istream-crlf.h
include/dovecot/istream-dot.h
include/dovecot/istream-header-filter.h
-include/dovecot/istream-internal.h
-include/dovecot/istream-mail-stats.h
+include/dovecot/istream-mail.h
+include/dovecot/istream-private.h
include/dovecot/istream-raw-mbox.h
+include/dovecot/istream-rawlog.h
include/dovecot/istream-seekable.h
include/dovecot/istream-tee.h
include/dovecot/istream.h
@@ -186,9 +204,9 @@ include/dovecot/mail-transaction-log-view-private.h
include/dovecot/mail-transaction-log.h
include/dovecot/mail-types.h
include/dovecot/mail-user.h
+include/dovecot/mailbox-guid-cache.h
include/dovecot/mailbox-list-delete.h
include/dovecot/mailbox-list-fs.h
-include/dovecot/mailbox-list-index-private.h
include/dovecot/mailbox-list-index.h
include/dovecot/mailbox-list-maildir.h
include/dovecot/mailbox-list-private.h
@@ -198,6 +216,7 @@ include/dovecot/mailbox-log.h
include/dovecot/mailbox-search-result-private.h
include/dovecot/mailbox-tree.h
include/dovecot/mailbox-uidvalidity.h
+include/dovecot/maildir-filename-flags.h
include/dovecot/maildir-filename.h
include/dovecot/maildir-keywords.h
include/dovecot/maildir-settings.h
@@ -205,6 +224,7 @@ include/dovecot/maildir-storage.h
include/dovecot/maildir-sync.h
include/dovecot/maildir-uidlist.h
include/dovecot/master-auth.h
+include/dovecot/master-instance.h
include/dovecot/master-interface.h
include/dovecot/master-login-auth.h
include/dovecot/master-login.h
@@ -248,6 +268,7 @@ include/dovecot/mkdir-parents.h
include/dovecot/mmap-util.h
include/dovecot/module-context.h
include/dovecot/module-dir.h
+include/dovecot/mountpoint-list.h
include/dovecot/mountpoint.h
include/dovecot/mycrypt.h
include/dovecot/network.h
@@ -255,10 +276,12 @@ include/dovecot/nfs-workarounds.h
include/dovecot/notify-plugin-private.h
include/dovecot/notify-plugin.h
include/dovecot/ostream-cmp.h
-include/dovecot/ostream-internal.h
+include/dovecot/ostream-private.h
+include/dovecot/ostream-rawlog.h
include/dovecot/ostream.h
include/dovecot/passdb-blocking.h
include/dovecot/passdb-cache.h
+include/dovecot/passdb-template.h
include/dovecot/passdb.h
include/dovecot/password-scheme.h
include/dovecot/pop3-capability.h
@@ -266,6 +289,10 @@ include/dovecot/pop3-client.h
include/dovecot/pop3-commands.h
include/dovecot/pop3-common.h
include/dovecot/pop3-settings.h
+include/dovecot/pop3c-client.h
+include/dovecot/pop3c-settings.h
+include/dovecot/pop3c-storage.h
+include/dovecot/pop3c-sync.h
include/dovecot/primes.h
include/dovecot/printf-format-fix.h
include/dovecot/priorityq.h
@@ -314,7 +341,7 @@ include/dovecot/unix-socket-create.h
include/dovecot/unlink-directory.h
include/dovecot/unlink-old-files.h
include/dovecot/userdb-blocking.h
-include/dovecot/userdb-static.h
+include/dovecot/userdb-template.h
include/dovecot/userdb-vpopmail.h
include/dovecot/userdb.h
include/dovecot/utc-mktime.h
@@ -322,10 +349,12 @@ include/dovecot/utc-offset.h
include/dovecot/var-expand.h
include/dovecot/wildcard-match.h
include/dovecot/write-full.h
+lib/dovecot/auth/libauthdb_imap.la
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.la
+lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la
lib/dovecot/dovecot-config
lib/dovecot/lib01_acl_plugin.la
lib/dovecot/lib02_imap_acl_plugin.la
@@ -344,15 +373,19 @@ lib/dovecot/lib20_virtual_plugin.la
lib/dovecot/lib20_zlib_plugin.la
lib/dovecot/lib21_fts_squat_plugin.la
lib/dovecot/lib30_imap_zlib_plugin.la
+lib/dovecot/lib90_stats_plugin.la
+lib/dovecot/lib95_imap_stats_plugin.la
lib/dovecot/libdovecot-lda.la
lib/dovecot/libdovecot-login.la
lib/dovecot/libdovecot-sql.la
+lib/dovecot/libdovecot-ssl.la
lib/dovecot/libdovecot-storage.la
lib/dovecot/libdovecot.la
libexec/dovecot/anvil
libexec/dovecot/auth
libexec/dovecot/checkpassword-reply
libexec/dovecot/config
+libexec/dovecot/decode2text.sh
libexec/dovecot/deliver
libexec/dovecot/dict
libexec/dovecot/director
@@ -362,8 +395,9 @@ libexec/dovecot/dovecot-lda
libexec/dovecot/gdbhelper
libexec/dovecot/imap
libexec/dovecot/imap-login
+libexec/dovecot/indexer
+libexec/dovecot/indexer-worker
libexec/dovecot/ipc
-libexec/dovecot/listview
libexec/dovecot/lmtp
libexec/dovecot/log
libexec/dovecot/maildirlock
@@ -373,6 +407,8 @@ libexec/dovecot/rawlog
libexec/dovecot/script
libexec/dovecot/script-login
libexec/dovecot/ssl-params
+libexec/dovecot/stats
+libexec/dovecot/xml2text
man/man1/deliver.1
man/man1/doveadm-altmove.1
man/man1/doveadm-auth.1
@@ -385,9 +421,11 @@ man/man1/doveadm-force-resync.1
man/man1/doveadm-help.1
man/man1/doveadm-import.1
man/man1/doveadm-index.1
+man/man1/doveadm-instance.1
man/man1/doveadm-kick.1
man/man1/doveadm-log.1
man/man1/doveadm-mailbox.1
+man/man1/doveadm-mount.1
man/man1/doveadm-move.1
man/man1/doveadm-penalty.1
man/man1/doveadm-purge.1
@@ -406,7 +444,6 @@ man/man1/dsync.1
man/man7/doveadm-search-query.7
sbin/dovecot
share/aclocal/dovecot.m4
-share/doc/dovecot/auth-protocol.txt
share/doc/dovecot/documentation.txt
share/doc/dovecot/securecoding.txt
share/doc/dovecot/thread-refs.txt
@@ -571,6 +608,7 @@ share/doc/dovecot/wiki/Plugins.FTS.txt
share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
share/doc/dovecot/wiki/Plugins.Listescape.txt
share/doc/dovecot/wiki/Plugins.MailLog.txt
+share/doc/dovecot/wiki/Plugins.Notify.txt
share/doc/dovecot/wiki/Plugins.Snarf.txt
share/doc/dovecot/wiki/Plugins.Trash.txt
share/doc/dovecot/wiki/Plugins.Virtual.txt
@@ -607,6 +645,7 @@ share/doc/dovecot/wiki/Upgrading.1.0.txt
share/doc/dovecot/wiki/Upgrading.1.1.txt
share/doc/dovecot/wiki/Upgrading.1.2.txt
share/doc/dovecot/wiki/Upgrading.2.0.txt
+share/doc/dovecot/wiki/Upgrading.2.1.txt
share/doc/dovecot/wiki/Upgrading.txt
share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
share/doc/dovecot/wiki/UserDatabase.NSS.txt
@@ -628,6 +667,7 @@ share/examples/dovecot/conf.d/10-mail.conf
share/examples/dovecot/conf.d/10-master.conf
share/examples/dovecot/conf.d/10-ssl.conf
share/examples/dovecot/conf.d/15-lda.conf
+share/examples/dovecot/conf.d/15-mailboxes.conf
share/examples/dovecot/conf.d/20-imap.conf
share/examples/dovecot/conf.d/20-lmtp.conf
share/examples/dovecot/conf.d/20-pop3.conf
@@ -651,4 +691,3 @@ share/examples/dovecot/dovecot-sql.conf.ext
share/examples/dovecot/dovecot.conf
share/examples/dovecot/mkcert.sh
share/examples/rc.d/dovecot
-@pkgdir lib/dovecot/auth
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 405f93dc91a..edc216ef28b 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.14 2012/01/08 09:43:47 adam Exp $
+$NetBSD: distinfo,v 1.15 2012/02/23 09:53:05 ghen Exp $
-SHA1 (dovecot-2.0.17.tar.gz) = 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe
-RMD160 (dovecot-2.0.17.tar.gz) = 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d
-Size (dovecot-2.0.17.tar.gz) = 3329794 bytes
+SHA1 (dovecot-2.1.1.tar.gz) = d7e2458fc405de1cc7070ee8b17e3a6dfb269334
+RMD160 (dovecot-2.1.1.tar.gz) = 6f6204a8703c589c18b03d7218829a234b553782
+Size (dovecot-2.1.1.tar.gz) = 3667894 bytes
SHA1 (patch-aa) = 882f0c9fcf3acdfd2feaf7919309f770324f9843
SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
SHA1 (patch-af) = 6d4b339898cba762243c1ff415e0fd09e3dec750
-SHA1 (patch-ah) = 13d7b1e84610c7a694e4b79888e8ebc3cee9ab79
SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
diff --git a/mail/dovecot2/patches/patch-ah b/mail/dovecot2/patches/patch-ah
deleted file mode 100644
index cc7008e3bab..00000000000
--- a/mail/dovecot2/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2010/12/03 21:21:11 ghen Exp $
-
---- src/lib/env-util.c.orig 2010-11-10 16:09:10.000000000 +0000
-+++ src/lib/env-util.c
-@@ -59,7 +59,11 @@ void env_clean(void)
- if (clearenv() < 0)
- i_fatal("clearenv() failed");
- #else
-+#ifdef __APPLE__
-+ char **environ = *_NSGetEnviron();
-+#else
- extern char **environ;
-+#endif
-
- /* Try to clear the environment.
-