From 4724dcbfa1ef56907e8ffa4d3a90c2c51108987f Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sun, 30 Nov 2014 01:42:55 +0000 Subject: [PATCH] Honor MK_AUDIT with respect to etc/security --- etc/Makefile | 2 ++ tools/build/mk/OptionalObsoleteFiles.inc | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/etc/Makefile b/etc/Makefile index a1efba28539..70093cbe00f 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -263,12 +263,14 @@ distribution: ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install +.if ${MK_AUDIT} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} +.endif .if ${MK_UNBOUND} != "no" if [ ! -e ${DESTDIR}/etc/unbound ]; then \ ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 9c8bac65e10..3ed1d5b7529 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -142,6 +142,11 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt .if ${MK_AUDIT} == no OLD_FILES+=etc/rc.d/auditd OLD_FILES+=etc/rc.d/auditdistd +OLD_FILES+=etc/security/audit_class +OLD_FILES+=etc/security/audit_control +OLD_FILES+=etc/security/audit_event +OLD_FILES+=etc/security/audit_user +OLD_FILES+=etc/security/audit_warn OLD_FILES+=usr/include/bsm/audit_uevents.h OLD_FILES+=usr/include/bsm/libbsm.h OLD_FILES+=usr/lib/libauditd.a @@ -263,6 +268,7 @@ OLD_FILES+=usr/share/man/man5/audit_user.5.gz OLD_FILES+=usr/share/man/man5/audit_warn.5.gz OLD_FILES+=usr/share/man/man8/audit.8.gz OLD_FILES+=usr/share/man/man8/auditd.8.gz +OLD_DIRS+=etc/security OLD_DIRS+=usr/include/bsm .endif -- 2.45.2