cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update postfix/stable to 3.2.0, from Brad

Browse Source
This commit is contained in:
sthen 2017-03-04 22:09:43 +00:00
parent d13947c49d
commit d5b8f716a9
10 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/postfix/stable/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.192 2017/01/08 00:27:27 sthen Exp $
# $OpenBSD: Makefile,v 1.193 2017/03/04 22:09:43 sthen Exp $
VERSION= 3.1.4
VERSION= 3.2.0
MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/}

4
mail/postfix/stable/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (postfix/postfix-3.1.4.tar.gz) = 8ztHDEeui0/xmatV3ELoYDH/DFNcy8gwacjP9ptb0Cc=
SIZE (postfix/postfix-3.1.4.tar.gz) = 4340102
SHA256 (postfix/postfix-3.2.0.tar.gz) = Qgcm55YiYgOU/Rd5nkkmja2nBB6gZ8o6oci/FVuapIc=
SIZE (postfix/postfix-3.2.0.tar.gz) = 4389547

18
mail/postfix/stable/patches/patch-conf_main_cf
View File

@ -1,15 +1,7 @@
$OpenBSD: patch-conf_main_cf,v 1.7 2015/10/19 19:38:10 giovanni Exp $
--- conf/main.cf.orig Fri Oct 10 01:46:44 2014
+++ conf/main.cf Thu Oct 15 15:08:37 2015
@@ -28,6 +28,7 @@
# The level below is what should be used with new (not upgrade) installs.
#
compatibility_level = 2
+smtputf8_enable = no
# SOFT BOUNCE
#
@@ -133,6 +134,9 @@ mail_owner = postfix
$OpenBSD: patch-conf_main_cf,v 1.8 2017/03/04 22:09:43 sthen Exp $
--- conf/main.cf.orig Wed Apr 1 06:56:39 2015
+++ conf/main.cf Wed Aug 10 19:48:51 2016
@@ -133,6 +133,9 @@ mail_owner = postfix
#inet_interfaces = $myhostname
#inet_interfaces = $myhostname, localhost
@ -19,7 +11,7 @@ $OpenBSD: patch-conf_main_cf,v 1.7 2015/10/19 19:38:10 giovanni Exp $
# The proxy_interfaces parameter specifies the network interface
# addresses that this mail system receives mail on by way of a
# proxy or network address translation unit. This setting extends
@@ -673,4 +677,3 @@ sample_directory =
@@ -673,4 +676,3 @@ sample_directory =
# readme_directory: The location of the Postfix README files.
#
readme_directory =

12
mail/postfix/stable/patches/patch-conf_master_cf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-conf_master_cf,v 1.8 2016/12/18 20:28:40 jca Exp $
--- conf/master.cf.orig Sat Jan 31 23:54:26 2015
+++ conf/master.cf Wed Dec 14 15:01:00 2016
$OpenBSD: patch-conf_master_cf,v 1.9 2017/03/04 22:09:43 sthen Exp $
--- conf/master.cf.orig Sat Dec 3 10:49:54 2016
+++ conf/master.cf Mon Feb 20 12:42:58 2017
@@ -9,12 +9,12 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (no) (never) (100)
@ -20,7 +20,7 @@ $OpenBSD: patch-conf_master_cf,v 1.8 2016/12/18 20:28:40 jca Exp $
# -o syslog_name=postfix/submission
# -o smtpd_tls_security_level=encrypt
# -o smtpd_sasl_auth_enable=yes
@@ -25,7 +25,7 @@ smtp inet n - n - -
@@ -26,7 +26,7 @@ smtp inet n - n - -
# -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING
@ -29,7 +29,7 @@ $OpenBSD: patch-conf_master_cf,v 1.8 2016/12/18 20:28:40 jca Exp $
# -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes
# -o smtpd_sasl_auth_enable=yes
@@ -36,32 +36,32 @@ smtp inet n - n - -
@@ -37,32 +37,32 @@ smtp inet n - n - -
# -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING
@ -83,7 +83,7 @@ $OpenBSD: patch-conf_master_cf,v 1.8 2016/12/18 20:28:40 jca Exp $
#
# ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual
@@ -95,21 +95,21 @@ scache unix - - n - 1
@@ -96,21 +96,21 @@ scache unix - - n - 1
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe

10
mail/postfix/stable/patches/patch-src_posttls-finger_posttls-finger_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_posttls-finger_posttls-finger_c,v 1.1 2016/09/03 15:39:58 sthen Exp $
--- src/posttls-finger/posttls-finger.c.orig Thu Sep 1 21:51:53 2016
+++ src/posttls-finger/posttls-finger.c Thu Sep 1 21:54:23 2016
@@ -1511,7 +1511,8 @@ static int finger(STATE *state)
$OpenBSD: patch-src_posttls-finger_posttls-finger_c,v 1.2 2017/03/04 22:09:43 sthen Exp $
--- src/posttls-finger/posttls-finger.c.orig Fri Feb 3 17:43:04 2017
+++ src/posttls-finger/posttls-finger.c Mon Feb 20 12:42:58 2017
@@ -1513,7 +1513,8 @@ static int finger(STATE *state)
return (0);
}
@ -11,7 +11,7 @@ $OpenBSD: patch-src_posttls-finger_posttls-finger_c,v 1.1 2016/09/03 15:39:58 st
/* ssl_cleanup - free memory allocated in the OpenSSL library */
@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[])
@@ -1966,7 +1967,8 @@ int main(int argc, char *argv[])
cleanup(&state);
/* OpenSSL 1.1.0 and later (de)initialization is implicit */

