]>
Commit | Line | Data |
---|---|---|
96e93d3d AM |
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 | |
b5aad17c | 3 | @@ -100,7 +100,7 @@ |
a59efb33 AM |
4 | # /usr/local/sbin. The installation script will try to create this directory, |
5 | # and any superior directories, if they do not exist. | |
6 | ||
7 | -BIN_DIRECTORY=/usr/exim/bin | |
8 | +BIN_DIRECTORY=/usr/bin | |
9 | ||
10 | ||
11 | #------------------------------------------------------------------------------ | |
96e93d3d | 12 | @@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin |
02568c72 AM |
13 | # don't exist. It will also install a default runtime configuration if this |
14 | # file does not exist. | |
a59efb33 AM |
15 | |
16 | -CONFIGURE_FILE=/usr/exim/configure | |
17 | +CONFIGURE_FILE=/etc/mail/exim.conf | |
18 | ||
49288260 | 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. | |
96e93d3d AM |
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. | |
a59efb33 AM |
24 | |
25 | -EXIM_USER= | |
26 | +EXIM_UID=79 | |
27 | +EXIM_GID=79 | |
28 | ||
86166e68 | 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 | |
b3e93248 AM |
31 | @@ -211,11 +211,11 @@ SPOOL_DIRECTORY=/var/spool/exim |
32 | # If you are building with TLS, the library configuration must be done: | |
96e93d3d AM |
33 | |
34 | # Uncomment this if you are using OpenSSL | |
35 | -# USE_OPENSSL=yes | |
36 | +USE_OPENSSL=yes | |
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 | |
44 | ||
45 | # Uncomment this if you are using GnuTLS | |
46 | @@ -317,7 +318,7 @@ ROUTER_REDIRECT=yes | |
ee2e20a0 AM |
47 | |
48 | # This one is very special-purpose, so is not included by default. | |
49 | ||
50 | -# ROUTER_IPLOOKUP=yes | |
51 | +ROUTER_IPLOOKUP=yes | |
52 | ||
53 | ||
54 | #------------------------------------------------------------------------------ | |
96e93d3d | 55 | @@ -338,7 +339,7 @@ TRANSPORT_SMTP=yes |
a59efb33 AM |
56 | # This one is special-purpose, and commonly not required, so it is not |
57 | # included by default. | |
58 | ||
59 | -# TRANSPORT_LMTP=yes | |
60 | +TRANSPORT_LMTP=yes | |
61 | ||
62 | ||
63 | #------------------------------------------------------------------------------ | |
96e93d3d | 64 | @@ -347,9 +348,9 @@ TRANSPORT_SMTP=yes |
a59efb33 AM |
65 | # MBX, is included only when requested. If you do not know what this is about, |
66 | # leave these settings commented out. | |
67 | ||
68 | -# SUPPORT_MAILDIR=yes | |
69 | -# SUPPORT_MAILSTORE=yes | |
70 | -# SUPPORT_MBX=yes | |
71 | +SUPPORT_MAILDIR=yes | |
72 | +SUPPORT_MAILSTORE=yes | |
73 | +SUPPORT_MBX=yes | |
74 | ||
75 | ||
76 | #------------------------------------------------------------------------------ | |
96e93d3d | 77 | @@ -407,8 +408,8 @@ LOOKUP_DBM=yes |
a59efb33 | 78 | LOOKUP_LSEARCH=yes |
c33d15a3 | 79 | LOOKUP_DNSDB=yes |
a59efb33 AM |
80 | |
81 | -# LOOKUP_CDB=yes | |
02568c72 | 82 | -# LOOKUP_DSEARCH=yes |
2d19282f | 83 | +LOOKUP_CDB=yes |
02568c72 | 84 | +LOOKUP_DSEARCH=yes |
07713049 | 85 | # LOOKUP_IBASE=yes |
96e93d3d | 86 | # LOOKUP_JSON=yes |
a59efb33 | 87 | # LOOKUP_LDAP=yes |
96e93d3d | 88 | @@ -417,7 +418,7 @@ LOOKUP_DNSDB=yes |
02568c72 | 89 | # LOOKUP_NIS=yes |
2d19282f AM |
90 | # LOOKUP_NISPLUS=yes |
91 | # LOOKUP_ORACLE=yes | |
92 | -# LOOKUP_PASSWD=yes | |
93 | +LOOKUP_PASSWD=yes | |
94 | # LOOKUP_PGSQL=yes | |
96e93d3d | 95 | # LOOKUP_REDIS=yes |
3a8fb3b3 | 96 | # LOOKUP_SQLITE=yes |
96e93d3d AM |
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. | |
100 | ||
101 | -# EXIM_MONITOR=eximon.bin | |
102 | +EXIM_MONITOR=eximon.bin | |
103 | ||
104 | ||
105 | #------------------------------------------------------------------------------ | |
106 | @@ -509,7 +510,7 @@ SUPPORT_DANE=yes | |
b5aad17c AM |
107 | # and the MIME ACL. Please read the documentation to learn more about these |
108 | # features. | |
109 | ||
110 | -# WITH_CONTENT_SCAN=yes | |
111 | +WITH_CONTENT_SCAN=yes | |
112 | ||
96e93d3d AM |
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. | |
bb1028e5 AM |
115 | @@ -587,7 +587,7 @@ DISABLE_MAL_MKS=yes |
116 | ||
117 | # Uncomment the following lines to add SRS (Sender Rewriting Scheme) support | |
118 | # using only native facilities. | |
119 | -# SUPPORT_SRS=yes | |
120 | +SUPPORT_SRS=yes | |
121 | ||
122 | ||
123 | #------------------------------------------------------------------------------ | |
96e93d3d | 124 | @@ -752,18 +753,18 @@ FIXED_NEVER_USERS=root |
a59efb33 AM |
125 | # included in the Exim binary. You will then need to set up the run time |
126 | # configuration to make use of the mechanism(s) selected. | |
127 | ||
128 | -# AUTH_CRAM_MD5=yes | |
b5aad17c AM |
129 | +AUTH_CRAM_MD5=yes |
130 | # AUTH_CYRUS_SASL=yes | |
d09678c6 | 131 | -# AUTH_DOVECOT=yes |
362e143b | 132 | +AUTH_DOVECOT=yes |
96e93d3d | 133 | # AUTH_EXTERNAL=yes |
362e143b AM |
134 | # AUTH_GSASL=yes |
135 | # AUTH_GSASL_PC=libgsasl | |
136 | # AUTH_HEIMDAL_GSSAPI=yes | |
137 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | |
ef320990 | 138 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 |
a59efb33 | 139 | -# AUTH_PLAINTEXT=yes |
02568c72 | 140 | -# AUTH_SPA=yes |
f4d0d081 | 141 | -# AUTH_TLS=yes |
a59efb33 | 142 | +AUTH_PLAINTEXT=yes |
02568c72 | 143 | +AUTH_SPA=yes |
f4d0d081 | 144 | +AUTH_TLS=yes |
a59efb33 | 145 | |
96e93d3d AM |
146 | # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1 |
147 | # requires multiple pkg-config files to work with Exim, so the second example | |
148 | @@ -787,7 +788,7 @@ FIXED_NEVER_USERS=root | |
e462f7e8 AM |
149 | # one that is set in the headers_charset option. The default setting is |
150 | # defined by this setting: | |
151 | ||
152 | -HEADERS_CHARSET="ISO-8859-1" | |
153 | +HEADERS_CHARSET="UTF-8" | |
154 | ||
155 | # If you are going to make use of $header_xxx expansions in your configuration | |
156 | # file, or if your users are going to use them in filter files, and the normal | |
96e93d3d | 157 | @@ -883,7 +898,7 @@ HEADERS_CHARSET="ISO-8859-1" |
a59efb33 AM |
158 | # Once you have done this, "make install" will build the info files and |
159 | # install them in the directory you have defined. | |
160 | ||
161 | -# INFO_DIRECTORY=/usr/share/info | |
162 | +INFO_DIRECTORY=/usr/share/info | |
163 | ||
164 | ||
165 | #------------------------------------------------------------------------------ | |
96e93d3d | 166 | @@ -896,7 +911,7 @@ HEADERS_CHARSET="ISO-8859-1" |
a59efb33 AM |
167 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
168 | # to form the final file names. Some installations may want something like this: | |
169 | ||
170 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
171 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
172 | ||
173 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
174 | # in which the log files are placed must exist; Exim does not try to create | |
96e93d3d | 175 | @@ -945,7 +960,7 @@ EXICYCLOG_MAX=10 |
a59efb33 AM |
176 | # files. Both the name of the command and the suffix that it adds to files |
177 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
178 | ||
179 | -COMPRESS_COMMAND=/usr/bin/gzip | |
180 | +COMPRESS_COMMAND=/bin/gzip | |
181 | COMPRESS_SUFFIX=gz | |
182 | ||
183 | ||
96e93d3d | 184 | @@ -960,7 +975,7 @@ COMPRESS_SUFFIX=gz |
f4d0d081 AM |
185 | # ZCAT_COMMAND=zcat |
186 | # | |
187 | # Or specify the full pathname: | |
a59efb33 AM |
188 | -ZCAT_COMMAND=/usr/bin/zcat |
189 | +ZCAT_COMMAND=/bin/zcat | |
190 | ||
a59efb33 | 191 | #------------------------------------------------------------------------------ |
f4d0d081 | 192 | # Compiling in support for embedded Perl: If you want to be able to |
96e93d3d | 193 | @@ -968,7 +983,7 @@ ZCAT_COMMAND=/usr/bin/zcat |
a59efb33 AM |
194 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
195 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
196 | ||
197 | -# EXIM_PERL=perl.o | |
198 | +EXIM_PERL=perl.o | |
199 | ||
200 | ||
201 | #------------------------------------------------------------------------------ | |
96e93d3d | 202 | @@ -978,7 +993,7 @@ ZCAT_COMMAND=/usr/bin/zcat |
3a8fb3b3 AM |
203 | # that the local_scan API is made available by the linker. You may also need |
204 | # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. | |
48a0e242 AM |
205 | |
206 | -# EXPAND_DLFUNC=yes | |
207 | +EXPAND_DLFUNC=yes | |
208 | ||
209 | ||
210 | #------------------------------------------------------------------------------ | |
96e93d3d | 211 | @@ -988,11 +1003,12 @@ ZCAT_COMMAND=/usr/bin/zcat |
a59efb33 AM |
212 | # support, which is intended for use in conjunction with the SMTP AUTH |
213 | # facilities, is included only when requested by the following setting: | |
214 | ||
215 | -# SUPPORT_PAM=yes | |
216 | +SUPPORT_PAM=yes | |
217 | ||
218 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
219 | # GNU/Linux -ldl is also needed. | |
220 | ||
221 | +EXTRALIBS=-lpam -ldl | |
222 | ||
223 | #------------------------------------------------------------------------------ | |
96e93d3d AM |
224 | # Proxying. |
225 | @@ -1079,7 +1095,7 @@ ZCAT_COMMAND=/usr/bin/zcat | |
226 | # /var/pwcheck) and chown it to Exim's user and group. Once you have installed | |
02568c72 | 227 | # pwcheck, you should arrange for it to be started by root at boot time. |
ecc5bdcd ŁJM |
228 | |
229 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
230 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
231 | ||
232 | ||
233 | #------------------------------------------------------------------------------ | |
96e93d3d | 234 | @@ -1096,7 +1112,7 @@ ZCAT_COMMAND=/usr/bin/zcat |
02568c72 AM |
235 | # group. Once you have installed saslauthd, you should arrange for it to be |
236 | # started by root at boot time. | |
237 | ||
238 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
239 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
240 | ||
241 | ||
242 | #------------------------------------------------------------------------------ | |
96e93d3d | 243 | @@ -1163,7 +1179,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases |
ee2e20a0 AM |
244 | # is "yes", as well as supporting line editing, a history of input lines in the |
245 | # current run is maintained. | |
246 | ||
247 | -# USE_READLINE=yes | |
248 | +USE_READLINE=yes | |
249 | ||
3a8fb3b3 | 250 | # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. |
b5aad17c | 251 | # Note that this option adds to the size of the Exim binary, because the |
96e93d3d | 252 | @@ -1253,7 +1269,7 @@ EXIM_TMPDIR="/tmp" |
a59efb33 AM |
253 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
254 | # does not exist, then the bare configuration file name is tried. | |
255 | ||
256 | -# CONFIGURE_FILE_USE_NODE=yes | |
257 | +CONFIGURE_FILE_USE_NODE=yes | |
258 | ||
259 | ||
260 | #------------------------------------------------------------------------------ | |
96e93d3d | 261 | @@ -1432,7 +1448,7 @@ EXIM_TMPDIR="/tmp" |
a59efb33 AM |
262 | # be changed here. The default is 0640 so that information from the spool is |
263 | # available to anyone who is a member of the Exim group. | |
264 | ||
265 | -# SPOOL_MODE=0640 | |
266 | +SPOOL_MODE=0640 | |
267 | ||
268 | ||
269 | #------------------------------------------------------------------------------ | |
96e93d3d | 270 | @@ -1478,7 +1494,7 @@ EXIM_TMPDIR="/tmp" |
f5c2c23d AM |
271 | # feature should only be used in very exceptional circumstances. YOU HAVE BEEN |
272 | # WARNED. | |
273 | ||
274 | -# ENABLE_DISABLE_FSYNC=yes | |
275 | +ENABLE_DISABLE_FSYNC=yes | |
276 | ||
96e93d3d AM |
277 | #------------------------------------------------------------------------------ |
278 | # For development, add this to include code to time various stages and report. |