--- exim-4.50/src/EDITME.orig	2005-02-17 16:49:11 +0200

+++ exim-4.50/src/EDITME	2005-02-21 16:02:21 +0200

@@ -65,7 +65,8 @@

 # also permitted to use the # character to add a comment to a setting, for

 # example

 #

-# EXIM_GID=42   # the "mail" group

+EXIM_GID=12   # the "mail" group

+EXIM_UID=8

 #

 # However, with some versions of "make" this works only if there is no white

 # space between the end of the setting and the #, so perhaps it is best

@@ -100,7 +101,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 +117,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/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 +135,7 @@

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

 # discouraged.

-EXIM_USER=

+EXIM_USER=mail

 # 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 +156,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=mail

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

 # and use

@@ -229,7 +230,7 @@

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

 # included by default.

-# TRANSPORT_LMTP=yes

+TRANSPORT_LMTP=yes

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

@@ -238,9 +239,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

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

@@ -255,16 +256,16 @@

 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_MYSQL=yes

 # LOOKUP_NIS=yes

 # LOOKUP_NISPLUS=yes

 # LOOKUP_ORACLE=yes

-# LOOKUP_PASSWD=yes

+LOOKUP_PASSWD=yes

 # LOOKUP_PGSQL=yes

 # LOOKUP_WHOSON=yes

@@ -272,8 +273,8 @@

 # 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_NWILDLSEARCH=yes

+LOOKUP_WILDLSEARCH=yes

+LOOKUP_NWILDLSEARCH=yes

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

@@ -301,8 +302,9 @@

 # specified in INCLUDE. The settings below are just examples; -lpq is for

 # PostgreSQL, -lgds is for Interbase.

-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include

-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds

+# LOOKUP_INCLUDE=-I /usr/include/ldap -I /usr/include/mysql -I /usr/include/pgsql

+LOOKUP_INCLUDE=-I /usr/include -I /usr/include/db4 -I /usr/lib/perl/i386-linux/CORE

+LOOKUP_LIBS=-L/usr/lib

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

 # Compiling the Exim monitor: If you want to compile the Exim monitor, a

@@ -321,14 +323,14 @@

 # 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

@@ -339,18 +341,18 @@

 # installed on your system (www.libspf2.org). Depending on where it is installed

 # you may have to edit the CFLAGS and LDFLAGS lines.

-# EXPERIMENTAL_SPF=yes

+EXPERIMENTAL_SPF=yes

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

-# LDFLAGS += -lspf2

+LDFLAGS += -lspf2

 # Uncomment the following lines to add SRS (Sender rewriting scheme) support.

 # You need to have libsrs_alt installed on your system (srs.mirtol.com).

 # Depending on where it is installed you may have to edit the CFLAGS and

 # LDFLAGS lines.

-# EXPERIMENTAL_SRS=yes

+EXPERIMENTAL_SRS=yes

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

-# LDFLAGS += -lsrs_alt

+LDFLAGS += -lsrs_alt

 # Uncomment the following lines to add Brightmail AntiSpam support. You need

 # to have the Brightmail client SDK installed. Please check the experimental

@@ -464,10 +466,10 @@

 # 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_CRAM_MD5=yes

 # AUTH_CYRUS_SASL=yes

-# AUTH_PLAINTEXT=yes

-# AUTH_SPA=yes

+AUTH_PLAINTEXT=yes

+AUTH_SPA=yes

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

@@ -484,7 +486,7 @@

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

 # defined by this setting:

-HEADERS_CHARSET="ISO-8859-1"

+#HEADERS_CHARSET="ISO-8859-1"

 # 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

@@ -504,7 +506,7 @@

 # 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()

@@ -553,10 +555,10 @@

 # 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_LIBS=-lssl -lcrypto

 # Uncomment these settings if you are using GnuTLS

 # USE_GNUTLS=yes

@@ -583,7 +585,7 @@

 # auxiliary programs. If the include files are not in a standard place, you can

 # set TLS_INCLUDE to specify where they are, for example:

-# TLS_INCLUDE=-I/usr/local/openssl/include/

+TLS_INCLUDE=-I/usr/include/openssl

 # or

 # TLS_INCLUDE=-I/opt/gnu/include

@@ -620,7 +622,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

@@ -632,7 +634,7 @@

 # files, by settings such as these

 # LOG_FILE_PATH=syslog

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

+# LOG_FILE_PATH=syslog:/var/log/exim/%s.log

 # The first of these uses only syslog; the second uses syslog and also writes

 # to log files. Do not include white space in such a setting as it messes up

@@ -669,7 +671,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

@@ -677,7 +679,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

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

@@ -686,7 +688,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

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

@@ -696,7 +698,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.

@@ -740,7 +742,7 @@

 # /var/pwcheck) and chown it to exim's user and group. Once you have installed

 # pwcheck, you should arrange for it to be started by root at boot time.

-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck

+CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck

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

@@ -757,7 +759,7 @@

 # 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

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

@@ -765,14 +767,15 @@

 # this setting. See the manual section entitled "Use of tcpwrappers" in the

 # chapter on building and installing Exim.

 #

-# USE_TCP_WRAPPERS=yes

+USE_TCP_WRAPPERS=yes

 #

 # 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

+CFLAGS=-I/usr/include

+EXTRALIBS_EXIM=-lwrap -lpam -ldl

+# -lradiusclient

 #

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

 # as well.

@@ -798,7 +801,7 @@

 # aliases). The following setting can be changed to specify a different

 # location for the system alias file.

-SYSTEM_ALIASES_FILE=/etc/aliases

+SYSTEM_ALIASES_FILE=/etc/exim/aliases

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

@@ -848,7 +851,7 @@

 # CHGRP_COMMAND=/usr/bin/chgrp

 # MV_COMMAND=/bin/mv

 # RM_COMMAND=/bin/rm

-# PERL_COMMAND=/usr/bin/perl

+PERL_COMMAND=/usr/bin/perl

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

@@ -1042,7 +1045,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".

@@ -1075,6 +1078,6 @@

 # run time option is required to cause the moving actually to occur. Such

 # messages become "invisible" to the normal management tools.

-# SUPPORT_MOVE_FROZEN_MESSAGES=yes

+SUPPORT_MOVE_FROZEN_MESSAGES=yes

 # End of EDITME for Exim 4.