update mail/dovecot: 0.99.9.1 -> 0.99.10

PR:		53796
Submitted by:	Dominic Marks <dominic.marks@btinternet.com> (maintainer)

3 files changed, 55 insertions, 20 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 7e86599b02df..4774569feabc 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	dovecot
 # Date created:				12/08/2002
-# Whom:			Dominic Marks <d.marks@student.umist.ac.uk>
+# Whom:			Dominic Marks <dominic.marks@btinternet.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	0.99.9.1
+PORTVERSION=	0.99.10
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://dovecot.procontrol.fi/
 
@@ -91,7 +91,7 @@ LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
 
-pre-everything:
+pre-everything::
 	@${ECHO_MSG} "==>  Dovecot Options"
 	@${ECHO_MSG} "==>   See the Makefile for descriptions."
 	@${ECHO_MSG} "==> ------------------------------------------"
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 2576efd71b5e..7f1429c69dcb 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1 +1 @@
-MD5 (dovecot-0.99.9.1.tar.gz) = d8d51af34a3467b65b20dc9d09140fbe
+MD5 (dovecot-0.99.10.tar.gz) = 26d8452366a28418cc8a114781a721b6
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 21bd705f7319..27f2883a551a 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	Fri Apr  4 13:17:25 2003
-+++ dovecot-example.conf	Sat Apr 19 14:11:40 2003
+--- dovecot-example.conf.orig	Thu Jun 26 17:11:06 2003
++++ dovecot-example.conf	Thu Jun 26 22:36:08 2003
 @@ -7,11 +7,11 @@
  # --with-ssldir=/etc/ssl
  
@@ -58,9 +58,9 @@
 -#login_executable = /usr/libexec/dovecot/imap-login
 +login_executable = %%PREFIX%%/libexec/dovecot/imap-login
  
- # User to use for the login process. The user must belong to a group where
- # only it has access, it's used to control access for authentication process
- # named sockets.
+ # 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
+ # only it has access, it's used to control access for authentication process.
 -#login_user = dovecot
 +login_user = dovecot
  
@@ -95,9 +95,18 @@
 -#verbose_ssl = no
 +verbose_ssl = yes
  
- # Valid UID/GID ranges for users, defaults to 500 and above. This is mostly
+ # 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.
-@@ -160,7 +160,7 @@
+@@ -155,7 +155,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.
+-#first_valid_gid = 1
++first_valid_gid = 0
+ #last_valid_gid = 0
+ 
+ # ':' separated list of directories under which chrooting is allowed for mail
+@@ -164,7 +164,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,7 +115,7 @@
  
  # Default MAIL environment to use when it's not set. By leaving this empty
  # dovecot tries to do some automatic detection as described in
-@@ -179,7 +179,7 @@
+@@ -183,7 +183,7 @@
  #   mbox:~/mail/:INBOX=/var/mail/%u
  #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
@@ -115,7 +124,7 @@
  
  # Space-separated list of fields to cache for all mails. Currently these
  # fields are allowed followed by a list of commands they speed up:
-@@ -224,7 +224,7 @@
+@@ -228,7 +228,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 +133,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
-@@ -249,7 +249,7 @@
+@@ -253,7 +253,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 +142,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.
-@@ -261,7 +261,7 @@
+@@ -265,7 +265,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 +151,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
-@@ -280,7 +280,7 @@
+@@ -284,7 +284,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 +160,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
-@@ -310,7 +310,7 @@
+@@ -314,7 +314,7 @@
  ##
  
  # Executable location
@@ -160,7 +169,15 @@
  
  # 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.
-@@ -321,7 +321,7 @@
+@@ -322,14 +322,14 @@
+ 
+ # 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
@@ -169,7 +186,16 @@
  
  # 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.
-@@ -374,10 +374,10 @@
+@@ -337,7 +337,7 @@
+ 
+ # Support for dynamically loadable modules.
+ #pop3_use_modules = no
+-#pop3_modules = /usr/lib/dovecot/pop3
++#pop3_modules = %%PREFIX%%/lib/dovecot/pop3
+ 
+ ##
+ ## Authentication processes
+@@ -386,10 +386,10 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
@@ -182,7 +208,16 @@
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -402,7 +402,7 @@
+@@ -397,7 +397,7 @@
+ # User to use for the process. This user needs access to only user and
+ # password databases, nothing else. Only shadow and pam authentication
+ # requires roots, so use something else if possible.
+-auth_user = root
++auth_user = dovecot
+ 
+ # Directory where to chroot the process. Most authentication backends don't
+ # work if this is set, and there's no point chrooting if auth_user is root.
+@@ -418,7 +418,7 @@
  
  # More verbose logging. Useful for figuring out why authentication isn't
  # working.