1 diff -Nru exim-4.74.orig/src/EDITME exim-4.74/src/EDITME
2 --- exim-4.74.orig/src/EDITME 2011-01-25 10:08:58.230470315 +0100
3 +++ exim-4.74/src/EDITME 2011-01-25 10:09:14.328390661 +0100
5 # this would be wanted.
6 ###############################################################################
11 ###############################################################################
12 # THESE ARE THINGS YOU MUST SPECIFY #
14 # /usr/local/sbin. The installation script will try to create this directory,
15 # and any superior directories, if they do not exist.
17 -BIN_DIRECTORY=/usr/exim/bin
18 +BIN_DIRECTORY=/usr/sbin
21 #------------------------------------------------------------------------------
23 # don't exist. It will also install a default runtime configuration if this
24 # file does not exist.
26 -CONFIGURE_FILE=/usr/exim/configure
27 +CONFIGURE_FILE=/etc/exim/exim.conf
29 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
30 # In this case, Exim will use the first of them that exists when it is run.
32 # deliveries. (Local deliveries run as various non-root users, typically as the
33 # owner of a local mailbox.) Specifying these values as root is not supported.
38 # If you specify EXIM_USER as a name, this is looked up at build time, and the
39 # uid number is built into the binary. However, you can specify that this
41 # MBX, is included only when requested. If you do not know what this is about,
42 # leave these settings commented out.
44 -# SUPPORT_MAILDIR=yes
46 # SUPPORT_MAILSTORE=yes
61 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
62 # local OS-specific make files.
64 -EXIM_MONITOR=eximon.bin
65 +# EXIM_MONITOR=eximon.bin
68 #------------------------------------------------------------------------------
70 # included in the Exim binary. You will then need to set up the run time
71 # configuration to make use of the mechanism(s) selected.
83 # leave these settings commented out.
85 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
89 # Uncomment this setting if you are using OpenSSL
90 -# TLS_LIBS=-lssl -lcrypto
91 +TLS_LIBS=-lssl -lcrypto
93 # Uncomment these settings if you are using GnuTLS
96 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
97 # to form the final file names. Some installations may want something like this:
99 -# LOG_FILE_PATH=/var/log/exim_%slog
100 +LOG_FILE_PATH=/var/log/exim/exim_%slog
102 # which results in files with names /var/log/exim_mainlog, etc. The directory
103 # in which the log files are placed must exist; Exim does not try to create
105 # files. Both the name of the command and the suffix that it adds to files
106 # need to be defined here. See also the EXICYCLOG_MAX configuration.
108 -COMPRESS_COMMAND=/usr/bin/gzip
109 +COMPRESS_COMMAND=/bin/gzip
114 # If the exigrep utility is fed compressed log files, it tries to uncompress
115 # them using this command.
117 -ZCAT_COMMAND=/usr/bin/zcat
118 +ZCAT_COMMAND=/bin/zcat
121 #------------------------------------------------------------------------------
123 # You may well also have to specify a local "include" file and an additional
124 # library for TCP wrappers, so you probably need something like this:
126 -# USE_TCP_WRAPPERS=yes
127 +USE_TCP_WRAPPERS=yes
128 # CFLAGS=-O -I/usr/local/include
129 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
130 +EXTRALIBS_EXIM=-lwrap
132 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
135 # aliases). The following setting can be changed to specify a different
136 # location for the system alias file.
138 -SYSTEM_ALIASES_FILE=/etc/aliases
139 +SYSTEM_ALIASES_FILE=/etc/exim/aliases
142 #------------------------------------------------------------------------------
143 @@ -970,13 +970,13 @@
144 # haven't got Perl, Exim will still build and run; you just won't be able to
145 # use those utilities.
147 -# CHOWN_COMMAND=/usr/bin/chown
148 -# CHGRP_COMMAND=/usr/bin/chgrp
149 -# CHMOD_COMMAND=/usr/bin/chmod
150 -# MV_COMMAND=/bin/mv
151 -# RM_COMMAND=/bin/rm
152 -# TOUCH_COMMAND=/usr/bin/touch
153 -# PERL_COMMAND=/usr/bin/perl
154 +CHOWN_COMMAND=/bin/chown
155 +CHGRP_COMMAND=/bin/chgrp
156 +CHMOD_COMMAND=/bin/chmod
159 +TOUCH_COMMAND=/bin/touch
160 +PERL_COMMAND=/usr/bin/perl
163 #------------------------------------------------------------------------------
164 @@ -1170,7 +1170,7 @@
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.pid
171 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
172 # using the name "exim-daemon.pid".
173 diff -Nru exim-4.74.orig/src/configure.default exim-4.74/src/configure.default
174 --- exim-4.74.orig/src/configure.default 2011-01-25 10:08:58.230470315 +0100
175 +++ exim-4.74/src/configure.default 2011-01-25 10:09:14.328390661 +0100
177 # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
178 # are all colon-separated lists:
180 -domainlist local_domains = @
181 +domainlist local_domains = @ : localhost
182 domainlist relay_to_domains =
183 hostlist relay_from_hosts = 127.0.0.1