1.1 --- a/dovecot/dovecot.patch Thu Nov 05 18:05:07 2009 +0100 1.2 +++ b/dovecot/dovecot.patch Thu Nov 05 18:06:08 2009 +0100 1.3 @@ -1,7 +1,8 @@ 1.4 Index: configure.in 1.5 +diff -Nau configure.in.orig configure.in 1.6 --- configure.in.orig 2009-07-27 07:26:10 +0200 1.7 +++ configure.in 2009-07-27 16:49:17 +0200 1.8 -@@ -1970,14 +1970,14 @@ 1.9 +@@ -1964,14 +1964,14 @@ 1.10 AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) 1.11 if test $PG_CONFIG = NO; then 1.12 # based on code from PHP 1.13 @@ -21,9 +22,10 @@ 1.14 PGSQL_LIBDIR=$i/$j 1.15 fi 1.16 Index: configure 1.17 +diff -Nau configure.orig configure 1.18 --- configure.orig 2009-07-27 07:26:28 +0200 1.19 +++ configure 2009-07-27 16:50:02 +0200 1.20 -@@ -29424,14 +29424,14 @@ 1.21 +@@ -29410,14 +29410,14 @@ 1.22 1.23 if test $PG_CONFIG = NO; then 1.24 # based on code from PHP 1.25 @@ -43,6 +45,7 @@ 1.26 PGSQL_LIBDIR=$i/$j 1.27 fi 1.28 Index: src/deliver/deliver.c 1.29 +diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c 1.30 --- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 1.31 +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 1.32 @@ -46,7 +46,7 @@ 1.33 @@ -54,3 +57,36 @@ 1.34 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" 1.35 1.36 /* After buffer grows larger than this, create a temporary file to /tmp 1.37 +Index: src/master/master-settings.c 1.38 +diff -Nau src/master/master-settings.c.orig src/master/master-settings.c 1.39 +--- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200 1.40 ++++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200 1.41 +@@ -179,8 +179,8 @@ 1.42 + 1.43 + /* general */ 1.44 + MEMBER(protocols) "imap imaps", 1.45 +- MEMBER(listen) "*", 1.46 +- MEMBER(ssl_listen) "", 1.47 ++ MEMBER(listen) "127.0.0.1", 1.48 ++ MEMBER(ssl_listen) "127.0.0.1", 1.49 + 1.50 + MEMBER(ssl) "yes", 1.51 + MEMBER(ssl_ca_file) "", 1.52 +@@ -200,7 +200,7 @@ 1.53 + /* login */ 1.54 + MEMBER(login_dir) "login", 1.55 + MEMBER(login_executable) NULL, 1.56 +- MEMBER(login_user) "dovecot", 1.57 ++ MEMBER(login_user) "@l_musr@", 1.58 + MEMBER(login_greeting) PACKAGE_NAME" ready.", 1.59 + MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", 1.60 + MEMBER(login_log_format) "%$: %s", 1.61 +@@ -321,7 +321,7 @@ 1.62 + MEMBER(anonymous_username) "anonymous", 1.63 + MEMBER(krb5_keytab) "", 1.64 + MEMBER(gssapi_hostname) "", 1.65 +- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", 1.66 ++ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", 1.67 + MEMBER(failure_delay) 2, 1.68 + 1.69 + MEMBER(verbose) FALSE,