# HG changeset patch # User Michael Schloh von Bennewitz # Date 1257424933 -3600 # Node ID 76b4896bea6315cf0bd5336a5b897cd399a5ceef # Parent 8b89c85ab5356d66b570adb258647b6e781719af 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.*. diff -r 8b89c85ab535 -r 76b4896bea63 dovecot/dovecot.patch --- a/dovecot/dovecot.patch Tue Nov 03 16:05:28 2009 +0100 +++ b/dovecot/dovecot.patch Thu Nov 05 13:42:13 2009 +0100 @@ -1,400 +1,51 @@ +Index: configure.in +--- configure.in.orig 2009-07-27 07:26:10 +0200 ++++ configure.in 2009-07-27 16:49:17 +0200 +@@ -1970,14 +1970,14 @@ + AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) + if test $PG_CONFIG = NO; then + # based on code from PHP +- for i in /usr /usr/local /usr/local/pgsql; do +- for j in include include/pgsql include/postgres include/postgresql ""; do ++ for i in @l_prefix@; do ++ for j in include/postgresql; do + if test -r "$i/$j/libpq-fe.h"; then + PGSQL_INCLUDE=$i/$j + fi + done +- for lib in lib lib64; do +- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do ++ for lib in lib; do ++ for j in $lib; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi Index: configure -diff -Nau configure.orig configure ---- configure.orig 2009-05-18 03:39:51.000000000 +0200 -+++ configure 2009-05-27 14:29:11.972121045 +0200 -@@ -28482,14 +28482,14 @@ +--- configure.orig 2009-07-27 07:26:28 +0200 ++++ configure 2009-07-27 16:50:02 +0200 +@@ -29424,14 +29424,14 @@ - if test $want_pgsql != no; then - # based on code from PHP -- for i in /usr /usr/local /usr/local/pgsql; do -- for j in include include/pgsql include/postgres include/postgresql ""; do -+ for i in @l_prefix@; do -+ for j in include/postgresql; do - if test -r "$i/$j/libpq-fe.h"; then - PGSQL_INCLUDE=$i/$j - fi - done -- for lib in lib lib64; do -- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do -+ for lib in lib; do -+ for j in $lib; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi -Index: configure.in -diff -Nau configure.in.orig configure.in ---- configure.in.orig 2009-05-18 03:39:35.000000000 +0200 -+++ configure.in 2009-05-27 14:29:11.926298334 +0200 -@@ -1962,14 +1962,14 @@ - - if test $want_pgsql != no; then - # based on code from PHP -- for i in /usr /usr/local /usr/local/pgsql; do -- for j in include include/pgsql include/postgres include/postgresql ""; do -+ for i in @l_prefix@; do -+ for j in include/postgresql; do - if test -r "$i/$j/libpq-fe.h"; then - PGSQL_INCLUDE=$i/$j - fi - done -- for lib in lib lib64; do -- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do -+ for lib in lib; do -+ for j in $lib; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi -Index: doc/dovecot-sql-example.conf -diff -Nau doc/dovecot-sql-example.conf.orig doc/dovecot-sql-example.conf ---- doc/dovecot-sql-example.conf.orig 2009-01-05 21:49:58.000000000 +0100 -+++ doc/dovecot-sql-example.conf 2009-05-27 14:29:11.973657746 +0200 -@@ -47,7 +47,8 @@ - # the default my.cnf location - # option_group - Read options from the given group (default: client) - # --# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock -+# You can connect to UNIX sockets by using host: -+# host=@l_prefix@/var/mysql/mysql.sock - # Note that currently you can't use spaces in parameters. - # - # MySQL supports multiple host parameters for load balancing / HA. -@@ -58,7 +59,7 @@ - # Examples: - # connect = host=192.168.1.1 dbname=users - # connect = host=sql.example.com dbname=virtual user=virtual password=blarg --# connect = /etc/dovecot/authdb.sqlite -+# connect = @l_prefix@/etc/dovecot/authdb.sqlite - # - #connect = - -Index: dovecot-example.conf -diff -Nau dovecot-example.conf.orig dovecot-example.conf ---- dovecot-example.conf.orig 2009-05-13 18:41:46.000000000 +0200 -+++ dovecot-example.conf 2009-05-27 14:29:11.981522023 +0200 -@@ -13,11 +13,10 @@ - # those. These are exceptions to this though: No sections (e.g. namespace {}) - # or plugin settings are added by default, they're listed only as examples. - # Paths are also just examples with the real defaults being based on configure --# options. The paths listed here are for configure --prefix=/usr --# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl -+# options. - - # Base directory where to store runtime data. --#base_dir = /var/run/dovecot/ -+#base_dir = @l_prefix@/var/dovecot/run - - # Protocols we want to be serving: imap imaps pop3 pop3s managesieve - # If you only want to use dovecot-auth, you can set this to "none". -@@ -43,7 +42,7 @@ - # listen = *:12000 - # .. - # } --#listen = * -+#listen = 127.0.0.1 - - # Disable LOGIN command and all other plaintext authentications unless - # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -@@ -65,7 +64,9 @@ - - # Log file to use for error messages, instead of sending them to syslog. - # /dev/stderr can be used to log into stderr. --#log_path = -+log_path = @l_prefix@/var/dovecot/log/dovecot-error.log # Error messages. -+info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log # Info/debug messages. -+log_timestamp = '%b %d %H:%M:%S ' # Prefix for each line written to log file. - - # Log file to use for informational and debug messages. - # Default is the same as log_path. -@@ -87,7 +88,7 @@ - # IP or host address where to listen in for SSL connections. Remember to also - # add imaps and/or pop3s to protocols setting. Defaults to same as "listen" - # setting if not specified. --#ssl_listen = -+#ssl_listen = 127.0.0.1 - - # Disable SSL/TLS support. - #ssl_disable = no -@@ -96,8 +97,8 @@ - # dropping root privileges, so keep the key file unreadable by anyone but - # root. Included doc/mkcert.sh can be used to easily generate self-signed - # 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 = @l_prefix@/etc/dovecot/ssl/dovecot.crt -+#ssl_key_file = @l_prefix@/etc/dovecot/ssl/dovecot.key - - # If key file is password protected, give the password here. Alternatively - # give it when starting dovecot with -p parameter. Since this file is often -@@ -140,7 +141,7 @@ - # 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 = @l_prefix@/var/dovecot/run/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. -@@ -150,7 +151,7 @@ - # and don't use it anywhere else. The user must also belong to a group where - # only it has access, it's used to control access for authentication process. - # Note that this user is NOT used to access mails. --#login_user = dovecot -+#login_user = @l_nusr@ - - # Set max. process size in megabytes. If you don't use - # login_process_per_connection you might need to grow this. -@@ -271,8 +272,8 @@ - # System user and group used to access mails. If you use multiple, userdb - # can override these by returning uid or gid fields. You can use either numbers - # or names. --#mail_uid = --#mail_gid = -+#mail_uid = @l_rusr@ -+#mail_gid = @l_rusr@ - - # Group to enable temporarily for privileged operations. Currently this is - # used only with INBOX when either its initial creation or dotlocking fails. -@@ -507,20 +508,24 @@ - ## - - protocol imap { -+ # Override main log file paths -+ log_path = @l_prefix@/var/dovecot/log/imap-error.log -+ info_log_path = @l_prefix@/var/dovecot/log/imap-info.log -+ - # Login executable location. -- #login_executable = /usr/libexec/dovecot/imap-login -+ #login_executable = @l_prefix@/libexec/dovecot/imap-login - - # 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 = @l_prefix@/libexec/dovecot/rawlog @l_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 = @l_prefix@/libexec/dovecot/gdbhelper @l_prefix@/libexec/dovecot/imap - # -- #mail_executable = /usr/libexec/dovecot/imap -+ #mail_executable = @l_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 -@@ -534,7 +539,7 @@ - # Support for dynamically loadable plugins. mail_plugins is a space separated - # list of plugins to load. - #mail_plugins = -- #mail_plugin_dir = /usr/lib/dovecot/imap -+ #mail_plugin_dir = @l_prefix@/lib/dovecot/imap - - # Send IMAP capabilities in greeting message. This makes it unnecessary for - # clients to request it with CAPABILITY command, so it saves one round-trip. -@@ -576,12 +581,16 @@ - ## - - protocol pop3 { -+ # Override main log file paths -+ log_path = @l_prefix@/var/dovecot/log/pop3-error.log -+ info_log_path = @l_prefix@/var/dovecot/log/pop3-info.log -+ - # Login executable location. -- #login_executable = /usr/libexec/dovecot/pop3-login -+ #login_executable = @l_prefix@/libexec/dovecot/pop3-login - - # POP3 executable location. See IMAP's mail_executable above for examples - # how this could be changed. -- #mail_executable = /usr/libexec/dovecot/pop3 -+ #mail_executable = @l_prefix@/libexec/dovecot/pop3 - - # 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 -@@ -641,7 +650,7 @@ - # Support for dynamically loadable plugins. mail_plugins is a space separated - # list of plugins to load. - #mail_plugins = -- #mail_plugin_dir = /usr/lib/dovecot/pop3 -+ #mail_plugin_dir = @l_prefix@/lib/dovecot/pop3 - - # Workarounds for various client bugs: - # outlook-no-nuls: -@@ -701,6 +710,10 @@ - ## - - protocol lda { -+ # Override main log file paths -+ log_path = @l_prefix@/var/dovecot/log/deliver-error.log -+ info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log -+ - # Address to use when sending rejection mails. - postmaster_address = postmaster@example.com - -@@ -711,7 +724,7 @@ - # Support for dynamically loadable plugins. mail_plugins is a space separated - # list of plugins to load. - #mail_plugins = -- #mail_plugin_dir = /usr/lib/dovecot/lda -+ #mail_plugin_dir = @l_prefix@/lib/dovecot/lda - - # If user is over quota, return with temporary failure instead of - # bouncing the mail. -@@ -725,7 +738,7 @@ - #deliver_log_format = msgid=%m: %$ - - # Binary to use for sending mails. -- #sendmail_path = /usr/lib/sendmail -+ #sendmail_path = @l_prefix@/sbin/sendmail - - # Subject: header to use for rejection mails. You can use the same variables - # as for rejection_reason below. -@@ -736,7 +749,7 @@ - #rejection_reason = Your message to <%t> was automatically rejected:%n%r - - # UNIX socket path to master authentication server to find users. -- #auth_socket_path = /var/run/dovecot/auth-master -+ #auth_socket_path = @l_prefix@/var/dovecot/run/auth-master - } - - ## -@@ -744,7 +757,7 @@ - ## - - # Executable location --#auth_executable = /usr/libexec/dovecot/dovecot-auth -+#auth_executable = @l_prefix@/libexec/dovecot/dovecot-auth - - # Set max. process size in megabytes. - #auth_process_size = 256 -@@ -834,7 +847,7 @@ - #auth_ntlm_use_winbind = no - - # Path for Samba's ntlm_auth helper binary. --#auth_winbind_helper_path = /usr/bin/ntlm_auth -+#auth_winbind_helper_path = @l_prefix@/bin/ntlm_auth - - # Number of seconds to delay before replying to failed authentications. - #auth_failure_delay = 2 -@@ -867,7 +880,7 @@ - - #passdb passwd-file { - # File contains a list of usernames, one per line -- #args = /etc/dovecot.deny -+ #args = @l_prefix@/etc/dovecot/dovecot.deny - #deny = yes - #} - -@@ -950,13 +963,13 @@ - # SQL database - #passdb sql { - # Path for SQL configuration file, see doc/dovecot-sql-example.conf -- #args = -+ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf - #} - - # LDAP database - #passdb ldap { - # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf -- #args = -+ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf - #} - - # vpopmail authentication -@@ -1021,13 +1034,13 @@ - # SQL database - #userdb sql { - # Path for SQL configuration file, see doc/dovecot-sql-example.conf -- #args = -+ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf - #} - - # LDAP database - #userdb ldap { - # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf -- #args = -+ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf - #} - - # vpopmail -@@ -1040,7 +1053,7 @@ - # authentication with BSDs internally accesses shadow files, which also - # requires roots. Note that this user is NOT used to access mails. - # That user is specified by userdb above. -- user = root -+ user = @l_nusr@ - - # Directory where to chroot the process. Most authentication backends don't - # work if this is set, and there's no point chrooting if auth_user is root. -@@ -1064,7 +1077,7 @@ - # Master socket provides access to userdb information. It's typically - # used to give Dovecot's local delivery agent access to userdb so it - # can find mailbox locations. -- #path = /var/run/dovecot/auth-master -+ #path = @l_prefix@/var/dovecot/run/auth-master - #mode = 0600 - # Default user/group is the one who started dovecot-auth (root) - #user = -@@ -1074,7 +1087,7 @@ - # The client socket is generally safe to export to everyone. Typical use - # is to export it to your SMTP server so it can do SMTP AUTH lookups - # using it. -- #path = /var/run/dovecot/auth-client -+ #path = @l_prefix@/var/dovecot/run/auth-client - #mode = 0660 - #} - #} -@@ -1088,7 +1101,7 @@ - #auth external { - # socket connect { - # master { --# path = /var/run/dovecot/auth-master -+# path = @l_prefix@/dovecot/run/auth-master - # } - # } - #} -@@ -1104,8 +1117,8 @@ - # referenced using URIs in format "proxy::". - - dict { -- #quota = mysql:/etc/dovecot-dict-quota.conf -- #expire = db:/var/lib/dovecot/expire.db -+ #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf -+ #expire = db:@l_prefix@/var/dovecot/lib/expire.db - } - - # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf -@@ -1156,7 +1169,7 @@ - # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter - # specifies how many seconds to wait between stat()ing dovecot-acl file - # to see if it changed. -- #acl = vfile:/etc/dovecot-acls:cache_secs=300 -+ #acl = vfile:@l_prefix@/etc/dovecot/dovecot-acls:cache_secs=300 - - # Convert plugin. If set, specifies the source storage path which is - # converted to destination storage (mail_location) when the user logs in. -@@ -1175,14 +1188,14 @@ - # until the message can be saved within quota limits. The configuration file - # is a text file where each line is in format: - # Mails are first deleted in lowest -> highest priority number order -- #trash = /etc/dovecot-trash.conf -+ #trash = @l_prefix@/etc/dovecot/dovecot-trash.conf - - # Expire plugin. Mails are expunged from mailboxes after being there the - # configurable time. The first expiration date for each mailbox is stored in - # a dictionary so it can be quickly determined which mailboxes contain - # expired mails. The actual expunging is done in a nightly cronjob, which - # you must set up: -- # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool -+ # dovecot --exec-mail ext @l_prefix@/libexec/dovecot/expire-tool - #expire = Trash 7 Spam 30 - #expire_dict = proxy::expire - + if test $PG_CONFIG = NO; then + # based on code from PHP +- for i in /usr /usr/local /usr/local/pgsql; do +- for j in include include/pgsql include/postgres include/postgresql ""; do ++ for i in @l_prefix@; do ++ for j in include/postgresql; do + if test -r "$i/$j/libpq-fe.h"; then + PGSQL_INCLUDE=$i/$j + fi + done +- for lib in lib lib64; do +- for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do ++ for lib in lib; do ++ for j in $lib; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi Index: src/deliver/deliver.c -diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c ---- src/deliver/deliver.c.orig 2009-02-27 00:31:13.000000000 +0100 -+++ src/deliver/deliver.c 2009-05-27 14:29:11.983461484 +0200 -@@ -41,7 +41,7 @@ +--- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 ++++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 +@@ -46,7 +46,7 @@ #include #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" @@ -403,46 +54,3 @@ #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" /* After buffer grows larger than this, create a temporary file to /tmp -Index: src/master/master-settings.c -diff -Nau src/master/master-settings.c.orig src/master/master-settings.c ---- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200 -+++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200 -@@ -178,14 +178,14 @@ - MEMBER(syslog_facility) "mail", - - /* general */ -- MEMBER(protocols) "imap imaps", -- MEMBER(listen) "*", -- MEMBER(ssl_listen) "", -+ MEMBER(protocols) "imap", -+ MEMBER(listen) "127.0.0.1", -+ MEMBER(ssl_listen) "127.0.0.1", - -- MEMBER(ssl_disable) FALSE, -+ MEMBER(ssl_disable) TRUE, - MEMBER(ssl_ca_file) "", -- MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem", -- MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem", -+ MEMBER(ssl_cert_file) "@l_prefix@/etc/dovecot/ssl/dovecot.crt", -+ MEMBER(ssl_key_file) "@l_prefix@/etc/dovecot/ssl/dovecot.key", - MEMBER(ssl_key_password) "", - MEMBER(ssl_parameters_regenerate) 168, - MEMBER(ssl_cipher_list) "", -@@ -200,7 +200,7 @@ - /* login */ - MEMBER(login_dir) "login", - MEMBER(login_executable) NULL, -- MEMBER(login_user) "dovecot", -+ MEMBER(login_user) "@l_musr@", - MEMBER(login_greeting) "Dovecot ready.", - MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", - MEMBER(login_log_format) "%$: %s", -@@ -325,7 +325,7 @@ - MEMBER(anonymous_username) "anonymous", - MEMBER(krb5_keytab) "", - MEMBER(gssapi_hostname) "", -- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", -+ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", - MEMBER(failure_delay) 2, - - MEMBER(verbose) FALSE, diff -r 8b89c85ab535 -r 76b4896bea63 dovecot/dovecot.spec --- a/dovecot/dovecot.spec Tue Nov 03 16:05:28 2009 +0100 +++ b/dovecot/dovecot.spec Thu Nov 05 13:42:13 2009 +0100 @@ -1,6 +1,6 @@ ## ## dovecot.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -22,10 +22,14 @@ ## # package version -%define V_major 1.1 -%define V_minor 15 -%define V_minor_sieve 6 -%define V_managesieve 0.10.6 +%define V_major 1.2 +%define V_minor 6 +%define V_sieve_base 1.2 +%define V_sieve 0.1.13 +%define V_managesieve_base 1.2.6 +%define V_managesieve 0.11.9 +%define V_managesieved_base 1.2 +%define V_managesieved 0.11.9 # package information Name: dovecot @@ -38,33 +42,33 @@ Group: Mail License: MIT+LGPL Version: %{V_major}.%{V_minor} -Release: 20090521 +Release: 20091101 # package options %option with_fsl yes %option with_pam yes +%option with_sieve yes +%option with_managesieve yes %option with_ldap no %option with_mysql no %option with_pgsql no %option with_sqlite no -%option with_pop3d no -%option with_managesieve no -%option with_sieve yes # list of sources Source0: http://www.dovecot.org/releases/%{V_major}/dovecot-%{V_major}.%{V_minor}.tar.gz -Source1: http://www.dovecot.org/releases/sieve/dovecot-sieve-%{V_major}.%{V_minor_sieve}.tar.gz -Source2: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}-managesieve-%{V_managesieve}.tar.gz +Source1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_sieve_base}-sieve-%{V_sieve}.tar.gz +Source2: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved}.tar.gz Source3: fsl.dovecot Source4: rc.dovecot +Source5: dovecot.conf Patch0: dovecot.patch -Patch1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}.%{V_minor}-managesieve-%{V_managesieve}.diff.gz +Patch1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_managesieve_base}-managesieve-%{V_managesieve}.diff.gz # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823 -PreReq: OpenPKG, openpkg >= 20060823, MTA +PreReq: OpenPKG, openpkg >= 20060823, MTA, x509 BuildPreReq: libiconv, openssl PreReq: libiconv, openssl %if "%{with_fsl}" == "yes" @@ -76,7 +80,6 @@ PreReq: openldap %endif %if "%{with_managesieve}" == "yes" -BuildPreReq: autoconf, automake, pkgconfig, libtool BuildPreReq: gettext PreReq: gettext %endif @@ -109,17 +112,22 @@ prog dovecot = { version = %{V_major}.%{V_minor} url = http://www.dovecot.org/download.html - regex = dovecot-(1\.1(\.\d+)+)\.tar\.gz + regex = dovecot-(__VER__)\.tar\.gz } prog dovecot:sieve = { - version = %{V_major}.%{V_minor_sieve} - url = http://www.dovecot.org/download.html - regex = dovecot-sieve-(%{V_major}(\.\d+)+)\.tar\.gz + version = %{V_sieve} + url = http://www.rename-it.nl/dovecot/%{V_major}/ + regex = dovecot-%{V_sieve_base}-sieve-(__VER__)\.tar\.gz + } + prog dovecot:managesieved = { + version = %{V_managesieved} + url = http://www.rename-it.nl/dovecot/%{V_major}/ + regex = dovecot-%{V_managesieved_base}-managesieve-(__VER__)\.tar\.gz } prog dovecot:managesieve = { version = %{V_managesieve} url = http://www.rename-it.nl/dovecot/%{V_major}/ - regex = dovecot-%{V_major}-managesieve-(__VER__)\.tar\.gz + regex = dovecot-%{V_managesieve_base}-managesieve-(__VER__)\.diff\.gz } %prep @@ -130,16 +138,10 @@ %if "%{with_managesieve}" == "yes" %setup -q -T -D -a 2 %{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1 -b - %{l_shtool} subst \ - -e 's;/usr/\(libexec/dovecot/managesieve\);%{l_prefix}/\1;g' \ - dovecot-example.conf %endif %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b %build -%if "%{with_managesieve}" == "yes" - autoreconf -i --force || true -%endif cppflags="%{l_cppflags}" ldflags="%{l_ldflags} %{l_fsl_ldflags}" libs="%{l_fsl_libs}" @@ -166,18 +168,16 @@ CPPFLAGS="$cppflags" \ LDFLAGS="$ldflags" \ LIBS="$libs" \ - GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ + --mandir=%{l_prefix}/man \ --sysconfdir=%{l_prefix}/etc/dovecot \ --with-ssldir=%{l_prefix}/etc/dovecot/ssl \ --datadir=%{l_prefix}/share/dovecot \ --docdir=%{l_prefix}/share/dovecot/doc \ --with-rundir=%{l_prefix}/var/dovecot/run \ - --with-statedir=%{l_prefix}/var/dovecot/dat \ --with-libiconv-prefix=%{l_prefix} \ --with-ssl=openssl \ - --with-deliver \ --with-docs \ %if "%{with_ldap}" == "yes" --with-ldap \ @@ -214,122 +214,108 @@ %else --without-pam \ %endif -%if "%{with_pop3d}" == "yes" - --with-pop3d \ -%else - --without-pop3d \ -%endif --without-gc \ --without-gssapi \ --without-lucene \ - --without-vpopmail + --without-vpopmail \ + --enable-shared \ + --disable-static %{l_make} %{l_mflags -O} %if "%{with_sieve}" == "yes" # build optional Dovecot LDA sieve plugin - ( cd dovecot-sieve-%{V_major}.%{V_minor_sieve} + ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ - GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ - --with-dovecot=.. + --mandir=%{l_prefix}/man \ + --with-dovecot=`pwd`/.. %{l_make} %{l_mflags -O} ) || exit $? %endif - %if "%{with_managesieve}" == "yes" - # build optional Dovecot managesieve package - ( cd dovecot-%{V_major}-managesieve-%{V_managesieve} + # build optional Dovecot LDA managesieve daemon + ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ - GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ - --with-dovecot=.. \ - --with-dovecot-sieve=../dovecot-sieve-%{V_major}.%{V_minor_sieve} + --mandir=%{l_prefix}/man \ + --with-dovecot-sieve=`pwd`/../dovecot-%{V_sieve_base}-sieve-%{V_sieve} \ + --with-dovecot=`pwd`/.. %{l_make} %{l_mflags -O} ) || exit $? %endif %install rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" %if "%{with_sieve}" == "yes" # install optional Dovecot LDA sieve plugin - ( cd dovecot-sieve-%{V_major}.%{V_minor_sieve} - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT + ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" ) || exit $? %endif - %if "%{with_managesieve}" == "yes" - # install optional Dovecot managesieve package - ( cd dovecot-%{V_major}-managesieve-%{V_managesieve} - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT + # install optional Dovecot LDA managesieve daemon + ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" ) || exit $? %endif - # adjust file names of configuration files - ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot - for i in dovecot dovecot-db dovecot-ldap dovecot-sql; do - mv ${i}{-example,}.conf - done - ) || exit $? - # create additional dirctories %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ssl \ - $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/dat \ $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/log \ $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/run/login - # install runcommand script + # install run-command script %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d -%if "%{with_pop3d}" == "yes" - cmd='/<\/\{0,1\}with_pop3d>/d' -%else - cmd='//,/<\/with_pop3d>/d' -%endif %{l_shtool} install -c -m 755 %{l_value -s -a} \ - -e "$cmd" \ %{SOURCE rc.dovecot} \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - # install OSSP fsl configuration - %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl - %{l_shtool} install -c -m 644 %{l_value -s -a} \ - %{SOURCE fsl.dovecot} \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - # strip installation + rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot*example.conf rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \ >/dev/null 2>&1 || true - rmdir $RPM_BUILD_ROOT%{l_prefix}/include/dovecot \ - $RPM_BUILD_ROOT%{l_prefix}/include \ - >/dev/null 2>&1 || true strip \ $RPM_BUILD_ROOT%{l_prefix}/sbin/* \ $RPM_BUILD_ROOT%{l_prefix}/libexec/dovecot/* \ >/dev/null 2>&1 || true + # install default server configuration + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + %{SOURCE dovecot.conf} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ + + # install OSSP fsl configuration + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + %{SOURCE fsl.dovecot} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + # generate file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%not %dir %{l_prefix}/etc/fsl' \ '%config %{l_prefix}/etc/fsl/fsl.dovecot' \ '%config %attr(0600,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/dovecot/*' \ - '%config %attr(0640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ + '%config %attr(0644,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/dovecot/ssl' \ - '%dir %attr(0755,%{l_musr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ - '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/dat' \ - '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ - '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \ - '%dir %attr(0750,%{l_musr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \ + '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ + '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ + '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \ + '%dir %attr(0750,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run/login' \ '%doc %{l_prefix}/share/dovecot/doc' \ '%doc %{l_prefix}/share/dovecot/doc/wiki' @@ -350,7 +336,6 @@ [ $1 -eq 0 ] || exit 0 %{l_rc} dovecot stop 2>/dev/null rm -f $RPM_INSTALL_PREFIX/var/dovecot/* >/dev/null 2>&1 || true - rm -f $RPM_INSTALL_PREFIX/var/dovecot/dat/* >/dev/null 2>&1 || true rm -f $RPM_INSTALL_PREFIX/var/dovecot/log/* >/dev/null 2>&1 || true rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/* >/dev/null 2>&1 || true rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/login/* >/dev/null 2>&1 || true diff -r 8b89c85ab535 -r 76b4896bea63 dovecot/rc.dovecot --- a/dovecot/rc.dovecot Tue Nov 03 16:05:28 2009 +0100 +++ b/dovecot/rc.dovecot Thu Nov 05 13:42:13 2009 +0100 @@ -15,10 +15,6 @@ dovecot_deliver_log_numfiles="10" dovecot_deliver_log_minsize="1M" dovecot_deliver_log_complevel="9" - - POP_type="dovecot" - POP_logfile="@l_prefix@/var/dovecot/log/dovecot.log" - %common dovecot_pidfile="@l_prefix@/var/dovecot/run/master.pid"