use 2000/10/05 + IPv6 patch. changes are really too many to paste here.

mostly SASL related changes, it seems.

7 files changed, 60 insertions, 103 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 8b39cfc40cf..91d481331b2 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/10/15 14:10:19 itojun Exp $
 
-DISTNAME=	snapshot-20000531
-PKGNAME=	postfix-20000531
+DISTNAME=	snapshot-20001005
+PKGNAME=	postfix-20001005
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/experimental/
 
-PATCHFILES=	postfix-20000531snap-v6-20000814b.diff.gz
+PATCHFILES=	postfix-20001005snap-v6-20001011a.diff.gz
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCH_DIST_STRIP=	-p1
+PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
@@ -35,14 +35,14 @@ ALL_TARGET=	#empty
 
 pre-configure:
 	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
-	${CP} ${WRKSRC}/util/sys_defs.h ${WRKSRC}/util/sys_defs.h.dist
+	${CP} ${WRKSRC}/src/util/sys_defs.h ${WRKSRC}/src/util/sys_defs.h.dist
 	${CP} ${WRKSRC}/INSTALL.sh ${WRKSRC}/INSTALL.sh.dist
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/conf/main.cf.dist \
 	    > ${WRKSRC}/conf/main.cf
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/util/sys_defs.h.dist \
-	    > ${WRKSRC}/util/sys_defs.h
+	    < ${WRKSRC}/src/util/sys_defs.h.dist \
+	    > ${WRKSRC}/src/util/sys_defs.h
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/INSTALL.sh.dist \
 	    > ${WRKSRC}/INSTALL.sh
diff --git a/mail/postfix-current/files/md5 b/mail/postfix-current/files/md5
index 74a60896d18..4262915f426 100644
--- a/mail/postfix-current/files/md5
+++ b/mail/postfix-current/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.2 2000/08/14 04:39:59 itojun Exp $
+$NetBSD: md5,v 1.3 2000/10/15 14:10:20 itojun Exp $
 
-MD5 (postfix/snapshot-20000531.tar.gz) = 5b25b37dc40e9982ec443cae1bda8c10
-MD5 (postfix/postfix-20000531snap-v6-20000814b.diff.gz) = e54eaf478fa509b160a0a5c3f285c643
+MD5 (postfix/snapshot-20001005.tar.gz) = 6a6f263037043536659bcfe3b58437f6
+MD5 (postfix/postfix-20001005snap-v6-20001011a.diff.gz) = 2aca31132e934918c38ee2e619431dc1
diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum
index 6148f8bdde3..b26aba6b078 100644
--- a/mail/postfix-current/files/patch-sum
+++ b/mail/postfix-current/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/10/04 15:22:41 christos Exp $
+$NetBSD: patch-sum,v 1.9 2000/10/15 14:10:20 itojun Exp $
 
-MD5 (patch-aa) = 357c00b48cea63e8ee9dec43bbe6a210
-MD5 (patch-ab) = 25d4b0b2867907ff6fc0a865639f0113
-MD5 (patch-af) = f441d8a6613df506f8fbe9b87537035e
+MD5 (patch-aa) = 79b6fe73755ce399cd7feae2d964529c
+MD5 (patch-af) = 5ad4a94cfb01558b6097da27af5ba84f
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index f0fa6f5e23b..94b9d11ef6b 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
---- INSTALL.sh.orig	Mon Aug 14 19:32:38 2000
-+++ INSTALL.sh	Mon Aug 14 19:33:07 2000
-@@ -6,39 +6,39 @@
- PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc
- umask 022
+$NetBSD: patch-aa,v 1.7 2000/10/15 14:10:20 itojun Exp $
+
+--- INSTALL.sh.orig	Wed Sep 20 22:06:06 2000
++++ INSTALL.sh	Wed Oct 11 11:42:36 2000
+@@ -8,35 +8,35 @@
  
 -cat <<EOF
 -
@@ -72,34 +71,30 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
 +#
 +#EOF
  
- # By now, shells must have functions. Ultrix users must use sh5 or lose.
- # The following shell functions replace files/symlinks while minimizing
-@@ -104,34 +104,31 @@
- 
- install_root=/
- tempdir=`pwd`
--config_directory=/etc/postfix
--daemon_directory=/usr/libexec/postfix
--command_directory=/usr/sbin
-+config_directory=__PREFIX/share/postfix
-+daemon_directory=__PREFIX/libexec/postfix
-+command_directory=__PREFIX/sbin
- queue_directory=/var/spool/postfix
+@@ -110,15 +110,12 @@
+ : ${tempdir=`pwd`}
+-: ${config_directory=/etc/postfix}
+-: ${daemon_directory=/usr/libexec/postfix}
+-: ${command_directory=/usr/sbin}
++: ${config_directory=__PREFIX/share/postfix}
++: ${daemon_directory=__PREFIX/libexec/postfix}
++: ${command_directory=__PREFIX/sbin}
+ : ${queue_directory=/var/spool/postfix}
 -if [ -f /usr/lib/sendmail ]
--    then sendmail_path=/usr/lib/sendmail 
--    else sendmail_path=/usr/sbin/sendmail
+-    then : ${sendmail_path=/usr/lib/sendmail}
+-    else : ${sendmail_path=/usr/sbin/sendmail}
 -fi
--newaliases_path=/usr/bin/newaliases
--mailq_path=/usr/bin/mailq
-+sendmail_path=__PREFIX/libexec/postfix/sendmail
-+#newaliases_path=/usr/bin/newaliases
-+#mailq_path=/usr/bin/mailq
- mail_owner=postfix
- setgid=no
--manpages=/usr/local/man
-+manpages=__PREFIX/man
- 
- # Find out the location of configuration files.
+-: ${newaliases_path=/usr/bin/newaliases}
+-: ${mailq_path=/usr/bin/mailq}
++: ${sendmail_path=__PREFIX/libexec/postfix/sendmail}
++#: ${newaliases_path=/usr/bin/newaliases}
++#: ${mailq_path=/usr/bin/mailq}
+ : ${mail_owner=postfix}
+ : ${setgid=no}
+-: ${manpages=/usr/local/man}
++: ${manpages=__PREFIX/man}
+ 
+@@ -126,14 +123,14 @@
  
 -for name in install_root tempdir config_directory
 -do
@@ -126,11 +121,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
 +#    done
 +#done
  
- # Sanity checks
- 
-@@ -153,31 +150,31 @@
- 
- CONFIG_DIRECTORY=$install_root$config_directory
+@@ -159,10 +156,10 @@
  
 -test -f $CONFIG_DIRECTORY/main.cf && {
 -    for name in daemon_directory command_directory queue_directory mail_owner 
@@ -148,7 +139,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
 -test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
 +#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
  
- # Override default settings.
+@@ -170,16 +167,16 @@
  
 -for name in daemon_directory command_directory \
 -    queue_directory sendmail_path newaliases_path mailq_path mail_owner\
@@ -179,11 +170,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
 +#    done
 +#done
  
- # Sanity checks
- 
-@@ -225,10 +222,10 @@
- 
- DAEMON_DIRECTORY=$install_root$daemon_directory
+@@ -231,6 +228,6 @@
  COMMAND_DIRECTORY=$install_root$command_directory
 -QUEUE_DIRECTORY=$install_root$queue_directory
 +QUEUE_DIRECTORY=$queue_directory
@@ -193,31 +180,19 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
 +#NEWALIASES_PATH=$install_root$newaliases_path
 +#MAILQ_PATH=$install_root$mailq_path
  MANPAGES=$install_root$manpages
- 
- # Create any missing directories.
-@@ -237,7 +234,7 @@
- test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
- test -d $COMMAND_DIRECTORY || mkdir -p $COMMAND_DIRECTORY || exit 1
+@@ -243,3 +240,3 @@
  test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1
 -for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH
 +for path in $SENDMAIL_PATH
  do
-     dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'`
-     test -d $dir || mkdir -p $dir || exit 1
-@@ -257,8 +254,8 @@
- 
- test -f bin/sendmail && {
+@@ -263,4 +260,4 @@
      compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1
 -    compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
 -    compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
 +#    compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
 +#    compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
  }
- 
- if [ -f $CONFIG_DIRECTORY/main.cf ]
-@@ -290,13 +287,13 @@
-     "mail_owner = $mail_owner" \
- || exit 1
+@@ -296,9 +293,9 @@
  
 -(echo "# This file was generated by $0"
 -for name in sendmail_path newaliases_path mailq_path setgid manpages
@@ -234,5 +209,3 @@ $NetBSD: patch-aa,v 1.6 2000/08/14 11:26:46 itojun Exp $
 +#compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1
 +#rm -f $tempdir/junk
  
- # Use set-gid privileges instead of writable maildrop (optional).
- 
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
deleted file mode 100644
index 6c424b0ca0e..00000000000
--- a/mail/postfix-current/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/10/04 15:22:10 christos Exp $
-
---- makedefs.orig	Tue Oct  3 18:47:56 2000
-+++ makedefs	Tue Oct  3 19:20:56 2000
-@@ -174,7 +174,7 @@
- 		*)	echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;;
- 		esac;;
-     Linux.2*)	SYSTYPE=LINUX2
--		for name in db nsl resolv
-+		for name in db db1 nsl resolv
- 		do
- 		    test -f /usr/lib/lib$name.a && SYSLIBS="$SYSLIBS -l$name"
- 		done
-@@ -182,6 +182,8 @@
- 		    CCARGS="$CCARGS -DPATH_DB_H='<db_185.h>'"
- 		elif [ -f /usr/include/db/db.h ]; then
- 		    CCARGS="$CCARGS -DPATH_DB_H='<db/db.h>'"
-+		elif [ -f /usr/include/db1/db.h ]; then
-+		    CCARGS="$CCARGS -DPATH_DB_H='<db1/db.h>'"
- 		fi
- 		;;
-      IRIX*.5.*)	SYSTYPE=IRIX5
diff --git a/mail/postfix-current/patches/patch-af b/mail/postfix-current/patches/patch-af
index 778376bd128..93fc233f5ad 100644
--- a/mail/postfix-current/patches/patch-af
+++ b/mail/postfix-current/patches/patch-af
@@ -1,8 +1,9 @@
-$NetBSD: patch-af,v 1.4 2000/08/14 05:10:53 itojun Exp $
---- conf/main.cf.orig	Mon Aug 14 13:51:15 2000
-+++ conf/main.cf	Mon Aug 14 14:07:32 2000
+$NetBSD: patch-af,v 1.5 2000/10/15 14:10:20 itojun Exp $
+
+--- conf/main.cf.orig	Fri Oct  6 00:01:00 2000
++++ conf/main.cf	Wed Oct 11 11:40:57 2000
 @@ -1 +1,3 @@
