Pullup ticket 458 - requested by Love Hornquist-Astrand

security fix for heimdal

Revisions pulled up:
- pkgsrc/security/heimdal/Makefile		1.34-1.35
- pkgsrc/security/heimdal/PLIST			1.7
- pkgsrc/security/heimdal/distinfo		1.11
- pkgsrc/security/heimdal/patches/patch-ae	removed

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Thu Apr 21 14:00:36 UTC 2005

   Modified Files:
   	pkgsrc/security/heimdal: Makefile

   Log Message:
   lha agreed to maintain this package.
---
   Module Name:		pkgsrc
   Committed By:	lha
   Date:		Thu Apr 21 14:35:47 UTC 2005

   Modified Files:
   	pkgsrc/security/heimdal: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/security/heimdal/patches: patch-ae

   Log Message:
   Update to Heimdal 0.6.4. While I'm here, claim maintainership of this
   package. Also please pkglint. Changes in heimdal 0.6.4 include:

    * fix vulnerabilities in telnet
    * rshd: encryption without a separate error socket should now work
    * telnet now uses appdefaults for the encrypt and forward/forwardable
      settings
    * bug fixes

4 files changed, 23 insertions, 37 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 6704ac5f175..762a364a00a 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:49 reed Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2005/04/21 15:55:33 salo Exp $
 
-DISTNAME=	heimdal-0.6.3
-PKGREVISION=	3
+DISTNAME=	heimdal-0.6.4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/	\
 		ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	lha@NetBSD.org
 HOMEPAGE=	http://www.pdc.kth.se/heimdal/
 COMMENT=	Kerberos 5 implementation
 
@@ -99,10 +98,10 @@ SUBST_SED.heimdal=							\
 	-e "/PATH_LOGIN/s,/login,/${KRB5_PREFIX}login,g"
 
 pre-configure:
-	cd ${WRKSRC}; for file in lib/hdb/hdb.h; do			\
+	cd ${WRKSRC}; for f in lib/hdb/hdb.h; do			\
 		${SED}	-e "s|/var/heimdal|${HEIMDAL_STATEDIR}|g"	\
-			$$file > $$file.new;				\
-		${MV} -f $$file.new $$file;				\
+			$$f > $$f.new;					\
+		${MV} -f $$f.new $$f;					\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index ae6f48adbd3..bb39c0512ad 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2004/10/19 04:03:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.6.4.1 2005/04/21 15:55:34 salo Exp $
+bin/${KRB5_PREFIX}login
+bin/${KRB5_PREFIX}rcp
+bin/${KRB5_PREFIX}rsh
+bin/${KRB5_PREFIX}su
+bin/${KRB5_PREFIX}telnet
 bin/afslog
 bin/compile_et
 bin/kauth
@@ -10,17 +15,12 @@ bin/kinit
 bin/klist
 bin/kpasswd
 bin/krb5-config
-bin/${KRB5_PREFIX}login
 bin/mk_cmds
 bin/otp
 bin/otpprint
 bin/pagsh
 bin/pfrom
-bin/${KRB5_PREFIX}rcp
-bin/${KRB5_PREFIX}rsh
 bin/string2key
-bin/${KRB5_PREFIX}su
-bin/${KRB5_PREFIX}telnet
 bin/verify_krb5_conf
 include/krb5/asn1_err.h
 include/krb5/base64.h
@@ -74,6 +74,8 @@ lib/libotp.la
 lib/libroken.la
 lib/libsl.la
 lib/libss.la
+libexec/${KRB5_PREFIX}rshd
+libexec/${KRB5_PREFIX}telnetd
 libexec/hprop
 libexec/hpropd
 libexec/ipropd-master
@@ -85,8 +87,9 @@ libexec/kftpd
 libexec/kpasswdd
 libexec/popper
 libexec/push
-libexec/${KRB5_PREFIX}rshd
-libexec/${KRB5_PREFIX}telnetd
+man/man1/${KRB5_PREFIX}login.1
+man/man1/${KRB5_PREFIX}rsh.1
+man/man1/${KRB5_PREFIX}telnet.1
 man/man1/afslog.1
 man/man1/kauth.1
 man/man1/kdestroy.1
@@ -98,14 +101,11 @@ man/man1/klist.1
 man/man1/kpasswd.1
 man/man1/krb5-config.1
 man/man1/kx.1
-man/man1/${KRB5_PREFIX}login.1
 man/man1/otp.1
 man/man1/otpprint.1
 man/man1/pfrom.1
-man/man1/${KRB5_PREFIX}rsh.1
 man/man1/rxtelnet.1
 man/man1/rxterm.1
-man/man1/${KRB5_PREFIX}telnet.1
 man/man1/tenletxr.1
 man/man1/xnlock.1
 man/man3/arg_printusage.3
@@ -367,6 +367,8 @@ man/man3/krb_afslog_uid.3
 man/man5/kftpusers.5
 man/man5/krb5.conf.5
 man/man5/login.access.5
+man/man8/${KRB5_PREFIX}rshd.8
+man/man8/${KRB5_PREFIX}telnetd.8
 man/man8/hprop.8
 man/man8/hpropd.8
 man/man8/kadmin.8
@@ -381,9 +383,7 @@ man/man8/ktutil.8
 man/man8/kxd.8
 man/man8/popper.8
 man/man8/push.8
-man/man8/${KRB5_PREFIX}rshd.8
 man/man8/string2key.8
-man/man8/${KRB5_PREFIX}telnetd.8
 man/man8/verify_krb5_conf.8
 sbin/dump_log
 sbin/kadmin
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 92eda7d442c..803e5dbee76 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 13:10:06 agc Exp $
+$NetBSD: distinfo,v 1.10.2.1 2005/04/21 15:55:34 salo Exp $
 
-SHA1 (heimdal-0.6.3.tar.gz) = 91863a1bd9f8a55063a09c28a5f41985b7a31145
-RMD160 (heimdal-0.6.3.tar.gz) = 5b1b8fa5bfd722350eeef80d1ac5b8579387e40b
-Size (heimdal-0.6.3.tar.gz) = 3333604 bytes
+SHA1 (heimdal-0.6.4.tar.gz) = 36160808bb9310460bc0f76e88389b24b1628904
+RMD160 (heimdal-0.6.4.tar.gz) = f8d5e3b968998115bdbd40a2fba47853f97b7e47
+Size (heimdal-0.6.4.tar.gz) = 3329293 bytes
 SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7
 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942
 SHA1 (patch-ad) = 20347c61cf79c17500ab3508424632efc3545b65
-SHA1 (patch-ae) = 518eabed07d4fc69e86ace3f02d23ca3064d4bd1
diff --git a/security/heimdal/patches/patch-ae b/security/heimdal/patches/patch-ae
deleted file mode 100644
index ec9db7366f8..00000000000
--- a/security/heimdal/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/10/06 17:18:32 gavan Exp $
-
---- lib/roken/ndbm_wrap.c.orig	2003-08-29 18:00:34.000000000 +0100
-+++ lib/roken/ndbm_wrap.c
-@@ -50,6 +50,7 @@ RCSID("$Id: ndbm_wrap.c,v 1.1.8.1 2003/0
- #include <string.h>
- #include <fcntl.h>
- 
-+#undef open
- 
- #define DBT2DATUM(DBT, DATUM) do { (DATUM)->dptr = (DBT)->data; (DATUM)->dsize = (DBT)->size; } while(0)
- #define DATUM2DBT(DATUM, DBT) do { (DBT)->data = (DATUM)->dptr; (DBT)->size = (DATUM)->dsize; } while(0)