--- exim-4.82/src/EDITME.orig 2013-10-25 04:46:27.000000000 +0400 +++ exim-4.82/src/EDITME 2014-05-19 18:38:40.114845745 +0400 @@ -63,7 +63,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 @@ -98,8 +99,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 #------------------------------------------------------------------------------ # CONFIGURE_FILE defines where Exim's run time configuration file is to be @@ -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/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. @@ -131,7 +131,7 @@ # deliveries. (Local deliveries run as various non-root users, typically as the # owner of a local mailbox.) Specifying these values as root is not supported. -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 @@ -152,7 +152,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 @@ -232,7 +232,7 @@ # This one is special-purpose, and commonly not required, so it is not # included by default. -# TRANSPORT_LMTP=yes +TRANSPORT_LMTP=yes #------------------------------------------------------------------------------ @@ -241,9 +241,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 #------------------------------------------------------------------------------ @@ -296,15 +296,15 @@ 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_ORACLE=yes -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes # LOOKUP_PGSQL=yes # LOOKUP_SQLITE=yes # LOOKUP_SQLITE_PC=sqlite3 @@ -363,6 +363,8 @@ # 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 -lsqlite3 +LOOKUP_INCLUDE=-I /usr/include -I /usr/include/db4 -I MYLIBDIR/perl5/CORE +LOOKUP_LIBS=-LMYLIBDIR -lsqlite3 #------------------------------------------------------------------------------ @@ -383,14 +385,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 # If you're using ClamAV and are backporting fixes to an old version, instead # of staying current (which is the more usual approach) then you may need to @@ -433,18 +435,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 @@ -605,15 +607,15 @@ # 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_CRAM_MD5=yes +AUTH_CYRUS_SASL=yes +AUTH_DOVECOT=yes # AUTH_GSASL=yes # AUTH_GSASL_PC=libgsasl # AUTH_HEIMDAL_GSSAPI=yes # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi -# AUTH_PLAINTEXT=yes -# AUTH_SPA=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes #------------------------------------------------------------------------------ @@ -623,7 +625,7 @@ # Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC. # Ditto for AUTH_HEIMDAL_GSSAPI(_PC). -# AUTH_LIBS=-lsasl2 +AUTH_LIBS=-lsasl2 # AUTH_LIBS=-lgsasl # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt @@ -634,7 +636,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 @@ -654,7 +656,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() @@ -716,11 +718,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 one of these settings if you are using OpenSSL; pkg-config vs not # USE_OPENSSL_PC=openssl -# TLS_LIBS=-lssl -lcrypto +TLS_LIBS=-lssl -lcrypto # Uncomment the first and either the second or the third of these if you # are using GnuTLS. If you have pkg-config, then the second, else the third. @@ -765,6 +767,8 @@ # or # TLS_INCLUDE=-I/opt/gnu/include +TLS_INCLUDE=-I/usr/include/openssl + # You don't need to set TLS_INCLUDE if the relevant directories are already # specified in INCLUDE. @@ -798,7 +802,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/%slog # 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 @@ -864,7 +868,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 #------------------------------------------------------------------------------ @@ -884,7 +888,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. @@ -935,7 +939,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 #------------------------------------------------------------------------------ @@ -952,22 +956,21 @@ # 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 #------------------------------------------------------------------------------ # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment # 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 +USE_TCP_WRAPPERS=yes +CFLAGS=-I/usr/include +EXTRALIBS_EXIM=-lwrap -lpam -ldl # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. @@ -1000,8 +1003,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 #------------------------------------------------------------------------------ # There are some testing options (-be, -bt, -bv) that read data from the @@ -1029,7 +1031,7 @@ #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. -# HAVE_IPV6=yes +HAVE_IPV6=yes ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # @@ -1077,7 +1079,7 @@ # it replaces the value with what is defined here. Commenting this setting # suppresses the check altogether. -TMPDIR="/tmp" +#TMPDIR="/tmp" #------------------------------------------------------------------------------ @@ -1249,7 +1251,7 @@ # If you wish to disable valgrind in the binary, define NVALGRIND=1. # This should not be needed. -# NVALGRIND=1 +NVALGRIND=1 #------------------------------------------------------------------------------ # Identifying the daemon: When an Exim daemon starts up, it writes its pid @@ -1257,6 +1259,7 @@ # 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". @@ -1289,7 +1292,7 @@ # 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 #------------------------------------------------------------------------------