From faf44dcf0dd82c90927415e247ce8be3c51783a5 Mon Sep 17 00:00:00 2001 From: brd Date: Wed, 15 Aug 2018 14:53:42 +0000 Subject: [PATCH] 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 --- etc/Makefile | 9 --------- secure/usr.bin/ssh/Makefile | 2 ++ secure/usr.sbin/sshd/Makefile | 2 ++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 7f02abfba2e..be034ee3d0d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 @@ -168,10 +163,6 @@ distribution: .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 \ ${SSL} ${DESTDIR}/etc/ssl diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 03f61b317ab..614cc7627fc 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -2,6 +2,8 @@ .include +CONFS= ssh_config +CONFSDIR= /etc/ssh PROG= ssh LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 93832a9c758..48c8df41bca 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -2,6 +2,8 @@ .include +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 \ -- 2.45.0