update build infrastructure for heimdal 0.3e

9 files changed, 363 insertions, 79 deletions

diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index 76c8b39..c8bf769 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	libroken libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl
+SUBDIR=	libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
 .if defined(MAKE_KERBEROS4) && \
 	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
 SUBDIR+=libkafs5
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 86fda55..efecce2 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -10,22 +10,56 @@ 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 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 \
-	asn1_Checksum.x asn1_EncAPRepPart.x asn1_EncASRepPart.x \
-	asn1_EncKDCRepPart.x asn1_EncKrbCredPart.x \
-	asn1_EncKrbPrivPart.x asn1_EncTGSRepPart.x \
-	asn1_EncTicketPart.x asn1_EncryptedData.x \
-	asn1_EncryptionKey.x asn1_ETYPE_INFO.x asn1_ETYPE_INFO_ENTRY.x \
-	asn1_HostAddress.x asn1_HostAddresses.x asn1_KDCOptions.x \
-	asn1_KDC_REP.x asn1_KDC_REQ.x asn1_KDC_REQ_BODY.x \
-	asn1_KRB_CRED.x asn1_KRB_ERROR.x asn1_KRB_PRIV.x \
-	asn1_KRB_SAFE.x asn1_KRB_SAFE_BODY.x asn1_KerberosTime.x \
-	asn1_KrbCredInfo.x asn1_LastReq.x asn1_METHOD_DATA.x \
-	asn1_PA_DATA.x asn1_PA_ENC_TS_ENC.x asn1_Principal.x \
-	asn1_PrincipalName.x asn1_Realm.x asn1_TGS_REP.x \
-	asn1_TGS_REQ.x asn1_Ticket.x asn1_TicketFlags.x \
-	asn1_TransitedEncoding.x
+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		\
+	asn1_CKSUMTYPE.x			\
+	asn1_Checksum.x				\
+	asn1_ETYPE_INFO.x			\
+	asn1_ETYPE_INFO_ENTRY.x			\
+	asn1_EncAPRepPart.x			\
+	asn1_EncASRepPart.x			\
+	asn1_EncKDCRepPart.x			\
+	asn1_EncKrbCredPart.x			\
+	asn1_EncKrbPrivPart.x			\
+	asn1_EncTGSRepPart.x			\
+	asn1_EncTicketPart.x			\
+	asn1_EncryptedData.x			\
+	asn1_EncryptionKey.x			\
+	asn1_HostAddress.x			\
+	asn1_HostAddresses.x			\
+	asn1_KDCOptions.x			\
+	asn1_KDC_REP.x				\
+	asn1_KDC_REQ.x				\
+	asn1_KDC_REQ_BODY.x			\
+	asn1_KRB_CRED.x				\
+	asn1_KRB_ERROR.x			\
+	asn1_KRB_PRIV.x				\
+	asn1_KRB_SAFE.x				\
+	asn1_KRB_SAFE_BODY.x			\
+	asn1_KerberosTime.x			\
+	asn1_KrbCredInfo.x			\
+	asn1_LastReq.x				\
+	asn1_MESSAGE_TYPE.x			\
+	asn1_METHOD_DATA.x			\
+	asn1_NAME_TYPE.x			\
+	asn1_PADATA_TYPE.x			\
+	asn1_PA_DATA.x				\
+	asn1_PA_ENC_TS_ENC.x			\
+	asn1_Principal.x			\
+	asn1_PrincipalName.x			\
+	asn1_Realm.x				\
+	asn1_TGS_REP.x				\
+	asn1_TGS_REQ.x				\
+	asn1_Ticket.x				\
+	asn1_TicketFlags.x			\
+	asn1_TransitedEncoding.x		\
+	asn1_UNSIGNED.x
 
 INCLUDES=asn1.h asn1_err.h 
 
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
new file mode 100644
index 0000000..75a02df
--- /dev/null
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+LIB=	gssapi
+CFLAGS+=-I${KRB5DIR}/lib/gssapi	\
+	-I${KRB5DIR}/lib/krb5   \
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/roken  \
+	-I${KRB5DIR}/lib/des	\
+	-I${KRB5DIR}/include	\
+	-I${ASN1OBJDIR}
+
+SRCS=				\
+	8003.c			\
+	accept_sec_context.c	\
+	acquire_cred.c		\
+	add_oid_set_member.c	\
+	canonicalize_name.c	\
+	compare_name.c		\
+	context_time.c		\
+	copy_ccache.c		\
+	create_emtpy_oid_set.c	\
+	decapsulate.c		\
+	delete_sec_context.c	\
+	display_name.c		\
+	display_status.c	\
+	duplicate_name.c	\
+	encapsulate.c		\
+	export_sec_context.c	\
+	export_name.c		\
+	external.c		\
+	get_mic.c		\
+	gssapi.h		\
+	gssapi_locl.h		\
+	import_name.c		\
+	import_sec_context.c	\
+	indicate_mechs.c	\
+	init.c			\
+	init_sec_context.c	\
+	inquire_context.c	\
+	inquire_cred.c		\
+	release_buffer.c	\
+	release_cred.c		\
+	release_name.c		\
+	release_oid_set.c	\
+	test_oid_set_member.c	\
+	unwrap.c		\
+	v1.c			\
+	verify_mic.c		\
+        wrap.c                  \
+        address_to_krb5addr.c
+
+INCLUDES=${KRB5DIR}/lib/gssapi/gssapi.h
+
+.include <bsd.lib.mk>
+
+.PATH:		${KRB5DIR}/lib/gssapi
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 354239e..15c8c82 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -9,9 +9,30 @@ CFLAGS+=-I${KRB5DIR}/include \
 	-I${KRB5DIR}/lib/roken \
 	-I${.OBJDIR} \
 	-I${ASN1OBJDIR}
