- updated to 4.92

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

diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index 729c9b6862a0ade1879a43882a67472f2dd2888d..d5f67c98abda9e1393427101680fdde106e742f9 100644 (file)
--- a/exim4-EDITME.patch
+++ b/exim4-EDITME.patch
@@ -60,7 +60,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -263,15 +263,15 @@
+@@ -263,15 +264,15 @@
  LOOKUP_LSEARCH=yes
  LOOKUP_DNSDB=yes
  
@@ -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,25 +79,16 @@ 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
-@@ -579,15 +579,15 @@
+ # 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,14 +101,24 @@ 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
 +AUTH_PLAINTEXT=yes
 +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:
  
- #------------------------------------------------------------------------------
-@@ -690,11 +690,11 @@
+-HEADERS_CHARSET="ISO-8859-1"
++HEADERS_CHARSET="UTF-8"
+ 
+ # 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
+@@ -690,11 +691,11 @@
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -159,14 +161,14 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  
  
 @@ -700,7 +701,7 @@
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
- 
+ # ZCAT_COMMAND=zcat
+ #
+ # Or specify the full pathname:
 -ZCAT_COMMAND=/usr/bin/zcat
 +ZCAT_COMMAND=/bin/zcat
  
- 
  #------------------------------------------------------------------------------
+ # Compiling in support for embedded Perl: If you want to be able to
 @@ -709,7 +710,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.
@@ -244,7 +246,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -1164,6 +1164,6 @@
+@@ -1164,6 +1166,6 @@
  # feature should only be used in very exceptional circumstances. YOU HAVE BEEN
  # WARNED.