Update mail/postfix to 3.2.0.

- Elliptic curve negotiation with OpenSSL >= 1.0.2. This changes the
  default smtpd_tls_eecdh_grade setting to "auto", and introduces a
  new parameter tls_eecdh_auto_curves with the names of curves that may
  be negotiated.
- Stored-procedure support for MySQL databases.
- Cidr: table support for if/endif and negation (by prepending ! to a
  pattern), just like regexp: and pcre: tables. See the cidr_table(5)
  manpage for details.
- The postmap command and the inline: and texthash: maps now support
  spaces in left-hand field of lookup table source text. Use double
  quotes (") around a left-hand field that contains spaces, and use
  backslash (\) to protect quotes in a left-hand field.
- Support for per-client Milter configuration (smtpd_milter_maps) that
  overrides the main.cf smtpd_milters setting, and that has the same
  syntax. A lookup result of "DISABLE" turns off Milter support for that
  client.
- The local SMTP server IP address and port are available in the
  policy delegation protocol (attribute names: server_address,
  server_port), in the Milter protocol (macro names: {daemon_addr},
  {daemon_port}), and in the XCLIENT protocol (attribute names:
  DESTADDR, DESTPORT).
- For safety reasons, the Postfix sendmail -C option must specify an
  authorized directory: the default configuration directory, a
  directory that is listed in the default main.cf file with
  alternate_config_directories or multi_instance_directories, otherwise
  the command must be invoked with root privileges. This mitigates a
  recurring "jail break" problem with the PHP mail() function.
- "PASS" and "STRIP" actions in header/body_checks. "STRIP" is similar
  to "IGNORE" but also logs the action, and "PASS" disables header,
  body, and Milter inspection for the remainder of the message content.
- The collate.pl script by Viktor Dukhovni for grouping Postfix
  logfile records into "sessions" based on queue ID and process ID
  information, in the auxiliary/collate directory of the Postfix source
  tree.

Disabled or removed behavior:
- SMTPUTF8 support: Postfix 3.2 disables the 'transitional'
  compatibility between the IDNA2003 and IDNA2008 standards for
  internationalized domain names (domain names beyond the limits of
  US-ASCII). This makes Postfix behavior consistent with contemporary
  web browsers.
- Postfix 3.2 removes tentative features that were implemented before
  the DANE spec was finalized: support for certificate usage
  PKIX-EE(1), the ability to disable digest agility, and the ability to
  disable support for "TLSA 2 [01] [12]" records that specify the digest
  of a trust anchor.

4 files changed, 23 insertions, 23 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index bcdc01648ac..30defbb43c9 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.295 2017/04/22 21:03:42 adam Exp $
+# $NetBSD: Makefile,v 1.296 2017/04/24 20:11:40 fhajny Exp $
 
-PKGREVISION= 1
 .include "../../mail/postfix/Makefile.common"
 
 COMMENT=	Postfix SMTP server and tools
diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common
index 6463863df48..7841e6341ae 100644
--- a/mail/postfix/Makefile.common
+++ b/mail/postfix/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.8 2017/03/04 06:26:24 taca Exp $
+# $NetBSD: Makefile.common,v 1.9 2017/04/24 20:11:40 fhajny Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
-DISTNAME=	postfix-3.1.4
+DISTNAME=	postfix-3.2.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+=	http://postfix.it-austria.net/releases/official/
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 5f3680fecbe..44ded4726e5 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.169 2017/04/11 09:33:30 adam Exp $
+$NetBSD: distinfo,v 1.170 2017/04/24 20:11:40 fhajny Exp $
 
-SHA1 (postfix-3.1.4.tar.gz) = 2889744044d85209563dc0b5388eb32c8b1f93f0
-RMD160 (postfix-3.1.4.tar.gz) = 9f7777096a76952aa9270977d1618ea5e95c329f
-SHA512 (postfix-3.1.4.tar.gz) = 4cf8aa8d0cf6d99defa32c2907705370d6f8d047d7e938c84a20a62c68ae07a2bec304f28c178d1072b9610f2969420f83fe2066821ad34c0f95e62bbb5b8c05
-Size (postfix-3.1.4.tar.gz) = 4340102 bytes
+SHA1 (postfix-3.2.0.tar.gz) = ce95aa5288735970abf806b719a09d517294e071
+RMD160 (postfix-3.2.0.tar.gz) = c4e685ceb90690a751664cb5dc84f47bb2dbc40f
+SHA512 (postfix-3.2.0.tar.gz) = bfaa4b2125758833997b399bb2f095475924c1e51fba752e631ad73494d8764458548541d175ef8a1ed6566e9dac569f963e0651e1500aa19595f9062b8e86ce
+Size (postfix-3.2.0.tar.gz) = 4389547 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
 SHA1 (patch-ag) = 1288ac987056f5c93a05e46148ce2ef1c50ade38
-SHA1 (patch-ai) = 35724ffff90ca0832e027c623e80f619420c4e0f
+SHA1 (patch-ai) = b909daf44016b8ee4e258791b5e0193879871aaa
 SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index c078e41b149..d574284aa2c 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.38 2017/04/11 09:33:30 adam Exp $
+$NetBSD: patch-ai,v 1.39 2017/04/24 20:11:40 fhajny Exp $
 
 1) Add shlib definitions for NetBSD 5; the build system must be
 hard-coded per OS per version.  Not yet reported upstream.
