1 files changed, 28 insertions, 61 deletions

diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index bb8f5ee3d8ec..586a497ad6cf 100644
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ b/mail/dovecot-devel/files/patch-dovecot-example.conf
@@ -1,11 +1,15 @@
---- dovecot-example.conf.orig	Fri Jun 18 19:25:31 2004
-+++ dovecot-example.conf	Mon Jun 21 11:15:52 2004
-@@ -7,11 +7,11 @@
+--- dovecot-example.conf.orig	Tue Jul 13 10:56:55 2004
++++ dovecot-example.conf	Fri Jul 23 13:41:17 2004
+@@ -3,7 +3,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
+ # with 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=/etc --localstatedir=/var
  # --with-ssldir=/etc/ssl
  
  # Base directory where to store runtime data.
--#base_dir = /var/run/dovecot/
-+base_dir = /var/dovecot/
+@@ -11,7 +11,7 @@
  
  # Protocols we want to be serving:
  #  imap imaps pop3 pop3s
@@ -14,7 +18,7 @@
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -27,18 +27,18 @@
+@@ -27,14 +27,14 @@
  #pop3s_listen = 
  
  # Disable SSL/TLS support.
@@ -27,36 +31,17 @@
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
 -#ssl_cert_file = /etc/ssl/certs/dovecot.pem
 -#ssl_key_file = /etc/ssl/private/dovecot.pem
-+ssl_cert_file = %%SSLDIR%%/certs/dovecot.pem
-+ssl_key_file = %%SSLDIR%%/private/dovecot.pem
++#ssl_cert_file = /etc/ssl/certs/imapd.pem
++#ssl_key_file = /etc/ssl/private/imapd.pem
  
  # SSL parameter file. Master process generates this file for login processes.
  # It contains Diffie Hellman and RSA parameters.
--#ssl_parameters_file = /var/run/dovecot/ssl-parameters.dat
-+ssl_parameters_file = %%SSLDIR%%/ssl-parameters.dat
- 
- # How often to regenerate the SSL parameters file. Generation is quite CPU
- # intensive operation. The value is in hours, 0 disables regeneration
-@@ -68,11 +68,11 @@
- # which login needs to be able to connect to. The sockets are created when
- # running as root, so you don't have to worry about permissions. Note that
- # everything in this directory is deleted when Dovecot is started.
--#login_dir = /var/run/dovecot/login
-+login_dir = /var/dovecot/login
- 
- # chroot login process to the login_dir. Only reason not to do this is if you
- # wish to run the whole Dovecot without roots.
--#login_chroot = yes
-+login_chroot = yes
- 
- 
- ##
 @@ -82,12 +82,12 @@
  login = imap
  
  # Executable location.
 -#login_executable = /usr/libexec/dovecot/imap-login
-+login_executable = %%PREFIX%%/libexec/dovecot/imap-login
++#login_executable = %%PREFIX%%/libexec/dovecot/imap-login
  
  # 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
@@ -71,7 +56,7 @@
  
  # Exception to above rule being the executable location.
 -#login_executable = /usr/libexec/dovecot/pop3-login
-+login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
++#login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
  
  ##
  ## Mail processes
@@ -111,25 +96,16 @@
  
  # Space-separated list of fields to cache for all mails. Currently these
  # fields are allowed followed by a list of commands they speed up:
-@@ -237,7 +237,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.
+@@ -240,7 +240,7 @@
+ #   outlook-pop3-no-nuls:
+ #     Outlook and Outlook Express hang if mails contain NUL characters.
+ #     This setting replaces them with 0x80 character.
 -#client_workarounds = 
-+client_workarounds = oe6-fetch-no-newmail outlook-idle
++client_workarounds = oe6-fetch-no-newmail outlook-idle outlook-pop3-no-nuls
  
  # Dovecot can notify client of new mail in selected mailbox soon after it's
  # received. This setting specifies the minimum interval in seconds between
-@@ -262,7 +262,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.
--#mail_save_crlf = no
-+mail_save_crlf = yes
- 
- # 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.
-@@ -281,7 +281,7 @@
+@@ -284,7 +284,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.
@@ -138,25 +114,16 @@
  
  # 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
-@@ -300,7 +300,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.
--#mbox_locks = dotlock fcntl
-+mbox_locks = fcntl
- 
- # 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
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@
  ##
  
  # Executable location
 -#imap_executable = /usr/libexec/dovecot/imap
-+imap_executable = %%PREFIX%%/libexec/dovecot/imap
++#imap_executable = %%PREFIX%%/libexec/dovecot/imap
  
  # 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.
-@@ -338,14 +338,14 @@
+@@ -341,14 +341,14 @@
  
  # Support for dynamically loadable modules.
  #imap_use_modules = no
@@ -169,11 +136,11 @@
  
  # Executable location
 -#pop3_executable = /usr/libexec/dovecot/pop3
-+pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
++#pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
  
  # 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.
-@@ -353,7 +353,7 @@
+@@ -356,7 +356,7 @@
  
  # Support for dynamically loadable modules.
  #pop3_use_modules = no
@@ -182,7 +149,7 @@
  
  ##
  ## Authentication processes
-@@ -403,9 +403,9 @@
+@@ -406,9 +406,9 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
@@ -190,11 +157,11 @@
 +auth_passdb = passwd
  
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
++#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -436,7 +436,7 @@
+@@ -439,7 +439,7 @@
  
  # More verbose logging. Useful for figuring out why authentication isn't
  # working.