Mon Aug 18 07:19:13 2008 UTC ()
Updated mail/postfix-current to 2.6.20080814

20080804

        Bugfix: dangling pointer in vstring_sprintf_prepend().
        File: util/vstring.c.

20080814

        Security: some systems have changed their link() semantics,
        and will hardlink a symlink, contrary to POSIX and XPG4.
        Sebastian Krahmer, SuSE. File: util/safe_open.c.

        The solution introduces the following incompatible change:
        when the target of mail delivery is a symlink, the parent
        directory of that symlink must now be writable by root only
        (in addition to the already existing requirement that the
        symlink itself is owned by root).  This change will break
        legitimate configurations that deliver mail to a symbolic
        link in a directory with less restrictive permissions.


(martti)
diff -r1.98 -r1.99 pkgsrc/mail/postfix-current/Makefile
diff -r1.44 -r1.45 pkgsrc/mail/postfix-current/distinfo
cvs diff -r1.98 -r1.99 pkgsrc/mail/postfix-current/Attic/Makefile (switch to unified diff)

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

--- pkgsrc/mail/postfix-current/Attic/distinfo 2008/08/13 07:34:44 1.44
+++ pkgsrc/mail/postfix-current/Attic/distinfo 2008/08/18 07:19:13 1.45
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.44 2008/08/13 07:34:44 martti Exp $ 1$NetBSD: distinfo,v 1.45 2008/08/18 07:19:13 martti Exp $
2 2
3SHA1 (postfix/postfix-2.6-20080726.tar.gz) = 738ffc2cb517560aff031882f898d967ea12c44f 3SHA1 (postfix/postfix-2.6-20080814.tar.gz) = 688aae4ac92b78375d6d3a9a5de980f651425062
4RMD160 (postfix/postfix-2.6-20080726.tar.gz) = b120be8ac224c9278ada39473b67867e514637cc 4RMD160 (postfix/postfix-2.6-20080814.tar.gz) = 9cdceb4da755bd05aa712335c650796ab09080d4
5Size (postfix/postfix-2.6-20080726.tar.gz) = 3178011 bytes 5Size (postfix/postfix-2.6-20080814.tar.gz) = 3157840 bytes
6SHA1 (patch-aa) = 757b6f1be1a51696f1c7d41ad520cba3b8420dcf 6SHA1 (patch-aa) = 757b6f1be1a51696f1c7d41ad520cba3b8420dcf
7SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228 7SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
8SHA1 (patch-ai) = 7b19361e77d25139134511331a82abcd26b5336d 8SHA1 (patch-ai) = 7b19361e77d25139134511331a82abcd26b5336d