svn commit: r321246 - in stable/11: etc/pam.d tools/build/mk

[Ngie Cooper]

Author: ngie
Date: Wed Jul 19 20:49:04 2017
New Revision: 321246
URL: https://svnweb.freebsd.org/changeset/base/321246

Log:
  MFC r316818:
  
  Conditionally install /etc/pam.d/ftp* and /etc/pam.d/telnetd
  
  /etc/pam.d/ftp* should be installed with MK_FTP != no and
  /etc/pam.d/telnetd should be installed when MK_TELNET != no.

Modified:
  stable/11/etc/pam.d/Makefile
  stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/pam.d/Makefile
==============================================================================
--- stable/11/etc/pam.d/Makefile	Wed Jul 19 20:44:50 2017	(r321245)
+++ stable/11/etc/pam.d/Makefile	Wed Jul 19 20:49:04 2017	(r321246)
@@ -8,13 +8,11 @@ FILESGROUPS=	FILES
 
 FILES=	README \
 	cron \
-	ftpd \
 	imap \
 	login \
 	other \
 	passwd pop3 \
 	sshd su system \
-	telnetd \
 	xdm
 
 FILESDIR=	/etc/pam.d
@@ -28,6 +26,15 @@ ATDIR=		${FILESDIR}
 ATMODE=		${FILESMODE}
 .endif
 
+.if ${MK_FTP} != "no"
+FILESGROUPS+=	FTP
+FTP+=	ftpd
+FTPPACKAGE+=	ftp
+FTPDIR=		${FILESDIR}
+FTPMODE=	${FILESMODE}
+LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
+.endif
+
 .if ${MK_RCMDS} != "no"
 FILESGROUPS+=	RCMDS
 RCMDS+=		rsh
@@ -36,7 +43,14 @@ RCMDSDIR=	${FILESDIR}
 RCMDSMODE=	${FILESMODE}
 .endif
 
+.if ${MK_TELNET} != "no"
+FILESGROUPS+=	TELNET
+TELNET+=	telnetd
+TELNETPACKAGE+=	telnet
+TELNETDIR=	${FILESDIR}
+TELNETMODE=	${FILESMODE}
+.endif
+
 FILESMODE_README=	444
-LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 
 .include <bsd.prog.mk>

Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jul 19 20:44:50 2017	(r321245)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jul 19 20:49:04 2017	(r321246)
@@ -1607,6 +1607,8 @@ OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 
 .if ${MK_FTP} == no
 OLD_FILES+=etc/ftpusers
+OLD_FILES+=etc/pam.d/ftp
+OLD_FILES+=etc/pam.d/ftpd
 OLD_FILES+=etc/rc.d/ftpd
 OLD_FILES+=usr/bin/ftp
 OLD_FILES+=usr/bin/gate-ftp
@@ -7725,6 +7727,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .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