1 diff -urP exim-4.12.orig/src/EDITME exim-4.12/src/EDITME
2 --- exim-4.12.orig/src/EDITME Wed Dec 18 11:28:00 2002
3 +++ exim-4.12/src/EDITME Mon Dec 23 03:50:04 2002
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 # directories if they don't exist. It will also install a default runtime
15 # configuration if this 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 #------------------------------------------------------------------------------
64 # included in the Exim binary. You will then need to set up the run time
65 # configuration to make use of the mechanism(s) selected.
75 # leave these settings commented out.
77 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
81 # Uncomment this setting if you are using OpenSSL
82 -# TLS_LIBS=-lssl -lcrypto
83 +TLS_LIBS=-lssl -lcrypto
85 # Uncomment these settings if you are using GnuTLS
88 # Once you have done this, "make install" will build the info files and
89 # install them in the directory you have defined.
91 -# INFO_DIRECTORY=/usr/share/info
92 +INFO_DIRECTORY=/usr/share/info
95 #------------------------------------------------------------------------------
97 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
98 # to form the final file names. Some installations may want something like this:
100 -# LOG_FILE_PATH=/var/log/exim_%slog
101 +LOG_FILE_PATH=/var/log/exim/%s.log
103 # which results in files with names /var/log/exim_mainlog, etc. The directory
104 # in which the log files are placed must exist; Exim does not try to create
106 # files. Both the name of the command and the suffix that it adds to files
107 # need to be defined here. See also the EXICYCLOG_MAX configuration.
109 -COMPRESS_COMMAND=/usr/bin/gzip
110 +COMPRESS_COMMAND=/bin/gzip
115 # If the exigrep utility is fed compressed log files, it tries to uncompress
116 # them using this command.
118 -ZCAT_COMMAND=/usr/bin/zcat
119 +ZCAT_COMMAND=/bin/zcat
122 #------------------------------------------------------------------------------
124 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
125 # Perl costs quite a lot of resources. Only do this if you really need it.
131 #------------------------------------------------------------------------------
132 @@ -451,11 +452,12 @@
133 # support, which is intended for use in conjunction with the SMTP AUTH
134 # facilities, is included only when requested by the following setting:
139 # You probably need to add -lpam to EXTRALIBS, and in some releases of
140 # GNU/Linux -ldl is also needed.
142 +EXTRALIBS=-lpam -ldl
144 #------------------------------------------------------------------------------
145 # Support for authentication via Radius is also available. The Exim support,
147 # and chown it to exim's user and group. Once you have installed pwcheck, you
148 # should arrange for it to be started by root at boot time.
150 -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
151 +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
154 #------------------------------------------------------------------------------
156 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
157 # does not exist, then the bare configuration file name is tried.
159 -# CONFIGURE_FILE_USE_NODE=yes
160 +CONFIGURE_FILE_USE_NODE=yes
163 #------------------------------------------------------------------------------
165 # (process id) to a file so that it can easily be identified. The path of the
166 # file can be specified here. Some installations may want something like this:
168 -# PID_FILE_PATH=/var/lock/exim.pid
169 +PID_FILE_PATH=/var/run/exim%s.pid
171 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
172 # using the name "exim-daemon.pid".
174 # be changed here. The default is 0640 so that information from the spool is
175 # available to anyone who is a member of the Exim group.
181 #------------------------------------------------------------------------------