Update Postfix to version 2.5.1 (ok martti). Major changes over 2.4.x are:

- TLS (SSL) support was streamlined further, and provides a new security level
  based on certificate fingerprints instead of CA signatures. See TLS_README
  for details.

- Milter support was updated from the Sendmail 8.13 feature set and now
  includes most of the features that were introduced with Sendmail 8.14. See
  MILTER_README for details.

- Stress-adaptive configuration was introduced. This allows the Postfix SMTP
  server to temporarily adjust its rules under conditions of overload, such as
  a malware attack or backscatter flood. See STRESS_README for details.
  [pkgsrc: this obsoletes the "postfix-stress" option which provided the same
  functionality via a distribution patch]

- The queue manager scheduler was refined. It now provides per-transport
  scheduling controls and allows for adjustment of the sensitivity to mail
  delivery (non-)errors. See SCHEDULER_README.

- Security was improved by introducing a Postfix-owned data_directory for
  storage of randomness, caches and other non-queue data. This change avoids
  future security loopholes due to untrusted data sitting in root-owned files
  or in root-owned directories. Writes to legacy files in root-owned
  directories are automatically redirected to files in the new data_directory.

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

6 files changed, 26 insertions, 38 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 90b26109f07..d213b9f1512 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.214 2008/01/25 09:44:24 ghen Exp $
+# $NetBSD: Makefile,v 1.215 2008/02/18 17:45:34 ghen Exp $
 
-DISTNAME=	postfix-2.4.6
-PKGREVISION=	2
+DISTNAME=	postfix-2.5.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 DIST_SUBDIR=	postfix
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index c5618d3d976..56bb5a406bc 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/04/25 13:09:35 ghen Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/02/18 17:45:34 ghen Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -138,6 +138,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/STRESS_README
 share/doc/postfix/TLS_LEGACY_README
 share/doc/postfix/TLS_README
 share/doc/postfix/TUNING_README
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 3dd716afad2..15544e966cc 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.115 2008/01/14 13:29:24 ghen Exp $
+$NetBSD: distinfo,v 1.116 2008/02/18 17:45:34 ghen Exp $
 
-SHA1 (postfix/postfix-2.4-stress-patch.gz) = fa0f7f01358c8dde1757f1c98806bb1585e487c3
-RMD160 (postfix/postfix-2.4-stress-patch.gz) = 0f96dda904a40a60cd1e26d20ad3cee0af4a4e7d
-Size (postfix/postfix-2.4-stress-patch.gz) = 2947 bytes
-SHA1 (postfix/postfix-2.4.6.tar.gz) = 226222707fd8d963d3173070cac96370c453ffa7
-RMD160 (postfix/postfix-2.4.6.tar.gz) = 115b3a4eb982701e29db2e52e294ec8ee69bdae5
-Size (postfix/postfix-2.4.6.tar.gz) = 2935249 bytes
-SHA1 (patch-aa) = b8f4e67ac18dcd1e5e3c56ad587b4552c539caa0
+SHA1 (postfix/postfix-2.5.1.tar.gz) = 4ceb805b78aff4c872b7e55554d2364e06f695b3
+RMD160 (postfix/postfix-2.5.1.tar.gz) = cf414306742d642ccab78212ee33af955d7a9023
+Size (postfix/postfix-2.5.1.tar.gz) = 3153629 bytes
+SHA1 (patch-aa) = 757b6f1be1a51696f1c7d41ad520cba3b8420dcf
 SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
-SHA1 (patch-ai) = 68201eac6b479ad733ba851741cc1cc2e56f7c9f
+SHA1 (patch-ai) = 7b19361e77d25139134511331a82abcd26b5336d
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index b219ab92bec..34a0f4bc7e6 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.29 2008/01/25 09:44:24 ghen Exp $
+# $NetBSD: options.mk,v 1.30 2008/02/18 17:45:34 ghen Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postfix
-PKG_SUPPORTED_OPTIONS=	bdb ldap mysql mysql4 pcre pgsql sasl tls postfix-stress
+PKG_SUPPORTED_OPTIONS=	bdb ldap mysql mysql4 pcre pgsql sasl tls
 PKG_SUGGESTED_OPTIONS=	tls
 
 .include "../../mk/bsd.options.mk"
@@ -105,12 +105,3 @@ CONF_FILES+=	${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 PLIST_SUBST+=	SASL="@comment "
 CCARGS+=	-DDEF_SERVER_SASL_TYPE=\"dovecot\"
 .endif
-
-###
-### Postfix stress-adaptive behaviour, back-ported from Postfix 2.5
-### See http://www.postfix.org/STRESS_README.html#adapt
-###
-.if !empty(PKG_OPTIONS:Mpostfix-stress)
-PATCHFILES=	postfix-2.4-stress-patch.gz
-PATCH_SITES=	${MASTER_SITES}
-.endif
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 808f12b0a97..29c43343a8a 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2007/06/01 03:34:07 martti Exp $
+$NetBSD: patch-aa,v 1.20 2008/02/18 17:45:34 ghen Exp $
 
---- postfix-install.orig	2007-04-02 20:14:37.000000000 +0300
-+++ postfix-install	2007-06-01 06:26:07.000000000 +0300
-@@ -359,26 +359,6 @@
+--- postfix-install.orig	2007-12-05 02:16:40.000000000 +0200
++++ postfix-install	2008-01-17 15:59:23.000000000 +0200
+@@ -365,26 +365,6 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.19 2007/06/01 03:34:07 martti Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -735,10 +715,3 @@
+@@ -739,10 +719,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 6168e603d5f..7baf7bea165 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.20 2007/04/03 07:27:51 martti Exp $
+$NetBSD: patch-ai,v 1.21 2008/02/18 17:45:34 ghen Exp $
 
---- makedefs.orig	2007-03-24 15:30:18.000000000 +0200
-+++ makedefs	2007-04-03 08:51:47.000000000 +0300
-@@ -130,6 +130,8 @@
+--- makedefs.orig	2007-08-19 14:28:11.000000000 +0000
++++ makedefs	2007-10-22 05:50:31.000000000 +0000
+@@ -132,6 +132,8 @@
  		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
+   FreeBSD.7*)	SYSTYPE=FREEBSD7
  		;;
 +  DragonFly.1*)	SYSTYPE=FREEBSD4
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -196,13 +198,6 @@
+@@ -198,13 +200,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -25,7 +25,7 @@ $NetBSD: patch-ai,v 1.20 2007/04/03 07:27:51 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -234,25 +229,8 @@
+@@ -236,25 +231,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -51,7 +51,7 @@ $NetBSD: patch-ai,v 1.20 2007/04/03 07:27:51 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -263,7 +241,6 @@
+@@ -265,7 +243,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -59,7 +59,7 @@ $NetBSD: patch-ai,v 1.20 2007/04/03 07:27:51 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -332,25 +309,13 @@
+@@ -360,25 +337,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"