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

[Olli Hauer]

Author: ohauer
Date: Sun Mar 31 16:09:51 2019
New Revision: 497426
URL: https://svnweb.freebsd.org/changeset/ports/497426

Log:
  - update to 3.4-20190106

Deleted:
  head/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c
  head/mail/postfix-current/files/patch-src_tls_tls.h
  head/mail/postfix-current/files/patch-src_tls_tls__client.c
  head/mail/postfix-current/files/patch-src_tls_tls__dane.c
  head/mail/postfix-current/files/patch-src_tls_tls__dh.c
  head/mail/postfix-current/files/patch-src_tls_tls__rsa.c
Modified:
  head/mail/postfix-current/Makefile
  head/mail/postfix-current/distinfo
  head/mail/postfix-current/files/patch-src_tls_tls__server.c

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Sun Mar 31 15:50:16 2019	(r497425)
+++ head/mail/postfix-current/Makefile	Sun Mar 31 16:09:51 2019	(r497426)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	3.4-20181202
-PORTREVISION?=	1
+DISTVERSION=	3.4-20190106
+PORTREVISION?=	0
 PORTEPOCH=	5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \

Modified: head/mail/postfix-current/distinfo
==============================================================================
--- head/mail/postfix-current/distinfo	Sun Mar 31 15:50:16 2019	(r497425)
+++ head/mail/postfix-current/distinfo	Sun Mar 31 16:09:51 2019	(r497426)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543765729
-SHA256 (postfix/postfix-3.4-20181202.tar.gz) = 401529f9781d9c6fa766a864db556fd5f6ed27d13f60dfd6e74efff847f9562c
-SIZE (postfix/postfix-3.4-20181202.tar.gz) = 4508807
+TIMESTAMP = 1546794397
+SHA256 (postfix/postfix-3.4-20190106.tar.gz) = 09e123a8027101dcac16725dab9d8cad99414c858feec617a627e12a79a7d050
+SIZE (postfix/postfix-3.4-20190106.tar.gz) = 4511160

Modified: head/mail/postfix-current/files/patch-src_tls_tls__server.c
==============================================================================
--- head/mail/postfix-current/files/patch-src_tls_tls__server.c	Sun Mar 31 15:50:16 2019	(r497425)
+++ head/mail/postfix-current/files/patch-src_tls_tls__server.c	Sun Mar 31 16:09:51 2019	(r497426)
@@ -1,38 +1,12 @@
---- src/tls/tls_server.c.orig	2018-11-17 14:59:22 UTC
+--- src/tls/tls_server.c.orig	2018-12-26 19:21:49 UTC
 +++ src/tls/tls_server.c
-@@ -174,7 +174,7 @@ static const char server_session_id_cont
- #endif					/* OPENSSL_VERSION_NUMBER */
- 
-  /* OpenSSL 1.1.0 bitrot */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef const unsigned char *session_id_t;
- 
- #else
-@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TL
-      */
-     tls_check_version();
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
-     /*
-      * Initialize the OpenSSL library by the book! To start with, we must
-@@ -486,7 +486,7 @@ TLS_APPL_STATE *tls_server_init(const TL
-      * OpenSSL 0.9.8h, while SSL_NO_TICKET was added in 0.9.8f.
-      */
- #ifdef SSL_OP_NO_TICKET
--#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL
-+#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL && !defined(LIBRESSL_VERSION_NUMBER)
-     ticketable = (*var_tls_tkt_cipher && scache_timeout > 0
- 		  && !(off & SSL_OP_NO_TICKET));
-     if (ticketable) {
-@@ -595,7 +595,7 @@ TLS_APPL_STATE *tls_server_init(const TL
-     /*
-      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
-     /*
-      * According to OpenSSL documentation, a temporary RSA key is needed when
+@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL
+ 	 * ticket decryption callback already (since 2.11) asks OpenSSL to
+ 	 * avoid issuing new tickets when the presented ticket is re-usable.
+ 	 */
++#ifndef LIBRESSL_VERSION_NUMBER
+ 	SSL_CTX_set_num_tickets(server_ctx, 1);
++#endif
+     }
+ #endif
+     if (!ticketable)