[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-bugs
Subject:    option to remove skey from OpenBSD build
From:       "Gream, Matthew" <mgream () orchestream ! com>
Date:       2002-09-26 19:46:46
[Download RAW message or body]

While making a minimal OpenBSD system (there was half-baked support for this
already, but it didn't seem to do all of the work).



Index: etc/login.conf
===================================================================
RCS file: /cvs/src/etc/login.conf,v
retrieving revision 1.13
diff -r1.13 login.conf
28c28
< auth-defaults:auth=passwd,skey:
---
> auth-defaults:auth=passwd:
Index: include/Makefile
===================================================================
RCS file: /cvs/src/include/Makefile,v
retrieving revision 1.113
diff -r1.113 Makefile
40c40
< 	../lib/libskey ../lib/libsectok ../lib/libedit ../lib/libpcap \
---
> 	../lib/libsectok ../lib/libedit ../lib/libpcap \
68a69,71
> .endif
> .if ${SKEY:L} == "yes"
> RDIRS+= ../lib/libskey
Index: lib/Makefile
===================================================================
RCS file: /cvs/src/lib/Makefile,v
retrieving revision 1.46
diff -r1.46 Makefile
5,7c5,11
< 	libdes libedit libevent libform libkeynote libkvm libl libm libmenu
\
< 	libocurses libossaudio libpanel libpcap libresolv librpcsvc libskey
\
< 	libsectok libssl libtelnet libusbhid libutil libwrap liby libz
---
> 	libdes libedit libevent libform libkeynote libl libm libmenu  \
> 	libocurses libossaudio libpanel libpcap libresolv librpcsvc \
> 	libsectok libssl libtelnet libusbhid libutil libwrap liby libz
libkvm
> 
> .if ${SKEY:L} == "yes"
> SUBDIR+=skey
> .endif
Index: libexec/Makefile
===================================================================
RCS file: /cvs/src/libexec/Makefile,v
retrieving revision 1.30
diff -r1.30 Makefile
10c10
< SUBDIR+=login_passwd login_skey login_krb4 login_krb4-or-pwd login_reject
\
---
> SUBDIR+=login_passwd login_reject \
20a21,24
> .if (${KERBEROS:L} == "yes")
> SUBDIR+=login_krb4 login_krb4-or-pwd
> .endif
> 
22a27,30
> .endif
> 
> .if (${SKEY:L} == "yes")
> SUBDIR+=login_skey
Index: usr.bin/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/Makefile,v
retrieving revision 1.79
diff -r1.79 Makefile
17,18c17,18
< 	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 \
27a28,31
> .endif
> 
> .if (${SKEY:L} == "yes")
> SUBDIR+=skey skeyaudit skeyinfo skeyinit
Index: usr.bin/ssh/sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.51
diff -r1.51 Makefile
16c16
< 	auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
---
> 	auth-bsdauth.c monitor_mm.c monitor.c \
40a41,47
> .if (${SKEY:L} == "yes")
> CFLAGS+= -DSKEY
> SRCS+= auth-skey.c
> LDADD+= -lskey
> DPADD+= ${SKEY}
> .endif
> 
52,56d58
< #.if (${SKEY:L} == "yes")
< #CFLAGS+= -DSKEY
< #LDADD+= -lskey
< #DPADD+= ${SKEY}
< #.endif




Matthew Gream
Technical Staff
___________________________________________________________________________
Orchestream 
Avon House, Kensington Village, Avonmore Road, London W14 8TS
T: +44 (0)20 7348 1500 F: +44 (0)20 7348 1501
www.orchestream.com




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


[prev in list] [next in list] [prev in thread] [next in thread]