8
mail/postfix/stable/patches/patch-src_tls_tls_client_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_tls_tls_client_c,v 1.1 2016/09/03 15:39:58 sthen Exp $
--- src/tls/tls_client.c.orig Thu Sep 1 21:53:17 2016
+++ src/tls/tls_client.c Thu Sep 1 21:55:50 2016
$OpenBSD: patch-src_tls_tls_client_c,v 1.2 2017/03/04 22:09:43 sthen Exp $
--- src/tls/tls_client.c.orig Sun Jan 1 17:22:13 2017
+++ src/tls/tls_client.c Mon Feb 20 12:42:58 2017
@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_
*/
tls_check_version();
@ -10,7 +10,7 @@ $OpenBSD: patch-src_tls_tls_client_c,v 1.1 2016/09/03 15:39:58 sthen Exp $
/*
* Initialize the OpenSSL library by the book! To start with, we must
@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_
@@ -433,7 +433,7 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_
/*
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
*/

8
mail/postfix/stable/patches/patch-src_tls_tls_dane_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_tls_tls_dane_c,v 1.1 2016/09/03 15:39:58 sthen Exp $
--- src/tls/tls_dane.c.orig Thu Sep 1 21:56:25 2016
+++ src/tls/tls_dane.c Thu Sep 1 21:56:58 2016
@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAfile)
$OpenBSD: patch-src_tls_tls_dane_c,v 1.2 2017/03/04 22:09:43 sthen Exp $
--- src/tls/tls_dane.c.orig Sun Jan 1 17:22:13 2017
+++ src/tls/tls_dane.c Mon Feb 20 12:42:58 2017
@@ -2125,7 +2125,7 @@ static SSL_CTX *ctx_init(const char *CAfile)
tls_param_init();
tls_check_version();

15
mail/postfix/stable/patches/patch-src_tls_tls_dh_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_tls_tls_dh_c,v 1.1 2017/03/04 22:09:43 sthen Exp $
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 || defined(LIBRESSL_VERSION_NUMBER)
if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) {
msg_warn("failed to enable automatic ECDHE curve selection");
tls_print_errors();

16
mail/postfix/stable/patches/patch-src_tls_tls_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_tls_tls_h,v 1.1 2016/03/05 17:34:24 sthen Exp $
$OpenBSD: patch-src_tls_tls_h,v 1.2 2017/03/04 22:09:43 sthen Exp $
Fix building with LibreSSL
--- src/tls/tls.h.orig Sat Feb 6 15:09:41 2016
+++ src/tls/tls.h Fri Feb 12 20:15:25 2016
--- src/tls/tls.h.orig Sun Jan 1 17:22:13 2017
+++ src/tls/tls.h Fri Jan 6 23:17:26 2017
@@ -89,7 +89,7 @@ extern const char *str_tls_level(int);
#endif
@ -13,3 +13,13 @@ Fix building with LibreSSL
#define OpenSSL_version_num SSLeay
#define OpenSSL_version SSLeay_version
#define OPENSSL_VERSION SSLEAY_VERSION
@@ -104,6 +104,9 @@ extern const char *str_tls_level(int);
#define ASN1_STRING_get0_data ASN1_STRING_data
#define X509_getm_notBefore X509_get_notBefore
#define X509_getm_notAfter X509_get_notAfter
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define TLS_method SSLv23_method
#define TLS_client_method SSLv23_client_method
#define TLS_server_method SSLv23_server_method

8
mail/postfix/stable/patches/patch-src_tls_tls_server_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_tls_tls_server_c,v 1.1 2016/09/03 15:39:58 sthen Exp $
--- src/tls/tls_server.c.orig Thu Sep 1 21:58:44 2016
+++ src/tls/tls_server.c Thu Sep 1 21:59:40 2016
$OpenBSD: patch-src_tls_tls_server_c,v 1.2 2017/03/04 22:09:43 sthen Exp $
--- src/tls/tls_server.c.orig Sun Jan 1 17:22:13 2017
+++ src/tls/tls_server.c Mon Feb 20 12:42:58 2017
@@ -174,7 +174,7 @@ static const char server_session_id_context[] = "Postf
#endif /* OPENSSL_VERSION_NUMBER */
@ -19,7 +19,7 @@ $OpenBSD: patch-src_tls_tls_server_c,v 1.1 2016/09/03 15:39:58 sthen Exp $
/*
* Initialize the OpenSSL library by the book! To start with, we must
@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_
@@ -580,7 +580,7 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_
/*
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
*/