Update dovecot to 1.0 beta9. From the release notes:

Fixes a lot of bugs. The next release will be the first "release
candidate" instead of a beta.

* PAM: Don't call pam_setcred() unless setcred=yes PAM passdb
  argument was given.
* Moved around settings in dovecot-example.conf to be in more logical
  groups.

+ Local delivery agent (deliver binary) works again.
+ LDAP: Added support for SASL binding. Patch by Geert Jansen
+ ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log
  invalid sent certificates. If verbose_ssl=yes, log even the valid
  certificates. When using the username from the certificate, use
  CommonName. Based on patch by HenkJan Wolthuis
+ PAM: Set PAM_TTY which is needed by some PAM plugins
+ dovecot --exec-mail ext <binary path> can now be used to start
  binaries which want dovecot.conf to be read, for example the
  convert-tool.
- Expunging needed to be done twice if client used STORE +FLAGS.SILENT
  command to set the \Deleted flags
- Added sql_escape_string() to lib-sql API and use it instead of
  normal \-escaping.
- ACL plugin fixes
- DIGEST-MD5: Trying to use subsequent authentication crashed
  dovecot-auth.
- Fetching BODY when BODYSTRUCTURE was already cached caused the
  reply to be broken in some cases
- Lots of fixes for index file handling
- dbox fixes and changes
- mbox syncing broke if some extraneous/broken headers were removed
  (eg. extra X-IMAPbase headers in mails)
- Running Dovecot from inetd work now properly with POP3
- Quota plugin fixes for calculating the quota correctly

6 files changed, 53 insertions, 59 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 2ac62f7b2be..8533718cb7b 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2006/05/21 13:48:51 ghen Exp $
+# $NetBSD: Makefile,v 1.53 2006/06/13 16:51:40 ghen Exp $
 
-DISTNAME=		dovecot-1.0.beta8
+DISTNAME=		dovecot-1.0.beta9
 PKGNAME=		${DISTNAME:S/.beta/beta/}
-PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
 
@@ -19,6 +18,10 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS:Q}
 
+# ./configure checks for c++ and fortran compilers although
+# dovecot doesn't actually use them, this should be fixed.
+USE_LANGUAGES+=		c c++ fortran
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index 3f5c0834f43..5006ca36bdb 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/05/12 15:47:39 jwise Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/06/13 16:51:40 ghen Exp $
 lib/dovecot/imap/lib01_acl_plugin.so
 lib/dovecot/imap/lib01_convert_plugin.so
 lib/dovecot/imap/lib01_quota_plugin.so
@@ -16,6 +16,7 @@ lib/dovecot/lib02_trash_plugin.la
 lib/dovecot/pop3/lib01_convert_plugin.so
 lib/dovecot/pop3/lib01_quota_plugin.so
 libexec/dovecot/checkpassword-reply
+libexec/dovecot/deliver
 libexec/dovecot/dict
 libexec/dovecot/dovecot-auth
 libexec/dovecot/gdbhelper
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index b4108bc843e..288fabb92d8 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2006/05/21 13:48:51 ghen Exp $
+$NetBSD: distinfo,v 1.31 2006/06/13 16:51:40 ghen Exp $
 
-SHA1 (dovecot-1.0.beta8.tar.gz) = fedd38c29a2bc396df386636ed5d8b65ecab0ff6
-RMD160 (dovecot-1.0.beta8.tar.gz) = 101a7011467691ba5f4a6f48e21d6d1dc5626c16
-Size (dovecot-1.0.beta8.tar.gz) = 1392106 bytes
+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 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
-SHA1 (patch-ab) = a674cc1cb195e31f7c8cd1cd2735c69e3562fca7
-SHA1 (patch-af) = 8a8a219feba0bc575c1319ff7743f1ae5281413a
+SHA1 (patch-ab) = 987747a6fa0abc19c28935b7c86a2adc568e14f0
+SHA1 (patch-ag) = ffb66cf054c0377245f3b400f65eabd975a225aa
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index c946ae45aa2..b60be5dd664 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 ghen Exp $
+$NetBSD: patch-ab,v 1.13 2006/06/13 16:51:40 ghen Exp $
 
---- dovecot-example.conf.orig	2006-03-15 10:47:59.000000000 +0100
+--- dovecot-example.conf.orig	2006-06-13 18:26:36.000000000 +0200
 +++ dovecot-example.conf
-@@ -7,17 +7,14 @@
+@@ -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
@@ -15,14 +15,13 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 ghen Exp $
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
  
- # Protocols we want to be serving:
- #  imap imaps pop3 pop3s
+ # Protocols we want to be serving: imap imaps pop3 pop3s
 -#protocols = imap imaps
 +protocols = imap pop3
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -43,7 +40,7 @@
+@@ -80,7 +77,7 @@
  #ssl_listen =
  
  # Disable SSL/TLS support.
@@ -31,7 +30,7 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 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
-@@ -432,19 +429,19 @@
+@@ -467,19 +464,19 @@
  
  protocol imap {
    # Login executable location.
@@ -55,7 +54,7 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 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
-@@ -454,7 +451,7 @@ protocol imap {
+@@ -489,7 +486,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -64,7 +63,7 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 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.
-@@ -494,10 +491,10 @@ protocol imap {
+@@ -529,10 +526,10 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -77,7 +76,7 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 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
-@@ -549,7 +546,7 @@ protocol pop3 {
+@@ -590,7 +587,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -86,7 +85,20 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -567,7 +564,7 @@ protocol pop3 {
+@@ -618,10 +615,10 @@ protocol lda {
+   # 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
+ 
+   # Binary to use for sending mails.
+-  #sendmail_path = /usr/lib/sendmail
++  #sendmail_path = /usr/sbin/sendmail
+ 
+   # UNIX socket path to master authentication server to find users.
+   #auth_socket_path = /var/run/dovecot/auth-master
+@@ -632,7 +629,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -95,16 +107,16 @@ $NetBSD: patch-ab,v 1.12 2006/04/04 09:38:46 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -664,7 +661,7 @@ auth default {
+@@ -744,7 +741,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.
 -  passdb pam {
 +  #passdb pam {
-     # [session=yes] [cache_key=<key>] [<service name>]
+     #  [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
      #
      # session=yes makes Dovecot open and immediately close PAM session. Some
-@@ -688,13 +685,13 @@ auth default {
+@@ -772,13 +769,13 @@ auth default {
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot
diff --git a/mail/dovecot/patches/patch-af b/mail/dovecot/patches/patch-af
deleted file mode 100644
index 89c4ff5c98b..00000000000
--- a/mail/dovecot/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/05/21 13:48:51 ghen Exp $
-
-From dovecot CVS: fix problem with non-C99 compilers.
-
---- src/master/master-settings.c.orig	2006-04-25 11:00:07.000000000 +0900
-+++ src/master/master-settings.c
-@@ -366,7 +366,6 @@ struct settings default_settings = {
- 	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
- 
- 	/* .. */
--	MEMBER(login_uid) 0,
- 	MEMBER(listen_fd) -1,
- 	MEMBER(ssl_listen_fd) -1
- };
---- src/master/master-settings.h.orig	2006-04-15 11:00:07.000000000 +0900
-+++ src/master/master-settings.h
-@@ -116,14 +116,15 @@ struct settings {
- 	const char *pop3_logout_format;
- 
- 	/* .. */
--	uid_t login_uid;
-+	int listen_fd, ssl_listen_fd;
- 
--	const char *imap_generated_capability;
-+	uid_t login_uid;
- 
--	int listen_fd, ssl_listen_fd;
- 	struct ip_addr listen_ip, ssl_listen_ip;
- 	unsigned int listen_port, ssl_listen_port;
- 
-+	const char *imap_generated_capability;
-+
- 	array_t ARRAY_DEFINE(plugin_envs, const char *);
- };
- 
diff --git a/mail/dovecot/patches/patch-ag b/mail/dovecot/patches/patch-ag
new file mode 100644
index 00000000000..3480bd4df94
--- /dev/null
+++ b/mail/dovecot/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/06/13 16:51:40 ghen Exp $
+
+--- src/deliver/deliver.c.orig	2006-06-13 18:37:31.000000000 +0200
++++ src/deliver/deliver.c
+@@ -29,7 +29,7 @@
+ 
+ #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
+ #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
+-#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
++#define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail"
+ 
+ /* After buffer grows larger than this, create a temporary file to /tmp
+    where to read the mail. */