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 #------------------------------------------------------------------------------
74 # LOOKUP_MYSQL_PC=mariadb
82 @@ -391,7 +391,7 @@ EXIM_MONITOR=eximon.bin
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 #------------------------------------------------------------------------------
90 # If you're using ClamAV and are backporting fixes to an old version, instead
91 @@ -629,15 +630,15 @@ FIXED_NEVER_USERS=root
92 # included in the Exim binary. You will then need to set up the run time
93 # configuration to make use of the mechanism(s) selected.
101 # AUTH_GSASL_PC=libgsasl
102 # AUTH_HEIMDAL_GSSAPI=yes
103 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
104 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
105 -# AUTH_PLAINTEXT=yes
113 # one that is set in the headers_charset option. The default setting is
114 # defined by this setting:
116 -HEADERS_CHARSET="ISO-8859-1"
117 +HEADERS_CHARSET="UTF-8"
119 # If you are going to make use of $header_xxx expansions in your configuration
120 # file, or if your users are going to use them in filter files, and the normal
121 @@ -690,11 +691,11 @@
122 # leave these settings commented out.
124 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
128 # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
129 -# USE_OPENSSL_PC=openssl
130 -# TLS_LIBS=-lssl -lcrypto
131 +USE_OPENSSL_PC=openssl
132 +TLS_LIBS=-lssl -lcrypto
134 # Uncomment the first and either the second or the third of these if you
135 # are using GnuTLS. If you have pkg-config, then the second, else the third.
137 # Once you have done this, "make install" will build the info files and
138 # install them in the directory you have defined.
140 -# INFO_DIRECTORY=/usr/share/info
141 +INFO_DIRECTORY=/usr/share/info
144 #------------------------------------------------------------------------------
146 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
147 # to form the final file names. Some installations may want something like this:
149 -# LOG_FILE_PATH=/var/log/exim_%slog
150 +LOG_FILE_PATH=/var/log/exim/%s.log
152 # which results in files with names /var/log/exim_mainlog, etc. The directory
153 # in which the log files are placed must exist; Exim does not try to create
155 # files. Both the name of the command and the suffix that it adds to files
156 # need to be defined here. See also the EXICYCLOG_MAX configuration.
158 -COMPRESS_COMMAND=/usr/bin/gzip
159 +COMPRESS_COMMAND=/bin/gzip
166 # Or specify the full pathname:
167 -ZCAT_COMMAND=/usr/bin/zcat
168 +ZCAT_COMMAND=/bin/zcat
170 #------------------------------------------------------------------------------
171 # Compiling in support for embedded Perl: If you want to be able to
173 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
174 # Perl costs quite a lot of resources. Only do this if you really need it.
180 #------------------------------------------------------------------------------
182 # that the local_scan API is made available by the linker. You may also need
183 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
189 #------------------------------------------------------------------------------
190 @@ -729,11 +730,12 @@
191 # support, which is intended for use in conjunction with the SMTP AUTH
192 # facilities, is included only when requested by the following setting:
197 # You probably need to add -lpam to EXTRALIBS, and in some releases of
198 # GNU/Linux -ldl is also needed.
200 +EXTRALIBS=-lpam -ldl
202 #------------------------------------------------------------------------------
203 # Support for authentication via Radius is also available. The Exim support,
205 # /var/pwcheck) and chown it to exim's user and group. Once you have installed
206 # pwcheck, you should arrange for it to be started by root at boot time.
208 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
209 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
212 #------------------------------------------------------------------------------
214 # group. Once you have installed saslauthd, you should arrange for it to be
215 # started by root at boot time.
217 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
218 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
221 #------------------------------------------------------------------------------
223 # is "yes", as well as supporting line editing, a history of input lines in the
224 # current run is maintained.
229 # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
230 # Note that this option adds to the size of the Exim binary, because the
232 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
233 # does not exist, then the bare configuration file name is tried.
235 -# CONFIGURE_FILE_USE_NODE=yes
236 +CONFIGURE_FILE_USE_NODE=yes
239 #------------------------------------------------------------------------------
240 @@ -1105,7 +1107,7 @@
241 # be changed here. The default is 0640 so that information from the spool is
242 # available to anyone who is a member of the Exim group.
248 #------------------------------------------------------------------------------
249 @@ -1164,6 +1166,6 @@
250 # feature should only be used in very exceptional circumstances. YOU HAVE BEEN
253 -# ENABLE_DISABLE_FSYNC=yes
254 +ENABLE_DISABLE_FSYNC=yes
256 # End of EDITME for Exim 4.