diff options
author | beech <beech@FreeBSD.org> | 2008-07-03 14:23:05 +0800 |
---|---|---|
committer | beech <beech@FreeBSD.org> | 2008-07-03 14:23:05 +0800 |
commit | b0f778afc9fc935a9a4ca8902d66218d4fc10860 (patch) | |
tree | 7c2569d44a591f38a35cdd6ba0168b97e67a31df /mail/dovecot-devel/files | |
parent | 8c63eed49d7829d394847795b1cdaca67256014c (diff) | |
download | freebsd-ports-gnome-b0f778afc9fc935a9a4ca8902d66218d4fc10860.tar.gz freebsd-ports-gnome-b0f778afc9fc935a9a4ca8902d66218d4fc10860.tar.zst freebsd-ports-gnome-b0f778afc9fc935a9a4ca8902d66218d4fc10860.zip |
- Update mail/dovecot-devel to 1.1.0 release.
- Release notes: http://dovecot.org/list/dovecot-news/2008-June/000079.html
- Upgrade considerations: http://wiki.dovecot.org/Upgrading/1.1
- NB: following release of 1.1.1 (which should resolve upgrade issues
relating to Maildir), this is likely to become mail/dovecot.
PR: ports/124857
Submitted by: Robin Breathe <robin@isometry.net> (maintainer)
Diffstat (limited to 'mail/dovecot-devel/files')
-rw-r--r-- | mail/dovecot-devel/files/patch-dovecot-example.conf | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf index 3e1fdd2f4978..cd57d29ee03d 100644 --- a/mail/dovecot-devel/files/patch-dovecot-example.conf +++ b/mail/dovecot-devel/files/patch-dovecot-example.conf @@ -1,5 +1,5 @@ ---- ./dovecot-example.conf.orig 2008-03-14 20:01:35.000000000 -0700 -+++ ./dovecot-example.conf 2008-04-30 14:18:20.161269186 -0700 +--- dovecot-example.conf.orig 2008-06-21 21:21:38.422213158 +0100 ++++ dovecot-example.conf 2008-06-21 21:29:47.638914442 +0100 @@ -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 @@ -26,7 +26,7 @@ # If you need to set multiple mailbox locations or want to change default # namespace settings, you can do it by defining namespace sections. @@ -273,6 +275,7 @@ - # used only for creating mbox dotlock files when creation fails for INBOX. + # 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 @@ -41,7 +41,15 @@ # 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. -@@ -502,19 +506,19 @@ +@@ -353,6 +357,7 @@ + # 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 + + # Maximum number of running mail processes. When this limit is reached, +@@ -503,19 +508,19 @@ protocol imap { # Login executable location. @@ -65,7 +73,7 @@ # 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 +532,7 @@ +@@ -529,7 +534,7 @@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -74,7 +82,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 +567,7 @@ +@@ -564,6 +569,7 @@ # accept '/' suffix in mailbox names in subscriptions list. # The list is space-separated. #imap_client_workarounds = @@ -82,7 +90,7 @@ } ## -@@ -571,11 +576,11 @@ +@@ -572,11 +578,11 @@ protocol pop3 { # Login executable location. @@ -96,15 +104,7 @@ # 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 -@@ -615,6 +620,7 @@ - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv -+ pop3_uidl_format = %08Xu%08Xv - - # POP3 logout format string: - # %i - total number of bytes read from client -@@ -635,7 +641,7 @@ +@@ -636,7 +642,7 @@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -113,7 +113,7 @@ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -646,6 +652,7 @@ +@@ -647,6 +653,7 @@ # missing. This option simply sends it if it's missing. # The list is space-separated. #pop3_client_workarounds = @@ -121,7 +121,7 @@ } ## -@@ -663,7 +670,7 @@ +@@ -664,7 +671,7 @@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -130,16 +130,15 @@ # If user is over quota, return with temporary failure instead of # bouncing the mail. -@@ -677,7 +684,7 @@ - #deliver_log_format = msgid=%m: %$ +@@ -679,6 +686,7 @@ # Binary to use for sending mails. -- #sendmail_path = /usr/lib/sendmail -+ #sendmail_path = /usr/sbin/sendmail + #sendmail_path = /usr/lib/sendmail ++ sendmail_path = /usr/sbin/sendmail # Human readable error message for rejection mails. Use can use variables: # %n = CRLF, %r = reason, %s = subject, %t = recipient -@@ -692,7 +699,7 @@ +@@ -693,7 +701,7 @@ ## # Executable location @@ -148,7 +147,7 @@ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -782,7 +789,7 @@ +@@ -783,7 +791,7 @@ #auth_ntlm_use_winbind = no # Path for Samba's ntlm_auth helper binary. @@ -157,7 +156,7 @@ # Number of seconds to delay before replying to failed authentications. #auth_failure_delay = 2 -@@ -815,7 +822,7 @@ +@@ -816,7 +824,7 @@ #passdb passwd-file { # File contains a list of usernames, one per line @@ -166,7 +165,7 @@ #deny = yes #} -@@ -1052,7 +1059,7 @@ +@@ -1053,7 +1061,7 @@ # referenced using URIs in format "proxy:<name>". dict { @@ -174,19 +173,19 @@ + #quota = mysql:%%PREFIX%%/etc/dovecot-dict-quota.conf } - ## -@@ -1090,8 +1097,8 @@ + # Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an +@@ -1095,8 +1103,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%% %%PREFIX%%/bin/quota-warning.sh 95 -+ # quota_warning2 = storage=80%% %%PREFIX%%/bin/quota-warning.sh 80 ++ # quota_warning = storage=95%% %%PREFIX%%/local/bin/quota-warning.sh 95 ++ # quota_warning2 = storage=80%% %%PREFIX%%/local/bin/quota-warning.sh 80 #quota = maildir # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir -@@ -1100,7 +1107,7 @@ +@@ -1105,7 +1113,7 @@ # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter # specifies how many seconds to wait between stat()ing dovecot-acl file # to see if it changed. @@ -195,7 +194,7 @@ # Convert plugin. If set, specifies the source storage path which is # converted to destination storage (mail_location) when the user logs in. -@@ -1119,14 +1126,14 @@ +@@ -1124,14 +1132,14 @@ # 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 |