upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgbase: separate /etc/mail/aliases from the sendmail package

Browse source 
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

(cherry picked from commit 8cd7841d84356adb91450e3daf2c25454a102221)
This commit is contained in:
Baptiste Daroussin 2024-03-20 16:39:39 +01:00
parent cd6e93e7a9
commit 0c66d02e63
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
etc/Makefile
View file

@ -21,7 +21,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