update kerberosV to Heimdal 1.5.2 using BSD Makefiles based

on the ones from FreeBSD

This is getting commited now so that we can patch it up
fast in the tree.
There are known regressions so please don't try to build
this on your own now, please wait for the next available
snapshot.

If however you would still want to build it, make sure
build and install everything in the tools directory first.

This is not the full commit yet because there are several
subdirectories.

11 files changed, 57 insertions, 152 deletions

diff --git a/kerberosV/usr.bin/Makefile b/kerberosV/usr.bin/Makefile
index f8ac28c311c..5054a7c3c8c 100644
--- a/kerberosV/usr.bin/Makefile
+++ b/kerberosV/usr.bin/Makefile
@@ -1,16 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2003/07/14 16:14:44 mho Exp $
+# $OpenBSD: Makefile,v 1.10 2013/06/17 18:57:45 robert Exp $
 
-# XXX asn1_compile is compiled in ../Makefile
-
-# kf - not imported?
-
-SUBDIR=	afslog \
-	kauth \
-	kdestroy \
-	kinit \
-	klist \
-	pagsh \
-	string2key \
-	verify_krb5_conf
+SUBDIR=	hxtool kadmin kcc kdestroy kgetcred kf kinit krb5-config ksu \
+	string2key verify_krb5_conf
 
 .include <bsd.subdir.mk>
diff --git a/kerberosV/usr.bin/Makefile.inc b/kerberosV/usr.bin/Makefile.inc
index c38170156b9..39488ea9340 100644
--- a/kerberosV/usr.bin/Makefile.inc
+++ b/kerberosV/usr.bin/Makefile.inc
@@ -1,3 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.1 2001/05/25 08:20:32 hin Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2013/06/17 18:57:45 robert Exp $
 
-BINDIR=	/usr/bin
\ No newline at end of file
+BINDIR=	/usr/bin
+
+.include "../Makefile.inc"
diff --git a/kerberosV/usr.bin/afslog/Makefile b/kerberosV/usr.bin/afslog/Makefile
deleted file mode 100644
index dfa14692756..00000000000
--- a/kerberosV/usr.bin/afslog/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
-
-PROG	= afslog
-
-.PATH:	${KRB5SRC}/appl/afsutil
-
-SRCS+=	afslog.c
-SRCS+=	${PRINTVER}
-
-DPADD	+= ${LIBKRB5} ${LIBCRYPTO}
-LDADD	+= -lkrb5 -lcrypto
-
-.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile
deleted file mode 100644
index 61c0914406e..00000000000
--- a/kerberosV/usr.bin/kauth/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
-
-PROG=	kauth
-NOMAN=
-
-SRCS=	kinit.c
-SRCS+=	${PRINTVER}
-
-.PATH:	${KRB5SRC}/kuser
-
-DPADD+= ${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
-
-.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 93fd73e2488..98d1fdea3de 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
+# $OpenBSD: Makefile,v 1.8 2013/06/17 18:57:45 robert Exp $
 
 PROG=	kdestroy
-
-SRCS=	kdestroy.c
-SRCS+=	${PRINTVER}
-
-.PATH:	${KRB5SRC}/kuser
-
-DPADD+= ${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} -lpthread \
+	-lasn1 -lcrypto -lwind -lhx509 -lcom_err \
+	-lheimbase
+MAN=	kdestroy.1
 
 .include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile
index 0e40f491df4..d6e604d1db1 100644
--- a/kerberosV/usr.bin/kf/Makefile
+++ b/kerberosV/usr.bin/kf/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
+# $OpenBSD: Makefile,v 1.5 2013/06/17 18:57:45 robert Exp $
 
 PROG=	kf
-
-SRCS=	kf.c
-
-.PATH:	${KRB5SRC}/appl/kf
-
-DPADD+= ${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
+MAN=	kf.1
+CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/roken
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+	${LIBCRYPT} ${LIBVERS}
+LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lpthread \
+	${LIBVERS} -lhx509 -lheimbase -lwind -lcom_err
 
 .include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/appl/kf
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index 5d97b64b789..4f10337c80d 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,17 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
+# $OpenBSD: Makefile,v 1.10 2013/06/17 18:57:45 robert Exp $
 
 PROG=	kinit
-MLINKS=	kinit.1 kauth.1
-
-SRCS=	kinit.c
-SRCS+=	${PRINTVER}
-
-.PATH:	${KRB5SRC}/kuser
-
-DPADD+=	${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} -lpthread \
+	-lasn1 -lcrypto -lcom_err -lhx509 -lheimbase -lwind
 
 .include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile
deleted file mode 100644
index ac197b0dfc0..00000000000
--- a/kerberosV/usr.bin/klist/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
-
-PROG=	klist
-
-SRCS=	klist.c
-SRCS+=	${PRINTVER}
-SRCS+=	rtbl.c
-
-.PATH:	${KRB5SRC}/kuser
-.PATH:	${ROKENSRC}
-
-DPADD+=	${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
-
-.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/pagsh/Makefile b/kerberosV/usr.bin/pagsh/Makefile
deleted file mode 100644
index 87af2676e5e..00000000000
--- a/kerberosV/usr.bin/pagsh/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
-
-PROG=	pagsh
-
-SRCS=	pagsh.c
-SRCS+=	${PRINTVER}
-SRCS+=	esetenv.c k_getpwuid.c
-
-.PATH:	${KRB5SRC}/appl/afsutil
-.PATH:	${ROKENSRC}
-
-DPADD+=	${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
-
-.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile
index 727268a5344..9bbc7a29c54 100644
--- a/kerberosV/usr.bin/string2key/Makefile
+++ b/kerberosV/usr.bin/string2key/Makefile
@@ -1,21 +1,17 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
+# $OpenBSD: Makefile,v 1.6 2013/06/17 18:57:46 robert Exp $
 
 PROG=	string2key
-MAN=	${PROG}.8
-
-SRCS=	string2key.c
-SRCS+=	${PRINTVER}
-SRCS+=	estrdup.c
-
-.PATH:	${KRB5SRC}/kdc
-.PATH:	${ROKENSRC}
-
-CFLAGS+=-I${KRB5SRC}/kdc -I${KRB5SRC}/lib/krb5
-
-DPADD+=	${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
+MAN=	string2key.8
+CFLAGS+=	-I${KRB5DIR}/kdc \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/windc
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+	${LIBCRYPT} ${LIBVERS}
+LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto ${LIBVERS} -lhx509 -lwind \
+	-lheimbase -lcom_err -lpthread
 
 .include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kdc
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index c25598b6200..5e8d9c55abe 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,19 +1,13 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/13 08:14:22 jsg Exp $
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
+# $OpenBSD: Makefile,v 1.6 2013/06/17 18:57:46 robert Exp $
 
 PROG=	verify_krb5_conf
-MAN=	${PROG}.8
-
-SRCS=	verify_krb5_conf.c
-SRCS+=	${PRINTVER}
-SRCS+=	parse_bytes.c
-
-.PATH:	${KRB5SRC}/lib/krb5
-.PATH:	${ROKENSRC}
-
-DPADD+= ${LIBKRB5} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lcrypto
+MAN=	verify_krb5_conf.8
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} -lpthread \
+	-lasn1 -lcrypto -lcom_err -lwind -lheimbase
 
 .include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/krb5