Updated mail/postfix to 2.7.0

Postfix stable release 2.7.0 is available. For the past several
releases, the focus has moved towards improving the code and
documentation, and updating the system for changing environments.

- Improved before-queue content filter performance. With
  "smtpd_proxy_options = speed_adjust", the Postfix SMTP server
  receives the entire message before it connects to a before-queue
  content filter. Typically, this allows Postfix to handle the same
  mail load with fewer content filter processes.

- Improved address verification performance. The verify database
  is now persistent by default, and it is automatically cleaned
  periodically, Under overload conditions, the Postfix SMTP server
  no longer waits up to 6 seconds for an address probe to complete.

- Support for reputation management based on the local SMTP client
  IP address. This is typically implemented with "FILTER transportname:"
  actions in access maps or header/body checks, and mail delivery
  transports in master.cf with unique smtp_bind_address values.

- The postscreen daemon (a zombie-blocker in front of Postfix) is
  still too rough for a stable release, and will be made "mature"
  in the Postfix 2.8 development cycle (however you can use Postfix
  2.7 with the Postfix 2.8 postscreen and dnsblog executables and
  master.cf configuration; this code has already proven itself).

No functionality has been removed, but it is a good idea to review
the RELEASE_NOTES file for the usual minor incompatibilities or
limitations.

You can find Postfix version 2.7.0 at the mirrors listed at
http://www.postfix.org/

The same code is also available as Postfix snapshot 2.8-20100213.
Updated versions of Postfix version 2.6, 2.5 and perhaps earlier
will be released with the same fixes that were already included
with Postfix versions 2.7 and 2.8.

6 files changed, 32 insertions, 40 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 008c8165dd7..dca1b3bec24 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.230 2009/08/31 09:37:35 martti Exp $
+# $NetBSD: Makefile,v 1.231 2010/02/25 13:01:22 martti Exp $
 
-DISTNAME=	postfix-2.6.5
+DISTNAME=	postfix-2.7.0
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
@@ -124,10 +124,6 @@ CONF_FILES=		# empty
 CONF_FILES+=		${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 .endfor
 CONF_FILES_PERMS=	# empty
-.for i in post-install postfix-script
-CONF_FILES_PERMS+=	${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
-			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-.endfor
 
 MAKE_ENV+=		DEBUG= # empty
 
@@ -163,8 +159,6 @@ do-install:
 .endif
 	cd ${WRKSRC} && sh ./postfix-install -non-interactive		\
 		${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${DESTDIR}${EXAMPLEDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${DESTDIR}${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${EXAMPLEDIR}/mailer.conf
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 1b2b0533b99..3532e38759d 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/06/14 18:04:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/02/25 13:01:22 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -172,8 +172,6 @@ share/examples/postfix/main.cf
 share/examples/postfix/main.cf.default
 share/examples/postfix/makedefs.out
 share/examples/postfix/master.cf
-share/examples/postfix/post-install
-share/examples/postfix/postfix-script
 share/examples/postfix/relocated
 ${PLIST.csasl}share/examples/postfix/smtpd.conf
 share/examples/postfix/transport
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index de1f0bf966c..96b3c0598f1 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.128 2009/08/31 09:37:35 martti Exp $
+$NetBSD: distinfo,v 1.129 2010/02/25 13:01:22 martti Exp $
 
-SHA1 (postfix/postfix-2.6.5.tar.gz) = 98b04c719869b4bd61bec8749e2d57a219eb69a7
-RMD160 (postfix/postfix-2.6.5.tar.gz) = f9b308457b9d3dcc05eb30c47b8267450a552a23
-Size (postfix/postfix-2.6.5.tar.gz) = 3325444 bytes
+SHA1 (postfix/postfix-2.7.0.tar.gz) = 1ef2633c2e531d9d60db53ca0e26d4b1d95bc949
+RMD160 (postfix/postfix-2.7.0.tar.gz) = 8878c0b5b253a20bd7c64e066ee1ee72ab52073d
+Size (postfix/postfix-2.7.0.tar.gz) = 3418064 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa
-SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e
-SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622
+SHA1 (patch-ag) = af3f5dc5f0de77562927b3e9407289a58b7ebbc7
+SHA1 (patch-ai) = ef3feef8a4fe7781a89f7e087fc5780760b461b1
+SHA1 (patch-as) = 621b92e56606794f28ab267c6c5d723734471389
 SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
 SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index cb18093d89a..39694904f62 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.28 2009/05/13 10:33:23 martti Exp $
+$NetBSD: patch-ag,v 1.29 2010/02/25 13:01:23 martti Exp $
 
 Only define HAS_DB if it hasn't been defined.
 Add support for NetBSD 5.x and DragonFly BSD.
 
---- src/util/sys_defs.h.orig	2009-05-11 03:45:27.000000000 +0300
-+++ src/util/sys_defs.h	2009-05-13 12:25:40.000000000 +0300
-@@ -28,8 +28,8 @@
+--- src/util/sys_defs.h.orig	2009-11-15 01:32:37.000000000 +0200
++++ src/util/sys_defs.h	2010-02-25 14:47:46.000000000 +0200
+@@ -29,8 +29,8 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
      || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
@@ -16,7 +16,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  #define SUPPORTED
  #include <sys/types.h>
  #include <sys/param.h>
-@@ -42,7 +42,9 @@
+@@ -43,7 +43,9 @@
  #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
@@ -26,7 +26,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  #define HAS_SA_LEN
  #define DEF_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -158,9 +160,19 @@
+@@ -163,9 +165,19 @@
  #define HAS_FUTIMES
  #endif
  
@@ -46,7 +46,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
      || defined(USAGI_LIBINET6)
  #ifndef NO_IPV6
  # define HAS_IPV6
-@@ -169,14 +181,16 @@
+@@ -174,14 +186,16 @@
  
  #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index e707a6c7276..98b825757bc 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,20 +1,20 @@
-$NetBSD: patch-ai,v 1.25 2009/05/13 10:33:23 martti Exp $
+$NetBSD: patch-ai,v 1.26 2010/02/25 13:01:23 martti Exp $
 
 Make this pkgsrc friendly.
 Add support for NetBSD 5.x and DragonFly BSD.
 
---- makedefs.orig	2009-05-12 00:26:46.000000000 +0300
-+++ makedefs	2009-05-13 12:26:34.000000000 +0300
-@@ -144,6 +144,8 @@
+--- makedefs.orig	2010-02-03 22:58:58.000000000 +0200
++++ makedefs	2010-02-25 14:48:50.000000000 +0200
+@@ -146,6 +146,8 @@
  		;;
-   FreeBSD.7*)	SYSTYPE=FREEBSD7
+   FreeBSD.8*)	SYSTYPE=FREEBSD8
  		;;
 + DragonFly.*)	SYSTYPE=DRAGONFLY
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -160,6 +162,8 @@
+@@ -162,6 +164,8 @@
  		;;
     NetBSD.4*)	SYSTYPE=NETBSD4
  		;;
@@ -23,7 +23,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
     BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -212,13 +216,6 @@
+@@ -214,13 +218,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -37,7 +37,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -250,25 +247,8 @@
+@@ -252,25 +249,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -63,7 +63,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -279,7 +259,6 @@
+@@ -281,7 +261,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -71,7 +71,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -372,25 +351,13 @@
+@@ -383,25 +362,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"
diff --git a/mail/postfix/patches/patch-as b/mail/postfix/patches/patch-as
index b656ff9b2c7..1b1ad59bbf2 100644
--- a/mail/postfix/patches/patch-as
+++ b/mail/postfix/patches/patch-as
@@ -1,9 +1,9 @@
-$NetBSD: patch-as,v 1.5 2009/05/13 10:33:23 martti Exp $
+$NetBSD: patch-as,v 1.6 2010/02/25 13:01:23 martti Exp $
 
 Support for sqlite.
 
---- src/global/Makefile.in.orig	2009-02-13 03:25:05.000000000 +0200
-+++ src/global/Makefile.in	2009-05-13 12:27:54.000000000 +0300
+--- src/global/Makefile.in.orig	2009-10-07 03:09:52.000000000 +0300
++++ src/global/Makefile.in	2010-02-25 14:49:15.000000000 +0200
 @@ -4,7 +4,7 @@
  	clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \
  	defer.c deliver_completed.c deliver_flock.c deliver_pass.c \
@@ -31,7 +31,7 @@ Support for sqlite.
  	dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \
  	dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \
  	file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \
-@@ -862,6 +862,13 @@
+@@ -868,6 +868,13 @@
  dict_proxy.o: dict_proxy.h
  dict_proxy.o: mail_params.h
  dict_proxy.o: mail_proto.h
@@ -45,7 +45,7 @@ Support for sqlite.
  domain_list.o: ../../include/match_list.h
  domain_list.o: ../../include/match_ops.h
  domain_list.o: ../../include/sys_defs.h
-@@ -1233,6 +1240,7 @@
+@@ -1239,6 +1246,7 @@
  mail_dict.o: dict_mysql.h
  mail_dict.o: dict_pgsql.h
  mail_dict.o: dict_proxy.h