Skip to content

Commit

Permalink
mail/postfix: Sanitize MANPREFIX
Browse files Browse the repository at this point in the history
Approved by:    portmgr (blanket)
  • Loading branch information
5u623l20 committed Jan 22, 2024
1 parent 9998de1 commit bcea742
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 83 deletions.
12 changes: 6 additions & 6 deletions mail/postfix/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postfix
DISTVERSION= 3.8.4
PORTREVISION?= 0
PORTREVISION?= 1
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= https://postfix-mirror.horus-it.com/postfix-release/ \
Expand Down Expand Up @@ -207,7 +207,7 @@ POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
-DDEF_MANPAGE_DIR=\\\"${PREFIX}/share/man\\\" \
-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
Expand Down Expand Up @@ -337,7 +337,7 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
s!^(setgid_group =)!\1 maildrop!g;\
s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\
s!^(manpage_directory =)!\1 ${PREFIX}/share/man!g;\
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
s!(:|= )/etc/postfix!\1$$config_directory!g;\
Expand Down Expand Up @@ -397,14 +397,14 @@ do-install:
meta_directory=${META_DIRECTORY} \
html_directory=${READMEDIR} \
mailq_path=${PREFIX}/bin/mailq \
manpage_directory=${MANPREFIX}/man \
manpage_directory=${PREFIX}/share/man \
newaliases_path=${PREFIX}/bin/newaliases \
readme_directory=${READMEDIR} \
sendmail_path=${PREFIX}/sbin/sendmail )

