OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 05-Jul-2009 18:12:21
Branch: HEAD Handle: 2009070517122100
Added files:
openpkg-src/dovecot dovecot.conf
Modified files:
openpkg-src/dovecot dovecot.patch dovecot.spec
Log:
upgrade to Dovecot 1.2
Summary:
Revision Changes Path
1.1 +59 -0 openpkg-src/dovecot/dovecot.conf
1.10 +0 -330 openpkg-src/dovecot/dovecot.patch
1.31 +75 -38 openpkg-src/dovecot/dovecot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.conf
============================================================================
$ cvs diff -u -r0 -r1.1 dovecot.conf
--- /dev/null 2009-07-05 18:12:21 +0200
+++ dovecot.conf 2009-07-05 18:12:21 +0200
@@ -0,0 +1,59 @@
+##
+## dovecot.conf -- Dovecot server configuration
+##
+
+protocols = imap
+
+protocol imap {
+ listen = 127.0.0.1:143
+ ssl_listen = 127.0.0.1:993
+}
+
+ssl_disable = no
+ssl_cert_file = @l_prefix@/etc/x509/example-server.crt.pem
+ssl_key_file = @l_prefix@/etc/x509/example-server.key.pem
+
+login_user = @l_musr@
+login_processes_count = 4
+login_max_processes_count = 128
+login_max_connections = 256
+
+mail_location = mbox:~/.mail:INBOX=~/.mail/inbox
+mail_uid = @l_rusr@
+mail_gid = @l_rusr@
+mail_privileged_group = @l_rusr@
+mbox_read_locks = fcntl
+mbox_write_locks = fcntl
+
+auth_realms = example.com
+auth_default_realm =
+auth_verbose = yes
+disable_plaintext_auth = no
+
+auth_debug = no
+auth_debug_passwords = no
+mail_debug = no
+verbose_ssl = no
+
+protocol lda {
+ postmaster_address = postmaster
+}
+
+auth default {
+ mechanisms = plain login
+ passdb passwd {
+ }
+ userdb passwd {
+ }
+ socket listen {
+ master {
+ path = @l_prefix@/var/dovecot/run/auth-master
+ mode = 0660
+ }
+ client {
+ path = @l_prefix@/var/dovecot/run/auth-client
+ mode = 0660
+ }
+ }
+}
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 dovecot.patch
--- openpkg-src/dovecot/dovecot.patch 18 May 2009 20:47:37 -0000 1.9
+++ openpkg-src/dovecot/dovecot.patch 5 Jul 2009 16:12:21 -0000 1.10
@@ -42,294 +42,6 @@
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
---- doc/dovecot-sql-example.conf.orig 2009-01-05 21:49:58 +0100
-+++ doc/dovecot-sql-example.conf 2009-05-18 22:39:30 +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:
-+# ho...@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
---- dovecot-example.conf.orig 2009-05-13 18:41:46 +0200
-+++ dovecot-example.conf 2009-05-18 22:42:42 +0200
-@@ -17,11 +17,11 @@
- # --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
-
- # 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
- # If you only want to use dovecot-auth, you can set this to "none".
--#protocols = imap imaps
-+#protocols = imap
-
- # A space separated list of IP or host addresses where to listen in for
- # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all
IPv6
-@@ -39,7 +39,7 @@
- # listen = *:10100
- # ..
- # }
--#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
-@@ -83,17 +83,17 @@
- # 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. <doc/wiki/SSL.txt>
--#ssl_disable = no
-+#ssl_disable = yes
-
- # PEM encoded X.509 SSL/TLS certificate and private key. They're opened
before
- # 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
-@@ -136,7 +136,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. <doc/wiki/Rootless.txt>
-@@ -146,7 +146,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. <doc/wiki/UserIds.txt>
--#login_user = dovecot
-+#login_user = @l_musr@
-
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
-@@ -504,7 +504,7 @@
-
- protocol imap {
- # 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.
-@@ -516,7 +516,7 @@
- # /tmp/gdbhelper.* files:
- # mail_executable = /usr/libexec/dovecot/gdbhelper
/usr/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
-@@ -530,7 +530,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.
-@@ -573,11 +573,11 @@
-
- protocol pop3 {
- # 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
-@@ -637,7 +637,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:
-@@ -665,7 +665,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.
-@@ -679,7 +679,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.
-@@ -690,7 +690,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
- }
-
- ##
-@@ -698,7 +698,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
-@@ -788,7 +788,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
-@@ -821,7 +821,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
- #}
-
-@@ -904,13 +904,13 @@
- # SQL database <doc/wiki/AuthDatabase.SQL.txt>
- #passdb sql {
- # Path for SQL configuration file, see doc/dovecot-sql-example.conf
-- #args =
-+ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf
- #}
-
- # LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
- #passdb ldap {
- # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
-- #args =
-+ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf
- #}
-
- # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -975,13 +975,13 @@
- # SQL database <doc/wiki/AuthDatabase.SQL.txt>
- #userdb sql {
- # Path for SQL configuration file, see doc/dovecot-sql-example.conf
-- #args =
-+ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf
- #}
-
- # LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
- #userdb ldap {
- # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
-- #args =
-+ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf
- #}
-
- # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -1018,7 +1018,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@/dovecot/run/auth-master
- #mode = 0600
- # Default user/group is the one who started dovecot-auth (root)
- #user =
-@@ -1028,7 +1028,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@/dovecot/run/auth-client
- #mode = 0660
- #}
- #}
-@@ -1042,7 +1042,7 @@
- #auth external {
- # socket connect {
- # master {
--# path = /var/run/dovecot/auth-master
-+# path = @l_prefix@/dovecot/run/auth-master
- # }
- # }
- #}
-@@ -1058,8 +1058,8 @@
- # referenced using URIs in format "proxy::<name>".
-
- 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
-@@ -1110,7 +1110,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.
-@@ -1129,14 +1129,14 @@
- # until the message can be saved within quota limits. The configuration
file
- # is a text file where each line is in format: <priority> <mailbox name>
- # 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
-
Index: src/deliver/deliver.c
--- src/deliver/deliver.c.orig 2009-02-27 00:31:13 +0100
+++ src/deliver/deliver.c 2009-05-18 22:39:30 +0200
@@ -342,45 +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
---- src/master/master-settings.c.orig 2009-05-13 19:32:34 +0200
-+++ src/master/master-settings.c 2009-05-18 22:39:30 +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",
-@@ -317,7 +317,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,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 dovecot.spec
--- openpkg-src/dovecot/dovecot.spec 2 Jun 2009 07:06:31 -0000 1.30
+++ openpkg-src/dovecot/dovecot.spec 5 Jul 2009 16:12:21 -0000 1.31
@@ -22,11 +22,14 @@
##
# package version
-%define V_major 1.1
-%define V_minor 16
-%define V_minor_sieve 6
-%define V_minor_managesieve 1
-%define V_managesieve 0.10.3
+%define V_major 1.2
+%define V_minor 0
+%define V_sieve_base 1.2
+%define V_sieve 0.1.6
+%define V_managesieve_base 1.2.rc5
+%define V_managesieve 0.11.5
+%define V_managesieved_base 1.2
+%define V_managesieved 0.11.5
# package information
Name: dovecot
@@ -39,32 +42,34 @@
Group: Mail
License: MIT+LGPL
Version: %{V_major}.%{V_minor}
-Release: 20090602
+Release: 20090705
# 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: fsl.dovecot
-Source3: rc.dovecot
+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}-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"
@@ -109,17 +114,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}\.%{V_minor_managesieve}-managesieve-(__VER__)\.diff\.gz
+ regex =
dovecot-%{V_managesieve_base}-managesieve-(__VER__)\.diff\.gz
}
%prep
@@ -127,13 +137,15 @@
%if "%{with_sieve}" == "yes"
%setup -q -T -D -a 1
%endif
- %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b
%if "%{with_managesieve}" == "yes"
- sleep 1
+ %setup -q -T -D -a 2
%{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1 -b
- sleep 1
- autoreconf -i --force || true
+ %{l_shtool} subst \
+ -e
's;\(CLIENT_LOGIN_IDLE_TIMEOUT_MSECS.*\)(3\*60\*1000);\1(2*60*1000);' \
+
dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved}/src/managesieve-login/client.h
+
%endif
+ %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b
%build
cppflags="%{l_cppflags}"
@@ -164,6 +176,7 @@
LIBS="$libs" \
./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 \
@@ -223,14 +236,30 @@
%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}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --with-dovecot=`pwd`/..
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+%endif
+%if "%{with_managesieve}" == "yes"
+ # 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}" \
./configure \
--prefix=%{l_prefix} \
- --with-dovecot=..
+ --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
@@ -241,17 +270,16 @@
%if "%{with_sieve}" == "yes"
# install optional Dovecot LDA sieve plugin
- ( cd dovecot-sieve-%{V_major}.%{V_minor_sieve}
+ ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve}
%{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-ldap dovecot-sql; do
- mv ${i}{-example,}.conf
- done
+%if "%{with_managesieve}" == "yes"
+ # 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
# create additional dirctories
%{l_shtool} mkdir -f -p -m 755 \
@@ -272,13 +300,8 @@
%{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
strip \
@@ -286,12 +309,26 @@
$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_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \
'%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
