Update Postfix to 19991231-pl06.

Addresses PR pkg/9844 from Oleg Polyanski.

10 files changed, 46 insertions, 75 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index afb03a6b54e..63f2f473023 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2000/01/09 01:29:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2000/04/09 08:10:19 simonb Exp $
 
-DISTNAME=	postfix-19990906-pl02
-PKGNAME=	postfix-19990906pl02
+DISTNAME=	postfix-19991231-pl06
+PKGNAME=	postfix-19991231pl06
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
diff --git a/mail/postfix/files/md5 b/mail/postfix/files/md5
index dab602dffae..ffef97a9ede 100644
--- a/mail/postfix/files/md5
+++ b/mail/postfix/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/09/12 00:14:53 simonb Exp $
+$NetBSD: md5,v 1.5 2000/04/09 08:10:20 simonb Exp $
 
-MD5 (postfix-19990906-pl02.tar.gz) = 7d712bc007bcb05728347cb6a3fbd2be
+MD5 (postfix-19991231-pl06.tar.gz) = 7630d7466569c08f1fdf7c437cef0a14
diff --git a/mail/postfix/files/patch-sum b/mail/postfix/files/patch-sum
index 6e397d768e5..90b7657ccef 100644
--- a/mail/postfix/files/patch-sum
+++ b/mail/postfix/files/patch-sum
@@ -1,14 +1,14 @@
-$NetBSD: patch-sum,v 1.6 2000/01/16 00:51:06 sommerfeld Exp $
+$NetBSD: patch-sum,v 1.7 2000/04/09 08:10:20 simonb Exp $
 
 MD5 (patch-aa) = cdf2646ba580757237d38ddd98768214
 MD5 (patch-ab) = 8b503cf0ecfaffdfefa2273631588d30
 MD5 (patch-ac) = 97942ae862063e7a004ccaf763c0322f
 MD5 (patch-ad) = 78efb242774fead3f76268cf6b061947
-MD5 (patch-ae) = 3ef93a7b18f0d7724b3b385701f1888c
-MD5 (patch-af) = 431b255709c6fb3b2a397394be61181c
+MD5 (patch-ae) = 8fe4ad7a6e51f2b7f8a4fd8fd78521bc
+MD5 (patch-af) = 75ac9870384f28958d4d3645dc45fff6
 MD5 (patch-ag) = d4dbd0aede1994b1ccf1d29c3bbeb0d1
 MD5 (patch-ah) = e91ff490a3ebc60961dd51130b329abe
-MD5 (patch-ai) = 53e71acf589917d4904b6e18f5ce75b3
+MD5 (patch-ai) = ed1273fc7b6f920733f4985c98fca03b
 MD5 (patch-aj) = 0cc01c3d3caec25e2889004af910f07e
 MD5 (patch-ak) = 3ce753b4951c5b52f8f0c0873189481c
 MD5 (patch-al) = def9b532bd501c1f34c6f8406930de6e
@@ -33,9 +33,9 @@ MD5 (patch-bd) = 3fa0301b61102bb0b73df40fd504a0a2
 MD5 (patch-be) = 40a4fd8f3896771f76061864926394db
 MD5 (patch-bf) = 76c734a8cab7f18ed911cbdb02a52236
 MD5 (patch-bg) = 4e577781f6960c0ca075c1eb4064fc2b
-MD5 (patch-bh) = 547f94963b74b887d18f0869c75c9635
+MD5 (patch-bh) = 712cf7c58c498ffcae77dae1704c95d7
 MD5 (patch-bi) = 51b31d6c1d255e3d808a243f4e436ca6
-MD5 (patch-bj) = dd7d8fd4f08855ef3397ef7c64a8c568
+MD5 (patch-bj) = 8285b9ba17e546b6e52561716ff8ec63
 MD5 (patch-bk) = a1458a452098452961cd8e5114092a41
 MD5 (patch-bl) = 11c5b30d4da4352b5a109bb805e409b5
 MD5 (patch-bm) = c1f055fbe88ab12f02393edb93a21d4f
@@ -44,4 +44,3 @@ MD5 (patch-bo) = e2ee220c316ad8a3530b3ffb0bc069bc
 MD5 (patch-bp) = 6cacc40a5e145fa0d83179f0712fe4e5
 MD5 (patch-bq) = 28f7c23282edafb36d3754c022f44178
 MD5 (patch-br) = c9bded674e4e2d415f06da232cab26c4
-MD5 (patch-bs) = c4e2c5417c2a18e523531dd88ae8dfb0
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
index 6ebf1018283..8bbbb52fd4c 100644
--- a/mail/postfix/patches/patch-ae
+++ b/mail/postfix/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $
+$NetBSD: patch-ae,v 1.2 2000/04/09 08:10:20 simonb Exp $
 
 --- conf/Makefile.orig	Sun May 30 18:49:12 1999
 +++ conf/Makefile	Sun May 30 18:49:12 1999
