Enable build of unified libkrb5. ok deraadt, todd. Testing by hin, jakob, David Krause, ...

10 files changed, 58 insertions, 40 deletions

diff --git a/kerberosV/usr.bin/Makefile b/kerberosV/usr.bin/Makefile
index f8807d02940..f8ac28c311c 100644
--- a/kerberosV/usr.bin/Makefile
+++ b/kerberosV/usr.bin/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2002/09/23 01:45:08 miod Exp $
+# $OpenBSD: Makefile,v 1.9 2003/07/14 16:14:44 mho Exp $
 
 # XXX asn1_compile is compiled in ../Makefile
 
-# kf
+# kf - not imported?
+
 SUBDIR=	afslog \
 	kauth \
 	kdestroy \
diff --git a/kerberosV/usr.bin/afslog/Makefile b/kerberosV/usr.bin/afslog/Makefile
index b12fd2abe37..e62241107e6 100644
--- a/kerberosV/usr.bin/afslog/Makefile
+++ b/kerberosV/usr.bin/afslog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,8 +7,10 @@ PROG	= afslog
 
 .PATH:	${KRB5SRC}/appl/afsutil
 
-CFLAGS	+= -I.
-DPADD	+= ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} ${LIBASN1}
-LDADD	+= -lkrb5 -ldes -lcrypto -lasn1 ${LIBROKEN} -lcom_err
+SRCS+=	afslog.c
+SRCS+=	${PRINTVER}
+
+DPADD	+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD	+= -lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile
index 913608ed802..c8f7943cbc5 100644
--- a/kerberosV/usr.bin/kauth/Makefile
+++ b/kerberosV/usr.bin/kauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/14 06:53:34 mho Exp $
+# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,10 +7,11 @@ PROG=	kauth
 NOMAN=
 
 SRCS=	kinit.c
+SRCS+=	${PRINTVER}
 
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index baf4c241e3e..c8133152dd2 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,11 +6,11 @@ KRBDEPTH=../..
 PROG=	kdestroy
 
 SRCS=	kdestroy.c
+SRCS+=	${PRINTVER}
 
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lasn1 -lcrypto ${LIBROKEN} -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile
index 48e0551c8df..2817d244f42 100644
--- a/kerberosV/usr.bin/kf/Makefile
+++ b/kerberosV/usr.bin/kf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -9,8 +9,7 @@ SRCS=	kf.c
 
 .PATH:	${KRB5SRC}/appl/kf
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -l45 -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index b105a7eb73d..39d81687874 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/05/14 06:56:02 mho Exp $
+# $OpenBSD: Makefile,v 1.8 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,9 +6,12 @@ KRBDEPTH=../..
 PROG=	kinit
 MLINKS=	kinit.1 kauth.1
 
+SRCS=	kinit.c
+SRCS+=	${PRINTVER}
+
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile
index 50a0260088c..23c06f8d2c1 100644
--- a/kerberosV/usr.bin/klist/Makefile
+++ b/kerberosV/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,12 +6,13 @@ KRBDEPTH=../..
 PROG=	klist
 
 SRCS=	klist.c
+SRCS+=	${PRINTVER}
+SRCS+=	rtbl.c
 
 .PATH:	${KRB5SRC}/kuser
+.PATH:	${ROKENSRC}
 
-CFLAGS+=-I${KRB5SRC}/lib/roken
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/pagsh/Makefile b/kerberosV/usr.bin/pagsh/Makefile
index 50cbdcd8c1b..aeaab5347b4 100644
--- a/kerberosV/usr.bin/pagsh/Makefile
+++ b/kerberosV/usr.bin/pagsh/Makefile
@@ -1,15 +1,18 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho 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}
 
-CFLAGS+=-I${KRB5SRC}/lib/roken
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile
index 22cf14cea96..826192c2882 100644
--- a/kerberosV/usr.bin/string2key/Makefile
+++ b/kerberosV/usr.bin/string2key/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,11 +6,16 @@ KRBDEPTH=../..
 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} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index 9e14af9ee22..1004407f175 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,16 +1,19 @@
-# $OpenBSD: Makefile,v 1.3 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
 PROG=	verify_krb5_conf
+MAN=	${PROG}.8
+
+SRCS=	verify_krb5_conf.c
+SRCS+=	${PRINTVER}
+SRCS+=	parse_bytes.c
 
 .PATH:	${KRB5SRC}/lib/krb5
-MAN=	${PROG}.8
+.PATH:	${ROKENSRC}
 
-CFLAGS+=-I${KRB5SRC}/lib/roken
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>