- rebuild with perl 5.24.0

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

diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index e2ffec7a937bb2f64c7954e83de8bde2e97bb72d..ee5182d952c21e76360666ea75d33671e8e0b228 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
  
@@ -96,7 +96,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  
  #------------------------------------------------------------------------------
  # Compiling Exim with experimental features. These are documented in
-@@ -473,11 +474,11 @@
+@@ -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.
  
@@ -104,27 +104,43 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
 +AUTH_CRAM_MD5=yes
  # AUTH_CYRUS_SASL=yes
 -# AUTH_DOVECOT=yes
++AUTH_DOVECOT=yes
+ # AUTH_GSASL=yes
+ # AUTH_GSASL_PC=libgsasl
+ # AUTH_HEIMDAL_GSSAPI=yes
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
 -# AUTH_PLAINTEXT=yes
 -# AUTH_SPA=yes
-+AUTH_DOVECOT=yes
+-# AUTH_TLS=yes
 +AUTH_PLAINTEXT=yes
 +AUTH_SPA=yes
++AUTH_TLS=yes
  
  
- #------------------------------------------------------------------------------
-@@ -576,10 +577,10 @@
+@@ -610,7 +611,7 @@
+ # one that is set in the headers_charset option. The default setting is
+ # defined by this setting:
+ 
+-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)
 -# SUPPORT_TLS=yes
 +SUPPORT_TLS=yes
  
- # Uncomment this setting if you are using OpenSSL
+ # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+-# USE_OPENSSL_PC=openssl
 -# TLS_LIBS=-lssl -lcrypto
++USE_OPENSSL_PC=openssl
 +TLS_LIBS=-lssl -lcrypto
  
- # Uncomment these settings if you are using GnuTLS
- # USE_GNUTLS=yes
+ # 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.
 @@ -630,7 +631,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
@@ -153,14 +169,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.
@@ -238,7 +254,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.