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,