Update to Dovecot 2.0.8.

* Services' default vsz_limits weren't being enforced correctly in
  earlier v2.0 releases. Now that they are enforced, you might notice
  that the default limits are too low and you need to increase them.
  This problem will show up in logs as "out of memory" errors.
  See default_vsz_limit and service { vsz_limit } settings.
* LMTP: In earlier versions if mail was delivered to user+detail@domain
  address, LMTP server always attempted to deliver the mail to mailbox
  named "detail". This was rather unintentional and shouldn't have been
  the default. lmtp_save_to_detail_mailbox=yes setting now preserves
  this behavior (default is no).

+ Added systemd support (configure --with-systemdsystemunitdir).
  Based on patch by Christophe Fergeau.
+ Replaced broken mbox-snarf plugin with a new more generic snarf
  plugin.
- dbox: Fixes to handling external mail attachments
- verbose_proctitle=yes didn't work for all processes in v2.0.7
- imap, pop3: When service { client_count } was larger than 1, the
  log messages didn't use the correct prefix. Last logged in user's
  prefix was always used, regardless of what user's session actually
  logged it. Now the proper log prefix is always used.
- MySQL: Only the first specified host was ever used

8 files changed, 22 insertions, 90 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index c32c9f6ca08..128893944c2 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2010/11/09 15:51:48 ghen Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/03 21:21:10 ghen Exp $
 
-DISTNAME=		dovecot-2.0.7
+DISTNAME=		dovecot-2.0.8
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/2.0/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index ca359c55cfb..596c4a33315 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/11/09 15:35:47 ghen Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/12/03 21:21:10 ghen Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -326,6 +326,7 @@ lib/dovecot/dovecot-config
 lib/dovecot/lib01_acl_plugin.la
 lib/dovecot/lib02_imap_acl_plugin.la
 lib/dovecot/lib02_lazy_expunge_plugin.la
+lib/dovecot/lib05_snarf_plugin.la
 lib/dovecot/lib10_quota_plugin.la
 lib/dovecot/lib11_imap_quota_plugin.la
 lib/dovecot/lib11_trash_plugin.la
@@ -335,7 +336,6 @@ 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
@@ -429,7 +429,6 @@ share/doc/dovecot/wiki/BasicConfiguration.txt
 share/doc/dovecot/wiki/Chrooting.txt
 share/doc/dovecot/wiki/Clients.NegativeUIDs.txt
 share/doc/dovecot/wiki/Clients.txt
-share/doc/dovecot/wiki/CommandLine.txt
 share/doc/dovecot/wiki/CompilingSource.txt
 share/doc/dovecot/wiki/Debugging.Authentication.txt
 share/doc/dovecot/wiki/Debugging.ProcessTracing.txt
@@ -438,6 +437,7 @@ share/doc/dovecot/wiki/Debugging.Thunderbird.txt
 share/doc/dovecot/wiki/Design.Arrays.txt
 share/doc/dovecot/wiki/Design.AuthProcess.txt
 share/doc/dovecot/wiki/Design.Buffers.txt
+share/doc/dovecot/wiki/Design.Dsync.txt
 share/doc/dovecot/wiki/Design.Indexes.Cache.txt
 share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
 share/doc/dovecot/wiki/Design.Indexes.MainIndex.txt
@@ -463,6 +463,7 @@ share/doc/dovecot/wiki/Design.Storage.MailboxList.txt
 share/doc/dovecot/wiki/Design.Storage.Plugins.txt
 share/doc/dovecot/wiki/Design.Strings.txt
 share/doc/dovecot/wiki/Design.txt
+share/doc/dovecot/wiki/Director.txt
 share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
@@ -474,25 +475,24 @@ share/doc/dovecot/wiki/HowTo.Rootless.txt
 share/doc/dovecot/wiki/HowTo.SimpleVirtualInstall.txt
 share/doc/dovecot/wiki/HowTo.txt
 share/doc/dovecot/wiki/IndexFiles.txt
-share/doc/dovecot/wiki/InetdInstall.txt
 share/doc/dovecot/wiki/Iptables.txt
 share/doc/dovecot/wiki/LDA.Exim.txt
 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/LMTP.txt
 share/doc/dovecot/wiki/Logging.txt
 share/doc/dovecot/wiki/LoginProcess.txt
 share/doc/dovecot/wiki/MDA.txt
 share/doc/dovecot/wiki/MTA.txt
 share/doc/dovecot/wiki/MailLocation.LocalDisk.txt
 share/doc/dovecot/wiki/MailLocation.Maildir.txt
