- rel 6; another dkim fix

[packages/exim.git] / exim4-EDITME.patch

diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index ee5182d952c21e76360666ea75d33671e8e0b228..d5f67c98abda9e1393427101680fdde106e742f9 100644 (file)
--- a/exim4-EDITME.patch
+++ b/exim4-EDITME.patch
@@ -71,6 +71,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  # LOOKUP_IBASE=yes
  # LOOKUP_LDAP=yes
  # LOOKUP_MYSQL=yes
+ # LOOKUP_MYSQL_PC=mariadb
  # LOOKUP_NIS=yes
  # LOOKUP_NISPLUS=yes
  # LOOKUP_ORACLE=yes
@@ -78,24 +79,15 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
 +LOOKUP_PASSWD=yes
  # LOOKUP_PGSQL=yes
  # LOOKUP_SQLITE=yes
- # LOOKUP_WHOSON=yes
-@@ -330,14 +331,14 @@
+@@ -391,7 +391,7 @@ EXIM_MONITOR=eximon.bin
  # 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
+ # If you're using ClamAV and are backporting fixes to an old version, instead
 @@ -629,15 +630,15 @@ 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.
@@ -109,6 +101,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  # 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
@@ -116,7 +109,6 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
 +AUTH_SPA=yes
 +AUTH_TLS=yes
  
- 
 @@ -610,7 +611,7 @@
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting: