From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 01:42:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6343A257; Sun, 30 Nov 2014 01:42:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 359A5B6; Sun, 30 Nov 2014 01:42:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU1gu2m042944; Sun, 30 Nov 2014 01:42:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU1gtpD042942; Sun, 30 Nov 2014 01:42:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300142.sAU1gtpD042942@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 01:42:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275293 - in projects/building-blocks: etc tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 01:42:56 -0000 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