1 files changed, 83 insertions, 0 deletions
diff --git a/mail/exim/files/patch-z0039-Fix-non-TLS-build b/mail/exim/files/patch-z0039-Fix-non-TLS-build
new file mode 100644
index 000000000000..ef9ef5c34095
--- /dev/null
+++ b/mail/exim/files/patch-z0039-Fix-non-TLS-build
@@ -0,0 +1,83 @@
+From 7a534c812646a7a6f680827352d6209c6ff7be96 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Thu, 27 Aug 2020 21:15:19 +0100
+Subject: [PATCH 39/42] Fix non-TLS build
+
+(cherry picked from commit b38a477da0a5248ed1d2b7590922c89c6337ec3b)
+---
+ src/transports/smtp.c | 18 +++++++++---------
+
+diff --git src/transports/smtp.c src/transports/smtp.c
+index 77335af09..b0dedfa8c 100644
+--- src/transports/smtp.c
++++ src/transports/smtp.c
+@@ -1989,7 +1989,7 @@ if (sx->smtps)
+ 	    DEFER, FALSE, &sx->delivery_start);
+   return ERROR;
+   }
+-#endif
++#else
+ 
+ /* If we have a proxied TLS connection, check usability for this message */
+ 
+@@ -1998,7 +1998,7 @@ if (continue_hostname && continue_proxy_cipher)
+   int rc;
+   const uschar * sni = US"";
+ 
+-#ifdef SUPPORT_DANE
++# ifdef SUPPORT_DANE
+   /* Check if the message will be DANE-verified; if so force its SNI */
+ 
+   tls_out.dane_verified = FALSE;
+@@ -2018,14 +2018,14 @@ if (continue_hostname && continue_proxy_cipher)
+ 			      string_sprintf("DANE error: tlsa lookup %s",
+ 				rc_to_string(rc)),
+ 			      rc, FALSE, &sx->delivery_start);
+-# ifndef DISABLE_EVENT
++#  ifndef DISABLE_EVENT
+ 			    (void) event_raise(sx->conn_args.tblock->event_action,
+ 			      US"dane:fail", sx->dane_required
+ 				?  US"dane-required" : US"dnssec-invalid");
+-# endif
++#  endif
+ 			    return rc;
+       }
+-#endif
++# endif
+ 
+   /* If the SNI or the DANE status required for the new message differs from the
+   existing conn drop the connection to force a new one. */
+@@ -2035,7 +2035,7 @@ if (continue_hostname && continue_proxy_cipher)
+       "<%s>: failed to expand transport's tls_sni value: %s",
+       sx->addrlist->address, expand_string_message);
+ 
+-#ifdef SUPPORT_DANE
++# ifdef SUPPORT_DANE
+   if (  (continue_proxy_sni ? (Ustrcmp(continue_proxy_sni, sni) == 0) : !*sni)
+      && continue_proxy_dane == sx->conn_args.dane)
+     {
+@@ -2043,10 +2043,10 @@ if (continue_hostname && continue_proxy_cipher)
+     if ((tls_out.dane_verified = continue_proxy_dane))
+       sx->conn_args.host->dnssec = DS_YES;
+     }
+-#else
++# else
+   if ((continue_proxy_sni ? (Ustrcmp(continue_proxy_sni, sni) == 0) : !*sni))
+     tls_out.sni = US sni;
+-#endif
++# endif
+   else
+     {
+     DEBUG(D_transport)
+@@ -2062,7 +2062,7 @@ if (continue_hostname && continue_proxy_cipher)
+ 				back through reporting pipe. */
+     }
+   }
+-
++#endif	/*!DISABLE_TLS*/
+ 
+ /* Make a connection to the host if this isn't a continued delivery, and handle
+ the initial interaction and HELO/EHLO/LHLO. Connect timeout errors are handled
+-- 
+2.29.2
+