1 diff -ruN exim-3.20.orig/src/EDITME exim-3.20/src/EDITME
2 --- exim-3.20.orig/src/EDITME Sat Nov 25 17:02:47 2000
3 +++ exim-3.20/src/EDITME Tue Dec 5 09:28:44 2000
5 # appropriate code is included in the binary. You then need to set up the
6 # runtime configuration to make use of the mechanism(s) selected.
14 # The binary directory: This variable defines where the exim binary will be
16 # installed in this directory. There is no default for this variable built into
17 # the source files; it must be set in one of the local configuration files.
19 -BIN_DIRECTORY=/usr/exim/bin
20 +BIN_DIRECTORY=/usr/bin
23 # The default distribution of Exim contains only the plain text form of the
25 # your info directory; "make install" will then build the info files and
28 -# INFO_DIRECTORY=/usr/local/info
29 +INFO_DIRECTORY=/usr/share/info
32 # The compress command is used by the exicyclog script to compress old log
33 # files. Both the name of the command and the suffix that it adds to files
34 # need to be defined here. See also the EXICYCLOG_MAX configuration.
36 -COMPRESS_COMMAND=/opt/gnu/bin/gzip
37 +COMPRESS_COMMAND=/bin/gzip
41 # If the exigrep utility is fed compressed log files, it tries to uncompress
42 # them using this command.
44 -ZCAT_COMMAND=/opt/gnu/bin/zcat
45 +ZCAT_COMMAND=/bin/zcat
48 # The runtime configuration file: This variable defines where Exim's runtime
50 # location of all other runtime files and directories can be changed in the
51 # runtime configuration file.
53 -CONFIGURE_FILE=/usr/exim/configure
54 +CONFIGURE_FILE=/etc/mail/exim.conf
57 # In some installations there may be multiple machines sharing file systems,
59 # period (for example, /usr/exim/configure.host.in.some.domain. If this file
60 # does not exist, then the bare configuration file name is tried.
62 -# CONFIGURE_FILE_USE_NODE=yes
63 +CONFIGURE_FILE_USE_NODE=yes
66 # In some esoteric configurations two different versions of Exim are run,
68 # "security" setting, which controls how privilege is released (setuid vs
77 # Compiling the Exim monitor: If you want to compile the Exim monitor,
79 # "panic", or "reject" to form the final file name. For example, some
80 # installations may want something like this:
82 -# LOG_FILE_PATH=/var/log/exim_%slog
83 +LOG_FILE_PATH=/var/log/exim/%s.log
85 # which results in files with names /var/log/exim_mainlog, etc. The directory
86 # in which the log files are placed must exist; Exim does not try to create
88 # the file name, allowing sites that run two separate daemons to distinguish
89 # them. Some installations may want something like this
91 -# PID_FILE_PATH=/var/lock/exim%s.pid
92 +PID_FILE_PATH=/var/run/exim%s.pid
94 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
95 # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
99 # Many installations will want something like this:
100 -# SPOOL_DIRECTORY=/var/spool/exim
101 +SPOOL_DIRECTORY=/var/spool/exim
103 # Others may prefer to keep all Exim things under one directory:
104 # SPOOL_DIRECTORY=/usr/exim/spool
106 # member of the Exim group, change the value to 0640. This is particularly
107 # relevant if you are going to run the Exim monitor.
113 # If STDERR_FILE is defined then the -df command line option causes Exim to
115 # of formats. The code for three specialist formats, maildir, mailstore, and
116 # MBX, is included only when requested by the following settings:
118 -# SUPPORT_MAILDIR=yes
119 -# SUPPORT_MAILSTORE=yes
122 +SUPPORT_MAILSTORE=yes
126 # Moving frozen messages: If the following is uncommented, Exim is compiled
127 @@ -510,11 +511,12 @@
128 # support, which is intended for use in conjunction with the SMTP AUTH
129 # facilities, is included only when requested by the following setting:
134 # You probably need to add -lpam to EXTRALIBS, and in some releases of
135 # GNU/Linux -ldl is also needed.
137 +EXTRALIBS=-lpam -ldl
139 # Exim can be built to support the SMTP STARTTLS command, which implements
140 # Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
142 # code of its own. Uncomment the following lines if you want to build Exim
146 -# TLS_LIBS=-lssl -lcrypto
148 +TLS_LIBS=-lssl -lcrypto
150 # If you are running Exim as a server, note that just building it with TLS
151 # support is not usually all you need to do. You normally need to set up a
153 # This one is special-purpose, and commonly not required, so do not include
156 -# TRANSPORT_LMTP=yes
160 # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment