Update mail/dovecot to 0.99.10.5.

v0.99.10.5 2003-12-27  Timo Sirainen <tss@iki.fi>

        + MySQL authentication, patch by Matthew Reimer
        + --with-moduledir configure option
        - mbox: APPEND reversed given \Draft and \Deleted flags
        - mbox: "LF not found" errors happened sometimes when X-IMAPbase
          header was updated. Possibly corrupted mbox sometimes.
          Thanks to Fabrice Bellet for finding this bug.
        - Custom flags couldn't be unset
        - Maildir: make sure ":2," is appended to filename when moving mails
          from new/ to cur/.
        - Maildir: synchronization might have sometimes set wrong flags to
          messages, or crash completely
        - Maildir: RENAME xx inbox.xx didn't result as uppercased ".INBOX.xx"
          directory which then couldn't be accessed
        - Don't crash with RAND_bytes() error messages anymore. This mostly
          happened with Fedora/RedHat.

pkgsrc changes:

	o Disable crammd5 patch, doesn't apply cleanly anymore.
	o Add a new option "DOVECOT_USE_MYSQL" to authenticate users
	  against a mysql database.

3 files changed, 26 insertions, 51 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d2ba521582d..2bee2210d2e 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2004/03/26 02:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/05/28 22:20:42 xtraeme Exp $
 
-DISTNAME=		dovecot-0.99.10.4
-PKGREVISION=		2
+DISTNAME=		dovecot-0.99.10.5
 CATEGORIES=		mail
 MASTER_SITES=		http://dovecot.fi/
 
+.if 0
 PATCH_SITES=		http://www.roughtrade.net/dovecot/
 PATCHFILES=		dovecot-crammd5-0.99.10.2.diff
 PATCH_DIST_STRIP=	-p1
+.endif
 
 MAINTAINER=		tom@replic8.net
 HOMEPAGE=		http://dovecot.fi/
@@ -27,8 +28,8 @@ CONFIGURE_ENV+=		F77=${FALSE}
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_PGSQL	\
-			USE_INET6 USE_OPENLDAP USE_SASL2
+BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_MYSQL \
+			DOVECOT_USE_PGSQL USE_INET6 USE_OPENLDAP USE_SASL2
 
 .if !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--enable-ssl=gnutls
@@ -38,6 +39,11 @@ CONFIGURE_ARGS+=        --enable-ssl=openssl
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 
+.if !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][SS])
+CONFIGURE_ARGS+=	--with-mysql
+.  include "../../databases/mysql4-client/buildlink3.mk"
+.endif
+
 .if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--with-pgsql
 CPPFLAGS=		-I${BUILDLINK_DIR}/include/pgsql
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 254ec05f67f..44461d80c41 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/12/09 04:06:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/05/28 22:20:43 xtraeme Exp $
 
-SHA1 (dovecot-0.99.10.4.tar.gz) = e4eabc78894e2c204d788521812497e021f45c08
-Size (dovecot-0.99.10.4.tar.gz) = 859856 bytes
-SHA1 (dovecot-crammd5-0.99.10.2.diff) = bd879993f2275bcafd9f6ae1e673114b0fbd82a2
-Size (dovecot-crammd5-0.99.10.2.diff) = 16476 bytes
+SHA1 (dovecot-0.99.10.5.tar.gz) = b9bef7b38e93bdbb0ec168e158b62b436d736589
+Size (dovecot-0.99.10.5.tar.gz) = 863825 bytes
 SHA1 (patch-aa) = 6ed31ba47883903e5a7b2fcb715432e0c3e8947c
-SHA1 (patch-ab) = 05efdd1f833cdf6a8df942f071c9961b31bd55e7
+SHA1 (patch-ab) = 4d8d0c850e20da0b948fdaa7d67a822663e6f0f9
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 16649f30947..cf8da89fdd8 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,20 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
+$NetBSD: patch-ab,v 1.4 2004/05/28 22:20:43 xtraeme Exp $
 
---- dovecot-example.conf.orig	2003-12-09 04:45:27.000000000 +0100
-+++ dovecot-example.conf	2003-12-09 04:50:48.000000000 +0100
-@@ -1,17 +1,15 @@
- ## Dovecot 1.0 configuration file
- 
- # 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
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--# --with-ssldir=/etc/ssl
-+# any of the lines. Exception to this are paths, they're just examples with
-+# real defaults being based on configure options.
- 
- # Base directory where to store runtime data.
- #base_dir = /var/run/dovecot/
+--- dovecot-example.conf.orig	2004-05-29 00:13:10.000000000 +0200
++++ dovecot-example.conf	2004-05-29 00:15:24.000000000 +0200
+@@ -11,7 +11,7 @@
  
  # Protocols we want to be serving:
  #  imap imaps pop3 pop3s
@@ -23,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -27,7 +25,7 @@
+@@ -27,7 +27,7 @@
  #pop3s_listen = 
  
  # Disable SSL/TLS support.
@@ -32,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme 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
-@@ -81,7 +79,7 @@
+@@ -81,7 +81,7 @@
  login = imap
  
  # Executable location.
@@ -41,7 +29,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
  
  # User to use for the login process. Create a completely new user for this,
  # and don't use it anywhere else. The user must also belong to a group where
-@@ -126,7 +124,7 @@
+@@ -126,7 +126,7 @@
  login = pop3
  
  # Exception to above rule being the executable location.
@@ -50,16 +38,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
  
  ##
  ## Mail processes
-@@ -318,7 +316,7 @@
- ##
- 
- # Executable location
--#imap_executable = /usr/libexec/dovecot/imap
-+imap_executable = @PREFIX@/libexec/dovecot/imap
- 
- # Set max. process size in megabytes. Most of the memory goes to mmap()ing
- # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -326,14 +324,14 @@
+@@ -326,14 +326,14 @@
  
  # Support for dynamically loadable modules.
  #imap_use_modules = no
@@ -76,7 +55,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -341,7 +339,7 @@
+@@ -341,7 +341,7 @@
  
  # Support for dynamically loadable modules.
  #pop3_use_modules = no
@@ -85,20 +64,12 @@ $NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
  
  ##
  ## Authentication processes
-@@ -381,7 +379,7 @@
- #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
- #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
- #auth_userdb = passwd
--auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf
-+auth_userdb = passwd
- 
- # Where password database is kept:
- #   passwd: /etc/passwd or similiar, using getpwnam()
-@@ -391,9 +389,9 @@
+@@ -390,9 +390,10 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
 -auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
++#auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
 +auth_passdb = passwd
  
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth