--- exim-4.30/scripts/Configure-Makefile.config 2003-12-01 11:15:41.000000000 +0100 +++ exim-4.30/scripts/Configure-Makefile 2003-12-04 15:22:26.000000000 +0100 @@ -130,7 +130,7 @@ 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 --- exim-4.30/Local/Makefile.config 2003-12-04 15:22:26.000000000 +0100 +++ exim-4.30/Local/Makefile 2003-12-04 15:28:11.000000000 +0100 @@ -98,7 +98,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 #------------------------------------------------------------------------------ @@ -114,7 +114,7 @@ # 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/exim4.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. @@ -132,7 +132,7 @@ # 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 @@ -153,7 +153,7 @@ # 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 @@ -227,7 +227,7 @@ # This one is special-purpose, and commonly not required, so it is not # included by default. -# TRANSPORT_LMTP=yes +TRANSPORT_LMTP=yes #------------------------------------------------------------------------------ @@ -236,9 +236,9 @@ # 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 #------------------------------------------------------------------------------ @@ -253,16 +253,18 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes -# LOOKUP_CDB=yes -# LOOKUP_DNSDB=yes -# LOOKUP_DSEARCH=yes +LOOKUP_CDB=yes +LOOKUP_DNSDB=yes +LOOKUP_DSEARCH=yes # LOOKUP_IBASE=yes -# LOOKUP_LDAP=yes +LOOKUP_LDAP=yes +LDAP_LIB_TYPE=OPENLDAP2 +LOOKUP_LIBS=-lldap -llber # LOOKUP_MYSQL=yes -# LOOKUP_NIS=yes -# LOOKUP_NISPLUS=yes +LOOKUP_NIS=yes +LOOKUP_NISPLUS=yes # LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes # LOOKUP_PGSQL=yes # LOOKUP_WHOSON=yes @@ -270,7 +272,7 @@ # LOOKUP_LSEARCH is enabled. However, we retain these for backward # compatibility. Setting one forces LOOKUP_LSEARCH if it is not set. -# LOOKUP_WILDLSEARCH=yes +LOOKUP_WILDLSEARCH=yes # LOOKUP_NWILDLSEARCH=yes @@ -386,9 +388,9 @@ # 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_PLAINTEXT=yes -# AUTH_SPA=yes +AUTH_CRAM_MD5=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes #------------------------------------------------------------------------------ @@ -466,10 +468,11 @@ # 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 @@ -520,7 +523,7 @@ # 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 #------------------------------------------------------------------------------ @@ -533,7 +536,7 @@ # %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 @@ -582,7 +585,7 @@ # 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 @@ -590,7 +593,7 @@ # 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 #------------------------------------------------------------------------------ @@ -599,7 +602,7 @@ # (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 #------------------------------------------------------------------------------ @@ -609,7 +612,7 @@ # 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. @@ -668,9 +671,9 @@ # 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=-g -O +EXTRALIBS_EXIM=-lwrap -lpam -ldl # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. @@ -719,11 +722,12 @@ # 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 -# MV_COMMAND=/bin/mv -# RM_COMMAND=/bin/rm -# PERL_COMMAND=/usr/bin/perl +CHOWN_COMMAND=/bin/chown +CHGRP_COMMAND=/bin/chgrp + +MV_COMAND=/bin/mv +RM_COMMAND=/bin/rm +PERL_COMMAND=/usr/bin/perl #------------------------------------------------------------------------------ @@ -917,7 +921,7 @@ # (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".