comparison: dovecot/dovecot.patch
dovecot/dovecot.patch
- changeset 608
- 09548e292fb1
- parent 239
- d2e66a0e1aa8
- child 609
- 747afbba9aa8
equal
deleted
inserted
replaced
| 5:31594594f98a | 6:ccab23b48c64 |
|---|---|
| 1 Index: configure.in | 1 Index: configure.in |
| 2 diff -Nau configure.in.orig configure.in | 2 --- configure.in.orig 2011-03-04 19:47:50.000000000 +0100 |
| 3 --- configure.in.orig 2009-07-27 07:26:10 +0200 | 3 +++ configure.in 2011-03-05 13:00:48.000000000 +0100 |
| 4 +++ configure.in 2009-07-27 16:49:17 +0200 | 4 @@ -2100,14 +2100,14 @@ |
| 5 @@ -1964,14 +1964,14 @@ | 5 AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO) |
| 6 AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) | |
| 7 if test $PG_CONFIG = NO; then | 6 if test $PG_CONFIG = NO; then |
| 8 # based on code from PHP | 7 # based on code from PHP |
| 9 - for i in /usr /usr/local /usr/local/pgsql; do | 8 - for i in /usr /usr/local /usr/local/pgsql; do |
| 10 - for j in include include/pgsql include/postgres include/postgresql ""; do | 9 - for j in include include/pgsql include/postgres include/postgresql ""; do |
| 11 + for i in @l_prefix@; do | 10 + for i in @l_prefix@; do |
| 20 + for j in $lib; do | 19 + for j in $lib; do |
| 21 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then | 20 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then |
| 22 PGSQL_LIBDIR=$i/$j | 21 PGSQL_LIBDIR=$i/$j |
| 23 fi | 22 fi |
| 24 Index: configure | 23 Index: configure |
| 25 diff -Nau configure.orig configure | 24 --- configure.orig 2011-03-04 19:47:55.000000000 +0100 |
| 26 --- configure.orig 2009-07-27 07:26:28 +0200 | 25 +++ configure 2011-03-05 13:00:48.000000000 +0100 |
| 27 +++ configure 2009-07-27 16:50:02 +0200 | 26 @@ -22858,14 +22858,14 @@ |
| 28 @@ -29410,14 +29410,14 @@ | |
| 29 | 27 |
| 30 if test $PG_CONFIG = NO; then | 28 if test $PG_CONFIG = NO; then |
| 31 # based on code from PHP | 29 # based on code from PHP |
| 32 - for i in /usr /usr/local /usr/local/pgsql; do | 30 - for i in /usr /usr/local /usr/local/pgsql; do |
| 33 - for j in include include/pgsql include/postgres include/postgresql ""; do | 31 - for j in include include/pgsql include/postgres include/postgresql ""; do |
| 42 + for lib in lib; do | 40 + for lib in lib; do |
| 43 + for j in $lib; do | 41 + for j in $lib; do |
| 44 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then | 42 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then |
| 45 PGSQL_LIBDIR=$i/$j | 43 PGSQL_LIBDIR=$i/$j |
| 46 fi | 44 fi |
| 47 Index: src/deliver/deliver.c | |
| 48 diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c | |
| 49 --- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 | |
| 50 +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 | |
| 51 @@ -46,7 +46,7 @@ | |
| 52 #include <syslog.h> | |
| 53 | |
| 54 #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" | |
| 55 -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail" | |
| 56 +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail" | |
| 57 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" | |
| 58 | |
| 59 /* After buffer grows larger than this, create a temporary file to /tmp | |
| 60 Index: src/master/master-settings.c | |
| 61 diff -Nau src/master/master-settings.c.orig src/master/master-settings.c | |
| 62 --- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200 | |
| 63 +++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200 | |
| 64 @@ -179,8 +179,8 @@ | |
| 65 | |
| 66 /* general */ | |
| 67 MEMBER(protocols) "imap imaps", | |
| 68 - MEMBER(listen) "*", | |
| 69 - MEMBER(ssl_listen) "", | |
| 70 + MEMBER(listen) "127.0.0.1", | |
| 71 + MEMBER(ssl_listen) "127.0.0.1", | |
| 72 | |
| 73 MEMBER(ssl) "yes", | |
| 74 MEMBER(ssl_ca_file) "", | |
| 75 @@ -200,7 +200,7 @@ | |
| 76 /* login */ | |
| 77 MEMBER(login_dir) "login", | |
| 78 MEMBER(login_executable) NULL, | |
| 79 - MEMBER(login_user) "dovecot", | |
| 80 + MEMBER(login_user) "@l_musr@", | |
| 81 MEMBER(login_greeting) PACKAGE_NAME" ready.", | |
| 82 MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", | |
| 83 MEMBER(login_log_format) "%$: %s", | |
| 84 @@ -321,7 +321,7 @@ | |
| 85 MEMBER(anonymous_username) "anonymous", | |
| 86 MEMBER(krb5_keytab) "", | |
| 87 MEMBER(gssapi_hostname) "", | |
| 88 - MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", | |
| 89 + MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", | |
| 90 MEMBER(failure_delay) 2, | |
| 91 | |
| 92 MEMBER(verbose) FALSE, |
