Fix conflicts after heimdal-1.1 import and add build infrastructure. Import

all non-style changes made by heimdal to our own libgssapi.

1 files changed, 47 insertions, 34 deletions

diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index cedc424..5d4fef3 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,51 +1,64 @@
 # $FreeBSD$
 
 LIB=		gssapi
-SHLIB_MAJOR=	9
+SHLIB_MAJOR=	10
+WARNS=		6
+VERSION_DEF=	${.CURDIR}/../libc/Versions.def
+SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
 SRCS=
-SRCS+=		gss_utils.c
-SRCS+=		gss_mech_switch.c
-SRCS+=		gss_names.c
-SRCS+=		gss_acquire_cred.c
-SRCS+=		gss_release_cred.c
-SRCS+=		gss_init_sec_context.c
 SRCS+=		gss_accept_sec_context.c
-SRCS+=		gss_process_context_token.c
-SRCS+=		gss_delete_sec_context.c
-SRCS+=		gss_context_time.c
-SRCS+=		gss_get_mic.c
-SRCS+=		gss_verify_mic.c
-SRCS+=		gss_wrap.c
-SRCS+=		gss_unwrap.c
-SRCS+=		gss_display_status.c
-SRCS+=		gss_indicate_mechs.c
+SRCS+=		gss_acquire_cred.c
+SRCS+=		gss_add_cred.c
+SRCS+=		gss_add_oid_set_member.c
+SRCS+=		gss_buffer_set.c
+SRCS+=		gss_canonicalize_name.c
 SRCS+=		gss_compare_name.c
+SRCS+=		gss_context_time.c
+SRCS+=		gss_create_empty_oid_set.c
+SRCS+=		gss_decapsulate_token.c
+SRCS+=		gss_delete_sec_context.c
 SRCS+=		gss_display_name.c
-SRCS+=		gss_import_name.c
+SRCS+=		gss_display_status.c
+SRCS+=		gss_duplicate_name.c
+SRCS+=		gss_duplicate_oid.c
+SRCS+=		gss_encapsulate_token.c
 SRCS+=		gss_export_name.c
-SRCS+=		gss_release_name.c
-SRCS+=		gss_inquire_cred.c
-SRCS+=		gss_inquire_context.c
-SRCS+=		gss_wrap_size_limit.c
-SRCS+=		gss_add_cred.c
-SRCS+=		gss_inquire_cred_by_mech.c
 SRCS+=		gss_export_sec_context.c
+SRCS+=		gss_get_mic.c
+SRCS+=		gss_import_name.c
 SRCS+=		gss_import_sec_context.c
-SRCS+=		gss_inquire_names_for_mech.c
+SRCS+=		gss_indicate_mechs.c
+SRCS+=		gss_init_sec_context.c
+SRCS+=		gss_inquire_context.c
+SRCS+=		gss_inquire_cred.c
+SRCS+=		gss_inquire_cred_by_mech.c
+SRCS+=		gss_inquire_cred_by_oid.c
 SRCS+=		gss_inquire_mechs_for_name.c
-SRCS+=		gss_canonicalize_name.c
-SRCS+=		gss_duplicate_name.c
-SRCS+=		gss_sign.c
-SRCS+=		gss_verify.c
+SRCS+=		gss_inquire_names_for_mech.c
+SRCS+=		gss_inquire_sec_context_by_oid.c
+SRCS+=		gss_mech_switch.c
+SRCS+=		gss_names.c
+SRCS+=		gss_oid_to_str.c
+SRCS+=		gss_process_context_token.c
+SRCS+=		gss_pseudo_random.c
+SRCS+=		gss_release_buffer.c
+SRCS+=		gss_release_cred.c
+SRCS+=		gss_release_name.c
+SRCS+=		gss_release_oid.c
+SRCS+=		gss_release_oid_set.c
 SRCS+=		gss_seal.c
-SRCS+=		gss_unseal.c
-SRCS+=		gss_krb5.c
-SRCS+=		gss_create_empty_oid_set.c
-SRCS+=		gss_add_oid_set_member.c
+SRCS+=		gss_set_cred_option.c
+SRCS+=		gss_set_sec_context_option.c
+SRCS+=		gss_sign.c
 SRCS+=		gss_test_oid_set_member.c
-SRCS+=		gss_release_oid_set.c
-SRCS+=		gss_release_buffer.c
+SRCS+=		gss_unseal.c
+SRCS+=		gss_unwrap.c
+SRCS+=		gss_utils.c
+SRCS+=		gss_verify.c
+SRCS+=		gss_verify_mic.c
+SRCS+=		gss_wrap.c
+SRCS+=		gss_wrap_size_limit.c
 
 MAN=
 MAN+=		gssapi.3