Update to Dovecot 1.2.8, imported from pkgsrc-wip and based on work of Edgar

Fuß <ef@math.uni-bonn.de>.

The package now contains Stephan Bosch' new Dovecot Sieve plugin as a pkgsrc
option (instead of the old CMU Sieve plugin that was a separate package), as
well as the ManageSieve extension.  The dovecot-sieve package will be removed.

Upgrading from Dovecot 1.1.x may require changes to your configuration file,
see this webpage for more information: http://wiki.dovecot.org/Upgrading/1.2

Major changes since Dovecot 1.1:

	* When creating files or directories to mailboxes, Dovecot now uses
	  the mailbox directory's permissions and GID for them. Previous
	  versions simply used 0600 mode always. For backwards compatibility
	  dovecot-shared file's permissions still override these with Maildir.
	* SQL dictionary (quota) configuration file is different than in v1.1.
	  See doc/dovecot-dict-sql-example.conf for the new format.
	* deliver -m: Mailbox name is now assumed to be in UTF-8 format,
	  not modified-UTF7. Stephan Bosch's new Sieve implementation also
	  assumes UTF-8 format in fileinto parameters.

	+ Full support for shared mailboxes and IMAP ACL extension.
	  The code is mainly from Sascha Wilde and Bernhard Herzog.
	+ IMAP: Added support for extensions: CONDSTORE, QRESYNC, ESEARCH,
	  ESORT, SEARCHRES, WITHIN, ID and CONTEXT=SEARCH.
	+ SEARCH supports INTHREAD search key, but the rest of the INTHREAD
	  draft isn't implemented yet so it's not advertised in capability.
	+ THREAD REFS algorithm where threads are sorted by their latest
	  message instead of the thread root message. There is also no base
	  subject merging.
	+ IMAP: Implemented imap-response-codes draft.
	+ Thread indexes for optimizing IMAP THREAD command and INTHREAD
	  search key.
	+ Added userdb checkpassword (by Sascha Wilde)
	+ Virtual mailboxes: http://wiki.dovecot.org/Plugins/Virtual
	+ Autocreate plugin: http://wiki.dovecot.org/Plugins/Autocreate
	+ Listescape plugin: http://wiki.dovecot.org/Plugins/Listescape

13 files changed, 205 insertions, 83 deletions

diff --git a/mail/dovecot/MESSAGE b/mail/dovecot/MESSAGE
index 54f473c47c4..643e4006e35 100644
--- a/mail/dovecot/MESSAGE
+++ b/mail/dovecot/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2008/06/22 17:41:23 ghen Exp $
+$NetBSD: MESSAGE,v 1.4 2009/12/11 20:52:21 ghen Exp $
 
-If you are upgrading from Dovecot 1.0.x to 1.1.x, you can find some
-update notes on http://wiki.dovecot.org/Upgrading/1.1
+If you are upgrading from Dovecot 1.1.x to 1.2.x, you can find some
+update notes on http://wiki.dovecot.org/Upgrading/1.2
 
 ===========================================================================
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index aa111e47a08..f315d32057f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,8 +1,17 @@
-# $NetBSD: Makefile,v 1.140 2009/11/14 15:53:52 ghen Exp $
+# $NetBSD: Makefile,v 1.141 2009/12/11 20:52:21 ghen Exp $
 
-DISTNAME=		dovecot-1.1.20
+DOVECOT_VERSION=	1.2
+DOVECOT_SUBVERSION=	.8
+SIEVE_VERSION=		0.1.12
+MANAGESIEVE_VERSION=	0.11.9
+DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
 CATEGORIES=		mail
-MASTER_SITES=		http://www.dovecot.org/releases/1.1/
+MASTER_SITES=		http://www.dovecot.org/releases/${DOVECOT_VERSION}/
+DOVECOT_SIEVE_SITES=	http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/
+
+MANAGESIEVE_PATCH=			dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}-managesieve-${MANAGESIEVE_VERSION}.diff.gz
+SITES.${MANAGESIEVE_PATCH}=	${DOVECOT_SIEVE_SITES}
+PATCH_DIST_STRIP.${MANAGESIEVE_PATCH}=	-p1
 
 MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.dovecot.org/
@@ -17,9 +26,9 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 USE_TOOLS+=		rpcgen
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}
 CONFIGURE_ARGS+=	--enable-header-install
 
 .include "../../mk/bsd.prefs.mk"
@@ -54,6 +63,20 @@ post-build:
 						> ${WRKDIR}/dovecot-example.conf
 	${SED} "s|/etc/ssl|${SSLDIR}|" ${WRKSRC}/doc/mkcert.sh \
 						> ${WRKDIR}/mkcert.sh
