Update 0.3f -> 0.4b

7 files changed, 5 insertions, 117 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 3c80c885b5b7..815797389548 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		heimdal
-PORTVERSION=	0.3f
-PORTREVISION=	2
+PORTVERSION=	0.4b
 CATEGORIES=		security ipv6
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 				ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index e04211e89dc5..71a35cb1bf35 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1 +1 @@
-MD5 (heimdal-0.3f.tar.gz) = 66f2107a87872a105ccfb9547ae758d9
+MD5 (heimdal-0.4b.tar.gz) = 80f038def4d018d8ce974305a5881b61
diff --git a/security/heimdal/files/patch-aa b/security/heimdal/files/patch-aa
deleted file mode 100644
index fa141e58bbb6..000000000000
--- a/security/heimdal/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cf/broken-glob.m4
-===================================================================
-RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/aux/broken-glob.m4,v
-retrieving revision 1.3
-diff -u -w -r1.3 broken-glob.m4
---- cf/broken-glob.m4	2001/03/26 11:40:24	1.3
-+++ cf/broken-glob.m4	2001/06/19 09:07:50
-@@ -8,7 +8,13 @@
- AC_TRY_LINK([
- #include <stdio.h>
- #include <glob.h>],[
--glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|GLOB_LIMIT,
-+glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
-+#ifdef GLOB_MAXPATH
-+GLOB_MAXPATH
-+#else
-+GLOB_LIMIT
-+#endif
-+,
- NULL, NULL);
- ],:,ac_cv_func_glob_working=no,:))
- 
diff --git a/security/heimdal/files/patch-ab b/security/heimdal/files/patch-ab
deleted file mode 100644
index 9d6877f404ec..000000000000
--- a/security/heimdal/files/patch-ab
+++ /dev/null
@@ -1,53 +0,0 @@
---- lib/krb5/keytab_any.c	2001/05/14 06:14:48	1.2
-+++ lib/krb5/keytab_any.c	2001/06/24 01:41:04
-@@ -60,7 +60,8 @@
-     krb5_error_code ret;
-     char buf[256];
- 
--    while (strsep_copy(&name, ",", buf, sizeof(buf)) != -1) {
-+    while (strsep_copy(&name, ",", buf, sizeof(buf)) != -1
-+	   && buf[0] != '\0') {
- 	a = malloc(sizeof(*a));
- 	if (a == NULL) {
- 	    ret = ENOMEM;
-@@ -68,7 +69,7 @@
- 	}
- 	if (a0 == NULL) {
- 	    a0 = a;
--	    a->name = strdup(name);
-+	    a->name = strdup(buf);
- 	    if (a->name == NULL) {
- 		krb5_set_error_string(context, "malloc: out of memory");
- 		ret = ENOMEM;
-@@ -139,10 +140,8 @@
-     ed->a = a;
-     ret = krb5_kt_start_seq_get(context, ed->a->kt, &ed->cursor);
-     if (ret) {
--	free (ed);
- 	free (c->data);
- 	c->data = NULL;
--	krb5_set_error_string (context, "malloc: out of memory");
- 	return ENOMEM;
-     }
-     return 0;
-@@ -166,14 +165,15 @@
- 	    ret2 = krb5_kt_end_seq_get (context, ed->a->kt, &ed->cursor);
- 	    if (ret2)
- 		return ret2;
--	    ed->a = ed->a->next;
-+	    while ((ed->a = ed->a->next) != NULL) {
-+		ret2 = krb5_kt_start_seq_get(context, ed->a->kt, &ed->cursor);
-+		if (ret2 == 0)
-+		    break;
-+	    }
- 	    if (ed->a == NULL) {
- 		krb5_clear_error_string (context);
- 		return KRB5_CC_END;
- 	    }
--	    ret2 = krb5_kt_start_seq_get(context, ed->a->kt, &ed->cursor);
--	    if (ret2)
--		return ret2;
- 	} else
- 	    return ret;
-     } while (ret == KRB5_CC_END);
-
diff --git a/security/heimdal/files/patch-ac b/security/heimdal/files/patch-ac
deleted file mode 100644
index 88cabd8ed15f..000000000000
--- a/security/heimdal/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: appl/ftp/ftpd/popen.c
-===================================================================
-RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/appl/ftp/ftpd/popen.c,v
-retrieving revision 1.24
-diff -u -w -r1.24 popen.c
---- appl/ftp/ftpd/popen.c	2001/03/26 11:41:02	1.24
-+++ appl/ftp/ftpd/popen.c	2001/06/19 09:07:50
-@@ -139,7 +139,13 @@
- 	for (gargc = argc = 1; argv[argc] && gargc < MAXGLOBS - 1; argc++) {
- 		glob_t gl;
- 		int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE
--		    | GLOB_LIMIT;
-+		    |
-+#ifdef GLOB_MAXPATH
-+	GLOB_MAXPATH
-+#else
-+	GLOB_LIMIT
-+#endif
-+		    ;
- 
- 		memset(&gl, 0, sizeof(gl));
- 		if (no_glob || glob(argv[argc], flags, NULL, &gl))
diff --git a/security/heimdal/files/patch-cj b/security/heimdal/files/patch-cj
index 1eab53ca54d7..69b1c2c845d2 100644
--- a/security/heimdal/files/patch-cj
+++ b/security/heimdal/files/patch-cj
@@ -34,18 +34,3 @@
  	seteuid(0);
  	if (bind(pdata, pasv_addr, socket_sockaddr_size (pasv_addr)) < 0) {
  		seteuid(pw->pw_uid);
-@@ -2165,7 +2171,13 @@
-   char buf[MaxPathLen];
- 
-   if (strpbrk(whichf, "~{[*?") != NULL) {
--    int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|GLOB_LIMIT;
-+    int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
-+#ifdef GLOB_MAXPATH
-+	GLOB_MAXPATH
-+#else
-+	GLOB_LIMIT
-+#endif
-+	;
- 
-     memset(&gl, 0, sizeof(gl));
-     freeglob = 1;
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 6097f880fd3c..83bb11c09e15 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -31,6 +31,7 @@ include/hdb.h
 include/hdb_asn1.h
 include/hdb_err.h
 include/heim_err.h
+include/k524_err.h
 include/kadm5/admin.h
 include/kadm5/kadm5-private.h
 include/kadm5/kadm5-protos.h
@@ -75,13 +76,13 @@ lib/libkadm5srv.so
 lib/libkadm5srv.so.7
 lib/libkrb5.a
 lib/libkrb5.so
-lib/libkrb5.so.16
+lib/libkrb5.so.17
 lib/libotp.a
 lib/libotp.so
 lib/libotp.so.1
 lib/libroken.a
 lib/libroken.so
-lib/libroken.so.12
+lib/libroken.so.13
 lib/libsl.a
 lib/libsl.so
 lib/libsl.so.1