[Midnightbsd-cvs] mports: mail/dovecot: update to 1.1.11

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 8 10:40:42 EDT 2009


Log Message:
-----------
update to 1.1.11

Modified Files:
--------------
    mports/mail/dovecot:
        Makefile (r1.18 -> r1.19)
        distinfo (r1.15 -> r1.16)
        pkg-plist (r1.7 -> r1.8)
    mports/mail/dovecot/files:
        patch-dovecot-example.conf (r1.4 -> r1.5)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/mail/dovecot/pkg-plist,v
retrieving revision 1.7
retrieving revision 1.8
diff -L mail/dovecot/pkg-plist -L mail/dovecot/pkg-plist -u -r1.7 -r1.8
--- mail/dovecot/pkg-plist
+++ mail/dovecot/pkg-plist
@@ -1,9 +1,11 @@
- at comment $MidnightBSD$
+ at comment $FreeBSD: ports/mail/dovecot-devel/pkg-plist,v 1.28 2008/05/04 09:28:54 delphij Exp $
 @unexec if cmp -s %D/etc/dovecot-example.conf %D/etc/dovecot.conf; then rm -f %D/etc/dovecot.conf; fi
 etc/dovecot-example.conf
 @exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
 %%PORTDOCS%%etc/dovecot-ldap-example.conf
 %%PORTDOCS%%etc/dovecot-sql-example.conf
+ at dirrmtry include/dovecot
+ at dirrm lib/dovecot/auth
 lib/dovecot/imap/lib01_acl_plugin.so
 lib/dovecot/imap/lib02_lazy_expunge_plugin.so
 lib/dovecot/imap/lib10_quota_plugin.so
@@ -12,21 +14,28 @@
 lib/dovecot/imap/lib11_imap_quota_plugin.so
 lib/dovecot/imap/lib11_trash_plugin.so
 lib/dovecot/imap/lib20_convert_plugin.so
+lib/dovecot/imap/lib20_fts_plugin.so
+lib/dovecot/imap/lib20_expire_plugin.so
 lib/dovecot/imap/lib20_mail_log_plugin.so
-lib/dovecot/imap/lib20_zlib_plugin.a
-lib/dovecot/imap/lib20_zlib_plugin.la
+lib/dovecot/imap/lib20_mbox_snarf_plugin.so
 lib/dovecot/imap/lib20_zlib_plugin.so
+lib/dovecot/imap/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot/imap
 lib/dovecot/lda/lib01_acl_plugin.so
 lib/dovecot/lda/lib10_quota_plugin.so
 lib/dovecot/lda/lib11_trash_plugin.so
 lib/dovecot/lda/lib20_convert_plugin.so
+lib/dovecot/lda/lib20_expire_plugin.so
+lib/dovecot/lda/lib20_fts_plugin.so
 lib/dovecot/lda/lib20_mail_log_plugin.so
+lib/dovecot/lda/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot/lda
 lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
 lib/dovecot/pop3/lib10_quota_plugin.so
 lib/dovecot/pop3/lib20_convert_plugin.so
+lib/dovecot/pop3/lib20_expire_plugin.so
 lib/dovecot/pop3/lib20_mail_log_plugin.so
+lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
 @dirrm lib/dovecot/pop3
 lib/dovecot/lib01_acl_plugin.a
 lib/dovecot/lib01_acl_plugin.la
@@ -43,18 +52,33 @@
 lib/dovecot/lib20_convert_plugin.a
 lib/dovecot/lib20_convert_plugin.la
 lib/dovecot/lib20_convert_plugin.so
+lib/dovecot/lib20_expire_plugin.a
+lib/dovecot/lib20_expire_plugin.so
+lib/dovecot/lib20_expire_plugin.la
+lib/dovecot/lib20_fts_plugin.a
+lib/dovecot/lib20_fts_plugin.so
+lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_mail_log_plugin.a
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mail_log_plugin.so
+lib/dovecot/lib20_mbox_snarf_plugin.a
+lib/dovecot/lib20_mbox_snarf_plugin.la
+lib/dovecot/lib20_mbox_snarf_plugin.so
+lib/dovecot/lib21_fts_squat_plugin.a
+lib/dovecot/lib21_fts_squat_plugin.so
+lib/dovecot/lib21_fts_squat_plugin.la
 @dirrm lib/dovecot
 libexec/dovecot/checkpassword-reply
 %%LDA%%libexec/dovecot/deliver