+.if !empty(PKG_OPTIONS:Mdovecot-sieve)
+# We need dovecot built in order to be able to configure sieve.
+	cd ${WRKSRC.sieve} \
+	&& env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_ARGS.sieve}
+	cd ${WRKSRC.sieve} \
+	&& env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+.endif
+.if !empty(PKG_OPTIONS:Mdovecot-managesieve)
+# Wee need sieve built in order to configure and build managesieve. Sigh.
+	cd ${WRKSRC.managesieve} \
+	&& env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_ARGS.managesieve}
+	cd ${WRKSRC.managesieve} \
+	&& env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf ${DESTDIR}${EGDIR}
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index eaca29279a7..a620725ec8e 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2009/06/14 20:45:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.26 2009/12/11 20:52:22 ghen Exp $
 include/dovecot/config.h
 include/dovecot/src/auth/auth-cache.h
 include/dovecot/src/auth/auth-client-connection.h
@@ -13,6 +13,7 @@ include/dovecot/src/auth/auth-worker-client.h
 include/dovecot/src/auth/auth-worker-server.h
 include/dovecot/src/auth/auth.h
 include/dovecot/src/auth/common.h
+include/dovecot/src/auth/db-checkpassword.h
 include/dovecot/src/auth/db-ldap.h
 include/dovecot/src/auth/db-passwd-file.h
 include/dovecot/src/auth/db-sql.h
@@ -39,31 +40,37 @@ include/dovecot/src/imap/commands.h
 include/dovecot/src/imap/common.h
 include/dovecot/src/imap/imap-expunge.h
 include/dovecot/src/imap/imap-fetch.h
-include/dovecot/src/imap/imap-messageset.h
+include/dovecot/src/imap/imap-search-args.h
 include/dovecot/src/imap/imap-search.h
-include/dovecot/src/imap/imap-sort.h
 include/dovecot/src/imap/imap-status.h
 include/dovecot/src/imap/imap-sync.h
-include/dovecot/src/imap/imap-thread.h
 include/dovecot/src/lib-auth/auth-client.h
+include/dovecot/src/lib-auth/auth-master.h
 include/dovecot/src/lib-auth/auth-server-connection.h
 include/dovecot/src/lib-auth/auth-server-request.h
 include/dovecot/src/lib-charset/charset-utf8.h
 include/dovecot/src/lib-dict/dict-client.h
 include/dovecot/src/lib-dict/dict-private.h
+include/dovecot/src/lib-dict/dict-sql-settings.h
 include/dovecot/src/lib-dict/dict-sql.h
 include/dovecot/src/lib-dict/dict.h
 include/dovecot/src/lib-imap/imap-base-subject.h
 include/dovecot/src/lib-imap/imap-bodystructure.h
 include/dovecot/src/lib-imap/imap-date.h
 include/dovecot/src/lib-imap/imap-envelope.h
+include/dovecot/src/lib-imap/imap-id.h
 include/dovecot/src/lib-imap/imap-match.h
 include/dovecot/src/lib-imap/imap-parser.h
 include/dovecot/src/lib-imap/imap-quote.h
+include/dovecot/src/lib-imap/imap-resp-code.h
+include/dovecot/src/lib-imap/imap-seqset.h
+include/dovecot/src/lib-imap/imap-utf7.h
 include/dovecot/src/lib-imap/imap-util.h
 include/dovecot/src/lib-index/mail-cache-private.h
 include/dovecot/src/lib-index/mail-cache.h
+include/dovecot/src/lib-index/mail-index-modseq.h
 include/dovecot/src/lib-index/mail-index-private.h
+include/dovecot/src/lib-index/mail-index-strmap.h
 include/dovecot/src/lib-index/mail-index-sync-private.h
 include/dovecot/src/lib-index/mail-index-transaction-private.h
 include/dovecot/src/lib-index/mail-index-view-private.h
@@ -79,6 +86,7 @@ include/dovecot/src/lib-mail/message-address.h
 include/dovecot/src/lib-mail/message-date.h
 include/dovecot/src/lib-mail/message-decoder.h
 include/dovecot/src/lib-mail/message-header-decode.h
+include/dovecot/src/lib-mail/message-header-encode.h
 include/dovecot/src/lib-mail/message-header-parser.h
 include/dovecot/src/lib-mail/message-id.h
 include/dovecot/src/lib-mail/message-parser.h
@@ -87,6 +95,7 @@ include/dovecot/src/lib-mail/message-search.h
 include/dovecot/src/lib-mail/message-send.h
 include/dovecot/src/lib-mail/message-size.h
 include/dovecot/src/lib-mail/quoted-printable.h
