-diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
---- exim-4.02.org/src/EDITME Tue Mar 26 13:02:27 2002
-+++ exim-4.02/src/EDITME Tue Mar 26 13:24:21 2002
-@@ -98,7 +98,7 @@
+diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
+--- exim-4.64.org/src/EDITME 2006-12-20 10:46:04.000000000 +0100
++++ exim-4.64/src/EDITME 2006-12-21 16:57:08.676246750 +0100
+@@ -100,7 +100,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
#------------------------------------------------------------------------------
-@@ -113,7 +113,7 @@
- # directories if they don't exist. It will also install a default run time
- # configuration if this file does not exist.
+@@ -116,7 +116,7 @@
+ # don't exist. It will also install a default runtime configuration if this
+ # file does not exist.
-CONFIGURE_FILE=/usr/exim/configure
+CONFIGURE_FILE=/etc/mail/exim.conf
-
- #------------------------------------------------------------------------------
-@@ -126,7 +126,8 @@
+ # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
+ # In this case, Exim will use the first of them that exists when it is run.
+@@ -134,7 +134,8 @@
# owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged. These values are compiled into the binary.
+ # discouraged.
-EXIM_USER=
+EXIM_UID=79
+EXIM_GID=79
- # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
- # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +208,7 @@
+ # If you specify EXIM_USER as a name, this is looked up at build time, and the
+ # uid number is built into the binary. However, you can specify that this
+@@ -214,7 +215,7 @@
+
+ # This one is very special-purpose, so is not included by default.
+
+-# ROUTER_IPLOOKUP=yes
++ROUTER_IPLOOKUP=yes
+
+
+ #------------------------------------------------------------------------------
+@@ -235,7 +236,7 @@
# This one is special-purpose, and commonly not required, so it is not
# included by default.
#------------------------------------------------------------------------------
-@@ -216,9 +217,9 @@
+@@ -244,9 +245,9 @@
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
#------------------------------------------------------------------------------
-@@ -233,7 +234,7 @@
+@@ -261,16 +262,16 @@
LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
-# LOOKUP_CDB=yes
+-# LOOKUP_DNSDB=yes
+-# LOOKUP_DSEARCH=yes
+LOOKUP_CDB=yes
- # LOOKUP_DNSDB=yes
- # LOOKUP_DSEARCH=yes
++LOOKUP_DNSDB=yes
++LOOKUP_DSEARCH=yes
+ # LOOKUP_IBASE=yes
# LOOKUP_LDAP=yes
-@@ -302,8 +303,8 @@
+ # LOOKUP_MYSQL=yes
+ # LOOKUP_NIS=yes
+ # LOOKUP_NISPLUS=yes
+ # LOOKUP_ORACLE=yes
+-# LOOKUP_PASSWD=yes
++LOOKUP_PASSWD=yes
+ # LOOKUP_PGSQL=yes
+ # LOOKUP_SQLITE=yes
+ # LOOKUP_WHOSON=yes
+@@ -330,14 +331,14 @@
+ # and the MIME ACL. Please read the documentation to learn more about these
+ # features.
+
+-# WITH_CONTENT_SCAN=yes
++WITH_CONTENT_SCAN=yes
+
+ # If you want to use the deprecated "demime" condition in the DATA ACL,
+ # uncomment the line below. Doing so will also explicitly turn on the
+ # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
+ # the "demime" condition.
+
+-# WITH_OLD_DEMIME=yes
++WITH_OLD_DEMIME=yes
+
+ #------------------------------------------------------------------------------
+ # Compiling Exim with experimental features. These are documented in
+@@ -473,11 +474,11 @@
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
-# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
+AUTH_CRAM_MD5=yes
+ # AUTH_CYRUS_SASL=yes
+-# AUTH_DOVECOT=yes
+-# AUTH_PLAINTEXT=yes
+-# AUTH_SPA=yes
++AUTH_DOVECOT=yes
+AUTH_PLAINTEXT=yes
- # AUTH_SPA=yes
++AUTH_SPA=yes
-@@ -315,8 +316,8 @@
- # with TLS support. If you don't know what this is all about, leave these
- # settings commented out.
+ #------------------------------------------------------------------------------
+@@ -576,10 +577,10 @@
+ # leave these settings commented out.
+ # This setting is required for any TLS support (either OpenSSL or GnuTLS)
-# SUPPORT_TLS=yes
--# TLS_LIBS=-lssl -lcrypto
+SUPPORT_TLS=yes
+
+ # Uncomment this setting if you are using OpenSSL
+-# TLS_LIBS=-lssl -lcrypto
+TLS_LIBS=-lssl -lcrypto
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
-@@ -358,7 +359,7 @@
+ # Uncomment these settings if you are using GnuTLS
+ # USE_GNUTLS=yes
+@@ -630,7 +631,7 @@
# Once you have done this, "make install" will build the info files and
# install them in the directory you have defined.
#------------------------------------------------------------------------------
-@@ -371,7 +372,7 @@
+@@ -643,7 +644,7 @@
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
# to form the final file names. Some installations may want something like this:
# which results in files with names /var/log/exim_mainlog, etc. The directory
# in which the log files are placed must exist; Exim does not try to create
-@@ -405,7 +406,7 @@
+@@ -692,7 +693,7 @@
# files. Both the name of the command and the suffix that it adds to files
# need to be defined here. See also the EXICYCLOG_MAX configuration.
COMPRESS_SUFFIX=gz
-@@ -413,7 +414,7 @@
+@@ -700,7 +701,7 @@
# If the exigrep utility is fed compressed log files, it tries to uncompress
# them using this command.
#------------------------------------------------------------------------------
-@@ -422,7 +423,7 @@
+@@ -709,7 +710,7 @@
# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
# Perl costs quite a lot of resources. Only do this if you really need it.
#------------------------------------------------------------------------------
-@@ -432,11 +433,12 @@
+@@ -719,7 +720,7 @@
+ # that the local_scan API is made available by the linker. You may also need
+ # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
+
+-# EXPAND_DLFUNC=yes
++EXPAND_DLFUNC=yes
+
+
+ #------------------------------------------------------------------------------
+@@ -729,11 +730,12 @@
# support, which is intended for use in conjunction with the SMTP AUTH
# facilities, is included only when requested by the following setting:
#------------------------------------------------------------------------------
# Support for authentication via Radius is also available. The Exim support,
-@@ -529,7 +531,7 @@
+@@ -780,7 +782,7 @@
+ # /var/pwcheck) and chown it to exim's user and group. Once you have installed
+ # pwcheck, you should arrange for it to be started by root at boot time.
+
+-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
++CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
+
+
+ #------------------------------------------------------------------------------
+@@ -797,7 +799,7 @@
+ # group. Once you have installed saslauthd, you should arrange for it to be
+ # started by root at boot time.
+
+-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
++CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
+
+
+ #------------------------------------------------------------------------------
+@@ -857,7 +859,7 @@
+ # is "yes", as well as supporting line editing, a history of input lines in the
+ # current run is maintained.
+
+-# USE_READLINE=yes
++USE_READLINE=yes
+
+ # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
+ # Note that this option adds to the size of the Exim binary, because the
+@@ -932,7 +934,7 @@
# period (for example, /usr/exim/configure.host.in.some.domain). If this file
# does not exist, then the bare configuration file name is tried.
#------------------------------------------------------------------------------
-@@ -678,7 +680,7 @@
- # (process id) to a file so that it can easily be identified. The path of the
- # file can be specified here. Some installations may want something like this:
-
--# PID_FILE_PATH=/var/lock/exim.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
-
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # using the name "exim-daemon.pid".
-@@ -701,7 +703,7 @@
+@@ -1105,7 +1107,7 @@
# be changed here. The default is 0640 so that information from the spool is
# available to anyone who is a member of the Exim group.
projects / packages / exim.git / blobdiff