Updated mail/postfix-2.3.3

- File corruption while executing a Milter "header insert" action
  with headers-only mail (found with dk-filter).  Delivery agents
  would go into an infinite loop because some queue file update
  had been done in the wrong order.  As a precaution, delivery
  agents now detect such loops, and the queue manager now saves
  such mail to the "corrupt" directory.

- Segmentation fault in the SMTP client while saving a cached
  connection with unsent data. Postfix indexed some table with -1,
  because some I/O cleanup had been done in the wrong order. The
  same problem should exist in Postfix 2.2.

- Postfix no longer announces its name in delivery status notifications.
  All other details of the default bounce text remain unchanged.
  The reason for this change is that too many people believe that
  Wietse provides a free helpdesk service that solves all their
  email problems.

4 files changed, 21 insertions, 23 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 6ff419b0f53..03d6dff843b 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.186 2006/08/11 12:34:24 taca Exp $
+# $NetBSD: Makefile,v 1.187 2006/08/31 18:44:50 martti Exp $
 
-DISTNAME=	postfix-2.3.2
-PKGREVISION=	1
+DISTNAME=	postfix-2.3.3
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index ae648c85b7e..e25a626ac33 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.102 2006/08/11 12:34:25 taca Exp $
+$NetBSD: distinfo,v 1.103 2006/08/31 18:44:50 martti Exp $
 
-SHA1 (postfix/postfix-2.3.2.tar.gz) = cb56e7f8f0d4335cc8beb572ab7aa0423aab2dcf
-RMD160 (postfix/postfix-2.3.2.tar.gz) = ce561dcc03e7f6bc1bb3bdd9426175b18571c625
-Size (postfix/postfix-2.3.2.tar.gz) = 2774600 bytes
+SHA1 (postfix/postfix-2.3.3.tar.gz) = 8fb8cff36b18468e75d21cf6c668269f941b4a41
+RMD160 (postfix/postfix-2.3.3.tar.gz) = 9e1550b09e98e7802ffcd1eaba65cf4420fd8ea5
+Size (postfix/postfix-2.3.3.tar.gz) = 2777045 bytes
 SHA1 (patch-aa) = e53bc6644c2b7898b73f4604489021cb85514610
-SHA1 (patch-ag) = 5b27be7d72f6c5e09d78ea13abc0f5eb244d6c38
-SHA1 (patch-ai) = 6b76dd8b5566a2fb8d64b06ebe1969ebf19ff554
+SHA1 (patch-ag) = d535f972e015924eaf8c53abab40a107d7e11288
+SHA1 (patch-ai) = b4887cea0b4a2b373cb827c28fc20e253497aa02
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 2c36a16db34..51349489aea 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,10 +1,8 @@
-$NetBSD: patch-ag,v 1.20 2006/08/11 12:34:25 taca Exp $
-
---- src/util/sys_defs.h.orig	2006-07-03 21:37:32.000000000 +0900
-+++ src/util/sys_defs.h
+--- src/util/sys_defs.h.orig	2006-07-31 13:04:29.000000000 +0000
++++ src/util/sys_defs.h	2006-08-31 19:37:16.000000000 +0000
 @@ -28,6 +28,7 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(OPENBSD3) \
+     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
      || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
 +    || defined(NETBSD4) \
      || defined(EKKOBSD1)
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 775e99a7860..32d6a112d08 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
+$NetBSD: patch-ai,v 1.18 2006/08/31 18:44:50 martti Exp $
 
---- makedefs.orig	2006-07-04 05:30:00.000000000 +0900
-+++ makedefs
-@@ -118,6 +118,8 @@ case "$SYSTEM.$RELEASE" in
+--- makedefs.orig	2006-07-31 13:03:31.000000000 +0000
++++ makedefs	2006-08-31 19:37:55.000000000 +0000
+@@ -118,6 +118,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -130,6 +132,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -132,6 +134,8 @@
  		;;
     NetBSD.3*)	SYSTYPE=NETBSD3
  		;;
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
     BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -180,13 +184,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -182,13 +186,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +34,7 @@ $NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -218,25 +215,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -220,25 +217,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -60,7 +60,7 @@ $NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -247,7 +227,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -249,7 +229,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -68,7 +68,7 @@ $NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -275,25 +254,13 @@ case "$SYSTEM.$RELEASE" in
+@@ -277,25 +256,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"