Update to 0.6.1:

 * Fixed cross realm vulnerability
 * Fixed ARCFOUR suppport
 * kdc: fix denial of service attack
 * kdc: stop clients from renewing tickets into the future
 * bug fixes

8 files changed, 17 insertions, 109 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 4eee34e6d6d..04bd9119c33 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2004/03/29 17:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/01 18:42:25 joda Exp $
 
-DISTNAME=		heimdal-0.6
-PKGREVISION=		3
+DISTNAME=		heimdal-0.6.1
+PKGREVISION=		0
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/heimdal/src/		\
-			ftp://ftp.pdc.kth.se/pub/heimdal/src/old/	\
-			ftp://ftp.pdc.kth.se/pub/heimdal/src/snapshots/
+			ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/pub/heimdal/src/
 
 MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.pdc.kth.se/heimdal/
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 6315223745a..92eacf24269 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/15 12:48:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/01 18:42:25 joda Exp $
 bin/afslog
 bin/compile_et
 bin/kauth
@@ -69,7 +69,7 @@ lib/libasn1.a
 lib/libasn1.la
 lib/libasn1.so
 lib/libasn1.so.6
-lib/libasn1.so.6.1
+lib/libasn1.so.6.2
 lib/libcom_err.a
 lib/libcom_err.la
 lib/libcom_err.so
@@ -80,13 +80,13 @@ lib/libeditline.la
 lib/libgssapi.a
 lib/libgssapi.la
 lib/libgssapi.so
-lib/libgssapi.so.4
-lib/libgssapi.so.4.0
+lib/libgssapi.so.5
+lib/libgssapi.so.5.0
 lib/libhdb.a
 lib/libhdb.la
 lib/libhdb.so
 lib/libhdb.so.7
-lib/libhdb.so.7.6
+lib/libhdb.so.7.7
 lib/libkadm5clnt.a
 lib/libkadm5clnt.la
 lib/libkadm5clnt.so
@@ -105,8 +105,8 @@ lib/libkafs.so.4.0
 lib/libkrb5.a
 lib/libkrb5.la
 lib/libkrb5.so
-lib/libkrb5.so.19
-lib/libkrb5.so.19.0
+lib/libkrb5.so.20
+lib/libkrb5.so.20.0
 lib/libotp.a
 lib/libotp.la
 lib/libotp.so
@@ -116,7 +116,7 @@ lib/libroken.a
 lib/libroken.la
 lib/libroken.so
 lib/libroken.so.16
