---- src/EDITME 2017-02-12 14:19:37.000000000 +0000
-+++ EDITME.exim4-light 2017-02-12 14:22:15.062382937 +0000
+--- src/EDITME 2019-04-16 15:52:53.000000000 +0000
++++ EDITME.exim4-light 2019-04-16 15:54:51.009790678 +0000
@@ -98,7 +98,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
-@@ -232,7 +233,7 @@
+@@ -237,7 +238,7 @@
# This one is special-purpose, and commonly not required, so it is not
# included by default.
#------------------------------------------------------------------------------
-@@ -241,8 +242,8 @@
+@@ -246,8 +247,8 @@
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
# SUPPORT_MBX=yes
-@@ -301,15 +302,15 @@
+@@ -306,16 +307,16 @@
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
# LOOKUP_IBASE=yes
# LOOKUP_LDAP=yes
# LOOKUP_MYSQL=yes
+ # LOOKUP_MYSQL_PC=mariadb
-# LOOKUP_NIS=yes
+LOOKUP_NIS=yes
# LOOKUP_NISPLUS=yes
# LOOKUP_PGSQL=yes
# LOOKUP_REDIS=yes
# LOOKUP_SQLITE=yes
-@@ -577,7 +578,7 @@
+@@ -367,7 +368,7 @@
+ # Uncomment the following line to add DANE support
+ # Note: Enabling this unconditionally overrides DISABLE_DNSSEC
+ # For DANE under GnuTLS we need an additional library. See TLS_LIBS below.
+-# SUPPORT_DANE=yes
++SUPPORT_DANE=yes
+
+ #------------------------------------------------------------------------------
+ # Additional libraries and include directories may be required for some
+@@ -595,7 +596,7 @@
# CONFIGURE_OWNER setting, to specify a configuration file which is listed in
# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
#------------------------------------------------------------------------------
-@@ -613,6 +614,9 @@
+@@ -631,6 +632,9 @@
# WHITELIST_D_MACROS=TLS:SPOOL
#------------------------------------------------------------------------------
# Exim has support for the AUTH (authentication) extension of the SMTP
# protocol, as defined by RFC 2554. If you don't know what SMTP authentication
-@@ -622,7 +626,7 @@
+@@ -640,7 +644,7 @@
# 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_CYRUS_SASL=yes
# AUTH_DOVECOT=yes
# AUTH_GSASL=yes
-@@ -630,7 +634,7 @@
+@@ -648,7 +652,7 @@
# AUTH_HEIMDAL_GSSAPI=yes
# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
# AUTH_SPA=yes
# AUTH_TLS=yes
-@@ -656,7 +660,7 @@
+@@ -674,7 +678,7 @@
# one that is set in the headers_charset option. The default setting is
# defined by this setting:
# 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
-@@ -745,7 +749,7 @@
+@@ -763,7 +767,7 @@
# leave these settings commented out.
# This setting is required for any TLS support (either OpenSSL or GnuTLS)
# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
# USE_OPENSSL_PC=openssl
-@@ -753,9 +757,9 @@
+@@ -771,9 +775,9 @@
# Uncomment the first and either the second or the third of these if you
# are using GnuTLS. If you have pkg-config, then the second, else the third.
# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
# build process will require libgcrypt-config to exist in your $PATH. A
-@@ -847,6 +851,7 @@
+@@ -809,7 +813,7 @@
+ # TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
+
+ # For DANE under GnuTLS we need an additional library.
+-# TLS_LIBS += -lgnutls-dane
++TLS_LIBS += -lgnutls-dane
+
+ # TLS_LIBS is included only on the command for linking Exim itself, not on any
+ # auxiliary programs. If the include files are not in a standard place, you can
+@@ -830,6 +834,7 @@
+ # description of the API to this function, see the Exim specification.
+
+ DLOPEN_LOCAL_SCAN=yes
++HAVE_LOCAL_SCAN=yes
+
+ # If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
+ # linker flags. Without it, the loaded .so won't be able to access any
+@@ -868,6 +873,7 @@
# to form the final file names. Some installations may want something like this:
# LOG_FILE_PATH=/var/log/exim_%slog
# 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
-@@ -895,7 +900,7 @@
+@@ -916,7 +922,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
-@@ -910,7 +915,7 @@
+@@ -931,7 +937,7 @@
# ZCAT_COMMAND=zcat
#
# Or specify the full pathname:
#------------------------------------------------------------------------------
# Compiling in support for embedded Perl: If you want to be able to
-@@ -942,6 +947,7 @@
+@@ -963,6 +969,7 @@
# You probably need to add -lpam to EXTRALIBS, and in some releases of
# GNU/Linux -ldl is also needed.
#------------------------------------------------------------------------------
-@@ -950,7 +956,7 @@
+@@ -971,7 +978,7 @@
# If you may want to use outbound (client-side) proxying, using Socks5,
# uncomment the line below.
# If you may want to use inbound (server-side) proxying, using Proxy Protocol,
# uncomment the line below.
-@@ -1038,6 +1044,8 @@
+@@ -1069,6 +1076,8 @@
# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
#------------------------------------------------------------------------------
# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-@@ -1343,6 +1351,7 @@
+@@ -1381,6 +1390,7 @@
# file can be specified here. Some installations may want something like this:
# PID_FILE_PATH=/var/lock/exim.pid
# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
# using the name "exim-daemon.pid".
-@@ -1376,6 +1385,7 @@
+@@ -1414,6 +1424,7 @@
# messages become "invisible" to the normal management tools.
# SUPPORT_MOVE_FROZEN_MESSAGES=yes
#------------------------------------------------------------------------------
-@@ -1414,3 +1424,6 @@
+@@ -1452,3 +1463,6 @@
# ENABLE_DISABLE_FSYNC=yes
# End of EDITME for Exim 4.
HCoop / hcoop / debian / exim4.git / blobdiff