From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 02:59:38 2014 Return-Path: Delivered-To: svn-src-projects@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 4B412F86; Wed, 26 Nov 2014 02:59: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 38856F1F; Wed, 26 Nov 2014 02:59: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 sAQ2xcfF051041; Wed, 26 Nov 2014 02:59:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ2xbLE051039; Wed, 26 Nov 2014 02:59:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411260259.sAQ2xbLE051039@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 02:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275099 - in projects/building-blocks: etc/pam.d 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: Wed, 26 Nov 2014 02:59:38 -0000 Author: ngie Date: Wed Nov 26 02:59:37 2014 New Revision: 275099 URL: https://svnweb.freebsd.org/changeset/base/275099 Log: Don't install the rsh and telnetd pam.d files if MK_RCMDS == no or MK_TELNET == no, respectively Modified: projects/building-blocks/etc/pam.d/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/pam.d/Makefile ============================================================================== --- projects/building-blocks/etc/pam.d/Makefile Wed Nov 26 02:46:48 2014 (r275098) +++ projects/building-blocks/etc/pam.d/Makefile Wed Nov 26 02:59:37 2014 (r275099) @@ -2,6 +2,8 @@ NO_OBJ= +.include + FILES= README \ atrun \ cron \ @@ -10,11 +12,17 @@ FILES= README \ login \ other \ passwd pop3 \ - rsh \ sshd su system \ - telnetd \ xdm +.if ${MK_RCMDS} != "no" +FILES+= rsh +.endif + +.if ${MK_TELNET} != "no" +FILES+= telnetd +.endif + FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:46:48 2014 (r275098) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 02:59:37 2014 (r275099) @@ -3913,6 +3913,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp +OLD_FILES+=etc/pam.d/rsh OLD_FILES+=etc/rc.d/rwho OLD_FILES+=etc/periodic/daily/140.clean-rwho OLD_FILES+=etc/periodic/daily/430.status-rwho @@ -4279,6 +4280,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcs .endif .if ${MK_TELNET} == no +OLD_FILES+=etc/pam.d/telnetd OLD_FILES+=usr/bin/telnet OLD_FILES+=usr/libexec/telnetd OLD_FILES+=usr/share/man/man1/telnet.1.gz