1 diff -urN exim-4.43.org/src/EDITME exim-4.51/src/EDITME
2 --- exim-4.43/src/EDITME 2004-10-07 14:25:49.533597214 +0200
3 +++ exim-4.51/src/EDITME 2004-10-07 14:28:22.292872122 +0200
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 # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
86 # the "demime" condition.
88 -# WITH_OLD_DEMIME=yes
91 #------------------------------------------------------------------------------
92 # Compiling Exim with experimental features. These are documented in
94 # included in the Exim binary. You will then need to set up the run time
95 # configuration to make use of the mechanism(s) selected.
100 -# AUTH_PLAINTEXT=yes
106 #------------------------------------------------------------------------------
107 @@ -553,10 +554,10 @@
108 # leave these settings commented out.
110 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
114 # Uncomment this setting if you are using OpenSSL
115 -# TLS_LIBS=-lssl -lcrypto
116 +TLS_LIBS=-lssl -lcrypto
118 # Uncomment these settings if you are using GnuTLS
121 # Once you have done this, "make install" will build the info files and
122 # install them in the directory you have defined.
124 -# INFO_DIRECTORY=/usr/share/info
125 +INFO_DIRECTORY=/usr/share/info
128 #------------------------------------------------------------------------------
130 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
131 # to form the final file names. Some installations may want something like this:
133 -# LOG_FILE_PATH=/var/log/exim_%slog
134 +LOG_FILE_PATH=/var/log/exim/%s.log
136 # which results in files with names /var/log/exim_mainlog, etc. The directory
137 # in which the log files are placed must exist; Exim does not try to create
139 # files. Both the name of the command and the suffix that it adds to files
140 # need to be defined here. See also the EXICYCLOG_MAX configuration.
142 -COMPRESS_COMMAND=/usr/bin/gzip
143 +COMPRESS_COMMAND=/bin/gzip
148 # If the exigrep utility is fed compressed log files, it tries to uncompress
149 # them using this command.
151 -ZCAT_COMMAND=/usr/bin/zcat
152 +ZCAT_COMMAND=/bin/zcat
155 #------------------------------------------------------------------------------
157 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
158 # Perl costs quite a lot of resources. Only do this if you really need it.
164 #------------------------------------------------------------------------------
166 # -shared option, and you will need to add -export-dynamic to EXTRALIBS so
167 # that the local_scan API is made available by the linker.
173 #------------------------------------------------------------------------------
174 @@ -705,11 +706,12 @@
175 # support, which is intended for use in conjunction with the SMTP AUTH
176 # facilities, is included only when requested by the following setting:
181 # You probably need to add -lpam to EXTRALIBS, and in some releases of
182 # GNU/Linux -ldl is also needed.
184 +EXTRALIBS=-lpam -ldl
186 #------------------------------------------------------------------------------
187 # Support for authentication via Radius is also available. The Exim support,
189 # /var/pwcheck) and chown it to exim's user and group. Once you have installed
190 # pwcheck, you should arrange for it to be started by root at boot time.
192 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
193 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
196 #------------------------------------------------------------------------------
198 # group. Once you have installed saslauthd, you should arrange for it to be
199 # started by root at boot time.
201 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
202 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl/mux
205 #------------------------------------------------------------------------------
207 # is "yes", as well as supporting line editing, a history of input lines in the
208 # current run is maintained.
213 # You may need to add -ldl to EXTRA_LIBS when you set USE_READLINE=yes.
214 # Note that this option adds to the size of the Exim binary, because the
216 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
217 # does not exist, then the bare configuration file name is tried.
219 -# CONFIGURE_FILE_USE_NODE=yes
220 +CONFIGURE_FILE_USE_NODE=yes
223 #------------------------------------------------------------------------------
224 @@ -1081,7 +1083,7 @@
225 # be changed here. The default is 0640 so that information from the spool is
226 # available to anyone who is a member of the Exim group.
232 #------------------------------------------------------------------------------