Updated postfix to 2.3-20051128

- Configurable text for (non)delivery status notifications.

- Support for multiple ISP accounts, implemented with sender-dependent
  relayhosts and with sender-dependent SASL passwords.

- Enhanced status codes per RFC 2034. This enables much improved
  error reporting with mail client programs, possibly in the user's
  own language.

- Complete support for (non)delivery status notifications (DSN)
  per RFC 346[1-4].  This also enables improved error reporting.

6 files changed, 21 insertions, 53 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index d32d2d6e8bf..e918a2537a2 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/11/16 06:53:14 martti Exp $
+# $NetBSD: Makefile,v 1.47 2005/11/30 14:02:47 martti Exp $
 
-DISTNAME=	postfix-2.3-20050922
-PKGREVISION=	1
+DISTNAME=	postfix-2.3-20051128
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		http://public.planetmirror.com.au/pub/postfix/experimental/
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index de6c099412b..be1f3e9f426 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/09/30 06:04:32 martti Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/11/30 14:02:47 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -43,6 +43,7 @@ man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
 man/man5/body_checks.5
+man/man5/bounce.5
 man/man5/canonical.5
 man/man5/cidr_table.5
 man/man5/generic.5
@@ -148,6 +149,7 @@ share/examples/postfix/LICENSE
 share/examples/postfix/TLS_LICENSE
 share/examples/postfix/access
 share/examples/postfix/aliases
+share/examples/postfix/bounce.cf.default
 share/examples/postfix/canonical
 share/examples/postfix/generic
 share/examples/postfix/header_checks
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index c79929a5b54..50f2cf8e17e 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.18 2005/11/16 06:53:14 martti Exp $
+$NetBSD: distinfo,v 1.19 2005/11/30 14:02:47 martti Exp $
 
-SHA1 (postfix/postfix-2.3-20050922.tar.gz) = 392548fef18c860bc6d75155f0e6b259fd4489a5
-RMD160 (postfix/postfix-2.3-20050922.tar.gz) = 848bcfcc5e044fdae3f42ed384bbc7bea98a1ae5
-Size (postfix/postfix-2.3-20050922.tar.gz) = 2508873 bytes
+SHA1 (postfix/postfix-2.3-20051128.tar.gz) = eb1e377cfdb5e417e2ce5e1d54811f8f93eef4cb
+RMD160 (postfix/postfix-2.3-20051128.tar.gz) = dfcb8c06b6f1c5ab0990f1852936563c7e7f8b3d
+Size (postfix/postfix-2.3-20051128.tar.gz) = 2561761 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ab) = aa08339399411b8c1e12856f6b5f8406b7775840
-SHA1 (patch-ag) = 550d1acab1c8bcd903a689207bd2c92444f42351
-SHA1 (patch-ai) = 562b29dcc4998b787b947727e0f88f134e1e7dff
+SHA1 (patch-ai) = 890ccf2d7f6c6e21f00a2bea9c71ef1e058ac826
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
deleted file mode 100644
index 05a46569eef..00000000000
--- a/mail/postfix-current/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/09/30 06:04:32 martti Exp $
-
---- src/dns/dns.h.orig	2005-07-27 03:31:35.000000000 +0300
-+++ src/dns/dns.h	2005-09-30 05:49:31.000000000 +0300
-@@ -19,6 +19,9 @@
- #ifdef RESOLVE_H_NEEDS_STDIO_H
- #include <stdio.h>
- #endif
-+#ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
-+#include <nameser8_compat.h>
-+#endif
- #include <resolv.h>
- 
-  /*
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
deleted file mode 100644
index 661bccd545c..00000000000
--- a/mail/postfix-current/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.11 2005/11/13 10:37:10 martti Exp $
-
---- src/util/sys_defs.h.orig	2005-07-15 00:28:33.000000000 +0300
-+++ src/util/sys_defs.h	2005-11-13 09:22:07.000000000 +0200
-@@ -52,3 +52,3 @@
- #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
--#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
-+#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 299000900)
- # define USE_STATVFS
-@@ -124,3 +124,3 @@
- 
--#if __NetBSD_Version__ >= 200060000	/* 2.0F */
-+#if __NetBSD_Version__ >= 299000900	/* 2.99.9 */
- #define HAS_CLOSEFROM
-@@ -157,2 +157,3 @@
- #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
-+#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
- #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 4aa875bb80e..d814ea7239c 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.11 2005/11/15 10:43:20 martti Exp $
+$NetBSD: patch-ai,v 1.12 2005/11/30 14:02:47 martti Exp $
 
---- makedefs.orig	2005-07-17 02:51:31.000000000 +0300
-+++ makedefs	2005-11-15 10:39:33.000000000 +0200
-@@ -116,6 +116,8 @@
+--- makedefs.orig	2005-11-14 21:21:04.000000000 +0200
++++ makedefs	2005-11-30 13:49:04.000000000 +0200
+@@ -118,6 +118,8 @@
  		;;
-   FreeBSD.5*)	SYSTYPE=FREEBSD5
+   FreeBSD.6*)	SYSTYPE=FREEBSD6
  		;;
 +  DragonFly.1*)	SYSTYPE=FREEBSD4
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -124,7 +126,7 @@
+@@ -126,7 +128,7 @@
  		;;
     NetBSD.1*)	SYSTYPE=NETBSD1
  		;;
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.11 2005/11/15 10:43:20 martti Exp $
  		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
-@@ -176,13 +178,6 @@
+@@ -178,13 +180,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +34,7 @@ $NetBSD: patch-ai,v 1.11 2005/11/15 10:43:20 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -214,25 +209,8 @@
+@@ -216,25 +211,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -60,7 +60,7 @@ $NetBSD: patch-ai,v 1.11 2005/11/15 10:43:20 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -243,7 +221,6 @@
+@@ -245,7 +223,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -68,7 +68,7 @@ $NetBSD: patch-ai,v 1.11 2005/11/15 10:43:20 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -271,25 +248,13 @@
+@@ -273,25 +250,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"