-SRCS=	keytab.c hdb.c common.c db.c ndbm.c print.c hdb_err.c \
-	hdb_asn1.h hdb_err.h krb5_err.h heim_err.h ${GEN:S/.x/.c/g}
-GEN=	asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
+
+SRCS=	\
+	common.c				\
+	db.c					\
+	db3.c					\
+	hdb-ldap.c				\
+	hdb.c					\
+	keytab.c				\
+	mkey.c					\
+	ndbm.c					\
+	print.c					\
+	hdb_err.c				\
+	hdb_err.h				\
+	hdb_asn1.h				\
+	krb5_err.h				\
+	heim_err.h				\
+	${GEN:S/.x/.c/g}
+
+GEN=						\
+	asn1_Key.x				\
+	asn1_Event.x				\
+	asn1_HDBFlags.x				\
+	asn1_hdb_entry.x			\
+	asn1_Salt.x
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index 3cee93c..dc8ebaa 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -5,14 +5,34 @@ CFLAGS+=-I${KRB5DIR}/include \
 	-I${KRB5DIR}/lib/krb5 \
 	-I${KRB5DIR}/lib/kadm5 \
 	-I${KRB5DIR}/lib/hdb \
+	-I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/lib/roken \
 	-I${ASN1OBJDIR} \
 	-I${HDBOBJDIR} \
 	-I${.OBJDIR}
-SRCS=	chpass_c.c common_glue.c create_c.c delete_c.c destroy_c.c \
-	flush_c.c free.c get_c.c get_princs_c.c init_c.c kadm5_err.c \
-	marshall.c modify_c.c privs_c.c randkey_c.c rename_c.c \
-	send_recv.c client_glue.c kadm5_err.h
+
+SRCS=	\
+	admin.h					\
+	chpass_c.c				\
+	common_glue.c				\
+	create_c.c				\
+	delete_c.c				\
+	destroy_c.c				\
+	flush_c.c				\
+	free.c					\
+	get_c.c					\
+	get_princs_c.c				\
+	init_c.c				\
+	kadm5_err.c				\
+	kadm5_locl.h				\
+	marshall.c				\
+	modify_c.c				\
+	private.h				\
+	privs_c.c				\
+	randkey_c.c				\
+	rename_c.c				\
+	send_recv.c				\
+	client_glue.c
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 7ce0d22..f9d01c8 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -5,15 +5,43 @@ CFLAGS+=-I${KRB5DIR}/include \
 	-I${KRB5DIR}/lib/krb5 \
 	-I${KRB5DIR}/lib/kadm5 \
 	-I${KRB5DIR}/lib/hdb \
+	-I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/lib/roken \
 	-I${ASN1OBJDIR} \
 	-I${HDBOBJDIR} \
 	-I${.OBJDIR}
