From owner-svn-src-stable-9@FreeBSD.ORG Wed Feb 11 09:21:38 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7742DBE7; Wed, 11 Feb 2015 09:21:38 +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 47C9E1E0; Wed, 11 Feb 2015 09:21:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B9LcqZ074602; Wed, 11 Feb 2015 09:21:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B9LbmZ074599; Wed, 11 Feb 2015 09:21:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502110921.t1B9LbmZ074599@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 11 Feb 2015 09:21:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278576 - in stable/9: etc/pam.d etc/rc.d tools/build/mk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2015 09:21:38 -0000 Author: ngie Date: Wed Feb 11 09:21:36 2015 New Revision: 278576 URL: https://svnweb.freebsd.org/changeset/base/278576 Log: MFC r275098,r277736,r277737: r277736: Honor MK_ACCT with etc/rc.d/accounting Sponsored by: EMC / Isilon Storage Division r277737: Honor MK_ACCT with etc/pam.d/atrun Sponsored by: EMC / Isilon Storage Division Modified: stable/9/etc/pam.d/Makefile stable/9/etc/rc.d/Makefile stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/etc/ (props changed) stable/9/etc/pam.d/ (props changed) stable/9/etc/rc.d/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) Modified: stable/9/etc/pam.d/Makefile ============================================================================== --- stable/9/etc/pam.d/Makefile Wed Feb 11 09:16:51 2015 (r278575) +++ stable/9/etc/pam.d/Makefile Wed Feb 11 09:21:36 2015 (r278576) @@ -1,9 +1,10 @@ # $FreeBSD$ +.include + NO_OBJ= FILES= README \ - atrun \ cron \ ftpd \ imap \ @@ -16,6 +17,10 @@ FILES= README \ telnetd \ xdm +.if ${MK_AT} != "no" +FILES+= atrun +.endif + FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 Modified: stable/9/etc/rc.d/Makefile ============================================================================== --- stable/9/etc/rc.d/Makefile Wed Feb 11 09:16:51 2015 (r278575) +++ stable/9/etc/rc.d/Makefile Wed Feb 11 09:21:36 2015 (r278576) @@ -8,7 +8,6 @@ FILES= DAEMON \ NETWORKING \ SERVERS \ abi \ - accounting \ addswap \ adjkerntz \ archdep \ @@ -149,6 +148,10 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_ACCT} != "no" +FILES+= accounting +.endif + .if ${MK_AMD} != "no" FILES+= amd .endif Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 09:16:51 2015 (r278575) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 09:21:36 2015 (r278576) @@ -6,6 +6,7 @@ # .if ${MK_ACCT} == no +OLD_FILES+=etc/rc.d/accounting OLD_FILES+=etc/periodic/daily/310.accounting OLD_FILES+=usr/sbin/accton OLD_FILES+=usr/sbin/sa @@ -61,6 +62,7 @@ OLD_FILES+=usr/share/man/man8/amd64/apmc .endif .if ${MK_AT} == no +OLD_FILES+=etc/pam.d/atrun OLD_FILES+=usr/bin/at OLD_FILES+=usr/bin/atq OLD_FILES+=usr/bin/atrm