Updated postfix to 2.0.0.2

IMPORTANT: read the documents in /usr/pkg/share/doc/postfix/ before
upgrading from Postfix 1.1.

Hightlights:

- MIME support (including 8bit->7bit conversion and more
  accurate matching of MIME headers in message bodies)
- completely rewritten RBL client code
- smarter handling of DNS lookup errors in UCE restrictions
- virtual delivery agent without transport map for every domain
- a long list of other things that are meant to improve performance
  or functionality without compromising what already existed.

9 files changed, 49 insertions, 132 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index cbc4980dc92..c5acdc13876 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2002/11/26 07:20:06 martti Exp $
+# $NetBSD: Makefile,v 1.72 2003/01/06 09:15:49 martti Exp $
 
-DISTNAME=	postfix-1.1.12
+DISTNAME=	postfix-2.0.0.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 8e7b2f65f96..10136df3e0f 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:48 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/06 09:15:49 martti Exp $
 bin/mailq
 bin/newaliases
 etc/mailer.conf.postfix
@@ -73,6 +73,10 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
+share/doc/postfix/ADDRESS_CLASS_README
+share/doc/postfix/LOCAL_RECIPIENT_README
+share/doc/postfix/MAILDROP_README
+share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
 share/doc/postfix/ETRN_README
@@ -108,6 +112,7 @@ share/postfix/sample-flush.cf
 share/postfix/sample-ldap.cf
 share/postfix/sample-lmtp.cf
 share/postfix/sample-local.cf
+share/postfix/sample-mime.cf
 share/postfix/sample-misc.cf
 share/postfix/sample-pcre-access.cf
 share/postfix/sample-pcre-body.cf
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 4e10c1129c2..43313d1fc2d 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.25 2002/11/24 16:37:56 martti Exp $
+$NetBSD: distinfo,v 1.26 2003/01/06 09:15:49 martti Exp $
 
-SHA1 (postfix/postfix-1.1.12.tar.gz) = cfecd528a89e51d8168f8c879113f4f797013ba5
-Size (postfix/postfix-1.1.12.tar.gz) = 1190811 bytes
-SHA1 (postfix/pfixtls-1.1.11.diff.gz) = 9cf910346d46c106d52e9012c4a84cdd15491cec
-Size (postfix/pfixtls-1.1.11.diff.gz) = 63310 bytes
+SHA1 (postfix/postfix-2.0.0.2.tar.gz) = 6282f5ed5c7c7a3349e4a72999e5ed096c9a7fdb
+Size (postfix/postfix-2.0.0.2.tar.gz) = 1325575 bytes
 SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
-SHA1 (patch-ab) = d4e50ffc31d71ff64067101f6d733655fcf76713
+SHA1 (patch-ab) = b414e4350e9004c3f45f591bc86663d9bf38464a
 SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4
-SHA1 (patch-ad) = 78f24bf3f7e6829c2a5c9a402e33dea25f1a55d2
-SHA1 (patch-ae) = 66908f37243ce4da24129ccb53120b4e068ffa1d
-SHA1 (patch-af) = fbee5a8854857e2a99c59bcfaee4775df735f086
-SHA1 (patch-ag) = 57fcf1c89ec7d9d4f454d6d9d6860a64127b9cac
-SHA1 (patch-ah) = d6a403915f52c3c09ac4dd6ea1d21208394a170f
+SHA1 (patch-ad) = d4e536f5f0d482a759da0016ea79f78b0a87455c
+SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
+SHA1 (patch-af) = 61e0789b328b029a016ac45a9503186d6ee603cb
diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
index 53d75e28fd8..386583ff3b1 100644
--- a/mail/postfix/patches/patch-ab
+++ b/mail/postfix/patches/patch-ab
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.4 2002/03/06 15:07:54 martti Exp $
+$NetBSD: patch-ab,v 1.5 2003/01/06 09:15:50 martti Exp $
 
---- src/util/sys_defs.h.orig	Tue Feb 12 13:46:16 2002
-+++ src/util/sys_defs.h	Tue Feb 12 13:47:13 2002
+--- src/util/sys_defs.h.orig	Sun Oct 13 17:00:52 2002
++++ src/util/sys_defs.h	Sat Dec 28 08:51:26 2002
 @@ -52,11 +52,11 @@
  #define STATFS_IN_SYS_MOUNT_H
  #define HAS_POSIX_REGEXP
  #define HAS_ST_GEN	/* struct stat contains inode generation number */
