svn commit: r433285 - in head/mail/postfix-current: . files

[Olli Hauer]

Author: ohauer
Date: Sat Feb  4 07:55:29 2017
New Revision: 433285
URL: https://svnweb.freebsd.org/changeset/ports/433285

Log:
  - 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

Added:
  head/mail/postfix-current/files/patch-src_tls_tls__dh.c   (contents, props changed)
Modified:
  head/mail/postfix-current/Makefile
  head/mail/postfix-current/distinfo

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Sat Feb  4 07:41:56 2017	(r433284)
+++ head/mail/postfix-current/Makefile	Sat Feb  4 07:55:29 2017	(r433285)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	3.2-20161224
+DISTVERSION=	3.2-20170129
 PORTREVISION?=	0
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6

Modified: head/mail/postfix-current/distinfo
==============================================================================
--- head/mail/postfix-current/distinfo	Sat Feb  4 07:41:56 2017	(r433284)
+++ head/mail/postfix-current/distinfo	Sat Feb  4 07:55:29 2017	(r433285)
@@ -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

Added: head/mail/postfix-current/files/patch-src_tls_tls__dh.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/postfix-current/files/patch-src_tls_tls__dh.c	Sat Feb  4 07:55:29 2017	(r433285)
@@ -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;