svn commit: r275293 - in projects/building-blocks: etc tools/build/mk
Garrett Cooper
ngie at FreeBSD.org
Sun Nov 30 01:42:56 UTC 2014
Author: ngie
Date: Sun Nov 30 01:42:55 2014
New Revision: 275293
URL: https://svnweb.freebsd.org/changeset/base/275293
Log:
Honor MK_AUDIT with respect to etc/security
Modified:
projects/building-blocks/etc/Makefile
projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
Modified: projects/building-blocks/etc/Makefile
==============================================================================
--- projects/building-blocks/etc/Makefile Sun Nov 30 00:55:50 2014 (r275292)
+++ projects/building-blocks/etc/Makefile Sun Nov 30 01:42:55 2014 (r275293)
@@ -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; \
Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 00:55:50 2014 (r275292)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 01:42:55 2014 (r275293)
@@ -142,6 +142,11 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-A
.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
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
More information about the svn-src-projects
mailing list