6 files changed, 56 insertions, 26 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 26bf0ae8e59b..f6c8f0a36678 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		heimdal
-PORTVERSION=		0.2t
+PORTVERSION=		0.3b
 CATEGORIES=		security ipv6
 MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 			ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
@@ -17,19 +17,22 @@ MAINTAINER=		nectar@FreeBSD.ORG
 
 RESTRICTED=		"Crypto; export-controlled"
 
-MAN1=			ftp.1 kdestroy.1 kgetcred.1 kinit.1 klist.1 kpasswd.1 \
+MAN1=			ftp.1 kdestroy.1 kf.1 kgetcred.1 kinit.1 klist.1 kpasswd.1 \
 			telnet.1 kx.1 rxtelnet.1 rxterm.1 tenletxr.1 pfrom.1
 MAN3=			editline.3 krb5_425_conv_principal.3 kafs.3 \
-			krb5_build_principal.3 krb5_free_principal.3 \
-			krb5_openlog.3 krb5_parse_name.3 \
-			krb5_sname_to_principal.3 krb5_unparse_name.3 \
-			krb5_warn.3
+			krb5_appdefault.3 krb5_build_principal.3 krb5_config.3 \
+			krb5_free_principal.3 krb5_openlog.3 krb5_parse_name.3 \
+			krb5_sname_to_principal.3 krb5_unparse_name.3 krb5_warn.3
 MAN5=			ftpusers.5 krb5.conf.5
-MAN8=			ftpd.8 hprop.8 hpropd.8 kdc.8 kpasswdd.8 kstash.8 \
+MAN8=			ftpd.8 hprop.8 hpropd.8 kadmind.8 kdc.8 kfd.8 kpasswdd.8 \
+			kstash.8 \
 			ktutil.8 push.8 telnetd.8 kxd.8 verify_krb5_conf.8 \
 			string2key.8
 
-USE_LIBTOOL=		yes
+# must use supplied ltconfig et. al. for now
+#USE_LIBTOOL=		yes
+
+GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS=		--prefix=${PREFIX} --enable-shared
 
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index ce75b0bdaff2..7436dfda03dd 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1 +1 @@
-MD5 (heimdal-0.2t.tar.gz) = 34b50fa5700833fcf6c8b894ecc00e03
+MD5 (heimdal-0.3b.tar.gz) = 92830b6323860e96b8fcca0a7ee8df48
diff --git a/security/heimdal/files/patch-cb b/security/heimdal/files/patch-cb
index a7c5b5abb8ac..8b37f0216780 100644
--- a/security/heimdal/files/patch-cb
+++ b/security/heimdal/files/patch-cb
@@ -1,13 +1,13 @@
---- configure.in.orig	Tue Feb 22 21:42:25 2000
-+++ configure.in	Thu Mar 30 22:52:03 2000
-@@ -73,6 +73,10 @@
+--- configure.in.orig	Wed Aug 30 07:17:26 2000
++++ configure.in	Wed Aug 30 07:18:03 2000
+@@ -83,6 +83,10 @@
+ 	LIB_openldap="-rpath $openldap_libdir $LIB_openldap"
  fi
- ])
  
 +dnl Kerberos 4 libraries are quite likely to need to link against
 +dnl libcom_err. 
 +AC_CHECK_LIB(com_err, init_error_table)
 +
- AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena)
+ AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4)
  
  LIB_kdb=
diff --git a/security/heimdal/files/patch-cc b/security/heimdal/files/patch-cc
index c37a7351bbde..d4fd8fc8359a 100644
--- a/security/heimdal/files/patch-cc
+++ b/security/heimdal/files/patch-cc
@@ -1,12 +1,13 @@
---- configure.orig	Sun Apr  2 21:21:46 2000
-+++ configure	Mon Apr 17 14:40:32 2000
-@@ -2217,6 +2217,9 @@
+--- configure.orig	Wed Aug 30 07:17:21 2000
++++ configure	Wed Aug 30 07:18:31 2000
+@@ -9346,6 +9346,10 @@
+ 	LIB_openldap="-rpath $openldap_libdir $LIB_openldap"
  fi
  
- 
 +# Kerberos IV on FreeBSD depends on libcom_err
 +LIBS="-lcom_err $LIBS"
 +echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
++
  # Check whether --with-krb4 or --without-krb4 was given.
  if test "${with_krb4+set}" = set; then
+   withval="$with_krb4"
diff --git a/security/heimdal/files/patch-ch b/security/heimdal/files/patch-ch
new file mode 100644
index 000000000000..fe7ecfa7b813
--- /dev/null
+++ b/security/heimdal/files/patch-ch
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Wed Aug 30 08:22:05 2000
++++ ltmain.sh	Wed Aug 30 08:24:36 2000
+@@ -4058,12 +4058,6 @@
+ 	  IFS="$save_ifs"
+ 	fi
+ 
+-	# Install the pseudo-library for information purposes.
+-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	instname="$dir/$name"i
+-	$show "$install_prog $instname $destdir/$name"
+-	$run eval "$install_prog $instname $destdir/$name" || exit $?
+-
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ 	;;
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 151447eef04a..d91b4e771406 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -3,6 +3,7 @@ bin/des
 bin/ftp
 bin/kauth
 bin/kdestroy
+bin/kf
 bin/kgetcred
 bin/kinit
 bin/klist
@@ -14,6 +15,7 @@ bin/otpprint
 bin/pfrom
 bin/rsh
 bin/string2key
+bin/su
 bin/telnet
 bin/verify_krb5_conf
 include/asn1.h
@@ -33,6 +35,8 @@ include/hdb_asn1.h
 include/hdb_err.h
 include/heim_err.h
 include/kadm5/admin.h
+include/kadm5/kadm5-protos.h
+include/kadm5/kadm5-private.h
 include/kadm5/kadm5_err.h
 include/kadm5/private.h
 include/kafs.h
@@ -49,17 +53,19 @@ include/parse_time.h
 include/parse_units.h
 include/rc4.h
 include/resolve.h
+include/rtbl.h
 include/roken-common.h
 include/roken.h
 include/sha.h
 include/sl.h
 include/ss/ss.h
+include/xdbm.h
 @unexec install-info --delete %D/info/heimdal.info %D/info/dir
 info/heimdal.info
 @exec install-info %D/info/heimdal.info %D/info/dir
 lib/libasn1.a
 lib/libasn1.so
-lib/libasn1.so.2
+lib/libasn1.so.3
 lib/libcom_err.a
 lib/libcom_err.so
 lib/libcom_err.so.1
@@ -69,31 +75,34 @@ lib/libdes.so.2
 lib/libeditline.a
 lib/libgssapi.a
 lib/libgssapi.so
-lib/libgssapi.so.1
+lib/libgssapi.so.2
 lib/libhdb.a
 lib/libhdb.so
-lib/libhdb.so.4
+lib/libhdb.so.6
 lib/libkadm5clnt.a
 lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
+lib/libkadm5clnt.so.6
 lib/libkadm5srv.a
 lib/libkadm5srv.so
-lib/libkadm5srv.so.6
+lib/libkadm5srv.so.7
 lib/libkrb5.a
 lib/libkrb5.so
-lib/libkrb5.so.11
+lib/libkrb5.so.13
 lib/libotp.a
 lib/libotp.so
 lib/libotp.so.1
 lib/libroken.a
 lib/libroken.so
-lib/libroken.so.8
+lib/libroken.so.10
 lib/libsl.a
 lib/libsl.so
 lib/libsl.so.1
 lib/libss.a
 lib/libss.so
 lib/libss.so.1
+lib/libvers.a
+lib/libvers.so
+lib/libvers.so.1
 libexec/ftpd
 libexec/hprop
 libexec/hpropd
@@ -101,6 +110,7 @@ libexec/ipropd-master
 libexec/ipropd-slave
 libexec/kadmind
 libexec/kdc
+libexec/kfd
 libexec/kpasswdd
 libexec/popper
 libexec/push
@@ -111,5 +121,6 @@ sbin/kadmin
 sbin/kstash
 sbin/ktutil
 sbin/replay_log
+sbin/truncate_log
 @dirrm include/kadm5
 @dirrm include/ss