-diff -urN exim-4.50.org/src/EDITME exim-4.50/src/EDITME
---- exim-4.50.org/src/EDITME 2005-02-17 15:49:11.000000000 +0100
-+++ exim-4.50/src/EDITME 2005-02-19 02:44:57.133818056 +0100
+--- exim-4.93/src/EDITME.org 2019-12-11 07:24:16.057781209 +0100
++++ exim-4.93/src/EDITME 2019-12-11 07:24:21.077926862 +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.
#------------------------------------------------------------------------------
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
# don't exist. It will also install a default runtime configuration if this
# file does not exist.
# 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.
+@@ -133,7 +133,8 @@ CONFIGURE_FILE=/usr/exim/configure
+ # deliveries. (Local deliveries run as various non-root users, typically as the
+ # owner of a local mailbox.) Specifying these values as root is not supported.
-EXIM_USER=
+EXIM_UID=79
# 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
-@@ -208,7 +209,7 @@
+@@ -211,11 +211,11 @@ SPOOL_DIRECTORY=/var/spool/exim
+ # If you are building with TLS, the library configuration must be done:
+
+ # Uncomment this if you are using OpenSSL
+-# USE_OPENSSL=yes
++USE_OPENSSL=yes
+ # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+ # and an optional location.
+-# USE_OPENSSL_PC=openssl
+-# TLS_LIBS=-lssl -lcrypto
++USE_OPENSSL_PC=openssl
++TLS_LIBS=-lssl -lcrypto
+ # TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
+
+ # Uncomment this if you are using GnuTLS
+@@ -317,7 +318,7 @@ ROUTER_REDIRECT=yes
# This one is very special-purpose, so is not included by default.
#------------------------------------------------------------------------------
-@@ -229,7 +230,7 @@
+@@ -338,7 +339,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
#------------------------------------------------------------------------------
-@@ -238,9 +239,9 @@
+@@ -347,9 +348,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
#------------------------------------------------------------------------------
-@@ -255,16 +256,16 @@
- LOOKUP_DBM=yes
+@@ -407,8 +408,8 @@ LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
+ LOOKUP_DNSDB=yes
-# LOOKUP_CDB=yes
--# LOOKUP_DNSDB=yes
-# LOOKUP_DSEARCH=yes
+LOOKUP_CDB=yes
-+LOOKUP_DNSDB=yes
+LOOKUP_DSEARCH=yes
# LOOKUP_IBASE=yes
+ # LOOKUP_JSON=yes
# LOOKUP_LDAP=yes
- # LOOKUP_MYSQL=yes
+@@ -417,7 +418,7 @@ LOOKUP_DNSDB=yes
# LOOKUP_NIS=yes
# LOOKUP_NISPLUS=yes
# LOOKUP_ORACLE=yes
-# LOOKUP_PASSWD=yes
+LOOKUP_PASSWD=yes
# LOOKUP_PGSQL=yes
- # LOOKUP_WHOSON=yes
+ # LOOKUP_REDIS=yes
+ # LOOKUP_SQLITE=yes
+@@ -500,7 +500,7 @@ SUPPORT_DANE=yes
+ # files are defaulted in the OS/Makefile-Default file, but can be overridden in
+ # local OS-specific make files.
-@@ -321,14 +322,14 @@
+-# EXIM_MONITOR=eximon.bin
++EXIM_MONITOR=eximon.bin
+
+
+ #------------------------------------------------------------------------------
+@@ -509,7 +510,7 @@ SUPPORT_DANE=yes
# 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.
+ # If you have content scanning you may wish to only include some of the scanner
+ # interfaces. Uncomment any of these lines to remove that code.
+@@ -587,7 +587,7 @@ DISABLE_MAL_MKS=yes
+
+ # Uncomment the following lines to add SRS (Sender Rewriting Scheme) support
+ # using only native facilities.
+-# SUPPORT_SRS=yes
++SUPPORT_SRS=yes
--# WITH_OLD_DEMIME=yes
-+WITH_OLD_DEMIME=yes
#------------------------------------------------------------------------------
- # Compiling Exim with experimental features. These are documented in
-@@ -464,10 +465,10 @@
+@@ -752,18 +753,18 @@ FIXED_NEVER_USERS=root
# 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_CRAM_MD5=yes
# AUTH_CYRUS_SASL=yes
+-# AUTH_DOVECOT=yes
++AUTH_DOVECOT=yes
+ # AUTH_EXTERNAL=yes
+ # AUTH_GSASL=yes
+ # AUTH_GSASL_PC=libgsasl
+ # AUTH_HEIMDAL_GSSAPI=yes
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
-# AUTH_PLAINTEXT=yes
-# AUTH_SPA=yes
+-# AUTH_TLS=yes
+AUTH_PLAINTEXT=yes
+AUTH_SPA=yes
++AUTH_TLS=yes
+ # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
+ # requires multiple pkg-config files to work with Exim, so the second example
+@@ -787,7 +788,7 @@ FIXED_NEVER_USERS=root
+ # one that is set in the headers_charset option. The default setting is
+ # defined by this setting:
- #------------------------------------------------------------------------------
-@@ -553,10 +554,10 @@
- # leave these settings commented out.
-
- # This setting is required for any TLS support (either OpenSSL or GnuTLS)
--# SUPPORT_TLS=yes
-+SUPPORT_TLS=yes
-
- # Uncomment this setting if you are using OpenSSL
--# TLS_LIBS=-lssl -lcrypto
-+TLS_LIBS=-lssl -lcrypto
+-HEADERS_CHARSET="ISO-8859-1"
++HEADERS_CHARSET="UTF-8"
- # Uncomment these settings if you are using GnuTLS
- # USE_GNUTLS=yes
-@@ -607,7 +608,7 @@
+ # If you are going to make use of $header_xxx expansions in your configuration
+ # file, or if your users are going to use them in filter files, and the normal
+@@ -883,7 +898,7 @@ HEADERS_CHARSET="ISO-8859-1"
# Once you have done this, "make install" will build the info files and
# install them in the directory you have defined.
#------------------------------------------------------------------------------
-@@ -620,7 +621,7 @@
+@@ -896,7 +911,7 @@ HEADERS_CHARSET="ISO-8859-1"
# %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
-@@ -669,7 +670,7 @@
+@@ -945,7 +960,7 @@ EXICYCLOG_MAX=10
# 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
-@@ -677,7 +678,7 @@
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
-
+@@ -960,7 +975,7 @@ COMPRESS_SUFFIX=gz
+ # ZCAT_COMMAND=zcat
+ #
+ # Or specify the full pathname:
-ZCAT_COMMAND=/usr/bin/zcat
+ZCAT_COMMAND=/bin/zcat
-
#------------------------------------------------------------------------------
-@@ -686,7 +687,7 @@
+ # Compiling in support for embedded Perl: If you want to be able to
+@@ -968,7 +983,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# (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.
#------------------------------------------------------------------------------
-@@ -696,11 +697,12 @@
+@@ -978,7 +993,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+ # 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
+
+
+ #------------------------------------------------------------------------------
+@@ -988,11 +1003,12 @@ ZCAT_COMMAND=/usr/bin/zcat
# support, which is intended for use in conjunction with the SMTP AUTH
# facilities, is included only when requested by the following setting:
+EXTRALIBS=-lpam -ldl
#------------------------------------------------------------------------------
- # Support for authentication via Radius is also available. The Exim support,
-@@ -740,7 +742,7 @@
- # /var/pwcheck) and chown it to exim's user and group. Once you have installed
+ # Proxying.
+@@ -1079,7 +1095,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+ # /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
#------------------------------------------------------------------------------
-@@ -757,7 +759,7 @@
+@@ -1096,7 +1112,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# group. Once you have installed saslauthd, you should arrange for it to be
# started by root at boot time.
#------------------------------------------------------------------------------
-@@ -817,7 +819,7 @@
+@@ -1163,7 +1179,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
# 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 EXTRA_LIBS when you set 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
-@@ -892,7 +894,7 @@
+@@ -1253,7 +1269,7 @@ EXIM_TMPDIR="/tmp"
# period (for example, /usr/exim/configure.host.in.some.domain). If this file
# does not exist, then the bare configuration file name is tried.
#------------------------------------------------------------------------------
-@@ -1065,7 +1067,7 @@
+@@ -1432,7 +1448,7 @@ EXIM_TMPDIR="/tmp"
# 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.
#------------------------------------------------------------------------------
+@@ -1478,7 +1494,7 @@ EXIM_TMPDIR="/tmp"
+ # feature should only be used in very exceptional circumstances. YOU HAVE BEEN
+ # WARNED.
+
+-# ENABLE_DISABLE_FSYNC=yes
++ENABLE_DISABLE_FSYNC=yes
+
+ #------------------------------------------------------------------------------
+ # For development, add this to include code to time various stages and report.
projects / packages / exim.git / blobdiff