Date: Wed, 26 Nov 2014 02:59:37 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275099 - in projects/building-blocks: etc/pam.d tools/build/mk Message-ID: <201411260259.sAQ2xbLE051039@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <src.opts.mk> + 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411260259.sAQ2xbLE051039>