From owner-svn-src-head@freebsd.org Wed Aug 15 14:53:44 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E54C81058950; Wed, 15 Aug 2018 14:53:43 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9B54690C0B; Wed, 15 Aug 2018 14:53:43 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D6924052; Wed, 15 Aug 2018 14:53:43 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7FErhkD079571; Wed, 15 Aug 2018 14:53:43 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7FErgK5079568; Wed, 15 Aug 2018 14:53:42 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201808151453.w7FErgK5079568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Wed, 15 Aug 2018 14:53:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337852 - in head: etc secure/usr.bin/ssh secure/usr.sbin/sshd X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc secure/usr.bin/ssh secure/usr.sbin/sshd X-SVN-Commit-Revision: 337852 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2018 14:53:44 -0000 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 +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 +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 \