]>
Commit | Line | Data |
---|---|---|
3a8fb3b3 AM |
1 | diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME |
2 | --- exim-4.64.org/src/EDITME 2006-12-20 10:46:04.000000000 +0100 | |
d09678c6 | 3 | +++ exim-4.64/src/EDITME 2006-12-21 16:57:08.676246750 +0100 |
b5aad17c | 4 | @@ -100,7 +100,7 @@ |
a59efb33 AM |
5 | # /usr/local/sbin. The installation script will try to create this directory, |
6 | # and any superior directories, if they do not exist. | |
7 | ||
8 | -BIN_DIRECTORY=/usr/exim/bin | |
9 | +BIN_DIRECTORY=/usr/bin | |
10 | ||
11 | ||
12 | #------------------------------------------------------------------------------ | |
b5aad17c | 13 | @@ -116,7 +116,7 @@ |
02568c72 AM |
14 | # don't exist. It will also install a default runtime configuration if this |
15 | # file does not exist. | |
a59efb33 AM |
16 | |
17 | -CONFIGURE_FILE=/usr/exim/configure | |
18 | +CONFIGURE_FILE=/etc/mail/exim.conf | |
19 | ||
49288260 | 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. | |
b5aad17c | 22 | @@ -134,7 +134,8 @@ |
a59efb33 | 23 | # owner of a local mailbox.) Specifying these values as root is very strongly |
86166e68 | 24 | # discouraged. |
a59efb33 AM |
25 | |
26 | -EXIM_USER= | |
27 | +EXIM_UID=79 | |
28 | +EXIM_GID=79 | |
29 | ||
86166e68 | 30 | # If you specify EXIM_USER as a name, this is looked up at build time, and the |
31 | # uid number is built into the binary. However, you can specify that this | |
3a8fb3b3 | 32 | @@ -214,7 +215,7 @@ |
ee2e20a0 AM |
33 | |
34 | # This one is very special-purpose, so is not included by default. | |
35 | ||
36 | -# ROUTER_IPLOOKUP=yes | |
37 | +ROUTER_IPLOOKUP=yes | |
38 | ||
39 | ||
40 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 41 | @@ -235,7 +236,7 @@ |
a59efb33 AM |
42 | # This one is special-purpose, and commonly not required, so it is not |
43 | # included by default. | |
44 | ||
45 | -# TRANSPORT_LMTP=yes | |
46 | +TRANSPORT_LMTP=yes | |
47 | ||
48 | ||
49 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 50 | @@ -244,9 +245,9 @@ |
a59efb33 AM |
51 | # MBX, is included only when requested. If you do not know what this is about, |
52 | # leave these settings commented out. | |
53 | ||
54 | -# SUPPORT_MAILDIR=yes | |
55 | -# SUPPORT_MAILSTORE=yes | |
56 | -# SUPPORT_MBX=yes | |
57 | +SUPPORT_MAILDIR=yes | |
58 | +SUPPORT_MAILSTORE=yes | |
59 | +SUPPORT_MBX=yes | |
60 | ||
61 | ||
62 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 63 | @@ -261,16 +262,16 @@ |
a59efb33 AM |
64 | LOOKUP_DBM=yes |
65 | LOOKUP_LSEARCH=yes | |
66 | ||
67 | -# LOOKUP_CDB=yes | |
2d19282f | 68 | -# LOOKUP_DNSDB=yes |
02568c72 | 69 | -# LOOKUP_DSEARCH=yes |
2d19282f AM |
70 | +LOOKUP_CDB=yes |
71 | +LOOKUP_DNSDB=yes | |
02568c72 | 72 | +LOOKUP_DSEARCH=yes |
07713049 | 73 | # LOOKUP_IBASE=yes |
a59efb33 | 74 | # LOOKUP_LDAP=yes |
02568c72 AM |
75 | # LOOKUP_MYSQL=yes |
76 | # LOOKUP_NIS=yes | |
2d19282f AM |
77 | # LOOKUP_NISPLUS=yes |
78 | # LOOKUP_ORACLE=yes | |
79 | -# LOOKUP_PASSWD=yes | |
80 | +LOOKUP_PASSWD=yes | |
81 | # LOOKUP_PGSQL=yes | |
3a8fb3b3 | 82 | # LOOKUP_SQLITE=yes |
2d19282f | 83 | # LOOKUP_WHOSON=yes |
3a8fb3b3 | 84 | @@ -330,14 +331,14 @@ |
b5aad17c AM |
85 | # and the MIME ACL. Please read the documentation to learn more about these |
86 | # features. | |
87 | ||
88 | -# WITH_CONTENT_SCAN=yes | |
89 | +WITH_CONTENT_SCAN=yes | |
90 | ||
91 | # If you want to use the deprecated "demime" condition in the DATA ACL, | |
92 | # uncomment the line below. Doing so will also explicitly turn on the | |
93 | # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of | |
94 | # the "demime" condition. | |
95 | ||
96 | -# WITH_OLD_DEMIME=yes | |
97 | +WITH_OLD_DEMIME=yes | |
98 | ||
99 | #------------------------------------------------------------------------------ | |
100 | # Compiling Exim with experimental features. These are documented in | |
3a8fb3b3 | 101 | @@ -473,11 +474,11 @@ |
a59efb33 AM |
102 | # included in the Exim binary. You will then need to set up the run time |
103 | # configuration to make use of the mechanism(s) selected. | |
104 | ||
105 | -# AUTH_CRAM_MD5=yes | |
b5aad17c AM |
106 | +AUTH_CRAM_MD5=yes |
107 | # AUTH_CYRUS_SASL=yes | |
d09678c6 | 108 | -# AUTH_DOVECOT=yes |
a59efb33 | 109 | -# AUTH_PLAINTEXT=yes |
02568c72 | 110 | -# AUTH_SPA=yes |
d09678c6 | 111 | +AUTH_DOVECOT=yes |
a59efb33 | 112 | +AUTH_PLAINTEXT=yes |
02568c72 | 113 | +AUTH_SPA=yes |
a59efb33 AM |
114 | |
115 | ||
02568c72 | 116 | #------------------------------------------------------------------------------ |
3a8fb3b3 | 117 | @@ -576,10 +577,10 @@ |
49288260 | 118 | # leave these settings commented out. |
a59efb33 | 119 | |
49288260 | 120 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
a59efb33 | 121 | -# SUPPORT_TLS=yes |
a59efb33 | 122 | +SUPPORT_TLS=yes |
49288260 | 123 | |
124 | # Uncomment this setting if you are using OpenSSL | |
125 | -# TLS_LIBS=-lssl -lcrypto | |
a59efb33 AM |
126 | +TLS_LIBS=-lssl -lcrypto |
127 | ||
49288260 | 128 | # Uncomment these settings if you are using GnuTLS |
129 | # USE_GNUTLS=yes | |
3a8fb3b3 | 130 | @@ -630,7 +631,7 @@ |
a59efb33 AM |
131 | # Once you have done this, "make install" will build the info files and |
132 | # install them in the directory you have defined. | |
133 | ||
134 | -# INFO_DIRECTORY=/usr/share/info | |
135 | +INFO_DIRECTORY=/usr/share/info | |
136 | ||
137 | ||
138 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 139 | @@ -643,7 +644,7 @@ |
a59efb33 AM |
140 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
141 | # to form the final file names. Some installations may want something like this: | |
142 | ||
143 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
144 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
145 | ||
146 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
147 | # in which the log files are placed must exist; Exim does not try to create | |
3a8fb3b3 | 148 | @@ -692,7 +693,7 @@ |
a59efb33 AM |
149 | # files. Both the name of the command and the suffix that it adds to files |
150 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
151 | ||
152 | -COMPRESS_COMMAND=/usr/bin/gzip | |
153 | +COMPRESS_COMMAND=/bin/gzip | |
154 | COMPRESS_SUFFIX=gz | |
155 | ||
156 | ||
3a8fb3b3 | 157 | @@ -700,7 +701,7 @@ |
a59efb33 AM |
158 | # If the exigrep utility is fed compressed log files, it tries to uncompress |
159 | # them using this command. | |
160 | ||
161 | -ZCAT_COMMAND=/usr/bin/zcat | |
162 | +ZCAT_COMMAND=/bin/zcat | |
163 | ||
164 | ||
165 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 166 | @@ -709,7 +710,7 @@ |
a59efb33 AM |
167 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
168 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
169 | ||
170 | -# EXIM_PERL=perl.o | |
171 | +EXIM_PERL=perl.o | |
172 | ||
173 | ||
174 | #------------------------------------------------------------------------------ | |
3a8fb3b3 AM |
175 | @@ -719,7 +720,7 @@ |
176 | # that the local_scan API is made available by the linker. You may also need | |
177 | # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. | |
48a0e242 AM |
178 | |
179 | -# EXPAND_DLFUNC=yes | |
180 | +EXPAND_DLFUNC=yes | |
181 | ||
182 | ||
183 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 184 | @@ -729,11 +730,12 @@ |
a59efb33 AM |
185 | # support, which is intended for use in conjunction with the SMTP AUTH |
186 | # facilities, is included only when requested by the following setting: | |
187 | ||
188 | -# SUPPORT_PAM=yes | |
189 | +SUPPORT_PAM=yes | |
190 | ||
191 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
192 | # GNU/Linux -ldl is also needed. | |
193 | ||
194 | +EXTRALIBS=-lpam -ldl | |
195 | ||
196 | #------------------------------------------------------------------------------ | |
197 | # Support for authentication via Radius is also available. The Exim support, | |
3a8fb3b3 | 198 | @@ -780,7 +782,7 @@ |
02568c72 AM |
199 | # /var/pwcheck) and chown it to exim's user and group. Once you have installed |
200 | # pwcheck, you should arrange for it to be started by root at boot time. | |
ecc5bdcd ŁJM |
201 | |
202 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
203 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
204 | ||
205 | ||
206 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 207 | @@ -797,7 +799,7 @@ |
02568c72 AM |
208 | # group. Once you have installed saslauthd, you should arrange for it to be |
209 | # started by root at boot time. | |
210 | ||
211 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
212 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
213 | ||
214 | ||
215 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 216 | @@ -857,7 +859,7 @@ |
ee2e20a0 AM |
217 | # is "yes", as well as supporting line editing, a history of input lines in the |
218 | # current run is maintained. | |
219 | ||
220 | -# USE_READLINE=yes | |
221 | +USE_READLINE=yes | |
222 | ||
3a8fb3b3 | 223 | # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. |
b5aad17c | 224 | # Note that this option adds to the size of the Exim binary, because the |
3a8fb3b3 | 225 | @@ -932,7 +934,7 @@ |
a59efb33 AM |
226 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
227 | # does not exist, then the bare configuration file name is tried. | |
228 | ||
229 | -# CONFIGURE_FILE_USE_NODE=yes | |
230 | +CONFIGURE_FILE_USE_NODE=yes | |
231 | ||
232 | ||
233 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 234 | @@ -1105,7 +1107,7 @@ |
a59efb33 AM |
235 | # be changed here. The default is 0640 so that information from the spool is |
236 | # available to anyone who is a member of the Exim group. | |
237 | ||
238 | -# SPOOL_MODE=0640 | |
239 | +SPOOL_MODE=0640 | |
240 | ||
241 | ||
242 | #------------------------------------------------------------------------------ |