1 diff -Nru exim-4.60.orig/src/EDITME exim-4.60/src/EDITME
2 --- exim-4.60.orig/src/EDITME 2005-11-28 16:31:10.000000000 +0100
3 +++ exim-4.60/src/EDITME 2005-11-28 16:31:26.000000000 +0100
4 @@ -74,7 +74,7 @@
5 # this would be wanted.
6 ###############################################################################
7
8 -
9 +CFLAGS=#CFLAGS#
10
11 ###############################################################################
12 # THESE ARE THINGS YOU MUST SPECIFY #
13 @@ -100,7 +100,7 @@
14 # /usr/local/sbin. The installation script will try to create this directory,
15 # and any superior directories, if they do not exist.
16
17 -BIN_DIRECTORY=/usr/exim/bin
18 +BIN_DIRECTORY=/usr/sbin
19
20
21 #------------------------------------------------------------------------------
22 @@ -116,7 +116,7 @@
23 # don't exist. It will also install a default runtime configuration if this
24 # file does not exist.
25
26 -CONFIGURE_FILE=/usr/exim/configure
27 +CONFIGURE_FILE=/etc/exim/exim.conf
28
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.
31 @@ -134,7 +134,7 @@
32 # owner of a local mailbox.) Specifying these values as root is very strongly
33 # discouraged.
34
35 -EXIM_USER=
36 +EXIM_USER=ref:mail
37
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
40 @@ -244,7 +244,7 @@
41 # MBX, is included only when requested. If you do not know what this is about,
42 # leave these settings commented out.
43
44 -# SUPPORT_MAILDIR=yes
45 +SUPPORT_MAILDIR=yes
46 # SUPPORT_MAILSTORE=yes
47 # SUPPORT_MBX=yes
48
49 @@ -261,9 +261,9 @@
50 LOOKUP_DBM=yes
51 LOOKUP_LSEARCH=yes
52
53 -# LOOKUP_CDB=yes
54 +LOOKUP_CDB=yes
55 # LOOKUP_DNSDB=yes
56 -# LOOKUP_DSEARCH=yes
57 +LOOKUP_DSEARCH=yes
58 # LOOKUP_IBASE=yes
59 # LOOKUP_LDAP=yes
60 # LOOKUP_MYSQL=yes
61 @@ -320,7 +320,7 @@
62 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
63 # local OS-specific make files.
64
65 -EXIM_MONITOR=eximon.bin
66 +# EXIM_MONITOR=eximon.bin
67
68
69 #------------------------------------------------------------------------------
70 @@ -473,9 +473,9 @@
71 # included in the Exim binary. You will then need to set up the run time
72 # configuration to make use of the mechanism(s) selected.
73
74 -# AUTH_CRAM_MD5=yes
75 +AUTH_CRAM_MD5=yes
76 # AUTH_CYRUS_SASL=yes
77 -# AUTH_PLAINTEXT=yes
78 +AUTH_PLAINTEXT=yes
79 # AUTH_SPA=yes
80
81
82 @@ -562,10 +562,10 @@
83 # leave these settings commented out.
84
85 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
86 -# SUPPORT_TLS=yes
87 +SUPPORT_TLS=yes
88
89 # Uncomment this setting if you are using OpenSSL
90 -# TLS_LIBS=-lssl -lcrypto
91 +TLS_LIBS=-lssl -lcrypto
92
93 # Uncomment these settings if you are using GnuTLS
94 # USE_GNUTLS=yes
95 @@ -629,7 +629,7 @@
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:
98
99 -# LOG_FILE_PATH=/var/log/exim_%slog
100 +LOG_FILE_PATH=/var/log/exim/exim_%slog
101
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
104 @@ -678,7 +678,7 @@
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.
107
108 -COMPRESS_COMMAND=/usr/bin/gzip
109 +COMPRESS_COMMAND=/bin/gzip
110 COMPRESS_SUFFIX=gz
111
112
113 @@ -686,7 +686,7 @@
114 # If the exigrep utility is fed compressed log files, it tries to uncompress
115 # them using this command.
116
117 -ZCAT_COMMAND=/usr/bin/zcat
118 +ZCAT_COMMAND=/bin/zcat
119
120
121 #------------------------------------------------------------------------------
122 @@ -796,9 +796,9 @@
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:
125 #
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
131 #
132 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
133 # as well.
134 @@ -824,7 +824,7 @@
135 # aliases). The following setting can be changed to specify a different
136 # location for the system alias file.
137
138 -SYSTEM_ALIASES_FILE=/etc/aliases
139 +SYSTEM_ALIASES_FILE=/etc/exim/aliases
140
141
142 #------------------------------------------------------------------------------
143 @@ -870,10 +870,10 @@
144 # haven't got Perl, Exim will still build and run; you just won't be able to
145 # use those utilities.
146
147 -# CHOWN_COMMAND=/usr/bin/chown
148 -# CHGRP_COMMAND=/usr/bin/chgrp
149 -# MV_COMMAND=/bin/mv
150 -# RM_COMMAND=/bin/rm
151 +CHOWN_COMMAND=/bin/chown
152 +CHGRP_COMMAND=/bin/chgrp
153 +MV_COMMAND=/bin/mv
154 +RM_COMMAND=/bin/rm
155 # PERL_COMMAND=/usr/bin/perl
156
157
158 @@ -1068,7 +1068,7 @@
159 # (process id) to a file so that it can easily be identified. The path of the
160 # file can be specified here. Some installations may want something like this:
161
162 -# PID_FILE_PATH=/var/lock/exim.pid
163 +PID_FILE_PATH=/var/run/exim.pid
164
165 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
166 # using the name "exim-daemon.pid".
|