--#define DEF_SENDMAIL_PATH "/usr/sbin/sendmail"
--#define DEF_MAILQ_PATH	"/usr/bin/mailq"
--#define DEF_NEWALIAS_PATH "/usr/bin/newaliases"
--#define DEF_COMMAND_DIR	"/usr/sbin"
--#define DEF_DAEMON_DIR	"/usr/libexec/postfix"
-+#define DEF_SENDMAIL_PATH "__PREFIX/sbin/sendmail"
-+#define DEF_MAILQ_PATH	"__PREFIX/bin/mailq"
-+#define DEF_NEWALIAS_PATH "__PREFIX/bin/newaliases"
-+#define DEF_COMMAND_DIR	"__PREFIX/sbin"
-+#define DEF_DAEMON_DIR	"__PREFIX/libexec/postfix"
+-#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+-#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+-#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
+-#define NATIVE_COMMAND_DIR "/usr/sbin"
+-#define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
++#define NATIVE_SENDMAIL_PATH "__PREFIX/sbin/sendmail"
++#define NATIVE_MAILQ_PATH "__PREFIX/bin/mailq"
++#define NATIVE_NEWALIAS_PATH "__PREFIX/bin/newaliases"
++#define NATIVE_COMMAND_DIR "__PREFIX/sbin"
++#define NATIVE_DAEMON_DIR "__PREFIX/libexec/postfix"
  #endif
  
  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4)
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
index b6d7ca1c489..9d6c6558b5d 100644
--- a/mail/postfix/patches/patch-ad
+++ b/mail/postfix/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2002/03/16 18:06:40 martti Exp $
+$NetBSD: patch-ad,v 1.5 2003/01/06 09:15:50 martti Exp $
 
---- conf/sample-misc.cf.orig	Sat Mar 16 18:01:19 2002
-+++ conf/sample-misc.cf	Sat Mar 16 18:02:59 2002
-@@ -293,7 +293,7 @@
- # The program_directory parameter specifies the location of Postfix
+--- conf/sample-misc.cf.orig	Wed Dec 18 01:42:28 2002
++++ conf/sample-misc.cf	Sat Dec 28 08:52:35 2002
+@@ -350,7 +350,7 @@
+ # The daemon_directory parameter specifies the location of Postfix
  # support programs and daemons. This directory must be owned by root.
  #
--program_directory = /usr/libexec/postfix
-+program_directory = __PREFIX/libexec/postfix
+-daemon_directory = /usr/libexec/postfix
++daemon_directory = __PREFIX/libexec/postfix
  
  # The queue_directory specifies the location of the Postfix queue.
  # This is also the root directory of Postfix daemons that run chrooted.
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
index 45c220571c0..48c00ff5766 100644
--- a/mail/postfix/patches/patch-ae
+++ b/mail/postfix/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2002/03/27 13:10:18 martti Exp $
+$NetBSD: patch-ae,v 1.6 2003/01/06 09:15:50 martti Exp $
 
---- src/global/mail_params.h.orig	Mon Mar 25 14:22:11 2002
-+++ src/global/mail_params.h	Wed Mar 27 13:59:44 2002
-@@ -50,7 +50,7 @@
+--- src/global/mail_params.h.orig	Mon Dec 23 20:33:09 2002
++++ src/global/mail_params.h	Sat Dec 28 08:53:11 2002
+@@ -64,7 +64,7 @@
  extern gid_t var_owner_gid;
  
  #define VAR_SGID_GROUP		"setgid_group"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2002/03/27 13:10:18 martti Exp $
  extern char *var_sgid_group;
  extern gid_t var_sgid_gid;
  
-@@ -169,18 +169,18 @@
+@@ -187,18 +187,18 @@
    */
  #define VAR_PROGRAM_DIR		"program_directory"
  #ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 191d3185ca3..a0bcc8c4a13 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,18 +1,17 @@
-$NetBSD: patch-af,v 1.11 2002/05/14 06:57:25 martti Exp $
+$NetBSD: patch-af,v 1.12 2003/01/06 09:15:50 martti Exp $
 
---- conf/main.cf.orig	Mon Mar 25 21:09:24 2002
-+++ conf/main.cf	Wed Mar 27 07:33:47 2002
-@@ -31,14 +33,19 @@
+--- conf/main.cf.orig	Sat Dec 21 21:53:01 2002
++++ conf/main.cf	Sat Dec 28 09:07:31 2002
+@@ -31,13 +31,18 @@
  # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
+ # postXXX commands.
  #
 -command_directory = /usr/sbin
 +command_directory = __PREFIX/sbin
  
  # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). The
- # default value is $program_directory. This directory must be owned
- # by root.
+ # daemon programs (i.e. programs listed in the master.cf file). This
+ # directory must be owned by root.
  #
 -daemon_directory = /usr/libexec/postfix
 +daemon_directory = __PREFIX/libexec/postfix
