upgrade to 20010202 (beta) with latest IPv6 patch.

Major changes with snapshot-20010202
====================================

The mailbox file size limits for the local and virtual delivery
agents can be disabled by setting mailbox_size_limit and/or
virtual_mailbox_limit to zero.

Incompatible changes with snapshot-20010128
===========================================

If this release does not work for you, you can go back to a previous
Postfix version without losing your mail, subject to the "incompatible
changes" listed for previous Postfix releases below.

REJECT in header/body_checks is now flagged as policy violation
rather than bounce, for consistency in postmaster notifications.

New mailbox size limit for local delivery (default: 50MBytes). This
limit affects all file write access by the local delivery agent or
by a process run by the local delivery agent. The purpose of this
parameter is to act as a safety for run-away software. It cannot
be a substitute for a file quota management system.

The default RBL (real-time blackhole lists) domain examples have
been updated from *.vix.com to *.mail-abuse.org.

Major changes with snapshot-20010128
====================================

Updated nqmgr (experimental queue manager with clever queueing
strategy) by Patrik Rak. This code is still new. Once it stops
changing (for a long time!) it will become part of the non-beta
release.

Virtual mailbox delivery agent by Andrew McNamara. This delivery
agent can deliver mail for any number of domains.  See the file
VIRTUAL_README for detailed examples. This code is still new. Once
it stops changing it will become part of the non-beta release.

Many "valid_hostname" warnings were eliminated. The warnings that
were not eliminated were replaced by something more informative.

SASL support (RFC 2554) for the LMTP delivery agent. This is required
by recent Cyrus implementations when delivering mail over TCP
sockets. The LMTP_README file has been updated but still contains
some obsolete information.

Workarounds for non-standard RFC 2554 (AUTH command) implementations.
Specify "broken_sasl_auth_clients = yes" to enable SMTP server
support for old Microsoft client applications. The Postfix SMTP
client supports non-standard RFC 2554 servers by default.

5 files changed, 57 insertions, 23 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 0df490b8383..da1be4f024e 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2001/01/17 14:31:23 itojun Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/04 06:10:23 itojun Exp $
 
-DISTNAME=	snapshot-20001217
-PKGNAME=	postfix-20001217
+DISTNAME=	snapshot-20010202
+PKGNAME=	postfix-20010202
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/experimental/
 
-PATCHFILES=	postfix-20001217snap-v6-20010117a.diff.gz 
+PATCHFILES=	postfix-20010202snap-v6-20010204a.diff.gz 
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 PATCH_DIST_STRIP+=	-p1
 
