don't patch the same file twice, don't patch multiple files in a

single patch.

7 files changed, 121 insertions, 86 deletions

diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index e79bfd61a02..a1959e3cc9e 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.54 2004/02/16 09:31:06 martti Exp $
+$NetBSD: distinfo,v 1.55 2004/03/05 22:59:32 grant Exp $
 
 SHA1 (postfix/postfix-2.0.18.tar.gz) = 7abf546d2756978caddb37f4203602412e277f51
 Size (postfix/postfix-2.0.18.tar.gz) = 1353649 bytes
-SHA1 (postfix/tls+ipv6-1.21-pf-2.0.18.patch.gz) = e2c29b3e6a00eb53120661d7e411d8e786a0bae6
-Size (postfix/tls+ipv6-1.21-pf-2.0.18.patch.gz) = 254862 bytes
-SHA1 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 51498e624f9fc68f33384c2355803f0b181ca64a
-Size (postfix/postfix-pg.postfix-2.0.0.2.patch) = 27419 bytes
 SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
 SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
-SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
+SHA1 (patch-ae) = 2a118fb905c469f8a2e947c3e91b5d4e82c5bb6e
 SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
-SHA1 (patch-ag) = 0b5f1241cd4f4b27b8edfd5e5e19f4b9ce9948ca
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
 SHA1 (patch-ai) = 25af047b95fcdd9bf71ac853a291b2499230ad42
+SHA1 (patch-ba) = e0ed2e41db1cfaf5d924578e536d809ff8623e2d
+SHA1 (patch-bb) = ba4cf4020ee26c3e43bd816f549ad6557a484110
+SHA1 (patch-bc) = 07ee685f6c607a5ee7ea723c4a36729a9c662ba1
+SHA1 (patch-bd) = 380f3947559667784584c05c0d38eb3ce61a13d5
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
index 48c00ff5766..821ebcc8edd 100644
--- a/mail/postfix/patches/patch-ae
+++ b/mail/postfix/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2003/01/06 09:15:50 martti Exp $
+$NetBSD: patch-ae,v 1.7 2004/03/05 22:59:32 grant Exp $
 
---- 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 @@
+--- src/global/mail_params.h.orig	2003-03-04 09:07:03.000000000 +1100
++++ src/global/mail_params.h
+@@ -64,7 +64,7 @@ extern uid_t var_owner_uid;
  extern gid_t var_owner_gid;
  
  #define VAR_SGID_GROUP		"setgid_group"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.6 2003/01/06 09:15:50 martti Exp $
  extern char *var_sgid_group;
  extern gid_t var_sgid_gid;
  
-@@ -187,18 +187,18 @@
+@@ -187,18 +187,18 @@ extern char *var_queue_dir;
    */
  #define VAR_PROGRAM_DIR		"program_directory"
  #ifndef DEF_PROGRAM_DIR
@@ -33,3 +33,14 @@ $NetBSD: patch-ae,v 1.6 2003/01/06 09:15:50 martti Exp $
  #endif
  extern char *var_command_dir;
  