+libexec/dovecot/convert-tool
 libexec/dovecot/dict
 libexec/dovecot/dovecot-auth
+libexec/dovecot/expire-tool
 libexec/dovecot/gdbhelper
 libexec/dovecot/idxview
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/listview
 libexec/dovecot/logview
 %%POP3%%libexec/dovecot/pop3
 %%POP3%%libexec/dovecot/pop3-login
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/dovecot/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -L mail/dovecot/Makefile -L mail/dovecot/Makefile -u -r1.18 -r1.19
--- mail/dovecot/Makefile
+++ mail/dovecot/Makefile
@@ -1,28 +1,21 @@
-# ex:ts=8
-# New ports collection makefile for:	dovecot
-# Date created:				12/08/2002
-# Whom:			Dominic Marks <dominic.marks at btinternet.com>
-#
 # $MidnightBSD$
-# $FreeBSD: ports/mail/dovecot/Makefile,v 1.66 2007/03/15 00:38:04 clsung Exp $
-#
 
 PORTNAME=	dovecot
-DISTVERSION=	1.0.15
+DISTVERSION=	1.1.11
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.dovecot.org/releases/1.0/
+MASTER_SITES=	http://www.dovecot.org/releases/1.1/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Secure and compact IMAP and POP3 servers
 LICENSE=	lgpl
-# technically agg, but worst case is lgpl
 
 USE_ICONV=	yes
 USE_RC_SUBR=	dovecot.sh
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
-CONFIGURE_ARGS=	--without-shadow --localstatedir=/var
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.1
+CONFIGURE_ARGS=	--without-shadow --localstatedir=/var \
+		--with-statedir=/var/db/dovecot
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	${PREFIX}/lib/dovecot \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/dovecot/distinfo,v
retrieving revision 1.15
retrieving revision 1.16
diff -L mail/dovecot/distinfo -L mail/dovecot/distinfo -u -r1.15 -r1.16
--- mail/dovecot/distinfo
+++ mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.15.tar.gz) = aa39c11c18df6b95b64d4f04d793d77a
-SHA256 (dovecot-1.0.15.tar.gz) = 2b4d8720d5f5868d57df294350ee0f5a8d2723e9937dab1eea2084478ace9597
-SIZE (dovecot-1.0.15.tar.gz) = 1783347
+MD5 (dovecot-1.1.11.tar.gz) = c973eb41aca79fb16630a16f0d84f765
+SHA256 (dovecot-1.1.11.tar.gz) = d37fa251219559841151e12ba000565da6b999f48827db6beee612865f7a5a34
+SIZE (dovecot-1.1.11.tar.gz) = 2362415
Index: patch-dovecot-example.conf
===================================================================
RCS file: /home/cvs/mports/mail/dovecot/files/patch-dovecot-example.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -L mail/dovecot/files/patch-dovecot-example.conf -L mail/dovecot/files/patch-dovecot-example.conf -u -r1.4 -r1.5
--- mail/dovecot/files/patch-dovecot-example.conf
+++ mail/dovecot/files/patch-dovecot-example.conf
@@ -1,189 +1,261 @@
---- dovecot-example.conf.orig	2008-03-04 05:48:12.000000000 +0000
-+++ dovecot-example.conf	2008-03-05 22:49:08.554336095 +0000
-@@ -12,7 +12,7 @@
- # Default values are shown for each setting, it's not required to uncomment
- # any of the lines. Exception to this are paths, they're just examples with
- # the real defaults being based on configure options. The paths listed here
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-+# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
- # --with-ssldir=/etc/ssl
+--- dovecot-example.conf.orig	2009-01-25 20:12:41.000000000 -0500
++++ dovecot-example.conf	2009-01-25 20:12:41.000000000 -0500
+@@ -20,7 +20,7 @@
  
