1 --- exim-4.93/src/EDITME.org 2019-12-11 07:24:16.057781209 +0100
2 +++ exim-4.93/src/EDITME 2019-12-11 07:24:21.077926862 +0100
4 # /usr/local/sbin. The installation script will try to create this directory,
5 # and any superior directories, if they do not exist.
7 -BIN_DIRECTORY=/usr/exim/bin
8 +BIN_DIRECTORY=/usr/bin
11 #------------------------------------------------------------------------------
12 @@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
13 # don't exist. It will also install a default runtime configuration if this
14 # file does not exist.
16 -CONFIGURE_FILE=/usr/exim/configure
17 +CONFIGURE_FILE=/etc/mail/exim.conf
19 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
20 # In this case, Exim will use the first of them that exists when it is run.
21 @@ -133,7 +133,8 @@ CONFIGURE_FILE=/usr/exim/configure
22 # deliveries. (Local deliveries run as various non-root users, typically as the
23 # owner of a local mailbox.) Specifying these values as root is not supported.
29 # If you specify EXIM_USER as a name, this is looked up at build time, and the
30 # uid number is built into the binary. However, you can specify that this
31 @@ -211,11 +212,11 @@ SPOOL_DIRECTORY=/var/spool/exim
32 # If you are buliding with TLS, the library configuration must be done:
34 # Uncomment this if you are using OpenSSL
37 # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
38 # and an optional location.
39 -# USE_OPENSSL_PC=openssl
40 -# TLS_LIBS=-lssl -lcrypto
41 +USE_OPENSSL_PC=openssl
42 +TLS_LIBS=-lssl -lcrypto
43 # TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
45 # Uncomment this if you are using GnuTLS
46 @@ -317,7 +318,7 @@ ROUTER_REDIRECT=yes
48 # This one is very special-purpose, so is not included by default.
50 -# ROUTER_IPLOOKUP=yes
54 #------------------------------------------------------------------------------
55 @@ -338,7 +339,7 @@ TRANSPORT_SMTP=yes
56 # This one is special-purpose, and commonly not required, so it is not
57 # included by default.
63 #------------------------------------------------------------------------------
64 @@ -347,9 +348,9 @@ TRANSPORT_SMTP=yes
65 # MBX, is included only when requested. If you do not know what this is about,
66 # leave these settings commented out.
68 -# SUPPORT_MAILDIR=yes
69 -# SUPPORT_MAILSTORE=yes
72 +SUPPORT_MAILSTORE=yes
76 #------------------------------------------------------------------------------
77 @@ -407,8 +408,8 @@ LOOKUP_DBM=yes
88 @@ -417,7 +418,7 @@ LOOKUP_DNSDB=yes
97 @@ -500,7 +500,7 @@ SUPPORT_DANE=yes
98 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
99 # local OS-specific make files.
101 -# EXIM_MONITOR=eximon.bin
102 +EXIM_MONITOR=eximon.bin
105 #------------------------------------------------------------------------------
106 @@ -509,7 +510,7 @@ SUPPORT_DANE=yes
107 # and the MIME ACL. Please read the documentation to learn more about these
110 -# WITH_CONTENT_SCAN=yes
111 +WITH_CONTENT_SCAN=yes
113 # If you have content scanning you may wish to only include some of the scanner
114 # interfaces. Uncomment any of these lines to remove that code.
115 @@ -752,18 +753,18 @@ FIXED_NEVER_USERS=root
116 # included in the Exim binary. You will then need to set up the run time
117 # configuration to make use of the mechanism(s) selected.
121 # AUTH_CYRUS_SASL=yes
126 # AUTH_GSASL_PC=libgsasl
127 # AUTH_HEIMDAL_GSSAPI=yes
128 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
129 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
130 -# AUTH_PLAINTEXT=yes
137 # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
138 # requires multiple pkg-config files to work with Exim, so the second example
139 @@ -787,7 +788,7 @@ FIXED_NEVER_USERS=root
140 # one that is set in the headers_charset option. The default setting is
141 # defined by this setting:
143 -HEADERS_CHARSET="ISO-8859-1"
144 +HEADERS_CHARSET="UTF-8"
146 # If you are going to make use of $header_xxx expansions in your configuration
147 # file, or if your users are going to use them in filter files, and the normal
148 @@ -883,7 +898,7 @@ HEADERS_CHARSET="ISO-8859-1"
149 # Once you have done this, "make install" will build the info files and
150 # install them in the directory you have defined.
152 -# INFO_DIRECTORY=/usr/share/info
153 +INFO_DIRECTORY=/usr/share/info
156 #------------------------------------------------------------------------------
157 @@ -896,7 +911,7 @@ HEADERS_CHARSET="ISO-8859-1"
158 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
159 # to form the final file names. Some installations may want something like this:
161 -# LOG_FILE_PATH=/var/log/exim_%slog
162 +LOG_FILE_PATH=/var/log/exim/%s.log
164 # which results in files with names /var/log/exim_mainlog, etc. The directory
165 # in which the log files are placed must exist; Exim does not try to create
166 @@ -945,7 +960,7 @@ EXICYCLOG_MAX=10
167 # files. Both the name of the command and the suffix that it adds to files
168 # need to be defined here. See also the EXICYCLOG_MAX configuration.
170 -COMPRESS_COMMAND=/usr/bin/gzip
171 +COMPRESS_COMMAND=/bin/gzip
175 @@ -960,7 +975,7 @@ COMPRESS_SUFFIX=gz
178 # Or specify the full pathname:
179 -ZCAT_COMMAND=/usr/bin/zcat
180 +ZCAT_COMMAND=/bin/zcat
182 #------------------------------------------------------------------------------
183 # Compiling in support for embedded Perl: If you want to be able to
184 @@ -968,7 +983,7 @@ ZCAT_COMMAND=/usr/bin/zcat
185 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
186 # Perl costs quite a lot of resources. Only do this if you really need it.
192 #------------------------------------------------------------------------------
193 @@ -978,7 +993,7 @@ ZCAT_COMMAND=/usr/bin/zcat
194 # that the local_scan API is made available by the linker. You may also need
195 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
201 #------------------------------------------------------------------------------
202 @@ -988,11 +1003,12 @@ ZCAT_COMMAND=/usr/bin/zcat
203 # support, which is intended for use in conjunction with the SMTP AUTH
204 # facilities, is included only when requested by the following setting:
209 # You probably need to add -lpam to EXTRALIBS, and in some releases of
210 # GNU/Linux -ldl is also needed.
212 +EXTRALIBS=-lpam -ldl
214 #------------------------------------------------------------------------------
216 @@ -1079,7 +1095,7 @@ ZCAT_COMMAND=/usr/bin/zcat
217 # /var/pwcheck) and chown it to Exim's user and group. Once you have installed
218 # pwcheck, you should arrange for it to be started by root at boot time.
220 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
221 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
224 #------------------------------------------------------------------------------
225 @@ -1096,7 +1112,7 @@ ZCAT_COMMAND=/usr/bin/zcat
226 # group. Once you have installed saslauthd, you should arrange for it to be
227 # started by root at boot time.
229 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
230 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
233 #------------------------------------------------------------------------------
234 @@ -1163,7 +1179,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
235 # is "yes", as well as supporting line editing, a history of input lines in the
236 # current run is maintained.
241 # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
242 # Note that this option adds to the size of the Exim binary, because the
243 @@ -1253,7 +1269,7 @@ EXIM_TMPDIR="/tmp"
244 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
245 # does not exist, then the bare configuration file name is tried.
247 -# CONFIGURE_FILE_USE_NODE=yes
248 +CONFIGURE_FILE_USE_NODE=yes
251 #------------------------------------------------------------------------------
252 @@ -1432,7 +1448,7 @@ EXIM_TMPDIR="/tmp"
253 # be changed here. The default is 0640 so that information from the spool is
254 # available to anyone who is a member of the Exim group.
260 #------------------------------------------------------------------------------
261 @@ -1478,7 +1494,7 @@ EXIM_TMPDIR="/tmp"
262 # feature should only be used in very exceptional circumstances. YOU HAVE BEEN
265 -# ENABLE_DISABLE_FSYNC=yes
266 +ENABLE_DISABLE_FSYNC=yes
268 #------------------------------------------------------------------------------
269 # For development, add this to include code to time various stages and report.