1.1 --- a/dovecot/dovecot.patch Wed Feb 08 20:16:40 2012 +0200
1.2 +++ b/dovecot/dovecot.patch Wed Feb 08 20:16:25 2012 +0200
1.3 @@ -1,9 +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 -@@ -1964,14 +1964,14 @@
1.9 - AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO)
1.10 +--- configure.in.orig 2011-03-04 19:47:50.000000000 +0100
1.11 ++++ configure.in 2011-03-05 13:00:48.000000000 +0100
1.12 +@@ -2100,14 +2100,14 @@
1.13 + AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO)
1.14 if test $PG_CONFIG = NO; then
1.15 # based on code from PHP
1.16 - for i in /usr /usr/local /usr/local/pgsql; do
1.17 @@ -22,10 +21,9 @@
1.18 PGSQL_LIBDIR=$i/$j
1.19 fi
1.20 Index: configure
1.21 -diff -Nau configure.orig configure
1.22 ---- configure.orig 2009-07-27 07:26:28 +0200
1.23 -+++ configure 2009-07-27 16:50:02 +0200
1.24 -@@ -29410,14 +29410,14 @@
1.25 +--- configure.orig 2011-03-04 19:47:55.000000000 +0100
1.26 ++++ configure 2011-03-05 13:00:48.000000000 +0100
1.27 +@@ -22858,14 +22858,14 @@
1.28
1.29 if test $PG_CONFIG = NO; then
1.30 # based on code from PHP
1.31 @@ -44,49 +42,3 @@
1.32 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
1.33 PGSQL_LIBDIR=$i/$j
1.34 fi
1.35 -Index: src/deliver/deliver.c
1.36 -diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c
1.37 ---- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200
1.38 -+++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200
1.39 -@@ -46,7 +46,7 @@
1.40 - #include <syslog.h>
1.41 -
1.42 - #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
1.43 --#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
1.44 -+#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail"
1.45 - #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
1.46 -
1.47 - /* After buffer grows larger than this, create a temporary file to /tmp
1.48 -Index: src/master/master-settings.c
1.49 -diff -Nau src/master/master-settings.c.orig src/master/master-settings.c
1.50 ---- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200
1.51 -+++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200
1.52 -@@ -179,8 +179,8 @@
1.53 -
1.54 - /* general */
1.55 - MEMBER(protocols) "imap imaps",
1.56 -- MEMBER(listen) "*",
1.57 -- MEMBER(ssl_listen) "",
1.58 -+ MEMBER(listen) "127.0.0.1",
1.59 -+ MEMBER(ssl_listen) "127.0.0.1",
1.60 -
1.61 - MEMBER(ssl) "yes",
1.62 - MEMBER(ssl_ca_file) "",
1.63 -@@ -200,7 +200,7 @@
1.64 - /* login */
1.65 - MEMBER(login_dir) "login",
1.66 - MEMBER(login_executable) NULL,
1.67 -- MEMBER(login_user) "dovecot",
1.68 -+ MEMBER(login_user) "@l_musr@",
1.69 - MEMBER(login_greeting) PACKAGE_NAME" ready.",
1.70 - MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",
1.71 - MEMBER(login_log_format) "%$: %s",
1.72 -@@ -321,7 +321,7 @@
1.73 - MEMBER(anonymous_username) "anonymous",
1.74 - MEMBER(krb5_keytab) "",
1.75 - MEMBER(gssapi_hostname) "",
1.76 -- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",
1.77 -+ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth",
1.78 - MEMBER(failure_delay) 2,
1.79 -
1.80 - MEMBER(verbose) FALSE,