-share/doc/dovecot/wiki/MailLocation.Mbox.txt
 share/doc/dovecot/wiki/MailLocation.SharedDisk.txt
+share/doc/dovecot/wiki/MailLocation.mbox.txt
 share/doc/dovecot/wiki/MailLocation.txt
 share/doc/dovecot/wiki/MailboxFormat.Cydir.txt
 share/doc/dovecot/wiki/MailboxFormat.MH.txt
@@ -537,7 +537,6 @@ share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
 share/doc/dovecot/wiki/PasswordDatabase.txt
 share/doc/dovecot/wiki/PerformanceTuning.txt
 share/doc/dovecot/wiki/Plugins.Autocreate.txt
-share/doc/dovecot/wiki/Plugins.Convert.txt
 share/doc/dovecot/wiki/Plugins.Expire.txt
 share/doc/dovecot/wiki/Plugins.FTS.Lucene.txt
 share/doc/dovecot/wiki/Plugins.FTS.Solr.txt
@@ -554,7 +553,7 @@ share/doc/dovecot/wiki/Plugins.txt
 share/doc/dovecot/wiki/PostLoginScripting.txt
 share/doc/dovecot/wiki/PreAuth.txt
 share/doc/dovecot/wiki/QuickConfiguration.txt
-share/doc/dovecot/wiki/Quota.1.1.txt
+share/doc/dovecot/wiki/Quota.Configuration.txt
 share/doc/dovecot/wiki/Quota.Dict.txt
 share/doc/dovecot/wiki/Quota.Dirsize.txt
 share/doc/dovecot/wiki/Quota.FS.txt
@@ -579,6 +578,7 @@ share/doc/dovecot/wiki/TimeMovedBackwards.txt
 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.txt
 share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
 share/doc/dovecot/wiki/UserDatabase.NSS.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 7fe47051fcf..f0fc5105205 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,18 +1,12 @@
-$NetBSD: distinfo,v 1.4 2010/11/09 15:51:48 ghen Exp $
+$NetBSD: distinfo,v 1.5 2010/12/03 21:21:10 ghen Exp $
 