- # Base directory where to store runtime data.
-@@ -21,6 +21,7 @@
  # Protocols we want to be serving: imap imaps pop3 pop3s
  # If you only want to use dovecot-auth, you can set this to "none".
- #protocols = imap imaps
+-#protocols = imap imaps
 +protocols = %%PROTOCOLS%%
  
- # IP or host address where to listen in for connections. It's not currently
- # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -210,6 +212,7 @@
+ # A space separated list of IP or host addresses where to listen in for
+ # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
+@@ -44,7 +44,7 @@
+ # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
+ # matches the local IP (ie. you're connecting from the same computer), the
+ # connection is considered secure and plaintext authentication is allowed.
+-#disable_plaintext_auth = yes
++disable_plaintext_auth = no
+ 
+ # Should all IMAP and POP3 processes be killed when Dovecot master process
+ # shuts down. Setting this to "no" means that Dovecot can be upgraded without
+@@ -214,7 +214,7 @@
+ #
  # <doc/wiki/MailLocation.txt>
  #
- #mail_location = 
+-#mail_location = 
 +mail_location = mbox:~/mail/:INBOX=/var/mail/%u
  
  # If you need to set multiple mailbox locations or want to change default
  # namespace settings, you can do it by defining namespace sections.
-@@ -256,6 +259,7 @@
- # used only for creating mbox dotlock files when creation fails for INBOX.
+@@ -272,7 +272,7 @@
+ # Group to enable temporarily for privileged operations. Currently this is
+ # used only with INBOX when either its initial creation or dotlocking fails.
  # Typically this is set to "mail" to give access to /var/mail.
- #mail_privileged_group =
+-#mail_privileged_group =
 +mail_privileged_group = mail
  
  # Grant access to these supplementary groups for mail processes. Typically
  # these are used to set up access to shared mailboxes. Note that it may be
-@@ -320,6 +324,7 @@
+@@ -311,7 +311,7 @@
+ 
+ # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
+ # since version 3, so this should be safe to use nowadays by default.
+-#dotlock_use_excl = yes
++dotlock_use_excl = yes
+ 
+ # Don't use fsync() or fdatasync() calls. This makes the performance better
+ # at the cost of potential data loss if the server (or the file server)
+@@ -339,20 +339,20 @@
+ # 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).
- #verbose_proctitle = no
+-#verbose_proctitle = no
 +verbose_proctitle = 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.
-@@ -333,6 +338,7 @@
+ # Note that denying root logins is hardcoded to dovecot binary and can't
+ # be done even if first_valid_uid is set to 0.
+-#first_valid_uid = 500
++first_valid_uid = 1000
+ #last_valid_uid = 0
+ 
+ # Valid GID range for users, defaults to non-root/wheel. Users having
+ # 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
+-#first_valid_gid = 1
++first_valid_gid = 1000
  #last_valid_gid = 0
  
  # Maximum number of running mail processes. When this limit is reached,
-@@ -506,19 +512,19 @@
- 
- protocol imap {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/imap-login
-+  #login_executable = %%PREFIX%%/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 = %%PREFIX%%/libexec/dovecot/rawlog %%PREFIX%%/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 = %%PREFIX%%/libexec/dovecot/gdbhelper %%PREFIX%%/libexec/dovecot/imap
-   #
--  #mail_executable = /usr/libexec/dovecot/imap
-+  #mail_executable = %%PREFIX%%/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
-@@ -528,7 +534,7 @@
-   # 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
+@@ -419,7 +419,7 @@
  
+ # When copying a message, do it with hard links whenever possible. This makes
+ # the performance much better, and it's unlikely to have any side effects.
+-#maildir_copy_with_hardlinks = yes
++maildir_copy_with_hardlinks = yes
+ 
+ # When copying a message, try to preserve the base filename. Only if the
+ # destination mailbox already contains the same name (ie. the mail is being
+@@ -534,7 +534,7 @@
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -563,6 +569,7 @@
+   # Many clients however don't understand it and ask the CAPABILITY anyway.
+-  #login_greeting_capability = no
++  login_greeting_capability = yes
+ 
+   # IMAP logout format string:
+   #  %i - total number of bytes read from client
+@@ -563,7 +563,7 @@
+   #     but not both. Thunderbird separates these two by forcing server to
    #     accept '/' suffix in mailbox names in subscriptions list.
    # The list is space-separated.
-   #imap_client_workarounds = outlook-idle
-+  imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
+-  #imap_client_workarounds = 
++  imap_client_workarounds = delay-newmail netscape-eoh tb-extra-mailbox-sep
  }
    
  ##
