svn commit: r467585 - in head/mail/exim: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Tue Apr 17 09:32:06 2018
New Revision: 467585
URL: https://svnweb.freebsd.org/changeset/ports/467585

Log:
  Various fixes for the Exim port
  
  - Fix build with no OSCP support (ported from upstream) [1]
  - Fix Dane support [2]
  - Silence compile warnings caused by Exim code style
  
  Reported by:	ler [1], Max Kostikov [2] via private email

Added:
  head/mail/exim/files/patch-src-tls-openssl.c   (contents, props changed)
Modified:
  head/mail/exim/Makefile

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Tue Apr 17 09:08:33 2018	(r467584)
+++ head/mail/exim/Makefile	Tue Apr 17 09:32:06 2018	(r467585)
@@ -3,7 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	EXIM:exim
 MASTER_SITE_SUBDIR=	/exim4/:exim \
@@ -151,6 +151,9 @@ CONFIG_FILE_PATH?=	${PREFIX}/etc/exim/configure
 ALT_CONFIG_PREFIX?=	${PREFIX}/etc/exim/
 
 EXIM_DYNAMIC_LDFLAGS=	-fPIC -rdynamic -export-dynamic
+# Avoid too many warnings due to Exim code style
+EXIM_WARN_FLAGS?=	-Wno-logical-op-parentheses -Wno-macro-redefined -Wno-parentheses -Wno-dangling-else
+CFLAGS+=	${EXIM_WARN_FLAGS}
 
 SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
@@ -214,7 +217,7 @@ SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DSN=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MDANE}
-SEDLIST+=	-e 's,^\# (EXPERIMENTAL_DANE=),\1,'
+SEDLIST+=	-e 's,^\# (SUPPORT_DANE=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MARC}

Added: head/mail/exim/files/patch-src-tls-openssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/exim/files/patch-src-tls-openssl.c	Tue Apr 17 09:32:06 2018	(r467585)
@@ -0,0 +1,40 @@
+From: Jeremy Harris <jgh146exb at wizmail.org>
+Date: Mon, 16 Apr 2018 17:45:04 +0000 (+0100)
+Subject: Fix OpenSSL non-OCSP build
+X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/37f0ce65959019e417ff79b9d0959e13470c5290
+
+Fix OpenSSL non-OCSP build
+---
+
+diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
+index fb59217..cefa94f 100644
+--- src/tls-openssl.c.orig
++++ src/tls-openssl.c
+@@ -2505,10 +2505,12 @@ if (error == SSL_ERROR_ZERO_RETURN)
+   if (SSL_get_shutdown(server_ssl) == SSL_RECEIVED_SHUTDOWN)
+  	SSL_shutdown(server_ssl);
+ 
++#ifndef DISABLE_OCSP
+   sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
++  server_static_cbinfo->verify_stack = NULL;
++#endif
+   SSL_free(server_ssl);
+   SSL_CTX_free(server_ctx);
+-  server_static_cbinfo->verify_stack = NULL;
+   server_ctx = NULL;
+   server_ssl = NULL;
+   tls_in.active = -1;
+@@ -2782,11 +2784,13 @@ if (shutdown)
+     }
+   }
+ 
++#ifndef DISABLE_OCSP
+ if (is_server)
+   {
+   sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
+   server_static_cbinfo->verify_stack = NULL;
+   }
++#endif
+ 
+ SSL_CTX_free(*ctxp);
+ SSL_free(*sslp);