1 diff -urN exim-4.24.org/src/EDITME exim-4.24/src/EDITME
2 --- exim-4.24.org/src/EDITME 2003-09-22 20:54:22.000000000 +0200
3 +++ exim-4.24/src/EDITME 2003-09-22 20:56:04.000000000 +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
24 # discouraged. These values are compiled into the binary.
30 # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
31 # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
33 # This one is special-purpose, and commonly not required, so it is not
34 # included by default.
40 #------------------------------------------------------------------------------
42 # MBX, is included only when requested. If you do not know what this is about,
43 # leave these settings commented out.
45 -# SUPPORT_MAILDIR=yes
46 -# SUPPORT_MAILSTORE=yes
49 +SUPPORT_MAILSTORE=yes
53 #------------------------------------------------------------------------------
74 -# LOOKUP_WILDLSEARCH=yes
75 -# LOOKUP_NWILDLSEARCH=yes
76 +LOOKUP_WILDLSEARCH=yes
77 +LOOKUP_NWILDLSEARCH=yes
80 #------------------------------------------------------------------------------
82 # included in the Exim binary. You will then need to set up the run time
83 # configuration to make use of the mechanism(s) selected.
93 #------------------------------------------------------------------------------
95 # leave these settings commented out.
97 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
101 # Uncomment this setting if you are using OpenSSL
102 -# TLS_LIBS=-lssl -lcrypto
103 +TLS_LIBS=-lssl -lcrypto
105 # Uncomment these settings if you are using GnuTLS
108 # Once you have done this, "make install" will build the info files and
109 # install them in the directory you have defined.
111 -# INFO_DIRECTORY=/usr/share/info
112 +INFO_DIRECTORY=/usr/share/info
115 #------------------------------------------------------------------------------
117 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
118 # to form the final file names. Some installations may want something like this:
120 -# LOG_FILE_PATH=/var/log/exim_%slog
121 +LOG_FILE_PATH=/var/log/exim/%s.log
123 # which results in files with names /var/log/exim_mainlog, etc. The directory
124 # in which the log files are placed must exist; Exim does not try to create
126 # files. Both the name of the command and the suffix that it adds to files
127 # need to be defined here. See also the EXICYCLOG_MAX configuration.
129 -COMPRESS_COMMAND=/usr/bin/gzip
130 +COMPRESS_COMMAND=/bin/gzip
135 # If the exigrep utility is fed compressed log files, it tries to uncompress
136 # them using this command.
138 -ZCAT_COMMAND=/usr/bin/zcat
139 +ZCAT_COMMAND=/bin/zcat
142 #------------------------------------------------------------------------------
144 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
145 # Perl costs quite a lot of resources. Only do this if you really need it.
151 #------------------------------------------------------------------------------
152 @@ -588,11 +589,12 @@
153 # support, which is intended for use in conjunction with the SMTP AUTH
154 # facilities, is included only when requested by the following setting:
159 # You probably need to add -lpam to EXTRALIBS, and in some releases of
160 # GNU/Linux -ldl is also needed.
162 +EXTRALIBS=-lpam -ldl
164 #------------------------------------------------------------------------------
165 # Support for authentication via Radius is also available. The Exim support,
167 # /var/pwcheck) and chown it to exim's user and group. Once you have installed
168 # pwcheck, you should arrange for it to be started by root at boot time.
170 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
171 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
174 #------------------------------------------------------------------------------
176 # group. Once you have installed saslauthd, you should arrange for it to be
177 # started by root at boot time.
179 -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
180 +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
183 #------------------------------------------------------------------------------
185 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
186 # does not exist, then the bare configuration file name is tried.
188 -# CONFIGURE_FILE_USE_NODE=yes
189 +CONFIGURE_FILE_USE_NODE=yes
192 #------------------------------------------------------------------------------
194 # (process id) to a file so that it can easily be identified. The path of the
195 # file can be specified here. Some installations may want something like this:
197 -# PID_FILE_PATH=/var/lock/exim.pid
198 +PID_FILE_PATH=/var/run/exim%s.pid
200 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
201 # using the name "exim-daemon.pid".
203 # be changed here. The default is 0640 so that information from the spool is
204 # available to anyone who is a member of the Exim group.
210 #------------------------------------------------------------------------------