-@@ -0,0 +1,17 @@
-+#	$NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $
+@@ -0,0 +1,16 @@
++#	$NetBSD: patch-ae,v 1.2 2000/04/09 08:10:20 simonb Exp $
 +.include "../conf/main.cf"
 +
 +BINDIR=		${share_directory}
@@ -11,12 +11,11 @@ $NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $
 +
 +FILES=		LICENSE Makefile access aliases canonical main.cf master.cf \
 +		relocated sample-aliases.cf sample-canonical.cf \
-+		sample-debug.cf sample-ldap.cf sample-local.cf \
-+		sample-misc.cf sample-pcre.cf sample-rate.cf \
-+		sample-relocated.cf sample-resource.cf \
-+		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-+		sample-transport.cf sample-virtual.cf transport virtual 
++		sample-debug.cf sample-ldap.cf sample-local.cf sample-misc.cf \
++		sample-pcre.cf sample-rate.cf sample-regexp.cf \
++		sample-relocated.cf sample-resource.cf sample-rewrite.cf \
++		sample-smtp.cf sample-smtpd.cf sample-transport.cf \
++		sample-virtual.cf transport virtual
 +SCRIPTS=	postfix-script-sgid postfix-script-nosgid
 +
 +.include <bsd.prog.mk>
-+
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index a879ddbedc6..5c0f5a674ec 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,20 +1,14 @@
-$NetBSD: patch-af,v 1.3 1999/09/12 00:14:53 simonb Exp $
+$NetBSD: patch-af,v 1.4 2000/04/09 08:10:20 simonb Exp $
 
---- conf/main.cf.orig	Tue Sep  7 06:20:55 1999
-+++ conf/main.cf	Sat Sep 11 14:55:13 1999
+--- conf/main.cf.orig	Fri Jan  7 01:52:45 2000
++++ conf/main.cf	Thu Mar  2 10:56:58 2000
 @@ -1,3 +1,5 @@
-+#	$NetBSD: patch-af,v 1.3 1999/09/12 00:14:53 simonb Exp $
++#	$NetBSD: patch-af,v 1.4 2000/04/09 08:10:20 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,19 +20,24 @@
- # Postfix support programs and daemons. This setting can be overruled
- # with the command_directory and daemon_directory parameters.
- #
--program_directory = /some/where/postfix/bin
-+#program_directory = /some/where/postfix/bin
- 
+@@ -17,14 +19,19 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.  The default value is $program_directory.
  #
@@ -36,7 +30,7 @@ $NetBSD: patch-af,v 1.3 1999/09/12 00:14:53 simonb Exp $
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -47,7 +54,7 @@
+@@ -41,7 +48,7 @@
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -45,7 +39,7 @@ $NetBSD: patch-af,v 1.3 1999/09/12 00:14:53 simonb Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -384,8 +391,7 @@
+@@ -376,8 +383,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 6ad8586ad21..f55ff4c72d7 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,16 +1,17 @@
-$NetBSD: patch-ai,v 1.3 1999/09/12 00:14:53 simonb Exp $
+$NetBSD: patch-ai,v 1.4 2000/04/09 08:10:20 simonb Exp $
 
 --- global/Makefile.orig	Sun May 30 18:49:13 1999
 +++ global/Makefile	Sun May 30 18:49:13 1999
 @@ -0,0 +1,32 @@
-+#	$NetBSD: patch-ai,v 1.3 1999/09/12 00:14:53 simonb Exp $
++#	$NetBSD: patch-ai,v 1.4 2000/04/09 08:10:20 simonb Exp $
 +
 +LIB	= global
 +
 +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 \
++	dot_lockfile.c dot_lockfile_as.c ext_prop.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 \
@@ -24,8 +25,7 @@ $NetBSD: patch-ai,v 1.3 1999/09/12 00:14:53 simonb Exp $
 +	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
++	tok822_resolve.c tok822_rewrite.c tok822_tree.c
 +
 +MKLINT=		no
 +MKPIC=		no
diff --git a/mail/postfix/patches/patch-bh b/mail/postfix/patches/patch-bh
index 94900666f52..43d32b1c72b 100644
--- a/mail/postfix/patches/patch-bh
+++ b/mail/postfix/patches/patch-bh
@@ -1,15 +1,16 @@
-$NetBSD: patch-bh,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bh,v 1.2 2000/04/09 08:10:20 simonb Exp $
 
 --- smtpd/Makefile.orig	Sun May 30 18:49:14 1999
 +++ smtpd/Makefile	Sun May 30 18:49:14 1999
-@@ -0,0 +1,16 @@
-+#	$NetBSD: patch-bh,v 1.1 1999/05/30 18:18:33 tron Exp $
+@@ -0,0 +1,17 @@
++#	$NetBSD: patch-bh,v 1.2 2000/04/09 08:10:20 simonb Exp $
 +.include "../conf/main.cf"
 +
 +PROG=	smtpd
 +BINDIR=${daemon_directory}
 +
