postfix: updated to 3.5.8

Fixed in Postfix version 3.5.8:

[Postfix 3.5 and later] The Postfix SMTP client inserted <CR><LF> into message headers with lines longer than $line_length_limit (default: 2048), causing all subsequent header content to become message body content. Reported by Andreas Weigel.

Fixed in Postfix versions 3.5.8, 3.4.18, 3.3.15, 3.2.20:

[Postfix 2.8 and later] The postscreen daemon did not save a copy of the postscreen_dnsbl_reply_map lookup result. This has no effect when the recommended texthash: lookup table is used, but it could result in stale data with other lookup tables.

[Postfix 2.3 and later] After deleting a recipient with a Milter, the Postfix recipient duplicate filter was not updated; the filter suppressed requests to add the recipient back. Reported by Mehmet Avcioglu.

[Postfix 2.3 and later] Memory leak: the static: maps did not free their casefolding buffer.

[Postfix 2.2 and later] With "smtpd_tls_wrappermode = yes", the smtps service was waiting for a TLS handshake, after processing an XCLIENT command. Reported by Aki Tuomi.

[Postfix 2.0 and later] The smtp_sasl_mechanism_filter implementation ignored table lookup errors, treating them as 'not found'.

[Postfix alpha and later] The code that looks for Delivered-To: headers ignored headers longer than $line_length_limit (default: 2048).

4 files changed, 30 insertions, 13 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 6baa24ce99f..c896edf1c01 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.324 2020/11/05 09:08:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.325 2020/11/22 11:14:44 adam Exp $
 
-PKGREVISION= 2
 .include "../../mail/postfix/Makefile.common"
 
 COMMENT=	Fast, easy to administer, and secure mail transfer agent
@@ -55,8 +54,8 @@ SUBST_STAGE.paths=	pre-configure
 INSTALLATION_DIRS+=	${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
 
 post-extract:
-	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
-	rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
+	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	${RM} -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 
 post-build:
 .if !empty(PKG_OPTIONS:Msasl)
@@ -64,7 +63,7 @@ post-build:
 .endif
 
 do-install:
-	rm -f ${WRKSRC}/conf/*.orig
+	${RM} -f ${WRKSRC}/conf/*.orig
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
 .endif
@@ -79,5 +78,19 @@ do-install:
 .for dir in ${POSTFIX_QUEUE_SUBDIR}
 	${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir}
 .endfor
+.if ${OPSYS} == "Darwin"
+	for f in ${DESTDIR}${PREFIX}/lib/postfix/lib*.dylib; do \
+		install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
+	done
+	for f in ${DESTDIR}${PREFIX}/libexec/postfix/* ${DESTDIR}${PREFIX}/sbin/*; do \
+		install_name_tool \
+			-change @rpath/libpostfix-dns.dylib ${PREFIX}/lib/postfix/libpostfix-dns.dylib \
+			-change @rpath/libpostfix-global.dylib ${PREFIX}/lib/postfix/libpostfix-global.dylib \
+			-change @rpath/libpostfix-master.dylib ${PREFIX}/lib/postfix/libpostfix-master.dylib \
+			-change @rpath/libpostfix-tls.dylib ${PREFIX}/lib/postfix/libpostfix-tls.dylib \
+			-change @rpath/libpostfix-util.dylib ${PREFIX}/lib/postfix/libpostfix-util.dylib \
+			$$f; \
+	done
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common
index d88f91852fe..f676be55d39 100644
--- a/mail/postfix/Makefile.common
+++ b/mail/postfix/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.30 2020/08/31 13:07:46 otis Exp $
+# $NetBSD: Makefile.common,v 1.31 2020/11/22 11:14:44 adam Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
-DISTNAME=	postfix-3.5.7
+DISTNAME=	postfix-3.5.8
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+=	http://mirrors.isc.org/pub/postfix/official/
diff --git a/mail/postfix/Makefile.module b/mail/postfix/Makefile.module
index 5cd314c8562..97f3c81f8cd 100644
--- a/mail/postfix/Makefile.module
+++ b/mail/postfix/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.1 2015/09/07 09:47:01 fhajny Exp $
+# $NetBSD: Makefile.module,v 1.2 2020/11/22 11:14:44 adam Exp $
 # used by mail/postfix-cdb/Makefile
 # used by mail/postfix-ldap/Makefile
 # used by mail/postfix-lmdb/Makefile
@@ -17,7 +17,11 @@ CCARGS+=	-DHAS_${POSTFIX_LIB:tu}
 MAKE_ENV+=	AUXLIBS_${POSTFIX_LIB:tu}=${AUXLIBS_MODULE:Q}
 
 # Define functionality to populate dynamicmaps.cf
+.if ${OPSYS} == "Darwin"
+POSTFIX_LIBFILE=	postfix-${POSTFIX_LIB}.dylib
+.else
 POSTFIX_LIBFILE=	postfix-${POSTFIX_LIB}.so
+.endif
 .if !empty(POSTFIX_LIB_DICT:Myes)
 POSTFIX_LIB_FUNCS+=	dict_${POSTFIX_LIB}_open
 .endif
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 70ab8bf4ca5..803c386cc02 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.189 2020/08/31 13:07:46 otis Exp $
+$NetBSD: distinfo,v 1.190 2020/11/22 11:14:44 adam Exp $
 
-SHA1 (postfix-3.5.7.tar.gz) = 487349be6903ae904903f2e88c1f9b57e0ba15c3
-RMD160 (postfix-3.5.7.tar.gz) = 1b6b594695ade724358cb052b4a232a8bb836664
-SHA512 (postfix-3.5.7.tar.gz) = 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2
-Size (postfix-3.5.7.tar.gz) = 4613756 bytes
+SHA1 (postfix-3.5.8.tar.gz) = 1dfb10729498be5d387dc730117c2a845dd93ac0
+RMD160 (postfix-3.5.8.tar.gz) = 110351d43f0b1b8e5fa63d7f5d557fff5ece2b46
+SHA512 (postfix-3.5.8.tar.gz) = 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
+Size (postfix-3.5.8.tar.gz) = 4614733 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
 SHA1 (patch-ag) = c126c572e36bf2bcbd3f6e5d8332a3d26e704109
 SHA1 (patch-ai) = 51748ccf92da543f7ff640f36906a29b5db3f6e3