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
3 +++ exim-4.64/src/EDITME 2006-12-21 16:57:08.676246750 +0100
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
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
34 # This one is very special-purpose, so is not included by default.
36 -# ROUTER_IPLOOKUP=yes
40 #------------------------------------------------------------------------------
42 # This one is special-purpose, and commonly not required, so it is not
43 # included by default.
49 #------------------------------------------------------------------------------
51 # MBX, is included only when requested. If you do not know what this is about,
52 # leave these settings commented out.
54 -# SUPPORT_MAILDIR=yes
55 -# SUPPORT_MAILSTORE=yes
58 +SUPPORT_MAILSTORE=yes
62 #------------------------------------------------------------------------------
83 # and the MIME ACL. Please read the documentation to learn more about these
86 -# WITH_CONTENT_SCAN=yes
87 +WITH_CONTENT_SCAN=yes
89 # If you want to use the deprecated "demime" condition in the DATA ACL,
90 # uncomment the line below. Doing so will also explicitly turn on the
91 # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
92 # the "demime" condition.
94 -# WITH_OLD_DEMIME=yes
97 #------------------------------------------------------------------------------
98 # Compiling Exim with experimental features. These are documented in
99 @@ -629,15 +630,15 @@ FIXED_NEVER_USERS=root
100 # included in the Exim binary. You will then need to set up the run time
101 # configuration to make use of the mechanism(s) selected.
105 # AUTH_CYRUS_SASL=yes
109 # AUTH_GSASL_PC=libgsasl
110 # AUTH_HEIMDAL_GSSAPI=yes
111 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
112 -# AUTH_PLAINTEXT=yes
121 # one that is set in the headers_charset option. The default setting is
122 # defined by this setting:
124 -HEADERS_CHARSET="ISO-8859-1"
125 +HEADERS_CHARSET="UTF-8"
127 # If you are going to make use of $header_xxx expansions in your configuration
128 # file, or if your users are going to use them in filter files, and the normal
129 @@ -690,11 +691,11 @@
130 # leave these settings commented out.
132 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
136 # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
137 -# USE_OPENSSL_PC=openssl
138 -# TLS_LIBS=-lssl -lcrypto
139 +USE_OPENSSL_PC=openssl
140 +TLS_LIBS=-lssl -lcrypto
142 # Uncomment the first and either the second or the third of these if you
143 # are using GnuTLS. If you have pkg-config, then the second, else the third.
145 # Once you have done this, "make install" will build the info files and
146 # install them in the directory you have defined.
148 -# INFO_DIRECTORY=/usr/share/info
149 +INFO_DIRECTORY=/usr/share/info
152 #------------------------------------------------------------------------------
154 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
155 # to form the final file names. Some installations may want something like this:
157 -# LOG_FILE_PATH=/var/log/exim_%slog
158 +LOG_FILE_PATH=/var/log/exim/%s.log
160 # which results in files with names /var/log/exim_mainlog, etc. The directory
161 # in which the log files are placed must exist; Exim does not try to create
163 # files. Both the name of the command and the suffix that it adds to files
164 # need to be defined here. See also the EXICYCLOG_MAX configuration.
166 -COMPRESS_COMMAND=/usr/bin/gzip
167 +COMPRESS_COMMAND=/bin/gzip
174 # Or specify the full pathname:
175 -ZCAT_COMMAND=/usr/bin/zcat
176 +ZCAT_COMMAND=/bin/zcat
178 #------------------------------------------------------------------------------
179 # Compiling in support for embedded Perl: If you want to be able to
181 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
182 # Perl costs quite a lot of resources. Only do this if you really need it.
188 #------------------------------------------------------------------------------
190 # that the local_scan API is made available by the linker. You may also need
191 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
197 #------------------------------------------------------------------------------
198 @@ -729,11 +730,12 @@
199 # support, which is intended for use in conjunction with the SMTP AUTH
200 # facilities, is included only when requested by the following setting:
205 # You probably need to add -lpam to EXTRALIBS, and in some releases of
206 # GNU/Linux -ldl is also needed.
208 +EXTRALIBS=-lpam -ldl
210 #------------------------------------------------------------------------------
211 # Support for authentication via Radius is also available. The Exim support,
213 # /var/pwcheck) and chown it to exim's user and group. Once you have installed
214 # pwcheck, you should arrange for it to be started by root at boot time.
216 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
217 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
220 #------------------------------------------------------------------------------
222 # group. Once you have installed saslauthd, you should arrange for it to be
223 # started by root at boot time.
225 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
226 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
229 #------------------------------------------------------------------------------
231 # is "yes", as well as supporting line editing, a history of input lines in the
232 # current run is maintained.
237 # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
238 # Note that this option adds to the size of the Exim binary, because the
240 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
241 # does not exist, then the bare configuration file name is tried.
243 -# CONFIGURE_FILE_USE_NODE=yes
244 +CONFIGURE_FILE_USE_NODE=yes
247 #------------------------------------------------------------------------------
248 @@ -1105,7 +1107,7 @@
249 # be changed here. The default is 0640 so that information from the spool is
250 # available to anyone who is a member of the Exim group.
256 #------------------------------------------------------------------------------
257 @@ -1164,6 +1166,6 @@
258 # feature should only be used in very exceptional circumstances. YOU HAVE BEEN
261 -# ENABLE_DISABLE_FSYNC=yes
262 +ENABLE_DISABLE_FSYNC=yes
264 # End of EDITME for Exim 4.