-@@ -571,11 +578,11 @@
- 
- protocol pop3 {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/pop3-login
-+  #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
- 
-   # POP3 executable location. See IMAP's mail_executable above for examples
-   # how this could be changed.
--  #mail_executable = /usr/libexec/dovecot/pop3
-+  #mail_executable = %%PREFIX%%/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
-@@ -621,6 +628,7 @@
-   # installations.
+@@ -615,7 +615,7 @@
+   # Dovecot's default, so if you're building a new server it would be a good
+   # idea to change this. %08Xu%08Xv should be pretty fail-safe.
    #
-   #pop3_uidl_format = 
+-  #pop3_uidl_format = %08Xu%08Xv
 +  pop3_uidl_format = %08Xu%08Xv
  
    # POP3 logout format string:
-   #  %t - number of TOP commands
-@@ -635,7 +643,7 @@
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/pop3
-+  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/pop3
- 
-   # Workarounds for various client bugs:
-   #   outlook-no-nuls:
-@@ -646,6 +654,7 @@
+   #  %i - total number of bytes read from client
+@@ -646,7 +646,7 @@
+   #     Outlook Express and Netscape Mail breaks if end of headers-line is
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
-   #pop3_client_workarounds = 
+-  #pop3_client_workarounds = 
 +  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
  }
  
  ##
-@@ -663,10 +672,11 @@
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/lda
-+  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/lda
- 
-   # 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
-@@ -677,7 +687,7 @@
- ##
+@@ -741,7 +741,7 @@
+ # the standard variables here, eg. %Lu would lowercase the username, %n would
+ # drop away the domain if it was given, or "%n-AT-%d" would change the '@' into
+ # "-AT-". This translation is done after auth_username_translation changes.
+-#auth_username_format =
++auth_username_format = %Lu
+ 
+ # If you want to allow master users to log in by specifying the master
+ # username within the normal username string (ie. not using SASL mechanism's
+@@ -797,7 +797,7 @@
+   #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey
+   #   gss-spnego
+   # NOTE: See also disable_plaintext_auth setting.
+-  mechanisms = plain
++  mechanisms = plain login
+ 
+   #
+   # Password database is used to verify user's password (and nothing more).
+@@ -859,6 +859,7 @@
+     #   args = session=yes %Ls
+     #   args = cache_key=%u dovecot
+     #args = dovecot
++    args = session=yes dovecot
+   }
+ 
+   # System users (NSS, /etc/passwd, or similiar)
+@@ -902,14 +903,16 @@
+ 
+   # SQL database <doc/wiki/AuthDatabase.SQL.txt>
+   #passdb sql {
+-    # Path for SQL configuration file, see doc/dovecot-sql-example.conf
+-    #args = 
++    # Path for SQL configuration file.
++    # See doc/dovecot-sql-example.conf
++    #args = /etc/dovecot-sql.conf
+   #}
+ 
+   # LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
+   #passdb ldap {
+-    # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
+-    #args = 
++    # Path for LDAP configuration file.
++    # See doc/dovecot-ldap-example.conf
++    #args = /etc/dovecot-ldap.conf
+   #}
  
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
- 
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -783,7 +793,7 @@
- 
-   #passdb passwd-file {
-     # File contains a list of usernames, one per line
--    #args = /etc/dovecot.deny
-+    #args = %%PREFIX%%/etc/dovecot.deny
-     #deny = yes
+   # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
+@@ -944,7 +947,7 @@
+     # proceses. Useful with remote NSS lookups that may block.
+     # NOTE: Be sure to use this setting with nss_ldap or users might get
+     # logged in as each others!
+-    #args = 
++    args = blocking=yes
+   }
+ 
+   # passwd-like file with specified location
+@@ -973,14 +976,16 @@
+ 
+   # SQL database <doc/wiki/AuthDatabase.SQL.txt>
+   #userdb sql {
+-    # Path for SQL configuration file, see doc/dovecot-sql-example.conf
+-    #args = 
++    # Path for SQL configuration file.
++    # See doc/dovecot-sql-example.conf
++    #args = /etc/dovecot-sql.conf
    #}
  
