svn commit: r337852 - in head: etc secure/usr.bin/ssh secure/usr.sbin/sshd

[Brad Davis]

Author: brd
Date: Wed Aug 15 14:53:42 2018
New Revision: 337852
URL: https://svnweb.freebsd.org/changeset/base/337852

Log:
  Move ssh config file handling into the ssh Makefiles.
  
  This helps with pkgbase by using CONFS and tagging these as config files.
  
  Approved by:	allanjude (mentor), des
  Differential Revision:	https://reviews.freebsd.org/D16678

Modified:
  head/etc/Makefile
  head/secure/usr.bin/ssh/Makefile
  head/secure/usr.sbin/sshd/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed Aug 15 14:52:56 2018	(r337851)
+++ head/etc/Makefile	Wed Aug 15 14:53:42 2018	(r337852)
@@ -74,11 +74,6 @@ BIN1+=	hosts.lpd printcap
 BIN1+=	${SRCTOP}/usr.bin/mail/misc/mail.rc
 .endif
 
-.if ${MK_OPENSSH} != "no"
-SSH=	${SRCTOP}/crypto/openssh/ssh_config \
-	${SRCTOP}/crypto/openssh/sshd_config \
-	${SRCTOP}/crypto/openssh/moduli
-.endif
 .if ${MK_OPENSSL} != "no"
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
@@ -167,10 +162,6 @@ distribution:
 .endif
 .if ${MK_SENDMAIL} != "no"
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
-.endif
-.if ${MK_OPENSSH} != "no"
-	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-	    ${SSH} ${DESTDIR}/etc/ssh
 .endif
 .if ${MK_OPENSSL} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

Modified: head/secure/usr.bin/ssh/Makefile
==============================================================================
--- head/secure/usr.bin/ssh/Makefile	Wed Aug 15 14:52:56 2018	(r337851)
+++ head/secure/usr.bin/ssh/Makefile	Wed Aug 15 14:53:42 2018	(r337852)
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+CONFS=	ssh_config
+CONFSDIR=	/etc/ssh
 PROG=	ssh
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MAN=	ssh.1 ssh_config.5

Modified: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile	Wed Aug 15 14:52:56 2018	(r337851)
+++ head/secure/usr.sbin/sshd/Makefile	Wed Aug 15 14:53:42 2018	(r337852)
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+CONFS=	moduli sshd_config
+CONFSDIR=	/etc/ssh
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c \
 	audit.c audit-bsm.c audit-linux.c platform.c \