Skip to content

Commit bcea742

Browse files
5u623l205u623l20
committed
mail/postfix: Sanitize MANPREFIX
Approved by: portmgr (blanket)
1 parent 9998de1 commit bcea742

2 files changed

Lines changed: 83 additions & 83 deletions

File tree

‎mail/postfix/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= postfix
22
DISTVERSION= 3.8.4
3-
PORTREVISION?= 0
3+
PORTREVISION?= 1
44
PORTEPOCH= 1
55
CATEGORIES= mail
66
MASTER_SITES= https://postfix-mirror.horus-it.com/postfix-release/ \
@@ -207,7 +207,7 @@ POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
207207
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
208208
-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
209209
-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
210-
-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
210+
-DDEF_MANPAGE_DIR=\\\"${PREFIX}/share/man\\\" \
211211
-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
212212
-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
213213
-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
@@ -337,7 +337,7 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
337337
s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
338338
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
339339
s!^(setgid_group =)!\1 maildrop!g;\
340-
s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\
340+
s!^(manpage_directory =)!\1 ${PREFIX}/share/man!g;\
341341
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
342342
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
343343
s!(:|= )/etc/postfix!\1$$config_directory!g;\
@@ -397,14 +397,14 @@ do-install:
397397
meta_directory=${META_DIRECTORY} \
398398
html_directory=${READMEDIR} \
399399
mailq_path=${PREFIX}/bin/mailq \
400-
manpage_directory=${MANPREFIX}/man \
400+
manpage_directory=${PREFIX}/share/man \
401401
newaliases_path=${PREFIX}/bin/newaliases \
402402
readme_directory=${READMEDIR} \
403403
sendmail_path=${PREFIX}/sbin/sendmail )
404404

