summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix-current/distinfo6
-rw-r--r--mail/postfix-current/files/extra-patch-blacklistd6
-rw-r--r--mail/postfix-current/files/patch-src_tls_tls__certkey.c11
-rw-r--r--mail/postfix-current/pkg-plist2
5 files changed, 20 insertions, 7 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 9a4e23586403..f9c640c776a6 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
-DISTVERSION= 3.4-20190106
+DISTVERSION= 3.5-20190330
PORTREVISION?= 0
PORTEPOCH= 5
CATEGORIES= mail ipv6
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 8621b6b27365..e1670b364a98 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -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
diff --git a/mail/postfix-current/files/extra-patch-blacklistd b/mail/postfix-current/files/extra-patch-blacklistd
index a9448d978c7d..a4102e3ab129 100644
--- a/mail/postfix-current/files/extra-patch-blacklistd
+++ b/mail/postfix-current/files/extra-patch-blacklistd
@@ -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));
diff --git a/mail/postfix-current/files/patch-src_tls_tls__certkey.c b/mail/postfix-current/files/patch-src_tls_tls__certkey.c
new file mode 100644
index 000000000000..b34b8efd2be6
--- /dev/null
+++ b/mail/postfix-current/files/patch-src_tls_tls__certkey.c
@@ -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;
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 319a29d3b66d..09e304898f33 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -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