 @@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.291 2016/07/09 06:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.292 2016/09/18 17:10:28 taca Exp $
 .include "../../mail/postfix/Makefile.common"
 COMMENT=	Postfix SMTP server and tools
 PKGREVISION=	5
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 CONFLICTS+=	esmtp>=1.2 nullmailer-[0-9]*
 USE_TOOLS+=	perl
 SPECIAL_PERMS+=	sbin/postdrop postfix maildrop 2555
 SPECIAL_PERMS+=	sbin/postqueue postfix maildrop 2555
 REPLACE_PERL+=	auxiliary/qshape/qshape.pl
 # options.mk appends to CCARGS and AUXLIBS the options needed to build
 # Postfix with support for various add-on modules.

 @@ -1,18 +1,18 @@
-# $NetBSD: Makefile.common,v 1.2 2016/04/10 16:39:28 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/09/18 17:10:28 taca Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
-DISTNAME=	postfix-3.0.2
+DISTNAME=	postfix-3.1.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+=	http://postfix.it-austria.net/releases/official/
 MASTER_SITES+=	http://mirrors.isc.org/pub/postfix/official/
 MASTER_SITES+=	http://mirror.postfix.jp/postfix-release/official/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 # The postfix license has only very minor diffs from cpl-1.0.
 LICENSE=	cpl-1.0
 #LICENSE=	postfix-license
 DISTINFO_FILE=	${PKGDIR}/../../mail/postfix/distinfo

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.29 2015/09/07 09:47:01 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.30 2016/09/18 17:10:28 taca Exp $
 bin/mailq
 bin/newaliases
 lib/postfix/libpostfix-dns.so
 lib/postfix/libpostfix-global.so
 lib/postfix/libpostfix-master.so
 lib/postfix/libpostfix-tls.so
 lib/postfix/libpostfix-util.so
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/dnsblog
 libexec/postfix/dynamicmaps.cf
 @@ -17,48 +17,50 @@ libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf.proto
 libexec/postfix/makedefs.out
 libexec/postfix/master
 libexec/postfix/master.cf.proto
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-tls-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/postscreen
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/tlsmgr
 libexec/postfix/tlsproxy
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 man/man1/mailq.1
 man/man1/newaliases.1
 man/man1/postalias.1
 man/man1/postcat.1
 man/man1/postconf.1
 man/man1/postdrop.1
 man/man1/postfix-tls.1
 man/man1/postfix.1
 man/man1/postkick.1
 man/man1/postlock.1
 man/man1/postlog.1
 man/man1/postmap.1
 man/man1/postmulti.1
 man/man1/postqueue.1
 man/man1/postsuper.1
 man/man1/qshape.1
 man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
 man/man5/body_checks.5
 @@ -125,26 +127,27 @@ sbin/postmap
 sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/qshape
 sbin/sendmail
 share/doc/postfix/AAAREADME
 share/doc/postfix/ADDRESS_CLASS_README
 share/doc/postfix/ADDRESS_REWRITING_README
 share/doc/postfix/ADDRESS_VERIFICATION_README
 share/doc/postfix/BACKSCATTER_README
 share/doc/postfix/BASIC_CONFIGURATION_README
 share/doc/postfix/BUILTIN_FILTER_README
 share/doc/postfix/CDB_README
 share/doc/postfix/COMPATIBILITY_README
 share/doc/postfix/CONNECTION_CACHE_README
 share/doc/postfix/CONTENT_INSPECTION_README
 share/doc/postfix/DATABASE_README
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
 share/doc/postfix/DSN_README
 share/doc/postfix/ETRN_README
 share/doc/postfix/FILTER_README
 share/doc/postfix/FORWARD_SECRECY_README
 share/doc/postfix/INSTALL
 share/doc/postfix/IPV6_README
 share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.163 2016/03/23 12:55:18 gdt Exp $
+$NetBSD: distinfo,v 1.164 2016/09/18 17:10:28 taca Exp $
-SHA1 (postfix-3.0.2.tar.gz) = 9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e
+SHA1 (postfix-3.1.2.tar.gz) = 1595ca360c465d7e4f69a5722b4849de5a598e4f
-RMD160 (postfix-3.0.2.tar.gz) = aba1e9decc1aa9aa0c0b68f2bb7f0432b75fabdf
+RMD160 (postfix-3.1.2.tar.gz) = 6ec7ef6c97631ebd88490f4f72b8ebab06d02994
-SHA512 (postfix-3.0.2.tar.gz) = b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021
+SHA512 (postfix-3.1.2.tar.gz) = 58493d1890c3235d74a18365294ca764bd3b3f278b9825da931005165af60250342c6cf477c3b3575e50858d99cd3ee40f22bece094eb61e9be6c3cf0313d571
-Size (postfix-3.0.2.tar.gz) = 4239235 bytes
+Size (postfix-3.1.2.tar.gz) = 4337569 bytes
 SHA1 (patch-aa) = f2c418a2fd34da7325ea2823ddd14043768f0111
 SHA1 (patch-ag) = e3d818cd75225c5b50960659827c6e27767cbd58
 SHA1 (patch-ai) = 17b29cceadba3055ae198e1802a786468ecc9eff
-SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a
+SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d

 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/09/18 17:10:28 taca Exp $
+#
 COMMENT=		Postfix SMTP server LDAP backend module
 PKGREVISION=		1
 POSTFIX_LIB=		ldap
 POSTFIX_LIBDIR=		src/global
 POSTFIX_LIB_DICT=	yes
 POSTFIX_LIB_MKMAP=	no
 .include "../../mail/postfix/Makefile.module"
 CCARGS+=		-I${BUILDLINK_PREFIX.openldap-client}/include
 AUXLIBS_MODULE=		-L${BUILDLINK_PREFIX.openldap-client}/lib -lldap -llber	\
 			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap-client}/lib
 .include "../../databases/openldap-client/buildlink3.mk"

 @@ -1,49 +1,100 @@
-$NetBSD: patch-src_dns_dns__lookup.c,v 1.3 2014/02/09 05:34:13 taca Exp $
+$NetBSD: patch-src_dns_dns__lookup.c,v 1.4 2016/09/18 17:10:28 taca Exp $
 Fix runtime problem when mysql PKG_OPTIONS is enabled.
---- src/dns/dns_lookup.c.orig	2014-01-09 15:00:36.000000000 +0000
+--- src/dns/dns_lookup.c.orig	2015-07-12 14:10:57.000000000 +0000
 +++ src/dns/dns_lookup.c
-@@ -194,6 +194,8 @@
+@@ -245,6 +245,8 @@
  /* Local stuff. */
 +struct __res_state rstate;
++
   /*
    * Structure to keep track of things while decoding a name server reply.
    */
-@@ -235,7 +237,7 @@ static int dns_query(const char *name, i
+@@ -308,7 +310,7 @@ typedef struct DNS_REPLY {
  /* dns_res_query - a res_query() clone that can return negative replies */
 -static int dns_res_query(const char *name, int class, int type,
 +static int dns_res_query(res_state statp, const char *name, int class, int type,
  			         unsigned char *answer, int anslen)
+ {
      unsigned char msg_buf[MAX_DNS_QUERY_SIZE];
@@ -337,14 +339,14 @@ static int dns_res_query(const char *nam
  #define NO_MKQUERY_DATA_LEN     ((int) 0)
  #define NO_MKQUERY_NEWRR        ((unsigned char *) 0)
 -    if ((len = res_mkquery(QUERY, name, class, type, NO_MKQUERY_DATA_BUF,
 +    if ((len = res_nmkquery(statp, QUERY, name, class, type, NO_MKQUERY_DATA_BUF,
  			   NO_MKQUERY_DATA_LEN, NO_MKQUERY_NEWRR,
  			   msg_buf, sizeof(msg_buf))) < 0) {
  	SET_H_ERRNO(NO_RECOVERY);
  	if (msg_verbose)
  	    msg_info("res_mkquery() failed");
  	return (len);
 -    } else if ((len = res_send(msg_buf, len, answer, anslen)) < 0) {
 +    } else if ((len = res_nsend(statp, msg_buf, len, answer, anslen)) < 0) {
  	SET_H_ERRNO(TRY_AGAIN);
  	if (msg_verbose)
  	    msg_info("res_send() failed");
@@ -373,7 +375,7 @@ static int dns_res_query(const char *nam
  /* dns_res_search - res_search() that can return negative replies */
 -static int dns_res_search(const char *name, int class, int type,
 +static int dns_res_search(res_state statp, const char *name, int class, int type,
  	               unsigned char *answer, int anslen, int keep_notfound)
+ {
      int     len;
@@ -396,7 +398,7 @@ static int dns_res_search(const char *na
      if (keep_notfound)
  	/* Prepare for returning a null-padded server reply. */
  	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
      /*
       * Initialize the name service.
       */
 -    if ((_res.options & RES_INIT) == 0 && res_init() < 0) {
 +    if ((rstate.options & RES_INIT) == 0 && res_ninit(&rstate) < 0) {
  	if (why)
  	    vstring_strcpy(why, "Name service initialization failure");
  	return (DNS_FAIL);
-@@ -264,18 +266,18 @@ static int dns_query(const char *name, i
+@@ -456,24 +458,24 @@ static int dns_query(const char *name, i
       */
  #define SAVE_FLAGS (USER_FLAGS | XTRA_FLAGS)
 -    saved_options = (_res.options & SAVE_FLAGS);
-+    saved_options = (rstate.options & USER_FLAGS);
++    saved_options = (rstate.options & SAVE_FLAGS);
      /*
       * Perform the lookup. Claim that the information cannot be found if and
       * only if the name server told us so.
       */
      for (;;) {
 -	_res.options &= ~saved_options;
 -	_res.options |= flags;
 -	len = res_search((char *) name, C_IN, type, reply->buf, reply->buf_len);
 -	_res.options &= ~flags;
 -	_res.options |= saved_options;
 +	rstate.options &= ~saved_options;
 +	rstate.options |= flags;
-+	len = res_nsearch(&rstate, (char *) name, C_IN, type, reply->buf, reply->buf_len);
+ 	if (keep_notfound && var_dns_ncache_ttl_fix) {
 -	    len = dns_res_query((char *) name, C_IN, type, reply->buf,
 +		len = dns_res_query(&rstate, (char *) name, C_IN, type, reply->buf,
  				reply->buf_len);
  	} else {
 -	    len = dns_res_search((char *) name, C_IN, type, reply->buf,
 +		len = dns_res_search(&rstate, (char *) name, C_IN, type, reply->buf,
  				 reply->buf_len, keep_notfound);
+ 	}
 -	_res.options &= ~flags;
 -	_res.options |= saved_options;
 +	rstate.options &= ~flags;
 +	rstate.options |= saved_options;
  	reply_header = (HEADER *) reply->buf;
  	reply->rcode = reply_header->rcode;
- 	if (len < 0) {
+ 	if (h_errno != 0) {

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2015/10/05 00:14:13 taca Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/18 17:10:28 taca Exp $
+#
 PKGREVISION=		1
 COMMENT=		Postfix SMTP server LMDB backend module
 POSTFIX_LIB=		lmdb
 POSTFIX_LIBDIR=		src/global
 POSTFIX_LIB_DICT=	yes
 POSTFIX_LIB_MKMAP=	yes
 .include "../../mail/postfix/Makefile.module"
 CCARGS+=		-I${BUILDLINK_PREFIX.lmdb}/include
 AUXLIBS_MODULE=		-L${BUILDLINK_PREFIX.lmdb}/lib -llmdb			\
 			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.lmdb}/lib

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2016/02/14 19:48:13 bsiegert Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/18 17:10:28 taca Exp $
+#
 PKGREVISION=		2
 COMMENT=		Postfix SMTP server PostgreSQL backend module
 POSTFIX_LIB=		pgsql
 POSTFIX_LIBDIR=		src/global
 POSTFIX_LIB_DICT=	yes
 POSTFIX_LIB_MKMAP=	no
 .include "../../mail/postfix/Makefile.module"
 CCARGS+=		-I${PGSQL_PREFIX}/include
 AUXLIBS_MODULE=		-L${PGSQL_PREFIX}/lib -lpq				\
 			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2016/04/11 19:01:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2016/09/18 17:10:28 taca Exp $
+#
 PKGREVISION=		3
 COMMENT=		Postfix SMTP server SQLite backend module
 POSTFIX_LIB=		sqlite
 POSTFIX_LIBDIR=		src/global
 POSTFIX_LIB_DICT=	yes
 POSTFIX_LIB_MKMAP=	no
 .include "../../mail/postfix/Makefile.module"
 CCARGS+=		-I${BUILDLINK_PREFIX.sqlite3}/include
 AUXLIBS_MODULE=		-L${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3		\
 			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib