Update to postfix 19990906-pl02. From the release notes:

Incompatible changes with postfix-19990906
==========================================

- On systems that use user.lock files to protect system mailboxes
against simultaneous updates, Postfix now uses /file/name.lock
files while delivering to files specified in aliases/forward/include
files. This is a no-op when the recipient lacks directory write
permission.

- The LDAP client code no longer looks up a name containing "*"
because it could be abused.  See the LDAP_README file for how to
restore previous behavior.

- The Postfix to PCRE interface now expects PCRE version 2.08.
Postfix is no longer compatible with PCRE versions prior to 2.06.

Major changes with postfix-19990906
===================================

Several bugfixes, none related to security.  See the HISTORY file
for a complete list of changes.

- Postfix is now distributed under IBM Public License Version 1.0
which does not carry the controversial termination clause. The new
license does have a requirement that contributors make source code
available.

- INSTALL.sh install/upgrade procedure that replaces existing
programs and shell scripts instead of overwriting them, and that
leaves existing queue files and configuration files alone.

- The ugly Delivered-To: header can now be turned off selectively.
The default setting is:  "prepend_delivered_header = command, file,
forward".  Turning off the Delivered-To:  header when forwarding
mail is not recommended.

- mysql client support by Scott Cotton and Joshua Marcus, Internet
Consultants Group, Inc. See the file MYSQL_README for instructions.

- reject_unauth_destination SMTP recipient restriction that rejects
destinations not in $relay_domains. Unlike the check_relay_domains
restriction, reject_unauth_destination ignores the client hostname.
By Lamont Jones of Hewlett-Packard.

- reject_unauth_pipelining SMTP *anything* restriction to stop mail
from spammers that improperly use SMTP command pipelining to speed
up their deliveries.

- Postfix "sendmail" now issues a warning and drops privileges if
installed set-uid root.

- No more duplicate delivery when "postfix reload" is immediately
followed by "sendmail -q".

- No more "invalid argument" errors when a Postfix daemon opens a
DB/DBM file while some other process is changing the file.

- Portability to the Mac OS X Server, Reliant Unix, AIX 3.2.5 and
Ultrix 4.3.

6 files changed, 41 insertions, 49 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index febbdc2d638..74e093de483 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 1999/07/08 07:58:43 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/09/12 00:14:52 simonb Exp $
 
-DISTNAME=	postfix-19990601
+DISTNAME=	postfix-19990906-pl02
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
diff --git a/mail/postfix/files/md5 b/mail/postfix/files/md5
index d13d331fdcc..dab602dffae 100644
--- a/mail/postfix/files/md5
+++ b/mail/postfix/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/06/27 20:09:23 christos Exp $
+$NetBSD: md5,v 1.4 1999/09/12 00:14:53 simonb Exp $
 
-MD5 (postfix-19990601.tar.gz) = adf54dfceb7950587b3e1a0966e84026
+MD5 (postfix-19990906-pl02.tar.gz) = 7d712bc007bcb05728347cb6a3fbd2be
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index b2f53cd0c3b..a879ddbedc6 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.2 1999/06/26 16:55:28 christos Exp $
+$NetBSD: patch-af,v 1.3 1999/09/12 00:14:53 simonb Exp $
 
---- conf/main.cf.orig	Wed Mar 17 23:35:48 1999
-+++ conf/main.cf	Sun May 30 18:49:15 1999
+--- conf/main.cf.orig	Tue Sep  7 06:20:55 1999
++++ conf/main.cf	Sat Sep 11 14:55:13 1999
 @@ -1,3 +1,5 @@
-+#	$NetBSD: patch-af,v 1.2 1999/06/26 16:55:28 christos Exp $
++#	$NetBSD: patch-af,v 1.3 1999/09/12 00:14:53 simonb Exp $
 +#
  # Global Postfix configuration file. This file lists only a subset
  # of all 100+ parameters. See the sample-xxx.cf files for a full list.
@@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.2 1999/06/26 16:55:28 christos Exp $
  # The command_directory parameter specifies the location of all
  # postXXX commands.  The default value is $program_directory.
  #
