head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.48 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.46 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.44 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.42 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.40 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.38 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.36 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.34 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.32 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.30 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.28 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.26 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.24 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.22 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.20 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.18 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.16 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.14 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.12 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.10 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.8 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.6 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.4 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.2 pkgsrc-2004Q3-base:1.6 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.6 date 2004.08.07.08.11.26; author jlam; state dead; branches; next 1.5; 1.5 date 2004.07.31.05.53.44; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.07.02.08.03.04; author martti; state Exp; 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.00; 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.12; author grant; state Exp; branches; next ; desc @@ 1.6 log @Mirror changes to mail/postfix: Reduce the number of patches needed by Postfix by using the subst framework and also by explicitly specifying more default values for Postfix parameters. Also pass -I/usr/pkg/include/sasl to the compiler when building using Cyrus SASLv2, which allows me to remove the patches that added an unnecessary USE_SASL2_AUTH check. @ text @$NetBSD: patch-ae,v 1.5 2004/07/31 05:53:44 jlam Exp $ --- src/global/mail_params.h.orig 2004-04-21 14:56:04.000000000 -0400 +++ src/global/mail_params.h 2004-05-23 22:44:13.000000000 -0400 @@@@ -64,7 +64,7 @@@@ extern gid_t var_owner_gid; #define VAR_SGID_GROUP "setgid_group" -#define DEF_SGID_GROUP "postdrop" +#define DEF_SGID_GROUP "maildrop" extern char *var_sgid_group; extern gid_t var_sgid_gid; @@@@ -202,13 +202,13 @@@@ */ #define VAR_DAEMON_DIR "daemon_directory" #ifndef DEF_DAEMON_DIR -#define DEF_DAEMON_DIR "/usr/libexec/postfix" +#define DEF_DAEMON_DIR "@@PREFIX@@/libexec/postfix" #endif extern char *var_daemon_dir; #define VAR_COMMAND_DIR "command_directory" #ifndef DEF_COMMAND_DIR -#define DEF_COMMAND_DIR "/usr/sbin" +#define DEF_COMMAND_DIR "@@PREFIX@@/sbin" #endif extern char *var_command_dir; @ 1.5 log @Minimize diffs with pkgsrc/mail/postfix to simplify maintenance of this package. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2004/07/02 08:03:04 martti Exp $ @ 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 @d1 1 a1 1 $NetBSD: patch-ae,v 1.8 2004/06/21 16:13:23 martti Exp $ d19 1 a19 1 +#define DEF_DAEMON_DIR "__PREFIX/libexec/postfix" d26 1 a26 1 +#define DEF_COMMAND_DIR "__PREFIX/sbin" @ 1.3 log @resolve conflicts @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/global/mail_params.h.orig 2004-01-18 02:04:00.000000000 +1100 +++ src/global/mail_params.h @@@@ -64,7 +64,7 @@@@ extern uid_t var_owner_uid; d14 1 a14 1 @@@@ -202,13 +202,13 @@@@ extern char *var_queue_dir; a29 11 @@@@ -334,6 +334,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_SEND_BCC_MAPS "sender_bcc_maps" #define DEF_SEND_BCC_MAPS "" extern char *var_send_bcc_maps; @ 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-ae,v 1.1 2000/08/14 04:33:24 itojun Exp $ d3 34 a36 5 --- conf/Makefile.orig Sun May 30 18:49:12 1999 +++ conf/Makefile Sun May 30 18:49:12 1999 @@@@ -0,0 +1,16 @@@@ +# $NetBSD: patch-ae,v 1.1 2000/08/14 04:33:24 itojun Exp $ +.include "../conf/main.cf" d38 3 a40 13 +BINDIR= ${share_directory} + + +FILES= LICENSE Makefile access aliases canonical main.cf master.cf \ + relocated sample-aliases.cf sample-canonical.cf \ + sample-debug.cf sample-ldap.cf sample-local.cf sample-misc.cf \ + sample-pcre.cf sample-rate.cf sample-regexp.cf \ + sample-relocated.cf sample-resource.cf sample-rewrite.cf \ + sample-smtp.cf sample-smtpd.cf sample-transport.cf \ + sample-virtual.cf transport virtual +SCRIPTS= postfix-script-sgid postfix-script-nosgid + +.include @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2000/04/09 08:10:20 simonb Exp $ d6 1 a6 1 +# $NetBSD: patch-ae,v 1.2 2000/04/09 08:10:20 simonb 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 5 a7 34 --- src/global/mail_params.h.orig 2004-01-18 02:04:00.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" -#define DEF_SGID_GROUP "postdrop" +#define DEF_SGID_GROUP "maildrop" extern char *var_sgid_group; extern gid_t var_sgid_gid; @@@@ -202,13 +202,13 @@@@ extern char *var_queue_dir; */ #define VAR_DAEMON_DIR "daemon_directory" #ifndef DEF_DAEMON_DIR -#define DEF_DAEMON_DIR "/usr/libexec/postfix" +#define DEF_DAEMON_DIR "__PREFIX/libexec/postfix" #endif extern char *var_daemon_dir; #define VAR_COMMAND_DIR "command_directory" #ifndef DEF_COMMAND_DIR -#define DEF_COMMAND_DIR "/usr/sbin" +#define DEF_COMMAND_DIR "__PREFIX/sbin" #endif extern char *var_command_dir; @@@@ -334,6 +334,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; d9 13 a21 3 #define VAR_SEND_BCC_MAPS "sender_bcc_maps" #define DEF_SEND_BCC_MAPS "" extern char *var_send_bcc_maps; @