@@ -59,7 +59,7 @@ pre-install:
 	    ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix
 	${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
-	${RM} ${WRKSRC}/conf/*.orig
+	-${RM} -f ${WRKSRC}/conf/*.orig
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
diff --git a/mail/postfix-current/files/md5 b/mail/postfix-current/files/md5
index 3b26c8580b7..efbe5090a00 100644
--- a/mail/postfix-current/files/md5
+++ b/mail/postfix-current/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.7 2001/01/17 14:31:24 itojun Exp $
+$NetBSD: md5,v 1.8 2001/02/04 06:10:24 itojun Exp $
 
-MD5 (postfix/snapshot-20001217.tar.gz) = b6ef69548b58b23001dd9d3c56896aba
-MD5 (postfix/postfix-20001217snap-v6-20010117a.diff.gz) = 883c5d5af6289bbe07b8d9b494efaf7a
+MD5 (postfix/snapshot-20010202.tar.gz) = 2fc440422cc4de9478e0e6e130b11728
+MD5 (postfix/postfix-20010202snap-v6-20010204a.diff.gz) = 58c1544386724bbdc79e2ab0b1febbcd
diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum
index ae57ecc6069..768fe60e946 100644
--- a/mail/postfix-current/files/patch-sum
+++ b/mail/postfix-current/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.11 2001/01/13 07:46:57 itojun Exp $
+$NetBSD: patch-sum,v 1.12 2001/02/04 06:10:24 itojun Exp $
 
-MD5 (patch-aa) = 0a48c33ffe8acb4085221bbeedc4f164
+MD5 (patch-aa) = f7ac2eab459a10ba6223185b5fc781b0
 MD5 (patch-af) = 0ecd0dd8ffa61668aaab2422862f51b5
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index 2d108e1b814..f608da5a0c7 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,9 +1,11 @@
-$NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
+$NetBSD: patch-aa,v 1.9 2001/02/04 06:10:24 itojun Exp $
 
---- INSTALL.sh.orig	Wed Sep 20 22:06:06 2000
-+++ INSTALL.sh	Mon Oct 23 18:31:05 2000
-@@ -8,35 +8,35 @@
+--- INSTALL.sh.orig	Thu Jan 25 11:02:53 2001
++++ INSTALL.sh	Sun Feb  4 14:45:40 2001
+@@ -7,39 +7,39 @@
+ umask 022
  
+ test -t 0 &&
 -cat <<EOF
 -
 -Warning: this script replaces existing sendmail or Postfix programs.
@@ -71,7 +73,11 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 +#
 +#EOF
  
-@@ -110,15 +110,12 @@
+ # By now, shells must have functions. Ultrix users must use sh5 or lose.
+ # The following shell functions replace files/symlinks while minimizing
+@@ -109,35 +109,32 @@
+ 
+ : ${install_root=/}
  : ${tempdir=`pwd`}
 -: ${config_directory=/etc/postfix}
 -: ${daemon_directory=/usr/libexec/postfix}
@@ -95,8 +101,9 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 +: ${setgid=maildrop}
 +: ${manpages=__PREFIX/man}
  
-@@ -126,14 +123,14 @@
+ # Find out the location of configuration files.
  
+-test -t 0 &&
 -for name in install_root tempdir config_directory
 -do
 -    while :
@@ -109,6 +116,7 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 -	esac
 -    done
 -done
++#test -t 0 &&
 +#for name in install_root tempdir config_directory
 +#do
 +#    while :
@@ -122,7 +130,11 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 +#    done
 +#done
  
-@@ -159,10 +156,10 @@
+ # Sanity checks
+ 
+@@ -159,32 +156,32 @@
+ 
+ CONFIG_DIRECTORY=$install_root$config_directory
  
 -test -f $CONFIG_DIRECTORY/main.cf && {
 -    for name in daemon_directory command_directory queue_directory mail_owner 
@@ -140,8 +152,9 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 -test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
 +#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf
  
-@@ -170,16 +167,16 @@
+ # Override default settings.
  
+-test -t 0 &&
 -for name in daemon_directory command_directory \
 -    queue_directory sendmail_path newaliases_path mailq_path mail_owner\
 -    setgid manpages
@@ -156,6 +169,7 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 -	esac
 -    done
 -done
++#test -t 0 &&
 +#for name in daemon_directory command_directory \
 +#    queue_directory sendmail_path newaliases_path mailq_path mail_owner\
 +#    setgid manpages
@@ -171,7 +185,11 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 +#    done
 +#done
  
-@@ -231,6 +228,6 @@
+ # Sanity checks
+ 
+@@ -232,10 +229,10 @@
+ 
+ DAEMON_DIRECTORY=$install_root$daemon_directory
  COMMAND_DIRECTORY=$install_root$command_directory
 -QUEUE_DIRECTORY=$install_root$queue_directory
 +QUEUE_DIRECTORY=$queue_directory
@@ -181,19 +199,31 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 itojun Exp $
 +#NEWALIASES_PATH=$install_root$newaliases_path
 +#MAILQ_PATH=$install_root$mailq_path
  MANPAGES=$install_root$manpages
-@@ -243,3 +240,3 @@
+ 
+ # Create any missing directories.
+@@ -244,7 +241,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
 -for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH
 +for path in $SENDMAIL_PATH
  do
-@@ -263,4 +260,4 @@
+     dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'`
+     test -d $dir || mkdir -p $dir || exit 1
+@@ -264,8 +261,8 @@
+ 
+ test -f bin/sendmail && {
      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
  }
-@@ -296,9 +293,9 @@
+ 
+ if [ -f $CONFIG_DIRECTORY/main.cf ]
+@@ -290,13 +287,13 @@
+     "mail_owner = $mail_owner" \
+ || exit 1
  
 -(echo "# This file was generated by $0"
 -for name in sendmail_path newaliases_path mailq_path setgid manpages
@@ -210,3 +240,5 @@ $NetBSD: patch-aa,v 1.8 2000/10/23 09:38:49 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/pkg/PLIST b/mail/postfix-current/pkg/PLIST
index 4d063cd615e..811ce27c89a 100644
--- a/mail/postfix-current/pkg/PLIST
+++ b/mail/postfix-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/01/13 07:46:57 itojun Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/02/04 06:10:24 itojun Exp $
 etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
@@ -17,6 +17,7 @@ libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
+libexec/postfix/virtual
 sbin/postalias
 sbin/postcat
 sbin/postconf
@@ -45,6 +46,7 @@ share/postfix/relocated
 share/postfix/sample-aliases.cf
 share/postfix/sample-auth.cf
 share/postfix/sample-canonical.cf
+share/postfix/sample-compatibility.cf  
 share/postfix/sample-debug.cf
 share/postfix/sample-filter.cf
 share/postfix/sample-flush.cf