Update to Dovecot 1.0.1. Lots of small fixes:

	* deliver: If Return-Path doesn't contain user and domain, don't try
	  to bounce the mail (this is how it was supposed to work earlier too)
	* deliver: %variables in mail setting coming from userdb aren't
	  expanded anymore (again how it should have worked). The expansion
	  could have caused problems if paths contained any '%' characters.

	+ Print Dovecot version number with dovecot -n and -a
	+ deliver: Added -e parameter to write rejection error to stderr and
	  exit with EX_NOPERM instead of sending the rejection by executing
	  sendmail.
	+ dovecot --log-error logs now a warning, an error and a fatal
	- Trying to start Dovecot while it's already running doesn't anymore
	  wipe out login_dir and break the running Dovecot.
	- maildir: Fixed "UID larger than next_uid" errors which happened
	  sometimes when dovecot-uidlist file didn't exist but index files did
	  (usually because mailbox didn't have any messages when it was
	  selected for the first time)
	- maildir: We violated maildir spec a bit by not having keyword
	  characters sorted in the filename.
	- maildir: If we don't have write access to cur/ directory, treat the
	  mailbox as read-only. This fixes some internal error problems with
	  trying to use read-only maildirs.
	- maildir: Deleting a symlinked maildir failed with internal error.
	- mbox: pop3_uidl_format=%m wasn't working right
	- mbox: If non-filesystem quota was enabled, we could have failed
	  with "Unexpectedly lost From-line" errors while saving new messages
	- mysql auth: %c didn't work. Patch by Andrey Panin
	- APPEND / SEARCH: If internaldate was outside valid value for time_t,
	  we returned BAD error for APPEND and SEARCH never matched. With 64bit
	  systems this shouldn't have happened. With 32bit systems the valid
	  range is usually for years 1902..2037.
	- COPY: We sent "Hang in there.." too early sometimes and checked it
	  too often (didn't break anything, but was slower than needed).
	- deliver: Postfix's sendmail binary wasn't working with mail_debug=yes
	- Don't corrupt ssl-parameters.dat files when running multiple Dovecot
	  instances.
	- Cache compression caused dovecot.index.cache to be completely deleted
	  with big endian CPUs if 64bit file offsets were used (default)
	- Fixed "(index_mail_parse_header): assertion failed" crash

5 files changed, 27 insertions, 22 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index e2824d7262f..5b5509dd907 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2007/05/16 07:34:46 ghen Exp $
+# $NetBSD: Makefile,v 1.97 2007/06/16 15:01:17 ghen Exp $
 
-DISTNAME=		dovecot-1.0.0
-PKGREVISION=		1
+DISTNAME=		dovecot-1.0.1
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
 
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index 17291cdaeb5..4689fbbc200 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2007/03/30 19:10:38 ghen Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/06/16 15:01:17 ghen Exp $
 lib/dovecot/imap/lib01_acl_plugin.so
 lib/dovecot/imap/lib02_lazy_expunge_plugin.so
 lib/dovecot/imap/lib10_quota_plugin.so
@@ -57,6 +57,7 @@ share/doc/dovecot/wiki/Authentication.RestrictAccess.txt
 share/doc/dovecot/wiki/Authentication.txt
 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
@@ -74,6 +75,11 @@ share/doc/dovecot/wiki/Design.Processes.txt
 share/doc/dovecot/wiki/Design.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
+share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
+share/doc/dovecot/wiki/HowTo.PostfixAndDovecotSASL.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
@@ -133,7 +139,6 @@ share/doc/dovecot/wiki/Plugins.txt
 share/doc/dovecot/wiki/PopBSMTPAndDovecot.txt
 share/doc/dovecot/wiki/PopRelay.txt
 share/doc/dovecot/wiki/PostLoginScripting.txt
-share/doc/dovecot/wiki/PostfixAndDovecotSASL.txt
 share/doc/dovecot/wiki/QuickConfiguration.txt
 share/doc/dovecot/wiki/Quota.Dict.txt
 share/doc/dovecot/wiki/Quota.Dirsize.txt
@@ -152,6 +157,7 @@ share/doc/dovecot/wiki/SharedMailboxes.txt
 share/doc/dovecot/wiki/SystemUsers.txt
 share/doc/dovecot/wiki/TestInstallation.txt
 share/doc/dovecot/wiki/TestPop3Installation.txt
+share/doc/dovecot/wiki/TimeMovedBackwards.txt
 share/doc/dovecot/wiki/UpgradingDovecot.txt
 share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
 share/doc/dovecot/wiki/UserDatabase.Prefetch.txt
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 2d3771dd0d2..1acb80c152b 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.66 2007/04/13 12:24:05 ghen Exp $
+$NetBSD: distinfo,v 1.67 2007/06/16 15:01:17 ghen Exp $
 
-SHA1 (dovecot-1.0.0.tar.gz) = 69054e9d3d10425bba5b13d092fa2cfeab382dce
-RMD160 (dovecot-1.0.0.tar.gz) = e750eb726fc7cf04d8dbd97604f01aa5ce4e3d19
-Size (dovecot-1.0.0.tar.gz) = 1674299 bytes
+SHA1 (dovecot-1.0.1.tar.gz) = 2772e27ecfc4afcb37b7afbed0deb98599fe645a
+RMD160 (dovecot-1.0.1.tar.gz) = 99fb3c7f69d7518d0fff3cc8245860c8731d1414
+Size (dovecot-1.0.1.tar.gz) = 1739087 bytes
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = 51faa52bc035a2c7ef96a3166191166e47c03876
-SHA1 (patch-ac) = 0f1d45ba606736a437892c7cb141d02396744db5
+SHA1 (patch-ab) = 5d45a1617dd5ee7ce07fe89b526a6fb273057bb5
+SHA1 (patch-ac) = 377da4719b5dca91a0b2fa7b3e11170cd2ea8d59
 SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 6d46f43083d..58d291a0350 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.21 2007/03/30 19:10:38 ghen Exp $
+$NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
 
---- dovecot-example.conf.orig	2007-03-30 13:36:18.000000000 +0200
+--- dovecot-example.conf.orig	2007-06-13 02:47:39.000000000 +0200
 +++ dovecot-example.conf
 @@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
@@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.21 2007/03/30 19:10:38 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -784,7 +781,7 @@ auth default {
+@@ -785,7 +782,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>
@@ -118,14 +118,14 @@ $NetBSD: patch-ab,v 1.21 2007/03/30 19:10:38 ghen Exp $
      # [blocking=yes] [session=yes] [setcred=yes]
      # [cache_key=<key>] [<service name>]
      #
-@@ -817,15 +814,15 @@ auth default {
+@@ -818,15 +815,15 @@ auth default {
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot
 -  }
 +  #}
  
-   # /etc/passwd or similar, using getpwnam()
+   # System users (NSS, /etc/passwd, or similiar)
    # In many systems nowadays this uses Name Service Switch, which is
    # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
 -  #passdb passwd {
@@ -135,5 +135,5 @@ $NetBSD: patch-ab,v 1.21 2007/03/30 19:10:38 ghen Exp $
 -  #}
 +  }
  
-   # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
-   # <doc/wiki/PasswordDatabase.Shadow.txt>
+   # Shadow passwords for system users (NSS, /etc/shadow or similiar).
+   # Deprecated by PAM nowadays.
diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac
index 9df45d0af60..d60199f49fa 100644
--- a/mail/dovecot/patches/patch-ac
+++ b/mail/dovecot/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.6 2007/03/30 19:10:38 ghen Exp $
+$NetBSD: patch-ac,v 1.7 2007/06/16 15:01:18 ghen Exp $
 
---- doc/Makefile.in.orig	2007-03-28 00:59:55.000000000 +0200
+--- doc/Makefile.in.orig	2007-06-11 19:06:53.000000000 +0200
 +++ doc/Makefile.in
-@@ -193,9 +193,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -202,9 +202,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  SUBDIRS = wiki
  confdir = $(sysconfdir)
 -conf_DATA = \