+include/dovecot/src/lib-mail/rfc2231-parser.h
 include/dovecot/src/lib-mail/rfc822-parser.h
 include/dovecot/src/lib-settings/settings.h
 include/dovecot/src/lib-sql/sql-api-private.h
@@ -100,10 +109,14 @@ include/dovecot/src/lib-storage/index/dbox/dbox-index.h
 include/dovecot/src/lib-storage/index/dbox/dbox-storage.h
 include/dovecot/src/lib-storage/index/dbox/dbox-sync.h
 include/dovecot/src/lib-storage/index/index-mail.h
+include/dovecot/src/lib-storage/index/index-search-result.h
 include/dovecot/src/lib-storage/index/index-sort-private.h
 include/dovecot/src/lib-storage/index/index-sort.h
 include/dovecot/src/lib-storage/index/index-storage.h
 include/dovecot/src/lib-storage/index/index-sync-changes.h
+include/dovecot/src/lib-storage/index/index-sync-private.h
+include/dovecot/src/lib-storage/index/index-thread-private.h
+include/dovecot/src/lib-storage/index/istream-mail-stats.h
 include/dovecot/src/lib-storage/index/maildir/maildir-filename.h
 include/dovecot/src/lib-storage/index/maildir/maildir-keywords.h
 include/dovecot/src/lib-storage/index/maildir/maildir-storage.h
@@ -117,6 +130,7 @@ include/dovecot/src/lib-storage/index/mbox/mbox-storage.h
 include/dovecot/src/lib-storage/index/mbox/mbox-sync-private.h
 include/dovecot/src/lib-storage/index/raw/raw-storage.h
 include/dovecot/src/lib-storage/index/raw/raw-sync.h
+include/dovecot/src/lib-storage/index/shared/shared-storage.h
 include/dovecot/src/lib-storage/list/index-mailbox-list.h
 include/dovecot/src/lib-storage/list/mailbox-list-fs.h
 include/dovecot/src/lib-storage/list/mailbox-list-maildir.h
@@ -125,11 +139,15 @@ include/dovecot/src/lib-storage/list/subscription-file.h
 include/dovecot/src/lib-storage/mail-copy.h
 include/dovecot/src/lib-storage/mail-error.h
 include/dovecot/src/lib-storage/mail-namespace.h
+include/dovecot/src/lib-storage/mail-search-build.h
 include/dovecot/src/lib-storage/mail-search.h
 include/dovecot/src/lib-storage/mail-storage-private.h
 include/dovecot/src/lib-storage/mail-storage.h
+include/dovecot/src/lib-storage/mail-thread.h
+include/dovecot/src/lib-storage/mail-user.h
 include/dovecot/src/lib-storage/mailbox-list-private.h
 include/dovecot/src/lib-storage/mailbox-list.h
+include/dovecot/src/lib-storage/mailbox-search-result-private.h
 include/dovecot/src/lib-storage/mailbox-tree.h
 include/dovecot/src/lib-storage/mailbox-uidvalidity.h
 include/dovecot/src/lib/aqueue.h
@@ -139,10 +157,12 @@ include/dovecot/src/lib/backtrace-string.h
 include/dovecot/src/lib/base64.h
 include/dovecot/src/lib/bsearch-insert-pos.h
 include/dovecot/src/lib/buffer.h
+include/dovecot/src/lib/child-wait.h
 include/dovecot/src/lib/close-keep-errno.h
 include/dovecot/src/lib/compat.h
 include/dovecot/src/lib/crc32.h
 include/dovecot/src/lib/data-stack.h
+include/dovecot/src/lib/eacces-error.h
 include/dovecot/src/lib/env-util.h
 include/dovecot/src/lib/failures.h
 include/dovecot/src/lib/fd-close-on-exec.h
@@ -155,6 +175,7 @@ include/dovecot/src/lib/file-dotlock.h
 include/dovecot/src/lib/file-lock.h
 include/dovecot/src/lib/file-set-size.h
 include/dovecot/src/lib/hash.h
+include/dovecot/src/lib/hash2.h
 include/dovecot/src/lib/hex-binary.h
 include/dovecot/src/lib/hex-dec.h
 include/dovecot/src/lib/hmac-md5.h
@@ -208,6 +229,7 @@ include/dovecot/src/lib/str-sanitize.h
 include/dovecot/src/lib/str.h
 include/dovecot/src/lib/strescape.h
 include/dovecot/src/lib/strfuncs.h
+include/dovecot/src/lib/time-util.h
 include/dovecot/src/lib/unichar.h
 include/dovecot/src/lib/unix-socket-create.h
 include/dovecot/src/lib/unlink-directory.h
@@ -222,46 +244,60 @@ include/dovecot/src/pop3/commands.h
 include/dovecot/src/pop3/common.h
 lib/dovecot/dovecot-config
 lib/dovecot/imap/lib01_acl_plugin.so
+lib/dovecot/imap/lib02_imap_acl_plugin.la
 lib/dovecot/imap/lib02_lazy_expunge_plugin.so
 lib/dovecot/imap/lib10_quota_plugin.so
 lib/dovecot/imap/lib11_imap_quota_plugin.la
 lib/dovecot/imap/lib11_trash_plugin.so
+lib/dovecot/imap/lib20_autocreate_plugin.so
 lib/dovecot/imap/lib20_convert_plugin.so
 lib/dovecot/imap/lib20_expire_plugin.so
 lib/dovecot/imap/lib20_fts_plugin.so
+lib/dovecot/imap/lib20_listescape_plugin.so
 lib/dovecot/imap/lib20_mail_log_plugin.so
 lib/dovecot/imap/lib20_mbox_snarf_plugin.so
+lib/dovecot/imap/lib20_virtual_plugin.so
 lib/dovecot/imap/lib20_zlib_plugin.so
 lib/dovecot/imap/lib21_fts_squat_plugin.so
 lib/dovecot/lda/lib01_acl_plugin.so
 lib/dovecot/lda/lib10_quota_plugin.so
 lib/dovecot/lda/lib11_trash_plugin.so
+lib/dovecot/lda/lib20_autocreate_plugin.so
 lib/dovecot/lda/lib20_convert_plugin.so
 lib/dovecot/lda/lib20_expire_plugin.so
 lib/dovecot/lda/lib20_fts_plugin.so
+lib/dovecot/lda/lib20_listescape_plugin.so
 lib/dovecot/lda/lib20_mail_log_plugin.so
+lib/dovecot/lda/lib20_virtual_plugin.so
 lib/dovecot/lda/lib21_fts_squat_plugin.so
 lib/dovecot/lib01_acl_plugin.la
 lib/dovecot/lib02_lazy_expunge_plugin.la
 lib/dovecot/lib10_quota_plugin.la
 lib/dovecot/lib11_trash_plugin.la
+lib/dovecot/lib20_autocreate_plugin.la
 lib/dovecot/lib20_convert_plugin.la
 lib/dovecot/lib20_expire_plugin.la
 lib/dovecot/lib20_fts_plugin.la
+lib/dovecot/lib20_listescape_plugin.la
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mbox_snarf_plugin.la
+lib/dovecot/lib20_virtual_plugin.la
 lib/dovecot/lib20_zlib_plugin.la
 lib/dovecot/lib21_fts_squat_plugin.la
 lib/dovecot/liblib.a
 lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
 lib/dovecot/pop3/lib10_quota_plugin.so
+lib/dovecot/pop3/lib20_autocreate_plugin.so
 lib/dovecot/pop3/lib20_convert_plugin.so
 lib/dovecot/pop3/lib20_expire_plugin.so
 lib/dovecot/pop3/lib20_fts_plugin.so
+lib/dovecot/pop3/lib20_listescape_plugin.so
 lib/dovecot/pop3/lib20_mail_log_plugin.so
 lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
+lib/dovecot/pop3/lib20_virtual_plugin.so
 lib/dovecot/pop3/lib20_zlib_plugin.so
 lib/dovecot/pop3/lib21_fts_squat_plugin.so
+libexec/dovecot/authtest
 libexec/dovecot/checkpassword-reply
 libexec/dovecot/convert-tool
 libexec/dovecot/deliver
@@ -272,6 +308,7 @@ libexec/dovecot/gdbhelper
 libexec/dovecot/idxview
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/imap-utf7
 libexec/dovecot/listview
 libexec/dovecot/logview
 libexec/dovecot/maildirlock
@@ -279,14 +316,19 @@ libexec/dovecot/pop3
 libexec/dovecot/pop3-login
 libexec/dovecot/rawlog
 libexec/dovecot/ssl-build-param
+libexec/dovecot/threadview
 sbin/dovecot
 sbin/dovecotpw
 share/doc/dovecot/auth-protocol.txt
 share/doc/dovecot/documentation.txt
 share/doc/dovecot/securecoding.txt
+share/doc/dovecot/thread-refs.txt
 share/doc/dovecot/wiki/ACL.txt
 share/doc/dovecot/wiki/AixPluginsSupport.txt
 share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.PasswordLookups.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.Userdb.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.txt
 share/doc/dovecot/wiki/AuthDatabase.Passwd.txt
 share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt
@@ -323,6 +365,7 @@ share/doc/dovecot/wiki/Design.Indexes.txt
 share/doc/dovecot/wiki/Design.MailProcess.txt
 share/doc/dovecot/wiki/Design.Processes.txt
 share/doc/dovecot/wiki/Design.txt
