dovecot/dovecot.patch@76b4896bea63
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.*.
1 Index: configure.in
2 --- configure.in.orig 2009-07-27 07:26:10 +0200
3 +++ configure.in 2009-07-27 16:49:17 +0200
4 @@ -1970,14 +1970,14 @@
5 AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO)
6 if test $PG_CONFIG = NO; then
7 # based on code from PHP
8 - for i in /usr /usr/local /usr/local/pgsql; do
9 - for j in include include/pgsql include/postgres include/postgresql ""; do
10 + for i in @l_prefix@; do
11 + for j in include/postgresql; do
12 if test -r "$i/$j/libpq-fe.h"; then
13 PGSQL_INCLUDE=$i/$j
14 fi
15 done
16 - for lib in lib lib64; do
17 - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
18 + for lib in lib; do
19 + for j in $lib; do
20 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
21 PGSQL_LIBDIR=$i/$j
22 fi
23 Index: configure
24 --- configure.orig 2009-07-27 07:26:28 +0200
25 +++ configure 2009-07-27 16:50:02 +0200
26 @@ -29424,14 +29424,14 @@
28 if test $PG_CONFIG = NO; then
29 # based on code from PHP
30 - for i in /usr /usr/local /usr/local/pgsql; do
31 - for j in include include/pgsql include/postgres include/postgresql ""; do
32 + for i in @l_prefix@; do
33 + for j in include/postgresql; do
34 if test -r "$i/$j/libpq-fe.h"; then
35 PGSQL_INCLUDE=$i/$j
36 fi
37 done
38 - for lib in lib lib64; do
39 - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
40 + for lib in lib; do
41 + for j in $lib; do
42 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
43 PGSQL_LIBDIR=$i/$j
44 fi
45 Index: src/deliver/deliver.c
46 --- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200
47 +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200
48 @@ -46,7 +46,7 @@
49 #include <syslog.h>
51 #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
52 -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
53 +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail"
54 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
56 /* After buffer grows larger than this, create a temporary file to /tmp