@@ -7,9 +7,9 @@ hard-coded per OS per version.  Not yet reported upstream.
 
 3) Add support for FreeBSD 11 & 12.
 
---- makedefs.orig	2016-08-20 00:08:42.000000000 +0000
+--- makedefs.orig	2017-02-12 15:32:10.000000000 +0000
 +++ makedefs
-@@ -272,6 +272,24 @@ case "$SYSTEM.$RELEASE" in
+@@ -284,6 +284,24 @@ case "$SYSTEM.$RELEASE" in
  		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
  		: ${PLUGIN_LD="${CC} -shared"}
  		;;
@@ -34,7 +34,7 @@ hard-coded per OS per version.  Not yet reported upstream.
   DragonFly.*)	SYSTYPE=DRAGONFLY
  		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
-@@ -309,6 +327,12 @@ case "$SYSTEM.$RELEASE" in
+@@ -321,6 +339,12 @@ case "$SYSTEM.$RELEASE" in
     NetBSD.4*)	SYSTYPE=NETBSD4
  		;;
     NetBSD.5*)	SYSTYPE=NETBSD5
@@ -47,7 +47,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
     NetBSD.6*)	SYSTYPE=NETBSD6
  		: ${SHLIB_SUFFIX=.so}
-@@ -389,13 +413,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -409,13 +433,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -61,7 +61,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -437,33 +454,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -457,33 +474,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -95,7 +95,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -524,25 +516,6 @@ EOF
+@@ -544,25 +536,6 @@ EOF
  		: ${PLUGIN_LD="${CC-gcc} -shared"}
  		;;
    Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
@@ -121,7 +121,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -563,24 +536,6 @@ EOF
+@@ -583,24 +556,6 @@ EOF
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
  		SYSTYPE=GNU0
@@ -146,10 +146,10 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -611,25 +566,13 @@ EOF
+@@ -631,26 +586,14 @@ EOF
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
- 		CCARGS="$CCARGS -DMISSING_USLEEP"
+ 		CCARGS="$CCARGS -DMISSING_USLEEP -DNO_SNPRINTF"
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    SYSLIBS="$SYSLIBS -ldb"
@@ -158,6 +158,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  HP-UX.B.10.*)	SYSTYPE=HPUX10
  		CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
  		    (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
+ 		CCARGS="$CCARGS -DNO_SNPRINTF"
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    SYSLIBS=-ldb
@@ -172,7 +173,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
  ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
  		RANLIB=echo
-@@ -671,12 +614,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
+@@ -692,12 +635,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
  		esac
  		: ${SHLIB_CFLAGS=-fPIC}
  		: ${SHLIB_SUFFIX=.dylib}
@@ -187,10 +188,10 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
      dcosx.1*)	SYSTYPE=DCOSX1
  		RANLIB=echo
-@@ -757,8 +700,8 @@ esac
+@@ -778,8 +721,8 @@ esac
  #
  case "$CCARGS" in
- *-DNO_EAI*) ;;
+ *-DNO_EAI*) CCARGS="$CCARGS "'-DDEF_SMTPUTF8_ENABLE=\"no\"';;
 -	 *) icu_cppflags=`(icu-config --cppflags) 2>/dev/null` && {
 -		icu_ldflags=`(icu-config --ldflags) 2>/dev/null` && {
 +	 *) icu_cppflags=`(pkg-config --cflags icu-i18n) 2>/dev/null` && {