+share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
 share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
@@ -340,6 +383,8 @@ share/doc/dovecot/wiki/LDA.Indexing.txt
 share/doc/dovecot/wiki/LDA.Postfix.txt
 share/doc/dovecot/wiki/LDA.Qmail.txt
 share/doc/dovecot/wiki/LDA.Sendmail.txt
+share/doc/dovecot/wiki/LDA.Sieve.CMU.txt
+share/doc/dovecot/wiki/LDA.Sieve.Dovecot.txt
 share/doc/dovecot/wiki/LDA.Sieve.txt
 share/doc/dovecot/wiki/LDA.txt
 share/doc/dovecot/wiki/Logging.txt
@@ -359,6 +404,11 @@ share/doc/dovecot/wiki/MailboxFormat.mailstore.txt
 share/doc/dovecot/wiki/MailboxFormat.mbox.txt
 share/doc/dovecot/wiki/MailboxFormat.mbx.txt
 share/doc/dovecot/wiki/MailboxFormat.txt
+share/doc/dovecot/wiki/ManageSieve.Clients.txt
+share/doc/dovecot/wiki/ManageSieve.Configuration.txt
+share/doc/dovecot/wiki/ManageSieve.Install.1.0.txt
+share/doc/dovecot/wiki/ManageSieve.Install.txt
+share/doc/dovecot/wiki/ManageSieve.Troubleshooting.txt
 share/doc/dovecot/wiki/ManageSieve.txt
 share/doc/dovecot/wiki/MboxLocking.txt
 share/doc/dovecot/wiki/MboxProblems.txt
@@ -418,6 +468,10 @@ share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
 share/doc/dovecot/wiki/SSL.txt
 share/doc/dovecot/wiki/Sasl.txt
 share/doc/dovecot/wiki/SecurityTuning.txt
+share/doc/dovecot/wiki/SharedMailboxes.Permissions.txt
+share/doc/dovecot/wiki/SharedMailboxes.Public.txt
+share/doc/dovecot/wiki/SharedMailboxes.Shared.txt
+share/doc/dovecot/wiki/SharedMailboxes.Symlinks.txt
 share/doc/dovecot/wiki/SharedMailboxes.txt
 share/doc/dovecot/wiki/SystemUsers.txt
 share/doc/dovecot/wiki/TestInstallation.txt
@@ -440,7 +494,9 @@ share/doc/dovecot/wiki/maildrop.txt
 share/doc/dovecot/wiki/mutt.txt
 share/doc/dovecot/wiki/uw2dovecot.sh.txt
 share/examples/dovecot/dovecot-db-example.conf
+share/examples/dovecot/dovecot-dict-sql-example.conf
 share/examples/dovecot/dovecot-example.conf
+share/examples/dovecot/dovecot-initd.sh
 share/examples/dovecot/dovecot-ldap-example.conf
 share/examples/dovecot/dovecot-openssl.cnf
 share/examples/dovecot/dovecot-sql-example.conf
diff --git a/mail/dovecot/PLIST.managesieve b/mail/dovecot/PLIST.managesieve
new file mode 100644
index 00000000000..6f3a5b4ed2f
--- /dev/null
+++ b/mail/dovecot/PLIST.managesieve
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.managesieve,v 1.1 2009/12/11 20:52:22 ghen Exp $
+libexec/dovecot/managesieve
+libexec/dovecot/managesieve-login
diff --git a/mail/dovecot/PLIST.sieve b/mail/dovecot/PLIST.sieve
new file mode 100644
index 00000000000..806b34a376f
--- /dev/null
+++ b/mail/dovecot/PLIST.sieve
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.sieve,v 1.1 2009/12/11 20:52:22 ghen Exp $
+bin/sieve-test
+bin/sievec
+bin/sieved
+lib/dovecot/lda/lib90_sieve_plugin.la
+man/man1/sieve-test.1
+man/man1/sievec.1
+man/man1/sieved.1
diff --git a/mail/dovecot/buildlink3.mk b/mail/dovecot/buildlink3.mk
index 1184de8db01..055ae47d482 100644
--- a/mail/dovecot/buildlink3.mk
+++ b/mail/dovecot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/12/11 20:52:22 ghen Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	dovecot
 .if !defined(DOVECOT_BUILDLINK3_MK)
 DOVECOT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=1.1beta16
+BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=1.2.0
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot
 
 pkgbase := dovecot
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 2216ad554f9..15874224cc3 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,10 +1,19 @@
-$NetBSD: distinfo,v 1.104 2009/11/14 15:53:52 ghen Exp $
+$NetBSD: distinfo,v 1.105 2009/12/11 20:52:22 ghen Exp $
 
