Updated security/mit-krb5 to 1.3.2. Changes from version 1.3.1 include:

* Support for AES in GSSAPI has been implemented.  This corresponds to the
  in-progress work in the IETF (CFX).

* To avoid compatibility problems, unrecognized TGS options will now be
  ignored.

* 128-bit AES has been added to the default enctypes.

* AES cryptosystem now chains IVs.  This WILL break backwards compatibility
  for the kcmd applications, if they are using AES session keys.

* Assorted minor bug fixes and plugged memory leaks.

4 files changed, 23 insertions, 31 deletions

diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index c8ba14c4be2..009943b61a5 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/30 20:17:42 jlam Exp $
 
-DISTNAME=	krb5-1.3.1
+DISTNAME=	krb5-1.3.2
 PKGNAME=	mit-${DISTNAME}
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	security
@@ -17,18 +17,10 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_MIT_KRB5_MASTER_SITE)
-MASTER_SITE=		# empty
-EXTRACT_SUFX=		.tar
-DOWNLOAD=		http://web.mit.edu/network/kerberos-form.html
-INTERACTIVE_STAGE=	fetch
-
-_FETCH_MESSAGE= \
-	${ECHO} "==============================================================="; \
-	${ECHO} "  MIT Kerberos V5 source code (${DISTNAME}${EXTRACT_SUFX}) can be fetched"; \
-	${ECHO} "  into ${DISTDIR} from"; \
-	${ECHO} "  ${DOWNLOAD}."; \
-	${ECHO} "==============================================================="
+USE_MIT_KRB5_MASTER_SITE?=	yes
+.if !empty(USE_MIT_KRB5_MASTER_SITE:M[yY][eE][sS])
+MASTER_SITES=	http://web.mit.edu/kerberos/dist/krb5/1.3/
+EXTRACT_SUFX=	.tar
 
 post-extract:
 	cd ${WRKDIR} && ${PAX} -O -rzf ${WRKDIR}/${DISTNAME}.tar.gz
diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo
index 33d23bc7387..3039645c840 100644
--- a/security/mit-krb5/distinfo
+++ b/security/mit-krb5/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2004/03/30 19:10:08 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/03/30 20:17:42 jlam Exp $
 
-SHA1 (krb5-1.3.1.tar.gz) = 594dfdd61433e0573f8a2445716c455f5fe8b05f
-Size (krb5-1.3.1.tar.gz) = 6157946 bytes
+SHA1 (krb5-1.3.2.tar) = f647b4ff3524a511dd1713661b6bf4afdd11a61b
+Size (krb5-1.3.2.tar) = 6328320 bytes
 SHA1 (patch-aa) = 2f4e62e7c8cdee2f58f8dd5b385faea0253c0aa5
 SHA1 (patch-ab) = b9f2f54f9ecfe9eaa168bb68b695a454ac044b9d
 SHA1 (patch-ac) = e1282a6f00e439d83444f5d8f81dceab863ab1d5
 SHA1 (patch-ad) = 819bfde3e63b70db6204d03fe22f33641b2a1568
 SHA1 (patch-ae) = 7e55b4e13b538ea44fe08d4db2e125c7c91c4d4b
-SHA1 (patch-af) = 2306953d969fad34a18dbdebd13b3f56c24e44ac
-SHA1 (patch-ag) = 7c1b4c6e7bb15505d4c27cf48b7024f05d54b38f
+SHA1 (patch-af) = 7c6799dcfa50a405e27119ede6763bda73e85462
+SHA1 (patch-ag) = aadf6c229815fb9780016644728f5cf615c075d8
 SHA1 (patch-ah) = 59a6bfc341a22234b38db406abe83b0d6d358a9f
 SHA1 (patch-ai) = 51ebf1d271f1e399da1a8d2ed03ad10014414d35
 SHA1 (patch-aj) = 573d4b9cbffcf80635356e300eb88fe72de82667
diff --git a/security/mit-krb5/patches/patch-af b/security/mit-krb5/patches/patch-af
index 190b049b6bb..de7681c6e8c 100644
--- a/security/mit-krb5/patches/patch-af
+++ b/security/mit-krb5/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+$NetBSD: patch-af,v 1.2 2004/03/30 20:17:42 jlam Exp $
 