-@@ -1021,7 +1031,7 @@
- # referenced using URIs in format "proxy:<name>".
+   # LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
+   #userdb ldap {
+-    # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
+-    #args = 
++    # Path for LDAP configuration file.
++    # See doc/dovecot-ldap-example.conf
++    #args = /etc/dovecot-ldap.conf
+   #}
  
- dict {
--  #quota = mysql:/etc/dovecot-dict-quota.conf 
-+  #quota = mysql:%%PREFIX%%/etc/dovecot-dict-quota.conf 
+   # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
+@@ -1012,25 +1017,25 @@
+   #ssl_username_from_cert = no
+ 
+   # It's possible to export the authentication interface to other programs:
+-  #socket listen {
+-    #master {
++  socket listen {
++    master {
+       # Master socket provides access to userdb information. It's typically
+       # used to give Dovecot's local delivery agent access to userdb so it
+       # can find mailbox locations.
+-      #path = /var/run/dovecot/auth-master
+-      #mode = 0600
++      path = /var/run/dovecot/auth-master
++      mode = 0600
+       # Default user/group is the one who started dovecot-auth (root)
+       #user = 
+       #group = 
+-    #}
+-    #client {
++    }
++    client {
+       # The client socket is generally safe to export to everyone. Typical use
+       # is to export it to your SMTP server so it can do SMTP AUTH lookups
+       # using it.
+-      #path = /var/run/dovecot/auth-client
+-      #mode = 0660
+-    #}
+-  #}
++      path = /var/run/dovecot/auth-client
++      mode = 0660
++    }
++  }
  }
  
+ # If you wish to use another authentication server than dovecot-auth, you can
+@@ -1060,8 +1065,9 @@
+   #quota = mysql:/etc/dovecot-dict-quota.conf 
+ }
+ 
+-# Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf
+-#dict_db_config = 
++# Path to Berkeley DB's configuration file.
++# See doc/dovecot-db-example.conf
++#dict_db_config = /etc/dovecot-db.conf
+ 
  ##
-@@ -1045,7 +1055,7 @@
-   # directory. You can also optionally give a global ACL directory path where
-   # ACLs are applied to all users' mailboxes. The global ACL directory contains
-   # one file for each mailbox, eg. INBOX or sub.mailbox.
--  #acl = vfile:/etc/dovecot-acls
-+  #acl = vfile:%%PREFIX%%/etc/dovecot-acls
- 
-   # Convert plugin. If set, specifies the source storage path which is
-   # converted to destination storage (mail_location) when the user logs in.
-@@ -1059,7 +1069,7 @@
-   # until the message can be saved within quota limits. The configuration file
-   # is a text file where each line is in format: <priority> <mailbox name>
-   # Mails are first deleted in lowest -> highest priority number order
--  #trash = /etc/dovecot-trash.conf
-+  #trash = %%PREFIX%%/etc/dovecot-trash.conf
+ ## Plugin settings
+@@ -1098,8 +1104,8 @@
+   # Each quota root has separate limits. Only the command for the first
+   # exceeded limit is excecuted, so put the highest limit first.
+   # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
+-  #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
+-  #   quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
++  #   quota_warning = storage=95%% /usr/bin/quota-warning.sh 95
++  #   quota_warning2 = storage=80%% /usr/bin/quota-warning.sh 80
+   #quota = maildir
+ 
+   # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir
+@@ -1136,7 +1142,7 @@
+   # you must set up:
+   #   dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool
+   #expire = Trash 7 Spam 30
+-  #expire_dict = db:/var/lib/dovecot/expire.db
++  #expire_dict = db:/var/db/dovecot/expire.db
  
    # Lazy expunge plugin. Currently works only with maildirs. When a user
    # expunges mails, the mails are moved to a mailbox in another namespace


More information about the Midnightbsd-cvs mailing list