-+#	$NetBSD: patch-af,v 1.4 2000/08/14 05:10:53 itojun Exp $
++#	$NetBSD: patch-af,v 1.5 2000/10/15 14:10:20 itojun Exp $
 +#
  # Global Postfix configuration file. This file lists only a subset
 @@ -19,3 +21,3 @@
@@ -30,7 +31,7 @@ $NetBSD: patch-af,v 1.4 2000/08/14 05:10:53 itojun Exp $
 +# listen to IPv4 and IPv6 smtp socket
 +inet_interfaces = 0.0.0.0, ::
  
-@@ -376,5 +385,4 @@
+@@ -417,5 +426,4 @@
  #
 -debugger_command =
 -	 PATH=/usr/bin:/usr/X11R6/bin
diff --git a/mail/postfix-current/pkg/PLIST b/mail/postfix-current/pkg/PLIST
index 7069a72ac34..b3b4410ae43 100644
--- a/mail/postfix-current/pkg/PLIST
+++ b/mail/postfix-current/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/14 05:28:26 itojun Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/10/15 14:10:20 itojun Exp $
 etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
+libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
@@ -14,6 +15,7 @@ libexec/postfix/sendmail
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
+libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
 sbin/postalias
 sbin/postcat
@@ -45,6 +47,7 @@ share/postfix/sample-auth.cf
 share/postfix/sample-canonical.cf
 share/postfix/sample-debug.cf
 share/postfix/sample-filter.cf
+share/postfix/sample-flush.cf
 share/postfix/sample-ldap.cf
 share/postfix/sample-local.cf
 share/postfix/sample-misc.cf
@@ -85,15 +88,18 @@ man/man8/bounce.8
 man/man8/cleanup.8
 man/man8/defer.8
 man/man8/error.8
+man/man8/flush.8
 man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
+man/man8/nqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
 man/man8/qmgr.8
 man/man8/showq.8
 man/man8/smtp.8
 man/man8/smtpd.8
+man/man8/spawn.8
 man/man8/trivial-rewrite.8
 @dirrm share/postfix
 @dirrm share/doc/postfix