@@ -24,7 +23,7 @@ $NetBSD: patch-af,v 1.11 2002/05/14 06:57:25 martti Exp $
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -56,7 +63,7 @@
+@@ -55,7 +60,7 @@
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -33,19 +32,7 @@ $NetBSD: patch-af,v 1.11 2002/05/14 06:57:25 martti Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -497,9 +504,8 @@
- # the process marches on. If you use an X-based debugger, be sure to
- # set up your XAUTHORITY environment variable before starting Postfix.
- #
--debugger_command =
--	 PATH=/usr/bin:/usr/X11R6/bin
--	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
-+debugger_command = PATH=/usr/bin:/usr/X11R6/bin; \
-+	xxgdb $daemon_directory/$process_name $process_id & sleep 5
- 
- # INSTALL-TIME CONFIGURATION INFORMATION
- #
-@@ -524,16 +530,16 @@
+@@ -606,16 +611,16 @@
  # commands.  This must be a group name with a numerical group ID that
  # is not shared with other accounts, not even with the Postfix account.
  #
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
deleted file mode 100644
index d415b0cb7fb..00000000000
--- a/mail/postfix/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2002/06/27 04:47:55 itojun Exp $
-
---- src/smtpd/smtpd_check.c-	Thu Jun 27 13:46:28 2002
-+++ src/smtpd/smtpd_check.c	Thu Jun 27 13:46:44 2002
-@@ -920,7 +920,7 @@
-     return (stat);
- }
- 
--/* reject_unknown_hostname - fail if name has no A or MX record */
-+/* reject_unknown_hostname - fail if name has no A, AAAA or MX record */
- 
- static int reject_unknown_hostname(SMTPD_STATE *state, char *name,
- 				        char *reply_name, char *reply_class)
-@@ -932,7 +932,7 @@
- 	msg_info("%s: %s", myname, name);
- 
-     dns_status = dns_lookup_types(name, 0, (DNS_RR **) 0, (VSTRING *) 0,
--				  (VSTRING *) 0, T_A, T_MX, 0);
-+				  (VSTRING *) 0, T_A, T_AAAA, T_MX, 0);
-     if (dns_status != DNS_OK)
- 	return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
- 				   "%d <%s>: %s rejected: Host not found",
-@@ -942,7 +942,7 @@
-     return (SMTPD_CHECK_DUNNO);
- }
- 
--/* reject_unknown_mailhost - fail if name has no A or MX record */
-+/* reject_unknown_mailhost - fail if name has no A, AAAA or MX record */
- 
- static int reject_unknown_mailhost(SMTPD_STATE *state, const char *name,
- 		            const char *reply_name, const char *reply_class)
-@@ -954,7 +954,7 @@
- 	msg_info("%s: %s", myname, name);
- 
-     dns_status = dns_lookup_types(name, 0, (DNS_RR **) 0, (VSTRING *) 0,
--				  (VSTRING *) 0, T_A, T_MX, 0);
-+				  (VSTRING *) 0, T_A, T_AAAA, T_MX, 0);
-     if (dns_status != DNS_OK)
- 	return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
- 				   "%d <%s>: %s rejected: Domain not found",
diff --git a/mail/postfix/patches/patch-ah b/mail/postfix/patches/patch-ah
deleted file mode 100644
index 132cec76ded..00000000000
--- a/mail/postfix/patches/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/07/17 22:34:46 itojun Exp $
-
-diff -u -r1.3 src/dns/dns_lookup.c
---- src/dns/dns_lookup.c	2001/11/11 05:26:51	1.3
-+++ src/dns/dns_lookup.c	2002/07/17 21:20:30
-@@ -132,6 +132,7 @@
- } DNS_REPLY;
- 
- #define INET_ADDR_LEN	4		/* XXX */
-+#define INET6_ADDR_LEN	16		/* XXX */
- 
- /* dns_query - query name server and pre-parse the reply */
- 
-@@ -328,6 +329,17 @@
- 	break;
-     case T_A:
- 	if (fixed->length != INET_ADDR_LEN) {
-+	    msg_warn("extract_answer: bad address length: %d", fixed->length);
-+	    return (0);
-+	}
-+	if (fixed->length > sizeof(temp))
-+	    msg_panic("dns_get_rr: length %d > DNS_NAME_LEN",
-+		      fixed->length);
-+	memcpy(temp, pos, fixed->length);
-+	data_len = fixed->length;
-+	break;
-+    case T_AAAA:
-+	if (fixed->length != INET6_ADDR_LEN) {
- 	    msg_warn("extract_answer: bad address length: %d", fixed->length);
- 	    return (0);
- 	}