- Update FreeBSD Heimdal distribution to version 1.5.1. This also brings

  several new kerberos related libraries and applications to FreeBSD:
  o kgetcred(1) allows one to manually get a ticket for a particular service.
  o kf(1) securily forwards ticket to another host through an authenticated
    and encrypted stream.
  o kcc(1) is an umbrella program around klist(1), kswitch(1), kgetcred(1)
    and other user kerberos operations. klist and kswitch are just symlinks
    to kcc(1) now.
  o kswitch(1) allows you to easily switch between kerberos credentials if
    you're running KCM.
  o hxtool(1) is a certificate management tool to use with PKINIT.
  o string2key(1) maps a password into key.
  o kdigest(8) is a userland tool to access the KDC's digest interface.
  o kimpersonate(8) creates a "fake" ticket for a service.

  We also now install manpages for some lirbaries that were not installed
  before, libheimntlm and libhx509.

- The new HEIMDAL version no longer supports Kerberos 4.  All users are
  recommended to switch to Kerberos 5.

- Weak ciphers are now disabled by default.  To enable DES support (used
  by telnet(8)), use "allow_weak_crypto" option in krb5.conf.

- libtelnet, pam_ksu and pam_krb5 are now compiled with error on warnings
  disabled due to the function they use (krb5_get_err_text(3)) being
  deprecated.  I plan to work on this next.

- Heimdal's KDC now require sqlite to operate.  We use the bundled version
  and install it as libheimsqlite.  If some other FreeBSD components will
  require it in the future we can rename it to libbsdsqlite and use for these
  components as well.

- This is not a latest Heimdal version, the new one was released while I was
  working on the update.  I will update it to 1.5.2 soon, as it fixes some
  important bugs and security issues.

6 files changed, 36 insertions, 67 deletions

diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile
index 271f511..0bbf2d4 100644
--- a/kerberos5/tools/Makefile
+++ b/kerberos5/tools/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	make-print-version make-roken asn1_compile slc
+SUBDIR=	make-roken asn1_compile slc
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc
index c0703a9..4cec6fe 100644
--- a/kerberos5/tools/Makefile.inc
+++ b/kerberos5/tools/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-realinstall:
+BINDIR?=	/usr/bin
 
 .include "../Makefile.inc"
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index 8fc7b01..fa325c1 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -2,54 +2,40 @@
 
 PROG=	asn1_compile
 NO_MAN=
-
-SRCS=	gen.c \
+LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
+LDADD=	${LIBROKEN_A} ${LIBVERS}
+DPADD=	${LIBROKEN_A} ${LIBVERS}
+
+SRCS=	asn1_queue.h \
+	asn1parse.y \
+	der.h \
+	gen.c \
 	gen_copy.c \
 	gen_decode.c \
 	gen_encode.c \
 	gen_free.c \
-	gen_glue-fixed.c \
+	gen_glue.c \
 	gen_length.c \
+	gen_locl.h \
 	gen_seq.c \
+	gen_template.c \
 	hash.c \
-	ecalloc.c \
-	emalloc.c \
-	estrdup.c \
-	main.c \
-	symbol.c \
-	getarg.c \
-	warnerr.c \
+	hash.h \
 	lex.l \
-	parse.y \
-	print_version.c \
-	print_version.h \
+	lex.h \
+	main.c \
+	asn1-template.h \
 	roken.h \
-	get_window_size.c \
-	strupr.c
+	symbol.c \
+	symbol.h
 
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
 
-CLEANFILES= print_version.h roken.h
-
-print_version.h: ../make-print-version/make-print-version
-	../make-print-version/make-print-version ${.TARGET}
-
-../make-print-version/make-print-version: .PHONY
-	cd ${.CURDIR}/../make-print-version && ${MAKE}
-
-roken.h: ../make-roken/make-roken
-	../make-roken/make-roken > ${.TARGET}
-
-../make-roken/make-roken: .PHONY
-	cd ${.CURDIR}/../make-roken && ${MAKE}
+CLEANFILES= roken.h
 
-gen_glue-fixed.c: gen_glue.c
-	 sed -e '96s/"/"#ifdef __PARSE_UNITS_H__\\n/;'\
-	     -e '96s/",/\\n#endif\\n",/' ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= gen_glue-fixed.c
+roken.h:
+	 make-roken > ${.TARGET}
 
 .include <bsd.prog.mk>
 
-# There are two print_version.c's, the one we need is in ${KRB5DIR}/lib/vers,
-# so the order of paths is important here.
-.PATH: ${KRB5DIR}/lib/vers ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/asn1
+.PATH: ${KRB5DIR}/lib/asn1
diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile
deleted file mode 100644
index 08899dc..0000000
--- a/kerberos5/tools/make-print-version/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG=	make-print-version
-NO_MAN=
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/lib/vers
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index 6f75cc6..a039943 100644
--- a/kerberos5/tools/make-roken/Makefile
+++ b/kerberos5/tools/make-roken/Makefile
@@ -5,7 +5,9 @@ NO_MAN=
 
 CLEANFILES= make-roken.c
 
-.include <bsd.prog.mk>
+.include "../Makefile.inc"
 
 make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
 	awk -f ${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
index 49cf417..c6f0d35 100644
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@@ -1,35 +1,24 @@
 # $FreeBSD$
 
 PROG=	slc
+LIBROKEN_A=     ${.OBJDIR}/../../lib/libroken/libroken.a
+LDADD=  ${LIBROKEN_A} ${LIBVERS}
+DPADD=  ${LIBROKEN_A} ${LIBVERS}
 NO_MAN=
 
-SRCS=	get_window_size.c \
-	getarg.c \
-	roken.h \
+SRCS=	roken.h \
 	slc-gram.y \
-	slc-lex.l \
-	slc.h \
-	strupr.c
-
-SRCS+=	print_version.c \
-	print_version.h
+	slc-lex.l
 
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/vers -I.
 
-CLEANFILES= print_version.h roken.h
-
-print_version.h: ../make-print-version/make-print-version
-	../make-print-version/make-print-version ${.TARGET}
-
-../make-print-version/make-print-version: .PHONY
-	cd ${.CURDIR}/../make-print-version && ${MAKE}
+CLEANFILES= roken.h
 
-roken.h: ../make-roken/make-roken
-	../make-roken/make-roken > ${.TARGET}
+roken.h:
+	make-roken > ${.TARGET}
 
-../make-roken/make-roken: .PHONY
-	cd ${.CURDIR}/../make-roken && ${MAKE}
+#	${.OBJDIR}/../make-roken/make-roken > ${.TARGET}
 
 .include <bsd.prog.mk>
 
-.PATH: ${KRB5DIR}/lib/vers ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/sl
+.PATH: ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/sl