Updated mail/postfix to 2.4.0

The footprint of new features with Postfix 2.4.0 is significantly
smaller than with earlier releases. And that is the whole point of
approaching completeness: fewer visible changes.

Below is a brief summary of what has changed.  See the RELEASE_NOTES
file for more, including compatibility issues that may affect your
site. The HISTORY file gives a blow-by-blow account of what happened
over the past year.

	Wietse

- Postfix can now manage thousands of connections without needing
special main.cf, master.cf, or compile-time tweaks, on systems with
BSD kqueue, Solaris /dev/poll, or Linux epoll support.

- Milter support for message body replacement. The resulting queue
files are backwards compatible with Postfix 2.3. The existing Milter
support for message header manipulations was revised and is now
implemented by much simpler code.

- Minor improvements in TLS session cache management and in the
implementation of certificate fingerprint based authentication.  A
more extensive revision of TLS internals will appear first in Postfix
2.5 snapshots.

- Improvements in queue manager performance when deferring large
amounts of mail, or when delivering mail with lots of recipients.

- Workarounds for SMTP servers that reply and hang up prematurely,
for file system clocks that are out of sync, and for broken kernel
lock management in POP servers.

6 files changed, 27 insertions, 28 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 7f926c239be..006ad38dd6d 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.200 2007/04/03 07:18:59 martti Exp $
+# $NetBSD: Makefile,v 1.201 2007/04/03 07:27:50 martti Exp $
 
-DISTNAME=	postfix-2.3.7
+DISTNAME=	postfix-2.4.0
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 47a9b66cbeb..a71c9ce8f42 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/07/13 09:57:51 martti Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/04/03 07:27:51 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -119,7 +119,6 @@ share/doc/postfix/INSTALL
 share/doc/postfix/IPV6_README
 share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README
-share/doc/postfix/LMTP_README
 share/doc/postfix/LOCAL_RECIPIENT_README
 share/doc/postfix/MAILDROP_README
 share/doc/postfix/MILTER_README
@@ -129,7 +128,6 @@ share/doc/postfix/OVERVIEW
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
 share/doc/postfix/PGSQL_README
-share/doc/postfix/QMQP_README
 share/doc/postfix/QSHAPE_README
 share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/RESTRICTION_CLASS_README
@@ -139,6 +137,7 @@ share/doc/postfix/SMTPD_ACCESS_README
 share/doc/postfix/SMTPD_POLICY_README
 share/doc/postfix/SMTPD_PROXY_README
 share/doc/postfix/STANDARD_CONFIGURATION_README
+share/doc/postfix/TLS_LEGACY_README
 share/doc/postfix/TLS_README
 share/doc/postfix/TUNING_README
 share/doc/postfix/ULTRIX_README
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index f033d04cf47..1804ccd0f01 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.109 2007/02/15 06:24:04 martti Exp $
+$NetBSD: distinfo,v 1.110 2007/04/03 07:27:51 martti Exp $
 
-SHA1 (postfix/postfix-2.3.7.tar.gz) = caac1243ea3cbb5f60380d5614f48cc21d3cff33
-RMD160 (postfix/postfix-2.3.7.tar.gz) = 5d3c1074f2ab02fba60cc5d7251af45bb15c9068
-Size (postfix/postfix-2.3.7.tar.gz) = 2785739 bytes
-SHA1 (patch-aa) = e53bc6644c2b7898b73f4604489021cb85514610
-SHA1 (patch-ag) = cb42a57876821b133df9520999d99f7e5efa541c
-SHA1 (patch-ai) = f82456cbac2840fb2da3e723c9942ad66e6437a0
+SHA1 (postfix/postfix-2.4.0.tar.gz) = 6223225e5ab116e09da27709ebce7dac3136fbe7
+RMD160 (postfix/postfix-2.4.0.tar.gz) = 00eb9e4510da1f6a0a0238417d147774deac50ce
+Size (postfix/postfix-2.4.0.tar.gz) = 2931537 bytes
+SHA1 (patch-aa) = acd87c45baa4da2341e9609f2d6276ec013be198
+SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
+SHA1 (patch-ai) = 68201eac6b479ad733ba851741cc1cc2e56f7c9f
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index a6e11bd9b5f..f3d301c7af2 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.17 2006/07/13 09:57:51 martti Exp $
+$NetBSD: patch-aa,v 1.18 2007/04/03 07:27:51 martti Exp $
 
---- postfix-install.orig	2005-08-14 01:51:38.000000000 +0000
-+++ postfix-install	2006-07-13 12:37:24.000000000 +0000
+--- postfix-install.orig	2007-03-25 23:44:02.000000000 +0300
++++ postfix-install	2007-04-03 08:51:05.000000000 +0300
 @@ -359,26 +359,6 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.17 2006/07/13 09:57:51 martti Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -725,10 +705,3 @@
+@@ -729,10 +709,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 522af62a4a1..5293fe4814f 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.23 2006/11/07 07:08:26 martti Exp $
+$NetBSD: patch-ag,v 1.24 2007/04/03 07:27:51 martti Exp $
 
---- src/util/sys_defs.h.orig	2006-09-28 22:55:47.000000000 +0000
-+++ src/util/sys_defs.h	2006-11-07 08:48:52.000000000 +0000
+--- src/util/sys_defs.h.orig	2007-03-25 00:45:33.000000000 +0200
++++ src/util/sys_defs.h	2007-04-03 08:51:26.000000000 +0300
 @@ -42,7 +42,9 @@
- #define DEF_MAILBOX_LOCK "flock"
+ #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
 +#ifndef HAS_DB
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 595dbc57619..6168e603d5f 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.19 2006/11/07 07:08:26 martti Exp $
+$NetBSD: patch-ai,v 1.20 2007/04/03 07:27:51 martti Exp $
 
---- makedefs.orig	2006-08-26 15:54:59.000000000 +0000
-+++ makedefs	2006-11-07 08:49:41.000000000 +0000
-@@ -118,6 +118,8 @@
+--- makedefs.orig	2007-03-24 15:30:18.000000000 +0200
++++ makedefs	2007-04-03 08:51:47.000000000 +0300
+@@ -130,6 +130,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.19 2006/11/07 07:08:26 martti Exp $
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -184,13 +186,6 @@
+@@ -196,13 +198,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -25,7 +25,7 @@ $NetBSD: patch-ai,v 1.19 2006/11/07 07:08:26 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -222,25 +217,8 @@
+@@ -234,25 +229,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -51,7 +51,7 @@ $NetBSD: patch-ai,v 1.19 2006/11/07 07:08:26 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -251,7 +229,6 @@
+@@ -263,7 +241,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -59,7 +59,7 @@ $NetBSD: patch-ai,v 1.19 2006/11/07 07:08:26 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -279,25 +256,13 @@
+@@ -332,25 +309,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"