]> git.pld-linux.org Git - packages/exim-lite.git/blame - exim4-EDITME.patch
- update for 4.50
[packages/exim-lite.git] / exim4-EDITME.patch
CommitLineData
4a6bd540
AM
1diff -urN exim-4.50.org/src/EDITME exim-4.50/src/EDITME
2--- exim-4.50.org/src/EDITME 2005-02-17 15:49:11.000000000 +0100
3+++ exim-4.50/src/EDITME 2005-02-19 02:44:57.133818056 +0100
4@@ -100,7 +100,7 @@
32f9109c
AM
5 # /usr/local/sbin. The installation script will try to create this directory,
6 # and any superior directories, if they do not exist.
7
8-BIN_DIRECTORY=/usr/exim/bin
9+BIN_DIRECTORY=/usr/bin
10
11
12 #------------------------------------------------------------------------------
4a6bd540 13@@ -116,7 +116,7 @@
d53e0fbb
AM
14 # don't exist. It will also install a default runtime configuration if this
15 # file does not exist.
32f9109c
AM
16
17-CONFIGURE_FILE=/usr/exim/configure
18+CONFIGURE_FILE=/etc/mail/exim.conf
19
9a8356f9 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.
4a6bd540 22@@ -134,7 +134,8 @@
32f9109c 23 # owner of a local mailbox.) Specifying these values as root is very strongly
9e6e8b07 24 # discouraged.
32f9109c
AM
25
26-EXIM_USER=
27+EXIM_UID=79
28+EXIM_GID=79
29
9e6e8b07 30 # If you specify EXIM_USER as a name, this is looked up at build time, and the
31 # uid number is built into the binary. However, you can specify that this
4a6bd540 32@@ -208,7 +209,7 @@
a453117f
AM
33
34 # This one is very special-purpose, so is not included by default.
35
36-# ROUTER_IPLOOKUP=yes
37+ROUTER_IPLOOKUP=yes
38
39
40 #------------------------------------------------------------------------------
4a6bd540 41@@ -229,7 +230,7 @@
32f9109c
AM
42 # This one is special-purpose, and commonly not required, so it is not
43 # included by default.
44
45-# TRANSPORT_LMTP=yes
46+TRANSPORT_LMTP=yes
47
48
49 #------------------------------------------------------------------------------
4a6bd540 50@@ -238,9 +239,9 @@
32f9109c
AM
51 # MBX, is included only when requested. If you do not know what this is about,
52 # leave these settings commented out.
53
54-# SUPPORT_MAILDIR=yes
55-# SUPPORT_MAILSTORE=yes
56-# SUPPORT_MBX=yes
57+SUPPORT_MAILDIR=yes
58+SUPPORT_MAILSTORE=yes
59+SUPPORT_MBX=yes
60
61
62 #------------------------------------------------------------------------------
4a6bd540 63@@ -255,16 +256,16 @@
32f9109c
AM
64 LOOKUP_DBM=yes
65 LOOKUP_LSEARCH=yes
66
67-# LOOKUP_CDB=yes
37c3e2fc 68-# LOOKUP_DNSDB=yes
d53e0fbb 69-# LOOKUP_DSEARCH=yes
37c3e2fc
AM
70+LOOKUP_CDB=yes
71+LOOKUP_DNSDB=yes
d53e0fbb 72+LOOKUP_DSEARCH=yes
b19ec081 73 # LOOKUP_IBASE=yes
32f9109c 74 # LOOKUP_LDAP=yes
d53e0fbb
AM
75 # LOOKUP_MYSQL=yes
76 # LOOKUP_NIS=yes
37c3e2fc
AM
77 # LOOKUP_NISPLUS=yes
78 # LOOKUP_ORACLE=yes
79-# LOOKUP_PASSWD=yes
80+LOOKUP_PASSWD=yes
81 # LOOKUP_PGSQL=yes
82 # LOOKUP_WHOSON=yes
37c3e2fc 83
4a6bd540
AM
84@@ -321,14 +322,14 @@
85 # and the MIME ACL. Please read the documentation to learn more about these
86 # features.
87
88-# WITH_CONTENT_SCAN=yes
89+WITH_CONTENT_SCAN=yes
90
91 # If you want to use the deprecated "demime" condition in the DATA ACL,
92 # uncomment the line below. Doing so will also explicitly turn on the
93 # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
94 # the "demime" condition.
95
96-# WITH_OLD_DEMIME=yes
97+WITH_OLD_DEMIME=yes
98
99 #------------------------------------------------------------------------------
100 # Compiling Exim with experimental features. These are documented in
101@@ -464,10 +465,10 @@
32f9109c
AM
102 # included in the Exim binary. You will then need to set up the run time
103 # configuration to make use of the mechanism(s) selected.
104
105-# AUTH_CRAM_MD5=yes
4a6bd540
AM
106+AUTH_CRAM_MD5=yes
107 # AUTH_CYRUS_SASL=yes
32f9109c 108-# AUTH_PLAINTEXT=yes
d53e0fbb 109-# AUTH_SPA=yes
32f9109c 110+AUTH_PLAINTEXT=yes
d53e0fbb 111+AUTH_SPA=yes
32f9109c
AM
112
113
d53e0fbb 114 #------------------------------------------------------------------------------
4a6bd540 115@@ -553,10 +554,10 @@
9a8356f9 116 # leave these settings commented out.
32f9109c 117
9a8356f9 118 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
32f9109c 119-# SUPPORT_TLS=yes
32f9109c 120+SUPPORT_TLS=yes
9a8356f9 121
122 # Uncomment this setting if you are using OpenSSL
123-# TLS_LIBS=-lssl -lcrypto
32f9109c
AM
124+TLS_LIBS=-lssl -lcrypto
125
9a8356f9 126 # Uncomment these settings if you are using GnuTLS
127 # USE_GNUTLS=yes
4a6bd540 128@@ -607,7 +608,7 @@
32f9109c
AM
129 # Once you have done this, "make install" will build the info files and
130 # install them in the directory you have defined.
131
132-# INFO_DIRECTORY=/usr/share/info
133+INFO_DIRECTORY=/usr/share/info
134
135
136 #------------------------------------------------------------------------------
4a6bd540 137@@ -620,7 +621,7 @@
32f9109c
AM
138 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
139 # to form the final file names. Some installations may want something like this:
140
141-# LOG_FILE_PATH=/var/log/exim_%slog
142+LOG_FILE_PATH=/var/log/exim/%s.log
143
144 # which results in files with names /var/log/exim_mainlog, etc. The directory
145 # in which the log files are placed must exist; Exim does not try to create
4a6bd540 146@@ -669,7 +670,7 @@
32f9109c
AM
147 # files. Both the name of the command and the suffix that it adds to files
148 # need to be defined here. See also the EXICYCLOG_MAX configuration.
149
150-COMPRESS_COMMAND=/usr/bin/gzip
151+COMPRESS_COMMAND=/bin/gzip
152 COMPRESS_SUFFIX=gz
153
154
4a6bd540 155@@ -677,7 +678,7 @@
32f9109c
AM
156 # If the exigrep utility is fed compressed log files, it tries to uncompress
157 # them using this command.
158
159-ZCAT_COMMAND=/usr/bin/zcat
160+ZCAT_COMMAND=/bin/zcat
161
162
163 #------------------------------------------------------------------------------
4a6bd540 164@@ -686,7 +687,7 @@
32f9109c
AM
165 # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
166 # Perl costs quite a lot of resources. Only do this if you really need it.
167
168-# EXIM_PERL=perl.o
169+EXIM_PERL=perl.o
170
171
172 #------------------------------------------------------------------------------
4a6bd540 173@@ -696,11 +697,12 @@
32f9109c
AM
174 # support, which is intended for use in conjunction with the SMTP AUTH
175 # facilities, is included only when requested by the following setting:
176
177-# SUPPORT_PAM=yes
178+SUPPORT_PAM=yes
179
180 # You probably need to add -lpam to EXTRALIBS, and in some releases of
181 # GNU/Linux -ldl is also needed.
182
183+EXTRALIBS=-lpam -ldl
184
185 #------------------------------------------------------------------------------
186 # Support for authentication via Radius is also available. The Exim support,
4a6bd540 187@@ -740,7 +742,7 @@
d53e0fbb
AM
188 # /var/pwcheck) and chown it to exim's user and group. Once you have installed
189 # pwcheck, you should arrange for it to be started by root at boot time.
13278cdd
ŁJM
190
191-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
192+CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
193
194
195 #------------------------------------------------------------------------------
4a6bd540 196@@ -757,7 +759,7 @@
d53e0fbb
AM
197 # group. Once you have installed saslauthd, you should arrange for it to be
198 # started by root at boot time.
199
200-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
201+CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
202
203
204 #------------------------------------------------------------------------------
4a6bd540 205@@ -817,7 +819,7 @@
a453117f
AM
206 # is "yes", as well as supporting line editing, a history of input lines in the
207 # current run is maintained.
208
209-# USE_READLINE=yes
210+USE_READLINE=yes
211
4a6bd540
AM
212 # You may need to add -ldl to EXTRA_LIBS when you set USE_READLINE=yes.
213 # Note that this option adds to the size of the Exim binary, because the
214@@ -892,7 +894,7 @@
32f9109c
AM
215 # period (for example, /usr/exim/configure.host.in.some.domain). If this file
216 # does not exist, then the bare configuration file name is tried.
217
218-# CONFIGURE_FILE_USE_NODE=yes
219+CONFIGURE_FILE_USE_NODE=yes
220
221
222 #------------------------------------------------------------------------------
4a6bd540 223@@ -1065,7 +1067,7 @@
32f9109c
AM
224 # be changed here. The default is 0640 so that information from the spool is
225 # available to anyone who is a member of the Exim group.
226
227-# SPOOL_MODE=0640
228+SPOOL_MODE=0640
229
230
231 #------------------------------------------------------------------------------
This page took 0.418452 seconds and 4 git commands to generate.