use postfix 20010228-pl02 from wietse.

20010403

	Workaround: the mysql library can return null pointers
	rather than zero-length strings.

20010404

	Ergonomics: log additional information about the reason
	why "mail for XXX loops back to myself", when the local
	machine is the best MX host. File: smtp/smtp_addr.c.

20010406

	Changed some noisy LDAP client warnings into optional
	logging. LaMont Jones, util/dict_ldap.c.

20010411

	Bugfix: the SMTP server now replies with 550 instead of
	503 when it receives the DATA command without having received
	a valid recipient address. This is needed for the Sendmail
	client-side pipelining implementation. Problem reported by
	Lutz Jaenicke. File: smtpd/smtpd.c.

	Cleanup: shut up if chattr fails on Reiserfs and other file
	systems that do not support the respective attributes.
	Files: conf/postfix-script-{no,}sgid.

20010413

	Ergonomics: Postfix applications now warn when a DB or DBM
	file is out of date, and recommend to rebuild the table.
	Files: util/dict_db.c, util/dict_dbm.c.

20010414

	Bugfix: with a non-default inet_interfaces setting, the
	master ignored host information in master.cf host:port
	settings.  Fix by Jun-ichiro itojun Hagino @ iijlab.net.
	Files: master/master.h, master/master_ent.c.

20010426

	Bugfix: the SMTP server did not parse invalid MAIL FROM or
	RCPT TO addresses such as <first last <user@domain>> the
	way it was supposed to do.  I thought this was taken care
	of years ago. File:  smtpd/smtpd.c.

20010427

	Bugfix: smtpd would reject mail instead of replying with
	a 4xx temporary error code when, for example, an LDAP or
	mysql server was unavailable. Remotely based on a fix by
	Robert Kiessling @ de.easynet.net. File: smtpd/smtpd_check.c.

3 files changed, 38 insertions, 21 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 89b29215556..a10443c86d3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2001/04/24 00:52:13 itojun Exp $
+# $NetBSD: Makefile,v 1.38 2001/05/03 00:24:12 itojun Exp $
 
-DISTNAME=	postfix-20010228-pl01
-PKGNAME=	postfix-20010228pl1
+DISTNAME=	postfix-20010228-pl02
+PKGNAME=	postfix-20010228pl2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
-PATCHFILES=	postfix-20010228release-v6-20010424a.diff.gz \
+PATCHFILES=	postfix-20010228pl02-v6-20010503a.diff.gz \
 		postfix-20010228release-ercpt.diff
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
 		ftp://ftp.gw.com/pub/people/kim/patches/
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 3b735f87316..a1c9698ddad 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/04/24 00:52:13 itojun Exp $
+$NetBSD: distinfo,v 1.4 2001/05/03 00:24:12 itojun Exp $
 
-SHA1 (postfix/postfix-20010228-pl01.tar.gz) = ce4f51ac4edc09a4014cdca841f581939bd8e103
-Size (postfix/postfix-20010228-pl01.tar.gz) = 975575 bytes
-SHA1 (postfix/postfix-20010228release-v6-20010424a.diff.gz) = 88434e9bbfb20c7ff552b665ca0e8befef57c1b3
-Size (postfix/postfix-20010228release-v6-20010424a.diff.gz) = 23182 bytes
+SHA1 (postfix/postfix-20010228-pl02.tar.gz) = abc4dda3bbaf46d73700e47c0a9c6090b18e844f
+Size (postfix/postfix-20010228-pl02.tar.gz) = 979794 bytes
+SHA1 (postfix/postfix-20010228pl02-v6-20010503a.diff.gz) = a74f28dbbf604682ee518756b12d033a7f04b82e
+Size (postfix/postfix-20010228pl02-v6-20010503a.diff.gz) = 22651 bytes
 SHA1 (postfix/postfix-20010228release-ercpt.diff) = c6abc5d57ca1a36de85dadee878b266d707ad3cd
 Size (postfix/postfix-20010228release-ercpt.diff) = 4484 bytes
-SHA1 (patch-aa) = 0e54ee4a1538cbe116ff1c85cbcb50b08c09095b
+SHA1 (patch-aa) = f7d4185faa98a8348d3d993f7d477121dede43d7
 SHA1 (patch-af) = 1f96a9b36cc65b079839542cc4e7a3230318013c
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index b3f5839d5c4..a3dcdd9dd5e 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
+$NetBSD: patch-aa,v 1.8 2001/05/03 00:24:12 itojun Exp $
 
---- INSTALL.sh.orig	Thu Jan 25 11:02:53 2001
-+++ INSTALL.sh	Sun Feb  4 14:45:40 2001
+--- INSTALL.sh.orig	Sat Apr 28 02:47:23 2001
++++ INSTALL.sh	Thu May  3 09:10:27 2001
 @@ -7,39 +7,39 @@
  umask 022
  
@@ -132,7 +132,7 @@ $NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  
  # Sanity checks
  
-@@ -159,32 +156,32 @@
+@@ -159,40 +156,40 @@
  
  CONFIG_DIRECTORY=$install_root$config_directory
  
@@ -142,15 +142,32 @@ $NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
 -	eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$
 -    done
 -}
+-
+-test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf || {
+-    test -t 0 || {
+-	echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2
+-	echo file from a previous Postfix installation. 1>&2
+-	echo 1>&2
+-	echo Use interactive installation instead. 1>&2
+-	exit 1
+-    }
+-}
 +#test -f $CONFIG_DIRECTORY/main.cf && {
 +#    for name in daemon_directory command_directory queue_directory mail_owner 
 +#    do
 +#	eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$
 +#    done
 +#}
- 
--test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
-+#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
++
++#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf || {
++#    test -t 0 || {
++#	echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2
++#	echo file from a previous Postfix installation. 1>&2
++#	echo 1>&2
++#	echo Use interactive installation instead. 1>&2
++#	exit 1
++#    }
++#}
  
  # Override default settings.
  
@@ -187,7 +204,7 @@ $NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  
  # Sanity checks
  
-@@ -232,10 +229,10 @@
+@@ -240,10 +237,10 @@
  
  DAEMON_DIRECTORY=$install_root$daemon_directory
  COMMAND_DIRECTORY=$install_root$command_directory
@@ -201,7 +218,7 @@ $NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  MANPAGES=$install_root$manpages
  
  # Create any missing directories.
-@@ -244,7 +241,7 @@
+@@ -252,7 +249,7 @@
  test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
  test -d $COMMAND_DIRECTORY || mkdir -p $COMMAND_DIRECTORY || exit 1
  test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1
@@ -210,7 +227,7 @@ $NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  do
      dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'`
      test -d $dir || mkdir -p $dir || exit 1
-@@ -264,8 +261,8 @@
+@@ -272,8 +269,8 @@
  
  test -f bin/sendmail && {
      compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1
@@ -221,7 +238,7 @@ $NetBSD: patch-aa,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  }
  
  if [ -f $CONFIG_DIRECTORY/main.cf ]
-@@ -290,13 +287,13 @@
+@@ -298,13 +295,13 @@
      "mail_owner = $mail_owner" \
  || exit 1