head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.48 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.46 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.44 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.42 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.40 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.38 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.36 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.34 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.32 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.30 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.28 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.26 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.24 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.22 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.20 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.18 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.16 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.14 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.12 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.10 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.8 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.6 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.4 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.2 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-base:1.1.1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 NetBSD-current-20000814:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2004.07.02.08.03.04; author martti; state dead; branches; next 1.3; 1.3 date 2004.03.06.15.08.32; author grant; state Exp; branches; next 1.2; 1.2 date 2000.08.14.04.40.02; author itojun; state dead; branches; next 1.1; 1.1 date 2000.08.14.04.33.24; author itojun; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.08.14.04.33.24; author itojun; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2004.03.06.15.04.13; author grant; state Exp; branches; next ; desc @@ 1.4 log @Updated postfix-current to 2.2-20040628 * Sync with pkgsrc/mail/postfix * Get rid of canonical_classes patch * No IPv6 patch @ text @$NetBSD: patch-be,v 1.3 2004/03/06 15:08:32 grant Exp $ --- src/cleanup/cleanup_message.c.orig 2004-01-21 12:25:27.000000000 +1100 +++ src/cleanup/cleanup_message.c @@@@ -177,15 +177,17 @@@@ static void cleanup_rewrite_sender(CLEAN for (tpp = addr_list; *tpp; tpp++) { cleanup_rewrite_tree(*tpp); if (state->flags & CLEANUP_FLAG_MAP_OK) { - if (cleanup_send_canon_maps) - cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps, - cleanup_ext_prop_mask & EXT_PROP_CANONICAL); - if (cleanup_comm_canon_maps) - cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps, - cleanup_ext_prop_mask & EXT_PROP_CANONICAL); - if (cleanup_masq_domains - && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM)) + if (var_canon_env_rcpt) { + if (cleanup_send_canon_maps) + cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps, + cleanup_ext_prop_mask & EXT_PROP_CANONICAL); + if (cleanup_comm_canon_maps) + cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps, + cleanup_ext_prop_mask & EXT_PROP_CANONICAL); + if (cleanup_masq_domains + && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM)) cleanup_masquerade_tree(*tpp, cleanup_masq_domains); + } } if (hdr_opts->type == HDR_FROM && state->from == 0) state->from = cleanup_extract_internal(header_buf, *tpp); @ 1.3 log @resolve conflicts @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @postfix 20000531 + IPv6 patch (not sure if it works right - please test). uses postfix Makefiles, not patches/*. experimental. @ text @d1 1 a1 1 $NetBSD: patch-be,v 1.1 2000/08/14 04:33:24 itojun Exp $ d3 28 a30 15 --- sendmail/Makefile.orig Wed Apr 26 20:25:56 2000 +++ sendmail/Makefile Wed Apr 26 20:39:50 2000 @@@@ -0,0 +1,12 @@@@ +# $NetBSD: patch-be,v 1.1 2000/08/14 04:33:24 itojun Exp $ +.include "../conf/main.cf" +PROG= sendmail +BINDIR=${daemon_directory} + +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL} +LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS} + +# XXX +NOMAN=1 + +.include @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-be,v 1.2 2000/04/27 01:05:09 kim Exp $ d6 1 a6 1 +# $NetBSD: patch-be,v 1.2 2000/04/27 01:05:09 kim Exp $ @ 1.1.1.1 log @mail/postfix-current, for experimental postfix code - based on mail/postfix @ text @@ 1.1.1.2 log @Initial import of postfix-current into The NetBSD Packages Collection. This package is the snapshot from 20040209. Postfix aims to be an alternative to the widely-used sendmail program. Sendmail is responsible for 70% of all e-mail delivered on the Internet. With an estimated 100 million users, that's an estimated 10 billion (10^10) messages daily. A stunning number. Although IBM supported the Postfix development, it abstains from control over its evolution. The goal is to have Postfix installed on as many systems as possible. To this end, the software is given away with no strings attached to it, so that it can evolve with input from and under control by its users. @ text @d1 1 a1 1 $NetBSD$ d3 15 a17 28 --- src/cleanup/cleanup_message.c.orig 2004-01-21 12:25:27.000000000 +1100 +++ src/cleanup/cleanup_message.c @@@@ -177,15 +177,17 @@@@ static void cleanup_rewrite_sender(CLEAN for (tpp = addr_list; *tpp; tpp++) { cleanup_rewrite_tree(*tpp); if (state->flags & CLEANUP_FLAG_MAP_OK) { - if (cleanup_send_canon_maps) - cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps, - cleanup_ext_prop_mask & EXT_PROP_CANONICAL); - if (cleanup_comm_canon_maps) - cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps, - cleanup_ext_prop_mask & EXT_PROP_CANONICAL); - if (cleanup_masq_domains - && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM)) + if (var_canon_env_rcpt) { + if (cleanup_send_canon_maps) + cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps, + cleanup_ext_prop_mask & EXT_PROP_CANONICAL); + if (cleanup_comm_canon_maps) + cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps, + cleanup_ext_prop_mask & EXT_PROP_CANONICAL); + if (cleanup_masq_domains + && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM)) cleanup_masquerade_tree(*tpp, cleanup_masq_domains); + } } if (hdr_opts->type == HDR_FROM && state->from == 0) state->from = cleanup_extract_internal(header_buf, *tpp); @