1.1 --- a/dovecot/dovecot.patch Tue Apr 21 14:20:49 2009 +0200
1.2 +++ b/dovecot/dovecot.patch Tue Apr 21 14:23:37 2009 +0200
1.3 @@ -96,7 +96,18 @@
1.4
1.5 # Disable LOGIN command and all other plaintext authentications unless
1.6 # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
1.7 -@@ -82,17 +80,17 @@
1.8 +@@ -60,7 +58,9 @@
1.9 +
1.10 + # Log file to use for error messages, instead of sending them to syslog.
1.11 + # /dev/stderr can be used to log into stderr.
1.12 +-#log_path =
1.13 ++log_path = @l_prefix@/var/dovecot/log/dovecot-error.log # Error messages.
1.14 ++info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log # Info/debug messages.
1.15 ++log_timestamp = '%b %d %H:%M:%S ' # Prefix for each line written to log file.
1.16 +
1.17 + # Log file to use for informational and debug messages.
1.18 + # Default is the same as log_path.
1.19 +@@ -82,17 +82,17 @@
1.20 # IP or host address where to listen in for SSL connections. Remember to also
1.21 # add imaps and/or pop3s to protocols setting. Defaults to same as "listen"
1.22 # setting if not specified.
1.23 @@ -118,7 +129,7 @@
1.24
1.25 # If key file is password protected, give the password here. Alternatively
1.26 # give it when starting dovecot with -p parameter. Since this file is often
1.27 -@@ -135,7 +133,7 @@
1.28 +@@ -135,7 +135,7 @@
1.29 # which login needs to be able to connect to. The sockets are created when
1.30 # running as root, so you don't have to worry about permissions. Note that
1.31 # everything in this directory is deleted when Dovecot is started.
1.32 @@ -127,25 +138,41 @@
1.33
1.34 # chroot login process to the login_dir. Only reason not to do this is if you
1.35 # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
1.36 -@@ -145,7 +143,7 @@
1.37 +@@ -145,7 +145,7 @@
1.38 # and don't use it anywhere else. The user must also belong to a group where
1.39 # only it has access, it's used to control access for authentication process.
1.40 # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
1.41 -#login_user = dovecot
1.42 -+#login_user = @l_musr@
1.43 ++#login_user = @l_nusr@
1.44
1.45 # Set max. process size in megabytes. If you don't use
1.46 # login_process_per_connection you might need to grow this.
1.47 -@@ -503,7 +501,7 @@
1.48 +@@ -266,8 +266,8 @@
1.49 + # System user and group used to access mails. If you use multiple, userdb
1.50 + # can override these by returning uid or gid fields. You can use either numbers
1.51 + # or names. <doc/wiki/UserIds>
1.52 +-#mail_uid =
1.53 +-#mail_gid =
1.54 ++#mail_uid = @l_rusr@
1.55 ++#mail_gid = @l_rusr@
1.56 +
1.57 + # Group to enable temporarily for privileged operations. Currently this is
1.58 + # used only with INBOX when either its initial creation or dotlocking fails.
1.59 +@@ -502,8 +502,12 @@
1.60 + ##
1.61
1.62 protocol imap {
1.63 ++ # Override main log file paths
1.64 ++ log_path = @l_prefix@/var/dovecot/log/imap-error.log
1.65 ++ info_log_path = @l_prefix@/var/dovecot/log/imap-info.log
1.66 ++
1.67 # Login executable location.
1.68 - #login_executable = /usr/libexec/dovecot/imap-login
1.69 + #login_executable = @l_prefix@/libexec/dovecot/imap-login
1.70
1.71 # IMAP executable location. Changing this allows you to execute other
1.72 # binaries before the imap process is executed.
1.73 -@@ -515,7 +513,7 @@
1.74 +@@ -515,7 +519,7 @@
1.75 # /tmp/gdbhelper.* files:
1.76 # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
1.77 #
1.78 @@ -154,7 +181,7 @@
1.79
1.80 # Maximum IMAP command line length in bytes. Some clients generate very long
1.81 # command lines with huge mailboxes, so you may need to raise this if you get
1.82 -@@ -529,7 +527,7 @@
1.83 +@@ -529,7 +533,7 @@
1.84 # Support for dynamically loadable plugins. mail_plugins is a space separated
1.85 # list of plugins to load.
1.86 #mail_plugins =
1.87 @@ -163,9 +190,14 @@
1.88
1.89 # Send IMAP capabilities in greeting message. This makes it unnecessary for
1.90 # clients to request it with CAPABILITY command, so it saves one round-trip.
1.91 -@@ -572,11 +570,11 @@
1.92 +@@ -571,12 +575,16 @@
1.93 + ##
1.94
1.95 protocol pop3 {
1.96 ++ # Override main log file paths
1.97 ++ log_path = @l_prefix@/var/dovecot/log/pop3-error.log
1.98 ++ info_log_path = @l_prefix@/var/dovecot/log/pop3-info.log
1.99 ++
1.100 # Login executable location.
1.101 - #login_executable = /usr/libexec/dovecot/pop3-login
1.102 + #login_executable = @l_prefix@/libexec/dovecot/pop3-login
1.103 @@ -177,7 +209,7 @@
1.104
1.105 # Don't try to set mails non-recent or seen with POP3 sessions. This is
1.106 # mostly intended to reduce disk I/O. With maildir it doesn't move files
1.107 -@@ -636,7 +634,7 @@
1.108 +@@ -636,7 +644,7 @@
1.109 # Support for dynamically loadable plugins. mail_plugins is a space separated
1.110 # list of plugins to load.
1.111 #mail_plugins =
1.112 @@ -186,7 +218,18 @@
1.113
1.114 # Workarounds for various client bugs:
1.115 # outlook-no-nuls:
1.116 -@@ -664,7 +662,7 @@
1.117 +@@ -654,6 +662,10 @@
1.118 + ##
1.119 +
1.120 + protocol lda {
1.121 ++ # Override main log file paths
1.122 ++ log_path = @l_prefix@/var/dovecot/log/deliver-error.log
1.123 ++ info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log
1.124 ++
1.125 + # Address to use when sending rejection mails.
1.126 + postmaster_address = postmaster@example.com
1.127 +
1.128 +@@ -664,7 +676,7 @@
1.129 # Support for dynamically loadable plugins. mail_plugins is a space separated
1.130 # list of plugins to load.
1.131 #mail_plugins =
1.132 @@ -195,7 +238,7 @@
1.133
1.134 # If user is over quota, return with temporary failure instead of
1.135 # bouncing the mail.
1.136 -@@ -678,7 +676,7 @@
1.137 +@@ -678,7 +690,7 @@
1.138 #deliver_log_format = msgid=%m: %$
1.139
1.140 # Binary to use for sending mails.
1.141 @@ -204,7 +247,7 @@
1.142
1.143 # Subject: header to use for rejection mails. You can use the same variables
1.144 # as for rejection_reason below.
1.145 -@@ -689,7 +687,7 @@
1.146 +@@ -689,7 +701,7 @@
1.147 #rejection_reason = Your message to <%t> was automatically rejected:%n%r
1.148
1.149 # UNIX socket path to master authentication server to find users.
1.150 @@ -213,7 +256,7 @@
1.151 }
1.152
1.153 ##
1.154 -@@ -697,7 +695,7 @@
1.155 +@@ -697,7 +709,7 @@
1.156 ##
1.157
1.158 # Executable location
1.159 @@ -222,7 +265,7 @@
1.160
1.161 # Set max. process size in megabytes.
1.162 #auth_process_size = 256
1.163 -@@ -787,7 +785,7 @@
1.164 +@@ -787,7 +799,7 @@
1.165 #auth_ntlm_use_winbind = no
1.166
1.167 # Path for Samba's ntlm_auth helper binary.
1.168 @@ -231,7 +274,7 @@
1.169
1.170 # Number of seconds to delay before replying to failed authentications.
1.171 #auth_failure_delay = 2
1.172 -@@ -820,7 +818,7 @@
1.173 +@@ -820,7 +832,7 @@
1.174
1.175 #passdb passwd-file {
1.176 # File contains a list of usernames, one per line
1.177 @@ -240,7 +283,7 @@
1.178 #deny = yes
1.179 #}
1.180
1.181 -@@ -903,13 +901,13 @@
1.182 +@@ -903,13 +915,13 @@
1.183 # SQL database <doc/wiki/AuthDatabase.SQL.txt>
1.184 #passdb sql {
1.185 # Path for SQL configuration file, see doc/dovecot-sql-example.conf
1.186 @@ -256,7 +299,7 @@
1.187 #}
1.188
1.189 # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
1.190 -@@ -974,13 +972,13 @@
1.191 +@@ -974,13 +986,13 @@
1.192 # SQL database <doc/wiki/AuthDatabase.SQL.txt>
1.193 #userdb sql {
1.194 # Path for SQL configuration file, see doc/dovecot-sql-example.conf
1.195 @@ -272,7 +315,16 @@
1.196 #}
1.197
1.198 # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
1.199 -@@ -1017,7 +1015,7 @@
1.200 +@@ -993,7 +1005,7 @@
1.201 + # authentication with BSDs internally accesses shadow files, which also
1.202 + # requires roots. Note that this user is NOT used to access mails.
1.203 + # That user is specified by userdb above.
1.204 +- user = root
1.205 ++ user = @l_nusr@
1.206 +
1.207 + # Directory where to chroot the process. Most authentication backends don't
1.208 + # work if this is set, and there's no point chrooting if auth_user is root.
1.209 +@@ -1017,7 +1029,7 @@
1.210 # Master socket provides access to userdb information. It's typically
1.211 # used to give Dovecot's local delivery agent access to userdb so it
1.212 # can find mailbox locations.
1.213 @@ -281,7 +333,7 @@
1.214 #mode = 0600
1.215 # Default user/group is the one who started dovecot-auth (root)
1.216 #user =
1.217 -@@ -1027,7 +1025,7 @@
1.218 +@@ -1027,7 +1039,7 @@
1.219 # The client socket is generally safe to export to everyone. Typical use
1.220 # is to export it to your SMTP server so it can do SMTP AUTH lookups
1.221 # using it.
1.222 @@ -290,7 +342,7 @@
1.223 #mode = 0660
1.224 #}
1.225 #}
1.226 -@@ -1041,7 +1039,7 @@
1.227 +@@ -1041,7 +1053,7 @@
1.228 #auth external {
1.229 # socket connect {
1.230 # master {
1.231 @@ -299,7 +351,7 @@
1.232 # }
1.233 # }
1.234 #}
1.235 -@@ -1057,8 +1055,8 @@
1.236 +@@ -1057,8 +1069,8 @@
1.237 # referenced using URIs in format "proxy::<name>".
1.238
1.239 dict {
1.240 @@ -310,7 +362,7 @@
1.241 }
1.242
1.243 # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf
1.244 -@@ -1109,7 +1107,7 @@
1.245 +@@ -1109,7 +1121,7 @@
1.246 # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter
1.247 # specifies how many seconds to wait between stat()ing dovecot-acl file
1.248 # to see if it changed.
1.249 @@ -319,7 +371,7 @@
1.250
1.251 # Convert plugin. If set, specifies the source storage path which is
1.252 # converted to destination storage (mail_location) when the user logs in.
1.253 -@@ -1128,14 +1126,14 @@
1.254 +@@ -1128,14 +1140,14 @@
1.255 # until the message can be saved within quota limits. The configuration file
1.256 # is a text file where each line is in format: <priority> <mailbox name>
1.257 # Mails are first deleted in lowest -> highest priority number order
