OpenPKG Specs / file comparison

comparison: dovecot/dovecot.patch

dovecot/dovecot.patch

changeset 228
19b611159e28
parent 187
0cbfb8a2de97
child 237
76b4896bea63
equal deleted inserted replaced
2:5d1274cb2db7 3:742bfa74f438
1 Index: configure
2 diff -Nau configure.orig configure
3 --- configure.orig 2009-05-18 03:39:51.000000000 +0200
4 +++ configure 2009-05-27 14:29:11.972121045 +0200
5 @@ -28482,14 +28482,14 @@
6
7 if test $want_pgsql != no; then
8 # based on code from PHP
9 - for i in /usr /usr/local /usr/local/pgsql; do
10 - for j in include include/pgsql include/postgres include/postgresql ""; do
11 + for i in @l_prefix@; do
12 + for j in include/postgresql; do
13 if test -r "$i/$j/libpq-fe.h"; then
14 PGSQL_INCLUDE=$i/$j
15 fi
16 done
17 - for lib in lib lib64; do
18 - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
19 + for lib in lib; do
20 + for j in $lib; do
21 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
22 PGSQL_LIBDIR=$i/$j
23 fi
1 Index: configure.in 24 Index: configure.in
2 --- configure.in.orig 2009-03-13 23:06:16 +0100 25 diff -Nau configure.in.orig configure.in
3 +++ configure.in 2009-03-14 09:11:12 +0100 26 --- configure.in.orig 2009-05-18 03:39:35.000000000 +0200
27 +++ configure.in 2009-05-27 14:29:11.926298334 +0200
4 @@ -1962,14 +1962,14 @@ 28 @@ -1962,14 +1962,14 @@
5 29
6 if test $want_pgsql != no; then 30 if test $want_pgsql != no; then
7 # based on code from PHP 31 # based on code from PHP
8 - for i in /usr /usr/local /usr/local/pgsql; do 32 - for i in /usr /usr/local /usr/local/pgsql; do
18 + for lib in lib; do 42 + for lib in lib; do
19 + for j in $lib; do 43 + for j in $lib; do
20 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 44 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
21 PGSQL_LIBDIR=$i/$j 45 PGSQL_LIBDIR=$i/$j
22 fi 46 fi
23 Index: configure
24 --- configure.orig 2009-03-13 23:06:32 +0100
25 +++ configure 2009-03-14 09:11:12 +0100
26 @@ -27966,14 +27966,14 @@
27
28 if test $want_pgsql != no; then
29 # based on code from PHP
30 - for i in /usr /usr/local /usr/local/pgsql; do
31 - for j in include include/pgsql include/postgres include/postgresql ""; do
32 + for i in @l_prefix@; do
33 + for j in include/postgresql; do
34 if test -r "$i/$j/libpq-fe.h"; then
35 PGSQL_INCLUDE=$i/$j
36 fi
37 done
38 - for lib in lib lib64; do
39 - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
40 + for lib in lib; do
41 + for j in $lib; do
42 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
43 PGSQL_LIBDIR=$i/$j
44 fi
45 Index: doc/dovecot-sql-example.conf 47 Index: doc/dovecot-sql-example.conf
46 --- doc/dovecot-sql-example.conf.orig 2009-01-05 21:49:58 +0100 48 diff -Nau doc/dovecot-sql-example.conf.orig doc/dovecot-sql-example.conf
47 +++ doc/dovecot-sql-example.conf 2009-03-14 09:11:12 +0100 49 --- doc/dovecot-sql-example.conf.orig 2009-01-05 21:49:58.000000000 +0100
50 +++ doc/dovecot-sql-example.conf 2009-05-27 14:29:11.973657746 +0200
48 @@ -47,7 +47,8 @@ 51 @@ -47,7 +47,8 @@
49 # the default my.cnf location 52 # the default my.cnf location
50 # option_group - Read options from the given group (default: client) 53 # option_group - Read options from the given group (default: client)
51 # 54 #
52 -# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock 55 -# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock
63 +# connect = @l_prefix@/etc/dovecot/authdb.sqlite 66 +# connect = @l_prefix@/etc/dovecot/authdb.sqlite
64 # 67 #
65 #connect = 68 #connect =
66 69
67 Index: dovecot-example.conf 70 Index: dovecot-example.conf
68 --- dovecot-example.conf.orig 2009-03-13 22:23:14 +0100 71 diff -Nau dovecot-example.conf.orig dovecot-example.conf
69 +++ dovecot-example.conf 2009-03-14 09:12:40 +0100 72 --- dovecot-example.conf.orig 2009-05-13 18:41:46.000000000 +0200
70 @@ -11,16 +11,14 @@ 73 +++ dovecot-example.conf 2009-05-27 14:29:11.981522023 +0200
71 74 @@ -13,11 +13,10 @@
72 # Default values are shown for each setting, it's not required to uncomment 75 # those. These are exceptions to this though: No sections (e.g. namespace {})
73 # any of the lines. Exception to this are paths, they're just examples with 76 # or plugin settings are added by default, they're listed only as examples.
74 -# the real defaults being based on configure options. The paths listed here 77 # Paths are also just examples with the real defaults being based on configure
75 -# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 78 -# options. The paths listed here are for configure --prefix=/usr
76 -# --with-ssldir=/etc/ssl 79 -# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
77 +# the real defaults being based on configure options. 80 +# options.
78 81
79 # Base directory where to store runtime data. 82 # Base directory where to store runtime data.
80 -#base_dir = /var/run/dovecot/ 83 -#base_dir = /var/run/dovecot/
81 +#base_dir = @l_prefix@/var/dovecot/run 84 +#base_dir = @l_prefix@/var/dovecot/run
82 85
83 # Protocols we want to be serving: imap imaps pop3 pop3s 86 # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
84 # If you only want to use dovecot-auth, you can set this to "none". 87 # If you only want to use dovecot-auth, you can set this to "none".
85 -#protocols = imap imaps 88 @@ -43,7 +42,7 @@
86 +#protocols = imap 89 # listen = *:12000
87
88 # A space separated list of IP or host addresses where to listen in for
89 # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
90 @@ -38,7 +36,7 @@
91 # listen = *:10100
92 # .. 90 # ..
93 # } 91 # }
94 -#listen = * 92 -#listen = *
95 +#listen = 127.0.0.1 93 +#listen = 127.0.0.1
96 94
97 # Disable LOGIN command and all other plaintext authentications unless 95 # Disable LOGIN command and all other plaintext authentications unless
98 # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP 96 # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
99 @@ -60,7 +58,9 @@ 97 @@ -65,7 +64,9 @@
100 98
101 # Log file to use for error messages, instead of sending them to syslog. 99 # Log file to use for error messages, instead of sending them to syslog.
102 # /dev/stderr can be used to log into stderr. 100 # /dev/stderr can be used to log into stderr.
103 -#log_path = 101 -#log_path =
104 +log_path = @l_prefix@/var/dovecot/log/dovecot-error.log # Error messages. 102 +log_path = @l_prefix@/var/dovecot/log/dovecot-error.log # Error messages.
105 +info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log # Info/debug messages. 103 +info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log # Info/debug messages.
106 +log_timestamp = '%b %d %H:%M:%S ' # Prefix for each line written to log file. 104 +log_timestamp = '%b %d %H:%M:%S ' # Prefix for each line written to log file.
107 105
108 # Log file to use for informational and debug messages. 106 # Log file to use for informational and debug messages.
109 # Default is the same as log_path. 107 # Default is the same as log_path.
110 @@ -82,17 +82,17 @@ 108 @@ -87,7 +88,7 @@
111 # IP or host address where to listen in for SSL connections. Remember to also 109 # IP or host address where to listen in for SSL connections. Remember to also
112 # add imaps and/or pop3s to protocols setting. Defaults to same as "listen" 110 # add imaps and/or pop3s to protocols setting. Defaults to same as "listen"
113 # setting if not specified. 111 # setting if not specified.
114 -#ssl_listen = 112 -#ssl_listen =
115 +#ssl_listen = 127.0.0.1 113 +#ssl_listen = 127.0.0.1
116 114
117 # Disable SSL/TLS support. <doc/wiki/SSL> 115 # Disable SSL/TLS support. <doc/wiki/SSL.txt>
118 -#ssl_disable = no 116 #ssl_disable = no
119 +#ssl_disable = yes 117 @@ -96,8 +97,8 @@
120
121 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
122 # dropping root privileges, so keep the key file unreadable by anyone but 118 # dropping root privileges, so keep the key file unreadable by anyone but
123 # root. Included doc/mkcert.sh can be used to easily generate self-signed 119 # root. Included doc/mkcert.sh can be used to easily generate self-signed
124 # certificate, just make sure to update the domains in dovecot-openssl.cnf 120 # certificate, just make sure to update the domains in dovecot-openssl.cnf
125 -#ssl_cert_file = /etc/ssl/certs/dovecot.pem 121 -#ssl_cert_file = /etc/ssl/certs/dovecot.pem
126 -#ssl_key_file = /etc/ssl/private/dovecot.pem 122 -#ssl_key_file = /etc/ssl/private/dovecot.pem
127 +#ssl_cert_file = @l_prefix@/etc/dovecot/ssl/dovecot.crt 123 +#ssl_cert_file = @l_prefix@/etc/dovecot/ssl/dovecot.crt
128 +#ssl_key_file = @l_prefix@/etc/dovecot/ssl/dovecot.key 124 +#ssl_key_file = @l_prefix@/etc/dovecot/ssl/dovecot.key
129 125
130 # If key file is password protected, give the password here. Alternatively 126 # If key file is password protected, give the password here. Alternatively
131 # give it when starting dovecot with -p parameter. Since this file is often 127 # give it when starting dovecot with -p parameter. Since this file is often
132 @@ -135,7 +135,7 @@ 128 @@ -140,7 +141,7 @@
133 # which login needs to be able to connect to. The sockets are created when 129 # which login needs to be able to connect to. The sockets are created when
134 # running as root, so you don't have to worry about permissions. Note that 130 # running as root, so you don't have to worry about permissions. Note that
135 # everything in this directory is deleted when Dovecot is started. 131 # everything in this directory is deleted when Dovecot is started.
136 -#login_dir = /var/run/dovecot/login 132 -#login_dir = /var/run/dovecot/login
137 +#login_dir = @l_prefix@/var/dovecot/run/login 133 +#login_dir = @l_prefix@/var/dovecot/run/login
138 134
139 # chroot login process to the login_dir. Only reason not to do this is if you 135 # chroot login process to the login_dir. Only reason not to do this is if you
140 # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt> 136 # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
141 @@ -145,7 +145,7 @@ 137 @@ -150,7 +151,7 @@
142 # and don't use it anywhere else. The user must also belong to a group where 138 # and don't use it anywhere else. The user must also belong to a group where
143 # only it has access, it's used to control access for authentication process. 139 # only it has access, it's used to control access for authentication process.
144 # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt> 140 # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
145 -#login_user = dovecot 141 -#login_user = dovecot
146 +#login_user = @l_nusr@ 142 +#login_user = @l_nusr@
147 143
148 # Set max. process size in megabytes. If you don't use 144 # Set max. process size in megabytes. If you don't use
149 # login_process_per_connection you might need to grow this. 145 # login_process_per_connection you might need to grow this.
150 @@ -266,8 +266,8 @@ 146 @@ -271,8 +272,8 @@
151 # System user and group used to access mails. If you use multiple, userdb 147 # System user and group used to access mails. If you use multiple, userdb
152 # can override these by returning uid or gid fields. You can use either numbers 148 # can override these by returning uid or gid fields. You can use either numbers
153 # or names. <doc/wiki/UserIds> 149 # or names. <doc/wiki/UserIds.txt>
154 -#mail_uid = 150 -#mail_uid =
155 -#mail_gid = 151 -#mail_gid =
156 +#mail_uid = @l_rusr@ 152 +#mail_uid = @l_rusr@
157 +#mail_gid = @l_rusr@ 153 +#mail_gid = @l_rusr@
158 154
159 # Group to enable temporarily for privileged operations. Currently this is 155 # Group to enable temporarily for privileged operations. Currently this is
160 # used only with INBOX when either its initial creation or dotlocking fails. 156 # used only with INBOX when either its initial creation or dotlocking fails.
161 @@ -502,8 +502,12 @@ 157 @@ -507,20 +508,24 @@
162 ## 158 ##
163 159
164 protocol imap { 160 protocol imap {
165 + # Override main log file paths 161 + # Override main log file paths
166 + log_path = @l_prefix@/var/dovecot/log/imap-error.log 162 + log_path = @l_prefix@/var/dovecot/log/imap-error.log
170 - #login_executable = /usr/libexec/dovecot/imap-login 166 - #login_executable = /usr/libexec/dovecot/imap-login
171 + #login_executable = @l_prefix@/libexec/dovecot/imap-login 167 + #login_executable = @l_prefix@/libexec/dovecot/imap-login
172 168
173 # IMAP executable location. Changing this allows you to execute other 169 # IMAP executable location. Changing this allows you to execute other
174 # binaries before the imap process is executed. 170 # binaries before the imap process is executed.
175 @@ -515,7 +519,7 @@ 171 #
172 # This would write rawlogs into ~/dovecot.rawlog/ directory:
173 - # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
174 + # mail_executable = @l_prefix@/libexec/dovecot/rawlog @l_prefix@/libexec/dovecot/imap
175 #
176 # This would attach gdb into the imap process and write backtraces into
176 # /tmp/gdbhelper.* files: 177 # /tmp/gdbhelper.* files:
177 # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap 178 - # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
179 + # mail_executable = @l_prefix@/libexec/dovecot/gdbhelper @l_prefix@/libexec/dovecot/imap
178 # 180 #
179 - #mail_executable = /usr/libexec/dovecot/imap 181 - #mail_executable = /usr/libexec/dovecot/imap
180 + #mail_executable = @l_prefix@/libexec/dovecot/imap 182 + #mail_executable = @l_prefix@/libexec/dovecot/imap
181 183
182 # Maximum IMAP command line length in bytes. Some clients generate very long 184 # Maximum IMAP command line length in bytes. Some clients generate very long
183 # command lines with huge mailboxes, so you may need to raise this if you get 185 # command lines with huge mailboxes, so you may need to raise this if you get
184 @@ -529,7 +533,7 @@ 186 @@ -534,7 +539,7 @@
185 # Support for dynamically loadable plugins. mail_plugins is a space separated 187 # Support for dynamically loadable plugins. mail_plugins is a space separated
186 # list of plugins to load. 188 # list of plugins to load.
187 #mail_plugins = 189 #mail_plugins =
188 - #mail_plugin_dir = /usr/lib/dovecot/imap 190 - #mail_plugin_dir = /usr/lib/dovecot/imap
189 + #mail_plugin_dir = @l_prefix@/lib/dovecot/imap 191 + #mail_plugin_dir = @l_prefix@/lib/dovecot/imap
190 192
191 # Send IMAP capabilities in greeting message. This makes it unnecessary for 193 # Send IMAP capabilities in greeting message. This makes it unnecessary for
192 # clients to request it with CAPABILITY command, so it saves one round-trip. 194 # clients to request it with CAPABILITY command, so it saves one round-trip.
193 @@ -571,12 +575,16 @@ 195 @@ -576,12 +581,16 @@
194 ## 196 ##
195 197
196 protocol pop3 { 198 protocol pop3 {
197 + # Override main log file paths 199 + # Override main log file paths
198 + log_path = @l_prefix@/var/dovecot/log/pop3-error.log 200 + log_path = @l_prefix@/var/dovecot/log/pop3-error.log
207 - #mail_executable = /usr/libexec/dovecot/pop3 209 - #mail_executable = /usr/libexec/dovecot/pop3
208 + #mail_executable = @l_prefix@/libexec/dovecot/pop3 210 + #mail_executable = @l_prefix@/libexec/dovecot/pop3
209 211
210 # Don't try to set mails non-recent or seen with POP3 sessions. This is 212 # Don't try to set mails non-recent or seen with POP3 sessions. This is
211 # mostly intended to reduce disk I/O. With maildir it doesn't move files 213 # mostly intended to reduce disk I/O. With maildir it doesn't move files
212 @@ -636,7 +644,7 @@ 214 @@ -641,7 +650,7 @@
213 # Support for dynamically loadable plugins. mail_plugins is a space separated 215 # Support for dynamically loadable plugins. mail_plugins is a space separated
214 # list of plugins to load. 216 # list of plugins to load.
215 #mail_plugins = 217 #mail_plugins =
216 - #mail_plugin_dir = /usr/lib/dovecot/pop3 218 - #mail_plugin_dir = /usr/lib/dovecot/pop3
217 + #mail_plugin_dir = @l_prefix@/lib/dovecot/pop3 219 + #mail_plugin_dir = @l_prefix@/lib/dovecot/pop3
218 220
219 # Workarounds for various client bugs: 221 # Workarounds for various client bugs:
220 # outlook-no-nuls: 222 # outlook-no-nuls:
221 @@ -654,6 +662,10 @@ 223 @@ -701,6 +710,10 @@
222 ## 224 ##
223 225
224 protocol lda { 226 protocol lda {
225 + # Override main log file paths 227 + # Override main log file paths
226 + log_path = @l_prefix@/var/dovecot/log/deliver-error.log 228 + log_path = @l_prefix@/var/dovecot/log/deliver-error.log
227 + info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log 229 + info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log
228 + 230 +
229 # Address to use when sending rejection mails. 231 # Address to use when sending rejection mails.
230 postmaster_address = postmaster@example.com 232 postmaster_address = postmaster@example.com
231 233
232 @@ -664,7 +676,7 @@ 234 @@ -711,7 +724,7 @@
233 # Support for dynamically loadable plugins. mail_plugins is a space separated 235 # Support for dynamically loadable plugins. mail_plugins is a space separated
234 # list of plugins to load. 236 # list of plugins to load.
235 #mail_plugins = 237 #mail_plugins =
236 - #mail_plugin_dir = /usr/lib/dovecot/lda 238 - #mail_plugin_dir = /usr/lib/dovecot/lda
237 + #mail_plugin_dir = @l_prefix@/lib/dovecot/lda 239 + #mail_plugin_dir = @l_prefix@/lib/dovecot/lda
238 240
239 # If user is over quota, return with temporary failure instead of 241 # If user is over quota, return with temporary failure instead of
240 # bouncing the mail. 242 # bouncing the mail.
241 @@ -678,7 +690,7 @@ 243 @@ -725,7 +738,7 @@
242 #deliver_log_format = msgid=%m: %$ 244 #deliver_log_format = msgid=%m: %$
243 245
244 # Binary to use for sending mails. 246 # Binary to use for sending mails.
245 - #sendmail_path = /usr/lib/sendmail 247 - #sendmail_path = /usr/lib/sendmail
246 + #sendmail_path = @l_prefix@/sbin/sendmail 248 + #sendmail_path = @l_prefix@/sbin/sendmail
247 249
248 # Subject: header to use for rejection mails. You can use the same variables 250 # Subject: header to use for rejection mails. You can use the same variables
249 # as for rejection_reason below. 251 # as for rejection_reason below.
250 @@ -689,7 +701,7 @@ 252 @@ -736,7 +749,7 @@
251 #rejection_reason = Your message to <%t> was automatically rejected:%n%r 253 #rejection_reason = Your message to <%t> was automatically rejected:%n%r
252 254
253 # UNIX socket path to master authentication server to find users. 255 # UNIX socket path to master authentication server to find users.
254 - #auth_socket_path = /var/run/dovecot/auth-master 256 - #auth_socket_path = /var/run/dovecot/auth-master
255 + #auth_socket_path = @l_prefix@/var/dovecot/run/auth-master 257 + #auth_socket_path = @l_prefix@/var/dovecot/run/auth-master
256 } 258 }
257 259
258 ## 260 ##
259 @@ -697,7 +709,7 @@ 261 @@ -744,7 +757,7 @@
260 ## 262 ##
261 263
262 # Executable location 264 # Executable location
263 -#auth_executable = /usr/libexec/dovecot/dovecot-auth 265 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
264 +#auth_executable = @l_prefix@/libexec/dovecot/dovecot-auth 266 +#auth_executable = @l_prefix@/libexec/dovecot/dovecot-auth
265 267
266 # Set max. process size in megabytes. 268 # Set max. process size in megabytes.
267 #auth_process_size = 256 269 #auth_process_size = 256
268 @@ -787,7 +799,7 @@ 270 @@ -834,7 +847,7 @@
269 #auth_ntlm_use_winbind = no 271 #auth_ntlm_use_winbind = no
270 272
271 # Path for Samba's ntlm_auth helper binary. 273 # Path for Samba's ntlm_auth helper binary.
272 -#auth_winbind_helper_path = /usr/bin/ntlm_auth 274 -#auth_winbind_helper_path = /usr/bin/ntlm_auth
273 +#auth_winbind_helper_path = @l_prefix@/bin/ntlm_auth 275 +#auth_winbind_helper_path = @l_prefix@/bin/ntlm_auth
274 276
275 # Number of seconds to delay before replying to failed authentications. 277 # Number of seconds to delay before replying to failed authentications.
276 #auth_failure_delay = 2 278 #auth_failure_delay = 2
277 @@ -820,7 +832,7 @@ 279 @@ -867,7 +880,7 @@
278 280
279 #passdb passwd-file { 281 #passdb passwd-file {
280 # File contains a list of usernames, one per line 282 # File contains a list of usernames, one per line
281 - #args = /etc/dovecot.deny 283 - #args = /etc/dovecot.deny
282 + #args = @l_prefix@/etc/dovecot/dovecot.deny 284 + #args = @l_prefix@/etc/dovecot/dovecot.deny
283 #deny = yes 285 #deny = yes
284 #} 286 #}
285 287
286 @@ -903,13 +915,13 @@ 288 @@ -950,13 +963,13 @@
287 # SQL database <doc/wiki/AuthDatabase.SQL.txt> 289 # SQL database <doc/wiki/AuthDatabase.SQL.txt>
288 #passdb sql { 290 #passdb sql {
289 # Path for SQL configuration file, see doc/dovecot-sql-example.conf 291 # Path for SQL configuration file, see doc/dovecot-sql-example.conf
290 - #args = 292 - #args =
291 + #args = @l_prefix@/etc/dovecot/dovecot-sql.conf 293 + #args = @l_prefix@/etc/dovecot/dovecot-sql.conf
297 - #args = 299 - #args =
298 + #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf 300 + #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf
299 #} 301 #}
300 302
301 # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt> 303 # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
302 @@ -974,13 +986,13 @@ 304 @@ -1021,13 +1034,13 @@
303 # SQL database <doc/wiki/AuthDatabase.SQL.txt> 305 # SQL database <doc/wiki/AuthDatabase.SQL.txt>
304 #userdb sql { 306 #userdb sql {
305 # Path for SQL configuration file, see doc/dovecot-sql-example.conf 307 # Path for SQL configuration file, see doc/dovecot-sql-example.conf
306 - #args = 308 - #args =
307 + #args = @l_prefix@/etc/dovecot/dovecot-sql.conf 309 + #args = @l_prefix@/etc/dovecot/dovecot-sql.conf
313 - #args = 315 - #args =
314 + #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf 316 + #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf
315 #} 317 #}
316 318
317 # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt> 319 # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
318 @@ -993,7 +1005,7 @@ 320 @@ -1040,7 +1053,7 @@
319 # authentication with BSDs internally accesses shadow files, which also 321 # authentication with BSDs internally accesses shadow files, which also
320 # requires roots. Note that this user is NOT used to access mails. 322 # requires roots. Note that this user is NOT used to access mails.
321 # That user is specified by userdb above. 323 # That user is specified by userdb above.
322 - user = root 324 - user = root
323 + user = @l_nusr@ 325 + user = @l_nusr@
324 326
325 # Directory where to chroot the process. Most authentication backends don't 327 # Directory where to chroot the process. Most authentication backends don't
326 # work if this is set, and there's no point chrooting if auth_user is root. 328 # work if this is set, and there's no point chrooting if auth_user is root.
327 @@ -1017,7 +1029,7 @@ 329 @@ -1064,7 +1077,7 @@
328 # Master socket provides access to userdb information. It's typically 330 # Master socket provides access to userdb information. It's typically
329 # used to give Dovecot's local delivery agent access to userdb so it 331 # used to give Dovecot's local delivery agent access to userdb so it
330 # can find mailbox locations. 332 # can find mailbox locations.
331 - #path = /var/run/dovecot/auth-master 333 - #path = /var/run/dovecot/auth-master
332 + #path = @l_prefix@/var/dovecot/run/auth-master 334 + #path = @l_prefix@/var/dovecot/run/auth-master
333 #mode = 0600 335 #mode = 0600
334 # Default user/group is the one who started dovecot-auth (root) 336 # Default user/group is the one who started dovecot-auth (root)
335 #user = 337 #user =
336 @@ -1027,7 +1039,7 @@ 338 @@ -1074,7 +1087,7 @@
337 # The client socket is generally safe to export to everyone. Typical use 339 # The client socket is generally safe to export to everyone. Typical use
338 # is to export it to your SMTP server so it can do SMTP AUTH lookups 340 # is to export it to your SMTP server so it can do SMTP AUTH lookups
339 # using it. 341 # using it.
340 - #path = /var/run/dovecot/auth-client 342 - #path = /var/run/dovecot/auth-client
341 + #path = @l_prefix@/var/dovecot/run/auth-client 343 + #path = @l_prefix@/var/dovecot/run/auth-client
342 #mode = 0660 344 #mode = 0660
343 #} 345 #}
344 #} 346 #}
345 @@ -1041,7 +1053,7 @@ 347 @@ -1088,7 +1101,7 @@
346 #auth external { 348 #auth external {
347 # socket connect { 349 # socket connect {
348 # master { 350 # master {
349 -# path = /var/run/dovecot/auth-master 351 -# path = /var/run/dovecot/auth-master
350 +# path = @l_prefix@/dovecot/run/auth-master 352 +# path = @l_prefix@/dovecot/run/auth-master
351 # } 353 # }
352 # } 354 # }
353 #} 355 #}
354 @@ -1057,8 +1069,8 @@ 356 @@ -1104,8 +1117,8 @@
355 # referenced using URIs in format "proxy::<name>". 357 # referenced using URIs in format "proxy::<name>".
356 358
357 dict { 359 dict {
358 - #quota = mysql:/etc/dovecot-dict-quota.conf 360 - #quota = mysql:/etc/dovecot-dict-quota.conf
359 - #expire = db:/var/lib/dovecot/expire.db 361 - #expire = db:/var/lib/dovecot/expire.db
360 + #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf 362 + #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf
361 + #expire = db:@l_prefix@/var/dovecot/lib/expire.db 363 + #expire = db:@l_prefix@/var/dovecot/lib/expire.db
362 } 364 }
363 365
364 # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf 366 # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf
365 @@ -1109,7 +1121,7 @@ 367 @@ -1156,7 +1169,7 @@
366 # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter 368 # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter
367 # specifies how many seconds to wait between stat()ing dovecot-acl file 369 # specifies how many seconds to wait between stat()ing dovecot-acl file
368 # to see if it changed. 370 # to see if it changed.
369 - #acl = vfile:/etc/dovecot-acls:cache_secs=300 371 - #acl = vfile:/etc/dovecot-acls:cache_secs=300
370 + #acl = vfile:@l_prefix@/etc/dovecot/dovecot-acls:cache_secs=300 372 + #acl = vfile:@l_prefix@/etc/dovecot/dovecot-acls:cache_secs=300
371 373
372 # Convert plugin. If set, specifies the source storage path which is 374 # Convert plugin. If set, specifies the source storage path which is
373 # converted to destination storage (mail_location) when the user logs in. 375 # converted to destination storage (mail_location) when the user logs in.
374 @@ -1128,14 +1140,14 @@ 376 @@ -1175,14 +1188,14 @@
375 # until the message can be saved within quota limits. The configuration file 377 # until the message can be saved within quota limits. The configuration file
376 # is a text file where each line is in format: <priority> <mailbox name> 378 # is a text file where each line is in format: <priority> <mailbox name>
377 # Mails are first deleted in lowest -> highest priority number order 379 # Mails are first deleted in lowest -> highest priority number order
378 - #trash = /etc/dovecot-trash.conf 380 - #trash = /etc/dovecot-trash.conf
379 + #trash = @l_prefix@/etc/dovecot/dovecot-trash.conf 381 + #trash = @l_prefix@/etc/dovecot/dovecot-trash.conf
387 + # dovecot --exec-mail ext @l_prefix@/libexec/dovecot/expire-tool 389 + # dovecot --exec-mail ext @l_prefix@/libexec/dovecot/expire-tool
388 #expire = Trash 7 Spam 30 390 #expire = Trash 7 Spam 30
389 #expire_dict = proxy::expire 391 #expire_dict = proxy::expire
390 392
391 Index: src/deliver/deliver.c 393 Index: src/deliver/deliver.c
392 --- src/deliver/deliver.c.orig 2009-02-27 00:31:13 +0100 394 diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c
393 +++ src/deliver/deliver.c 2009-03-14 09:11:12 +0100 395 --- src/deliver/deliver.c.orig 2009-02-27 00:31:13.000000000 +0100
396 +++ src/deliver/deliver.c 2009-05-27 14:29:11.983461484 +0200
394 @@ -41,7 +41,7 @@ 397 @@ -41,7 +41,7 @@
395 #include <syslog.h> 398 #include <syslog.h>
396 399
397 #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" 400 #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
398 -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail" 401 -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
399 +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail" 402 +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail"
400 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" 403 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
401 404
402 /* After buffer grows larger than this, create a temporary file to /tmp 405 /* After buffer grows larger than this, create a temporary file to /tmp
403 Index: src/master/master-settings.c 406 Index: src/master/master-settings.c
404 --- src/master/master-settings.c.orig 2009-03-13 20:11:53 +0100 407 diff -Nau src/master/master-settings.c.orig src/master/master-settings.c
405 +++ src/master/master-settings.c 2009-03-14 09:11:12 +0100 408 --- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200
409 +++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200
406 @@ -178,14 +178,14 @@ 410 @@ -178,14 +178,14 @@
407 MEMBER(syslog_facility) "mail", 411 MEMBER(syslog_facility) "mail",
408 412
409 /* general */ 413 /* general */
410 - MEMBER(protocols) "imap imaps", 414 - MEMBER(protocols) "imap imaps",
431 - MEMBER(login_user) "dovecot", 435 - MEMBER(login_user) "dovecot",
432 + MEMBER(login_user) "@l_musr@", 436 + MEMBER(login_user) "@l_musr@",
433 MEMBER(login_greeting) "Dovecot ready.", 437 MEMBER(login_greeting) "Dovecot ready.",
434 MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", 438 MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",
435 MEMBER(login_log_format) "%$: %s", 439 MEMBER(login_log_format) "%$: %s",
436 @@ -317,7 +317,7 @@ 440 @@ -325,7 +325,7 @@
437 MEMBER(anonymous_username) "anonymous", 441 MEMBER(anonymous_username) "anonymous",
438 MEMBER(krb5_keytab) "", 442 MEMBER(krb5_keytab) "",
439 MEMBER(gssapi_hostname) "", 443 MEMBER(gssapi_hostname) "",
440 - MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", 444 - MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",
441 + MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", 445 + MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth",

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial