Updated postfix to 2.0.17

- Portability to MacOSX: Bind8 compatibility, core dumps in mailq
  and postdrop, and changes in netinfo support.

- Elimination of some DNS lookup problems in third-party library
  routines (typically resulting in localhost not being found).

- More agressive delivery to sites that defer a lot of mail.

- Correction of a few obscure error messages.

- Several small documentation fixes.

- Minor fixes for robustness problems that no-one has experienced.

5 files changed, 37 insertions, 67 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 25b5b0f3ab8..de82ef6dfe6 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2004/01/11 07:40:13 jlam Exp $
+# $NetBSD: Makefile,v 1.113 2004/01/21 06:56:48 martti Exp $
 
-DISTNAME=	postfix-2.0.16
+DISTNAME=	postfix-2.0.17
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 DIST_SUBDIR=	postfix
@@ -32,8 +32,8 @@ FIX_RPATH+=	AUXLIBS
 
 .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
 .  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=		tls+ipv6-1.18a-pf-2.0.16.patch.gz
-PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.18/
+PATCHFILES+=		tls+ipv6-1.20-pf-2.0.16.patch.gz
+PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.20/
 PATCH_DIST_STRIP=	-p1
 BUILD_DEFS+=		POSTFIX_USE_INET6
 
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 2d4ca3eb6c7..18f2170c9d8 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.49 2004/01/20 19:37:45 martin Exp $
+$NetBSD: distinfo,v 1.50 2004/01/21 06:56:48 martti Exp $
 
-SHA1 (postfix/postfix-2.0.16.tar.gz) = 6272be8b87df1142a467f2a4e13c4e27d00bf952
-Size (postfix/postfix-2.0.16.tar.gz) = 1353520 bytes
+SHA1 (postfix/postfix-2.0.17.tar.gz) = f3b3a897d0aecd8020e966bb59737af7705ccbb1
+Size (postfix/postfix-2.0.17.tar.gz) = 1353628 bytes
+SHA1 (postfix/tls+ipv6-1.20-pf-2.0.16.patch.gz) = a451b7382c67d34fbefbdae08283c4b4f618e6b2
+Size (postfix/tls+ipv6-1.20-pf-2.0.16.patch.gz) = 254580 bytes
 SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
-SHA1 (patch-ad) = 2f83cc6108eea4a1c401fe9e549d93430166f7fa
+SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
-SHA1 (patch-af) = 4d3a6c21d284dce1c75dcd4fc537af17a28a5e66
-SHA1 (patch-ag) = 7c59f4bee987dedc2fd5f193a8d5c980ac09ae82
+SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
+SHA1 (patch-ag) = 0b5f1241cd4f4b27b8edfd5e5e19f4b9ce9948ca
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
index e51c1069e64..76ebd38529f 100644
--- a/mail/postfix/patches/patch-ad
+++ b/mail/postfix/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2003/04/17 06:22:19 martti Exp $
+$NetBSD: patch-ad,v 1.7 2004/01/21 06:56:48 martti Exp $
 
---- conf/sample-misc.cf.orig	2003-03-20 22:51:12.000000000 +0200
-+++ conf/sample-misc.cf	2003-04-17 08:53:55.000000000 +0300
-@@ -357,7 +357,7 @@
+--- conf/sample-misc.cf.orig	2003-08-12 19:20:19.000000000 +0300
++++ conf/sample-misc.cf	2004-01-21 08:40:15.000000000 +0200
+@@ -360,7 +360,7 @@
  # The daemon_directory parameter specifies the location of Postfix
  # support programs and daemons. This directory must be owned by root.
  #
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 56496b57efa..81118455aac 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.17 2003/05/01 14:07:58 jmmv Exp $
+$NetBSD: patch-af,v 1.18 2004/01/21 06:56:48 martti Exp $
 
---- conf/main.cf.orig	2003-02-20 16:44:47.000000000 +0200
-+++ conf/main.cf	2003-02-21 13:27:20.000000000 +0200
+--- conf/main.cf.orig	2003-09-06 03:30:35.000000000 +0300
++++ conf/main.cf	2004-01-21 08:40:42.000000000 +0200
 @@ -31,13 +31,18 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.17 2003/05/01 14:07:58 jmmv Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -618,16 +623,16 @@
+@@ -621,16 +626,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
index 70c1f884911..3857af227fd 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,30 +1,20 @@
-$NetBSD: patch-ag,v 1.8 2003/04/17 06:22:19 martti Exp $
+$NetBSD: patch-ag,v 1.9 2004/01/21 06:56:48 martti Exp $
 
