Attachment #201945 for bug #235678

Lines 3-9 Link Here

(-)Makefile (-2 / +2 lines)
3		3
4	PORTNAME= exim	4	PORTNAME= exim
5	PORTVERSION?= ${EXIM_VERSION}	5	PORTVERSION?= ${EXIM_VERSION}
6	PORTREVISION= 4	6	PORTREVISION= 0
7	CATEGORIES= mail ipv6	7	CATEGORIES= mail ipv6
8	MASTER_SITES= EXIM:exim	8	MASTER_SITES= EXIM:exim
9	MASTER_SITE_SUBDIR= /exim4/:exim \	9	MASTER_SITE_SUBDIR= /exim4/:exim \
Lines 98-104 Link Here
98	DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim	98	DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
99	.endif	99	.endif
100		100
101	EXIM_VERSION= 4.91	101	EXIM_VERSION= 4.92
102	SA_EXIM_VERSION=4.2	102	SA_EXIM_VERSION=4.2
103	EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"	103	EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"
104		104

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523893897	1	TIMESTAMP = 1549923921
2	SHA256 (exim/exim-4.91.tar.bz2) = eff5b41276a0039e89af4b447da13aaa61c5823d4ec2c37353dc23577cfb02d3	2	SHA256 (exim/exim-4.92.tar.bz2) = 541fcfb3d57d51647b552a0357cde26da34c843a33647373348a27002cbefa88
3	SIZE (exim/exim-4.91.tar.bz2) = 1912811	3	SIZE (exim/exim-4.92.tar.bz2) = 1924751
4	SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a	4	SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
5	SIZE (exim/sa-exim-4.2.tar.gz) = 66575	5	SIZE (exim/sa-exim-4.2.tar.gz) = 66575




From: Jeremy Harris <jgh146exb@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);

Return to bug 235678

Lines 1-40 Link Here

(-)files/patch-src-tls-openssl.c (-40 lines)
1	From: Jeremy Harris <jgh146exb@wizmail.org>
2	Date: Mon, 16 Apr 2018 17:45:04 +0000 (+0100)
3	Subject: Fix OpenSSL non-OCSP build
4	X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/37f0ce65959019e417ff79b9d0959e13470c5290
5
6	Fix OpenSSL non-OCSP build
7	---
8
9	diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
10	index fb59217..cefa94f 100644
11	--- src/tls-openssl.c.orig
12	+++ src/tls-openssl.c
13	@@ -2505,10 +2505,12 @@ if (error == SSL_ERROR_ZERO_RETURN)
14	if (SSL_get_shutdown(server_ssl) == SSL_RECEIVED_SHUTDOWN)
15	SSL_shutdown(server_ssl);
16
17	+#ifndef DISABLE_OCSP
18	sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
19	+ server_static_cbinfo->verify_stack = NULL;
20	+#endif
21	SSL_free(server_ssl);
22	SSL_CTX_free(server_ctx);
23	- server_static_cbinfo->verify_stack = NULL;
24	server_ctx = NULL;
25	server_ssl = NULL;
26	tls_in.active = -1;
27	@@ -2782,11 +2784,13 @@ if (shutdown)
28	}
29	}
30
31	+#ifndef DISABLE_OCSP
32	if (is_server)
33	{
34	sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
35	server_static_cbinfo->verify_stack = NULL;
36	}
37	+#endif
38
39	SSL_CTX_free(*ctxp);
40	SSL_free(*sslp);