6 files changed, 46 insertions, 52 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 27289f294ca9..348d0058c667 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	0.99.10.5
+PORTVERSION=	0.99.10.6
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/
 
@@ -32,12 +32,13 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 DOCS=		auth.txt configuration.txt design.txt \
 		index.txt mail-storages.txt mkcert.sh multiaccess.txt \
 		nfs.txt dovecot-ldap.conf dovecot-pgsql.conf \
-		dovecot-openssl.cnf securecoding.txt
+		dovecot-mysql.conf dovecot-openssl.cnf securecoding.txt
 
 OPTIONS=	SASL2		"SASL2 support"		off \
 		VPOPMAIL	"VPopMail support"	off \
 		LDAP		"OpenLDAP support"	off \
-		PGSQL		"PostgreSQL support"	off
+		PGSQL		"PostgreSQL support"	off \
+		MYSQL		"MySQL support"		off
 
 .include <bsd.port.pre.mk>
 
@@ -85,6 +86,16 @@ LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
 
+## MySQL Support
+#
+# MySQL is another SQL database that can be
+# used to store user tables.
+#
+.if defined(WITH_MYSQL)
+USE_MYSQL=		yes
+CONFIGURED_ARGS+=	--with-mysql
+.endif
+
 pre-build:
 	@${REINPLACE_CMD} -e 's,%%SSLDIR%%,/var/dovecot/ssl,' \
 		${WRKSRC}/doc/mkcert.sh \
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 4bac4bf3a57e..31af0c6b318f 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,2 +1,2 @@
-MD5 (dovecot-0.99.10.5.tar.gz) = acda02c8bdcff5e194a8b9227ccb74b5
-SIZE (dovecot-0.99.10.5.tar.gz) = 863825
+MD5 (dovecot-0.99.10.6.tar.gz) = 4f4f61147dc202a05c673a77535e5a46
+SIZE (dovecot-0.99.10.6.tar.gz) = 858545
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 95b0d407fd9f..bb8f5ee3d8ec 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,11 +1,11 @@
---- dovecot-example.conf.orig	Sat May 29 16:56:16 2004
-+++ dovecot-example.conf	Sat May 29 17:08:35 2004
+--- dovecot-example.conf.orig	Fri Jun 18 19:25:31 2004
++++ dovecot-example.conf	Mon Jun 21 11:15:52 2004
 @@ -7,11 +7,11 @@
  # --with-ssldir=/etc/ssl
  
  # Base directory where to store runtime data.
 -#base_dir = /var/run/dovecot/
-+base_dir = /var/dovecot
++base_dir = /var/dovecot/
  
  # Protocols we want to be serving:
  #  imap imaps pop3 pop3s
@@ -37,10 +37,10 @@
  
  # How often to regenerate the SSL parameters file. Generation is quite CPU
  # intensive operation. The value is in hours, 0 disables regeneration
-@@ -67,11 +67,11 @@
- # Directory where authentication process places authentication UNIX sockets
+@@ -68,11 +68,11 @@
  # which login needs to be able to connect to. The sockets are created when
- # running as root, so you don't have to worry about permissions.
+ # running as root, so you don't have to worry about permissions. Note that
+ # everything in this directory is deleted when Dovecot is started.
 -#login_dir = /var/run/dovecot/login
 +login_dir = /var/dovecot/login
  
@@ -51,7 +51,7 @@
  
  
  ##
-@@ -81,12 +81,12 @@
+@@ -82,12 +82,12 @@
  login = imap
  
  # Executable location.
@@ -66,7 +66,7 @@
  
  # Set max. process size in megabytes. If you don't use
  # login_process_per_connection you might need to grow this.
-@@ -126,7 +126,7 @@
+@@ -127,7 +127,7 @@
  login = pop3
  
  # Exception to above rule being the executable location.
@@ -75,7 +75,7 @@
  
  ##
  ## Mail processes
-@@ -139,10 +139,10 @@
+@@ -140,7 +140,7 @@
  # Show more verbose process titles (in ps). Currently shows user name and
  # IP address. Useful for seeing who are actually using the IMAP processes
  # (eg. shared mailboxes or if same uid is used for multiple accounts).
@@ -83,12 +83,8 @@
 +verbose_proctitle = yes
  
  # Show protocol level SSL errors.
--#verbose_ssl = no
-+verbose_ssl = yes
- 
- # Valid UID range for users, defaults to 500 and above. This is mostly
- # to make sure that users can't log in as daemons or other system users.
-@@ -155,7 +155,7 @@
+ #verbose_ssl = no
+@@ -156,7 +156,7 @@
  # non-valid GID as primary group ID aren't allowed to log in. If user
  # belongs to supplementary groups with non-valid GIDs, those groups are
  # not set.
@@ -96,8 +92,8 @@
 +first_valid_gid = 0
  #last_valid_gid = 0
  
- # ':' separated list of directories under which chrooting is allowed for mail
-@@ -164,7 +164,7 @@
+ # Grant access to these extra groups for mail processes. Typical use would be
+@@ -169,7 +169,7 @@
  # WARNING: Never add directories here which local users can modify, that
  # may lead to root exploit. Usually this should be done only if you don't
  # allow shell access for users. See doc/configuration.txt for more information.
