|
|||||||||||
|
system/2867: not possible to entirely build system without SKEY or KERBEROS
From: Gream, Matthew <mgream(at)orchestream.com>
Date: Thu Aug 08 2002 - 07:55:20 EDT
System : OpenBSD-current Architecture: OpenBSD.i386 Machine : i386 Index: include/Makefile RCS file: /cvs/src/include/Makefile,v retrieving revision 1.112 diff -u -r1.112 Makefile --- include/Makefile 2002/06/16 14:42:22 1.112 +++ include/Makefile 2002/08/08 11:27:14 @@ -37,7 +37,7 @@ RDIRS= ../lib/libc_r ../lib/libcom_err ../lib/libcompat ../lib/libcurses \ ../lib/libcurses++ ../lib/libform ../lib/libssl ../lib/libmenu \ ../lib/libocurses ../lib/libossaudio ../lib/libpanel ../lib/librpcsvc \ - ../lib/libskey ../lib/libsectok ../lib/libedit ../lib/libpcap \ + ../lib/libsectok ../lib/libedit ../lib/libpcap \ ../lib/libutil ../lib/libusbhid ../lib/libwrap ../lib/libz \ ../lib/libkeynote ../lib/libevent \ ../usr.bin/lex ../gnu/lib/libreadline \@@ -66,6 +66,9 @@ .endif .if ${KERBEROS5:L} == "yes" RDIRS+= ../kerberosV/lib
+.endif
+.if ${SKEY:L} == "yes"
+RDIRS+= ../lib/libskey
.endif
prereq:
RCS file: /cvs/src/libexec/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- libexec/Makefile 2002/07/15 19:23:14 1.29 +++ libexec/Makefile 2002/08/08 11:27:14 @@ -7,7 +7,7 @@ mail.local makewhatis \ rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd \ rshd talkd tcpd telnetd tftpd uucpd smtpd-SUBDIR+=login_passwd login_skey login_krb4 login_krb4-or-pwd login_reject \ +SUBDIR+=login_passwd login_reject \ login_chpass login_lchpass login_token login_radius
.if (${YP:L} == "yes")
+.if (${KERBEROS:L} == "yes")
+SUBDIR+=login_krb4 login_krb4-or-pwd
+.endif
+
.if (${KERBEROS5:L} == "yes") SUBDIR+=login_krb5 login_krb5-or-pwd
+.endif
+
+.if (${SKEY:L} == "yes")
+SUBDIR+=login_skey
.endif
.include <bsd.subdir.mk>
RCS file: /cvs/src/usr.bin/Makefile,v retrieving revision 1.79 diff -u -r1.79 Makefile --- usr.bin/Makefile 2002/07/24 01:08:56 1.79 +++ usr.bin/Makefile 2002/08/08 11:27:14 @@ -14,8 +14,8 @@ nohup oldrdist pagesize passwd paste patch pctr pr printenv printf \ quota radioctl rdist rdistd readlink renice rev rpcgen rpcinfo \ rs rsh \ - rup ruptime rusers rwall rwho script sectok sed shar showmount skey \ - skeyaudit skeyinfo skeyinit sort spell split ssh su sup systat sudo \ + rup ruptime rusers rwall rwho script sectok sed shar showmount \ + sort spell split ssh su sup systat sudo \ tail talk tcopy tee telnet tftp tic time tip tn3270 top touch tput tr \ true tset tsort tty usbhidaction usbhidctl ul uname unexpand unifdef \ uniq units \ @@ -25,6 +25,10 @@
.if (${YP:L} == "yes")
+.endif
+
+.if (${SKEY:L} == "yes")
+SUBDIR+=skey skeyaudit skeyinfo skeyinit
.endif
.if (${ELF_TOOLCHAIN} != "yes")
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v retrieving revision 1.51 diff -u -r1.51 Makefile
--- usr.bin/ssh/sshd/Makefile 2002/06/20 19:56:07 1.51
+++ usr.bin/ssh/sshd/Makefile 2002/08/08 11:27:14
@@ -13,7 +13,7 @@
sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \
auth.c auth1.c auth2.c auth-options.c session.c \
auth-chall.c auth2-chall.c groupaccess.c \
- auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
+ auth-bsdauth.c monitor_mm.c monitor.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
auth2-hostbased.c auth2-kbdint.c
@@ -38,6 +38,13 @@
DPADD+= ${LIBKRB}
.endif # KERBEROS
+.if (${SKEY:L} == "yes")
+CFLAGS+= -DSKEY
+SRCS+= auth-skey.c
+LDADD+= -lskey
+DPADD+= ${SKEY}
+.endif
+
.include <bsd.prog.mk>
LDADD+= -lcrypto -lutil -lz -ldes
-#.if (${SKEY:L} == "yes")
-#CFLAGS+= -DSKEY
-#LDADD+= -lskey
-#DPADD+= ${SKEY}
-#.endif
-- This communication contains confidential information intended solely for the use of the individual/s and/or entity or entities to whom it was intended to be addressed. If you are not the intended recipient, be aware that any disclosure, copying, distribution, or use of the contents of this transmission is prohibited. If you have received this communication in error, please contact the sender immediately, delete this communication from your system, and do not disclose its contents to any third party, or use its contents. Any opinions expressed are solely those of the author and do not necessarily represent those of Orchestream Ltd or its group of companies unless otherwise specifically stated.Received on Thu Nov 7 15:34:46 2002 This archive was generated by hypermail 2.1.8 : Wed Aug 23 2006 - 13:29:36 EDT |
||||||||||
|
|||||||||||