1 files changed, 33 insertions, 16 deletions

diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index 455793ddcda7..db540085bb01 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	Sun Dec 18 15:10:59 2005
-+++ dovecot-example.conf	Sun Dec 18 15:15:02 2005
+--- dovecot-example.conf.orig	Fri Feb 10 18:46:38 2006
++++ dovecot-example.conf	Fri Feb 10 18:51:23 2006
 @@ -7,7 +7,7 @@
  # Default values are shown after each value, it's not required to uncomment
  # any of the lines. Exception to this are paths, they're just examples
@@ -18,6 +18,15 @@
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
+@@ -104,7 +104,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
 @@ -153,7 +153,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
@@ -51,23 +60,31 @@
  
  # If you need to set multiple mailbox locations or want to change default
  # namespace settings, you can do it by defining namespace sections:
-@@ -400,12 +400,12 @@
+@@ -420,19 +420,19 @@
  
  protocol imap {
    # Login executable location.
 -  #login_executable = /usr/libexec/dovecot/imap-login
 +  #login_executable = %%PREFIX%%/libexec/dovecot/imap-login
  
-   # IMAP executable location
+   # 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
-   # 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
  
    # 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
-@@ -414,7 +414,7 @@
+@@ -441,7 +441,7 @@
  
    # Support for dynamically loadable modules.
    #mail_use_modules = no
@@ -76,16 +93,16 @@
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -444,7 +444,7 @@
-   #     With mbox storage a mailbox can contain either mails or submailboxes,
+@@ -472,7 +472,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
  }
    
  ##
-@@ -453,10 +453,10 @@
+@@ -481,10 +481,10 @@
  
  protocol pop3 {
    # Login executable location.
@@ -98,7 +115,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
-@@ -493,7 +493,7 @@
+@@ -521,7 +521,7 @@
    # installations. %08Xu%08Xv will be the new default, so use it for new
    # installations.
    #
@@ -107,7 +124,7 @@
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -507,7 +507,7 @@
+@@ -535,7 +535,7 @@
  
    # Support for dynamically loadable modules.
    #mail_use_modules = no
@@ -116,16 +133,16 @@
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -516,7 +516,7 @@
-   #   oe-ns-eoh:
+@@ -545,7 +545,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 = outlook-no-nuls oe-ns-eoh
  }
  
  ##
-@@ -524,7 +524,7 @@
+@@ -553,7 +553,7 @@
  ##
  
  # Executable location