mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

- Update Exim to 4.92

Browse Source 
PR:		235678 [1]
Submitted by:	pi [1], ler (via private email)
This commit is contained in:
Vsevolod Stakhov 2019-02-12 10:46:10 +00:00
parent deeb46784c
commit eeb619fe01
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=492772
5 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/exim-doc-html/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= exim
PORTVERSION= 4.91
PORTVERSION= 4.92
CATEGORIES= mail
MASTER_SITES= EXIM
MASTER_SITE_SUBDIR= /exim4/ \

14
mail/exim-doc-html/distinfo
View File

@ -1,7 +1,7 @@
TIMESTAMP = 1523895250
SHA256 (exim/exim-html-4.91.tar.bz2) = f8cc27a8b9ff3f76769cf530179386db97fcb129a3496b569956abcf54a076ba
SIZE (exim/exim-html-4.91.tar.bz2) = 493670
SHA256 (exim/exim-pdf-4.91.tar.bz2) = 95767840a332a68777445ad936774b7f1e7afda182179c554760fa4dfc3aab61
SIZE (exim/exim-pdf-4.91.tar.bz2) = 2005787
SHA256 (exim/exim-postscript-4.91.tar.bz2) = fe20825a2fc53035585cf034e8cd66197173118f13d1d99d46a920e646ae21e9
SIZE (exim/exim-postscript-4.91.tar.bz2) = 1076728
TIMESTAMP = 1549968229
SHA256 (exim/exim-html-4.92.tar.bz2) = d5a5fd1e240533a4a04f4414e4300ce2911bbdbec1061d1f62f7dac341e5ecf5
SIZE (exim/exim-html-4.92.tar.bz2) = 492128
SHA256 (exim/exim-pdf-4.92.tar.bz2) = 22613f998a826be4638aad3191e9e06ed559204124b1e8581ce36d273e3ee765
SIZE (exim/exim-pdf-4.92.tar.bz2) = 2066614
SHA256 (exim/exim-postscript-4.92.tar.bz2) = e70cb6030ddc949a116fe50fdc773383a08fdf88e0e303ff854b79178b6b3c89
SIZE (exim/exim-postscript-4.92.tar.bz2) = 1097997

4
mail/exim/Makefile
View File

@ -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"

6
mail/exim/distinfo
View File

@ -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

40
mail/exim/files/patch-src-tls-openssl.c
View File

@ -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);