From bb19906839608ce8431ecfebce770a1f5ed1e8d8 Mon Sep 17 00:00:00 2001 From: christos Date: Thu, 20 Mar 2003 22:23:21 +0000 Subject: - upgrade to 2.0.7 - add kim's recipient canonicalization patch. NOTE: TLS was disabled and is still disabled in this version. --- mail/postfix/Makefile | 4 ++-- mail/postfix/distinfo | 7 +++--- mail/postfix/patches/patch-ag | 54 +++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 32 deletions(-) (limited to 'mail') diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 79bcc532df0..fe1e870ac05 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.86 2003/03/14 19:37:47 jlam Exp $ +# $NetBSD: Makefile,v 1.87 2003/03/20 22:23:21 christos Exp $ -DISTNAME= postfix-2.0.6 +DISTNAME= postfix-2.0.7 CATEGORIES= mail MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 9f2f602dc4e..36ed4d802c5 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.36 2003/03/07 03:08:34 taca Exp $ +$NetBSD: distinfo,v 1.37 2003/03/20 22:23:21 christos Exp $ -SHA1 (postfix/postfix-2.0.6.tar.gz) = c7263976542fb63f8a583e1d814af9918ad93dda -Size (postfix/postfix-2.0.6.tar.gz) = 1345009 bytes +SHA1 (postfix/postfix-2.0.7.tar.gz) = 6f7567f780239e4372192171365d858c37c08fac +Size (postfix/postfix-2.0.6.tar.gz) = 1345929 bytes SHA1 (postfix/tls+ipv6-1.13-pf-2.0.6.patch.gz) = d14daefb0214f255ece87aab2fb3fb74c2396ba1 Size (postfix/tls+ipv6-1.13-pf-2.0.6.patch.gz) = 95701 bytes SHA1 (patch-aa) = 5bc8f2d888bea92cfa88ef154c852b63990ae03e SHA1 (patch-ad) = d4e536f5f0d482a759da0016ea79f78b0a87455c SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a SHA1 (patch-af) = 1020280735f4d4aeb352f576e00e3bdb28f152a6 +SHA1 (patch-ag) = 424aa8485737638914d66916b9ce4f827da21d3a diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag index 919ea2f99bb..c9e50a87337 100644 --- a/mail/postfix/patches/patch-ag +++ b/mail/postfix/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.6 2003/03/20 22:04:47 christos Exp $ +$NetBSD: patch-ag,v 1.7 2003/03/20 22:23:22 christos Exp $ --- src/cleanup/cleanup.c Mon Nov 5 11:25:58 2001 +++ src/cleanup/cleanup.c Thu Jan 17 21:50:18 2002 @@ -20,11 +20,11 @@ $NetBSD: patch-ag,v 1.6 2003/03/20 22:04:47 christos Exp $ 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 Fri Dec 21 20:11:40 2001 -+++ src/cleanup/cleanup_envelope.c Thu Jan 17 21:50:18 2002 -@@ -166,15 +166,19 @@ - return; - } +--- src/cleanup/cleanup_envelope.c.orig 2002-11-01 08:34:02.000000000 -0500 ++++ src/cleanup/cleanup_envelope.c 2003-03-20 17:09:12.000000000 -0500 +@@ -192,15 +192,19 @@ + 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, @@ -38,21 +38,21 @@ $NetBSD: patch-ag,v 1.6 2003/03/20 22:04:47 christos Exp $ + 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); ++ 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); ++ cleanup_comm_canon_maps, ++ cleanup_ext_prop_mask & EXT_PROP_CANONICAL); + if (cleanup_masq_domains -+ && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT)) ++ && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT)) + cleanup_masquerade_internal(clean_addr, cleanup_masq_domains); + } - cleanup_out_recipient(state, STR(clean_addr)); + 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 Fri Aug 3 18:39:18 2001 -+++ src/cleanup/cleanup_init.c Thu Jan 17 21:50:18 2002 +--- src/cleanup/cleanup_init.c.orig 2002-12-03 09:56:56.000000000 -0500 ++++ src/cleanup/cleanup_init.c 2003-03-20 17:10:34.000000000 -0500 @@ -6,6 +6,8 @@ /* SYNOPSIS /* #include "cleanup.h" @@ -71,26 +71,26 @@ $NetBSD: patch-ag,v 1.6 2003/03/20 22:04:47 christos Exp $ /* parameters that must be initialized before calling any functions /* in this module. These tables satisfy the interface as specified in /* single_service(3). -@@ -107,6 +109,7 @@ - char *var_always_bcc; /* big brother */ +@@ -109,6 +111,7 @@ int var_extra_rcpt_limit; /* recipient extract limit */ char *var_rcpt_witheld; /* recipients not disclosed */ -+bool var_canon_env_rcpt; /* canonicalize envelope recipient */ 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 */ - CONFIG_INT_TABLE cleanup_int_table[] = { -@@ -136,6 +139,11 @@ - VAR_ALWAYS_BCC, DEF_ALWAYS_BCC, &var_always_bcc, 0, 0, - VAR_RCPT_WITHELD, DEF_RCPT_WITHELD, &var_rcpt_witheld, 1, 0, - VAR_MASQ_CLASSES, DEF_MASQ_CLASSES, &var_masq_classes, 0, 0, -+ 0, -+}; -+ -+CONFIG_BOOL_TABLE cleanup_bool_table[] = { -+ VAR_CANON_ENV_RCPT, DEF_CANON_ENV_RCPT, &var_canon_env_rcpt, +@@ -145,6 +148,11 @@ 0, }; ++CONFIG_BOOL_TABLE cleanup_bool_table[] = { ++ VAR_CANON_ENV_RCPT, DEF_CANON_ENV_RCPT, &var_canon_env_rcpt, ++ 0, ++}; ++ + /* + * Mappings. + */ --- src/global/mail_params.h Tue Jan 15 10:24:34 2002 +++ src/global/mail_params.h Thu Jan 17 21:50:19 2002 @@ -295,6 +295,10 @@ -- cgit v1.2.3