# HG changeset patch # User Michael Schloh von Bennewitz # Date 1257440768 -3600 # Node ID d2e66a0e1aa89a0f17e723ca4292d0a6b5d9c019 # Parent 642966b63c34634f519f769ccee4b888b5925dee Specify required statedir, correct permissions, improve config. diff -r 642966b63c34 -r d2e66a0e1aa8 dovecot/dovecot.conf --- a/dovecot/dovecot.conf Thu Nov 05 18:05:07 2009 +0100 +++ b/dovecot/dovecot.conf Thu Nov 05 18:06:08 2009 +0100 @@ -7,13 +7,21 @@ protocol imap { listen = 127.0.0.1:143 ssl_listen = 127.0.0.1:993 + log_path = @l_prefix@/var/dovecot/log/imap-error.log + info_log_path = @l_prefix@/var/dovecot/log/imap-info.log + login_executable = @l_prefix@/libexec/dovecot/imap-login + mail_executable = @l_prefix@/libexec/dovecot/rawlog @l_prefix@/libexec/dovecot/imap } ssl = yes 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@ +log_path = @l_prefix@/var/dovecot/log/dovecot-error.log +info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log +log_timestamp = '%b %d %H:%M:%S ' + +login_user = @l_nusr@ login_processes_count = 4 login_max_processes_count = 128 login_max_connections = 256 @@ -37,6 +45,8 @@ protocol lda { postmaster_address = postmaster + log_path = @l_prefix@/var/dovecot/log/deliver-error.log + info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log } auth default { @@ -48,11 +58,15 @@ socket listen { master { path = @l_prefix@/var/dovecot/run/auth-master - mode = 0660 + mode = 0600 + user = @l_rusr@ + group = @l_rugrp@ } client { path = @l_prefix@/var/dovecot/run/auth-client mode = 0660 + user = @l_musr@ + group = @l_mgrp@ } } } diff -r 642966b63c34 -r d2e66a0e1aa8 dovecot/dovecot.patch --- a/dovecot/dovecot.patch Thu Nov 05 18:05:07 2009 +0100 +++ b/dovecot/dovecot.patch Thu Nov 05 18:06:08 2009 +0100 @@ -1,7 +1,8 @@ Index: configure.in +diff -Nau configure.in.orig 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 @@ +@@ -1964,14 +1964,14 @@ AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) if test $PG_CONFIG = NO; then # based on code from PHP @@ -21,9 +22,10 @@ PGSQL_LIBDIR=$i/$j fi Index: configure +diff -Nau configure.orig configure --- configure.orig 2009-07-27 07:26:28 +0200 +++ configure 2009-07-27 16:50:02 +0200 -@@ -29424,14 +29424,14 @@ +@@ -29410,14 +29410,14 @@ if test $PG_CONFIG = NO; then # based on code from PHP @@ -43,6 +45,7 @@ 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-06-28 01:47:56 +0200 +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 @@ -46,7 +46,7 @@ @@ -54,3 +57,36 @@ #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 +@@ -179,8 +179,8 @@ + + /* general */ + MEMBER(protocols) "imap imaps", +- MEMBER(listen) "*", +- MEMBER(ssl_listen) "", ++ MEMBER(listen) "127.0.0.1", ++ MEMBER(ssl_listen) "127.0.0.1", + + MEMBER(ssl) "yes", + MEMBER(ssl_ca_file) "", +@@ -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) PACKAGE_NAME" ready.", + MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", + MEMBER(login_log_format) "%$: %s", +@@ -321,7 +321,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 642966b63c34 -r d2e66a0e1aa8 dovecot/dovecot.spec --- a/dovecot/dovecot.spec Thu Nov 05 18:05:07 2009 +0100 +++ b/dovecot/dovecot.spec Thu Nov 05 18:06:08 2009 +0100 @@ -42,7 +42,7 @@ Group: Mail License: MIT+LGPL Version: %{V_major}.%{V_minor} -Release: 20091101 +Release: 20091104 # package options %option with_fsl yes @@ -176,6 +176,7 @@ --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-docs \ @@ -218,7 +219,6 @@ --without-gssapi \ --without-lucene \ --without-vpopmail \ - --enable-shared \ --disable-static %{l_make} %{l_mflags -O} @@ -254,28 +254,29 @@ %install rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT %if "%{with_sieve}" == "yes" # install optional Dovecot LDA sieve plugin ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT ) || exit $? %endif %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" + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT ) || exit $? %endif # 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 run-command script + # install runcommand script %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d %{l_shtool} install -c -m 755 %{l_value -s -a} \ @@ -286,6 +287,10 @@ 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}/lib/dovecot/auth \ + $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/* \ @@ -294,7 +299,7 @@ # 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} \ + %{l_shtool} install -c -m 640 %{l_value -s -a} \ %{SOURCE dovecot.conf} \ $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ @@ -310,12 +315,13 @@ '%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(0644,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ + '%config %attr(0640,%{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' \ - '%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' \ + '%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' \ '%doc %{l_prefix}/share/dovecot/doc' \ '%doc %{l_prefix}/share/dovecot/doc/wiki' @@ -336,6 +342,7 @@ [ $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