--- exim-4.71/src/EDITME.config	2009-11-20 12:18:19.000000000 +0000

+++ exim-4.71/src/EDITME	2009-12-24 19:02:19.000000000 +0000

@@ -100,7 +100,7 @@

 # /usr/local/sbin. The installation script will try to create this directory,

 # and any superior directories, if they do not exist.

-BIN_DIRECTORY=/usr/exim/bin

+BIN_DIRECTORY=/usr/sbin

 #------------------------------------------------------------------------------

@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin

 # don't exist. It will also install a default runtime configuration if this

 # file does not exist.

-CONFIGURE_FILE=/usr/exim/configure

+CONFIGURE_FILE=/etc/exim/exim.conf

 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.

 # In this case, Exim will use the first of them that exists when it is run.

@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure

 # owner of a local mailbox.) Specifying these values as root is very strongly

 # discouraged.

-EXIM_USER=

+EXIM_USER=93

 # If you specify EXIM_USER as a name, this is looked up at build time, and the

 # uid number is built into the binary. However, you can specify that this

@@ -155,7 +155,7 @@ EXIM_USER=

 # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless

 # you want to use a group other than the default group for the given user.

-# EXIM_GROUP=

+EXIM_GROUP=93

 # Many sites define a user called "exim", with an appropriate default group,

 # and use

@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes

 # This one is special-purpose, and commonly not required, so it is not

 # included by default.

-# TRANSPORT_LMTP=yes

+TRANSPORT_LMTP=yes

 #------------------------------------------------------------------------------

@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes

 # MBX, is included only when requested. If you do not know what this is about,

 # leave these settings commented out.

-# SUPPORT_MAILDIR=yes

-# SUPPORT_MAILSTORE=yes

-# SUPPORT_MBX=yes

+SUPPORT_MAILDIR=yes

+SUPPORT_MAILSTORE=yes

+SUPPORT_MBX=yes

 #------------------------------------------------------------------------------

@@ -262,17 +262,20 @@ LOOKUP_DBM=yes

 LOOKUP_LSEARCH=yes

 LOOKUP_DNSDB=yes

-# LOOKUP_CDB=yes

-# LOOKUP_DSEARCH=yes

+LOOKUP_CDB=yes

+LOOKUP_DSEARCH=yes

 # LOOKUP_IBASE=yes

-# LOOKUP_LDAP=yes

-# LOOKUP_MYSQL=yes

-# LOOKUP_NIS=yes

-# LOOKUP_NISPLUS=yes

+LOOKUP_LDAP=yes

+LDAP_LIB_TYPE=OPENLDAP2

+LOOKUP_INCLUDE=-I/usr/include/mysql

+LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq

+LOOKUP_MYSQL=yes

+LOOKUP_NIS=yes

+LOOKUP_NISPLUS=yes

 # LOOKUP_ORACLE=yes

-# LOOKUP_PASSWD=yes

-# LOOKUP_PGSQL=yes

-# LOOKUP_SQLITE=yes

+LOOKUP_PASSWD=yes

+LOOKUP_PGSQL=yes

+LOOKUP_SQLITE=yes

 # LOOKUP_WHOSON=yes

 # These two settings are obsolete; all three lookups are compiled when

@@ -343,14 +346,14 @@ EXIM_MONITOR=eximon.bin

 # and the MIME ACL. Please read the documentation to learn more about these

 # features.

-# WITH_CONTENT_SCAN=yes

+WITH_CONTENT_SCAN=yes

 # If you want to use the deprecated "demime" condition in the DATA ACL,

 # uncomment the line below. Doing so will also explicitly turn on the

 # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of

 # the "demime" condition.

-# WITH_OLD_DEMIME=yes

+WITH_OLD_DEMIME=yes

 #------------------------------------------------------------------------------

 # Compiling Exim with experimental features. These are documented in

@@ -486,11 +489,11 @@ FIXED_NEVER_USERS=root

 # included in the Exim binary. You will then need to set up the run time

 # configuration to make use of the mechanism(s) selected.

-# AUTH_CRAM_MD5=yes

-# AUTH_CYRUS_SASL=yes

-# AUTH_DOVECOT=yes

-# AUTH_PLAINTEXT=yes

-# AUTH_SPA=yes

+AUTH_CRAM_MD5=yes

+AUTH_CYRUS_SASL=yes

+AUTH_DOVECOT=yes

+AUTH_PLAINTEXT=yes

+AUTH_SPA=yes

 #------------------------------------------------------------------------------

@@ -507,7 +510,7 @@ FIXED_NEVER_USERS=root

 # one that is set in the headers_charset option. The default setting is

 # defined by this setting:

-HEADERS_CHARSET="ISO-8859-1"

+HEADERS_CHARSET="UTF-8"

 # If you are going to make use of $header_xxx expansions in your configuration

 # file, or if your users are going to use them in filter files, and the normal

@@ -527,7 +530,7 @@ HEADERS_CHARSET="ISO-8859-1"

 # the Sieve filter support. For those OS where iconv() is known to be installed

 # as standard, the file in OS/Makefile-xxxx contains

 #

-# HAVE_ICONV=yes

+HAVE_ICONV=yes

 #

 # If you are not using one of those systems, but have installed iconv(), you

 # need to uncomment that line above. In some cases, you may find that iconv()

@@ -589,10 +592,11 @@ HEADERS_CHARSET="ISO-8859-1"

 # leave these settings commented out.

 # This setting is required for any TLS support (either OpenSSL or GnuTLS)

-# SUPPORT_TLS=yes

+SUPPORT_TLS=yes

 # Uncomment this setting if you are using OpenSSL

-# TLS_LIBS=-lssl -lcrypto

+TLS_INCLUDE=-I/usr/kerberos/include