-lib/libroken.so.16.2
+lib/libroken.so.16.3
 lib/libsl.a
 lib/libsl.la
 lib/libsl.so
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 8fa6f5b3ed5..c71848acf0b 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2004/04/01 18:42:25 joda Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	heimdal
 
 .if !empty(HEIMDAL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.4e
-BUILDLINK_RECOMMENDED.heimdal?=	heimdal>=0.6nb2
+BUILDLINK_RECOMMENDED.heimdal?=	heimdal>=0.6.1
 BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5
 .endif	# HEIMDAL_BUILDLINK3_MK
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index c625b15188e..bb8545d8ef1 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/02/22 11:59:50 markd Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 18:42:25 joda Exp $
 
-SHA1 (heimdal-0.6.tar.gz) = 06f00ea8ec26d64729806960f2f7f66bee8275bd
-Size (heimdal-0.6.tar.gz) = 3135319 bytes
-SHA1 (patch-aa) = 26482a8a642df10a2d816e660a2b80a6127c54d0
+SHA1 (heimdal-0.6.1.tar.gz) = d4f79a076727b7f909dffa04136504ca9fe01deb
+Size (heimdal-0.6.1.tar.gz) = 3312603 bytes
 SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7
 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942
 SHA1 (patch-ad) = 47b4a76c1021f2683bd7f9940df78e2b38cf5448
-SHA1 (patch-ae) = 46d5125deec8b82c821208aa0091d96f625d8e88
-SHA1 (patch-af) = 7df1c2dfd7cb69d7ec657e4be0d56a57b394e3fd
-SHA1 (patch-ag) = 80c85e544f6be3ecdd538c89e888a80e77a2a630
diff --git a/security/heimdal/patches/patch-aa b/security/heimdal/patches/patch-aa
deleted file mode 100644
index 4c1e5c7b35b..00000000000
--- a/security/heimdal/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/10 14:56:45 jlam Exp $
-
---- appl/ftp/ftp/gssapi.c.orig	Sun Mar 16 14:40:18 2003
-+++ appl/ftp/ftp/gssapi.c
-@@ -228,12 +228,13 @@ gss_adat(void *app_data, void *buf, size
- 	    gss_release_buffer(&min_stat, &export_name);
- 	    goto out;
- 	}
--	name = realloc(export_name.value, export_name.length + 1);
-+	name = malloc(export_name.length + 1);
- 	if(name == NULL) {
- 	    reply(500, "Out of memory");
- 	    gss_release_buffer(&min_stat, &export_name);
- 	    goto out;
- 	}
-+	memcpy(name, export_name.value, export_name.length);
- 	name[export_name.length] = '\0';
- 	gss_release_buffer(&min_stat, &export_name);
- 	d->client_name = name;
diff --git a/security/heimdal/patches/patch-ae b/security/heimdal/patches/patch-ae
deleted file mode 100644
index 9b78e9757fb..00000000000
--- a/security/heimdal/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/01/13 02:05:29 markd Exp $
-
---- lib/krb5/verify_krb5_conf.c.orig	2003-03-29 21:52:50.000000000 +1200
-+++ lib/krb5/verify_krb5_conf.c
-@@ -449,8 +449,8 @@ struct entry log_strings[] = {
- 
- #if 0
- struct entry kdcdefaults_entries[] = {
--    { "kdc_ports, krb5_config_string, mit_entry },
--    { "v4_mode, krb5_config_string, mit_entry },
-+    { "kdc_ports", krb5_config_string, mit_entry },
-+    { "v4_mode", krb5_config_string, mit_entry },
-     { NULL }
- };
- #endif
diff --git a/security/heimdal/patches/patch-af b/security/heimdal/patches/patch-af
deleted file mode 100644
index 0746db4c673..00000000000
--- a/security/heimdal/patches/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/02/22 11:59:50 markd Exp $
-
---- lib/hdb/db3.c.orig	2001-08-09 20:41:48.000000000 +1200
-+++ lib/hdb/db3.c
-@@ -37,7 +37,13 @@ RCSID("$Id: db3.c,v 1.8 2001/08/09 08:41
- 
- #if HAVE_DB3
- 
-+#if defined(HAVE_DB4_DB_H)
-+#include <db4/db.h>
-+#elif defined(HAVE_DB3_DB_H)
-+#include <db3/db.h>
-+#else
- #include <db.h>
-+#endif
- 
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-@@ -262,10 +268,18 @@ DB_open(krb5_context context, HDB *db, i
-     }
-     db_create(&d, NULL, 0);
-     db->db = d;
-+#if defined(HAVE_DB4_DB_H)
-+    if ((ret = d->open(db->db, NULL, fn, NULL, DB_BTREE, myflags, mode))) {
-+#else
-     if ((ret = d->open(db->db, fn, NULL, DB_BTREE, myflags, mode))) {
-+#endif
-       if(ret == ENOENT)
- 	/* try to open without .db extension */
-+#if defined(HAVE_DB4_DB_H)
-+	if (d->open(db->db, NULL, db->name, NULL, DB_BTREE, myflags, mode)) {
-+#else
- 	if (d->open(db->db, db->name, NULL, DB_BTREE, myflags, mode)) {
-+#endif
- 	  free(fn);
- 	  krb5_set_error_string(context, "opening %s: %s",
- 				db->name, strerror(ret));
diff --git a/security/heimdal/patches/patch-ag b/security/heimdal/patches/patch-ag
deleted file mode 100644
index a7f0b6e5b28..00000000000
--- a/security/heimdal/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/02/22 11:59:50 markd Exp $
-
---- lib/roken/ndbm_wrap.c.orig	2002-05-01 04:37:08.000000000 +1200
-+++ lib/roken/ndbm_wrap.c
-@@ -165,7 +165,11 @@ dbm_open (const char *file, int flags, m
- 	free(fn);
- 	return NULL;
-     }
-+#if defined(HAVE_DB4_DB_H)
-+    if(db->open(db, NULL, fn, NULL, DB_BTREE, myflags, mode) != 0) {
-+#else
-     if(db->open(db, fn, NULL, DB_BTREE, myflags, mode) != 0) {
-+#endif
- 	free(fn);
- 	db->close(db, 0);
- 	return NULL;