Update to version 1.2.1.

Changes in release 1.2.1:
* kadmind: fix remote exploit

Changes in release 1.2:
* fix buffer overrun in ftp
* fix openssl building
* don't try to force encryption in telnet if not talking to a default
  telnet port
* recognise AIX 5
* should work with more DB libraries

4 files changed, 40 insertions, 38 deletions

diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 53348f01ab4..4a17e0d714b 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2002/10/02 18:59:50 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2002/10/29 13:56:50 joda Exp $
 #
 
-DISTNAME=		krb4-1.1.1
-PKGNAME=		kth-krb4-1.1.1 
+DISTNAME=		krb4-1.2.1
+PKGNAME=		kth-krb4-1.2.1 
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/krb/src/
 
@@ -64,4 +64,5 @@ post-install:
 # Enable line below once it's needed
 #.include "../../mk/automake.mk"
 .include "../../mk/texinfo.mk"
+.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST
index 58cfb3645a6..510b493a972 100644
--- a/security/kth-krb4/PLIST
+++ b/security/kth-krb4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:23:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/10/29 13:56:50 joda Exp $
 bin/afslog
 bin/compile_et
 bin/ftp
@@ -9,7 +9,7 @@ bin/kinit
 bin/kip
 bin/klist
 bin/kpasswd
-bin/krb4-config 
+bin/krb4-config
 bin/ksrvtgt
 bin/kstring2key
 bin/kx
@@ -35,7 +35,8 @@ include/kerberosIV/acl.h
 include/kerberosIV/base64.h
 include/kerberosIV/com_err.h
 include/kerberosIV/com_right.h
-include/kerberosIV/editline.h  
+include/kerberosIV/des.h
+include/kerberosIV/editline.h
 include/kerberosIV/getarg.h
 include/kerberosIV/kadm.h
 include/kerberosIV/kadm_err.h
@@ -64,9 +65,9 @@ include/kerberosIV/xdbm.h
 include/kerberosIV/ss/ss.h
 @dirrm include/kerberosIV/ss
 @dirrm include/kerberosIV
-@unexec ${INSTALL_INFO} --delete %D/info/kth-krb.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/kth-krb.info
 info/kth-krb.info
-@exec ${INSTALL_INFO} %D/info/kth-krb.info %D/info/dir
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/kth-krb.info
 lib/libacl.a
 lib/libacl.la
 lib/libacl.so
@@ -76,39 +77,39 @@ lib/libcom_err.a
 lib/libcom_err.la
 lib/libcom_err.so
 lib/libcom_err.so.2
-lib/libcom_err.so.2.0
+lib/libcom_err.so.2.1
 lib/libeditline.a
 lib/libeditline.la
 lib/libkadm.a
 lib/libkadm.la
 lib/libkadm.so
 lib/libkadm.so.1
-lib/libkadm.so.1.10
+lib/libkadm.so.1.11
 lib/libkafs.a
 lib/libkafs.la
 lib/libkafs.so
 lib/libkafs.so.3
-lib/libkafs.so.3.3
+lib/libkafs.so.3.4
 lib/libkdb.a
 lib/libkdb.la
 lib/libkdb.so
 lib/libkdb.so.1
-lib/libkdb.so.1.10
+lib/libkdb.so.1.11
 lib/libkrb.a
 lib/libkrb.la
 lib/libkrb.so
 lib/libkrb.so.2
-lib/libkrb.so.2.0
+lib/libkrb.so.2.1
 lib/libotp.a
-lib/libotp.la  
+lib/libotp.la
 lib/libotp.so
 lib/libotp.so.1
 lib/libotp.so.1.3
 lib/libroken.a
 lib/libroken.la
 lib/libroken.so
-lib/libroken.so.15
-lib/libroken.so.15.0
+lib/libroken.so.16
+lib/libroken.so.16.0
 lib/libsl.a
 lib/libsl.la
 lib/libsl.so
@@ -172,7 +173,7 @@ man/cat3/k_unlog.0
 man/cat3/kafs.0
 man/cat3/kerberos.0
 man/cat3/krb_afslog.0
-man/cat3/krb_afslog_uid.0 
+man/cat3/krb_afslog_uid.0
 man/cat3/krb_realmofhost.0
 man/cat3/krb_sendauth.0
 man/cat5/ftpusers.0