--#command_directory = /usr/sbin
+-command_directory = /usr/sbin
 +command_directory = __PREFIX/sbin
  
  # The daemon_directory parameter specifies the location of all Postfix
@@ -26,7 +26,7 @@ $NetBSD: patch-af,v 1.2 1999/06/26 16:55:28 christos Exp $
  # default value is $program_directory. This directory must be owned
  # by root.
  #
--#daemon_directory = /usr/libexec/postfix
+-daemon_directory = /usr/libexec/postfix
 +daemon_directory = __PREFIX/libexec/postfix
 +
 +# Shared files and etc directory
@@ -36,15 +36,7 @@ $NetBSD: patch-af,v 1.2 1999/06/26 16:55:28 christos Exp $
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -40,14 +47,14 @@
- # OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In particular,
- # don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
- #
--#mail_owner = postfix
-+mail_owner = postfix
- 
- # The default_privs parameter specifies the default rights used by
- # the local delivery agent for delivery to external file or command.
+@@ -47,7 +54,7 @@
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -53,7 +45,7 @@ $NetBSD: patch-af,v 1.2 1999/06/26 16:55:28 christos Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -347,8 +354,7 @@
+@@ -384,8 +391,7 @@
  # the process marches on. If you use an X-based debugger, be sure to
  # set up your XAUTHORITY environment variable before starting Postfix.
  #
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 19a90ea565b..6ad8586ad21 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,32 +1,31 @@
-$NetBSD: patch-ai,v 1.2 1999/06/27 00:11:03 christos Exp $
+$NetBSD: patch-ai,v 1.3 1999/09/12 00:14:53 simonb Exp $
 
 --- global/Makefile.orig	Sun May 30 18:49:13 1999
 +++ global/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,33 @@
-+#	$NetBSD: patch-ai,v 1.2 1999/06/27 00:11:03 christos Exp $
+@@ -0,0 +1,32 @@
++#	$NetBSD: patch-ai,v 1.3 1999/09/12 00:14:53 simonb Exp $
 +
 +LIB	= global
 +
-+SRCS	= been_here.c bounce.c canon_addr.c cleanup_strerror.c \
-+	debug_peer.c \
-+	debug_process.c defer.c deliver_completed.c deliver_flock.c \
-+	deliver_request.c domain_list.c dot_lockfile.c file_id.c \
-+	header_opts.c is_header.c mail_addr.c mail_addr_crunch.c \
-+	mail_addr_find.c mail_addr_map.c mail_command_read.c \
-+	mail_command_write.c mail_connect.c mail_copy.c mail_date.c \
-+	mail_error.c mail_flush.c mail_open_ok.c mail_params.c \
-+	mail_pathname.c mail_print.c mail_queue.c mail_run.c mail_scan.c \
-+	mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \
-+	mark_corrupt.c mkmap_db.c mkmap_dbm.c mkmap_open.c mynetworks.c \
-+	mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \
-+	peer_name.c pipe_command.c post_mail.c quote_822_local.c \
-+	rec_streamlf.c rec_type.c recipient_list.c record.c remove.c \
-+	resolve_clnt.c resolve_local.c rewrite_clnt.c sent.c smtp_stream.c \
-+	split_addr.c string_list.c sys_exits.c timed_ipc.c tok822_find.c \
-+	tok822_node.c tok822_parse.c tok822_resolve.c tok822_rewrite.c \
-+	tok822_tree.c clnt_stream.c deliver_pass.c ext_prop.c mail_conf.c \
++SRCS	= been_here.c bounce.c canon_addr.c cleanup_strerror.c clnt_stream.c \
++	debug_peer.c debug_process.c defer.c deliver_completed.c \
++	deliver_flock.c deliver_pass.c deliver_request.c domain_list.c \
++	dot_lockfile.c file_id.c header_opts.c is_header.c mail_addr.c \
++	mail_addr_crunch.c mail_addr_find.c mail_addr_map.c \
++	mail_command_read.c mail_command_write.c mail_conf.c \
 +	mail_conf_bool.c mail_conf_int.c mail_conf_raw.c mail_conf_str.c \
