Update security/heimdal to 0.7.1 (approved by lha). We drop support

for the "db4" option and just rely on the appropriate BDB_* settings
via bdb.buildlink3.mk.  Also, we tweak the builtin.mk file so use
krb5-config, if it's available, to check the version of the built-in
heimdal.  Patches patch-ab, patch-ae and patch-af have been sent back
upstream and will be incorporated into future Heimdal releases.

Changes between version 0.6.5 and version 0.7.1 include:

 * Support for KCM, a process based credential cache
 * Support CCAPI credential cache
 * SPNEGO support
 * AES (and the gssapi conterpart, CFX) support
 * Adding new and improve old documentation
 * Bug fixes

6 files changed, 52 insertions, 98 deletions

diff --git a/security/heimdal/patches/patch-aa b/security/heimdal/patches/patch-aa
deleted file mode 100644
index b1ee7e02f86..00000000000
--- a/security/heimdal/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/08/04 16:50:18 tonio Exp $
-
---- lib/asn1/gen_glue.c.orig	2005-08-04 16:58:58.000000000 +0200
-+++ lib/asn1/gen_glue.c	2005-08-04 17:02:45.000000000 +0200
-@@ -103,11 +103,11 @@
-     int tag = -1;
- 
-     fprintf (headerfile,
--	     "extern struct units %s_units[];",
-+	     "extern struct units * const %s_units;",
- 	     s->gen_name);
- 
-     fprintf (codefile,
--	     "struct units %s_units[] = {\n",
-+	     "struct units %s_units_static[] = {\n",
- 	     s->gen_name);
- 
-     if(t->members)
-@@ -122,6 +122,10 @@
-     fprintf (codefile,
- 	     "\t{NULL,\t0}\n"
- 	     "};\n\n");
-+
-+    fprintf (codefile,
-+            "struct units * const %s_units = %s_units_static;\n\n",
-+            s->gen_name, s->gen_name);
- }
- 
- void
diff --git a/security/heimdal/patches/patch-ab b/security/heimdal/patches/patch-ab
index 9905a3e27ea..b67664f58be 100644
--- a/security/heimdal/patches/patch-ab
+++ b/security/heimdal/patches/patch-ab
@@ -1,40 +1,30 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/10 14:56:45 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/26 15:12:45 jlam Exp $
 
---- cf/install-catman.sh.orig	Sat Sep 29 12:05:38 2001
+--- cf/install-catman.sh.orig	2005-09-09 08:12:22.000000000 -0400
 +++ cf/install-catman.sh
-@@ -14,16 +14,7 @@ for f in "$@"; do
+@@ -9,6 +9,7 @@ mkinstalldirs="$1"; shift
+ srcdir="$1"; shift
+ manbase="$1"; shift
+ suffix="$1"; shift
++catinstall="${INSTALL_CATPAGES-yes}"
+ 
+ for f in "$@"; do
  	base=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\1/'`
- 	section=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\2/'`
- 	mandir="$manbase/man$section"
--	catdir="$manbase/cat$section"
--	c="$base.cat$section"
+@@ -17,7 +18,7 @@ for f in "$@"; do
+ 	catdir="$manbase/cat$section"
+ 	c="$base.cat$section"
  
 -	if test -f "$srcdir/$c"; then
--		if test \! -d "$catdir"; then
--			eval "$mkinstalldirs $catdir"
--		fi
--		eval "echo $INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
--		eval "$INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
--	fi
- 	for link in `sed -n -e '/SYNOPSIS/q;/DESCRIPTION/q;s/^\.Nm \([^ ]*\).*/\1/p' $srcdir/$f`; do
- 		if [ "$link" != "$base" ]; then
- 			target="$mandir/$link.$section"
-@@ -36,18 +27,6 @@ for f in "$@"; do
++	if test "$catinstall" = yes -a -f "$srcdir/$c"; then
+ 		if test \! -d "$catdir"; then
+ 			eval "$mkinstalldirs $catdir"
+ 		fi
+@@ -36,7 +37,7 @@ for f in "$@"; do
  					break
  				fi
  			done
 -			if test -f "$srcdir/$c"; then
--				target="$catdir/$link.$suffix"
--				for cmd in "ln -f $catdir/$base.$suffix $target" \
--					   "ln -fs $base.$suffix $target" \
--					   "cp -f $catdir/$base.$suffix $target"
--				do
--					if eval "$cmd"; then
--						eval echo "$cmd"
--						break
--					fi
--				done
--			fi
- 		fi
- 	done
- done
++			if test "$catinstall" = yes -a -f "$srcdir/$c"; then
+ 				target="$catdir/$link.$suffix"
+ 				for cmd in "ln -f $catdir/$base.$suffix $target" \
+ 					   "ln -fs $base.$suffix $target" \
diff --git a/security/heimdal/patches/patch-ac b/security/heimdal/patches/patch-ac
index ade79ffbd10..e34eaf84cc7 100644
--- a/security/heimdal/patches/patch-ac
+++ b/security/heimdal/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/10 14:56:45 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2005/10/26 15:12:45 jlam Exp $
 
---- configure.in.orig	Mon May 12 11:26:39 2003
+--- configure.in.orig	2005-09-09 08:13:10.000000000 -0400
 +++ configure.in
-@@ -16,9 +16,6 @@ AM_MAINTAINER_MODE
+@@ -15,9 +15,6 @@ AM_MAINTAINER_MODE
  
  AC_PREFIX_DEFAULT(/usr/heimdal)
  
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index 81b03a611a3..60848f26193 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2005/08/23 14:07:25 reed Exp $
+$NetBSD: patch-ad,v 1.7 2005/10/26 15:12:45 jlam Exp $
 
---- configure.orig	2005-06-14 14:29:16.000000000 +0000
+--- configure.orig	2005-09-09 08:14:45.000000000 -0400
 +++ configure
-@@ -3176,9 +3176,6 @@ fi
+@@ -3182,9 +3182,6 @@ fi
  
  
  
@@ -12,35 +12,3 @@ $NetBSD: patch-ad,v 1.6 2005/08/23 14:07:25 reed Exp $
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
    { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-@@ -22000,6 +21997,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- 		#undef KRB5 /* makes md4.h et al unhappy */
-+		#include <sys/types.h>
- 		#ifdef HAVE_OPENSSL
- 		#include <openssl/md4.h>
- 		#include <openssl/md5.h>
-@@ -22096,6 +22094,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- 		#undef KRB5 /* makes md4.h et al unhappy */
-+		#include <sys/types.h>
- 		#ifdef HAVE_OPENSSL
- 		#include <openssl/md4.h>
- 		#include <openssl/md5.h>
-@@ -22192,6 +22191,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- 		#undef KRB5 /* makes md4.h et al unhappy */
-+		#include <sys/types.h>
- 		#ifdef HAVE_OPENSSL
- 		#include <openssl/md4.h>
- 		#include <openssl/md5.h>
-@@ -22319,6 +22319,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- 		#undef KRB5 /* makes md4.h et al unhappy */
-+		#include <sys/types.h>
- 		#ifdef HAVE_OPENSSL
- 		#include <openssl/md4.h>
- 		#include <openssl/md5.h>
diff --git a/security/heimdal/patches/patch-ae b/security/heimdal/patches/patch-ae
new file mode 100644
index 00000000000..b964bddb558
--- /dev/null
+++ b/security/heimdal/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2005/10/26 15:12:45 jlam Exp $
+
+--- lib/krb5/krb5_encrypt.3.orig	2005-09-09 08:12:13.000000000 -0400
++++ lib/krb5/krb5_encrypt.3
+@@ -44,7 +44,7 @@
+ .Nm krb5_decrypt_ivec ,
+ .Nm krb5_decrypt_ticket ,
+ .Nm krb5_encrypt ,
+-.Nm krb5_encrypt_EncryptedData,
++.Nm krb5_encrypt_EncryptedData ,
+ .Nm krb5_encrypt_ivec ,
+ .Nm krb5_enctype_disable ,
+ .Nm krb5_enctype_keysize ,
diff --git a/security/heimdal/patches/patch-af b/security/heimdal/patches/patch-af
new file mode 100644
index 00000000000..0fc76745dda
--- /dev/null
+++ b/security/heimdal/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.3 2005/10/26 15:12:45 jlam Exp $
+
+--- lib/krb5/Makefile.in.orig	2005-09-09 08:17:31.000000000 -0400
++++ lib/krb5/Makefile.in
+@@ -737,6 +737,7 @@ man_MANS = \
+ 	krb5_rcache.3				\
+ 	krb5_rd_error.3				\
+ 	krb5_set_default_realm.3		\
++	krb5_set_password.3			\
+ 	krb5_storage.3				\
+ 	krb5_string_to_key.3			\
+ 	krb5_ticket.3				\