-+SRCS	= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c
++SRCS	= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
++	smtpd_peer.c
 +
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
diff --git a/mail/postfix/patches/patch-bj b/mail/postfix/patches/patch-bj
index 1853449c444..75d56f01e3b 100644
--- a/mail/postfix/patches/patch-bj
+++ b/mail/postfix/patches/patch-bj
@@ -1,14 +1,14 @@
-$NetBSD: patch-bj,v 1.2 1999/06/27 00:11:03 christos Exp $
+$NetBSD: patch-bj,v 1.3 2000/04/09 08:10:21 simonb Exp $
 
 --- util/Makefile.orig	Sun May 30 18:49:14 1999
 +++ util/Makefile	Sun May 30 18:49:14 1999
-@@ -0,0 +1,35 @@
-+#	$NetBSD: patch-bj,v 1.2 1999/06/27 00:11:03 christos Exp $
+@@ -0,0 +1,34 @@
++#	$NetBSD: patch-bj,v 1.3 2000/04/09 08:10:21 simonb Exp $
 +
 +LIB=	util
-+SRCS=	argv.c argv_split.c attr.c basename.c binhash.c chroot_uid.c \
++SRCS	= argv.c argv_split.c attr.c basename.c binhash.c chroot_uid.c \
 +	close_on_exec.c concatenate.c dict.c dict_db.c dict_dbm.c \
-+	dict_env.c dict_ht.c dict_ldap.c dict_ni.c dict_nis.c \
++	dict_env.c dict_ht.c dict_ldap.c dict_mysql.c dict_ni.c dict_nis.c \
 +	dict_nisplus.c dict_open.c dir_forest.c doze.c environ.c \
 +	events.c exec_command.c fifo_listen.c fifo_trigger.c file_limit.c \
 +	find_inet.c fsspace.c fullname.c get_domainname.c get_hostname.c \
@@ -25,10 +25,9 @@ $NetBSD: patch-bj,v 1.2 1999/06/27 00:11:03 christos Exp $
 +	translit.c trimblanks.c unix_connect.c unix_listen.c unix_trigger.c \
 +	unsafe.c username.c valid_hostname.c vbuf.c vbuf_print.c \
 +	vstream.c vstream_popen.c vstring.c vstring_vstream.c writable.c \
-+	write_buf.c write_wait.c dict_unix.c dict_pcre.c clean_env.c \
-+	dict_regexp.c fifo_open.c fifo_rdonly_bug.c fifo_rdwr_bug.c \
-+	mac_expand.c select_bug.c stream_connect.c stream_listen.c \
-+	stream_trigger.c
++	write_buf.c write_wait.c dict_unix.c dict_pcre.c stream_listen.c \
++	stream_connect.c stream_trigger.c dict_regexp.c mac_expand.c \
++	clean_env.c watchdog.c spawn_command.c sane_rename.c sane_link.c
 +
 +MKLINT=		no
 +MKPIC=		no
diff --git a/mail/postfix/patches/patch-bs b/mail/postfix/patches/patch-bs
deleted file mode 100644
index 756ca03b67f..00000000000
--- a/mail/postfix/patches/patch-bs
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bs,v 1.1 2000/01/16 00:51:07 sommerfeld Exp $
-
---- util/inet_addr_local.c.orig	Fri Aug 27 08:08:43 1999
-+++ util/inet_addr_local.c	Sat Jan 15 17:41:30 2000
-@@ -42,6 +42,7 @@
- #include <sys/sockio.h>
- #endif
- #include <errno.h>
-+#include <string.h>
- 
- /* Utility library. */
- 
-@@ -114,7 +115,8 @@
-     the_end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
-     for (ifr = ifc.ifc_req; ifr < the_end;) {
- 	if (ifr->ifr_addr.sa_family == AF_INET) {	/* IP interface */
--	    ifreq = *ifr;
-+	    char *ifrp = (char *)ifr;
-+	    memcpy(&ifreq, ifrp, sizeof(*ifr));
- 	    if (ioctl(sock, SIOCGIFFLAGS, (char *) &ifreq) < 0)
- 		msg_fatal("%s: ioctl SIOCGIFFLAGS: %m", myname);
- 	    if (ifreq.ifr_flags & IFF_UP) {	/* active interface */
diff --git a/mail/postfix/pkg/PLIST b/mail/postfix/pkg/PLIST
index e64d4051017..23c111987c5 100644
--- a/mail/postfix/pkg/PLIST
+++ b/mail/postfix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1999/09/14 02:07:00 simonb Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/04/09 08:10:21 simonb Exp $
 etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
@@ -99,6 +99,7 @@ share/postfix/sample-local.cf
 share/postfix/sample-misc.cf
 share/postfix/sample-pcre.cf
 share/postfix/sample-rate.cf
+share/postfix/sample-regexp.cf
 share/postfix/sample-relocated.cf
 share/postfix/sample-resource.cf
 share/postfix/sample-rewrite.cf