head 1.12; access; symbols pkgsrc-2013Q2:1.12.0.32 pkgsrc-2013Q2-base:1.12 pkgsrc-2012Q4:1.12.0.30 pkgsrc-2012Q4-base:1.12 pkgsrc-2011Q4:1.12.0.28 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q2:1.12.0.26 pkgsrc-2011Q2-base:1.12 pkgsrc-2009Q4:1.12.0.24 pkgsrc-2009Q4-base:1.12 pkgsrc-2008Q4:1.12.0.22 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.20 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.18 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.16 pkgsrc-2008Q2-base:1.12 pkgsrc-2008Q1:1.12.0.14 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.12 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.10 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.8 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.6 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.4 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.2 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.11.0.2 pkgsrc-2006Q2-base:1.11 pkgsrc-2006Q1:1.10.0.14 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.12 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.10.0.10 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.8 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.6 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.4 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.2 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.6.0.4 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1; locks; strict; comment @# @; 1.12 date 2006.07.13.09.57.51; author martti; state dead; branches; next 1.11; 1.11 date 2006.06.27.04.40.50; author jlam; state Exp; branches; next 1.10; 1.10 date 2004.08.07.07.58.32; author jlam; state dead; branches; next 1.9; 1.9 date 2004.07.18.19.16.31; author jlam; state Exp; branches; next 1.8; 1.8 date 2004.06.21.16.13.23; author martti; state Exp; branches; next 1.7; 1.7 date 2004.03.05.22.59.32; author grant; state Exp; branches 1.7.4.1; next 1.6; 1.6 date 2003.01.06.09.15.50; author martti; state Exp; branches; next 1.5; 1.5 date 2002.03.27.13.10.18; author martti; state Exp; branches; next 1.4; 1.4 date 2002.03.16.18.06.40; author martti; state Exp; branches; next 1.3; 1.3 date 2001.03.20.12.50.51; author hubertf; state dead; branches; next 1.2; 1.2 date 2000.04.09.08.10.20; author simonb; state Exp; branches; next 1.1; 1.1 date 99.05.30.18.18.31; author tron; state Exp; branches; next ; 1.7.4.1 date 2004.07.08.08.33.49; author agc; state Exp; branches; next ; desc @@ 1.12 log @Updated mail/postfix to 2.3.0 This is the first version in the 2.3.x series, please see the release notes for full list of changes since 2.2.x before upgrading your current installation. @ text @$NetBSD: patch-ae,v 1.11 2006/06/27 04:40:50 jlam Exp $ --- src/global/mail_params.h.orig 2006-02-03 11:06:52.000000000 -0500 +++ src/global/mail_params.h @@@@ -1186,7 +1186,7 @@@@ extern char *var_smtpd_sasl_opts; extern char *var_smtpd_sasl_appname; #define VAR_SMTPD_SASL_TLS_OPTS "smtpd_sasl_tls_security_options" -#define DEF_SMTPD_SASL_TLS_OPTS "$smtpd_sasl_security_options" +#define DEF_SMTPD_SASL_TLS_OPTS "$" VAR_SMTPD_SASL_OPTS extern char *var_smtpd_sasl_tls_opts; #define VAR_SMTPD_SASL_REALM "smtpd_sasl_local_domain" @@@@ -1227,7 +1227,7 @@@@ extern char *var_smtp_sasl_opts; extern char *var_smtp_sasl_mechs; #define VAR_SMTP_SASL_TLS_OPTS "smtp_sasl_tls_security_options" -#define DEF_SMTP_SASL_TLS_OPTS "$var_smtp_sasl_opts" +#define DEF_SMTP_SASL_TLS_OPTS "$" VAR_SMTP_SASL_OPTS extern char *var_smtp_sasl_tls_opts; /* @ 1.11 log @Fix default value of smtp_sasl_tls_security_options to use $smtp_sasl_security_options (as documented in postconf(5)) instead of $var_smtp_sasl_opts, which is never defined. This is a bug that exists in the Postfix-2.2.x series but has been fixed in the (current) Postfix-2.3.x series. This fixes PR pkg/29631 by Christoph Badura. Bump the PKGREVISION to 1. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @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 @d1 1 a1 1 $NetBSD: patch-ae,v 1.9 2004/07/18 19:16:31 jlam Exp $ d3 4 a6 4 --- 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; d8 4 a11 5 #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; d13 3 a15 8 @@@@ -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; d17 4 a20 6 #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; d22 1 @ 1.9 log @Use FILES_SUBST_SED instead of local make targets to do the same thing. FILES_SUBST_SED substitutes for @@FOO@@, so use that format for things to be replaced. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.8 2004/06/21 16:13:23 martti Exp $ @ 1.8 log @Updated postfix to 2.1.3 This is the new 2.1.x series, please see www.postfix.org for complete list of changes since 2.0.20. @ text @d1 1 a1 1 $NetBSD$ d19 1 a19 1 +#define DEF_DAEMON_DIR "__PREFIX/libexec/postfix" d26 1 a26 1 +#define DEF_COMMAND_DIR "__PREFIX/sbin" @ 1.7 log @don't patch the same file twice, don't patch multiple files in a single patch. @ text @d3 3 a5 3 --- 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; d14 1 a14 1 @@@@ -187,18 +187,18 @@@@ extern char *var_queue_dir; a15 6 #define VAR_PROGRAM_DIR "program_directory" #ifndef DEF_PROGRAM_DIR -#define DEF_PROGRAM_DIR "/usr/libexec/postfix" +#define DEF_PROGRAM_DIR "__PREFIX/libexec/postfix" #endif a29 11 @@@@ -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; @ 1.7.4.1 log @Pullup ticket 47 to the pkgsrc-2004Q2 branch, requested by Martti Kuparinen. Update postfix to 2.1.3. Module Name: pkgsrc Committed By: martti Date: Mon Jun 21 16:13:24 UTC 2004 Modified Files: pkgsrc/mail/postfix: Makefile PLIST PLIST.tls distinfo pkgsrc/mail/postfix/patches: patch-aa patch-ae patch-af patch-ag patch-ai Removed Files: pkgsrc/mail/postfix/patches: patch-ad patch-ba patch-bb patch-bc patch-bd Log Message: Updated postfix to 2.1.3 This is the new 2.1.x series, please see www.postfix.org for complete list of changes since 2.0.20. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.7 2004/03/05 22:59:32 grant Exp $ d3 3 a5 3 --- 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 @@@@ d14 1 a14 1 @@@@ -202,13 +202,13 @@@@ d16 6 d36 11 @ 1.6 log @Updated postfix to 2.0.0.2 IMPORTANT: read the documents in /usr/pkg/share/doc/postfix/ before upgrading from Postfix 1.1. Hightlights: - MIME support (including 8bit->7bit conversion and more accurate matching of MIME headers in message bodies) - completely rewritten RBL client code - smarter handling of DNS lookup errors in UCE restrictions - virtual delivery agent without transport map for every domain - a long list of other things that are meant to improve performance or functionality without compromising what already existed. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2002/03/27 13:10:18 martti Exp $ d3 3 a5 3 --- 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 @@@@ d14 1 a14 1 @@@@ -187,18 +187,18 @@@@ d36 11 @ 1.5 log @Use maildrop as the default gid. PR#16034 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2002/03/16 18:06:40 martti Exp $ d3 3 a5 3 --- src/global/mail_params.h.orig Mon Mar 25 14:22:11 2002 +++ src/global/mail_params.h Wed Mar 27 13:59:44 2002 @@@@ -50,7 +50,7 @@@@ d14 1 a14 1 @@@@ -169,18 +169,18 @@@@ @ 1.4 log @* Install main.cf and master.cf to /etc/postfix if they don't exist * Fixed some hardcoded paths (should fix pkg/13987) @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 2 --- src/global/mail_params.h.orig Sat Mar 16 18:04:22 2002 +++ src/global/mail_params.h Sat Mar 16 18:05:47 2002 @ 1.3 log @Move files from postfix-current to postfix, as that's actually the latest release (it's also in the base src). Adresses PR 12426 by Martti Kuparinen @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2000/04/09 08:10:20 simonb Exp $ d3 24 a26 19 --- 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.2 2000/04/09 08:10:20 simonb Exp $ +.include "../conf/main.cf" + +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.2 log @Update Postfix to 19991231-pl06. Addresses PR pkg/9844 from Oleg Polyanski. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $ d6 1 a6 1 +# $NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $ @ 1.1 log @Patch one file per patch file. @ text @d1 1 a1 1 $NetBSD$ d5 2 a6 2 @@@@ -0,0 +1,17 @@@@ +# $NetBSD: patch-aa,v 1.1 1999/05/29 20:57:19 christos Exp $ d14 5 a18 5 + sample-debug.cf sample-ldap.cf sample-local.cf \ + sample-misc.cf sample-pcre.cf sample-rate.cf \ + sample-relocated.cf sample-resource.cf \ + sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \ + sample-transport.cf sample-virtual.cf transport virtual a21 1 + @