diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
--- exim-4.64.org/src/EDITME 2006-12-20 10:46:04.000000000 +0100
-+++ exim-4.64/src/EDITME 2006-12-21 16:38:55.955956000 +0100
++++ exim-4.64/src/EDITME 2006-12-21 16:57:08.676246750 +0100
@@ -100,7 +100,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
#------------------------------------------------------------------------------
-@@ -261,16 +262,16 @@
- LOOKUP_DBM=yes
+@@ -263,15 +264,15 @@
LOOKUP_LSEARCH=yes
+ LOOKUP_DNSDB=yes
-# LOOKUP_CDB=yes
--# LOOKUP_DNSDB=yes
-# LOOKUP_DSEARCH=yes
+LOOKUP_CDB=yes
-+LOOKUP_DNSDB=yes
+LOOKUP_DSEARCH=yes
# LOOKUP_IBASE=yes
# LOOKUP_LDAP=yes
#------------------------------------------------------------------------------
# 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.
-# AUTH_CRAM_MD5=yes
+AUTH_CRAM_MD5=yes
# AUTH_CYRUS_SASL=yes
- # AUTH_DOVECOT=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_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.
@@ -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.
#------------------------------------------------------------------------------
+@@ -1164,6 +1166,6 @@
+ # feature should only be used in very exceptional circumstances. YOU HAVE BEEN
+ # WARNED.
+
+-# ENABLE_DISABLE_FSYNC=yes
++ENABLE_DISABLE_FSYNC=yes
+
+ # End of EDITME for Exim 4.