Wed Jan 26 17:41:31 2022 UTC ()
postfix: Update to 3.6.4

upstream changes:
-----------------
 Fixed in Postfix 3.6.4, 3.5.14, 3.4.24, 3.3.21:
  o Bug introduced in bugfix 20210708: duplicate bounce_notice_recipient
    entries in postconf output. This was caused by an incomplete fix to send
    SMTP session transcripts to $bounce_notice_recipient. Reported by Vincent
    Lefevre.
  o Bug introduced in Postfix 3.0: the proxymap daemon did not automatically
    authorize proxied maps inside pipemap (example:
    pipemap:{proxy:maptype:mapname, ...}) or inside unionmap. Problem reported
    by Mirko Vogt.
  o Bug introduced in Postfix 2.5: off-by-one error while writing a string
    terminator. This code passed all memory corruption tests, presumably
    because it wrote over an alignment padding byte, or over an adjacent
    character byte that was never read. Reported by Robert Siemer.

Fixed in Postfix 3.6.4, 3.5.14, 3.4.24:
  o The proxymap daemon did not automatically authorize map features added
    after Postfix 3.3, caused by missing *_maps parameter names in the
    proxy_read_maps default value. Found during code maintenance.


(triaxx)
diff -r1.333 -r1.334 pkgsrc/mail/postfix/Makefile
diff -r1.39 -r1.40 pkgsrc/mail/postfix/Makefile.common
diff -r1.199 -r1.200 pkgsrc/mail/postfix/distinfo
cvs diff -r1.333 -r1.334 pkgsrc/mail/postfix/Makefile (switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2021/12/15 20:54:00 1.333
+++ pkgsrc/mail/postfix/Makefile 2022/01/26 17:41:31 1.334
@@ -1,99 +1,98 @@ @@ -1,99 +1,98 @@
1# $NetBSD: Makefile,v 1.333 2021/12/15 20:54:00 adam Exp $ 1# $NetBSD: Makefile,v 1.334 2022/01/26 17:41:31 triaxx Exp $
2 2
3PKGREVISION= 1 
4.include "../../mail/postfix/Makefile.common" 3.include "../../mail/postfix/Makefile.common"
5 4
6COMMENT= Fast, easy to administer, and secure mail transfer agent 5COMMENT= Fast, easy to administer, and secure mail transfer agent
7 6
8CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 7CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
9CONFLICTS+= esmtp>=1.2 nullmailer-[0-9]* 8CONFLICTS+= esmtp>=1.2 nullmailer-[0-9]*
10 9
11USE_TOOLS+= perl pkg-config m4 10USE_TOOLS+= perl pkg-config m4
12 11
13SPECIAL_PERMS+= sbin/postdrop ${POSTFIX_USER} ${MAILDROP_GROUP} 2555 12SPECIAL_PERMS+= sbin/postdrop ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
14SPECIAL_PERMS+= sbin/postqueue ${POSTFIX_USER} ${MAILDROP_GROUP} 2555 13SPECIAL_PERMS+= sbin/postqueue ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
15 14
16REPLACE_PERL+= auxiliary/qshape/qshape.pl 15REPLACE_PERL+= auxiliary/qshape/qshape.pl
17 16
18# options.mk appends to CCARGS and AUXLIBS the options needed to build 17# options.mk appends to CCARGS and AUXLIBS the options needed to build
19# Postfix with support for various add-on modules. 18# Postfix with support for various add-on modules.
20# 19#
21.include "options.mk" 20.include "options.mk"
22 21
23FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 22FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
24MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 23MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
25MESSAGE_SUBST+= DOCDIR=${DOCDIR} 24MESSAGE_SUBST+= DOCDIR=${DOCDIR}
26 25
27MESSAGE_SRC+= ${PKGDIR}/MESSAGE 26MESSAGE_SRC+= ${PKGDIR}/MESSAGE
28.if exists(${PKGDIR}/MESSAGE.${OPSYS}) 27.if exists(${PKGDIR}/MESSAGE.${OPSYS})
29MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS} 28MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
30.endif 29.endif
31PLIST_SRC+= ${PKGDIR}/PLIST 30PLIST_SRC+= ${PKGDIR}/PLIST
32 31
33RCD_SCRIPTS= postfix 32RCD_SCRIPTS= postfix
34OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc 33OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
35OWN_DIRS_PERMS+= ${POSTFIX_DATA_DIR} ${POSTFIX_USER} ${POSTFIX_GROUP} 0700 34OWN_DIRS_PERMS+= ${POSTFIX_DATA_DIR} ${POSTFIX_USER} ${POSTFIX_GROUP} 0700
36MAKE_DIRS+= ${METADIR}/dynamicmaps.cf.d ${METADIR}/postfix-files.d 35MAKE_DIRS+= ${METADIR}/dynamicmaps.cf.d ${METADIR}/postfix-files.d
37 36
38PKG_GROUPS?= ${POSTFIX_GROUP} ${MAILDROP_GROUP} 37PKG_GROUPS?= ${POSTFIX_GROUP} ${MAILDROP_GROUP}
39PKG_USERS?= ${POSTFIX_USER}:${POSTFIX_GROUP} 38PKG_USERS?= ${POSTFIX_USER}:${POSTFIX_GROUP}
40 39
41PKG_GECOS.${POSTFIX_USER}= Postfix User 40PKG_GECOS.${POSTFIX_USER}= Postfix User
42PKG_HOME.${POSTFIX_USER}= ${POSTFIX_QUEUE_DIR} 41PKG_HOME.${POSTFIX_USER}= ${POSTFIX_QUEUE_DIR}
43 42
44CONF_FILES= # empty 43CONF_FILES= # empty
45.for i in main.cf master.cf 44.for i in main.cf master.cf
46CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} 45CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
47.endfor 46.endfor
48CONF_FILES_PERMS= # empty 47CONF_FILES_PERMS= # empty
49 48
50SUBST_CLASSES+= paths 49SUBST_CLASSES+= paths
51SUBST_FILES.paths= ${WRKDIR}/mailer.conf 50SUBST_FILES.paths= ${WRKDIR}/mailer.conf
52SUBST_VARS.paths= PREFIX 51SUBST_VARS.paths= PREFIX
53SUBST_STAGE.paths= pre-configure 52SUBST_STAGE.paths= pre-configure
54 53
55INSTALLATION_DIRS+= ${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR} 54INSTALLATION_DIRS+= ${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
56 55
57post-extract: 56post-extract:
58 ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf 57 ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
59 ${RM} -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix 58 ${RM} -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
60 59
61post-build: 60post-build:
62.if !empty(PKG_OPTIONS:Msasl) 61.if !empty(PKG_OPTIONS:Msasl)
63 ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf 62 ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
64.endif 63.endif
65 64
66do-install: 65do-install:
67 ${RM} -f ${WRKSRC}/conf/*.orig 66 ${RM} -f ${WRKSRC}/conf/*.orig
68.if !empty(PKG_OPTIONS:Msasl) 67.if !empty(PKG_OPTIONS:Msasl)
69 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR} 68 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
70.endif 69.endif
71 cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC}/lib \ 70 cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC}/lib \
72 DYLD_LIBRARY_PATH=${WRKSRC}/lib \ 71 DYLD_LIBRARY_PATH=${WRKSRC}/lib \
73 ${SH} ./postfix-install -non-interactive \ 72 ${SH} ./postfix-install -non-interactive \
74 ${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}" 73 ${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
75 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \ 74 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
76 ${DESTDIR}${EXAMPLEDIR}/mailer.conf 75 ${DESTDIR}${EXAMPLEDIR}/mailer.conf
77 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \ 76 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
78 ${DESTDIR}${PREFIX}/sbin/qshape 77 ${DESTDIR}${PREFIX}/sbin/qshape
79 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \ 78 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
80 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 79 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
81.for dir in ${POSTFIX_QUEUE_SUBDIR} 80.for dir in ${POSTFIX_QUEUE_SUBDIR}
82 ${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir} 81 ${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir}
83.endfor 82.endfor
84.if ${OPSYS} == "Darwin" 83.if ${OPSYS} == "Darwin"
85 for f in ${DESTDIR}${PREFIX}/lib/postfix/lib*.dylib; do \ 84 for f in ${DESTDIR}${PREFIX}/lib/postfix/lib*.dylib; do \
86 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \ 85 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
87 done 86 done
88 for f in ${DESTDIR}${PREFIX}/libexec/postfix/* ${DESTDIR}${PREFIX}/sbin/*; do \ 87 for f in ${DESTDIR}${PREFIX}/libexec/postfix/* ${DESTDIR}${PREFIX}/sbin/*; do \
89 install_name_tool \ 88 install_name_tool \
90 -change @rpath/libpostfix-dns.dylib ${PREFIX}/lib/postfix/libpostfix-dns.dylib \ 89 -change @rpath/libpostfix-dns.dylib ${PREFIX}/lib/postfix/libpostfix-dns.dylib \
91 -change @rpath/libpostfix-global.dylib ${PREFIX}/lib/postfix/libpostfix-global.dylib \ 90 -change @rpath/libpostfix-global.dylib ${PREFIX}/lib/postfix/libpostfix-global.dylib \
92 -change @rpath/libpostfix-master.dylib ${PREFIX}/lib/postfix/libpostfix-master.dylib \ 91 -change @rpath/libpostfix-master.dylib ${PREFIX}/lib/postfix/libpostfix-master.dylib \
93 -change @rpath/libpostfix-tls.dylib ${PREFIX}/lib/postfix/libpostfix-tls.dylib \ 92 -change @rpath/libpostfix-tls.dylib ${PREFIX}/lib/postfix/libpostfix-tls.dylib \
94 -change @rpath/libpostfix-util.dylib ${PREFIX}/lib/postfix/libpostfix-util.dylib \ 93 -change @rpath/libpostfix-util.dylib ${PREFIX}/lib/postfix/libpostfix-util.dylib \
95 $$f; \ 94 $$f; \
96 done 95 done
97.endif 96.endif
98 97
99.include "../../mk/bsd.pkg.mk" 98.include "../../mk/bsd.pkg.mk"
cvs diff -r1.39 -r1.40 pkgsrc/mail/postfix/Makefile.common (switch to unified diff)

--- pkgsrc/mail/postfix/Makefile.common 2021/12/18 10:50:33 1.39
+++ pkgsrc/mail/postfix/Makefile.common 2022/01/26 17:41:31 1.40
@@ -1,134 +1,134 @@ @@ -1,134 +1,134 @@
1# $NetBSD: Makefile.common,v 1.39 2021/12/18 10:50:33 adam Exp $ 1# $NetBSD: Makefile.common,v 1.40 2022/01/26 17:41:31 triaxx Exp $
2# used by mail/postfix/Makefile 2# used by mail/postfix/Makefile
3# used by mail/postfix/Makefile.module 3# used by mail/postfix/Makefile.module
4 4
5DISTNAME= postfix-3.6.3 5DISTNAME= postfix-3.6.4
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 7MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.postfix.org/ 10HOMEPAGE= http://www.postfix.org/
11# The postfix license has only very minor diffs from cpl-1.0. 11# The postfix license has only very minor diffs from cpl-1.0.
12LICENSE= cpl-1.0 12LICENSE= cpl-1.0
13#LICENSE= postfix-license 13#LICENSE= postfix-license
14 14
15DISTINFO_FILE= ${PKGDIR}/../../mail/postfix/distinfo 15DISTINFO_FILE= ${PKGDIR}/../../mail/postfix/distinfo
16PATCHDIR= ${PKGDIR}/../../mail/postfix/patches 16PATCHDIR= ${PKGDIR}/../../mail/postfix/patches
17 17
18CHECK_HEADERS_SKIP+= src/global/mail_params.h 18CHECK_HEADERS_SKIP+= src/global/mail_params.h
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22POSTFIX_USER?= postfix 22POSTFIX_USER?= postfix
23POSTFIX_GROUP?= postfix 23POSTFIX_GROUP?= postfix
24MAILDROP_GROUP?= maildrop 24MAILDROP_GROUP?= maildrop
25 25
26# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is 26# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
27# merely a default, and may be changed by setting "queue_directory" in 27# merely a default, and may be changed by setting "queue_directory" in
28# ${PKG_SYSCONFDIR}/main.cf. 28# ${PKG_SYSCONFDIR}/main.cf.
29# 29#
30POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix 30POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix
31POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix 31POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
32POSTFIX_QUEUE_SUBDIR= active bounce corrupt defer deferred flush hold \ 32POSTFIX_QUEUE_SUBDIR= active bounce corrupt defer deferred flush hold \
33 incoming maildrop pid private public saved trace 33 incoming maildrop pid private public saved trace
34BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR 34BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
35 35
36# CCARGS is a list of options to pass to the preprocessor/compiler. 36# CCARGS is a list of options to pass to the preprocessor/compiler.
37# AUXLIBS is a list of options to pass to the linker. 37# AUXLIBS is a list of options to pass to the linker.
38CCARGS= #defined 38CCARGS= #defined
39AUXLIBS= ${LDFLAGS} 39AUXLIBS= ${LDFLAGS}
40 40
41# Enable Dovecot SASL 41# Enable Dovecot SASL
42CCARGS+= -DUSE_SASL_AUTH 42CCARGS+= -DUSE_SASL_AUTH
43# Enable Berkeley DB map type. BDB_LIBS is defined in mk/bdb.buildlink3.mk. 43# Enable Berkeley DB map type. BDB_LIBS is defined in mk/bdb.buildlink3.mk.
44CCARGS+= -DHAS_DB 44CCARGS+= -DHAS_DB
45AUXLIBS+= ${BDB_LIBS} 45AUXLIBS+= ${BDB_LIBS}
46 46
47# Disable modules by default 47# Disable modules by default
48.for module in cdb ldap lmdb mysql pcre pgsql sqlite 48.for module in cdb ldap lmdb mysql pcre pgsql sqlite
49CCARGS+= -DNO_${module:tu} 49CCARGS+= -DNO_${module:tu}
50.endfor 50.endfor
51 51
52# Set some default paths to override ${WRKSRC}/src/global/mail_params.h. 52# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
53CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\" 53CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
54CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\" 54CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
55CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\" 55CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
56CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\" 56CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
57CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\" 57CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
58CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\" 58CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\"
59CCARGS+= -DDEF_META_DIR=\"${PREFIX}/${METADIR}\" 59CCARGS+= -DDEF_META_DIR=\"${PREFIX}/${METADIR}\"
60CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\" 60CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
61CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\" 61CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
62CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\" 62CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\"
63CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\" 63CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
64CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\" 64CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
65CCARGS+= -DDEF_SHLIB_DIR=\"${PREFIX}/${SHLIBDIR}\" 65CCARGS+= -DDEF_SHLIB_DIR=\"${PREFIX}/${SHLIBDIR}\"
66 66
67# Override those same default paths in the installed example main.cf. 67# Override those same default paths in the installed example main.cf.
68SUBST_CLASSES+= postfix 68SUBST_CLASSES+= postfix
69SUBST_STAGE.postfix= post-configure 69SUBST_STAGE.postfix= post-configure
70SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h 70SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h
71SUBST_SED.postfix= \ 71SUBST_SED.postfix= \
72 -e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|' 72 -e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|'
73SUBST_SED.postfix+= \ 73SUBST_SED.postfix+= \
74 -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|' 74 -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
75SUBST_SED.postfix+= \ 75SUBST_SED.postfix+= \
76 -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|' 76 -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
77SUBST_SED.postfix+= \ 77SUBST_SED.postfix+= \
78 -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|' 78 -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
79SUBST_SED.postfix+= \ 79SUBST_SED.postfix+= \
80 -e 's|^\(meta_directory\) =.*|\1 = ${PREFIX}/${METADIR}|' 80 -e 's|^\(meta_directory\) =.*|\1 = ${PREFIX}/${METADIR}|'
81SUBST_SED.postfix+= \ 81SUBST_SED.postfix+= \
82 -e 's|^\(shlib_directory\) =.*|\1 = ${PREFIX}/${SHLIBDIR}|' 82 -e 's|^\(shlib_directory\) =.*|\1 = ${PREFIX}/${SHLIBDIR}|'
83SUBST_SED.postfix+= \ 83SUBST_SED.postfix+= \
84 -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|' 84 -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
85SUBST_SED.postfix+= \ 85SUBST_SED.postfix+= \
86 -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|' 86 -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
87SUBST_SED.postfix+= \ 87SUBST_SED.postfix+= \
88 -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|' 88 -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
89SUBST_SED.postfix+= \ 89SUBST_SED.postfix+= \
90 -e 's|^\(mail_owner\) =.*|\1 = ${POSTFIX_USER}|' 90 -e 's|^\(mail_owner\) =.*|\1 = ${POSTFIX_USER}|'
91SUBST_SED.postfix+= \ 91SUBST_SED.postfix+= \
92 -e 's|^\(setgid_group\) =.*|\1 = ${MAILDROP_GROUP}|' 92 -e 's|^\(setgid_group\) =.*|\1 = ${MAILDROP_GROUP}|'
93SUBST_SED.postfix+= \ 93SUBST_SED.postfix+= \
94 -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|' 94 -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|'
95SUBST_SED.postfix+= \ 95SUBST_SED.postfix+= \
96 -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|' 96 -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
97SUBST_SED.postfix+= \ 97SUBST_SED.postfix+= \
98 -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|' 98 -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
99SUBST_SED.postfix+= \ 99SUBST_SED.postfix+= \
100 -e '/^\#define DEF_MAIL_OWNER[ ]/s,postfix,${POSTFIX_USER},g' 100 -e '/^\#define DEF_MAIL_OWNER[ ]/s,postfix,${POSTFIX_USER},g'
101SUBST_SED.postfix+= \ 101SUBST_SED.postfix+= \
102 -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,${MAILDROP_GROUP},g' 102 -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,${MAILDROP_GROUP},g'
103 103
104PKG_SYSCONFSUBDIR= postfix 104PKG_SYSCONFSUBDIR= postfix
105LIBEXECDIR= ${PREFIX}/libexec/postfix 105LIBEXECDIR= ${PREFIX}/libexec/postfix
106DOCDIR= ${PREFIX}/share/doc/postfix 106DOCDIR= ${PREFIX}/share/doc/postfix
107EXAMPLEDIR= ${PREFIX}/share/examples/postfix 107EXAMPLEDIR= ${PREFIX}/share/examples/postfix
108# Not prefixed so that we can use where relative path needed 108# Not prefixed so that we can use where relative path needed
109# METADIR set for postfix-2.6.x compatibility 109# METADIR set for postfix-2.6.x compatibility
110METADIR= libexec/postfix 110METADIR= libexec/postfix
111SHLIBDIR= lib/postfix 111SHLIBDIR= lib/postfix
112 112
113BUILD_TARGET= # empty 113BUILD_TARGET= # empty
114MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q} 114MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q}
115MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q} 115MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
116 116
117MAKE_ENV+= DEBUG= # empty 117MAKE_ENV+= DEBUG= # empty
118 118
119.if ${OPSYS} == "SunOS" && !exists(/usr/include/rpcsvc/nis_cache.h) 119.if ${OPSYS} == "SunOS" && !exists(/usr/include/rpcsvc/nis_cache.h)
120CCARGS+= -DNO_NISPLUS 120CCARGS+= -DNO_NISPLUS
121.endif 121.endif
122 122
123CFLAGS.SunOS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 123CFLAGS.SunOS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
124LDFLAGS.Darwin+= -headerpad_max_install_names 124LDFLAGS.Darwin+= -headerpad_max_install_names
125 125
126DESTDIR_INSTALLOPTIONS= -package install_root="${DESTDIR}" 126DESTDIR_INSTALLOPTIONS= -package install_root="${DESTDIR}"
127 127
128do-configure: 128do-configure:
129 cd ${WRKSRC} && \ 129 cd ${WRKSRC} && \
130 env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \ 130 env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
131 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}' \ 131 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}' \
132 shared=yes dynamicmaps=yes 132 shared=yes dynamicmaps=yes
133 133
134.include "../../mk/bdb.buildlink3.mk" 134.include "../../mk/bdb.buildlink3.mk"
cvs diff -r1.199 -r1.200 pkgsrc/mail/postfix/distinfo (switch to unified diff)

--- pkgsrc/mail/postfix/distinfo 2021/11/08 13:58:09 1.199
+++ pkgsrc/mail/postfix/distinfo 2022/01/26 17:41:31 1.200
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.199 2021/11/08 13:58:09 taca Exp $ 1$NetBSD: distinfo,v 1.200 2022/01/26 17:41:31 triaxx Exp $
2 2
3BLAKE2s (postfix-3.6.3.tar.gz) = 1ba19a223c40f45a0bf4e5994b2acba2ef6210ad7c524b72eb4adf7302446ce1 3BLAKE2s (postfix-3.6.4.tar.gz) = 91a54f04959c49aa514db5d884576501df627f51df109829acbb40295d28311b
4SHA512 (postfix-3.6.3.tar.gz) = 7179aaeeaf27838b867d9a07f9a889d7cd6b7f5053e123caef4dff2820d4df6d5be167effedde6c857b4468966b8449c631e56405e1ac2d589716fb4e3f15e3b 4SHA512 (postfix-3.6.4.tar.gz) = f5813801377a5887d27720cc7f85a6a68f8ca82fc7a9e852b27c8967996b3d64f651cc16e2b021d55316a074b4778e19155bb60c8f0885d4aaf72766cab7c4cd
5Size (postfix-3.6.3.tar.gz) = 4750833 bytes 5Size (postfix-3.6.4.tar.gz) = 4751433 bytes
6SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c 6SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
7SHA1 (patch-ag) = feccf4aba580f581953b32e6c3a2c453fcb9131c 7SHA1 (patch-ag) = feccf4aba580f581953b32e6c3a2c453fcb9131c
8SHA1 (patch-ai) = b93d8b4e7a52e2c281cf0815ef2cf653c3cd7efa 8SHA1 (patch-ai) = b93d8b4e7a52e2c281cf0815ef2cf653c3cd7efa
9SHA1 (patch-src_smtpd_Makefile.in) = 8133f9cceb0c1c0250d6543cb060c66288571722 9SHA1 (patch-src_smtpd_Makefile.in) = 8133f9cceb0c1c0250d6543cb060c66288571722
10SHA1 (patch-src_smtpd_pfilter.c) = c747d2f3584f694eb7b73b19118b4d8b450cfe7f 10SHA1 (patch-src_smtpd_pfilter.c) = c747d2f3584f694eb7b73b19118b4d8b450cfe7f
11SHA1 (patch-src_smtpd_pfilter.h) = 153b516da89d709d293c6086c2f126791bd945d6 11SHA1 (patch-src_smtpd_pfilter.h) = 153b516da89d709d293c6086c2f126791bd945d6
12SHA1 (patch-src_smtpd_smtpd.c) = 5f290ec55305702986beefdbbc194f5ce7987643 12SHA1 (patch-src_smtpd_smtpd.c) = 5f290ec55305702986beefdbbc194f5ce7987643