-SHA1 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = ef06d157302576a9276c8f1181a3c5de018e2f36
-RMD160 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = a3cd58c13c3de33e6941c94633c580af4406ad85
-Size (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = 1195090 bytes
-SHA1 (dovecot-2.0.7.tar.gz) = 3aab6cee878bd02e364aebcb70741bf1e4affc0d
-RMD160 (dovecot-2.0.7.tar.gz) = b284c99630935e87b124f48f132970a14737c985
-Size (dovecot-2.0.7.tar.gz) = 3174912 bytes
+SHA1 (dovecot-2.0.8.tar.gz) = daf25ba788369055f349f37c172be33beced916c
+RMD160 (dovecot-2.0.8.tar.gz) = 3a0a42a771b0bff8a04731e6ae4847faf340a1ea
+Size (dovecot-2.0.8.tar.gz) = 3177602 bytes
 SHA1 (patch-aa) = b7e2923ead1ad1eacd3b8b1a37111325794135d2
-SHA1 (patch-ab) = 43361741cf68d1ad5d6e1073cfb9746acf497868
+SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
-SHA1 (patch-ad) = 5a11ece1ea86ec775d73bd2d305fb927f8669ba5
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 SHA1 (patch-af) = 691cb36fcd5d71e1dea1812da5ed3e93a9ca029a
-SHA1 (patch-ag) = 1f78984359bb6fcf939c540b54d1dc56317931b4
-SHA1 (patch-ah) = 2c2ed68bbc475398a0247e08673be5a5db08d3c4
-SHA1 (patch-ai) = 7ceb18222b47b496099f6634ca4cb4c3edcbf943
+SHA1 (patch-ah) = 13d7b1e84610c7a694e4b79888e8ebc3cee9ab79
 SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
diff --git a/mail/dovecot2/patches/patch-ab b/mail/dovecot2/patches/patch-ab
index 260e96a3556..01b2dc171c9 100644
--- a/mail/dovecot2/patches/patch-ab
+++ b/mail/dovecot2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+$NetBSD: patch-ab,v 1.2 2010/12/03 21:21:10 ghen Exp $
 
---- doc/example-config/dovecot.conf.orig	2010-07-23 19:37:44.000000000 +0000
+--- doc/example-config/dovecot.conf.orig	2010-11-10 16:09:10.000000000 +0000
 +++ doc/example-config/dovecot.conf
-@@ -12,9 +12,6 @@
+@@ -12,12 +12,9 @@
  # 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.
@@ -10,11 +10,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
 -# options. The paths listed here are for configure --prefix=/usr
 -# --sysconfdir=/etc --localstatedir=/var
  
- # Most of the actual configuration gets included below. The filenames are
- # first sorted by their ASCII value and parsed in that order. The 00-prefixes
-@@ -22,7 +19,7 @@
- !include conf.d/*.conf
- 
  # Protocols we want to be serving.
 -#protocols = imap pop3 lmtp
 +protocols = imap pop3 lmtp
diff --git a/mail/dovecot2/patches/patch-ad b/mail/dovecot2/patches/patch-ad
deleted file mode 100644
index 1b001210a17..00000000000
--- a/mail/dovecot2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
-
---- doc/example-config/conf.d/15-lda.conf.orig	2010-11-04 13:33:36.000000000 +0000
-+++ doc/example-config/conf.d/15-lda.conf
-@@ -15,7 +15,7 @@
- #quota_full_tempfail = no
- 
- # Binary to use for sending mails.
--#sendmail_path = /usr/lib/sendmail
-+#sendmail_path = /usr/sbin/sendmail
- 
- # Subject: header to use for rejection mails. You can use the same variables
- # as for rejection_reason below.
diff --git a/mail/dovecot2/patches/patch-ag b/mail/dovecot2/patches/patch-ag
deleted file mode 100644
index 8fbab0c1416..00000000000
--- a/mail/dovecot2/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
-
---- src/lib-settings/settings-parser.c.orig	2010-09-23 18:41:53.000000000 +0000
-+++ src/lib-settings/settings-parser.c
-@@ -942,7 +942,11 @@ static int environ_cmp(char *const *s1, 
- 
- int settings_parse_environ(struct setting_parser_context *ctx)
- {
-+#ifdef __APPLE__
-+	char **environ = *_NSGetEnviron();
-+#else
- 	extern char **environ;
-+#endif
- 	ARRAY_TYPE(string) sorted_envs_arr;
- 	const char *key, *value;
- 	char *const *sorted_envs;
diff --git a/mail/dovecot2/patches/patch-ah b/mail/dovecot2/patches/patch-ah
index 92528351c92..cc7008e3bab 100644
--- a/mail/dovecot2/patches/patch-ah
+++ b/mail/dovecot2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+$NetBSD: patch-ah,v 1.2 2010/12/03 21:21:11 ghen Exp $
 
---- src/lib/env-util.c.orig	2010-11-05 08:18:43.000000000 +0000
+--- src/lib/env-util.c.orig	2010-11-10 16:09:10.000000000 +0000
 +++ src/lib/env-util.c
-@@ -55,7 +55,11 @@ void env_clean(void)
+@@ -59,7 +59,11 @@ void env_clean(void)
  	if (clearenv() < 0)
  		i_fatal("clearenv() failed");
  #else
@@ -14,15 +14,3 @@ $NetBSD: patch-ah,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
  
  	/* Try to clear the environment.
  
-@@ -73,7 +77,11 @@ void env_clean(void)
- struct env_backup *env_backup_save(void)
- {
- 	struct env_backup *env;
-+#ifdef __APPLE__
-+	char **environ = *_NSGetEnviron();
-+#else
- 	extern char **environ;
-+#endif
- 	unsigned int i, count;
- 	pool_t pool;
- 
diff --git a/mail/dovecot2/patches/patch-ai b/mail/dovecot2/patches/patch-ai
deleted file mode 100644
index c70bc5de762..00000000000
--- a/mail/dovecot2/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
-
---- src/lib/process-title.c.orig	2010-11-05 08:26:04.000000000 +0000
-+++ src/lib/process-title.c
-@@ -115,7 +115,11 @@ static void proctitle_hack_set(const cha
- void process_title_init(char **argv[])
- {
- #ifdef PROCTITLE_HACK
-+#ifdef __APPLE__
-+	char **environ = *_NSGetEnviron();
-+#else
- 	extern char **environ;
-+#endif
- 	char **orig_argv = *argv;
- 	char **orig_environ = environ;
-