changeset
Resynchronize with upstream package maintainer version.
Thu, 05 Nov 2009 13:42:13 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 05 Nov 2009 13:42:13 +0100
- changeset 237
- 76b4896bea63
- parent 236
- 8b89c85ab535
- child 238
- 642966b63c34
Resynchronize with upstream package maintainer version.
This is needed due to large changeset after upgrade of vendor
distribution from version 1.1.* to 1.2.*.
| dovecot/dovecot.patch | file | annotate | diff | comparison | revisions | |
| dovecot/dovecot.spec | file | annotate | diff | comparison | revisions | |
| dovecot/rc.dovecot | file | annotate | diff | comparison | revisions |
1.1 --- a/dovecot/dovecot.patch Tue Nov 03 16:05:28 2009 +0100 1.2 +++ b/dovecot/dovecot.patch Thu Nov 05 13:42:13 2009 +0100 1.3 @@ -1,400 +1,51 @@ 1.4 +Index: configure.in 1.5 +--- configure.in.orig 2009-07-27 07:26:10 +0200 1.6 ++++ configure.in 2009-07-27 16:49:17 +0200 1.7 +@@ -1970,14 +1970,14 @@ 1.8 + AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) 1.9 + if test $PG_CONFIG = NO; then 1.10 + # based on code from PHP 1.11 +- for i in /usr /usr/local /usr/local/pgsql; do 1.12 +- for j in include include/pgsql include/postgres include/postgresql ""; do 1.13 ++ for i in @l_prefix@; do 1.14 ++ for j in include/postgresql; do 1.15 + if test -r "$i/$j/libpq-fe.h"; then 1.16 + PGSQL_INCLUDE=$i/$j 1.17 + fi 1.18 + done 1.19 +- for lib in lib lib64; do 1.20 +- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do 1.21 ++ for lib in lib; do 1.22 ++ for j in $lib; do 1.23 + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 1.24 + PGSQL_LIBDIR=$i/$j 1.25 + fi 1.26 Index: configure 1.27 -diff -Nau configure.orig configure 1.28 ---- configure.orig 2009-05-18 03:39:51.000000000 +0200 1.29 -+++ configure 2009-05-27 14:29:11.972121045 +0200 1.30 -@@ -28482,14 +28482,14 @@ 1.31 +--- configure.orig 2009-07-27 07:26:28 +0200 1.32 ++++ configure 2009-07-27 16:50:02 +0200 1.33 +@@ -29424,14 +29424,14 @@ 1.34 1.35 - if test $want_pgsql != no; then 1.36 - # based on code from PHP 1.37 -- for i in /usr /usr/local /usr/local/pgsql; do 1.38 -- for j in include include/pgsql include/postgres include/postgresql ""; do 1.39 -+ for i in @l_prefix@; do 1.40 -+ for j in include/postgresql; do 1.41 - if test -r "$i/$j/libpq-fe.h"; then 1.42 - PGSQL_INCLUDE=$i/$j 1.43 - fi 1.44 - done 1.45 -- for lib in lib lib64; do 1.46 -- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do 1.47 -+ for lib in lib; do 1.48 -+ for j in $lib; do 1.49 - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 1.50 - PGSQL_LIBDIR=$i/$j 1.51 - fi 1.52 -Index: configure.in 1.53 -diff -Nau configure.in.orig configure.in 1.54 ---- configure.in.orig 2009-05-18 03:39:35.000000000 +0200 1.55 -+++ configure.in 2009-05-27 14:29:11.926298334 +0200 1.56 -@@ -1962,14 +1962,14 @@ 1.57 - 1.58 - if test $want_pgsql != no; then 1.59 - # based on code from PHP 1.60 -- for i in /usr /usr/local /usr/local/pgsql; do 1.61 -- for j in include include/pgsql include/postgres include/postgresql ""; do 1.62 -+ for i in @l_prefix@; do 1.63 -+ for j in include/postgresql; do 1.64 - if test -r "$i/$j/libpq-fe.h"; then 1.65 - PGSQL_INCLUDE=$i/$j 1.66 - fi 1.67 - done 1.68 -- for lib in lib lib64; do 1.69 -- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do 1.70 -+ for lib in lib; do 1.71 -+ for j in $lib; do 1.72 - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 1.73 - PGSQL_LIBDIR=$i/$j 1.74 - fi 1.75 -Index: doc/dovecot-sql-example.conf 1.76 -diff -Nau doc/dovecot-sql-example.conf.orig doc/dovecot-sql-example.conf 1.77 ---- doc/dovecot-sql-example.conf.orig 2009-01-05 21:49:58.000000000 +0100 1.78 -+++ doc/dovecot-sql-example.conf 2009-05-27 14:29:11.973657746 +0200 1.79 -@@ -47,7 +47,8 @@ 1.80 - # the default my.cnf location 1.81 - # option_group - Read options from the given group (default: client) 1.82 - # 1.83 --# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock 1.84 -+# You can connect to UNIX sockets by using host: 1.85 -+# host=@l_prefix@/var/mysql/mysql.sock 1.86 - # Note that currently you can't use spaces in parameters. 1.87 - # 1.88 - # MySQL supports multiple host parameters for load balancing / HA. 1.89 -@@ -58,7 +59,7 @@ 1.90 - # Examples: 1.91 - # connect = host=192.168.1.1 dbname=users 1.92 - # connect = host=sql.example.com dbname=virtual user=virtual password=blarg 1.93 --# connect = /etc/dovecot/authdb.sqlite 1.94 -+# connect = @l_prefix@/etc/dovecot/authdb.sqlite 1.95 - # 1.96 - #connect = 1.97 - 1.98 -Index: dovecot-example.conf 1.99 -diff -Nau dovecot-example.conf.orig dovecot-example.conf 1.100 ---- dovecot-example.conf.orig 2009-05-13 18:41:46.000000000 +0200 1.101 -+++ dovecot-example.conf 2009-05-27 14:29:11.981522023 +0200 1.102 -@@ -13,11 +13,10 @@ 1.103 - # those. These are exceptions to this though: No sections (e.g. namespace {}) 1.104 - # or plugin settings are added by default, they're listed only as examples. 1.105 - # Paths are also just examples with the real defaults being based on configure 1.106 --# options. The paths listed here are for configure --prefix=/usr 1.107 --# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl 1.108 -+# options. 1.109 - 1.110 - # Base directory where to store runtime data. 1.111 --#base_dir = /var/run/dovecot/ 1.112 -+#base_dir = @l_prefix@/var/dovecot/run 1.113 - 1.114 - # Protocols we want to be serving: imap imaps pop3 pop3s managesieve 1.115 - # If you only want to use dovecot-auth, you can set this to "none". 1.116 -@@ -43,7 +42,7 @@ 1.117 - # listen = *:12000 1.118 - # .. 1.119 - # } 1.120 --#listen = * 1.121 -+#listen = 127.0.0.1 1.122 - 1.123 - # Disable LOGIN command and all other plaintext authentications unless 1.124 - # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP 1.125 -@@ -65,7 +64,9 @@ 1.126 - 1.127 - # Log file to use for error messages, instead of sending them to syslog. 1.128 - # /dev/stderr can be used to log into stderr. 1.129 --#log_path = 1.130 -+log_path = @l_prefix@/var/dovecot/log/dovecot-error.log # Error messages. 1.131 -+info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log # Info/debug messages. 1.132 -+log_timestamp = '%b %d %H:%M:%S ' # Prefix for each line written to log file. 1.133 - 1.134 - # Log file to use for informational and debug messages. 1.135 - # Default is the same as log_path. 1.136 -@@ -87,7 +88,7 @@ 1.137 - # IP or host address where to listen in for SSL connections. Remember to also 1.138 - # add imaps and/or pop3s to protocols setting. Defaults to same as "listen" 1.139 - # setting if not specified. 1.140 --#ssl_listen = 1.141 -+#ssl_listen = 127.0.0.1 1.142 - 1.143 - # Disable SSL/TLS support. <doc/wiki/SSL.txt> 1.144 - #ssl_disable = no 1.145 -@@ -96,8 +97,8 @@ 1.146 - # dropping root privileges, so keep the key file unreadable by anyone but 1.147 - # root. Included doc/mkcert.sh can be used to easily generate self-signed 1.148 - # certificate, just make sure to update the domains in dovecot-openssl.cnf 1.149 --#ssl_cert_file = /etc/ssl/certs/dovecot.pem 1.150 --#ssl_key_file = /etc/ssl/private/dovecot.pem 1.151 -+#ssl_cert_file = @l_prefix@/etc/dovecot/ssl/dovecot.crt 1.152 -+#ssl_key_file = @l_prefix@/etc/dovecot/ssl/dovecot.key 1.153 - 1.154 - # If key file is password protected, give the password here. Alternatively 1.155 - # give it when starting dovecot with -p parameter. Since this file is often 1.156 -@@ -140,7 +141,7 @@ 1.157 - # which login needs to be able to connect to. The sockets are created when 1.158 - # running as root, so you don't have to worry about permissions. Note that 1.159 - # everything in this directory is deleted when Dovecot is started. 1.160 --#login_dir = /var/run/dovecot/login 1.161 -+#login_dir = @l_prefix@/var/dovecot/run/login 1.162 - 1.163 - # chroot login process to the login_dir. Only reason not to do this is if you 1.164 - # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt> 1.165 -@@ -150,7 +151,7 @@ 1.166 - # and don't use it anywhere else. The user must also belong to a group where 1.167 - # only it has access, it's used to control access for authentication process. 1.168 - # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt> 1.169 --#login_user = dovecot 1.170 -+#login_user = @l_nusr@ 1.171 - 1.172 - # Set max. process size in megabytes. If you don't use 1.173 - # login_process_per_connection you might need to grow this. 1.174 -@@ -271,8 +272,8 @@ 1.175 - # System user and group used to access mails. If you use multiple, userdb 1.176 - # can override these by returning uid or gid fields. You can use either numbers 1.177 - # or names. <doc/wiki/UserIds.txt> 1.178 --#mail_uid = 1.179 --#mail_gid = 1.180 -+#mail_uid = @l_rusr@ 1.181 -+#mail_gid = @l_rusr@ 1.182 - 1.183 - # Group to enable temporarily for privileged operations. Currently this is 1.184 - # used only with INBOX when either its initial creation or dotlocking fails. 1.185 -@@ -507,20 +508,24 @@ 1.186 - ## 1.187 - 1.188 - protocol imap { 1.189 -+ # Override main log file paths 1.190 -+ log_path = @l_prefix@/var/dovecot/log/imap-error.log 1.191 -+ info_log_path = @l_prefix@/var/dovecot/log/imap-info.log 1.192 -+ 1.193 - # Login executable location. 1.194 -- #login_executable = /usr/libexec/dovecot/imap-login 1.195 -+ #login_executable = @l_prefix@/libexec/dovecot/imap-login 1.196 - 1.197 - # IMAP executable location. Changing this allows you to execute other 1.198 - # binaries before the imap process is executed. 1.199 - # 1.200 - # This would write rawlogs into ~/dovecot.rawlog/ directory: 1.201 -- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap 1.202 -+ # mail_executable = @l_prefix@/libexec/dovecot/rawlog @l_prefix@/libexec/dovecot/imap 1.203 - # 1.204 - # This would attach gdb into the imap process and write backtraces into 1.205 - # /tmp/gdbhelper.* files: 1.206 -- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap 1.207 -+ # mail_executable = @l_prefix@/libexec/dovecot/gdbhelper @l_prefix@/libexec/dovecot/imap 1.208 - # 1.209 -- #mail_executable = /usr/libexec/dovecot/imap 1.210 -+ #mail_executable = @l_prefix@/libexec/dovecot/imap 1.211 - 1.212 - # Maximum IMAP command line length in bytes. Some clients generate very long 1.213 - # command lines with huge mailboxes, so you may need to raise this if you get 1.214 -@@ -534,7 +539,7 @@ 1.215 - # Support for dynamically loadable plugins. mail_plugins is a space separated 1.216 - # list of plugins to load. 1.217 - #mail_plugins = 1.218 -- #mail_plugin_dir = /usr/lib/dovecot/imap 1.219 -+ #mail_plugin_dir = @l_prefix@/lib/dovecot/imap 1.220 - 1.221 - # Send IMAP capabilities in greeting message. This makes it unnecessary for 1.222 - # clients to request it with CAPABILITY command, so it saves one round-trip. 1.223 -@@ -576,12 +581,16 @@ 1.224 - ## 1.225 - 1.226 - protocol pop3 { 1.227 -+ # Override main log file paths 1.228 -+ log_path = @l_prefix@/var/dovecot/log/pop3-error.log 1.229 -+ info_log_path = @l_prefix@/var/dovecot/log/pop3-info.log 1.230 -+ 1.231 - # Login executable location. 1.232 -- #login_executable = /usr/libexec/dovecot/pop3-login 1.233 -+ #login_executable = @l_prefix@/libexec/dovecot/pop3-login 1.234 - 1.235 - # POP3 executable location. See IMAP's mail_executable above for examples 1.236 - # how this could be changed. 1.237 -- #mail_executable = /usr/libexec/dovecot/pop3 1.238 -+ #mail_executable = @l_prefix@/libexec/dovecot/pop3 1.239 - 1.240 - # Don't try to set mails non-recent or seen with POP3 sessions. This is 1.241 - # mostly intended to reduce disk I/O. With maildir it doesn't move files 1.242 -@@ -641,7 +650,7 @@ 1.243 - # Support for dynamically loadable plugins. mail_plugins is a space separated 1.244 - # list of plugins to load. 1.245 - #mail_plugins = 1.246 -- #mail_plugin_dir = /usr/lib/dovecot/pop3 1.247 -+ #mail_plugin_dir = @l_prefix@/lib/dovecot/pop3 1.248 - 1.249 - # Workarounds for various client bugs: 1.250 - # outlook-no-nuls: 1.251 -@@ -701,6 +710,10 @@ 1.252 - ## 1.253 - 1.254 - protocol lda { 1.255 -+ # Override main log file paths 1.256 -+ log_path = @l_prefix@/var/dovecot/log/deliver-error.log 1.257 -+ info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log 1.258 -+ 1.259 - # Address to use when sending rejection mails. 1.260 - postmaster_address = postmaster@example.com 1.261 - 1.262 -@@ -711,7 +724,7 @@ 1.263 - # Support for dynamically loadable plugins. mail_plugins is a space separated 1.264 - # list of plugins to load. 1.265 - #mail_plugins = 1.266 -- #mail_plugin_dir = /usr/lib/dovecot/lda 1.267 -+ #mail_plugin_dir = @l_prefix@/lib/dovecot/lda 1.268 - 1.269 - # If user is over quota, return with temporary failure instead of 1.270 - # bouncing the mail. 1.271 -@@ -725,7 +738,7 @@ 1.272 - #deliver_log_format = msgid=%m: %$ 1.273 - 1.274 - # Binary to use for sending mails. 1.275 -- #sendmail_path = /usr/lib/sendmail 1.276 -+ #sendmail_path = @l_prefix@/sbin/sendmail 1.277 - 1.278 - # Subject: header to use for rejection mails. You can use the same variables 1.279 - # as for rejection_reason below. 1.280 -@@ -736,7 +749,7 @@ 1.281 - #rejection_reason = Your message to <%t> was automatically rejected:%n%r 1.282 - 1.283 - # UNIX socket path to master authentication server to find users. 1.284 -- #auth_socket_path = /var/run/dovecot/auth-master 1.285 -+ #auth_socket_path = @l_prefix@/var/dovecot/run/auth-master 1.286 - } 1.287 - 1.288 - ## 1.289 -@@ -744,7 +757,7 @@ 1.290 - ## 1.291 - 1.292 - # Executable location 1.293 --#auth_executable = /usr/libexec/dovecot/dovecot-auth 1.294 -+#auth_executable = @l_prefix@/libexec/dovecot/dovecot-auth 1.295 - 1.296 - # Set max. process size in megabytes. 1.297 - #auth_process_size = 256 1.298 -@@ -834,7 +847,7 @@ 1.299 - #auth_ntlm_use_winbind = no 1.300 - 1.301 - # Path for Samba's ntlm_auth helper binary. 1.302 --#auth_winbind_helper_path = /usr/bin/ntlm_auth 1.303 -+#auth_winbind_helper_path = @l_prefix@/bin/ntlm_auth 1.304 - 1.305 - # Number of seconds to delay before replying to failed authentications. 1.306 - #auth_failure_delay = 2 1.307 -@@ -867,7 +880,7 @@ 1.308 - 1.309 - #passdb passwd-file { 1.310 - # File contains a list of usernames, one per line 1.311 -- #args = /etc/dovecot.deny 1.312 -+ #args = @l_prefix@/etc/dovecot/dovecot.deny 1.313 - #deny = yes 1.314 - #} 1.315 - 1.316 -@@ -950,13 +963,13 @@ 1.317 - # SQL database <doc/wiki/AuthDatabase.SQL.txt> 1.318 - #passdb sql { 1.319 - # Path for SQL configuration file, see doc/dovecot-sql-example.conf 1.320 -- #args = 1.321 -+ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf 1.322 - #} 1.323 - 1.324 - # LDAP database <doc/wiki/AuthDatabase.LDAP.txt> 1.325 - #passdb ldap { 1.326 - # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf 1.327 -- #args = 1.328 -+ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf 1.329 - #} 1.330 - 1.331 - # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt> 1.332 -@@ -1021,13 +1034,13 @@ 1.333 - # SQL database <doc/wiki/AuthDatabase.SQL.txt> 1.334 - #userdb sql { 1.335 - # Path for SQL configuration file, see doc/dovecot-sql-example.conf 1.336 -- #args = 1.337 -+ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf 1.338 - #} 1.339 - 1.340 - # LDAP database <doc/wiki/AuthDatabase.LDAP.txt> 1.341 - #userdb ldap { 1.342 - # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf 1.343 -- #args = 1.344 -+ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf 1.345 - #} 1.346 - 1.347 - # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt> 1.348 -@@ -1040,7 +1053,7 @@ 1.349 - # authentication with BSDs internally accesses shadow files, which also 1.350 - # requires roots. Note that this user is NOT used to access mails. 1.351 - # That user is specified by userdb above. 1.352 -- user = root 1.353 -+ user = @l_nusr@ 1.354 - 1.355 - # Directory where to chroot the process. Most authentication backends don't 1.356 - # work if this is set, and there's no point chrooting if auth_user is root. 1.357 -@@ -1064,7 +1077,7 @@ 1.358 - # Master socket provides access to userdb information. It's typically 1.359 - # used to give Dovecot's local delivery agent access to userdb so it 1.360 - # can find mailbox locations. 1.361 -- #path = /var/run/dovecot/auth-master 1.362 -+ #path = @l_prefix@/var/dovecot/run/auth-master 1.363 - #mode = 0600 1.364 - # Default user/group is the one who started dovecot-auth (root) 1.365 - #user = 1.366 -@@ -1074,7 +1087,7 @@ 1.367 - # The client socket is generally safe to export to everyone. Typical use 1.368 - # is to export it to your SMTP server so it can do SMTP AUTH lookups 1.369 - # using it. 1.370 -- #path = /var/run/dovecot/auth-client 1.371 -+ #path = @l_prefix@/var/dovecot/run/auth-client 1.372 - #mode = 0660 1.373 - #} 1.374 - #} 1.375 -@@ -1088,7 +1101,7 @@ 1.376 - #auth external { 1.377 - # socket connect { 1.378 - # master { 1.379 --# path = /var/run/dovecot/auth-master 1.380 -+# path = @l_prefix@/dovecot/run/auth-master 1.381 - # } 1.382 - # } 1.383 - #} 1.384 -@@ -1104,8 +1117,8 @@ 1.385 - # referenced using URIs in format "proxy::<name>". 1.386 - 1.387 - dict { 1.388 -- #quota = mysql:/etc/dovecot-dict-quota.conf 1.389 -- #expire = db:/var/lib/dovecot/expire.db 1.390 -+ #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf 1.391 -+ #expire = db:@l_prefix@/var/dovecot/lib/expire.db 1.392 - } 1.393 - 1.394 - # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf 1.395 -@@ -1156,7 +1169,7 @@ 1.396 - # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter 1.397 - # specifies how many seconds to wait between stat()ing dovecot-acl file 1.398 - # to see if it changed. 1.399 -- #acl = vfile:/etc/dovecot-acls:cache_secs=300 1.400 -+ #acl = vfile:@l_prefix@/etc/dovecot/dovecot-acls:cache_secs=300 1.401 - 1.402 - # Convert plugin. If set, specifies the source storage path which is 1.403 - # converted to destination storage (mail_location) when the user logs in. 1.404 -@@ -1175,14 +1188,14 @@ 1.405 - # until the message can be saved within quota limits. The configuration file 1.406 - # is a text file where each line is in format: <priority> <mailbox name> 1.407 - # Mails are first deleted in lowest -> highest priority number order 1.408 -- #trash = /etc/dovecot-trash.conf 1.409 -+ #trash = @l_prefix@/etc/dovecot/dovecot-trash.conf 1.410 - 1.411 - # Expire plugin. Mails are expunged from mailboxes after being there the 1.412 - # configurable time. The first expiration date for each mailbox is stored in 1.413 - # a dictionary so it can be quickly determined which mailboxes contain 1.414 - # expired mails. The actual expunging is done in a nightly cronjob, which 1.415 - # you must set up: 1.416 -- # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool 1.417 -+ # dovecot --exec-mail ext @l_prefix@/libexec/dovecot/expire-tool 1.418 - #expire = Trash 7 Spam 30 1.419 - #expire_dict = proxy::expire 1.420 - 1.421 + if test $PG_CONFIG = NO; then 1.422 + # based on code from PHP 1.423 +- for i in /usr /usr/local /usr/local/pgsql; do 1.424 +- for j in include include/pgsql include/postgres include/postgresql ""; do 1.425 ++ for i in @l_prefix@; do 1.426 ++ for j in include/postgresql; do 1.427 + if test -r "$i/$j/libpq-fe.h"; then 1.428 + PGSQL_INCLUDE=$i/$j 1.429 + fi 1.430 + done 1.431 +- for lib in lib lib64; do 1.432 +- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do 1.433 ++ for lib in lib; do 1.434 ++ for j in $lib; do 1.435 + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 1.436 + PGSQL_LIBDIR=$i/$j 1.437 + fi 1.438 Index: src/deliver/deliver.c 1.439 -diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c 1.440 ---- src/deliver/deliver.c.orig 2009-02-27 00:31:13.000000000 +0100 1.441 -+++ src/deliver/deliver.c 2009-05-27 14:29:11.983461484 +0200 1.442 -@@ -41,7 +41,7 @@ 1.443 +--- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 1.444 ++++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 1.445 +@@ -46,7 +46,7 @@ 1.446 #include <syslog.h> 1.447 1.448 #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" 1.449 @@ -403,46 +54,3 @@ 1.450 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" 1.451 1.452 /* After buffer grows larger than this, create a temporary file to /tmp 1.453 -Index: src/master/master-settings.c 1.454 -diff -Nau src/master/master-settings.c.orig src/master/master-settings.c 1.455 ---- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200 1.456 -+++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200 1.457 -@@ -178,14 +178,14 @@ 1.458 - MEMBER(syslog_facility) "mail", 1.459 - 1.460 - /* general */ 1.461 -- MEMBER(protocols) "imap imaps", 1.462 -- MEMBER(listen) "*", 1.463 -- MEMBER(ssl_listen) "", 1.464 -+ MEMBER(protocols) "imap", 1.465 -+ MEMBER(listen) "127.0.0.1", 1.466 -+ MEMBER(ssl_listen) "127.0.0.1", 1.467 - 1.468 -- MEMBER(ssl_disable) FALSE, 1.469 -+ MEMBER(ssl_disable) TRUE, 1.470 - MEMBER(ssl_ca_file) "", 1.471 -- MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem", 1.472 -- MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem", 1.473 -+ MEMBER(ssl_cert_file) "@l_prefix@/etc/dovecot/ssl/dovecot.crt", 1.474 -+ MEMBER(ssl_key_file) "@l_prefix@/etc/dovecot/ssl/dovecot.key", 1.475 - MEMBER(ssl_key_password) "", 1.476 - MEMBER(ssl_parameters_regenerate) 168, 1.477 - MEMBER(ssl_cipher_list) "", 1.478 -@@ -200,7 +200,7 @@ 1.479 - /* login */ 1.480 - MEMBER(login_dir) "login", 1.481 - MEMBER(login_executable) NULL, 1.482 -- MEMBER(login_user) "dovecot", 1.483 -+ MEMBER(login_user) "@l_musr@", 1.484 - MEMBER(login_greeting) "Dovecot ready.", 1.485 - MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", 1.486 - MEMBER(login_log_format) "%$: %s", 1.487 -@@ -325,7 +325,7 @@ 1.488 - MEMBER(anonymous_username) "anonymous", 1.489 - MEMBER(krb5_keytab) "", 1.490 - MEMBER(gssapi_hostname) "", 1.491 -- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", 1.492 -+ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", 1.493 - MEMBER(failure_delay) 2, 1.494 - 1.495 - MEMBER(verbose) FALSE,
2.1 --- a/dovecot/dovecot.spec Tue Nov 03 16:05:28 2009 +0100 2.2 +++ b/dovecot/dovecot.spec Thu Nov 05 13:42:13 2009 +0100 2.3 @@ -1,6 +1,6 @@ 2.4 ## 2.5 ## dovecot.spec -- OpenPKG RPM Package Specification 2.6 -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> 2.8 ## 2.9 ## Permission to use, copy, modify, and distribute this software for 2.10 ## any purpose with or without fee is hereby granted, provided that 2.11 @@ -22,10 +22,14 @@ 2.12 ## 2.13 2.14 # package version 2.15 -%define V_major 1.1 2.16 -%define V_minor 15 2.17 -%define V_minor_sieve 6 2.18 -%define V_managesieve 0.10.6 2.19 +%define V_major 1.2 2.20 +%define V_minor 6 2.21 +%define V_sieve_base 1.2 2.22 +%define V_sieve 0.1.13 2.23 +%define V_managesieve_base 1.2.6 2.24 +%define V_managesieve 0.11.9 2.25 +%define V_managesieved_base 1.2 2.26 +%define V_managesieved 0.11.9 2.27 2.28 # package information 2.29 Name: dovecot 2.30 @@ -38,33 +42,33 @@ 2.31 Group: Mail 2.32 License: MIT+LGPL 2.33 Version: %{V_major}.%{V_minor} 2.34 -Release: 20090521 2.35 +Release: 20091101 2.36 2.37 # package options 2.38 %option with_fsl yes 2.39 %option with_pam yes 2.40 +%option with_sieve yes 2.41 +%option with_managesieve yes 2.42 %option with_ldap no 2.43 %option with_mysql no 2.44 %option with_pgsql no 2.45 %option with_sqlite no 2.46 -%option with_pop3d no 2.47 -%option with_managesieve no 2.48 -%option with_sieve yes 2.49 2.50 # list of sources 2.51 Source0: http://www.dovecot.org/releases/%{V_major}/dovecot-%{V_major}.%{V_minor}.tar.gz 2.52 -Source1: http://www.dovecot.org/releases/sieve/dovecot-sieve-%{V_major}.%{V_minor_sieve}.tar.gz 2.53 -Source2: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}-managesieve-%{V_managesieve}.tar.gz 2.54 +Source1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_sieve_base}-sieve-%{V_sieve}.tar.gz 2.55 +Source2: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved}.tar.gz 2.56 Source3: fsl.dovecot 2.57 Source4: rc.dovecot 2.58 +Source5: dovecot.conf 2.59 Patch0: dovecot.patch 2.60 -Patch1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}.%{V_minor}-managesieve-%{V_managesieve}.diff.gz 2.61 +Patch1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_managesieve_base}-managesieve-%{V_managesieve}.diff.gz 2.62 2.63 # build information 2.64 Prefix: %{l_prefix} 2.65 BuildRoot: %{l_buildroot} 2.66 BuildPreReq: OpenPKG, openpkg >= 20060823 2.67 -PreReq: OpenPKG, openpkg >= 20060823, MTA 2.68 +PreReq: OpenPKG, openpkg >= 20060823, MTA, x509 2.69 BuildPreReq: libiconv, openssl 2.70 PreReq: libiconv, openssl 2.71 %if "%{with_fsl}" == "yes" 2.72 @@ -76,7 +80,6 @@ 2.73 PreReq: openldap 2.74 %endif 2.75 %if "%{with_managesieve}" == "yes" 2.76 -BuildPreReq: autoconf, automake, pkgconfig, libtool 2.77 BuildPreReq: gettext 2.78 PreReq: gettext 2.79 %endif 2.80 @@ -109,17 +112,22 @@ 2.81 prog dovecot = { 2.82 version = %{V_major}.%{V_minor} 2.83 url = http://www.dovecot.org/download.html 2.84 - regex = dovecot-(1\.1(\.\d+)+)\.tar\.gz 2.85 + regex = dovecot-(__VER__)\.tar\.gz 2.86 } 2.87 prog dovecot:sieve = { 2.88 - version = %{V_major}.%{V_minor_sieve} 2.89 - url = http://www.dovecot.org/download.html 2.90 - regex = dovecot-sieve-(%{V_major}(\.\d+)+)\.tar\.gz 2.91 + version = %{V_sieve} 2.92 + url = http://www.rename-it.nl/dovecot/%{V_major}/ 2.93 + regex = dovecot-%{V_sieve_base}-sieve-(__VER__)\.tar\.gz 2.94 + } 2.95 + prog dovecot:managesieved = { 2.96 + version = %{V_managesieved} 2.97 + url = http://www.rename-it.nl/dovecot/%{V_major}/ 2.98 + regex = dovecot-%{V_managesieved_base}-managesieve-(__VER__)\.tar\.gz 2.99 } 2.100 prog dovecot:managesieve = { 2.101 version = %{V_managesieve} 2.102 url = http://www.rename-it.nl/dovecot/%{V_major}/ 2.103 - regex = dovecot-%{V_major}-managesieve-(__VER__)\.tar\.gz 2.104 + regex = dovecot-%{V_managesieve_base}-managesieve-(__VER__)\.diff\.gz 2.105 } 2.106 2.107 %prep 2.108 @@ -130,16 +138,10 @@ 2.109 %if "%{with_managesieve}" == "yes" 2.110 %setup -q -T -D -a 2 2.111 %{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1 -b 2.112 - %{l_shtool} subst \ 2.113 - -e 's;/usr/\(libexec/dovecot/managesieve\);%{l_prefix}/\1;g' \ 2.114 - dovecot-example.conf 2.115 %endif 2.116 %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b 2.117 2.118 %build 2.119 -%if "%{with_managesieve}" == "yes" 2.120 - autoreconf -i --force || true 2.121 -%endif 2.122 cppflags="%{l_cppflags}" 2.123 ldflags="%{l_ldflags} %{l_fsl_ldflags}" 2.124 libs="%{l_fsl_libs}" 2.125 @@ -166,18 +168,16 @@ 2.126 CPPFLAGS="$cppflags" \ 2.127 LDFLAGS="$ldflags" \ 2.128 LIBS="$libs" \ 2.129 - GREP="grep" \ 2.130 ./configure \ 2.131 --prefix=%{l_prefix} \ 2.132 + --mandir=%{l_prefix}/man \ 2.133 --sysconfdir=%{l_prefix}/etc/dovecot \ 2.134 --with-ssldir=%{l_prefix}/etc/dovecot/ssl \ 2.135 --datadir=%{l_prefix}/share/dovecot \ 2.136 --docdir=%{l_prefix}/share/dovecot/doc \ 2.137 --with-rundir=%{l_prefix}/var/dovecot/run \ 2.138 - --with-statedir=%{l_prefix}/var/dovecot/dat \ 2.139 --with-libiconv-prefix=%{l_prefix} \ 2.140 --with-ssl=openssl \ 2.141 - --with-deliver \ 2.142 --with-docs \ 2.143 %if "%{with_ldap}" == "yes" 2.144 --with-ldap \ 2.145 @@ -214,122 +214,108 @@ 2.146 %else 2.147 --without-pam \ 2.148 %endif 2.149 -%if "%{with_pop3d}" == "yes" 2.150 - --with-pop3d \ 2.151 -%else 2.152 - --without-pop3d \ 2.153 -%endif 2.154 --without-gc \ 2.155 --without-gssapi \ 2.156 --without-lucene \ 2.157 - --without-vpopmail 2.158 + --without-vpopmail \ 2.159 + --enable-shared \ 2.160 + --disable-static 2.161 %{l_make} %{l_mflags -O} 2.162 2.163 %if "%{with_sieve}" == "yes" 2.164 # build optional Dovecot LDA sieve plugin 2.165 - ( cd dovecot-sieve-%{V_major}.%{V_minor_sieve} 2.166 + ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} 2.167 CC="%{l_cc}" \ 2.168 CFLAGS="%{l_cflags -O}" \ 2.169 CPPFLAGS="%{l_cppflags}" \ 2.170 LDFLAGS="%{l_ldflags}" \ 2.171 - GREP="grep" \ 2.172 ./configure \ 2.173 --prefix=%{l_prefix} \ 2.174 - --with-dovecot=.. 2.175 + --mandir=%{l_prefix}/man \ 2.176 + --with-dovecot=`pwd`/.. 2.177 %{l_make} %{l_mflags -O} 2.178 ) || exit $? 2.179 %endif 2.180 - 2.181 %if "%{with_managesieve}" == "yes" 2.182 - # build optional Dovecot managesieve package 2.183 - ( cd dovecot-%{V_major}-managesieve-%{V_managesieve} 2.184 + # build optional Dovecot LDA managesieve daemon 2.185 + ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} 2.186 CC="%{l_cc}" \ 2.187 CFLAGS="%{l_cflags -O}" \ 2.188 CPPFLAGS="%{l_cppflags}" \ 2.189 LDFLAGS="%{l_ldflags}" \ 2.190 - GREP="grep" \ 2.191 ./configure \ 2.192 --prefix=%{l_prefix} \ 2.193 - --with-dovecot=.. \ 2.194 - --with-dovecot-sieve=../dovecot-sieve-%{V_major}.%{V_minor_sieve} 2.195 + --mandir=%{l_prefix}/man \ 2.196 + --with-dovecot-sieve=`pwd`/../dovecot-%{V_sieve_base}-sieve-%{V_sieve} \ 2.197 + --with-dovecot=`pwd`/.. 2.198 %{l_make} %{l_mflags -O} 2.199 ) || exit $? 2.200 %endif 2.201 2.202 %install 2.203 rm -rf $RPM_BUILD_ROOT 2.204 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.205 + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 2.206 2.207 %if "%{with_sieve}" == "yes" 2.208 # install optional Dovecot LDA sieve plugin 2.209 - ( cd dovecot-sieve-%{V_major}.%{V_minor_sieve} 2.210 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.211 + ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} 2.212 + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 2.213 ) || exit $? 2.214 %endif 2.215 - 2.216 %if "%{with_managesieve}" == "yes" 2.217 - # install optional Dovecot managesieve package 2.218 - ( cd dovecot-%{V_major}-managesieve-%{V_managesieve} 2.219 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.220 + # install optional Dovecot LDA managesieve daemon 2.221 + ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} 2.222 + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 2.223 ) || exit $? 2.224 %endif 2.225 2.226 - # adjust file names of configuration files 2.227 - ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot 2.228 - for i in dovecot dovecot-db dovecot-ldap dovecot-sql; do 2.229 - mv ${i}{-example,}.conf 2.230 - done 2.231 - ) || exit $? 2.232 - 2.233 # create additional dirctories 2.234 %{l_shtool} mkdir -f -p -m 755 \ 2.235 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ssl \ 2.236 - $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/dat \ 2.237 $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/log \ 2.238 $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/run/login 2.239 2.240 - # install runcommand script 2.241 + # install run-command script 2.242 %{l_shtool} mkdir -f -p -m 755 \ 2.243 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d 2.244 -%if "%{with_pop3d}" == "yes" 2.245 - cmd='/<\/\{0,1\}with_pop3d>/d' 2.246 -%else 2.247 - cmd='/<with_pop3d>/,/<\/with_pop3d>/d' 2.248 -%endif 2.249 %{l_shtool} install -c -m 755 %{l_value -s -a} \ 2.250 - -e "$cmd" \ 2.251 %{SOURCE rc.dovecot} \ 2.252 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ 2.253 2.254 - # install OSSP fsl configuration 2.255 - %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl 2.256 - %{l_shtool} install -c -m 644 %{l_value -s -a} \ 2.257 - %{SOURCE fsl.dovecot} \ 2.258 - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ 2.259 - 2.260 # strip installation 2.261 + rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot*example.conf 2.262 rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \ 2.263 >/dev/null 2>&1 || true 2.264 - rmdir $RPM_BUILD_ROOT%{l_prefix}/include/dovecot \ 2.265 - $RPM_BUILD_ROOT%{l_prefix}/include \ 2.266 - >/dev/null 2>&1 || true 2.267 strip \ 2.268 $RPM_BUILD_ROOT%{l_prefix}/sbin/* \ 2.269 $RPM_BUILD_ROOT%{l_prefix}/libexec/dovecot/* \ 2.270 >/dev/null 2>&1 || true 2.271 2.272 + # install default server configuration 2.273 + %{l_shtool} mkdir -f -p -m 755 \ 2.274 + $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot 2.275 + %{l_shtool} install -c -m 644 %{l_value -s -a} \ 2.276 + %{SOURCE dovecot.conf} \ 2.277 + $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ 2.278 + 2.279 + # install OSSP fsl configuration 2.280 + %{l_shtool} mkdir -f -p -m 755 \ 2.281 + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl 2.282 + %{l_shtool} install -c -m 644 %{l_value -s -a} \ 2.283 + %{SOURCE fsl.dovecot} \ 2.284 + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ 2.285 + 2.286 # generate file list 2.287 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ 2.288 '%not %dir %{l_prefix}/etc/fsl' \ 2.289 '%config %{l_prefix}/etc/fsl/fsl.dovecot' \ 2.290 '%config %attr(0600,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/dovecot/*' \ 2.291 - '%config %attr(0640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ 2.292 + '%config %attr(0644,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ 2.293 '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/dovecot/ssl' \ 2.294 - '%dir %attr(0755,%{l_musr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ 2.295 - '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/dat' \ 2.296 - '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ 2.297 - '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \ 2.298 - '%dir %attr(0750,%{l_musr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \ 2.299 + '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ 2.300 + '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ 2.301 + '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \ 2.302 + '%dir %attr(0750,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run/login' \ 2.303 '%doc %{l_prefix}/share/dovecot/doc' \ 2.304 '%doc %{l_prefix}/share/dovecot/doc/wiki' 2.305 2.306 @@ -350,7 +336,6 @@ 2.307 [ $1 -eq 0 ] || exit 0 2.308 %{l_rc} dovecot stop 2>/dev/null 2.309 rm -f $RPM_INSTALL_PREFIX/var/dovecot/* >/dev/null 2>&1 || true 2.310 - rm -f $RPM_INSTALL_PREFIX/var/dovecot/dat/* >/dev/null 2>&1 || true 2.311 rm -f $RPM_INSTALL_PREFIX/var/dovecot/log/* >/dev/null 2>&1 || true 2.312 rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/* >/dev/null 2>&1 || true 2.313 rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/login/* >/dev/null 2>&1 || true
3.1 --- a/dovecot/rc.dovecot Tue Nov 03 16:05:28 2009 +0100 3.2 +++ b/dovecot/rc.dovecot Thu Nov 05 13:42:13 2009 +0100 3.3 @@ -15,10 +15,6 @@ 3.4 dovecot_deliver_log_numfiles="10" 3.5 dovecot_deliver_log_minsize="1M" 3.6 dovecot_deliver_log_complevel="9" 3.7 -<with_pop3d> 3.8 - POP_type="dovecot" 3.9 - POP_logfile="@l_prefix@/var/dovecot/log/dovecot.log" 3.10 -</with_pop3d> 3.11 3.12 %common 3.13 dovecot_pidfile="@l_prefix@/var/dovecot/run/master.pid"
