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 #------------------------------------------------------------------------------
85 # and the MIME ACL. Please read the documentation to learn more about these
88 -# WITH_CONTENT_SCAN=yes
89 +WITH_CONTENT_SCAN=yes
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.
96 -# WITH_OLD_DEMIME=yes
99 #------------------------------------------------------------------------------
100 # Compiling Exim with experimental features. These are documented in
101 @@ -473,11 +474,11 @@
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.
107 # AUTH_CYRUS_SASL=yes
109 -# AUTH_PLAINTEXT=yes
116 #------------------------------------------------------------------------------
117 @@ -576,10 +577,10 @@
118 # leave these settings commented out.
120 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
124 # Uncomment this setting if you are using OpenSSL
125 -# TLS_LIBS=-lssl -lcrypto
126 +TLS_LIBS=-lssl -lcrypto
128 # Uncomment these settings if you are using GnuTLS
131 # Once you have done this, "make install" will build the info files and
132 # install them in the directory you have defined.
134 -# INFO_DIRECTORY=/usr/share/info
135 +INFO_DIRECTORY=/usr/share/info
138 #------------------------------------------------------------------------------
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:
143 -# LOG_FILE_PATH=/var/log/exim_%slog
144 +LOG_FILE_PATH=/var/log/exim/%s.log
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
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.
152 -COMPRESS_COMMAND=/usr/bin/gzip
153 +COMPRESS_COMMAND=/bin/gzip
158 # If the exigrep utility is fed compressed log files, it tries to uncompress
159 # them using this command.
161 -ZCAT_COMMAND=/usr/bin/zcat
162 +ZCAT_COMMAND=/bin/zcat
165 #------------------------------------------------------------------------------
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.
174 #------------------------------------------------------------------------------
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.
183 #------------------------------------------------------------------------------
184 @@ -729,11 +730,12 @@
185 # support, which is intended for use in conjunction with the SMTP AUTH
186 # facilities, is included only when requested by the following setting:
191 # You probably need to add -lpam to EXTRALIBS, and in some releases of
192 # GNU/Linux -ldl is also needed.
194 +EXTRALIBS=-lpam -ldl
196 #------------------------------------------------------------------------------
197 # Support for authentication via Radius is also available. The Exim support,
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.
202 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
203 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
206 #------------------------------------------------------------------------------
208 # group. Once you have installed saslauthd, you should arrange for it to be
209 # started by root at boot time.
211 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
212 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
215 #------------------------------------------------------------------------------
217 # is "yes", as well as supporting line editing, a history of input lines in the
218 # current run is maintained.
223 # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
224 # Note that this option adds to the size of the Exim binary, because the
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.
229 -# CONFIGURE_FILE_USE_NODE=yes
230 +CONFIGURE_FILE_USE_NODE=yes
233 #------------------------------------------------------------------------------
234 @@ -1105,7 +1107,7 @@
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.
242 #------------------------------------------------------------------------------