Updated postfix to 2.1.5

- The code to eliminate the local MTA from an MX address list did
  not handle the case that the local MTA could appear with different
  MX preferences in both inet_interfaces and proxy_interfaces.

- The SMTP server's kiss-of-death message "421 Timeout exceeded"
  wasn't guarded by setjmp().

- The SMTP server didn't update the per-session error counter when
  a client was denied access with smtpd_delay_reject=no.

- The Postfix sendmail command leaked file descriptors when it was
  unable to execute the postdrop mail submission command.

- The bounce daemon sent the wrong type of bounce message when a

- Plus some portability, safety and documentation fixes.

4 files changed, 15 insertions, 19 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 3a3e3f3f731..e9490280628 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.149 2004/08/07 16:56:53 jlam Exp $
+# $NetBSD: Makefile,v 1.150 2004/09/23 16:10:07 martti Exp $
 
-DISTNAME=	postfix-2.1.4
+DISTNAME=	postfix-2.1.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 DIST_SUBDIR=	postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 2a906e1b616..6cacf6ad81c 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.75 2004/08/11 06:51:31 jlam Exp $
+$NetBSD: distinfo,v 1.76 2004/09/23 16:10:07 martti Exp $
 
-SHA1 (postfix/postfix-2.1.4.tar.gz) = 64dbd7b053df4ccf2191d4200b272be06e1592a8
-Size (postfix/postfix-2.1.4.tar.gz) = 1970068 bytes
+SHA1 (postfix/postfix-2.1.5.tar.gz) = bbc65c9fdc1cbd8e553816a5549b2685255cf69d
+Size (postfix/postfix-2.1.5.tar.gz) = 1971931 bytes
 SHA1 (postfix/postfix-2.1.1-canonical_classes-with_docs.diff) = d11d839210db3aa6e0a62850cb45edabe257c3fe
 Size (postfix/postfix-2.1.1-canonical_classes-with_docs.diff) = 13110 bytes
-SHA1 (postfix/tls+ipv6-1.25-pf-2.1.4.patch.gz) = af90da3976643f3e0f7cfb2491be090d55f40a6a
-Size (postfix/tls+ipv6-1.25-pf-2.1.4.patch.gz) = 256600 bytes
+SHA1 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 04431d177f67ad4091df4660b2318d9f7f85f75c
+Size (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 251571 bytes
 SHA1 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 313d572bcd960e3cafd78ac9ee4b87bdc1f02fc8
 Size (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
-SHA1 (patch-ag) = 1c6ba5e7b8dc923172add8b0f8af0f9a81226edc
+SHA1 (patch-ag) = d5e9aab43b5d3be6df9ad8e3f03572b9a228f784
 SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index fff8102035b..4508ead1e04 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2004/08/27 06:29:08 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2004/09/23 16:10:07 martti Exp $
 
 # Global and legacy options
 #
@@ -17,7 +17,7 @@ PKG_DEFAULT_OPTIONS+=	inet6
 PKG_DEFAULT_OPTIONS+=	tls
 .endif
 .if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	pcre 
+PKG_DEFAULT_OPTIONS+=	pcre
 .endif
 .if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS])
 PKG_DEFAULT_OPTIONS+=	mysql
@@ -43,7 +43,7 @@ PKG_SUPPORTED_OPTIONS=	inet6 ldap mysql mysql4 pcre pgsql sasl tls
 .  if empty(PKG_OPTIONS:Mtls)
 PKG_OPTIONS+=		tls
 .  endif
-IPV6TLS_PATCH=		tls+ipv6-1.25-pf-2.1.4.patch.gz
+IPV6TLS_PATCH=		tls+ipv6-1.25-pf-2.1.5.patch.gz
 PATCHFILES+=		${IPV6TLS_PATCH}
 SITES_${IPV6TLS_PATCH}=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
 PATCH_DIST_STRIP.${IPV6TLS_PATCH}=	-p1
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 6c4cd63b372..4fb54c0a785 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,10 +1,8 @@
-$NetBSD: patch-ag,v 1.13 2004/08/10 16:49:47 schmonz Exp $
+$NetBSD: patch-ag,v 1.14 2004/09/23 16:10:07 martti Exp $
 
---- src/util/sys_defs.h.orig	Tue Aug 10 02:27:04 2004
-+++ src/util/sys_defs.h
-@@ -134,9 +134,15 @@
- #define DEF_DB_TYPE	"hash"
- #define ALIAS_DB_MAP	"hash:/etc/aliases"
+--- src/util/sys_defs.h.orig	2004-08-02 00:05:23.000000000 +0300
++++ src/util/sys_defs.h	2004-09-23 19:01:03.000000000 +0300
+@@ -128,5 +128,11 @@
  #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
 +#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
@@ -16,5 +14,3 @@ $NetBSD: patch-ag,v 1.13 2004/08/10 16:49:47 schmonz Exp $
  #define STATFS_IN_SYS_MOUNT_H
 +#endif
  #define HAS_POSIX_REGEXP
- #define NORETURN	void
- #define PRINTFLIKE(x,y)