X-Git-Url: http://git.hcoop.net/hcoop/debian/exim4.git/blobdiff_plain/d1e9e98adb057fac01d3b4db6c75347e05e88263..01e60269815612fced0df2994079cb2081f8ff0b:/debian/EDITME.exim4-heavy.diff

diff --git a/debian/EDITME.exim4-heavy.diff b/debian/EDITME.exim4-heavy.diff
index 136ca61..b2c7b4e 100644
--- a/debian/EDITME.exim4-heavy.diff
+++ b/debian/EDITME.exim4-heavy.diff
@@ -1,6 +1,6 @@
---- EDITME.exim4-light	2017-03-04 11:15:58.309895066 +0100
-+++ EDITME.exim4-heavy	2017-03-04 11:17:12.616522005 +0100
-@@ -212,7 +212,7 @@
+--- 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.
  
@@ -9,7 +9,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -244,7 +244,7 @@
+@@ -249,7 +249,7 @@
  
  SUPPORT_MAILDIR=yes
  SUPPORT_MAILSTORE=yes
@@ -18,7 +18,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -305,15 +305,15 @@
+@@ -310,16 +310,16 @@
  LOOKUP_CDB=yes
  LOOKUP_DSEARCH=yes
  # LOOKUP_IBASE=yes
@@ -26,6 +26,7 @@
 -# LOOKUP_MYSQL=yes
 +LOOKUP_LDAP=yes
 +LOOKUP_MYSQL=yes
+ # LOOKUP_MYSQL_PC=mariadb
  LOOKUP_NIS=yes
  # LOOKUP_NISPLUS=yes
  # LOOKUP_ORACLE=yes
@@ -38,7 +39,7 @@
  # LOOKUP_SQLITE_PC=sqlite3
  # LOOKUP_WHOSON=yes
  
-@@ -334,7 +334,7 @@
+@@ -340,7 +340,7 @@
  # with Solaris 7 onwards. Uncomment whichever of these you are using.
  
  # LDAP_LIB_TYPE=OPENLDAP1
@@ -47,7 +48,7 @@
  # LDAP_LIB_TYPE=NETSCAPE
  # LDAP_LIB_TYPE=SOLARIS
  
-@@ -373,6 +373,9 @@
+@@ -385,6 +385,9 @@
  # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
  
  
@@ -57,7 +58,7 @@
  #------------------------------------------------------------------------------
  # 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
-@@ -381,7 +384,7 @@
+@@ -393,7 +396,7 @@
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -66,16 +67,16 @@
  
  
  #------------------------------------------------------------------------------
-@@ -391,7 +394,7 @@
+@@ -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're using ClamAV and are backporting fixes to an old version, instead
-@@ -627,16 +630,16 @@
+ # 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
@@ -96,7 +97,7 @@
  
  # 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
-@@ -649,7 +652,7 @@
+@@ -667,7 +670,7 @@
  # Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC.
  # Ditto for AUTH_HEIMDAL_GSSAPI(_PC).
  
@@ -105,7 +106,7 @@
  # AUTH_LIBS=-lgsasl
  # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt
  
-@@ -923,7 +926,7 @@
+@@ -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.
  
@@ -114,7 +115,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -933,7 +936,7 @@
+@@ -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.
  
@@ -123,7 +124,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -943,11 +946,11 @@
+@@ -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:
  
@@ -137,7 +138,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -961,7 +964,7 @@
+@@ -983,7 +986,7 @@
  # If you may want to use inbound (server-side) proxying, using Proxy Protocol,
  # uncomment the line below.
  
@@ -146,7 +147,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -1299,7 +1302,7 @@
+@@ -1338,7 +1341,7 @@
  # local part) can be increased by changing this value. It should be set to
  # a multiple of 16.