mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-09-21 15:52:39 +02:00
pkgbase: separate /etc/mail/aliases from the sendmail package
move /etc/aliases and /etc/mail/aliases into the runtime package this file is used by both sendmail and dma. While here mark this file as a config file so 3way merge is performed
This commit is contained in:
parent
45d83c3926
commit
8cd7841d84
10
etc/Makefile
10
etc/Makefile
@ -20,7 +20,7 @@ SUBDIR+=sendmail
|
||||
|
||||
ETCMAIL=aliases
|
||||
.if ${MK_SENDMAIL} != "no"
|
||||
ETCMAIL+=Makefile README access.sample virtusertable.sample \
|
||||
ETCMAIL_SENDMAIL+=Makefile README access.sample virtusertable.sample \
|
||||
mailertable.sample
|
||||
.endif
|
||||
|
||||
@ -78,13 +78,17 @@ distribution:
|
||||
|
||||
.if ${MK_MAIL} != "no"
|
||||
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
-T "package=sendmail" ${ETCMAIL} ${DESTDIR}/etc/mail
|
||||
-T "package=runtime,config" ${ETCMAIL} ${DESTDIR}/etc/mail
|
||||
if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
|
||||
! -f ${DESTDIR}/etc/aliases ]; then \
|
||||
${INSTALL_SYMLINK} -T "package=sendmail" \
|
||||
${INSTALL_SYMLINK} -T "package=runtime" \
|
||||
mail/aliases ${DESTDIR}/etc/aliases; \
|
||||
fi
|
||||
.endif
|
||||
.if ${MK_SENDMAIL} != "no"
|
||||
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
-T "package=sendmail" ${ETCMAIL_SENDMAIL} ${DESTDIR}/etc/mail
|
||||
.endif
|
||||
.if ${MK_LOCATE} != "no"
|
||||
${INSTALL} -o nobody -g ${BINGRP} -m 644 -T "package=runtime"\
|
||||
/dev/null ${DESTDIR}/var/db/locate.database
|
||||
|
Loading…
Reference in New Issue
Block a user