diff options
24 files changed, 50 insertions, 46 deletions
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile index 221bdb4..6ec6361 100644 --- a/kerberos5/libexec/telnetd/Makefile +++ b/kerberos5/libexec/telnetd/Makefile @@ -13,9 +13,9 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \ ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ +LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \ -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile index fb5219b..e3c97f5 100644 --- a/kerberos5/usr.bin/telnet/Makefile +++ b/kerberos5/usr.bin/telnet/Makefile @@ -9,9 +9,9 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \ +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBIPSEC} -LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ +LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \ -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec .include <bsd.prog.mk> diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc index f4e8bb2..7c375c0 100644 --- a/kerberosIV/Makefile.inc +++ b/kerberosIV/Makefile.inc @@ -71,6 +71,10 @@ TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \ -I${INCLUDEOBJDIR} -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\" +.if defined(RSAREF) && ${RSAREF} == YES +LDADD+= -lRSAglue +DPADD+= ${LIBRSAGLUE} +.endif protos.h: ${KRB4DIR}/include/protos.H ln -sf ${.ALLSRC} ${.TARGET} diff --git a/kerberosIV/libexec/kauthd/Makefile b/kerberosIV/libexec/kauthd/Makefile index 96041f1..def0ac3a4 100644 --- a/kerberosIV/libexec/kauthd/Makefile +++ b/kerberosIV/libexec/kauthd/Makefile @@ -8,9 +8,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/appl/kauth -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/libexec/kipd/Makefile b/kerberosIV/libexec/kipd/Makefile index fa750be..3c3d2a7 100644 --- a/kerberosIV/libexec/kipd/Makefile +++ b/kerberosIV/libexec/kipd/Makefile @@ -7,9 +7,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/appl/kip -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile index e4a4172..e904b22 100644 --- a/kerberosIV/libexec/kpropd/Makefile +++ b/kerberosIV/libexec/kpropd/Makefile @@ -11,9 +11,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include \ -I${.OBJDIR} -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile index 221bdb4..6ec6361 100644 --- a/kerberosIV/libexec/telnetd/Makefile +++ b/kerberosIV/libexec/telnetd/Makefile @@ -13,9 +13,9 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \ ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ +LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \ -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kadmin/Makefile b/kerberosIV/usr.bin/kadmin/Makefile index a22ecb1..4a985f2 100644 --- a/kerberosIV/usr.bin/kadmin/Makefile +++ b/kerberosIV/usr.bin/kadmin/Makefile @@ -18,9 +18,9 @@ CFLAGS+= -I${KRB4DIR}/include \ LDADD= -L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \ -L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -ldes -lcrypt -lcom_err -lreadline -ltermcap + -lcrypto -lcrypt -lcom_err -lreadline -ltermcap DPADD= ${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \ + ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \ ${LIBTERMCAP} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kauth/Makefile b/kerberosIV/usr.bin/kauth/Makefile index f38cc47..0fcb7f5 100644 --- a/kerberosIV/usr.bin/kauth/Makefile +++ b/kerberosIV/usr.bin/kauth/Makefile @@ -9,8 +9,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/appl/kauth LDADD= -L${ROKENOBJDIR} -lroken -L${KAFSOBJDIR} -lkafs \ - -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt -lcom_err +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kdestroy/Makefile b/kerberosIV/usr.bin/kdestroy/Makefile index 33dcd6d..e4c418c 100644 --- a/kerberosIV/usr.bin/kdestroy/Makefile +++ b/kerberosIV/usr.bin/kdestroy/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/kuser \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kinit/Makefile b/kerberosIV/usr.bin/kinit/Makefile index 2476f91..1037bf8 100644 --- a/kerberosIV/usr.bin/kinit/Makefile +++ b/kerberosIV/usr.bin/kinit/Makefile @@ -11,8 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/kuser \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} + -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/klist/Makefile b/kerberosIV/usr.bin/klist/Makefile index 2e0c0c0..40fcb9b 100644 --- a/kerberosIV/usr.bin/klist/Makefile +++ b/kerberosIV/usr.bin/klist/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/kuser \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile index fb5219b..e3c97f5 100644 --- a/kerberosIV/usr.bin/telnet/Makefile +++ b/kerberosIV/usr.bin/telnet/Makefile @@ -9,9 +9,9 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \ +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBIPSEC} -LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ +LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \ -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile index 46ea9c6..025c51b 100644 --- a/kerberosIV/usr.sbin/ext_srvtab/Makefile +++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kadmind/Makefile b/kerberosIV/usr.sbin/kadmind/Makefile index 52698d42..979b437 100644 --- a/kerberosIV/usr.sbin/kadmind/Makefile +++ b/kerberosIV/usr.sbin/kadmind/Makefile @@ -18,9 +18,9 @@ CFLAGS+= -I${KRB4DIR}/include \ LDADD= -L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \ -L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -ldes -lcom_err -lcrypt + -lcrypto -lcom_err -lcrypt DPADD= ${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT} + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile index 30bfae2..b9cf729 100644 --- a/kerberosIV/usr.sbin/kdb_destroy/Makefile +++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile index 203768c..ad3a099 100644 --- a/kerberosIV/usr.sbin/kdb_edit/Makefile +++ b/kerberosIV/usr.sbin/kdb_edit/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile index 3649a62..e351b7b 100644 --- a/kerberosIV/usr.sbin/kdb_init/Makefile +++ b/kerberosIV/usr.sbin/kdb_init/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile index d08aea9..020c98e 100644 --- a/kerberosIV/usr.sbin/kdb_util/Makefile +++ b/kerberosIV/usr.sbin/kdb_util/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile index 885125a..1df36d1 100644 --- a/kerberosIV/usr.sbin/kerberos/Makefile +++ b/kerberosIV/usr.sbin/kerberos/Makefile @@ -16,9 +16,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kip/Makefile b/kerberosIV/usr.sbin/kip/Makefile index eadaf2e..b6d6e4b 100644 --- a/kerberosIV/usr.sbin/kip/Makefile +++ b/kerberosIV/usr.sbin/kip/Makefile @@ -9,9 +9,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/kadmin \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile index 185a67b..d7f54fc 100644 --- a/kerberosIV/usr.sbin/kprop/Makefile +++ b/kerberosIV/usr.sbin/kprop/Makefile @@ -11,9 +11,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include \ -I${.OBJDIR} -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile index 8799cfc..648ac01 100644 --- a/kerberosIV/usr.sbin/ksrvutil/Makefile +++ b/kerberosIV/usr.sbin/ksrvutil/Makefile @@ -16,10 +16,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken -L${KADMOBJDIR} -lkadm \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcom_err \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcom_err \ -lcrypt DPADD= ${LIBROKEN} ${LIBKADM} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT} + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile index b05ae5d..c27338e 100644 --- a/kerberosIV/usr.sbin/kstash/Makefile +++ b/kerberosIV/usr.sbin/kstash/Makefile @@ -12,9 +12,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${.CURDIR}/../include \ -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \ -lcom_err -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} .include <bsd.prog.mk> |