diff options
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim/distinfo | 6 | ||||
| -rw-r--r-- | mail/exim/files/patch-src-tls-openssl.c | 40 |
3 files changed, 5 insertions, 45 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 30247425db6a..b98ab7305c48 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ @@ -98,7 +98,7 @@ MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -EXIM_VERSION= 4.91 +EXIM_VERSION= 4.92 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" diff --git a/mail/exim/distinfo b/mail/exim/distinfo index c26c1e070e15..2953792212c8 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1523893897 -SHA256 (exim/exim-4.91.tar.bz2) = eff5b41276a0039e89af4b447da13aaa61c5823d4ec2c37353dc23577cfb02d3 -SIZE (exim/exim-4.91.tar.bz2) = 1912811 +TIMESTAMP = 1549968111 +SHA256 (exim/exim-4.92.tar.bz2) = 541fcfb3d57d51647b552a0357cde26da34c843a33647373348a27002cbefa88 +SIZE (exim/exim-4.92.tar.bz2) = 1924751 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 diff --git a/mail/exim/files/patch-src-tls-openssl.c b/mail/exim/files/patch-src-tls-openssl.c deleted file mode 100644 index 01e6800d7c3d..000000000000 --- a/mail/exim/files/patch-src-tls-openssl.c +++ /dev/null @@ -1,40 +0,0 @@ -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); |