From ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 26 Mar 2001 14:53:33 +0000
Subject: secure/ build fixes:

- TELNETOBJDIR is gone.  `buildworld' already installs libtelnet.a
  in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.

- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
  New LIBSSH is introduced for libssh.a (an internal static lib).
  Previously, build without prior `obj' was broken; SSH modules
  always looked for libssh.a in ${.OBJDIR}.  Also, the dependancies
  on the libssh.a were missing.

- libtelnet/ did not install the crypto version of telnet.h into
  /usr/include/arpa.

- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.

Reviewed by:	markm

- MAN[1-9] -> MAN.
---
 secure/usr.sbin/Makefile.inc  |  3 ++-
 secure/usr.sbin/sshd/Makefile | 21 +++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'secure/usr.sbin')

diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc
index c3699c1..1495232 100644
--- a/secure/usr.sbin/Makefile.inc
+++ b/secure/usr.sbin/Makefile.inc
@@ -1,4 +1,5 @@
 # $FreeBSD$
 
-BINDIR?=/usr/sbin
+BINDIR?=	/usr/sbin
+
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 93c3ad0..caa71d1 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,25 +1,17 @@
 # $FreeBSD$
 #
 
-SSHSRC=	${.CURDIR}/../../../crypto/openssh
 LOGINSRC= ${.CURDIR}/../../../usr.bin/login
 
 PROG=	sshd
-BINOWN=	root
-BINMODE=555
-MAN8=	sshd.8
-
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	pty.c log-server.c login.c servconf.c serverloop.c \
 	auth.c auth1.c auth2.c auth-options.c session.c login_access.c dh.c \
 	auth-pam.c
+MAN=	sshd.8
 
 CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DLOGIN_ACCESS -I${LOGINSRC} -DUSE_PAM -DHAVE_PAM_GETENVLIST
 
-.include <bsd.own.mk>
-
-.PATH:		${SSHSRC} ${LOGINSRC}
-
 .if defined(MAKE_KERBEROS4) && \
 	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
 DISTRIBUTION=krb4
@@ -42,12 +34,13 @@ CFLAGS+= -DSKEY
 LDADD+=	-lopie -lmd
 DPADD+=	${LIBOPIE} ${LIBMD}
 
-.include <bsd.prog.mk>
-
 .if defined(X11BASE)
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 .endif
 
-LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap \
-	-lpam
-DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
+LDADD+=	${LIBSSH} -lcrypt -lcrypto -lutil -lz -lwrap -lpam
+DPADD+=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
+
+.include <bsd.prog.mk>
+
+.PATH:	${SSHDIR} ${LOGINSRC}
-- 
cgit v1.1