-+	mail_version.c rec2stream.c recdump.c stream2rec.c
++	mail_connect.c mail_copy.c mail_date.c mail_error.c mail_flush.c \
++	mail_open_ok.c mail_params.c mail_pathname.c mail_print.c \
++	mail_queue.c mail_run.c mail_scan.c mail_scan_dir.c mail_stream.c \
++	mail_task.c mail_trigger.c maps.c mark_corrupt.c mkmap_db.c \
++	mkmap_dbm.c mkmap_open.c mynetworks.c mypwd.c namadr_list.c \
++	off_cvt.c opened.c own_inet_addr.c peer_name.c pipe_command.c \
++	post_mail.c quote_822_local.c rec_streamlf.c rec_type.c \
++	recipient_list.c record.c remove.c resolve_clnt.c resolve_local.c \
++	rewrite_clnt.c sent.c smtp_stream.c split_addr.c string_list.c \
++	sys_exits.c timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
++	tok822_resolve.c tok822_rewrite.c tok822_tree.c ext_prop.c \
++	dot_lockfile_as.c
 +
 +MKLINT=		no
 +MKPIC=		no
diff --git a/mail/postfix/patches/patch-aj b/mail/postfix/patches/patch-aj
index 2ecce0e7958..df3d2631c58 100644
--- a/mail/postfix/patches/patch-aj
+++ b/mail/postfix/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.2 1999/06/27 00:11:03 christos Exp $
+$NetBSD: patch-aj,v 1.3 1999/09/12 00:14:53 simonb Exp $
 
 --- local/Makefile.orig	Sun May 30 18:49:13 1999
 +++ local/Makefile	Sun May 30 18:49:13 1999
 @@ -0,0 +1,18 @@
-+#	$NetBSD: patch-aj,v 1.2 1999/06/27 00:11:03 christos Exp $
++#	$NetBSD: patch-aj,v 1.3 1999/09/12 00:14:53 simonb Exp $
 +
 +.include "../conf/main.cf"
 +PROG=	local
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.2 1999/06/27 00:11:03 christos Exp $
 +
 +SRCS	= alias.c command.c delivered.c dotforward.c file.c forward.c \
 +	include.c indirect.c local.c mailbox.c recipient.c resolve.c token.c \
-+	deliver_attr.c feature.c maildir.c biff_notify.c unknown.c \
++	deliver_attr.c maildir.c biff_notify.c unknown.c \
 +	local_expand.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/mail/postfix/patches/patch-au b/mail/postfix/patches/patch-au
index 0c660e18898..e378d7398d8 100644
--- a/mail/postfix/patches/patch-au
+++ b/mail/postfix/patches/patch-au
@@ -1,9 +1,9 @@
-$NetBSD: patch-au,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-au,v 1.2 1999/09/12 00:14:53 simonb Exp $
 
 --- postconf/Makefile.orig	Sun May 30 18:49:13 1999
 +++ postconf/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,27 @@
-+#	$NetBSD: patch-au,v 1.1 1999/05/30 18:18:32 tron Exp $
+@@ -0,0 +1,28 @@
++#	$NetBSD: patch-au,v 1.2 1999/09/12 00:14:53 simonb Exp $
 +.include "../conf/main.cf"
 +PROG=	postconf
 +BINDIR=${command_directory}
@@ -23,8 +23,9 @@ $NetBSD: patch-au,v 1.1 1999/05/30 18:18:32 tron Exp $
 +# XXX
 +NOMAN=1
 +
++AWK?=	awk
 +${GENSRCS}: ${.CURDIR}/../global/mail_params.h
-+	sh ${.CURDIR}/extract.sh ${.CURDIR}/../*/*.c
++	$(AWK) -f $(.CURDIR)/extract.awk $(.CURDIR)/../*/*.c
 +
 +# XXX
 +${PSRCS}: ${GENSRCS}