diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2017-02-04 07:55:29 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2017-02-04 07:55:29 +0000 |
| commit | 3b482a5cd9f69abd47605fb4666a22f07e57098c (patch) | |
| tree | aeddf01589e75d4709c193918df42a587b0c9f01 | |
| parent | devel/py-libusb1: update to 1.6.4 (diff) | |
- update to 20170129
- fix build with libressl < 2.5.x
Release Notes:
ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20170129.RELEASE_NOTES
PR: 216732
Submitted by: Bernard Spil
Reported by: Piotr Kubaj
Obtained from: OpenBSD
| -rw-r--r-- | mail/postfix-current/Makefile | 2 | ||||
| -rw-r--r-- | mail/postfix-current/distinfo | 6 | ||||
| -rw-r--r-- | mail/postfix-current/files/patch-src_tls_tls__dh.c | 48 |
3 files changed, 52 insertions, 4 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index ae7bcce89f27..8d5b760f8523 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.2-20161224 +DISTVERSION= 3.2-20170129 PORTREVISION?= 0 PORTEPOCH= 4 CATEGORIES= mail ipv6 diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 6b42b45c61e9..73e99eebef8d 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482623407 -SHA256 (postfix/postfix-3.2-20161224.tar.gz) = d49a19a1cfd2e8d7a2d5a2f09de90c69b0d2219762b753aa13119c463751002e -SIZE (postfix/postfix-3.2-20161224.tar.gz) = 4377777 +TIMESTAMP = 1485724016 +SHA256 (postfix/postfix-3.2-20170129.tar.gz) = 72e997e8e5b0d9fc8380a990ac2032603b8f4919d07b125f4fb8d28b1ec0b838 +SIZE (postfix/postfix-3.2-20170129.tar.gz) = 4401582 diff --git a/mail/postfix-current/files/patch-src_tls_tls__dh.c b/mail/postfix-current/files/patch-src_tls_tls__dh.c new file mode 100644 index 000000000000..2575ead80c6b --- /dev/null +++ b/mail/postfix-current/files/patch-src_tls_tls__dh.c @@ -0,0 +1,48 @@ +PR 216732: Fix build with libressl < 2.5.1 +========================================================= +--- src/tls/tls_dh.c.orig 2016-12-26 23:47:24 UTC ++++ src/tls/tls_dh.c +@@ -94,7 +94,7 @@ + #define TLS_INTERNAL + #include <tls.h> + #include <openssl/dh.h> +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) + #include <openssl/ec.h> + #endif + +@@ -244,7 +244,7 @@ DH *tls_tmp_dh_cb(SSL *unused_ssl, i + + void tls_auto_eecdh_curves(SSL_CTX *ctx) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX *tmpctx; + int *nids; + int space = 5; +@@ -337,14 +337,14 @@ void tls_set_eecdh_curve(SSL_CTX *ser + #define TLS_EECDH_NONE 1 + #define TLS_EECDH_STRONG 2 + #define TLS_EECDH_ULTRA 3 +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(LIBRESSL_VERSION_NUMBER) + #define TLS_EECDH_AUTO 4 + #endif + static NAME_CODE eecdh_table[] = { + "none", TLS_EECDH_NONE, + "strong", TLS_EECDH_STRONG, + "ultra", TLS_EECDH_ULTRA, +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(LIBRESSL_VERSION_NUMBER) + "auto", TLS_EECDH_AUTO, + #endif + 0, TLS_EECDH_INVALID, +@@ -364,7 +364,7 @@ void tls_set_eecdh_curve(SSL_CTX *ser + case TLS_EECDH_ULTRA: + curve = var_tls_eecdh_ultra; + break; +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(LIBRESSL_VERSION_NUMBER) + case TLS_EECDH_AUTO: + tls_auto_eecdh_curves(server_ctx); + return; |