Update security/heimdal to 0.6.3. Changes from version 0.6.1 include:

* fix vulnerabilities in ftpd
* support for linux AFS /proc "syscalls"
* support for RFC3244 (Windows 2000 Kerberos Change/Set Password) in kpasswdd
* fix possible KDC denial of service
* Fix possible buffer overrun in v4 kadmin (which now defaults to off)

5 files changed, 17 insertions, 63 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 812e5ebf222..27318984d67 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/09/14 14:41:34 jlam Exp $
 
-DISTNAME=	heimdal-0.6.1
-PKGREVISION=	1
+DISTNAME=	heimdal-0.6.3
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/		\
+MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/	\
 		ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/pub/heimdal/src/
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -16,6 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
+LIBTOOLIZE_PLIST=	yes
 
 HEIMDAL_STATEDIR?=	${VARBASE}/heimdal
 
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 6251eef47d9..6f0b738448b 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/09/14 14:41:34 jlam Exp $
 bin/afslog
 bin/compile_et
 bin/kauth
@@ -64,68 +64,19 @@ include/krb5/xdbm.h
 info/heimdal.info
 info/heimdal.info-1
 info/heimdal.info-2
-lib/libasn1.a
 lib/libasn1.la
-lib/libasn1.so
-lib/libasn1.so.6
-lib/libasn1.so.6.2
-lib/libcom_err.a
 lib/libcom_err.la
-lib/libcom_err.so
-lib/libcom_err.so.2
-lib/libcom_err.so.2.1
-lib/libeditline.a
 lib/libeditline.la
-lib/libgssapi.a
 lib/libgssapi.la
-lib/libgssapi.so
-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.7
-lib/libkadm5clnt.a
 lib/libkadm5clnt.la
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.6
-lib/libkadm5clnt.so.6.4
-lib/libkadm5srv.a
 lib/libkadm5srv.la
-lib/libkadm5srv.so
-lib/libkadm5srv.so.7
-lib/libkadm5srv.so.7.6
-lib/libkafs.a
 lib/libkafs.la
-lib/libkafs.so
-lib/libkafs.so.4
-lib/libkafs.so.4.0
-lib/libkrb5.a
 lib/libkrb5.la
-lib/libkrb5.so
-lib/libkrb5.so.20
-lib/libkrb5.so.20.0
-lib/libotp.a
 lib/libotp.la
-lib/libotp.so
-lib/libotp.so.1
-lib/libotp.so.1.4
-lib/libroken.a
 lib/libroken.la
-lib/libroken.so
-lib/libroken.so.16
-lib/libroken.so.16.3
-lib/libsl.a
 lib/libsl.la
-lib/libsl.so
-lib/libsl.so.1
-lib/libsl.so.1.2
-lib/libss.a
 lib/libss.la
-lib/libss.so
-lib/libss.so.1
-lib/libss.so.1.4
 libexec/hprop
 libexec/hpropd
 libexec/ipropd-master
@@ -293,6 +244,7 @@ man/man3/krb5_cc_set_default_name.3
 man/man3/krb5_cc_set_flags.3
 man/man3/krb5_cc_store_cred.3
 man/man3/krb5_ccache.3
+man/man3/krb5_change_password.3
 man/man3/krb5_checksum_is_collision_proof.3
 man/man3/krb5_checksum_is_keyed.3
 man/man3/krb5_checksumsize.3
@@ -385,6 +337,8 @@ man/man3/krb5_principal_get_comp_string.3
 man/man3/krb5_principal_get_realm.3
 man/man3/krb5_print_address.3
 man/man3/krb5_set_default_realm.3
+man/man3/krb5_set_password.3
+man/man3/krb5_set_password_using_ccache.3
 man/man3/krb5_set_warn_dest.3
 man/man3/krb5_sname_to_principal.3
 man/man3/krb5_sock_to_principal.3
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index c71848acf0b..6afef8efd18 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/04/01 18:42:25 joda Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/09/14 14:41:34 jlam 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.6.1
+BUILDLINK_RECOMMENDED.heimdal?=	heimdal>=0.6.3
 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 bb8545d8ef1..e26a63716af 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/04/01 18:42:25 joda Exp $
+$NetBSD: distinfo,v 1.5 2004/09/14 14:41:34 jlam Exp $
 
-SHA1 (heimdal-0.6.1.tar.gz) = d4f79a076727b7f909dffa04136504ca9fe01deb
-Size (heimdal-0.6.1.tar.gz) = 3312603 bytes
+SHA1 (heimdal-0.6.3.tar.gz) = 91863a1bd9f8a55063a09c28a5f41985b7a31145
+Size (heimdal-0.6.3.tar.gz) = 3333604 bytes
 SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7
 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942
-SHA1 (patch-ad) = 47b4a76c1021f2683bd7f9940df78e2b38cf5448
+SHA1 (patch-ad) = e14359cb79eba9a3742f5cb7df4b85befc59db75
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index 262cfc5cdf0..02fbccf3566 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/01/10 14:56:45 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2004/09/14 14:41:34 jlam Exp $
 
---- configure.orig	Mon May 12 11:28:20 2003
+--- configure.orig	Mon Sep 13 08:27:10 2004
 +++ configure
-@@ -3036,9 +3036,6 @@ fi
+@@ -3176,9 +3176,6 @@ fi