- update to 3.5-20190330

- adopt libressl patches from OpenBSD
This commit is contained in:
Olli Hauer 2019-04-19 18:55:09 +00:00
parent 56228e8fd2
commit 5e14016976
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=499383
5 changed files with 20 additions and 7 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
DISTVERSION= 3.4-20190106
DISTVERSION= 3.5-20190330
PORTREVISION?= 0
PORTEPOCH= 5
CATEGORIES= mail ipv6

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1546794397
SHA256 (postfix/postfix-3.4-20190106.tar.gz) = 09e123a8027101dcac16725dab9d8cad99414c858feec617a627e12a79a7d050
SIZE (postfix/postfix-3.4-20190106.tar.gz) = 4511160
TIMESTAMP = 1553986683
SHA256 (postfix/postfix-3.5-20190330.tar.gz) = ed51359b0572aa64d81e6dd21232c28b41200628bc1d813f450cff8ba0089233
SIZE (postfix/postfix-3.5-20190330.tar.gz) = 4596058

View File

@ -1,6 +1,6 @@
# PR 225664: support blacklistd on FreeBSD >= 11.0
#
--- src/smtpd/Makefile.in.orig 2017-02-05 23:36:32 UTC
--- src/smtpd/Makefile.in.orig 2019-01-27 22:17:15 UTC
+++ src/smtpd/Makefile.in
@@ -2,14 +2,14 @@ SHELL = /bin/sh
SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
@ -20,7 +20,7 @@
TESTSRC = smtpd_token_test.c
DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE)
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
--- src/smtpd/smtpd_sasl_glue.c.orig 2017-02-19 01:58:21 UTC
--- src/smtpd/smtpd_sasl_glue.c.orig 2018-08-26 18:48:45 UTC
+++ src/smtpd/smtpd_sasl_glue.c
@@ -147,6 +147,7 @@
#include "smtpd.h"
@ -30,7 +30,7 @@
#ifdef USE_SASL_AUTH
@@ -332,6 +333,10 @@ int smtpd_sasl_authenticate(SMTPD_ST
@@ -331,6 +332,10 @@ int smtpd_sasl_authenticate(SMTPD_ST
else
smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s",
STR(state->sasl_reply));

View File

@ -0,0 +1,11 @@
--- src/tls/tls_certkey.c.orig 2019-03-07 23:57:10 UTC
+++ src/tls/tls_certkey.c
@@ -144,7 +144,7 @@ static void init_pem_load_state(pem_load
/* use_chain - load cert, key and chain into ctx or ssl */
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL && !defined(LIBRESSL_VERSION_NUMBER)
static int use_chain(pem_load_state_t *st)
{
int ret;

View File

@ -61,6 +61,7 @@ libexec/postfix/postfix-files
libexec/postfix/postfix-script
libexec/postfix/postfix-tls-script
libexec/postfix/postfix-wrapper
libexec/postfix/postlogd
libexec/postfix/postmulti-script
libexec/postfix/postscreen
libexec/postfix/proxymap
@ -137,6 +138,7 @@ libexec/postfix/virtual
%%BMAN%%man/man8/oqmgr.8.gz
%%BMAN%%man/man8/pickup.8.gz
%%BMAN%%man/man8/pipe.8.gz
%%BMAN%%man/man8/postlogd.8.gz
%%BMAN%%man/man8/postscreen.8.gz
%%BMAN%%man/man8/proxymap.8.gz
%%BMAN%%man/man8/qmgr.8.gz