Update to Dovecot 1.1.2. From the release announcement mail:

Development of new features in this release and the upcoming
multi-master replication are sponsored by Directi (www.directi.com).

Lucene indexing is currently deprecated in favor of the new Solr
indexing. I'm even considering removing the Lucene C++ library support,
so if you're interested in keeping it send me a mail. Note that the
current fts-lucene is somewhat broken as well as non-optimal.

Anyone interested in using zlib plugin with Maildir should read
http://wiki.dovecot.org/Plugins/Zlib.

I'm hoping to get the first v1.2 betas out in a couple of weeks and an
eventual v1.2.0 release in a couple of months.

	+ Added full text search indexing support for Apache Lucene Solr
	  server: http://wiki.dovecot.org/Plugins/FTS/Solr
	+ IMAP SORT: Added X-SCORE sort key for use with Solr searches.
	+ zlib plugin supports now bzip2 also.
	+ quota: All backends now take noenforcing parameter.
	+ Maildir: Add ,S=3D<size> to maildir filename whenever quota plugin
	  is loaded, even when not using Maildir++ quota.
	+ deliver: Allow lda section to override plugin settings.
	+ deliver: Giving a -m <namespace prefix> parameter now silently saves
	  the mail to INBOX. This is useful for e.g. -m INBOX/${extension}
	+ Added a new maildirlock utility for write-locking Dovecot Maildir.
	+ dict-sql: Support non-MySQL databases by assuming they implement the
	  "INSERT .. ON DUPLICATE KEY" using an INSERT trigger.
	- SORT: Fixed several crashes/errors with sort indexing.
	- IMAP: BODYSTRUCTURE is finally RFC 3501 compliant. Earlier versions
	  didn't include Content-Location support.
	- IMAP: Fixed bugs with listing INBOX.
	- Maildir: maildirfolder file wasn't created when dovecot-shared
	  file existed on the root directory
	- deliver didn't expand %variables in namespace location settings.
	- zlib: Copying non-compressed messages resulted in empty mails
	  (except when hardlink-copying between maildirs).
	- mbox-snarf plugin was somewhat broken
	- deliver + Maildir: If uidlist couldn't be locked while saving,
	  we might have assert-crashed
	- mbox: Fixed an assert-crash with \Recent flag handling

This release also fixes a NetBSD-specific bug, see the following thread:
http://www.dovecot.org/list/dovecot/2008-June/031680.html

4 files changed, 19 insertions, 13 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 7894c6b13a9..8385775bb6a 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.118 2008/07/10 00:54:30 jnemeth Exp $
+# $NetBSD: Makefile,v 1.119 2008/07/24 07:38:51 ghen Exp $
 
-DISTNAME=		dovecot-1.1.1
-PKGREVISION=		1
+DISTNAME=		dovecot-1.1.2
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/1.1/
 
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index eab3cdefd35..1240fbc22db 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/06/22 17:41:23 ghen Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/07/24 07:38:51 ghen Exp $
 include/dovecot/config.h
 include/dovecot/src/auth/auth-cache.h
 include/dovecot/src/auth/auth-client-connection.h
@@ -230,7 +230,7 @@ lib/dovecot/imap/lib20_expire_plugin.so
 lib/dovecot/imap/lib20_fts_plugin.so
 lib/dovecot/imap/lib20_mail_log_plugin.so
 lib/dovecot/imap/lib20_mbox_snarf_plugin.so
-lib/dovecot/imap/lib20_zlib_plugin.la
+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
@@ -249,14 +249,18 @@ lib/dovecot/lib20_expire_plugin.la
 lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mbox_snarf_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_convert_plugin.so
 lib/dovecot/pop3/lib20_expire_plugin.so
+lib/dovecot/pop3/lib20_fts_plugin.so
 lib/dovecot/pop3/lib20_mail_log_plugin.so
 lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
+lib/dovecot/pop3/lib20_zlib_plugin.so
+lib/dovecot/pop3/lib21_fts_squat_plugin.so
 libexec/dovecot/checkpassword-reply
 libexec/dovecot/convert-tool
 libexec/dovecot/deliver
@@ -269,6 +273,7 @@ libexec/dovecot/imap
 libexec/dovecot/imap-login
 libexec/dovecot/listview
 libexec/dovecot/logview
+libexec/dovecot/maildirlock
 libexec/dovecot/pop3
 libexec/dovecot/pop3-login
 libexec/dovecot/rawlog
@@ -425,6 +430,7 @@ share/doc/dovecot/wiki/WhyDoesItNotWork.txt
 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-example.conf
 share/examples/dovecot/dovecot-ldap-example.conf
 share/examples/dovecot/dovecot-openssl.cnf
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 30404e264f0..e974b2aed09 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.83 2008/07/21 10:19:42 ghen Exp $
+$NetBSD: distinfo,v 1.84 2008/07/24 07:38:51 ghen Exp $
 
-SHA1 (dovecot-1.1.1.tar.gz) = 039993d8769237dd7d1c0c3ef277734f7013c66b
-RMD160 (dovecot-1.1.1.tar.gz) = be522b080f221dbf655d9afa1f3fb1a786d4c3b2
-Size (dovecot-1.1.1.tar.gz) = 2273779 bytes
+SHA1 (dovecot-1.1.2.tar.gz) = 7363e86a87369a3464637d8d097e22e2b40df3d1
+RMD160 (dovecot-1.1.2.tar.gz) = 50c8e0a18994332a91c2fe7fc512db858e5f6e76
+Size (dovecot-1.1.2.tar.gz) = 2300564 bytes
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
 SHA1 (patch-ab) = e298616fa4b88da4f0748b025deeedd36b5a49dd
-SHA1 (patch-ac) = 1c539de145258fce4da636698fd13015ca60ca8d
+SHA1 (patch-ac) = 6fe2f73109ff611040b816d14cd587212c319f32
 SHA1 (patch-ag) = c9989f71bdfd9ae22883450b85fc55a215594df1
diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac
index 1b6b75b7674..0a74d29b71c 100644
--- a/mail/dovecot/patches/patch-ac
+++ b/mail/dovecot/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.8 2008/06/22 17:41:23 ghen Exp $
+$NetBSD: patch-ac,v 1.9 2008/07/24 07:38:51 ghen Exp $
 
---- doc/Makefile.in.orig	2008-05-05 00:02:25.000000000 +0200
+--- doc/Makefile.in.orig	2008-07-20 23:59:55.000000000 +0200
 +++ doc/Makefile.in
-@@ -209,9 +209,7 @@ top_builddir = @top_builddir@
+@@ -212,10 +212,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = wiki
  confdir = $(sysconfdir)
 -conf_DATA = \
+-	dovecot-db-example.conf \
 -	dovecot-ldap-example.conf \
 -	dovecot-sql-example.conf
 +conf_DATA =