Thu Jun 4 14:08:57 2009 UTC ()
Updated mail/postfix to 2.6.2

Postfix stable release 2.6.2 fixes one defect in SASL support.
This does not affect Postfix versions 2.5 and earlier.

With plaintext SMTP sessions AND smtpd_tls_auth_only=yes AND
smtp_sasl_auth_enable=yes, the SMTP server logged warnings for
reject_*_sender_login_mismatch, instead of enforcing them.

You can find Postfix version 2.6.2 at the mirrors listed at
http://www.postfix.org/

The same fix is also available in Postfix snapshot 2.7-20090528.
Postfix versions 2.5 and earlier are not affected.


(martti)
diff -r1.227 -r1.228 pkgsrc/mail/postfix/Makefile
diff -r1.126 -r1.127 pkgsrc/mail/postfix/distinfo
cvs diff -r1.227 -r1.228 pkgsrc/mail/postfix/Makefile (switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2009/05/20 07:46:09 1.227
+++ pkgsrc/mail/postfix/Makefile 2009/06/04 14:08:56 1.228
@@ -1,170 +1,170 @@ @@ -1,170 +1,170 @@
1# $NetBSD: Makefile,v 1.227 2009/05/20 07:46:09 martti Exp $ 1# $NetBSD: Makefile,v 1.228 2009/06/04 14:08:56 martti Exp $
2 2
3DISTNAME= postfix-2.6.1 3DISTNAME= postfix-2.6.2
4#PKGREVISION= 1 4#PKGREVISION= 1
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
7MASTER_SITES+= http://postfix.it-austria.net/releases/official/ 7MASTER_SITES+= http://postfix.it-austria.net/releases/official/
8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/ 8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/
9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/official/ 9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/official/
10DIST_SUBDIR= postfix 10DIST_SUBDIR= postfix
11 11
12MAINTAINER= martti@NetBSD.org 12MAINTAINER= martti@NetBSD.org
13HOMEPAGE= http://www.postfix.org/ 13HOMEPAGE= http://www.postfix.org/
14COMMENT= Postfix SMTP server and tools 14COMMENT= Postfix SMTP server and tools
15LICENSE= postfix-license 15LICENSE= postfix-license
16 16
17CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 17CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
18 18
19PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
20 20
21USE_TOOLS+= perl 21USE_TOOLS+= perl
22CHECK_HEADERS_SKIP+= src/global/mail_params.h 22CHECK_HEADERS_SKIP+= src/global/mail_params.h
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555 26SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555
27SPECIAL_PERMS+= sbin/postqueue postfix maildrop 2555 27SPECIAL_PERMS+= sbin/postqueue postfix maildrop 2555
28 28
29# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is 29# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
30# merely a default, and may be changed by setting "queue_directory" in 30# merely a default, and may be changed by setting "queue_directory" in
31# ${PKG_SYSCONFDIR}/main.cf. 31# ${PKG_SYSCONFDIR}/main.cf.
32# 32#
33POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix 33POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix
34POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix 34POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
35BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR 35BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
36 36
37# CCARGS is a list of options to pass to the preprocessor/compiler. 37# CCARGS is a list of options to pass to the preprocessor/compiler.
38# AUXLIBS is a list of options to pass to the linker. 38# AUXLIBS is a list of options to pass to the linker.
39# 39#
40CCARGS= -DUSE_SASL_AUTH 40CCARGS= -DUSE_SASL_AUTH
41AUXLIBS= ${LDFLAGS} 41AUXLIBS= ${LDFLAGS}
42 42
43# Set some default paths to override ${WRKSRC}/src/global/mail_params.h. 43# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
44CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\" 44CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
45CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\" 45CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
46CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\" 46CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
47CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\" 47CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
48CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\" 48CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
49CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\" 49CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
50CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\" 50CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
51CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\" 51CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
52CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\" 52CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\"
53CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\" 53CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
54CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\" 54CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\"
55 55
56REPLACE_PERL+= auxiliary/qshape/qshape.pl 56REPLACE_PERL+= auxiliary/qshape/qshape.pl
57 57
58# Override those same default paths in the installed example main.cf. 58# Override those same default paths in the installed example main.cf.
59SUBST_CLASSES+= postfix 59SUBST_CLASSES+= postfix
60SUBST_STAGE.postfix= post-configure 60SUBST_STAGE.postfix= post-configure
61SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h 61SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h
62SUBST_SED.postfix= \ 62SUBST_SED.postfix= \
63 -e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|' 63 -e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|'
64SUBST_SED.postfix+= \ 64SUBST_SED.postfix+= \
65 -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|' 65 -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
66SUBST_SED.postfix+= \ 66SUBST_SED.postfix+= \
67 -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|' 67 -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
68SUBST_SED.postfix+= \ 68SUBST_SED.postfix+= \
69 -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|' 69 -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
70SUBST_SED.postfix+= \ 70SUBST_SED.postfix+= \
71 -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|' 71 -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
72SUBST_SED.postfix+= \ 72SUBST_SED.postfix+= \
73 -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|' 73 -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
74SUBST_SED.postfix+= \ 74SUBST_SED.postfix+= \
75 -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|' 75 -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
76SUBST_SED.postfix+= \ 76SUBST_SED.postfix+= \
77 -e 's|^\(setgid_group\) =.*|\1 = maildrop|' 77 -e 's|^\(setgid_group\) =.*|\1 = maildrop|'
78SUBST_SED.postfix+= \ 78SUBST_SED.postfix+= \
79 -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|' 79 -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|'
80SUBST_SED.postfix+= \ 80SUBST_SED.postfix+= \
81 -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|' 81 -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
82SUBST_SED.postfix+= \ 82SUBST_SED.postfix+= \
83 -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|' 83 -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
84SUBST_SED.postfix+= \ 84SUBST_SED.postfix+= \
85 -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,maildrop,g' 85 -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,maildrop,g'
86 86
87# options.mk appends to CCARGS and AUXLIBS the options needed to build 87# options.mk appends to CCARGS and AUXLIBS the options needed to build
88# Postfix with support for various add-on modules. 88# Postfix with support for various add-on modules.
89# 89#
90.include "options.mk" 90.include "options.mk"
91 91
92PKG_SYSCONFSUBDIR= postfix 92PKG_SYSCONFSUBDIR= postfix
93LIBEXECDIR= ${PREFIX}/libexec/postfix 93LIBEXECDIR= ${PREFIX}/libexec/postfix
94DOCDIR= ${PREFIX}/share/doc/postfix 94DOCDIR= ${PREFIX}/share/doc/postfix
95EXAMPLEDIR= ${PREFIX}/share/examples/postfix 95EXAMPLEDIR= ${PREFIX}/share/examples/postfix
96 96
97FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 97FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
98MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 98MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
99MESSAGE_SUBST+= DOCDIR=${DOCDIR} 99MESSAGE_SUBST+= DOCDIR=${DOCDIR}
100 100
101MESSAGE_SRC+= ${PKGDIR}/MESSAGE 101MESSAGE_SRC+= ${PKGDIR}/MESSAGE
102.if exists(${PKGDIR}/MESSAGE.${OPSYS}) 102.if exists(${PKGDIR}/MESSAGE.${OPSYS})
103MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS} 103MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
104.endif 104.endif
105PLIST_SRC+= ${PKGDIR}/PLIST 105PLIST_SRC+= ${PKGDIR}/PLIST
106 106
107BUILD_TARGET= # empty 107BUILD_TARGET= # empty
108MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q} 108MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q}
109MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q} 109MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
110 110
111RCD_SCRIPTS= postfix 111RCD_SCRIPTS= postfix
112OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc 112OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
113OWN_DIRS_PERMS+= ${POSTFIX_DATA_DIR} postfix postfix 0700 113OWN_DIRS_PERMS+= ${POSTFIX_DATA_DIR} postfix postfix 0700
114MAKE_DIRS+= ${PKG_SYSCONFDIR} 114MAKE_DIRS+= ${PKG_SYSCONFDIR}
115 115
116PKG_GROUPS?= postfix maildrop 116PKG_GROUPS?= postfix maildrop
117PKG_USERS?= postfix:postfix 117PKG_USERS?= postfix:postfix
118PKG_GECOS.postfix= Postfix User 118PKG_GECOS.postfix= Postfix User
119PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR} 119PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR}
120 120
121CONF_FILES= # empty 121CONF_FILES= # empty
122.for i in main.cf master.cf 122.for i in main.cf master.cf
123CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} 123CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
124.endfor 124.endfor
125CONF_FILES_PERMS= # empty 125CONF_FILES_PERMS= # empty
126.for i in post-install postfix-script 126.for i in post-install postfix-script
127CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \ 127CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
128 ${ROOT_USER} ${ROOT_GROUP} 755 128 ${ROOT_USER} ${ROOT_GROUP} 755
129.endfor 129.endfor
130 130
131MAKE_ENV+= DEBUG= # empty 131MAKE_ENV+= DEBUG= # empty
132 132
133SUBST_CLASSES+= paths 133SUBST_CLASSES+= paths
134SUBST_FILES.paths= ${WRKDIR}/mailer.conf 134SUBST_FILES.paths= ${WRKDIR}/mailer.conf
135SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 135SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
136SUBST_STAGE.paths= post-patch 136SUBST_STAGE.paths= post-patch
137 137
138post-extract: 138post-extract:
139 cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf 139 cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
140 rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix 140 rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
141 141
142do-configure: 142do-configure:
143 cd ${WRKSRC} && \ 143 cd ${WRKSRC} && \
144 env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \ 144 env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
145 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}' 145 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
146 146
147post-build: 147post-build:
148.if !empty(PKG_OPTIONS:Msasl) 148.if !empty(PKG_OPTIONS:Msasl)
149 ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf 149 ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
150.endif 150.endif
151 151
152do-install: 152do-install:
153 ${INSTALL_DATA_DIR} ${LIBEXECDIR} 153 ${INSTALL_DATA_DIR} ${LIBEXECDIR}
154 ${INSTALL_DATA_DIR} ${EXAMPLEDIR} 154 ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
155 ${INSTALL_DATA_DIR} ${DOCDIR} 155 ${INSTALL_DATA_DIR} ${DOCDIR}
156 rm -f ${WRKSRC}/conf/*.orig 156 rm -f ${WRKSRC}/conf/*.orig
157.if !empty(PKG_OPTIONS:Msasl) 157.if !empty(PKG_OPTIONS:Msasl)
158 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR} 158 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
159.endif 159.endif
160 ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR} 160 ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
161 ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR} 161 ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
162 ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf 162 ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
163 cd ${WRKSRC} && sh ./postfix-install -non-interactive \ 163 cd ${WRKSRC} && sh ./postfix-install -non-interactive \
164 config_directory="${EXAMPLEDIR}" 164 config_directory="${EXAMPLEDIR}"
165 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \ 165 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
166 ${PREFIX}/sbin/qshape 166 ${PREFIX}/sbin/qshape
167 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \ 167 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
168 ${PREFIX}/${PKGMANDIR}/man1 168 ${PREFIX}/${PKGMANDIR}/man1
169 169
170.include "../../mk/bsd.pkg.mk" 170.include "../../mk/bsd.pkg.mk"
cvs diff -r1.126 -r1.127 pkgsrc/mail/postfix/distinfo (switch to unified diff)

--- pkgsrc/mail/postfix/distinfo 2009/05/20 07:46:09 1.126
+++ pkgsrc/mail/postfix/distinfo 2009/06/04 14:08:56 1.127
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.126 2009/05/20 07:46:09 martti Exp $ 1$NetBSD: distinfo,v 1.127 2009/06/04 14:08:56 martti Exp $
2 2
3SHA1 (postfix/postfix-2.6.1.tar.gz) = 0d072c80a3e7b4b228ae45cbf0adbe3f945a7767 3SHA1 (postfix/postfix-2.6.2.tar.gz) = a3b349df60bca947f3b94ff484b699d176777b4a
4RMD160 (postfix/postfix-2.6.1.tar.gz) = b45af58e1fca01cb34edd51e4ff46b56cc3eca63 4RMD160 (postfix/postfix-2.6.2.tar.gz) = a86c829c3c17746986a0ea013674b6bec49d74ea
5Size (postfix/postfix-2.6.1.tar.gz) = 3324194 bytes 5Size (postfix/postfix-2.6.2.tar.gz) = 3323255 bytes
6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb 6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
7SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa 7SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa
8SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e 8SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e
9SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622 9SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622
10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03 10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf 11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73 12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73