Date: Sat, 11 Aug 2018 13:23:09 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337622 - in head: etc usr.sbin/auditd Message-ID: <201808111323.w7BDN9s2021370@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brd Date: Sat Aug 11 13:23:09 2018 New Revision: 337622 URL: https://svnweb.freebsd.org/changeset/base/337622 Log: Move OpenBSM to CONFS This helps with pkgbase as these config files will be properly tagged as config files. Approved by: allanjude (mentor), oshogbo Differential Revision: https://reviews.freebsd.org/D16679 Modified: head/etc/Makefile head/usr.sbin/auditd/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sat Aug 11 13:18:19 2018 (r337621) +++ head/etc/Makefile Sat Aug 11 13:23:09 2018 (r337622) @@ -56,14 +56,6 @@ BIN1+= etc.${MACHINE_CPUARCH}/ttys .error etc.MACHINE/ttys missing .endif -OPENBSMDIR= ${SRCTOP}/contrib/openbsm -BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ - ${OPENBSMDIR}/etc/audit_event -BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \ - ${OPENBSMDIR}/etc/audit_user -BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn -BSM_ETC_DIR= ${DESTDIR}/etc/security - # NB: keep these sorted by MK_* knobs .if ${MK_AMD} != "no" @@ -203,12 +195,6 @@ distribution: ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install - 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} .if ${MK_UNBOUND} != "no" if [ ! -e ${DESTDIR}/etc/unbound ]; then \ ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \ Modified: head/usr.sbin/auditd/Makefile ============================================================================== --- head/usr.sbin/auditd/Makefile Sat Aug 11 13:18:19 2018 (r337621) +++ head/usr.sbin/auditd/Makefile Sat Aug 11 13:23:09 2018 (r337622) @@ -7,6 +7,18 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm CFLAGS+= -I${OPENBSMDIR} +OPENBSMETCDIR= ${OPENBSMDIR}/etc +CONFS= ${OPENBSMETCDIR}/audit_class +CONFSMODE_${OPENBSMETCDIR}/audit_class= 444 +CONFS+= ${OPENBSMETCDIR}/audit_control +CONFSMODE_${OPENBSMETCDIR}/audit_control= 600 +CONFS+= ${OPENBSMETCDIR}/audit_event +CONFSMODE_${OPENBSMETCDIR}/audit_event= 444 +CONFS+= ${OPENBSMETCDIR}/audit_user +CONFSMODE_${OPENBSMETCDIR}/audit_user= 600 +CONFS+= ${OPENBSMETCDIR}/audit_warn +CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500 +CONFSDIR= /etc/security PROG= auditd SRCS= auditd.c audit_warn.c auditd_fbsd.c MAN= auditd.8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808111323.w7BDN9s2021370>