---- EDITME.exim4-light 2012-05-18 20:11:24.000000000 +0200
-+++ EDITME.exim4-heavy 2012-05-18 20:13:56.000000000 +0200
-@@ -212,7 +212,7 @@ ROUTER_REDIRECT=yes
+--- EDITME.exim4-light 2019-04-16 15:54:51.009790678 +0000
++++ EDITME.exim4-heavy 2019-04-16 15:54:44.177917231 +0000
+@@ -217,7 +217,7 @@
# This one is very special-purpose, so is not included by default.
#------------------------------------------------------------------------------
-@@ -244,7 +244,7 @@ TRANSPORT_LMTP=yes
+@@ -249,7 +249,7 @@
SUPPORT_MAILDIR=yes
SUPPORT_MAILSTORE=yes
#------------------------------------------------------------------------------
-@@ -300,14 +300,14 @@ LOOKUP_DNSDB=yes
+@@ -310,16 +310,16 @@
LOOKUP_CDB=yes
LOOKUP_DSEARCH=yes
# LOOKUP_IBASE=yes
-# LOOKUP_MYSQL=yes
+LOOKUP_LDAP=yes
+LOOKUP_MYSQL=yes
+ # LOOKUP_MYSQL_PC=mariadb
LOOKUP_NIS=yes
# LOOKUP_NISPLUS=yes
# LOOKUP_ORACLE=yes
LOOKUP_PASSWD=yes
-# LOOKUP_PGSQL=yes
--# LOOKUP_SQLITE=yes
+LOOKUP_PGSQL=yes
+ # LOOKUP_REDIS=yes
+-# LOOKUP_SQLITE=yes
+LOOKUP_SQLITE=yes
# LOOKUP_SQLITE_PC=sqlite3
# LOOKUP_WHOSON=yes
-@@ -328,7 +328,7 @@ LOOKUP_PASSWD=yes
+@@ -340,7 +340,7 @@
# with Solaris 7 onwards. Uncomment whichever of these you are using.
# LDAP_LIB_TYPE=OPENLDAP1
# LDAP_LIB_TYPE=NETSCAPE
# LDAP_LIB_TYPE=SOLARIS
-@@ -366,6 +366,9 @@ LOOKUP_PASSWD=yes
+@@ -385,6 +385,9 @@
# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
#------------------------------------------------------------------------------
# Compiling the Exim monitor: If you want to compile the Exim monitor, a
# program that requires an X11 display, then EXIM_MONITOR should be set to the
-@@ -374,7 +377,7 @@ LOOKUP_PASSWD=yes
+@@ -393,7 +396,7 @@
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
# local OS-specific make files.
#------------------------------------------------------------------------------
-@@ -384,14 +387,14 @@ EXIM_MONITOR=eximon.bin
+@@ -403,7 +406,7 @@
# 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
-
- # If you're using ClamAV and are backporting fixes to an old version, instead
- # of staying current (which is the more usual approach) then you may need to
-@@ -578,14 +581,14 @@ WHITELIST_D_MACROS=OUTGOING
+ # 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.
+@@ -645,16 +648,16 @@
# configuration to make use of the mechanism(s) selected.
AUTH_CRAM_MD5=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_SPA=yes
++AUTH_TLS=yes
-
- #------------------------------------------------------------------------------
-@@ -595,7 +598,7 @@ AUTH_PLAINTEXT=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
+@@ -667,7 +670,7 @@
# Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC.
# Ditto for AUTH_HEIMDAL_GSSAPI(_PC).
# AUTH_LIBS=-lgsasl
# AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt
-@@ -830,7 +833,7 @@ ZCAT_COMMAND=/bin/zcat
+@@ -945,7 +948,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.
#------------------------------------------------------------------------------
-@@ -840,7 +843,7 @@ ZCAT_COMMAND=/bin/zcat
+@@ -955,7 +958,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.
#------------------------------------------------------------------------------
-@@ -850,11 +853,11 @@ ZCAT_COMMAND=/bin/zcat
+@@ -965,11 +968,11 @@
# support, which is intended for use in conjunction with the SMTP AUTH
# facilities, is included only when requested by the following setting:
#------------------------------------------------------------------------------
-@@ -1174,7 +1177,7 @@ TMPDIR="/tmp"
+@@ -983,7 +986,7 @@
+ # If you may want to use inbound (server-side) proxying, using Proxy Protocol,
+ # uncomment the line below.
+
+-# SUPPORT_PROXY=yes
++SUPPORT_PROXY=yes
+
+
+ #------------------------------------------------------------------------------
+@@ -1338,7 +1341,7 @@
# local part) can be increased by changing this value. It should be set to
# a multiple of 16.
HCoop / hcoop / debian / exim4.git / blobdiff