@@ -106,16 +102,16 @@
  
  # Default chroot directory for mail processes. This can be overridden by
  # giving /./ in user's home directory (eg. /home/./user chroots into /home).
-@@ -187,7 +187,7 @@
- #   mbox:~/mail/:INBOX=/var/mail/%u
- #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
+@@ -192,7 +192,7 @@
+ #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
+ #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
 -#default_mail_env = 
 +default_mail_env = mbox:/var/mail/%u
  
  # Space-separated list of fields to cache for all mails. Currently these
  # fields are allowed followed by a list of commands they speed up:
-@@ -232,7 +232,7 @@
+@@ -237,7 +237,7 @@
  #     arrives in half a hour, Dovecot closes the connection. This is still
  #     fine, except Outlook doesn't connect back so you don't see if new mail
  #     arrives.
@@ -124,7 +120,7 @@
  
  # Dovecot can notify client of new mail in selected mailbox soon after it's
  # received. This setting specifies the minimum interval in seconds between
-@@ -257,7 +257,7 @@
+@@ -262,7 +262,7 @@
  # Save mails with CR+LF instead of plain LF. This makes sending those mails
  # take less CPU, especially with sendfile() syscall with Linux and FreeBSD.
  # But it also creates a bit more disk I/O which may just make it slower.
@@ -133,7 +129,7 @@
  
  # Use mmap() instead of read() to read mail files. read() seems to be a bit
  # faster with my Linux/x86 and it's better with NFS, so that's the default.
-@@ -269,7 +269,7 @@
+@@ -281,7 +281,7 @@
  # know any MUA which would modify mail files directly. IMAP protocol also
  # requires that the mails don't change, so it would be problematic in any case.
  # If you care about performance, enable it.
@@ -142,7 +138,7 @@
  
  # Check if mails' content has been changed by external programs. This slows
  # down things as extra stat() needs to be called for each file. If changes are
-@@ -288,7 +288,7 @@
+@@ -300,7 +300,7 @@
  # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
  # and flock. Some operating systems don't allow using both of them
  # simultaneously, eg. BSDs. If dotlock is used, it's always created first.
@@ -151,7 +147,7 @@
  
  # Should we create dotlock file even when we want only a read-lock? Setting
  # this to yes hurts the performance when the mailbox is accessed simultaneously
-@@ -318,7 +318,7 @@
+@@ -330,7 +330,7 @@
  ##
  
  # Executable location
@@ -160,7 +156,7 @@
  
  # 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 +326,14 @@
+@@ -338,14 +338,14 @@
  
  # Support for dynamically loadable modules.
  #imap_use_modules = no
@@ -173,11 +169,11 @@
  
  # Executable location
 -#pop3_executable = /usr/libexec/dovecot/pop3
-+#pop3_executable = %%PREFIX%%/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.
-@@ -341,7 +341,7 @@
+@@ -353,7 +353,7 @@
  
  # Support for dynamically loadable modules.
  #pop3_use_modules = no
@@ -186,7 +182,7 @@
  
  ##
  ## Authentication processes
-@@ -390,9 +390,9 @@
+@@ -403,9 +403,9 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
@@ -198,7 +194,7 @@
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -421,7 +421,7 @@
+@@ -436,7 +436,7 @@
  
  # More verbose logging. Useful for figuring out why authentication isn't
  # working.
diff --git a/mail/dovecot/files/patch-network.c b/mail/dovecot/files/patch-network.c
deleted file mode 100644
index 2a133c381eb0..000000000000
--- a/mail/dovecot/files/patch-network.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/network.c.orig	Sun Jun 22 23:09:48 2003
-+++ src/lib/network.c	Sun Jan 25 20:22:17 2004
-@@ -591,7 +591,11 @@
- int net_hosterror_notfound(int error)
- {
- #ifdef HAVE_IPV6
-+#ifdef EAI_NODATA
- 	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
-+#else
-+	return error != 1 && (error == EAI_NONAME);
-+#endif
- #else
- 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
- #endif
diff --git a/mail/dovecot/pkg-descr b/mail/dovecot/pkg-descr
index 11d9ecc0836e..51dc26165dee 100644
--- a/mail/dovecot/pkg-descr
+++ b/mail/dovecot/pkg-descr
@@ -1,7 +1,7 @@
 Dovecot is a secure and compact IMAP server which is in the early stages
 of developement. It supports Maildirs and mbox formats and much of the
 IMAP v4 protocol including SSL/TLS. IPv6 support is also included.
-Dovecot supports authentication with OpenLDAP, PostgreSQL, vpopmail and
-PAM.
+Dovecot supports authentication with OpenLDAP, PostgreSQL, MySQL vpopmail
+and PAM.
 
-WWW: http://dovecot.procontrol.fi/
+WWW: http://www.dovecot.org/
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index 12fc5375f7bc..0fc3a564bebc 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -15,6 +15,7 @@ sbin/dovecot
 %%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
 %%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
 %%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf
+%%PORTDOCS%%%%DOCSDIR%%/dovecot-mysql.conf
 %%PORTDOCS%%%%DOCSDIR%%/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
 %%PORTDOCS%%%%DOCSDIR%%/mkcert.sh