Update to Dovecot 1.1.15.

v1.1.15 2009-05-17  Timo Sirainen <tss@iki.fi>

+ IMAP: When multiple commands are pipelined, try harder to combine their
  mailbox syncing together. For example with Maildir pipelining STORE 1:*
  +FLAGS \Deleted and EXPUNGE commands the files won't be unnecessarily
  rename()d before being unlink()ed.
- IMAP: SEARCH command was slower than necessary in a large mailbox.
- deliver: When forwarding messages, if -f parameter was given, it should have
  been used as the Return-Path.
- Maildir saving: Fixed race condition bugs in uidlist handling, causing files
  to be given new UIDs sometimes.
- mbox: Don't crash when expunging all messages and file doesn't end with
  [CR]LF.
- expire-tool: Use mail_uid and mail_gid settings if userdb doesn't return
  uid/gid.
- Berkeley DB dict: Transaction rollbacking was implemented wrong.
- zlib plugin: Some email / FETCH command combinations could have disconnected
  the client or sent compressed garbage.

5 files changed, 35 insertions, 38 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d4bd824b6c4..2638d8f3294 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.132 2009/05/11 08:54:49 tnn Exp $
+# $NetBSD: Makefile,v 1.133 2009/05/20 08:07:38 ghen Exp $
 
-DISTNAME=		dovecot-1.1.14
-PKGREVISION=		1
+DISTNAME=		dovecot-1.1.15
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/1.1/
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 6df08f5cd19..ad0f61f72b2 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.97 2009/05/11 08:54:49 tnn Exp $
+$NetBSD: distinfo,v 1.98 2009/05/20 08:07:38 ghen Exp $
 
-SHA1 (dovecot-1.1.14.tar.gz) = a508e6cb69710e5f7fe40ef2559d370678352ad5
-RMD160 (dovecot-1.1.14.tar.gz) = c39ab75125a224492f36deaada4c8ab73d51db21
-Size (dovecot-1.1.14.tar.gz) = 2372939 bytes
-SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = 75338a53304cdb9f480646c448de42ef148faa32
-SHA1 (patch-ac) = bf4c21c0e08832926944ad43c8678ef505e92dd6
+SHA1 (dovecot-1.1.15.tar.gz) = 16a638b9d67bcd6c2d8a09a124103a1fc2ea6745
+RMD160 (dovecot-1.1.15.tar.gz) = 2ddda6240e8aaed8afdce11196070c3628443083
+Size (dovecot-1.1.15.tar.gz) = 2383354 bytes
+SHA1 (patch-aa) = 00ed62ab4d7db505cc323b0c94352ddcd91ba6a1
+SHA1 (patch-ab) = 2531c84a2ae34e74bb55fa33ccb0aabbbc263de0
+SHA1 (patch-ac) = 4baa1d5160618f1e23eb8b401daca0afa7dfe9ea
 SHA1 (patch-ag) = c9989f71bdfd9ae22883450b85fc55a215594df1
 SHA1 (patch-ah) = b6b278e04538fc3408d7c176d22c1ec7b83c9875
diff --git a/mail/dovecot/patches/patch-aa b/mail/dovecot/patches/patch-aa
index 7cba6c798f1..501c691bfab 100644
--- a/mail/dovecot/patches/patch-aa
+++ b/mail/dovecot/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2008/06/22 17:41:23 ghen Exp $
+$NetBSD: patch-aa,v 1.9 2009/05/20 08:07:38 ghen Exp $
 
---- Makefile.in.orig	2006-10-09 20:53:16.000000000 +0200
+--- Makefile.in.orig	2009-05-18 03:39:56.000000000 +0200
 +++ Makefile.in
-@@ -220,7 +220,7 @@ SUBDIRS = \
+@@ -244,7 +244,7 @@ SUBDIRS = \
  	$(DOCS)
  
  confdir = $(sysconfdir)
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 1afebe0fb0a..8ad853d5f61 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,16 +1,14 @@
-$NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
+$NetBSD: patch-ab,v 1.27 2009/05/20 08:07:38 ghen Exp $
 
---- dovecot-example.conf.orig	2009-03-13 22:23:14.000000000 +0100
+--- dovecot-example.conf.orig	2009-05-13 18:41:46.000000000 +0200
 +++ dovecot-example.conf
-@@ -10,17 +10,14 @@
- # value inside quotes, eg.: key = "# char and trailing whitespace  "
- 
+@@ -12,16 +12,13 @@
  # 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. 
+ # 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.
+-# Paths are also 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
  
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
@@ -22,16 +20,16 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -85,7 +82,7 @@
+@@ -86,7 +83,7 @@
  #ssl_listen =
  
- # Disable SSL/TLS support. <doc/wiki/SSL>
+ # Disable SSL/TLS support. <doc/wiki/SSL.txt>
 -#ssl_disable = no
 +ssl_disable = yes
  
  # 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
-@@ -149,7 +146,7 @@
+@@ -150,7 +147,7 @@
  
  # Set max. process size in megabytes. If you don't use
  # login_process_per_connection you might need to grow this.
@@ -40,7 +38,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
  
  # Should each login be processed in it's own process (yes), or should one
  # login process be allowed to process multiple connections (no)? Yes is more
-@@ -503,19 +500,19 @@
+@@ -504,19 +501,19 @@
  
  protocol imap {
    # Login executable location.
@@ -64,7 +62,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn 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
-@@ -529,7 +526,7 @@ protocol imap {
+@@ -530,7 +527,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -73,7 +71,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn 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.
-@@ -572,11 +569,11 @@ protocol imap {
+@@ -573,11 +570,11 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -87,7 +85,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn 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
-@@ -636,7 +633,7 @@ protocol pop3 {
+@@ -637,7 +634,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -96,7 +94,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -664,7 +661,7 @@ protocol lda {
+@@ -665,7 +662,7 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -105,7 +103,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
  
    # If user is over quota, return with temporary failure instead of
    # bouncing the mail.
-@@ -678,7 +675,7 @@ protocol lda {
+@@ -679,7 +676,7 @@ protocol lda {
    #deliver_log_format = msgid=%m: %$
  
    # Binary to use for sending mails.
@@ -114,7 +112,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
  
    # Subject: header to use for rejection mails. You can use the same variables
    # as for rejection_reason below.
-@@ -697,7 +694,7 @@ protocol lda {
+@@ -698,7 +695,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -123,7 +121,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -830,7 +827,7 @@ auth default {
+@@ -831,7 +828,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>
@@ -132,7 +130,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/11 08:54:49 tnn Exp $
      # [session=yes] [setcred=yes] [failure_show_msg=yes]
      # [cache_key=<key>] [<service name>]
      #
-@@ -859,15 +856,15 @@ auth default {
+@@ -860,15 +857,15 @@ auth default {
      #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot
diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac
index ea9052fa982..ef441975e02 100644
--- a/mail/dovecot/patches/patch-ac
+++ b/mail/dovecot/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2009/01/08 00:02:44 abs Exp $
+$NetBSD: patch-ac,v 1.11 2009/05/20 08:07:38 ghen Exp $
 
---- doc/Makefile.in.orig	2009-01-06 13:53:39.000000000 +0000
+--- doc/Makefile.in.orig	2009-05-18 03:39:52.000000000 +0200
 +++ doc/Makefile.in
-@@ -217,10 +217,7 @@ top_builddir = @top_builddir@
+@@ -219,10 +219,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = wiki
  confdir = $(sysconfdir)