-SHA1 (dovecot-1.1.20.tar.gz) = cd2f01dddadf67045740a8308d93b00a914c6014
-RMD160 (dovecot-1.1.20.tar.gz) = 95c41fdf8b2557c6056cb82bace1e67d5bd7e48d
-Size (dovecot-1.1.20.tar.gz) = 2407142 bytes
-SHA1 (patch-aa) = 00ed62ab4d7db505cc323b0c94352ddcd91ba6a1
-SHA1 (patch-ab) = 2531c84a2ae34e74bb55fa33ccb0aabbbc263de0
-SHA1 (patch-ac) = 4baa1d5160618f1e23eb8b401daca0afa7dfe9ea
-SHA1 (patch-ag) = c9989f71bdfd9ae22883450b85fc55a215594df1
-SHA1 (patch-ah) = b6b278e04538fc3408d7c176d22c1ec7b83c9875
+SHA1 (dovecot-1.2-managesieve-0.11.9.tar.gz) = 63f3c6cf6615586c5b4bbd2feffc9f0c774edcb7
+RMD160 (dovecot-1.2-managesieve-0.11.9.tar.gz) = 1b85540bb0b32e30a6f8e780b6922c4e8ce3bb23
+Size (dovecot-1.2-managesieve-0.11.9.tar.gz) = 396242 bytes
+SHA1 (dovecot-1.2-sieve-0.1.12.tar.gz) = cd142f051b45b58cc162222f9ccdc12e1f69c343
+RMD160 (dovecot-1.2-sieve-0.1.12.tar.gz) = 92ed585f098ebaa37bececa56bdd912d47e7f162
+Size (dovecot-1.2-sieve-0.1.12.tar.gz) = 964938 bytes
+SHA1 (dovecot-1.2.8-managesieve-0.11.9.diff.gz) = 0446572f3cc747f6b1f3607d8063436dc2cea929
+RMD160 (dovecot-1.2.8-managesieve-0.11.9.diff.gz) = 207b13f835d7e5f70e52adad8a446e3d3b0dcb10
+Size (dovecot-1.2.8-managesieve-0.11.9.diff.gz) = 6298 bytes
+SHA1 (dovecot-1.2.8.tar.gz) = ded015aa8094070a7315840a9a329e97de93a85d
+RMD160 (dovecot-1.2.8.tar.gz) = b685d002224435f372364b7e69d550c136630cea
+Size (dovecot-1.2.8.tar.gz) = 2702887 bytes
+SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020
+SHA1 (patch-ab) = 37a99a6b0abbed8dd14d773d6a7c22dd8011433a
+SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7
+SHA1 (patch-ag) = 7e733d41c0607df64c2c3195b78683689f2143d6
+SHA1 (patch-ah) = a7d02fa3ab1d1a760e05510ebd3cfb07a6652863
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index 331bd3cfcf5..b7d409e59f7 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.22 2009/07/02 11:38:34 ghen Exp $
+# $NetBSD: options.mk,v 1.23 2009/12/11 20:52:22 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS=	gssapi inet6 kqueue ldap mysql pam pgsql sqlite
+PKG_SUPPORTED_OPTIONS=	dovecot-sieve dovecot-managesieve gssapi
+PKG_SUPPORTED_OPTIONS+=	kqueue ldap mysql pam pgsql sqlite
 PKG_OPTIONS_OPTIONAL_GROUPS= ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 PKG_SUGGESTED_OPTIONS=	ssl
@@ -19,6 +20,7 @@ PKG_SUGGESTED_OPTIONS+=	kqueue
 CONFIGURE_ARGS+=	--with-ssl=openssl
 CONFIGURE_ENV+=		SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
 CONFIGURE_ENV+=		SSL_LIBS="-lssl -lcrypto"
+BUILDLINK_API_DEPENDS.openssl=openssl>=0.9.8a
 .  include "../../security/openssl/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mgnutls)
 CONFIGURE_ARGS+=	--with-ssl=gnutls
@@ -45,15 +47,6 @@ CPPFLAGS+=		-I${BUILDLINK_DIR}/include/pgsql
 .endif
 
 ###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-###
 ### LDAP directory support.
 ###
 .if !empty(PKG_OPTIONS:Mldap)
@@ -98,3 +91,43 @@ CONFIGURE_ARGS+=	--with-gssapi
 .else
 CONFIGURE_ARGS+=	--without-gssapi
 .endif
+
+###
+### Sieve and the ManageSieve patch
+###
+.if !empty(PKG_OPTIONS:Mdovecot-sieve)
+# ManageSieve needs Sieve to build.
+# We can't simply use CONFIGURE_DIRS+= and BUILD_DIRS+=
+#  because dovecot must be built before sieve can be configured
+#  and sieve must be built before managesieve can be configured/built.
+# So use post-build in Makefile. Sigh.
+#
+# Default so we can use += below
+DISTFILES=		${DEFAULT_DISTFILES}
+PLIST_SRC=		${PLIST_SRC_DFLT}
+INSTALL_DIRS=		${WRKSRC}
+# sieve (must be built after dovecot, before managesieve)
+DISTFILES+=		dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz
+SITES.dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz=\
+			${DOVECOT_SIEVE_SITES}
+WRKSRC.sieve=		${WRKDIR}/dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}
+CONFIGURE_ARGS.sieve=	--with-dovecot=${WRKSRC}
+INSTALL_DIRS+=		${WRKSRC.sieve}
+# Augment PLIST for sieve
+PLIST_SRC+=		${PKGDIR}/PLIST.sieve
+
+.if !empty(PKG_OPTIONS:Mdovecot-managesieve)
+# The managesieve patch to dovecot
+PATCHFILES+=		${MANAGESIEVE_PATCH}
+# managesieve itself (built after both dovecot and sieve)
+DISTFILES+=		dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}.tar.gz
+SITES.dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}.tar.gz=\
+			${DOVECOT_SIEVE_SITES}
+WRKSRC.managesieve=	${WRKDIR}/dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}
+CONFIGURE_ARGS.managesieve=\
+			--with-dovecot=${WRKSRC} --with-dovecot-sieve=${WRKSRC.sieve}
+INSTALL_DIRS+=		${WRKSRC.managesieve}
+# Augment PLIST for managesieve
+PLIST_SRC+=		${PKGDIR}/PLIST.managesieve
+.endif # dovecot-managesieve
+.endif # dovecot-sieve
diff --git a/mail/dovecot/patches/patch-aa b/mail/dovecot/patches/patch-aa
index 501c691bfab..65a4e9644c6 100644
--- a/mail/dovecot/patches/patch-aa
+++ b/mail/dovecot/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2009/05/20 08:07:38 ghen Exp $
+$NetBSD: patch-aa,v 1.10 2009/12/11 20:52:22 ghen Exp $
 
---- Makefile.in.orig	2009-05-18 03:39:56.000000000 +0200
+--- Makefile.in.orig	2009-06-01 06:30:25.000000000 +0200
 +++ Makefile.in
 @@ -244,7 +244,7 @@ SUBDIRS = \
  	$(DOCS)
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 8ad853d5f61..1d289ce95a1 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
+$NetBSD: patch-ab,v 1.28 2009/12/11 20:52:22 ghen Exp $
 
---- dovecot-example.conf.orig	2009-05-13 18:41:46.000000000 +0200
+--- dovecot-example.conf.orig	2009-06-01 05:21:42.000000000 +0200
 +++ dovecot-example.conf
-@@ -12,16 +12,13 @@
+@@ -12,9 +12,6 @@
  # Default values are shown for each setting, it's not required to uncomment
  # those. These are exceptions to this though: No sections (e.g. namespace {})
  # or plugin settings are added by default, they're listed only as examples.
@@ -12,33 +12,21 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
- 
- # Protocols we want to be serving: imap imaps pop3 pop3s
+@@ -23,3 +20,3 @@
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +protocols = imap pop3
  
- # A space separated list of IP or host addresses where to listen in for
- # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
 @@ -86,7 +83,7 @@
  #ssl_listen =
  
- # Disable SSL/TLS support. <doc/wiki/SSL.txt>
--#ssl_disable = no
-+ssl_disable = yes
+ # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
+-#ssl = yes
++#ssl = no
  
  # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
  # dropping root privileges, so keep the key file unreadable by anyone but