@@ -201,7 +202,7 @@ man/man1/kdestroy.1
 man/man1/kerberos.1
 man/man1/kinit.1
 man/man1/klist.1
-man/man1/krb4-config.1  
+man/man1/krb4-config.1
 man/man1/ksrvtgt.1
 man/man1/kx.1
 man/man1/login.1
diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo
index 56dc89e6cd3..d11b92d908b 100644
--- a/security/kth-krb4/distinfo
+++ b/security/kth-krb4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/09/24 00:17:51 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/10/29 13:56:50 joda Exp $
 
-SHA1 (krb4-1.1.1.tar.gz) = db192908ec8510a22161c7607f83c8779dc7294a
-Size (krb4-1.1.1.tar.gz) = 1817919 bytes
+SHA1 (krb4-1.2.1.tar.gz) = 8134bf761d030210cc87fe3b4635ce4afe817c66
+Size (krb4-1.2.1.tar.gz) = 1876149 bytes
 SHA1 (patch-ag) = 41e3b00986b886d820e8d120709c057e58c209af
-SHA1 (patch-ah) = f60b4c67dc6fbd08a337f75585f9597e508c4c4c
+SHA1 (patch-ah) = 87c87b38dcb3b9c16e2654122194a21bfeeb5180
 SHA1 (patch-ai) = 716ae2b9675d1d83e5e27edfa90c792d72b37ea5
diff --git a/security/kth-krb4/patches/patch-ah b/security/kth-krb4/patches/patch-ah
index a2e035c9fc0..dc2ae16e083 100644
--- a/security/kth-krb4/patches/patch-ah
+++ b/security/kth-krb4/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2002/04/05 11:32:22 wennmach Exp $
+$NetBSD: patch-ah,v 1.3 2002/10/29 13:56:51 joda Exp $
 
 Do not install the des executable, nor the des.1 man page. This avoids
 a conflict with the openssl package, which installs an executable with
@@ -24,18 +24,18 @@ the same name (and functionality) into the same place.
  
  ## this is an awful lot of junk, but it's just as well to include everything
  EXTRA_DIST =		\
---- lib/des/Makefile.in.orig	Thu Apr  4 16:10:37 2002
-+++ lib/des/Makefile.in	Thu Apr  4 16:11:27 2002
-@@ -212,7 +212,7 @@
- check_PROGRAMS = destest mdtest md5crypt_test
+--- lib/des/Makefile.in.orig	Wed Oct 23 06:39:44 2002
++++ lib/des/Makefile.in	Mon Oct 28 15:26:36 2002
+@@ -213,7 +213,7 @@
  
  TESTS = destest mdtest md5crypt_test
+ CHECK_LOCAL = 
 -bin_PROGRAMS = des #rpw speed
-+bin_PROGRAMS =
++bin_PROGRAMS = 
  
  des_SOURCES = des.c des_ver.h
  
-@@ -260,7 +260,7 @@
+@@ -261,7 +261,7 @@
  	passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h
  
  
@@ -44,12 +44,12 @@ the same name (and functionality) into the same place.
  
  EXTRA_DIST = \
  	COPYRIGHT	\
-@@ -329,7 +329,7 @@
- rc4_enc.lo read_pwd.lo rnd_keys.lo set_key.lo sha.lo str2key.lo \
- xcbc_enc.lo
- libdes_la_OBJECTS =  $(am_libdes_la_OBJECTS)
--bin_PROGRAMS =  des$(EXEEXT)
-+bin_PROGRAMS =
- check_PROGRAMS =  destest$(EXEEXT) mdtest$(EXEEXT) \
- md5crypt_test$(EXEEXT)
- PROGRAMS =  $(bin_PROGRAMS)
+@@ -322,7 +322,7 @@
+ 	pcbc_enc.lo qud_cksm.lo rc4_skey.lo rc4_enc.lo read_pwd.lo \
+ 	rnd_keys.lo set_key.lo sha.lo str2key.lo xcbc_enc.lo
+ libdes_la_OBJECTS = $(am_libdes_la_OBJECTS)
+-bin_PROGRAMS = des$(EXEEXT)
++bin_PROGRAMS = 
+ check_PROGRAMS = destest$(EXEEXT) mdtest$(EXEEXT) md5crypt_test$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+