-SRCS=	acl.c chpass_s.c common_glue.c context_s.c create_s.c \
-	delete_s.c destroy_s.c ent_setup.c error.c flush_s.c \
-	free.c get_princs_s.c get_s.c init_s.c kadm5_err.c kadm5_err.h \
-	log.c marshall.c modify_s.c privs_s.c randkey_s.c rename_s.c \
-	set_keys.c set_modifier.c password_quality.c server_glue.c \
+
+SRCS=	\
+	acl.c					\
+	admin.h					\
+	bump_pw_expire.c			\
+	chpass_s.c				\
+	common_glue.c				\
+	context_s.c				\
+	create_s.c				\
+	delete_s.c				\
+	destroy_s.c				\
+	ent_setup.c				\
+	error.c					\
+	flush_s.c				\
+	free.c					\
+	get_princs_s.c				\
+	get_s.c					\
+	init_s.c				\
+	kadm5_err.c				\
+	kadm5_locl.h				\
+	keys.c					\
+	log.c					\
+	marshall.c				\
+	modify_s.c				\
+	private.h				\
+	privs_s.c				\
+	randkey_s.c				\
+	rename_s.c				\
+	set_keys.c				\
+	set_modifier.c				\
+	password_quality.c			\
+	server_glue.c
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 4d09cdb..cd662a4 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -12,32 +12,101 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 \
 	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
 CFLAGS+=-I${KRB4DIR}/include
 .endif
-SRCS=	add_et_list.c addr_families.c address.c aname_to_localname.c \
-	asn1_glue.c auth_context.c build_ap_req.c build_auth.c \
-	cache.c changepw.c codec.c config_file.c config_file_netinfo.c \
-	convert_creds.c constants.c context.c copy_host_realm.c \
-	crc.c creds.c crypto.c data.c expand_hostname.c fcache.c \
-	free.c free_host_realm.c generate_seq_number.c \
-	generate_subkey.c get_addrs.c get_cred.c get_default_principal.c \
-	get_default_realm.c get_for_creds.c get_host_realm.c \
-	get_in_tkt.c get_in_tkt_pw.c get_in_tkt_with_keytab.c \
-	get_in_tkt_with_skey.c get_port.c init_creds.c init_creds_pw.c \
-	keyblock.c keytab.c keytab_file.c keytab_memory.c \
-	keytab_keyfile.c krbhst.c kuserok.c log.c \
-	mcache.c misc.c mk_error.c mk_priv.c mk_rep.c mk_req.c \
-	mk_req_ext.c mk_safe.c net_read.c net_write.c n-fold.c \
-	padata.c principal.c prog_setup.c prompter_posix.c \
-	rd_cred.c rd_error.c rd_priv.c rd_rep.c rd_req.c rd_safe.c \
-	read_message.c recvauth.c send_to_kdc.c sendauth.c \
-	set_default_realm.c sock_principal.c store.c store_emem.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 \
-	rc4_enc.c rc4_skey.c
-.if defined(MAKE_KERBEROS4) && \
-	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
-SRCS+=	keytab_krb4.c 
-.endif
+SRCS=	\
+	acl.c \
+	add_et_list.c \
+	addr_families.c \
+	address.c \
+	aname_to_localname.c \
+	appdefault.c \
+	asn1_glue.c \
+	auth_context.c \
+	build_ap_req.c \
+	build_auth.c \
+	cache.c \
+	changepw.c \
+	codec.c \
+	config_file.c \
+	config_file_netinfo.c \
+	convert_creds.c \
+	constants.c \
+	context.c \
+	copy_host_realm.c \
+	crc.c \
+	creds.c \
+	crypto.c \
+	data.c \
+	eai_to_heim_errno.c \
+	expand_hostname.c \
+	fcache.c \
+	free.c \
+	free_host_realm.c \
+	generate_seq_number.c \
+	generate_subkey.c \
+	get_addrs.c \
+	get_cred.c \
+	get_default_principal.c \
+	get_default_realm.c \
+	get_for_creds.c \
+	get_host_realm.c \
+	get_in_tkt.c \
+	get_in_tkt_pw.c \
+	get_in_tkt_with_keytab.c \
+	get_in_tkt_with_skey.c \
+	get_port.c \
+	init_creds.c \
+	init_creds_pw.c \
+	keyblock.c \
+	keytab.c \
+	keytab_file.c \
+	keytab_memory.c \
+	keytab_keyfile.c \
+	keytab_krb4.c \
+	krbhst.c \
+	kuserok.c \
+	log.c \
+	mcache.c \
+	misc.c \
+	mk_error.c \
+	mk_priv.c \
+	mk_rep.c \
+	mk_req.c \
+	mk_req_ext.c \
+	mk_safe.c \
+	net_read.c \
+	net_write.c \
+	n-fold.c \
+	padata.c \
+	principal.c \
+	prog_setup.c \
+	prompter_posix.c \
+	rd_cred.c \
+	rd_error.c \
+	rd_priv.c \
+	rd_rep.c \
+	rd_req.c \
+	rd_safe.c \
+	read_message.c \
+	recvauth.c \
+	replay.c \
+	send_to_kdc.c \
+	sendauth.c \
+	set_default_realm.c \
+	sock_principal.c \
+	store.c \
+	store_emem.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 \
+	heim_err.c
 
 INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
 	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h 
@@ -48,5 +117,3 @@ INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
 .PATH:		${KRB5DIR}/lib/des
 
 beforedepend all:	asn1_err.h krb5_err.h
-
-CLEANFILES+=	profile.h
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 849d701..0e7bebe 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -5,32 +5,61 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${INCLUDEOBJDIR} \
 		-I${KRB5DIR}/lib/roken \
 		-I${.OBJDIR}
-SRCS=		base64.c concat.c emalloc.c eread.c erealloc.c estrdup.c \
-		ewrite.c get_default_username.c get_window_size.c getarg.c \
-		getnameinfo_verified.c issuid.c k_getpwnam.c k_getpwuid.c \
-		mini_inetd.c net_read.c net_write.c parse_bytes.c \
-		parse_time.c parse_units.c print_version.c resolve.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 \
-		strcollect.c getaddrinfo_hostspec.c \
-		print_version.h roken.h
+
+SRCS=		\
+	base64.c		\
+	concat.c		\
+	emalloc.c		\
+	environment.c		\
+	eread.c			\
+	erealloc.c		\
+	esetenv.c		\
+	estrdup.c		\
+	ewrite.c		\
+	getaddrinfo_hostspec.c	\
+	get_default_username.c	\
+	get_window_size.c	\
+	getarg.c		\
+	getnameinfo_verified.c	\
+	issuid.c		\
+	k_getpwnam.c		\
+	k_getpwuid.c		\
+	mini_inetd.c		\
+	net_read.c		\
+	net_write.c		\
+	parse_bytes.c		\
+	parse_time.c		\
+	parse_units.c		\
+	resolve.c		\
+	roken_gethostby.c	\
+	rtbl.c			\
+	rtbl.h			\
+	signal.c		\
+	simple_exec.c		\
+	snprintf.c		\
+	socket.c		\
+	strcollect.c		\
+	timeval.c		\
+	tm2time.c		\
+	unvis.c			\
+	verify.c		\
+	vis.c			\
+	warnerr.c		\
+	write_pid.c		\
+	xdbm.h			\
+	copyhostent.c		\
+	strlwr.c		\
+	strndup.c		\
+	strnlen.c		\
+	strsep_copy.c		\
+	strupr.c		\
+	print_version.h		\
+	roken.h
+
 NOPIC=		yes
 
 install:
 
 .include <bsd.lib.mk>
 
-beforedepend all:	print_version.h
-
 .PATH:		${KRB5DIR}/lib/roken
-
-build-tools:	make-print-version make-roken
-
-print_version.h: make-print-version
-	./make-print-version print_version.h
-
-make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
-
-CLEANFILES+=	make-print-version print_version.h
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
new file mode 100644
index 0000000..0f108e6
--- /dev/null
+++ b/kerberos5/lib/libvers/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+LIB=		vers
+
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${ROKENOBJDIR} \
+		-I${KRB5DIR}/lib/roken \
+		-I${.OBJDIR}
+
+SRCS=		\
+		print_version.c
+
+install:
+
+.include <bsd.lib.mk>
+
+beforedepend all:	print_version.h
+
+.PATH:		${KRB5DIR}/lib/vers
+
+build-tools:	make-print-version
+
+print_version.h: make-print-version
+	./make-print-version print_version.h
+
+make-print-version: make-print-version.c
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
+
+CLEANFILES+=	make-print-version print_version.h