1 files changed, 21 insertions, 28 deletions

diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index 4b658c61e2c6..d658b54c46fc 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	Fri Aug 18 21:19:13 2006
-+++ dovecot-example.conf	Fri Aug 18 21:23:26 2006
+--- dovecot-example.conf.orig	Sun Oct 15 22:12:31 2006
++++ dovecot-example.conf	Mon Oct 16 23:14:19 2006
 @@ -9,7 +9,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
@@ -9,31 +9,23 @@
  # --with-ssldir=/etc/ssl
  
  # Base directory where to store runtime data.
-@@ -17,6 +17,7 @@
- 
+@@ -18,6 +18,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 pop3
++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.
-@@ -135,6 +136,7 @@
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
- #login_process_size = 32
-+login_process_size = 64
- 
- # Should each login be processed in it's own process (yes), or should one
- # login process be allowed to process multiple connections (no)? Yes is more
-@@ -192,6 +194,7 @@
+@@ -195,6 +196,7 @@
  #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
  #default_mail_env = 
-+default_mail_env = mbox:/var/mail/%u
++default_mail_env = 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:
-@@ -235,6 +238,7 @@
+@@ -238,6 +240,7 @@
  # Grant access to these extra groups for mail processes. Typical use would be
  # to give "mail" group write access to /var/mail to be able to create dotlocks.
  #mail_extra_groups =
@@ -41,7 +33,7 @@
  
  # Allow full filesystem access to clients. There's no access checks other than
  # what the operating system does for the active UID/GID. It works with both
-@@ -282,6 +286,7 @@
+@@ -285,6 +288,7 @@
  # 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
@@ -49,7 +41,7 @@
  
  # 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.
-@@ -295,6 +300,7 @@
+@@ -298,6 +302,7 @@
  # belongs to supplementary groups with non-valid GIDs, those groups are
  # not set.
  #first_valid_gid = 1
@@ -57,7 +49,7 @@
  #last_valid_gid = 0
  
  # Maximum number of running mail processes. When this limit is reached,
-@@ -467,19 +473,19 @@
+@@ -470,19 +475,19 @@
  
  protocol imap {
    # Login executable location.
@@ -81,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
-@@ -489,7 +495,7 @@
+@@ -492,7 +497,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -90,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.
-@@ -521,6 +527,7 @@
+@@ -524,6 +529,7 @@
    #     accept '/' suffix in mailbox names in subscriptions list.
    # The list is space-separated.
    #imap_client_workarounds = outlook-idle
@@ -98,20 +90,21 @@
  }
    
  ##
-@@ -529,10 +536,10 @@
+@@ -532,11 +538,11 @@
  
  protocol pop3 {
    # Login executable location.
 -  #login_executable = /usr/libexec/dovecot/pop3-login
 +  #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
  
-   # POP3 executable location
+   # 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
-@@ -577,6 +584,7 @@
+@@ -581,6 +587,7 @@
    # installations.
    #
    #pop3_uidl_format = 
@@ -119,7 +112,7 @@
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -591,7 +599,7 @@
+@@ -595,7 +602,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -128,7 +121,7 @@
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -602,6 +610,7 @@
+@@ -606,6 +613,7 @@
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
    #pop3_client_workarounds = 
@@ -136,7 +129,7 @@
  }
  
  ##
-@@ -619,10 +628,11 @@
+@@ -623,10 +631,11 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -149,7 +142,7 @@
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -633,7 +643,7 @@
+@@ -637,7 +646,7 @@
  ##
  
  # Executable location