dovecot/dovecot.patch@76b4896bea63 (annotated)
dovecot/dovecot.patch
Thu, 05 Nov 2009 13:42:13 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 05 Nov 2009 13:42:13 +0100
- changeset 237
- 76b4896bea63
- parent 204
- 5aa32536e189
- child 239
- d2e66a0e1aa8
- permissions
- -rw-r--r--
Resynchronize with upstream package maintainer version.
This is needed due to large changeset after upgrade of vendor
distribution from version 1.1.* to 1.2.*.
| michael@237 | 1 | Index: configure.in |
| michael@237 | 2 | --- configure.in.orig 2009-07-27 07:26:10 +0200 |
| michael@237 | 3 | +++ configure.in 2009-07-27 16:49:17 +0200 |
| michael@237 | 4 | @@ -1970,14 +1970,14 @@ |
| michael@237 | 5 | AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) |
| michael@237 | 6 | if test $PG_CONFIG = NO; then |
| michael@237 | 7 | # based on code from PHP |
| michael@237 | 8 | - for i in /usr /usr/local /usr/local/pgsql; do |
| michael@237 | 9 | - for j in include include/pgsql include/postgres include/postgresql ""; do |
| michael@237 | 10 | + for i in @l_prefix@; do |
| michael@237 | 11 | + for j in include/postgresql; do |
| michael@237 | 12 | if test -r "$i/$j/libpq-fe.h"; then |
| michael@237 | 13 | PGSQL_INCLUDE=$i/$j |
| michael@237 | 14 | fi |
| michael@237 | 15 | done |
| michael@237 | 16 | - for lib in lib lib64; do |
| michael@237 | 17 | - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do |
| michael@237 | 18 | + for lib in lib; do |
| michael@237 | 19 | + for j in $lib; do |
| michael@237 | 20 | if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then |
| michael@237 | 21 | PGSQL_LIBDIR=$i/$j |
| michael@237 | 22 | fi |
| michael@204 | 23 | Index: configure |
| michael@237 | 24 | --- configure.orig 2009-07-27 07:26:28 +0200 |
| michael@237 | 25 | +++ configure 2009-07-27 16:50:02 +0200 |
| michael@237 | 26 | @@ -29424,14 +29424,14 @@ |
| michael@204 | 27 | |
| michael@237 | 28 | if test $PG_CONFIG = NO; then |
| michael@237 | 29 | # based on code from PHP |
| michael@237 | 30 | - for i in /usr /usr/local /usr/local/pgsql; do |
| michael@237 | 31 | - for j in include include/pgsql include/postgres include/postgresql ""; do |
| michael@237 | 32 | + for i in @l_prefix@; do |
| michael@237 | 33 | + for j in include/postgresql; do |
| michael@237 | 34 | if test -r "$i/$j/libpq-fe.h"; then |
| michael@237 | 35 | PGSQL_INCLUDE=$i/$j |
| michael@237 | 36 | fi |
| michael@237 | 37 | done |
| michael@237 | 38 | - for lib in lib lib64; do |
| michael@237 | 39 | - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do |
| michael@237 | 40 | + for lib in lib; do |
| michael@237 | 41 | + for j in $lib; do |
| michael@237 | 42 | if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then |
| michael@237 | 43 | PGSQL_LIBDIR=$i/$j |
| michael@237 | 44 | fi |
| michael@148 | 45 | Index: src/deliver/deliver.c |
| michael@237 | 46 | --- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 |
| michael@237 | 47 | +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 |
| michael@237 | 48 | @@ -46,7 +46,7 @@ |
| michael@148 | 49 | #include <syslog.h> |
| michael@148 | 50 | |
| michael@148 | 51 | #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" |
| michael@148 | 52 | -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail" |
| michael@148 | 53 | +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail" |
| michael@148 | 54 | #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" |
| michael@148 | 55 | |
| michael@148 | 56 | /* After buffer grows larger than this, create a temporary file to /tmp |
