mail/postfix: update to 3.2.5

Update mail/postfix to 3.2.5.

[An on-line version of this announcement will be available at
http://www.postfix.org/announcements/postfix-3.2.4.html]

This announcement concerns fixes for problems that were introduced
with Postfix 3.0 and later. Older supported releases are unaffected.

Fixed in Postfix 3.1 and later:

  * DANE interoperability. Postfix builds with OpenSSL 1.0.0 or
    1.0.1 failed to send email to some sites with "TLSA 2 X X" DNS
    records associated with an intermediate CA certificate. Problem
    report and initial fix by Erwan Legrand.

Fixed in Postfix 3.0 and later:

  * Missing dynamicmaps support in the Postfix sendmail command.
    This broke authorized_submit_users settings that use a
    dynamically-loaded map type. Problem reported by Ulrich Zehl.

3 files changed, 15 insertions, 15 deletions

diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common
index 4e511c025f0..1ba60f7218c 100644
--- a/mail/postfix/Makefile.common
+++ b/mail/postfix/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2017/12/09 02:34:48 taca Exp $
+# $NetBSD: Makefile.common,v 1.14 2018/02/25 12:27:49 taca Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
-DISTNAME=	postfix-3.2.4
+DISTNAME=	postfix-3.2.5
 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/distinfo b/mail/postfix/distinfo
index f15cf38a6b9..0d6531f8b93 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.174 2017/12/09 02:34:48 taca Exp $
+$NetBSD: distinfo,v 1.175 2018/02/25 12:27:49 taca Exp $
 
-SHA1 (postfix-3.2.4.tar.gz) = 86de2f38ca0894f42b9473bec6ac061ed6369c9a
-RMD160 (postfix-3.2.4.tar.gz) = 64912f5e06a47a3ac7f7c7879eb727dc7e255546
-SHA512 (postfix-3.2.4.tar.gz) = 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
-Size (postfix-3.2.4.tar.gz) = 4390376 bytes
+SHA1 (postfix-3.2.5.tar.gz) = 77bbc55ba4d140b0677c31905ec59454e861314d
+RMD160 (postfix-3.2.5.tar.gz) = 64eafb4d9a18228eec74552a8e4ecdd78f3258fe
+SHA512 (postfix-3.2.5.tar.gz) = ffd07e8664d41a5c40b7f3f7511a4c4cc57310d103395b12f2f7e9499d1f901768d6ebb1d5d1588d6fdb834ad2548a9df6d925ff3d7f74d74764a6f6f550ecb6
+Size (postfix-3.2.5.tar.gz) = 4394765 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
 SHA1 (patch-ag) = 10e7c6ec4ca9e05ba8a37eeb4910b784fb9a5e34
 SHA1 (patch-ai) = 464da0a53bc9cac1f4e932e9735b75f4a33c7aa7
-SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d
+SHA1 (patch-src_dns_dns__lookup.c) = 88cdda55765799d40f05fa7aad43cdbc58c4a307
diff --git a/mail/postfix/patches/patch-src_dns_dns__lookup.c b/mail/postfix/patches/patch-src_dns_dns__lookup.c
index a30d0cfe124..cfebfcaf3b1 100644
--- a/mail/postfix/patches/patch-src_dns_dns__lookup.c
+++ b/mail/postfix/patches/patch-src_dns_dns__lookup.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_dns_dns__lookup.c,v 1.4 2016/09/18 17:10:28 taca Exp $
+$NetBSD: patch-src_dns_dns__lookup.c,v 1.5 2018/02/25 12:27:50 taca Exp $
 
 Fix runtime problem when mysql PKG_OPTIONS is enabled.
 
---- src/dns/dns_lookup.c.orig	2015-07-12 14:10:57.000000000 +0000
+--- src/dns/dns_lookup.c.orig	2017-12-21 01:53:15.000000000 +0000
 +++ src/dns/dns_lookup.c
 @@ -245,6 +245,8 @@
  
@@ -54,10 +54,10 @@ Fix runtime problem when mysql PKG_OPTIONS is enabled.
  	memset(answer, 0, anslen);
 -    len = res_query(name, class, type, answer, anslen);
 +    len = res_nquery(statp, name, class, type, answer, anslen);
-     if (len > 0) {
- 	SET_H_ERRNO(0);
-     } else if (keep_notfound && NOT_FOUND_H_ERRNO(h_errno)) {
-@@ -427,7 +429,7 @@ static int dns_query(const char *name, i
+     /* Begin API creep workaround. */
+     if (len < 0 && h_errno == 0) {
+ 	SET_H_ERRNO(TRY_AGAIN);
+@@ -435,7 +437,7 @@ static int dns_query(const char *name, i
      /*
       * Initialize the name service.
       */
@@ -66,7 +66,7 @@ Fix runtime problem when mysql PKG_OPTIONS is enabled.
  	if (why)
  	    vstring_strcpy(why, "Name service initialization failure");
  	return (DNS_FAIL);
-@@ -456,24 +458,24 @@ static int dns_query(const char *name, i
+@@ -464,24 +466,24 @@ static int dns_query(const char *name, i
       */
  #define SAVE_FLAGS (USER_FLAGS | XTRA_FLAGS)