---- src/cleanup/cleanup.c.orig	2002-12-20 03:33:40.000000000 +0200
-+++ src/cleanup/cleanup.c	2003-04-17 08:54:39.000000000 +0300
-@@ -333,6 +333,7 @@
-      * Pass control to the single-threaded service skeleton.
-      */
+--- src/cleanup/cleanup.c.orig	2003-08-10 03:40:30.000000000 +0300
++++ src/cleanup/cleanup.c	2004-01-21 08:41:03.000000000 +0200
+@@ -335,2 +335,3 @@
      single_server_main(argc, argv, cleanup_service,
 +		       MAIL_SERVER_BOOL_TABLE, cleanup_bool_table,
  		       MAIL_SERVER_INT_TABLE, cleanup_int_table,
- 		       MAIL_SERVER_STR_TABLE, cleanup_str_table,
- 		       MAIL_SERVER_TIME_TABLE, cleanup_time_table,
 --- src/cleanup/cleanup.h.orig	2002-12-03 16:58:11.000000000 +0200
-+++ src/cleanup/cleanup.h	2003-04-17 08:54:39.000000000 +0300
-@@ -118,6 +118,7 @@
- extern void cleanup_all(void);
- extern void cleanup_pre_jail(char *, char **);
++++ src/cleanup/cleanup.h	2004-01-21 08:41:03.000000000 +0200
+@@ -120,2 +120,3 @@
  extern void cleanup_post_jail(char *, char **);
 +extern CONFIG_BOOL_TABLE cleanup_bool_table[];
  extern CONFIG_INT_TABLE cleanup_int_table[];
- extern CONFIG_STR_TABLE cleanup_str_table[];
- extern CONFIG_TIME_TABLE cleanup_time_table[];
---- src/cleanup/cleanup_envelope.c.orig	2002-11-01 15:34:02.000000000 +0200
-+++ src/cleanup/cleanup_envelope.c	2003-04-17 08:54:39.000000000 +0300
-@@ -192,15 +192,19 @@
- 	if (state->orig_rcpt == 0)
- 	    state->orig_rcpt = mystrdup(buf);
+--- src/cleanup/cleanup_envelope.c.orig	2003-05-23 00:03:20.000000000 +0300
++++ src/cleanup/cleanup_envelope.c	2004-01-21 08:41:03.000000000 +0200
+@@ -196,11 +196,15 @@
  	cleanup_rewrite_internal(clean_addr, *buf ? buf : var_empty_addr);
 -	if (cleanup_rcpt_canon_maps)
 -	    cleanup_map11_internal(state, clean_addr, cleanup_rcpt_canon_maps,
@@ -49,39 +39,23 @@ $NetBSD: patch-ag,v 1.8 2003/04/17 06:22:19 martti Exp $
 +		cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
 +	}
  	cleanup_out_recipient(state, state->orig_rcpt, STR(clean_addr));
- 	if (state->recip == 0)
- 	    state->recip = mystrdup(STR(clean_addr));
 --- src/cleanup/cleanup_init.c.orig	2002-12-03 16:56:56.000000000 +0200
-+++ src/cleanup/cleanup_init.c	2003-04-17 08:54:39.000000000 +0300
-@@ -6,6 +6,8 @@
- /* SYNOPSIS
- /*	#include "cleanup.h"
++++ src/cleanup/cleanup_init.c	2004-01-21 08:41:03.000000000 +0200
+@@ -8,2 +8,4 @@
  /*
 +/*	CONFIG_BOOL_TABLE cleanup_bool_table[];
 +/*
  /*	CONFIG_INT_TABLE cleanup_int_table[];
- /*
- /*	CONFIG_STR_TABLE cleanup_str_table[];
-@@ -28,7 +30,7 @@
- /*	for one-time initializations that must be done before any message
- /*	processing can take place.
+@@ -30,3 +32,3 @@
  /*
 -/*	cleanup_{int,str,time}_table[] specify configuration
 +/*	cleanup_{bool,int,str,time}_table[] specify configuration
  /*	parameters that must be initialized before calling any functions
- /*	in this module. These tables satisfy the interface as specified in
- /*	single_service(3).
-@@ -109,6 +111,7 @@
- int     var_extra_rcpt_limit;		/* recipient extract limit */
- char   *var_rcpt_witheld;		/* recipients not disclosed */
+@@ -111,2 +113,3 @@
  char   *var_masq_classes;		/* what to masquerade */
 +bool    var_canon_env_rcpt;		/* canonicalize envelope recipient */
  int     var_qattr_count_limit;		/* named attribute limit */
- int     var_body_check_len;		/* when to stop body scan */
- 
-@@ -145,6 +148,11 @@
-     0,
- };
+@@ -147,2 +150,7 @@
  
 +CONFIG_BOOL_TABLE cleanup_bool_table[] = {
 +    VAR_CANON_ENV_RCPT, DEF_CANON_ENV_RCPT, &var_canon_env_rcpt,
@@ -89,18 +63,12 @@ $NetBSD: patch-ag,v 1.8 2003/04/17 06:22:19 martti Exp $
 +};
 +
   /*
-   * Mappings.
-   */
---- src/global/mail_params.h.orig	2003-04-17 08:54:22.000000000 +0300
-+++ src/global/mail_params.h	2003-04-17 08:54:39.000000000 +0300
-@@ -324,6 +324,10 @@
- #define DEF_RCPT_CANON_MAPS	""
- extern char *var_rcpt_canon_maps;
+--- src/global/mail_params.h.orig	2004-01-21 08:40:40.000000000 +0200
++++ src/global/mail_params.h	2004-01-21 08:41:03.000000000 +0200
+@@ -326,2 +326,6 @@
  
 +#define VAR_CANON_ENV_RCPT	"canonicalize_envelope_recipient"
 +#define DEF_CANON_ENV_RCPT	1
 +extern bool var_canon_env_rcpt;
 +
  #define VAR_TRANSPORT_MAPS	"transport_maps"
- #define DEF_TRANSPORT_MAPS	""
- extern char *var_transport_maps;