1 diff -urN exim-4.22.org/src/EDITME exim-4.22/src/EDITME
2 --- exim-4.22.org/src/EDITME 2003-09-03 23:36:28.000000000 +0200
3 +++ exim-4.22/src/EDITME 2003-09-03 23:38:08.000000000 +0200
5 # /usr/local/sbin. The installation script will try to create this directory,
6 # and any superior directories, if they do not exist.
8 -BIN_DIRECTORY=/usr/exim/bin
9 +BIN_DIRECTORY=/usr/bin
12 #------------------------------------------------------------------------------
14 # don't exist. It will also install a default runtime configuration if this
15 # file does not exist.
17 -CONFIGURE_FILE=/usr/exim/configure
18 +CONFIGURE_FILE=/etc/mail/exim.conf
20 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
21 # In this case, Exim will use the first of them that exists when it is run.
23 # owner of a local mailbox.) Specifying these values as root is very strongly
24 # discouraged. These values are compiled into the binary.
30 # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
31 # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
33 # This one is special-purpose, and commonly not required, so it is not
34 # included by default.
40 #------------------------------------------------------------------------------
42 # MBX, is included only when requested. If you do not know what this is about,
43 # leave these settings commented out.
45 -# SUPPORT_MAILDIR=yes
46 -# SUPPORT_MAILSTORE=yes
49 +SUPPORT_MAILSTORE=yes
53 #------------------------------------------------------------------------------
73 -# LOOKUP_WILDLSEARCH=yes
74 +LOOKUP_WILDLSEARCH=yes
77 #------------------------------------------------------------------------------
79 # included in the Exim binary. You will then need to set up the run time
80 # configuration to make use of the mechanism(s) selected.
90 #------------------------------------------------------------------------------
92 # leave these settings commented out.
94 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
98 # Uncomment this setting if you are using OpenSSL
99 -# TLS_LIBS=-lssl -lcrypto
100 +TLS_LIBS=-lssl -lcrypto
102 # Uncomment these settings if you are using GnuTLS
105 # Once you have done this, "make install" will build the info files and
106 # install them in the directory you have defined.
108 -# INFO_DIRECTORY=/usr/share/info
109 +INFO_DIRECTORY=/usr/share/info
112 #------------------------------------------------------------------------------
114 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
115 # to form the final file names. Some installations may want something like this:
117 -# LOG_FILE_PATH=/var/log/exim_%slog
118 +LOG_FILE_PATH=/var/log/exim/%s.log
120 # which results in files with names /var/log/exim_mainlog, etc. The directory
121 # in which the log files are placed must exist; Exim does not try to create
123 # files. Both the name of the command and the suffix that it adds to files
124 # need to be defined here. See also the EXICYCLOG_MAX configuration.
126 -COMPRESS_COMMAND=/usr/bin/gzip
127 +COMPRESS_COMMAND=/bin/gzip
132 # If the exigrep utility is fed compressed log files, it tries to uncompress
133 # them using this command.
135 -ZCAT_COMMAND=/usr/bin/zcat
136 +ZCAT_COMMAND=/bin/zcat
139 #------------------------------------------------------------------------------
141 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
142 # Perl costs quite a lot of resources. Only do this if you really need it.
148 #------------------------------------------------------------------------------
149 @@ -533,11 +534,12 @@
150 # support, which is intended for use in conjunction with the SMTP AUTH
151 # facilities, is included only when requested by the following setting:
156 # You probably need to add -lpam to EXTRALIBS, and in some releases of
157 # GNU/Linux -ldl is also needed.
159 +EXTRALIBS=-lpam -ldl
161 #------------------------------------------------------------------------------
162 # Support for authentication via Radius is also available. The Exim support,
164 # /var/pwcheck) and chown it to exim's user and group. Once you have installed
165 # pwcheck, you should arrange for it to be started by root at boot time.
167 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
168 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
171 #------------------------------------------------------------------------------
173 # group. Once you have installed saslauthd, you should arrange for it to be
174 # started by root at boot time.
176 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
177 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
180 #------------------------------------------------------------------------------
182 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
183 # does not exist, then the bare configuration file name is tried.
185 -# CONFIGURE_FILE_USE_NODE=yes
186 +CONFIGURE_FILE_USE_NODE=yes
189 #------------------------------------------------------------------------------
191 # (process id) to a file so that it can easily be identified. The path of the
192 # file can be specified here. Some installations may want something like this:
194 -# PID_FILE_PATH=/var/lock/exim.pid
195 +PID_FILE_PATH=/var/run/exim%s.pid
197 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
198 # using the name "exim-daemon.pid".
200 # be changed here. The default is 0640 so that information from the spool is
201 # available to anyone who is a member of the Exim group.
207 #------------------------------------------------------------------------------