---- config/pre.in.orig	Wed May 28 00:06:28 2003
+--- config/pre.in.orig	Fri Feb 13 16:36:22 2004
 +++ config/pre.in
-@@ -134,6 +134,7 @@ ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_IN
+@@ -138,6 +138,7 @@ ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_IN
  CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
  DEFS = @DEFS@
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  CC = @CC@
  LD = $(PURE) @LD@
  DEPLIBS = @DEPLIBS@
-@@ -151,10 +152,12 @@ CLNTDEPLIBS = @CLNTDEPLIBS@
+@@ -155,10 +156,12 @@ CLNTDEPLIBS = @CLNTDEPLIBS@
  
  INSTALL=@INSTALL@
  INSTALL_STRIP=
@@ -25,7 +25,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  ## This is needed because autoconf will sometimes define @exec_prefix@ to be
  ## ${prefix}.
  prefix=@prefix@
-@@ -270,6 +273,10 @@ RPATH_FLAG=@RPATH_FLAG@
+@@ -274,6 +277,10 @@ RPATH_FLAG=@RPATH_FLAG@
  # depending on whether we're building with shared libraries.
  DEPLIBEXT=@DEPLIBEXT@
  
@@ -36,7 +36,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  KADMCLNT_DEPLIB	= $(TOPLIBD)/libkadm5clnt$(DEPLIBEXT)
  KADMSRV_DEPLIB	= $(TOPLIBD)/libkadm5srv$(DEPLIBEXT)
  KDB5_DEPLIB	= $(TOPLIBD)/libkdb5$(DEPLIBEXT)
-@@ -286,12 +293,12 @@ COM_ERR_DEPLIB	= $(COM_ERR_DEPLIB-@COM_E
+@@ -290,12 +297,12 @@ COM_ERR_DEPLIB	= $(COM_ERR_DEPLIB-@COM_E
  COM_ERR_DEPLIB-sys = # empty
  COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_err$(DEPLIBEXT)
  
@@ -52,7 +52,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  
  KRB5_BASE_DEPLIBS	= $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB)
  KRB4COMPAT_DEPLIBS	= $(KRB4_DEPLIB) $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS)
-@@ -332,7 +339,7 @@ GEN_LIB		= @GEN_LIB@
+@@ -336,7 +343,7 @@ GEN_LIB		= @GEN_LIB@
  
  SS_LIB		= $(SS_LIB-@SS_VERSION@)
  SS_LIB-sys	= @SS_LIB@
@@ -61,7 +61,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  KDB5_LIB	= -lkdb5
  DB_LIB		= @DB_LIB@
  KDB5_DB_LIB	= @KDB5_DB_LIB@
-@@ -455,15 +462,23 @@ SHLIBEXT=@SHLIBEXT@
+@@ -459,15 +466,23 @@ SHLIBEXT=@SHLIBEXT@
  # usually _p.a
  PFLIBEXT=@PFLIBEXT@
  
@@ -85,7 +85,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  
  ## Parameters to be set by configure for use in libobj.in:
  
-@@ -475,6 +490,7 @@ OBJLISTS=@OBJLISTS@
+@@ -479,6 +494,7 @@ OBJLISTS=@OBJLISTS@
  # the suffix substitution will break on some platforms!
  SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@)
  PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)
diff --git a/security/mit-krb5/patches/patch-ag b/security/mit-krb5/patches/patch-ag
index 9396959f527..6cc570b5db1 100644
--- a/security/mit-krb5/patches/patch-ag
+++ b/security/mit-krb5/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2004/03/30 20:17:42 jlam Exp $
 
---- config/shlib.conf.orig	Mon Mar  3 02:09:45 2003
+--- config/shlib.conf.orig	Fri Feb 13 16:36:22 2004
 +++ config/shlib.conf
 @@ -8,12 +8,14 @@ SHLIBVEXT=.so.v-nobuild
  SHLIBSEXT=.so.s-nobuild
@@ -17,7 +17,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
  # Default for systems w/o shared libraries
  CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  
-@@ -300,3 +302,8 @@ mips-*-netbsd*)
+@@ -325,3 +327,8 @@ mips-*-netbsd*)
  	RUN_ENV='LIBPATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/lib:/usr/local/lib; export LIBPATH; '
  
  esac