D16678.id46552.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16678.id46552.diff
View Options

	Index: etc/Makefile
	===================================================================
	--- etc/Makefile
	+++ etc/Makefile
	@@ -94,11 +94,6 @@
	BIN1+= ntp.conf
	.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
	@@ -217,10 +212,6 @@
	.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
	Index: secure/usr.bin/ssh/Makefile
	===================================================================
	--- secure/usr.bin/ssh/Makefile
	+++ secure/usr.bin/ssh/Makefile
	@@ -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
	Index: secure/usr.sbin/sshd/Makefile
	===================================================================
	--- secure/usr.sbin/sshd/Makefile
	+++ secure/usr.sbin/sshd/Makefile
	@@ -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 \