-@@ -150,7 +147,7 @@
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
--#login_process_size = 64
-+#login_process_size = 128
- 
- # Should each login be processed in it's own process (yes), or should one
- # login process be allowed to process multiple connections (no)? Yes is more
-@@ -504,19 +501,19 @@
+@@ -537,20 +534,20 @@
  
  protocol imap {
    # Login executable location.
@@ -48,9 +36,10 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
    # IMAP executable location. Changing this allows you to execute other
    # binaries before the imap process is executed.
    #
-   # This would write rawlogs into ~/dovecot.rawlog/ directory:
+   # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
 -  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
 +  #   mail_executable = @PREFIX@/libexec/dovecot/rawlog @PREFIX@/libexec/dovecot/imap
+   # <doc/wiki/Debugging/Rawlog.txt>
    #
    # This would attach gdb into the imap process and write backtraces into
    # /tmp/gdbhelper.* files:
@@ -62,16 +51,16 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -530,7 +527,7 @@ protocol imap {
+@@ -564,7 +561,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
 -  #mail_plugin_dir = /usr/lib/dovecot/imap
-+  #mail_plugin_dir = @PREFIX@/lib/dovecot/imap
++  #mail_plugin_dir = @PREFIX@/dovecot/imap
  
-   # Send IMAP capabilities in greeting message. This makes it unnecessary for
-   # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -573,11 +570,11 @@ protocol imap {
+   # IMAP logout format string:
+   #  %i - total number of bytes read from client
+@@ -614,11 +611,11 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -85,7 +74,7 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -637,7 +634,7 @@ protocol pop3 {
+@@ -678,7 +675,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -94,7 +83,7 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -665,7 +662,7 @@ protocol lda {
+@@ -706,7 +703,7 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -103,7 +92,7 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
    # If user is over quota, return with temporary failure instead of
    # bouncing the mail.
-@@ -679,7 +676,7 @@ protocol lda {
+@@ -720,7 +717,7 @@ protocol lda {
    #deliver_log_format = msgid=%m: %$
  
    # Binary to use for sending mails.
@@ -112,7 +101,7 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
    # Subject: header to use for rejection mails. You can use the same variables
    # as for rejection_reason below.
-@@ -698,7 +695,7 @@ protocol lda {
+@@ -739,7 +736,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -121,16 +110,16 @@ $NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -831,7 +828,7 @@ auth default {
+@@ -869,7 +866,7 @@ auth default {
    # database (passwd usually), you can use static userdb.
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
 -  passdb pam {
 +  #passdb pam {
-     # [session=yes] [setcred=yes] [failure_show_msg=yes]
+     # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
      # [cache_key=<key>] [<service name>]
      #
-@@ -860,15 +857,15 @@ auth default {
+@@ -902,15 +899,15 @@ auth default {
      #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot
diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac
index ef441975e02..728c896fdff 100644
--- a/mail/dovecot/patches/patch-ac
+++ b/mail/dovecot/patches/patch-ac
@@ -1,16 +1,17 @@
-$NetBSD: patch-ac,v 1.11 2009/05/20 08:07:38 ghen Exp $
+$NetBSD: patch-ac,v 1.12 2009/12/11 20:52:22 ghen Exp $
 
---- doc/Makefile.in.orig	2009-05-18 03:39:52.000000000 +0200
+--- doc/Makefile.in.orig	2009-11-10 03:35:49.000000000 +0100
 +++ doc/Makefile.in
-@@ -219,10 +219,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = wiki
+@@ -272,11 +272,7 @@ docfiles = \
+ 
+ @BUILD_DOCS_TRUE@doc_DATA = $(docfiles)
  confdir = $(sysconfdir)
 -conf_DATA = \
 -	dovecot-db-example.conf \
+-	dovecot-dict-sql-example.conf \
 -	dovecot-ldap-example.conf \
 -	dovecot-sql-example.conf
 +conf_DATA =
  
- doc_DATA = \
- 	auth-protocol.txt \
+ EXTRA_DIST = \
+ 	dovecot-initd.sh \
diff --git a/mail/dovecot/patches/patch-ag b/mail/dovecot/patches/patch-ag
index 02fc7febc11..9d50505d55d 100644
--- a/mail/dovecot/patches/patch-ag
+++ b/mail/dovecot/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2008/06/22 17:41:23 ghen Exp $
+$NetBSD: patch-ag,v 1.5 2009/12/11 20:52:22 ghen Exp $
 
---- src/deliver/deliver.c.orig	2008-01-20 13:54:08.000000000 +0100
+--- src/deliver/deliver.c.orig	2008-12-13 17:01:04.000000000 +0100
 +++ src/deliver/deliver.c
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
  #include <syslog.h>
  
  #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
diff --git a/mail/dovecot/patches/patch-ah b/mail/dovecot/patches/patch-ah
index eb8d455a701..dfc71a90d9b 100644
--- a/mail/dovecot/patches/patch-ah
+++ b/mail/dovecot/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.5 2009/05/11 08:54:49 tnn Exp $
+$NetBSD: patch-ah,v 1.6 2009/12/11 20:52:22 ghen Exp $
 
---- src/master/master-settings.c.orig	2009-03-16 01:07:00.000000000 +0100
+--- src/master/master-settings.c.orig	2009-12-11 21:40:00.000000000 +0100
 +++ src/master/master-settings.c
 @@ -209,7 +209,7 @@ struct settings default_settings = {
  	MEMBER(login_chroot) TRUE,
- 	MEMBER(login_greeting_capability) FALSE,
+ 	MEMBER(login_trusted_networks) "",
  
 -	MEMBER(login_process_size) 64,
 +	MEMBER(login_process_size) 128,