Update to dovecot-1.0rc3. This release candidate should fix the following problems:

- SSL connections hanged sometimes, especially when saving messages.
- mbox: Mail bodies were saved with CR+LF linefeeds
- Mail forwarding was broken with deliver/Sieve
- dbox fixes. Might actually be usable now.
- Index file handling fixes with keywords
- Cache file was incorrectly used in some situations, which probably
  caused problems sometimes.
- Maildir++ quota: Don't count "." and ".." directory sizes to quota.
  After rewriting maildirsize file keep its fd open so that we can
  later update it. Patch by Alexander Zagrebin

3 files changed, 21 insertions, 21 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 86fffce2e42..211212c5093 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2006/07/04 18:17:42 ghen Exp $
+# $NetBSD: Makefile,v 1.59 2006/08/02 17:48:37 ghen Exp $
 
-DISTNAME=		dovecot-1.0.rc2
+DISTNAME=		dovecot-1.0.rc3
 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 8e2373e348c..7414216a6f8 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2006/07/04 18:17:42 ghen Exp $
+$NetBSD: distinfo,v 1.35 2006/08/02 17:48:37 ghen Exp $
 
-SHA1 (dovecot-1.0.rc2.tar.gz) = 548d691166c71533cce05f72204d5f728941bab6
-RMD160 (dovecot-1.0.rc2.tar.gz) = cbb1919f30ccc82033ddda5a9a4b2e9695f78eb9
-Size (dovecot-1.0.rc2.tar.gz) = 1257435 bytes
+SHA1 (dovecot-1.0.rc3.tar.gz) = c3c303ea1c3081144ede044c919826bd72b2544a
+RMD160 (dovecot-1.0.rc3.tar.gz) = 7d154c7154242902dbef8e5a192850be98ed70e8
+Size (dovecot-1.0.rc3.tar.gz) = 1260043 bytes
 SHA1 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
-SHA1 (patch-ab) = 10ac66a276c28259517b321b67d1da0d83fd811f
+SHA1 (patch-ab) = 1f5ce4a9d0db770246f838ea2f9f80e66c6da287
 SHA1 (patch-ag) = ffb66cf054c0377245f3b400f65eabd975a225aa
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 60f2f974444..2dbf0473cb4 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
+$NetBSD: patch-ab,v 1.15 2006/08/02 17:48:37 ghen Exp $
 
---- dovecot-example.conf.orig	2006-06-17 17:05:22.000000000 +0200
+--- dovecot-example.conf.orig	2006-07-05 21:51:02.000000000 +0200
 +++ dovecot-example.conf
 @@ -7,16 +7,13 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
- # Default values are shown after each value, it's not required to uncomment
--# any of the lines. Exception to this are paths, they're just examples
--# with real defaults being based on configure options. The paths listed here
+ # Default values are shown for each setting, it's not required to uncomment
+-# any of the lines. Exception to this are paths, they're just examples with
+-# the real defaults being based on configure options. The paths listed here
 -# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 -# --with-ssldir=/etc/ssl
-+# any of the lines.
++# any of the lines. 
  
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
@@ -30,7 +30,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
  
  # 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
-@@ -467,19 +464,19 @@
+@@ -468,19 +465,19 @@
  
  protocol imap {
    # Login executable location.
@@ -54,7 +54,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 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
-@@ -489,7 +486,7 @@ protocol imap {
+@@ -490,7 +487,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -63,7 +63,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -529,10 +526,10 @@ protocol imap {
+@@ -530,10 +527,10 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 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
-@@ -590,7 +587,7 @@ protocol pop3 {
+@@ -592,7 +589,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -618,10 +615,10 @@ protocol lda {
+@@ -620,10 +617,10 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -632,7 +629,7 @@ protocol lda {
+@@ -634,7 +631,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -107,7 +107,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -744,7 +741,7 @@ auth default {
+@@ -746,7 +743,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.
@@ -116,7 +116,7 @@ $NetBSD: patch-ab,v 1.14 2006/07/02 09:29:17 ghen Exp $
      #  [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
      #
      # session=yes makes Dovecot open and immediately close PAM session. Some
-@@ -772,13 +769,13 @@ auth default {
+@@ -774,13 +771,13 @@ auth default {
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot