8 files changed, 154 insertions, 49 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 4e634682e9a4..1dcc866f293b 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		heimdal
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6
 PORTREVISION=	0
 CATEGORIES=		security ipv6
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -55,6 +55,7 @@ CONFIGURE_ARGS+=	--with-krb4-include=/usr/include --with-krb4-lib=/usr/lib
 CONFIGURE_ARGS+=	--without-krb4
 .endif
 
+INFO=				heimdal
 PLIST:=				${WRKDIR}/PLIST
 
 pre-configure:
diff --git a/security/heimdal/Makefile.man b/security/heimdal/Makefile.man
index 6facdf916acb..6803fc2a1950 100644
--- a/security/heimdal/Makefile.man
+++ b/security/heimdal/Makefile.man
@@ -1,3 +1,4 @@
+MAN1+= afslog.1
 MAN1+= ftp.1
 MAN1+= kdestroy.1
 MAN1+= kf.1
@@ -6,6 +7,7 @@ MAN1+= kinit.1
 MAN1+= klist.1
 MAN1+= kpasswd.1
 MAN1+= krb5-config.1
+MAN1+= login.1
 MAN1+= otp.1
 MAN1+= otpprint.1
 MAN1+= pfrom.1
@@ -13,34 +15,151 @@ MAN1+= rsh.1
 MAN1+= telnet.1
 MAN3+= editline.3
 MAN3+= getarg.3
+MAN3+= gss_accept_sec_context.3
+MAN3+= gss_acquire_cred.3
+MAN3+= gss_add_cred.3
+MAN3+= gss_add_oid_set_member.3
+MAN3+= gss_canonicalize_name.3
+MAN3+= gss_compare_name.3
+MAN3+= gss_context_time.3
+MAN3+= gss_create_empty_oid_set.3
+MAN3+= gss_delete_sec_context.3
+MAN3+= gss_display_name.3
+MAN3+= gss_display_status.3
+MAN3+= gss_duplicate_name.3
+MAN3+= gss_export_name.3
+MAN3+= gss_export_sec_context.3
+MAN3+= gss_get_mic.3
+MAN3+= gss_import_name.3
+MAN3+= gss_import_sec_context.3
+MAN3+= gss_indicate_mechs.3
+MAN3+= gss_init_sec_context.3
+MAN3+= gss_inquire_context.3
+MAN3+= gss_inquire_cred.3
+MAN3+= gss_inquire_cred_by_mech.3
+MAN3+= gss_inquire_mechs_for_name.3
+MAN3+= gss_inquire_names_for_mech.3
+MAN3+= gss_krb5_compat_des3_mic.3
+MAN3+= gss_krb5_copy_ccache.3
+MAN3+= gss_process_context_token.3
+MAN3+= gss_release_buffer.3
+MAN3+= gss_release_cred.3
+MAN3+= gss_release_name.3
+MAN3+= gss_release_oid_set.3
+MAN3+= gss_seal.3
+MAN3+= gss_sign.3
+MAN3+= gss_test_oid_set_member.3
+MAN3+= gss_unseal.3
+MAN3+= gss_unwrap.3
+MAN3+= gss_verify.3
+MAN3+= gss_verify_mic.3
+MAN3+= gss_wrap.3
+MAN3+= gss_wrap_size_limit.3
+MAN3+= gssapi.3
 MAN3+= kafs.3
+MAN3+= kafs_set_verbose.3
+MAN3+= kafs_settoken.3
+MAN3+= kafs_settoken5.3
+MAN3+= kafs_settoken_rxkad.3
 MAN3+= krb5.3
 MAN3+= krb5_425_conv_principal.3
+MAN3+= krb5_addr2sockaddr.3
+MAN3+= krb5_address.3
+MAN3+= krb5_address_compare.3
+MAN3+= krb5_address_order.3
+MAN3+= krb5_address_search.3
+MAN3+= krb5_addresses.3
+MAN3+= krb5_afslog.3
+MAN3+= krb5_afslog_uid.3
+MAN3+= krb5_aname_to_localname.3
+MAN3+= krb5_anyaddr.3
 MAN3+= krb5_appdefault.3
+MAN3+= krb5_append_addresses.3
 MAN3+= krb5_auth_context.3
 MAN3+= krb5_build_principal.3
+MAN3+= krb5_cc_close.3
+MAN3+= krb5_cc_copy_cache.3
+MAN3+= krb5_cc_cursor.3
+MAN3+= krb5_cc_default.3
+MAN3+= krb5_cc_default_name.3
+MAN3+= krb5_cc_destroy.3
+MAN3+= krb5_cc_end_seq_get.3
+MAN3+= krb5_cc_gen_new.3
+MAN3+= krb5_cc_get_name.3
+MAN3+= krb5_cc_get_ops.3
+MAN3+= krb5_cc_get_principal.3
+MAN3+= krb5_cc_get_type.3
+MAN3+= krb5_cc_get_version.3
+MAN3+= krb5_cc_initialize.3
+MAN3+= krb5_cc_next_cred.3
+MAN3+= krb5_cc_ops.3
+MAN3+= krb5_cc_register.3
+MAN3+= krb5_cc_remove_cred.3
+MAN3+= krb5_cc_resolve.3
+MAN3+= krb5_cc_retrieve_cred.3
+MAN3+= krb5_cc_set_default_name.3
+MAN3+= krb5_cc_set_flags.3
+MAN3+= krb5_cc_store_cred.3
+MAN3+= krb5_ccache.3
 MAN3+= krb5_config.3
 MAN3+= krb5_context.3
+MAN3+= krb5_copy_address.3
+MAN3+= krb5_copy_addresses.3
+MAN3+= krb5_copy_data.3
 MAN3+= krb5_create_checksum.3
 MAN3+= krb5_crypto_init.3
+MAN3+= krb5_data.3
+MAN3+= krb5_data_alloc.3
+MAN3+= krb5_data_copy.3
+MAN3+= krb5_data_free.3
+MAN3+= krb5_data_realloc.3
+MAN3+= krb5_data_zero.3
 MAN3+= krb5_encrypt.3
+MAN3+= krb5_fcc_ops.3
+MAN3+= krb5_free_address.3
 MAN3+= krb5_free_addresses.3
+MAN3+= krb5_free_data.3
+MAN3+= krb5_free_data_contents.3
+MAN3+= krb5_free_host_realm.3
 MAN3+= krb5_free_principal.3
 MAN3+= krb5_get_all_client_addrs.3
+MAN3+= krb5_get_default_realm.3
+MAN3+= krb5_get_default_realms.3
+MAN3+= krb5_get_host_realm.3
 MAN3+= krb5_get_krbhst.3
+MAN3+= krb5_h_addr2addr.3
+MAN3+= krb5_h_addr2sockaddr.3
 MAN3+= krb5_init_context.3
 MAN3+= krb5_keytab.3
 MAN3+= krb5_krbhst_init.3
+MAN3+= krb5_kt_get_type.3
+MAN3+= krb5_kuserok.3
+MAN3+= krb5_make_addrport.3
+MAN3+= krb5_max_sockaddr_size.3
+MAN3+= krb5_mcc_ops.3
 MAN3+= krb5_openlog.3
+MAN3+= krb5_parse_address.3
 MAN3+= krb5_parse_name.3
 MAN3+= krb5_principal_get_realm.3
+MAN3+= krb5_print_address.3
+MAN3+= krb5_set_default_realm.3
 MAN3+= krb5_sname_to_principal.3
+MAN3+= krb5_sockaddr2address.3
+MAN3+= krb5_sockaddr2port.3
+MAN3+= krb5_sockaddr_uninteresting.3
 MAN3+= krb5_timeofday.3
 MAN3+= krb5_unparse_name.3
+MAN3+= krb5_verify_opt_init.3
+MAN3+= krb5_verify_opt_set_flags.3
+MAN3+= krb5_verify_opt_set_keytab.3
+MAN3+= krb5_verify_opt_set_secure.3
+MAN3+= krb5_verify_opt_set_service.3
 MAN3+= krb5_verify_user.3
+MAN3+= krb5_verify_user_opt.3
 MAN3+= krb5_warn.3
 MAN5+= ftpusers.5
 MAN5+= krb5.conf.5
+MAN5+= login.access.5
 MAN8+= ftpd.8
 MAN8+= hprop.8
 MAN8+= hpropd.8
@@ -58,14 +177,16 @@ MAN8+= rshd.8
 MAN8+= string2key.8
 MAN8+= telnetd.8
 MAN8+= verify_krb5_conf.8
-.if defined(USE_XLIB)
+# Heimdal 0.6 seems to install these man pages even if --without-x.
+# I'll not move these around yet, in case this gets fixed.
+#.if defined(USE_XLIB)
 MAN1+= kx.1
 MAN1+= rxtelnet.1
 MAN1+= rxterm.1
 MAN1+= tenletxr.1
 MAN1+= xnlock.1
 MAN8+= kxd.8
-.endif
+#.endif
 MLINKS+= getarg.3 arg_printusage.3
 MLINKS+= kafs.3 k_afs_cell_of_file.3
 MLINKS+= kafs.3 k_hasafs.3
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 7a5981800366..f8c991f00912 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1 +1 @@
-MD5 (heimdal-0.5.1.tar.gz) = bef2257673ddb9196702bf60c550ce53
+MD5 (heimdal-0.6.tar.gz) = e68c260181f2ee58e01215b8d03c35ba
diff --git a/security/heimdal/files/patch-include::make_crypto.c b/security/heimdal/files/patch-include::make_crypto.c
deleted file mode 100644
index 8a85f5035d64..000000000000
--- a/security/heimdal/files/patch-include::make_crypto.c
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: include/make_crypto.c
-===================================================================
-RCS file: /home/kth-krb/heimdal/include/make_crypto.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -c -c -r1.3 -r1.4
-*** include/make_crypto.c	19 Sep 2002 15:25:14 -0000	1.3
---- include/make_crypto.c	12 Jan 2003 18:54:46 -0000	1.4
-***************
-*** 60,65 ****
---- 60,66 ----
-      fprintf(f, "#ifndef __%s__\n", argv[1]);
-      fprintf(f, "#define __%s__\n", argv[1]);
-  #ifdef HAVE_OPENSSL
-+     fputs("#define OPENSSL_DES_LIBDES_COMPATIBILITY\n", f);
-      fputs("#include <openssl/des.h>\n", f);
-      fputs("#include <openssl/rc4.h>\n", f);
-      fputs("#include <openssl/md4.h>\n", f);
diff --git a/security/heimdal/files/patch-kuser::kuser_locl.h b/security/heimdal/files/patch-kuser::kuser_locl.h
deleted file mode 100644
index 3560a7fcfaa1..000000000000
--- a/security/heimdal/files/patch-kuser::kuser_locl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: kuser/kuser_locl.h
-===================================================================
-RCS file: /home/kth-krb/heimdal/kuser/kuser_locl.h,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -c -c -r1.12 -r1.13
-*** kuser/kuser_locl.h	2 Dec 1999 17:05:01 -0000	1.12
---- kuser/kuser_locl.h	21 Jan 2003 14:13:51 -0000	1.13
-***************
-*** 85,89 ****
---- 85,90 ----
-  #include <sys/ioccom.h>
-  #endif
-  #include <kafs.h>
-+ #include "crypto-headers.h" /* for des_read_pw_string */
-  
-  #endif /* __KUSER_LOCL_H__ */
diff --git a/security/heimdal/files/patch-verify_krb5_conf.c b/security/heimdal/files/patch-verify_krb5_conf.c
new file mode 100644
index 000000000000..a46c891cd395
--- /dev/null
+++ b/security/heimdal/files/patch-verify_krb5_conf.c
@@ -0,0 +1,21 @@
+*** lib/krb5/verify_krb5_conf.c.orig	Mon Aug 18 19:15:38 2003
+--- lib/krb5/verify_krb5_conf.c	Mon Aug 18 19:15:57 2003
+***************
+*** 449,456 ****
+  
+  #if 0
+  struct entry kdcdefaults_entries[] = {
+!     { "kdc_ports, krb5_config_string, mit_entry },
+!     { "v4_mode, krb5_config_string, mit_entry },
+      { NULL }
+  };
+  #endif
+--- 449,456 ----
+  
+  #if 0
+  struct entry kdcdefaults_entries[] = {
+!     { "kdc_ports", krb5_config_string, mit_entry },
+!     { "v4_mode", krb5_config_string, mit_entry },
+      { NULL }
+  };
+  #endif
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 0433cae867fa..b6fc38569e9a 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -1,3 +1,4 @@
+bin/afslog
 bin/ftp
 bin/kauth
 bin/kdestroy
@@ -11,6 +12,7 @@ bin/login
 bin/mk_cmds
 bin/otp
 bin/otpprint
+bin/pagsh
 bin/pfrom
 bin/rcp
 bin/rsh
@@ -56,16 +58,13 @@ include/rtbl.h
 include/sl.h
 include/ss/ss.h
 include/xdbm.h
-@unexec install-info --delete %D/info/heimdal.info %D/info/dir
-info/heimdal.info
-@exec install-info %D/info/heimdal.info %D/info/dir
 lib/libasn1.a
 lib/libasn1.so
 lib/libasn1.so.6
 lib/libeditline.a
 lib/libgssapi.a
 lib/libgssapi.so
-lib/libgssapi.so.3
+lib/libgssapi.so.4
 lib/libhdb.a
 lib/libhdb.so
 lib/libhdb.so.7
@@ -75,9 +74,12 @@ lib/libkadm5clnt.so.6
 lib/libkadm5srv.a
 lib/libkadm5srv.so
 lib/libkadm5srv.so.7
+lib/libkafs.a
+lib/libkafs.so
+lib/libkafs.so.4
 lib/libkrb5.a
 lib/libkrb5.so
-lib/libkrb5.so.18
+lib/libkrb5.so.19
 lib/libotp.a
 lib/libotp.so
 lib/libotp.so.1
diff --git a/security/heimdal/pkg-plist.krb4 b/security/heimdal/pkg-plist.krb4
index 4c6a002a8076..283dbfeb036e 100644
--- a/security/heimdal/pkg-plist.krb4
+++ b/security/heimdal/pkg-plist.krb4
@@ -1,6 +1 @@
-bin/afslog
-bin/pagsh
 lib/lib45.a
-lib/libkafs.a
-lib/libkafs.so
-lib/libkafs.so.3