Attachment 179639 Details for Bug 216790 – patch

[patch] patch

postfix-current.patch (text/plain), 7.59 KB, created by Piotr Kubaj on 2017-02-05 11:32:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2017-02-05 11:32:04 UTC

Size: 7.59 KB

patch

obsolete

>diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
>index 8d5b760f8523..2b8e9b2b8a96 100644
>--- a/mail/postfix-current/Makefile
>+++ b/mail/postfix-current/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	postfix
> DISTVERSION=	3.2-20170129
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> PORTEPOCH=	4
> CATEGORIES=	mail ipv6
> MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
>diff --git a/mail/postfix-current/files/patch-makedefs b/mail/postfix-current/files/patch-makedefs
>index 4d1acb84539a..4799fc1449d0 100644
>--- a/mail/postfix-current/files/patch-makedefs
>+++ b/mail/postfix-current/files/patch-makedefs
>@@ -1,6 +1,6 @@
>---- makedefs.orig	2016-06-26 00:02:58 UTC
>+--- makedefs.orig	2017-01-14 23:14:08 UTC
> +++ makedefs
>-@@ -279,6 +279,24 @@ case "$SYSTEM.$RELEASE" in
>+@@ -284,6 +284,24 @@ case "$SYSTEM.$RELEASE" in
>  		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
>  		: ${PLUGIN_LD="${CC} -shared"}
>  		;;
>diff --git a/mail/postfix-current/files/patch-src__util__sys_defs.h b/mail/postfix-current/files/patch-src__util__sys_defs.h
>index 7e2e5f0c9501..f5f332d5ff1e 100644
>--- a/mail/postfix-current/files/patch-src__util__sys_defs.h
>+++ b/mail/postfix-current/files/patch-src__util__sys_defs.h
>@@ -1,6 +1,6 @@
>---- src/util/sys_defs.h.orig	2016-07-09 20:09:34 UTC
>+--- src/util/sys_defs.h.orig	2017-01-01 16:03:34 UTC
> +++ src/util/sys_defs.h
>-@@ -27,6 +27,7 @@
>+@@ -30,6 +30,7 @@
>  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
>      || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
>      || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
>diff --git a/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c b/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c
>index 10f2e2d22d87..e0fab9f35d47 100644
>--- a/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c
>+++ b/mail/postfix-current/files/patch-src_posttls-finger_posttls-finger.c
>@@ -1,4 +1,4 @@
>---- src/posttls-finger/posttls-finger.c.orig	2016-08-27 20:27:50 UTC
>+--- src/posttls-finger/posttls-finger.c.orig	2016-08-27 14:34:36 UTC
> +++ src/posttls-finger/posttls-finger.c
> @@ -1511,7 +1511,8 @@ static int finger(STATE *state)
>      return (0);
>diff --git a/mail/postfix-current/files/patch-src_tls_tls.h b/mail/postfix-current/files/patch-src_tls_tls.h
>index 2bf7bdd5d082..cae8d1b1e2c9 100644
>--- a/mail/postfix-current/files/patch-src_tls_tls.h
>+++ b/mail/postfix-current/files/patch-src_tls_tls.h
>@@ -1,7 +1,7 @@
> # fix build against LibreSSL
> # Obtained from: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/mail/postfix/stable/patches/
> # 
>---- src/tls/tls.h.orig	2016-02-06 20:09:41 UTC
>+--- src/tls/tls.h.orig	2017-01-01 22:22:13 UTC
> +++ src/tls/tls.h
> @@ -89,7 +89,7 @@ extern const char *str_tls_level(int);
>  #endif
>diff --git a/mail/postfix-current/files/patch-src_tls_tls__client.c b/mail/postfix-current/files/patch-src_tls_tls__client.c
>index 4f63c0858b26..0e5f68597ae8 100644
>--- a/mail/postfix-current/files/patch-src_tls_tls__client.c
>+++ b/mail/postfix-current/files/patch-src_tls_tls__client.c
>@@ -1,4 +1,4 @@
>---- src/tls/tls_client.c.orig	2016-08-27 20:27:50 UTC
>+--- src/tls/tls_client.c.orig	2017-01-01 22:22:13 UTC
> +++ src/tls/tls_client.c
> @@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL
>       */
>@@ -9,7 +9,7 @@
>  
>      /*
>       * Initialize the OpenSSL library by the book! To start with, we must
>-@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL
>+@@ -433,7 +433,7 @@ TLS_APPL_STATE *tls_client_init(const TL
>      /*
>       * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
>       */
>diff --git a/mail/postfix-current/files/patch-src_tls_tls__dane.c b/mail/postfix-current/files/patch-src_tls_tls__dane.c
>index 494c3598053d..612d5485c226 100644
>--- a/mail/postfix-current/files/patch-src_tls_tls__dane.c
>+++ b/mail/postfix-current/files/patch-src_tls_tls__dane.c
>@@ -1,6 +1,6 @@
>---- src/tls/tls_dane.c.orig	2016-08-27 20:27:50 UTC
>+--- src/tls/tls_dane.c.orig	2017-01-01 22:22:13 UTC
> +++ src/tls/tls_dane.c
>-@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf
>+@@ -2125,7 +2125,7 @@ static SSL_CTX *ctx_init(const char *CAf
>      tls_param_init();
>      tls_check_version();
>  
>diff --git a/mail/postfix-current/files/patch-src_tls_tls__dh.c b/mail/postfix-current/files/patch-src_tls_tls__dh.c
>index 2575ead80c6b..eeab526fbe8e 100644
>--- a/mail/postfix-current/files/patch-src_tls_tls__dh.c
>+++ b/mail/postfix-current/files/patch-src_tls_tls__dh.c
>@@ -1,48 +1,13 @@
>-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;
>+Fix building with LibreSSL
>+
>+--- src/tls/tls_dh.c.orig	Mon Dec 26 18:47:24 2016
>++++ src/tls/tls_dh.c	Sat Feb  4 01:45:39 2017
>+@@ -314,7 +314,7 @@ void    tls_auto_eecdh_curves(SSL_CTX *ctx)
>+      * This is a NOP in OpenSSL 1.1.0 and later, where curves are always
>+      * auto-negotiated.
>+      */
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000UL
>++#if OPENSSL_VERSION_NUMBER < 0x10100000UL || LIBRESSL_VERSION_NUMBER >= 0x2050100fL
>+     if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) {
>+ 	msg_warn("failed to enable automatic ECDHE curve selection");
>+	tls_print_errors();
>diff --git a/mail/postfix-current/files/patch-src_tls_tls__server.c b/mail/postfix-current/files/patch-src_tls_tls__server.c
>index b9fb84e87acd..0d3f0e0075f6 100644
>--- a/mail/postfix-current/files/patch-src_tls_tls__server.c
>+++ b/mail/postfix-current/files/patch-src_tls_tls__server.c
>@@ -1,4 +1,4 @@
>---- src/tls/tls_server.c.orig	2016-08-27 20:27:50 UTC
>+--- src/tls/tls_server.c.orig	2017-01-01 22:22:13 UTC
> +++ src/tls/tls_server.c
> @@ -174,7 +174,7 @@ static const char server_session_id_cont
>  #endif					/* OPENSSL_VERSION_NUMBER */
>@@ -18,7 +18,7 @@
>  
>      /*
>       * Initialize the OpenSSL library by the book! To start with, we must
>-@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL
>+@@ -580,7 +580,7 @@ TLS_APPL_STATE *tls_server_init(const TL
>      /*
>       * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
>       */

Actions: View | Diff

Attachments on bug 216790: 179608 | 179639 | 179641 | 180193 | 180229 | 180231 | 180532 | 182015 | 182584 | 182586