Use libcrypto instead of libdes. Upgrade for Heimdal-0.2p

4 files changed, 11 insertions, 8 deletions

diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index a07388c..5a2a5a1 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -7,7 +7,8 @@ CFLAGS+=-I${KRB5DIR}/include \
 	-I${INCLUDEOBJDIR} \
 	-I${.OBJDIR}
 SRCS=	der_get.c der_put.c der_free.c der_length.c der_copy.c \
-	timegm.c asn1_err.c asn1_err.h asn1.h ${GEN:S/.x/.c/g}
+	timegm.c asn1_err.c asn1_err.h asn1.h roken.h \
+	${GEN:S/.x/.c/g}
 
 GEN=	asn1_APOptions.x asn1_AP_REP.x asn1_AP_REQ.x asn1_AS_REP.x \
 	asn1_AS_REQ.x asn1_Authenticator.x asn1_AuthorizationData.x \
@@ -31,7 +32,7 @@ GEN=	asn1_APOptions.x asn1_AP_REP.x asn1_AP_REQ.x asn1_AS_REP.x \
 .PATH:		${KRB5DIR}/lib/asn1
 .PATH:		${KRB5DIR}/lib/roken
 
-beforedepend all:
+beforedepend all: roken.h
 
 .for I in ${GEN}
 ${I:S/.x/.c/}:	${I}
@@ -51,7 +52,7 @@ asn1_compile:	parse.o lex.o main.c hash.c symbol.c gen.c \
 		get_window_size.c strupr.c
 	${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
 
-parse.o:	parse.c
+parse.o:	parse.c roken.h
 
 parse.h parse.c:	parse.y
 	${YACC}	-d ${.OODATE}
@@ -60,7 +61,7 @@ parse.h parse.c:	parse.y
 
 lex.o:		lex.l
 
-print_version.o: print_version.h print_version.c
+print_version.o: print_version.h print_version.c roken.h
 	${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/roken/print_version.c
 
 print_version.h: make-print-version
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 3021732..a12819c 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -29,7 +29,7 @@ SRCS=	add_et_list.c addr_families.c address.c aname_to_localname.c \
 	store_fd.c store_mem.c ticket.c time.c transited.c \
 	verify_init.c verify_user.c version.c warn.c write_message.c \
 	krb5_err.c krb5_err.h heim_err.c heim_err.h \
-	md4.c md5.c sha.c rc4_enc.c rc4_skey.c
+	rc4_enc.c rc4_skey.c
 INCLUDES=krb5.h
 
 .include <bsd.lib.mk>
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 5c11dbe..8430907 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -13,7 +13,8 @@ SRCS=		base64.c concat.c emalloc.c eread.c erealloc.c estrdup.c \
 		roken_gethostby.c signal.c simple_exec.c snprintf.c \
 		socket.c tm2time.c verify.c warnerr.c copyhostent.c \
 		strlwr.c strndup.c strnlen.c strupr.c get_default_username.c \
-		print_version.h
+		strcollect.c getaddrinfo_hostspec.c \
+		print_version.h roken.h
 NOPIC=		yes
 
 install:
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 3f5add3..0bcd739 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -3,8 +3,9 @@
 LIB=	sl
 CFLAGS+=-I${KRB5DIR}/lib/sl \
 	-I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/include
-SRCS=	sl.c
+	-I${KRB5DIR}/include \
+	-I${.OBJDIR}
+SRCS=	sl.c roken.h
 
 NOPIC=	yes