${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${PREFIX}/share/man/man1

# == do not overwrite existing config
${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample
Expand Down Expand Up @@ -440,6 +440,6 @@ do-install:

do-install-TEST-on:
${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${PREFIX}/share/man/man1

.include <bsd.port.mk>
154 changes: 77 additions & 77 deletions mail/postfix/pkg-plist
Expand Up @@ -85,83 +85,83 @@ libexec/postfix/tlsproxy
libexec/postfix/trivial-rewrite
libexec/postfix/verify
libexec/postfix/virtual
%%BMAN%%man/man1/mailq.1.gz
%%BMAN%%man/man1/newaliases.1.gz
%%BMAN%%man/man1/postalias.1.gz
%%BMAN%%man/man1/postcat.1.gz
%%BMAN%%man/man1/postconf.1.gz
%%BMAN%%man/man1/postdrop.1.gz
%%BMAN%%man/man1/postfix-tls.1.gz
%%BMAN%%man/man1/postfix.1.gz
%%BMAN%%man/man1/postkick.1.gz
%%BMAN%%man/man1/postlock.1.gz
%%BMAN%%man/man1/postlog.1.gz
%%BMAN%%man/man1/postmap.1.gz
%%BMAN%%man/man1/postmulti.1.gz
%%BMAN%%man/man1/postqueue.1.gz
%%BMAN%%man/man1/postsuper.1.gz
%%BMAN%%man/man1/posttls-finger.1.gz
%%TEST%%%%BMAN%%man/man1/qmqp-sink.1.gz
%%TEST%%%%BMAN%%man/man1/qmqp-source.1.gz
%%BMAN%%man/man1/qshape.1.gz
%%BMAN%%man/man1/sendmail.1.gz
%%TEST%%%%BMAN%%man/man1/smtp-sink.1.gz
%%TEST%%%%BMAN%%man/man1/smtp-source.1.gz
%%BMAN%%man/man5/access.5.gz
%%BMAN%%man/man5/aliases.5.gz
%%BMAN%%man/man5/body_checks.5.gz
%%BMAN%%man/man5/bounce.5.gz
%%BMAN%%man/man5/canonical.5.gz
%%BMAN%%man/man5/cidr_table.5.gz
%%BMAN%%man/man5/generic.5.gz
%%BMAN%%man/man5/header_checks.5.gz
%%BMAN%%man/man5/ldap_table.5.gz
%%BMAN%%man/man5/lmdb_table.5.gz
%%BMAN%%man/man5/master.5.gz
%%BMAN%%man/man5/memcache_table.5.gz
%%BMAN%%man/man5/mysql_table.5.gz
%%BMAN%%man/man5/nisplus_table.5.gz
%%BMAN%%man/man5/pcre_table.5.gz
%%BMAN%%man/man5/pgsql_table.5.gz
%%BMAN%%man/man5/postconf.5.gz
%%BMAN%%man/man5/postfix-wrapper.5.gz
%%BMAN%%man/man5/regexp_table.5.gz
%%BMAN%%man/man5/relocated.5.gz
%%BMAN%%man/man5/socketmap_table.5.gz
%%BMAN%%man/man5/sqlite_table.5.gz
%%BMAN%%man/man5/tcp_table.5.gz
%%BMAN%%man/man5/transport.5.gz
%%BMAN%%man/man5/virtual.5.gz
%%BMAN%%man/man8/anvil.8.gz
%%BMAN%%man/man8/bounce.8.gz
%%BMAN%%man/man8/cleanup.8.gz
%%BMAN%%man/man8/defer.8.gz
%%BMAN%%man/man8/discard.8.gz
%%BMAN%%man/man8/dnsblog.8.gz
%%BMAN%%man/man8/error.8.gz
%%BMAN%%man/man8/flush.8.gz
%%BMAN%%man/man8/lmtp.8.gz
%%BMAN%%man/man8/local.8.gz
%%BMAN%%man/man8/master.8.gz
%%BMAN%%man/man8/oqmgr.8.gz
%%BMAN%%man/man8/pickup.8.gz
%%BMAN%%man/man8/pipe.8.gz
%%BMAN%%man/man8/postlogd.8.gz
%%BMAN%%man/man8/postscreen.8.gz
%%BMAN%%man/man8/proxymap.8.gz
%%BMAN%%man/man8/qmgr.8.gz
%%BMAN%%man/man8/qmqpd.8.gz
%%BMAN%%man/man8/scache.8.gz
%%BMAN%%man/man8/showq.8.gz
%%BMAN%%man/man8/smtp.8.gz
%%BMAN%%man/man8/smtpd.8.gz
%%BMAN%%man/man8/spawn.8.gz
%%BMAN%%man/man8/tlsmgr.8.gz
%%BMAN%%man/man8/tlsproxy.8.gz
%%BMAN%%man/man8/trace.8.gz
%%BMAN%%man/man8/trivial-rewrite.8.gz
%%BMAN%%man/man8/verify.8.gz
%%BMAN%%man/man8/virtual.8.gz
%%BMAN%%share/man/man1/mailq.1.gz
%%BMAN%%share/man/man1/newaliases.1.gz
%%BMAN%%share/man/man1/postalias.1.gz
%%BMAN%%share/man/man1/postcat.1.gz
%%BMAN%%share/man/man1/postconf.1.gz
%%BMAN%%share/man/man1/postdrop.1.gz
%%BMAN%%share/man/man1/postfix-tls.1.gz
%%BMAN%%share/man/man1/postfix.1.gz
%%BMAN%%share/man/man1/postkick.1.gz
%%BMAN%%share/man/man1/postlock.1.gz
%%BMAN%%share/man/man1/postlog.1.gz
%%BMAN%%share/man/man1/postmap.1.gz
%%BMAN%%share/man/man1/postmulti.1.gz
%%BMAN%%share/man/man1/postqueue.1.gz
%%BMAN%%share/man/man1/postsuper.1.gz
%%BMAN%%share/man/man1/posttls-finger.1.gz
%%TEST%%%%BMAN%%share/man/man1/qmqp-sink.1.gz
%%TEST%%%%BMAN%%share/man/man1/qmqp-source.1.gz
%%BMAN%%share/man/man1/qshape.1.gz
%%BMAN%%share/man/man1/sendmail.1.gz
%%TEST%%%%BMAN%%share/man/man1/smtp-sink.1.gz
%%TEST%%%%BMAN%%share/man/man1/smtp-source.1.gz
%%BMAN%%share/man/man5/access.5.gz
%%BMAN%%share/man/man5/aliases.5.gz
%%BMAN%%share/man/man5/body_checks.5.gz
%%BMAN%%share/man/man5/bounce.5.gz
%%BMAN%%share/man/man5/canonical.5.gz
%%BMAN%%share/man/man5/cidr_table.5.gz
%%BMAN%%share/man/man5/generic.5.gz
%%BMAN%%share/man/man5/header_checks.5.gz
%%BMAN%%share/man/man5/ldap_table.5.gz
%%BMAN%%share/man/man5/lmdb_table.5.gz
%%BMAN%%share/man/man5/master.5.gz
%%BMAN%%share/man/man5/memcache_table.5.gz
%%BMAN%%share/man/man5/mysql_table.5.gz
%%BMAN%%share/man/man5/nisplus_table.5.gz
%%BMAN%%share/man/man5/pcre_table.5.gz
%%BMAN%%share/man/man5/pgsql_table.5.gz
%%BMAN%%share/man/man5/postconf.5.gz
%%BMAN%%share/man/man5/postfix-wrapper.5.gz
%%BMAN%%share/man/man5/regexp_table.5.gz
%%BMAN%%share/man/man5/relocated.5.gz
%%BMAN%%share/man/man5/socketmap_table.5.gz
%%BMAN%%share/man/man5/sqlite_table.5.gz
%%BMAN%%share/man/man5/tcp_table.5.gz
%%BMAN%%share/man/man5/transport.5.gz
%%BMAN%%share/man/man5/virtual.5.gz
%%BMAN%%share/man/man8/anvil.8.gz
%%BMAN%%share/man/man8/bounce.8.gz
%%BMAN%%share/man/man8/cleanup.8.gz
%%BMAN%%share/man/man8/defer.8.gz
%%BMAN%%share/man/man8/discard.8.gz
%%BMAN%%share/man/man8/dnsblog.8.gz
%%BMAN%%share/man/man8/error.8.gz
%%BMAN%%share/man/man8/flush.8.gz
%%BMAN%%share/man/man8/lmtp.8.gz
%%BMAN%%share/man/man8/local.8.gz
%%BMAN%%share/man/man8/master.8.gz
%%BMAN%%share/man/man8/oqmgr.8.gz
%%BMAN%%share/man/man8/pickup.8.gz
%%BMAN%%share/man/man8/pipe.8.gz
%%BMAN%%share/man/man8/postlogd.8.gz
%%BMAN%%share/man/man8/postscreen.8.gz
%%BMAN%%share/man/man8/proxymap.8.gz
%%BMAN%%share/man/man8/qmgr.8.gz
%%BMAN%%share/man/man8/qmqpd.8.gz
%%BMAN%%share/man/man8/scache.8.gz
%%BMAN%%share/man/man8/showq.8.gz
%%BMAN%%share/man/man8/smtp.8.gz
%%BMAN%%share/man/man8/smtpd.8.gz
%%BMAN%%share/man/man8/spawn.8.gz
%%BMAN%%share/man/man8/tlsmgr.8.gz
%%BMAN%%share/man/man8/tlsproxy.8.gz
%%BMAN%%share/man/man8/trace.8.gz
%%BMAN%%share/man/man8/trivial-rewrite.8.gz
%%BMAN%%share/man/man8/verify.8.gz
%%BMAN%%share/man/man8/virtual.8.gz
sbin/postalias
sbin/postcat
sbin/postconf
Expand Down

0 comments on commit bcea742

Please sign in to comment.