405405
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail
406406
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
407-
${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1
407+
${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${PREFIX}/share/man/man1
408408

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

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

445445
.include <bsd.port.mk>

‎mail/postfix/pkg-plist‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -85,83 +85,83 @@ libexec/postfix/tlsproxy
8585
libexec/postfix/trivial-rewrite
8686
libexec/postfix/verify
8787
libexec/postfix/virtual
88-
%%BMAN%%man/man1/mailq.1.gz
89-
%%BMAN%%man/man1/newaliases.1.gz
90-
%%BMAN%%man/man1/postalias.1.gz
91-
%%BMAN%%man/man1/postcat.1.gz
92-
%%BMAN%%man/man1/postconf.1.gz
93-
%%BMAN%%man/man1/postdrop.1.gz
94-
%%BMAN%%man/man1/postfix-tls.1.gz
95-
%%BMAN%%man/man1/postfix.1.gz
96-
%%BMAN%%man/man1/postkick.1.gz
97-
%%BMAN%%man/man1/postlock.1.gz
98-
%%BMAN%%man/man1/postlog.1.gz
99-
%%BMAN%%man/man1/postmap.1.gz
100-
%%BMAN%%man/man1/postmulti.1.gz
101-
%%BMAN%%man/man1/postqueue.1.gz
102-
%%BMAN%%man/man1/postsuper.1.gz
103-
%%BMAN%%man/man1/posttls-finger.1.gz
104-
%%TEST%%%%BMAN%%man/man1/qmqp-sink.1.gz
105-
%%TEST%%%%BMAN%%man/man1/qmqp-source.1.gz
106-
%%BMAN%%man/man1/qshape.1.gz
107-
%%BMAN%%man/man1/sendmail.1.gz
108-
%%TEST%%%%BMAN%%man/man1/smtp-sink.1.gz
109-
%%TEST%%%%BMAN%%man/man1/smtp-source.1.gz
110-
%%BMAN%%man/man5/access.5.gz
111-
%%BMAN%%man/man5/aliases.5.gz
112-
%%BMAN%%man/man5/body_checks.5.gz
113-
%%BMAN%%man/man5/bounce.5.gz
114-
%%BMAN%%man/man5/canonical.5.gz
115-
%%BMAN%%man/man5/cidr_table.5.gz
116-
%%BMAN%%man/man5/generic.5.gz
117-
%%BMAN%%man/man5/header_checks.5.gz
118-
%%BMAN%%man/man5/ldap_table.5.gz
119-
%%BMAN%%man/man5/lmdb_table.5.gz
120-
%%BMAN%%man/man5/master.5.gz
121-
%%BMAN%%man/man5/memcache_table.5.gz
122-
%%BMAN%%man/man5/mysql_table.5.gz
123-
%%BMAN%%man/man5/nisplus_table.5.gz
124-
%%BMAN%%man/man5/pcre_table.5.gz
125-
%%BMAN%%man/man5/pgsql_table.5.gz
126-
%%BMAN%%man/man5/postconf.5.gz
127-
%%BMAN%%man/man5/postfix-wrapper.5.gz
128-
%%BMAN%%man/man5/regexp_table.5.gz
129-
%%BMAN%%man/man5/relocated.5.gz
130-
%%BMAN%%man/man5/socketmap_table.5.gz
131-
%%BMAN%%man/man5/sqlite_table.5.gz
132-
%%BMAN%%man/man5/tcp_table.5.gz
133-
%%BMAN%%man/man5/transport.5.gz
134-
%%BMAN%%man/man5/virtual.5.gz
135-
%%BMAN%%man/man8/anvil.8.gz
136-
%%BMAN%%man/man8/bounce.8.gz
137-
%%BMAN%%man/man8/cleanup.8.gz
138-
%%BMAN%%man/man8/defer.8.gz
139-
%%BMAN%%man/man8/discard.8.gz
140-
%%BMAN%%man/man8/dnsblog.8.gz
141-
%%BMAN%%man/man8/error.8.gz
142-
%%BMAN%%man/man8/flush.8.gz
143-
%%BMAN%%man/man8/lmtp.8.gz
144-
%%BMAN%%man/man8/local.8.gz
145-
%%BMAN%%man/man8/master.8.gz
146-
%%BMAN%%man/man8/oqmgr.8.gz
147-
%%BMAN%%man/man8/pickup.8.gz
148-
%%BMAN%%man/man8/pipe.8.gz
149-
%%BMAN%%man/man8/postlogd.8.gz
150-
%%BMAN%%man/man8/postscreen.8.gz
151-
%%BMAN%%man/man8/proxymap.8.gz
152-
%%BMAN%%man/man8/qmgr.8.gz
153-
%%BMAN%%man/man8/qmqpd.8.gz
154-
%%BMAN%%man/man8/scache.8.gz
155-
%%BMAN%%man/man8/showq.8.gz
156-
%%BMAN%%man/man8/smtp.8.gz
157-
%%BMAN%%man/man8/smtpd.8.gz
158-
%%BMAN%%man/man8/spawn.8.gz
159-
%%BMAN%%man/man8/tlsmgr.8.gz
160-
%%BMAN%%man/man8/tlsproxy.8.gz
161-
%%BMAN%%man/man8/trace.8.gz
162-
%%BMAN%%man/man8/trivial-rewrite.8.gz
163-
%%BMAN%%man/man8/verify.8.gz
164-
%%BMAN%%man/man8/virtual.8.gz
88+
%%BMAN%%share/man/man1/mailq.1.gz
89+
%%BMAN%%share/man/man1/newaliases.1.gz
90+
%%BMAN%%share/man/man1/postalias.1.gz
91+
%%BMAN%%share/man/man1/postcat.1.gz
92+
%%BMAN%%share/man/man1/postconf.1.gz
93+
%%BMAN%%share/man/man1/postdrop.1.gz
94+
%%BMAN%%share/man/man1/postfix-tls.1.gz
95+
%%BMAN%%share/man/man1/postfix.1.gz
96+
%%BMAN%%share/man/man1/postkick.1.gz
97+
%%BMAN%%share/man/man1/postlock.1.gz
98+
%%BMAN%%share/man/man1/postlog.1.gz
99+
%%BMAN%%share/man/man1/postmap.1.gz
100+
%%BMAN%%share/man/man1/postmulti.1.gz
101+
%%BMAN%%share/man/man1/postqueue.1.gz
102+
%%BMAN%%share/man/man1/postsuper.1.gz
103+
%%BMAN%%share/man/man1/posttls-finger.1.gz
104+
%%TEST%%%%BMAN%%share/man/man1/qmqp-sink.1.gz
105+
%%TEST%%%%BMAN%%share/man/man1/qmqp-source.1.gz
106+
%%BMAN%%share/man/man1/qshape.1.gz
107+
%%BMAN%%share/man/man1/sendmail.1.gz
108+
%%TEST%%%%BMAN%%share/man/man1/smtp-sink.1.gz
109+
%%TEST%%%%BMAN%%share/man/man1/smtp-source.1.gz
110+
%%BMAN%%share/man/man5/access.5.gz
111+
%%BMAN%%share/man/man5/aliases.5.gz
112+
%%BMAN%%share/man/man5/body_checks.5.gz
113+
%%BMAN%%share/man/man5/bounce.5.gz
114+
%%BMAN%%share/man/man5/canonical.5.gz
115+
%%BMAN%%share/man/man5/cidr_table.5.gz
116+
%%BMAN%%share/man/man5/generic.5.gz
117+
%%BMAN%%share/man/man5/header_checks.5.gz
118+
%%BMAN%%share/man/man5/ldap_table.5.gz
119+
%%BMAN%%share/man/man5/lmdb_table.5.gz
120+
%%BMAN%%share/man/man5/master.5.gz
121+
%%BMAN%%share/man/man5/memcache_table.5.gz
122+
%%BMAN%%share/man/man5/mysql_table.5.gz
123+
%%BMAN%%share/man/man5/nisplus_table.5.gz
124+
%%BMAN%%share/man/man5/pcre_table.5.gz
125+
%%BMAN%%share/man/man5/pgsql_table.5.gz
126+
%%BMAN%%share/man/man5/postconf.5.gz
127+
%%BMAN%%share/man/man5/postfix-wrapper.5.gz
128+
%%BMAN%%share/man/man5/regexp_table.5.gz
129+
%%BMAN%%share/man/man5/relocated.5.gz
130+
%%BMAN%%share/man/man5/socketmap_table.5.gz
131+
%%BMAN%%share/man/man5/sqlite_table.5.gz
132+
%%BMAN%%share/man/man5/tcp_table.5.gz
133+
%%BMAN%%share/man/man5/transport.5.gz
134+
%%BMAN%%share/man/man5/virtual.5.gz
135+
%%BMAN%%share/man/man8/anvil.8.gz
136+
%%BMAN%%share/man/man8/bounce.8.gz
137+
%%BMAN%%share/man/man8/cleanup.8.gz
138+
%%BMAN%%share/man/man8/defer.8.gz
139+
%%BMAN%%share/man/man8/discard.8.gz
140+
%%BMAN%%share/man/man8/dnsblog.8.gz
141+
%%BMAN%%share/man/man8/error.8.gz
142+
%%BMAN%%share/man/man8/flush.8.gz
143+
%%BMAN%%share/man/man8/lmtp.8.gz
144+
%%BMAN%%share/man/man8/local.8.gz
145+
%%BMAN%%share/man/man8/master.8.gz
146+
%%BMAN%%share/man/man8/oqmgr.8.gz
147+
%%BMAN%%share/man/man8/pickup.8.gz
148+
%%BMAN%%share/man/man8/pipe.8.gz
149+
%%BMAN%%share/man/man8/postlogd.8.gz
150+
%%BMAN%%share/man/man8/postscreen.8.gz
151+
%%BMAN%%share/man/man8/proxymap.8.gz
152+
%%BMAN%%share/man/man8/qmgr.8.gz
153+
%%BMAN%%share/man/man8/qmqpd.8.gz
154+
%%BMAN%%share/man/man8/scache.8.gz
155+
%%BMAN%%share/man/man8/showq.8.gz
156+
%%BMAN%%share/man/man8/smtp.8.gz
157+
%%BMAN%%share/man/man8/smtpd.8.gz
158+
%%BMAN%%share/man/man8/spawn.8.gz
159+
%%BMAN%%share/man/man8/tlsmgr.8.gz
160+
%%BMAN%%share/man/man8/tlsproxy.8.gz
161+
%%BMAN%%share/man/man8/trace.8.gz
162+
%%BMAN%%share/man/man8/trivial-rewrite.8.gz
163+
%%BMAN%%share/man/man8/verify.8.gz
164+
%%BMAN%%share/man/man8/virtual.8.gz
165165
sbin/postalias
166166
sbin/postcat
167167
sbin/postconf

0 commit comments

Comments
 (0)