+@@ -324,6 +324,10 @@ extern char *var_send_canon_maps;
+ #define DEF_RCPT_CANON_MAPS	""
+ extern char *var_rcpt_canon_maps;
+ 
++#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;
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
deleted file mode 100644
index 3857af227fd..00000000000
--- a/mail/postfix/patches/patch-ag
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ag,v 1.9 2004/01/21 06:56:48 martti Exp $
-
---- 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,
---- src/cleanup/cleanup.h.orig	2002-12-03 16:58:11.000000000 +0200
-+++ 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[];
---- 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,
--				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
--	if (cleanup_comm_canon_maps)
--	    cleanup_map11_internal(state, clean_addr, cleanup_comm_canon_maps,
--				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
--	if (cleanup_masq_domains
--	    && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT))
--	    cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
-+	if (var_canon_env_rcpt) {
-+	    if (cleanup_rcpt_canon_maps)
-+		cleanup_map11_internal(state, clean_addr,
-+				    cleanup_rcpt_canon_maps,
-+				    cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+	    if (cleanup_comm_canon_maps)
-+		cleanup_map11_internal(state, clean_addr,
-+				    cleanup_comm_canon_maps,
-+				    cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+	    if (cleanup_masq_domains
-+		&& (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT))
-+		cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
-+	}
- 	cleanup_out_recipient(state, state->orig_rcpt, STR(clean_addr));
---- src/cleanup/cleanup_init.c.orig	2002-12-03 16:56:56.000000000 +0200
-+++ 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[];
-@@ -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
-@@ -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 */
-@@ -147,2 +150,7 @@
- 
-+CONFIG_BOOL_TABLE cleanup_bool_table[] = {
-+    VAR_CANON_ENV_RCPT, DEF_CANON_ENV_RCPT, &var_canon_env_rcpt,
-+    0,
-+};
-+
-  /*
---- 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"
diff --git a/mail/postfix/patches/patch-ba b/mail/postfix/patches/patch-ba
new file mode 100644
index 00000000000..809415bf42e
--- /dev/null
+++ b/mail/postfix/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.7 2004/03/05 22:59:32 grant Exp $
+
+--- src/cleanup/cleanup.c.orig	2003-08-10 10:40:30.000000000 +1000
++++ src/cleanup/cleanup.c
+@@ -333,6 +333,7 @@ int     main(int argc, char **argv)
+      * Pass control to the single-threaded service skeleton.
+      */
+     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,
diff --git a/mail/postfix/patches/patch-bb b/mail/postfix/patches/patch-bb
new file mode 100644
index 00000000000..9540af4e645
--- /dev/null
+++ b/mail/postfix/patches/patch-bb
@@ -0,0 +1,12 @@
+$NetBSD: patch-bb,v 1.4 2004/03/05 22:59:32 grant Exp $
+
+--- src/cleanup/cleanup.h.orig	2002-12-04 01:58:11.000000000 +1100
++++ src/cleanup/cleanup.h
+@@ -118,6 +118,7 @@ extern void cleanup_free(CLEANUP_STATE *
+ extern void cleanup_all(void);
+ extern void cleanup_pre_jail(char *, char **);
+ 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[];
diff --git a/mail/postfix/patches/patch-bc b/mail/postfix/patches/patch-bc
new file mode 100644
index 00000000000..43607190e12
--- /dev/null
+++ b/mail/postfix/patches/patch-bc
@@ -0,0 +1,33 @@
+$NetBSD: patch-bc,v 1.4 2004/03/05 22:59:32 grant Exp $
+
+--- src/cleanup/cleanup_envelope.c.orig	2003-05-23 07:03:20.000000000 +1000
++++ src/cleanup/cleanup_envelope.c
+@@ -194,15 +194,19 @@ static void cleanup_envelope_process(CLE
+ 	if (state->orig_rcpt == 0)
+ 	    state->orig_rcpt = mystrdup(buf);
+ 	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,
+-				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
+-	if (cleanup_comm_canon_maps)
+-	    cleanup_map11_internal(state, clean_addr, cleanup_comm_canon_maps,
+-				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
+-	if (cleanup_masq_domains
+-	    && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT))
+-	    cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
++	if (var_canon_env_rcpt) {
++	    if (cleanup_rcpt_canon_maps)
++		cleanup_map11_internal(state, clean_addr,
++				    cleanup_rcpt_canon_maps,
++				    cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
++	    if (cleanup_comm_canon_maps)
++		cleanup_map11_internal(state, clean_addr,
++				    cleanup_comm_canon_maps,
++				    cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
++	    if (cleanup_masq_domains
++		&& (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT))
++		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));
diff --git a/mail/postfix/patches/patch-bd b/mail/postfix/patches/patch-bd
new file mode 100644
index 00000000000..8df221accef
--- /dev/null
+++ b/mail/postfix/patches/patch-bd
@@ -0,0 +1,42 @@
+$NetBSD: patch-bd,v 1.4 2004/03/05 22:59:32 grant Exp $
+
+--- src/cleanup/cleanup_init.c.orig	2002-12-04 01:56:56.000000000 +1100
++++ src/cleanup/cleanup_init.c
+@@ -6,6 +6,8 @@
+ /* SYNOPSIS
+ /*	#include "cleanup.h"
+ /*
++/*	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.
+ /*
+-/*	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 @@ char   *var_always_bcc;			/* big brother
+ int     var_extra_rcpt_limit;		/* recipient extract limit */
+ char   *var_rcpt_witheld;		/* recipients not disclosed */
+ 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 @@ CONFIG_STR_TABLE cleanup_str_table[] = {
+     0,
+ };
+ 
++CONFIG_BOOL_TABLE cleanup_bool_table[] = {
++    VAR_CANON_ENV_RCPT, DEF_CANON_ENV_RCPT, &var_canon_env_rcpt,
++    0,
++};
++
+  /*
+   * Mappings.
+   */