Upgrade dovecot to 1.0rc1. Changes:

* PAM: If user's password is expired, give "Password expired" error
  message to the user. Now actually working thanks to Vaidas Pilkauskas
* Relicensed dovecot-auth, lib-sql and lib-ntlm to MIT license. See
  COPYING file for more information.
* Abuse prevention: When creating a mailbox, limit the number of
  hierarchies (up to 20) and the length of the mailbox name within
  a hierarchy (up to 200 characters).
* mbox: If saved mail doesn't end with LF, add it ourself so that the
  mails always have one empty line before the next From-line.

+ Added --with-statedir configure option which defaults to
  $localstatedir/lib/dovecot. ssl-parameters.dat is permanently
  stored in that directory and is copied to login_dirs from there.
+ IMAP: Support SASL-IR extension (SASL initial response)
+ Support initial SASL response with LOGIN mechanism. Patch by Anders
  Karlsson
+ Added PLAIN-MD4 password scheme. Patch by Andrey Panin.
+ Added support for XFS disk quotas. Patch by Pawel Jarosz
+ If another process deletes the opened mailbox, try to handle it
  without writing errors to log file. Handles the most common cases.
+ Added TLS support for LDAP if the library supports it.
- SEARCH command was more or less broken with OR and NOT conditions
- Dovecot corrupted mbox files which had CR+LF linefeeds in headers
- MySQL code could have crashed while escaping strings
- MD4 code with NTLM authentication was broken with 64bit systems.
  Patch by Andrey Panin
- Plugin loading was broken in some OSes (eg. FreeBSD)
- Several fixes to handling empty values in configuration file
- Several fixes to dictionary quota backend and dict server.
  Also changed how they're configured.
- deliver: Fixed plugin handling settings
- mbox_min_index_size handling was somewhat broken
- passdb passwd-file: extra_args field wasn't read unless the file
  was also used as userdb.

4 files changed, 12 insertions, 32 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index a55462c032b..06ab023b182 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2006/06/19 08:28:05 ghen Exp $
+# $NetBSD: Makefile,v 1.56 2006/07/02 09:29:17 ghen Exp $
 
-DISTNAME=		dovecot-1.0.beta9
-PKGNAME=		${DISTNAME:S/.beta/beta/}
-PKGREVISION=		2
+DISTNAME=		dovecot-1.0.rc1
+PKGNAME=		${DISTNAME:S/.rc/rc/}
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 6336960a6e8..f612ce1c4b7 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.32 2006/06/19 08:28:05 ghen Exp $
+$NetBSD: distinfo,v 1.33 2006/07/02 09:29:17 ghen Exp $
 
-SHA1 (dovecot-1.0.beta9.tar.gz) = c3f5014e67cd993206373915ee622ed1f68b4b14
-RMD160 (dovecot-1.0.beta9.tar.gz) = 30d423b9fd2056fd8d898bc4bc630d3806cc64c4
-Size (dovecot-1.0.beta9.tar.gz) = 1245601 bytes
+SHA1 (dovecot-1.0.rc1.tar.gz) = 4b56d2205cd8b7229e368c736c993ebc1f59fe5e
+RMD160 (dovecot-1.0.rc1.tar.gz) = fa761a2b24ede31b383b505ed36fc202810191cd
+Size (dovecot-1.0.rc1.tar.gz) = 1254731 bytes
 SHA1 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
-SHA1 (patch-ab) = 987747a6fa0abc19c28935b7c86a2adc568e14f0
+SHA1 (patch-ab) = 10ac66a276c28259517b321b67d1da0d83fd811f
 SHA1 (patch-ag) = ffb66cf054c0377245f3b400f65eabd975a225aa
-SHA1 (patch-ah) = 4da22e1c515c9c6bd9256d85b74919353fd4b9a1
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index b60be5dd664..60f2f974444 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.13 2006/06/13 16:51:40 ghen Exp $
+$NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
 
---- dovecot-example.conf.orig	2006-06-13 18:26:36.000000000 +0200
+--- dovecot-example.conf.orig	2006-06-17 17:05:22.000000000 +0200
 +++ dovecot-example.conf
 @@ -7,16 +7,13 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
@@ -89,8 +89,8 @@ $NetBSD: patch-ab,v 1.13 2006/06/13 16:51:40 ghen Exp $
    # 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 = /usr/lib/dovecot/lda
++  #mail_plugin_dir = @PREFIX@/lib/dovecot/lda
  
    # Binary to use for sending mails.
 -  #sendmail_path = /usr/lib/sendmail
diff --git a/mail/dovecot/patches/patch-ah b/mail/dovecot/patches/patch-ah
deleted file mode 100644
index 9e9cfa6ec3f..00000000000
--- a/mail/dovecot/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/06/19 08:28:05 ghen Exp $
-
-1.0beta9 didn't start when ssl_listen wasn't explicitly set in the config file.
-This fix is from Dovecot's CVS so it will be in the next release.
-
---- src/master/main.c.orig	2006-06-11 19:43:41.000000000 +0200
-+++ src/master/main.c
-@@ -355,7 +355,9 @@ static void listen_protocols(struct sett
- 	resolve_ip(set->listen, &set->listen_ip, &set->listen_port);
- 	resolve_ip(set->ssl_listen, &set->ssl_listen_ip, &set->ssl_listen_port);
- 
--	if (set->ssl_listen_ip.family == 0 && set->ssl_listen == NULL)
-+	/* if ssl_listen wasn't explicitly set in the config file,
-+	   use the non-ssl IP settings for the ssl listener, too. */
-+	if (set->ssl_listen_ip.family == 0 && *set->ssl_listen == '\0')
- 		set->ssl_listen_ip = set->listen_ip;
- 
- 	/* register wanted protocols */