- Update mail/dovecot to 1.0beta2. The 1.0 betas are very stable, and

  recommended by the Dovecot author (the 0.99.x series are deprecated).

  Major changes:

  v1.0.beta2 2006-01-22  Timo Sirainen <tss@iki.fi>
	+ Added SQLite support. Patch by Jakob Hirsch.
	+ Added auth_debug_passwords setting. If it's not enabled, hide all
          password strings from logs.
	+ Added mail_cache_min_mail_count and mbox_min_index_size settings
	  which can be used to make Dovecot do less disk writes in small
          mailboxes where they don't benefit that much.
	+ Added --build-ssl-parameters parameter to dovecot binary
	- SSL parameters were being regenerated every 10 minutes, although not
	  with all systems.
	- Fixed dovecot-auth crashing at startup. Happened only with some
	  specific compilers.
	- base_dir was supposed to be set world-readable, not world-writable

  v1.0.beta1 2006-01-16  Timo Sirainen <tss@iki.fi>
	* Almost a complete rewrite since 0.99.x, but some of the major
	  changes are:

	+ Index file code rewritten to do less disk I/O, wait locks less and in
	  generate be smarter. They also support being in clustered filesystems
          and NFS support is mostly working also.
	+ Mail caching is smarter. Only the data that client requests is
	  cached. Before Dovecot opened and cached all mails when mailbox was
          opened the first time, which was slow.
	+ Mbox handling code rewritten to be much faster, safer and correct
	+ New authentication mechanisms: APOP, GSSAPI, LOGIN, NTLM and RPA.
	+ LDAP supports authentication binds
	+ Authentication server can cache password database lookups
	+ Support for multiple authentication databases
	+ Namespace configuration
	+ Dovecot works with shared

- Add an option for sqlite support.

- Take over maintainership.

All suggested (and ok'ed) by xtraeme.

7 files changed, 161 insertions, 93 deletions

diff --git a/mail/dovecot/MESSAGE b/mail/dovecot/MESSAGE
new file mode 100644
index 00000000000..813aab10cb9
--- /dev/null
+++ b/mail/dovecot/MESSAGE
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/02/06 15:54:37 ghen Exp $
+
+The Dovecot configuration file format has changed between 0.99.x
+and 1.0.  If you are upgrading from 0.99.x, be sure to read
+http://wiki.dovecot.org/UpgradingDovecot to avoid any issues.
+
+===========================================================================
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 13d7df554f1..7dc35e77acf 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.42 2006/01/19 02:31:12 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/02/06 15:54:37 ghen Exp $
 
-DISTNAME=		dovecot-0.99.14
-PKGREVISION=		2
+DISTNAME=		dovecot-1.0.beta2
+PKGNAME=		${DISTNAME:S/.beta/b/}
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
 
-MAINTAINER=		xtraeme@NetBSD.org
+MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.dovecot.org/
 COMMENT=		Secure IMAP and POP3 server
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/.1$//}
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -22,15 +21,15 @@ CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS:Q}
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-RCD_SCRIPTS=	dovecot
+RCD_SCRIPTS=		dovecot
 
