d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ssh config file handling into the ssh Makefiles.

Browse Source 
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
This commit is contained in:
Brad Davis 2018-08-15 14:53:42 +00:00
parent ac2d0191fc
commit f0a51d9df4
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/Makefile
View File

@ -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

2
secure/usr.bin/ssh/Makefile
View File

@ -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

2
secure/usr.sbin/sshd/Makefile
View File

@ -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 \