+TLS_LIBS=-lssl -lcrypto

 # Uncomment these settings if you are using GnuTLS

 # USE_GNUTLS=yes

@@ -643,7 +647,7 @@ HEADERS_CHARSET="ISO-8859-1"

 # Once you have done this, "make install" will build the info files and

 # install them in the directory you have defined.

-# INFO_DIRECTORY=/usr/share/info

+INFO_DIRECTORY=/usr/share/info

 #------------------------------------------------------------------------------

@@ -656,7 +660,7 @@ HEADERS_CHARSET="ISO-8859-1"

 # %s. This will be replaced by one of the strings "main", "panic", or "reject"

 # to form the final file names. Some installations may want something like this:

-# LOG_FILE_PATH=/var/log/exim_%slog

+LOG_FILE_PATH=/var/log/exim/%s.log

 # which results in files with names /var/log/exim_mainlog, etc. The directory

 # in which the log files are placed must exist; Exim does not try to create

@@ -705,7 +709,7 @@ EXICYCLOG_MAX=10

 # files. Both the name of the command and the suffix that it adds to files

 # need to be defined here. See also the EXICYCLOG_MAX configuration.

-COMPRESS_COMMAND=/usr/bin/gzip

+COMPRESS_COMMAND=/bin/gzip

 COMPRESS_SUFFIX=gz

@@ -713,7 +717,7 @@ COMPRESS_SUFFIX=gz

 # If the exigrep utility is fed compressed log files, it tries to uncompress

 # them using this command.

-ZCAT_COMMAND=/usr/bin/zcat

+ZCAT_COMMAND=/bin/zcat

 #------------------------------------------------------------------------------

@@ -722,7 +726,7 @@ ZCAT_COMMAND=/usr/bin/zcat

 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded

 # Perl costs quite a lot of resources. Only do this if you really need it.

-# EXIM_PERL=perl.o

+EXIM_PERL=perl.o

 #------------------------------------------------------------------------------

@@ -732,7 +736,7 @@ ZCAT_COMMAND=/usr/bin/zcat

 # that the local_scan API is made available by the linker. You may also need

 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.

-# EXPAND_DLFUNC=yes

+EXPAND_DLFUNC=yes

 #------------------------------------------------------------------------------

@@ -742,7 +746,7 @@ ZCAT_COMMAND=/usr/bin/zcat

 # support, which is intended for use in conjunction with the SMTP AUTH

 # facilities, is included only when requested by the following setting:

-# SUPPORT_PAM=yes

+SUPPORT_PAM=yes

 # You probably need to add -lpam to EXTRALIBS, and in some releases of

 # GNU/Linux -ldl is also needed.

@@ -810,7 +814,7 @@ ZCAT_COMMAND=/usr/bin/zcat

 # group. Once you have installed saslauthd, you should arrange for it to be

 # started by root at boot time.

-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux

+CYRUS_SASLAUTHD_SOCKET=/var/run/saslauthd/mux

 #------------------------------------------------------------------------------

@@ -823,9 +827,9 @@ ZCAT_COMMAND=/usr/bin/zcat

 # You may well also have to specify a local "include" file and an additional

 # library for TCP wrappers, so you probably need something like this:

 #

-# USE_TCP_WRAPPERS=yes

-# CFLAGS=-O -I/usr/local/include

-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap

+USE_TCP_WRAPPERS=yes

+CFLAGS+=$(RPM_OPT_FLAGS) $(PIE)

+EXTRALIBS_EXIM=-lwrap -lpam -ldl

 #

 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM

 # as well.

@@ -870,13 +874,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases

 # is "yes", as well as supporting line editing, a history of input lines in the

 # current run is maintained.

-# USE_READLINE=yes

+USE_READLINE=yes

 # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.

 # Note that this option adds to the size of the Exim binary, because the

 # dynamic loading library is not otherwise included.

-

+HAVE_IPV6=yes

 ###############################################################################

 #              THINGS YOU ALMOST NEVER NEED TO MENTION                        #

@@ -897,13 +901,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases

 # haven't got Perl, Exim will still build and run; you just won't be able to

 # use those utilities.

-# CHOWN_COMMAND=/usr/bin/chown

-# CHGRP_COMMAND=/usr/bin/chgrp

-# CHMOD_COMMAND=/usr/bin/chmod

-# MV_COMMAND=/bin/mv

-# RM_COMMAND=/bin/rm

-# TOUCH_COMMAND=/usr/bin/touch

-# PERL_COMMAND=/usr/bin/perl

+CHOWN_COMMAND=/bin/chown

+CHGRP_COMMAND=/bin/chgrp

+CHMOD_COMMAND=/bin/chmod

+MV_COMMAND=/bin/mv

+RM_COMMAND=/bin/rm

+TOUCH_COMMAND=/bin/touch

+PERL_COMMAND=/usr/bin/perl

 #------------------------------------------------------------------------------

@@ -1097,7 +1101,7 @@ TMPDIR="/tmp"

 # (process id) to a file so that it can easily be identified. The path of the

 # file can be specified here. Some installations may want something like this:

-# PID_FILE_PATH=/var/lock/exim.pid

+PID_FILE_PATH=/var/run/exim.pid

 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory

 # using the name "exim-daemon.pid".

--- exim-4.71/scripts/Configure-Makefile.config	2009-11-20 21:22:20.000000000 +0000

+++ exim-4.71/scripts/Configure-Makefile	2009-12-24 18:59:48.000000000 +0000

@@ -137,7 +137,7 @@ if [ "${EXIM_PERL}" != "" ] ; then

   mv $mft $mftt

   echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft

-  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft

+  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts` \$(CFLAGS)" >>$mft

   echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft

   echo "" >>$mft

   cat $mftt >> $mft