-DOVECOT_USER?=	dovecot
-DOVECOT_GROUP?=	dovecot
-PKG_GROUPS=	${DOVECOT_GROUP}
-PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\ IMAP/POP3\ user
+DOVECOT_USER?=		dovecot
+DOVECOT_GROUP?=		dovecot
+PKG_GROUPS=		${DOVECOT_GROUP}
+PKG_USERS=		${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\ IMAP/POP3\ user
 
-EGDIR=		${PREFIX}/share/examples/dovecot
-CONF_FILES=	${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
+EGDIR=			${PREFIX}/share/examples/dovecot
+CONF_FILES=		${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
 
 INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
 			share/examples/dovecot
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index c460d09a21b..14488e0fa56 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,11 +1,25 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:33:59 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/02/06 15:54:37 ghen Exp $
+lib/dovecot/imap/lib01_quota_plugin.so
+lib/dovecot/imap/lib01_zlib_plugin.la
+lib/dovecot/imap/lib02_imap_quota_plugin.la
+lib/dovecot/imap/lib02_trash_plugin.so
+lib/dovecot/lda/lib01_quota_plugin.so
+lib/dovecot/lda/lib02_trash_plugin.so
+lib/dovecot/lib01_quota_plugin.la
+lib/dovecot/lib02_trash_plugin.la
+libexec/dovecot/checkpassword-reply
+libexec/dovecot/dict
 libexec/dovecot/dovecot-auth
+libexec/dovecot/gdbhelper
 libexec/dovecot/imap
 libexec/dovecot/imap-login
 libexec/dovecot/pop3
 libexec/dovecot/pop3-login
+libexec/dovecot/rawlog
 sbin/dovecot
+sbin/dovecotpw
 share/doc/dovecot/USE-WIKI-INSTEAD
+share/doc/dovecot/auth-protocol.txt
 share/doc/dovecot/auth.txt
 share/doc/dovecot/configuration.txt
 share/doc/dovecot/design.txt
@@ -14,13 +28,16 @@ share/doc/dovecot/mail-storages.txt
 share/doc/dovecot/multiaccess.txt
 share/doc/dovecot/nfs.txt
 share/doc/dovecot/securecoding.txt
+share/doc/dovecot/variables.txt
 share/examples/dovecot/dovecot-ldap.conf
 share/examples/dovecot/dovecot-openssl.cnf
-share/examples/dovecot/dovecot-mysql.conf
-share/examples/dovecot/dovecot-pgsql.conf
+share/examples/dovecot/dovecot-sql.conf
 share/examples/dovecot/dovecot.conf.default
 share/examples/dovecot/mkcert.sh
 share/examples/rc.d/dovecot
 @dirrm share/examples/dovecot
 @dirrm share/doc/dovecot
 @dirrm libexec/dovecot
+@dirrm lib/dovecot/lda
+@dirrm lib/dovecot/imap
+@dirrm lib/dovecot
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 91aa4d50f6f..1536a920c74 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2005/02/24 09:59:21 agc Exp $
+$NetBSD: distinfo,v 1.19 2006/02/06 15:54:37 ghen Exp $
 
-SHA1 (dovecot-0.99.14.tar.gz) = b93569c3ca8849ced7ab0580e95d83771c4686fa
-RMD160 (dovecot-0.99.14.tar.gz) = 5c6f370f2e81472c5d1d8a639b1edc63df362e6b
-Size (dovecot-0.99.14.tar.gz) = 871285 bytes
-SHA1 (patch-aa) = c1079f49bdaa2e6cf648afad2c7bda025e2c1ac8
-SHA1 (patch-ab) = 75c8560479dcec3cb7e5c08030303959fcee30ea
+SHA1 (dovecot-1.0.beta2.tar.gz) = cf25468db5eb171cdf020c39296ae4a688417873
+RMD160 (dovecot-1.0.beta2.tar.gz) = 446072d3aef6288b18392b7002bbe3eaf124fa99
+Size (dovecot-1.0.beta2.tar.gz) = 1340629 bytes
+SHA1 (patch-aa) = be37d7ed741930e683028e6ea626aa1d312a328e
+SHA1 (patch-ab) = 0e1f60ac3bd3dfeb4439da7bba1f7c0a73643150
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index 36d1f33e06a..63b34703899 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.10 2006/01/10 12:39:04 ghen Exp $
+# $NetBSD: options.mk,v 1.11 2006/02/06 15:54:37 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS=	inet6 ldap mysql pam pgsql sasl ssl
+PKG_SUPPORTED_OPTIONS=	inet6 ldap mysql pam pgsql sasl ssl sqlite
 PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
@@ -66,3 +66,11 @@ CONFIGURE_ARGS+=	--with-pam
 .else
 CONFIGURE_ARGS+=	--without-pam
 .endif
+
+###
+### SQLite support.
+###
+.if !empty(PKG_OPTIONS:Msqlite)
+CONFIGURE_ARGS+=	--with-sqlite
+.  include "../../databases/sqlite3/buildlink3.mk"
+.endif
diff --git a/mail/dovecot/patches/patch-aa b/mail/dovecot/patches/patch-aa
index ee0c5d67550..af042b31a89 100644
--- a/mail/dovecot/patches/patch-aa
+++ b/mail/dovecot/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2005/01/08 19:58:16 schmonz Exp $
+$NetBSD: patch-aa,v 1.5 2006/02/06 15:54:37 ghen Exp $
 
---- Makefile.in.orig	2005-01-06 13:28:47.000000000 -0500
+--- Makefile.in.orig	2006-01-31 11:12:20.000000000 +0100
 +++ Makefile.in
-@@ -101,7 +101,7 @@ ssldir = @ssldir@
- SUBDIRS = src doc
+@@ -212,7 +212,7 @@ SUBDIRS = \
+ 	$(DOCS)
  
  confdir = $(sysconfdir)
 -conf_DATA = dovecot-example.conf
 +conf_DATA = 
- 
- EXTRA_DIST =  	config.rpath 	dovecot.spec 	dovecot.spec.in 	COPYING.LGPL 	$(conf_DATA)
- 
+ EXTRA_DIST = \
+ 	dovecot.spec \
+ 	dovecot.spec.in \
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 2c41d23cc01..7298cad5245 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.7 2005/01/08 19:58:16 schmonz Exp $
+$NetBSD: patch-ab,v 1.8 2006/02/06 15:54:37 ghen Exp $
 
---- dovecot-example.conf.orig	2004-12-29 13:00:24.000000000 -0500
+--- dovecot-example.conf.orig	2006-02-06 16:39:00.000000000 +0100
 +++ dovecot-example.conf
-@@ -11,7 +11,7 @@
+@@ -5,17 +5,14 @@
+ # 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
+-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+-# --with-ssldir=/etc/ssl
++# any of the lines.
+ 
+ # Base directory where to store runtime data.
+ #base_dir = /var/run/dovecot/
  
  # Protocols we want to be serving:
  #  imap imaps pop3 pop3s
@@ -11,8 +22,8 @@ $NetBSD: patch-ab,v 1.7 2005/01/08 19:58:16 schmonz 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 +27,7 @@
- #pop3s_listen = 
+@@ -31,7 +28,7 @@
+ #ssl_listen =
  
  # Disable SSL/TLS support.
 -#ssl_disable = no
@@ -20,68 +31,93 @@ $NetBSD: patch-ab,v 1.7 2005/01/08 19:58:16 schmonz 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
-@@ -85,7 +85,7 @@
- login = imap
- 
- # Executable location.
--#login_executable = /usr/libexec/dovecot/imap-login
-+#login_executable = @PREFIX@/libexec/dovecot/imap-login
- 
- # 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
-@@ -132,7 +132,7 @@ login = imap
- login = pop3
- 
- # Exception to above rule being the executable location.
--#login_executable = /usr/libexec/dovecot/pop3-login
-+#login_executable = @PREFIX@/libexec/dovecot/pop3-login
- 
- ##
- ## Mail processes
-@@ -338,7 +338,7 @@ login = pop3
+@@ -420,19 +417,19 @@
+ 
+ protocol imap {
+   # Login executable location.
+-  #login_executable = /usr/libexec/dovecot/imap-login
++  #login_executable = /usr/pkg/libexec/dovecot/imap-login
+ 
+   # IMAP executable location. Changing this allows you to execute other
+   # binaries before the imap process is executed.
+   #
+   # This would write rawlogs into ~/dovecot.rawlog/ directory:
+-  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
++  #   mail_executable = /usr/pkg/libexec/dovecot/rawlog /usr/pkg/libexec/dovecot/imap
+   #
+   # This would attach gdb into the imap process and write backtraces into
+   # /tmp/gdbhelper.* files:
+-  #   mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
++  #   mail_executable = /usr/pkg/libexec/dovecot/gdbhelper /usr/pkg/libexec/dovecot/imap
+   #
+-  #mail_executable = /usr/libexec/dovecot/imap
++  #mail_executable = /usr/pkg/libexec/dovecot/imap
+ 
+   # 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
+@@ -441,7 +438,7 @@ protocol imap {
+ 
+   # Support for dynamically loadable modules.
+   #mail_use_modules = no
+-  #mail_modules = /usr/lib/dovecot/imap
++  #mail_modules = /usr/pkg/lib/dovecot/imap
+ 
+   # Send IMAP capabilities in greeting message. This makes it unnecessary for
+   # clients to request it with CAPABILITY command, so it saves one round-trip.
+@@ -481,10 +478,10 @@ protocol imap {
+ 
+ protocol pop3 {
+   # Login executable location.
+-  #login_executable = /usr/libexec/dovecot/pop3-login
++  #login_executable = /usr/pkg/libexec/dovecot/pop3-login
+ 
+   # POP3 executable location
+-  #mail_executable = /usr/libexec/dovecot/pop3
++  #mail_executable = /usr/pkg/libexec/dovecot/pop3
+ 
+   # 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
+@@ -535,7 +532,7 @@ protocol pop3 {
+ 
+   # Support for dynamically loadable modules.
+   #mail_use_modules = no
+-  #mail_modules = /usr/lib/dovecot/pop3
++  #mail_modules = /usr/pkg/lib/dovecot/pop3
+ 
+   # Workarounds for various client bugs:
+   #   outlook-no-nuls:
+@@ -553,7 +550,7 @@ protocol pop3 {
  ##
  
  # 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.
-@@ -346,14 +346,14 @@ login = pop3
- 
- # Support for dynamically loadable modules.
- #imap_use_modules = no
--#imap_modules = /usr/lib/dovecot/imap
-+#imap_modules = @PREFIX@/lib/dovecot/imap
- 
- ##
- ## POP3 process
- ##
- 
- # Executable location
--#pop3_executable = /usr/libexec/dovecot/pop3
-+#pop3_executable = @PREFIX@/libexec/dovecot/pop3
- 
- # 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.
-@@ -361,7 +361,7 @@ login = pop3
- 
- # Support for dynamically loadable modules.
- #pop3_use_modules = no
--#pop3_modules = /usr/lib/dovecot/pop3
-+#pop3_modules = @PREFIX@/lib/dovecot/pop3
- 
- ##
- ## Authentication processes
-@@ -438,9 +438,9 @@ auth_userdb = passwd
- #   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 = pam
-+auth_passdb = passwd
- 
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth
++#auth_executable = /usr/pkg/libexec/dovecot/dovecot-auth
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
+@@ -642,7 +639,7 @@ auth default {
+   # Note that PAM can only be used to verify if user's password is correct,
+   # so it can't be used as userdb. If you don't want to use a separate user
+   # database (passwd usually), you can use static userdb.
+-  passdb pam {
++  #passdb pam {
+     # [session=yes] [cache_key=<key>] [<service name>]
+     #
+     # session=yes makes Dovecot open and immediately close PAM session. Some
+@@ -666,13 +663,13 @@ auth default {
+     #   args = session=yes *
+     #   args = cache_key=%u dovecot
+     #args = dovecot
+-  }
++  #}
+ 
+   # /etc/passwd or similar, using getpwnam()
+   # In many systems nowadays this uses Name Service Switch, which is
+   # configured in /etc/nsswitch.conf.
+-  #passdb passwd {
+-  #}
++  passdb passwd {
++  }
+ 
+   # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
+   #passdb shadow {