Merge branch 'debian'

[hcoop/debian/exim4.git] / debian / EDITME.openssl.exim4-light.diff

diff --git a/debian/EDITME.openssl.exim4-light.diff b/debian/EDITME.openssl.exim4-light.diff
index a00d7b6..0dc9836 100644 (file)
--- a/debian/EDITME.openssl.exim4-light.diff
+++ b/debian/EDITME.openssl.exim4-light.diff
@@ -1,6 +1,6 @@
---- EDITME.exim4-light 2012-05-29 19:16:05.000000000 +0200
-+++ EDITME.exim4-light 2012-05-29 19:17:05.000000000 +0200
-@@ -697,13 +697,13 @@ SUPPORT_TLS=yes
+--- EDITME.exim4-light 2017-10-28 08:02:20.930695089 +0200
++++ EDITME.exim4-light 2017-10-28 08:03:25.433584564 +0200
+@@ -760,13 +760,13 @@ SUPPORT_TLS=yes
  
  # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
  # USE_OPENSSL_PC=openssl
@@ -15,5 +15,5 @@
 -TLS_LIBS=-lgnutls
 +# TLS_LIBS=-lgnutls
  
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
+ # If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
+ # build process will require libgcrypt-config to exist in your $PATH.  A