diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2002-09-13 13:46:48 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2002-09-13 13:46:48 +0000 |
| commit | 495424cc3f4dc1d6dd1d506f839d9ea3fbd7ffe4 (patch) | |
| tree | e05fcfc9b73ada31786b238977da8a9651659cfe /security/krb5-17 | |
| parent | Chase the libnmz shlib version bump. (diff) | |
Update 1.2.5 --> 1.2.6
Note: Since crypto-publish.org does not yet have krb5-1.2.6 up on their
website, fetch from their site has been temporarily disabled.
Notes
Notes:
svn path=/head/; revision=66260
Diffstat (limited to 'security/krb5-17')
| -rw-r--r-- | security/krb5-17/Makefile | 12 | ||||
| -rw-r--r-- | security/krb5-17/distinfo | 3 | ||||
| -rw-r--r-- | security/krb5-17/files/patch-kdc::kdc_preauth.c | 16 | ||||
| -rw-r--r-- | security/krb5-17/files/patch-lib::rpc::xdr_array.c | 20 |
4 files changed, 9 insertions, 42 deletions
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile index 54537d1bcaa2..6542d43aba70 100644 --- a/security/krb5-17/Makefile +++ b/security/krb5-17/Makefile @@ -6,12 +6,16 @@ # PORTNAME= krb5 -PORTVERSION= 1.2.5 -PORTREVISION= 2 +PORTVERSION= 1.2.6 CATEGORIES= security .if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" -MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ -EXTRACT_SUFX= .tar.gz +# XXX crypto-publish.org does not at this time have the krb5-1.2.6 tarball. +# Use manual download until crypto-publish.org posts a copy of krb5-1.2.6 +# on their website. +# MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ +# EXTRACT_SUFX= .tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar .else MASTER_SITES= # manual download EXTRACT_SUFX= .tar diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo index 7fb8cb4d4695..6942bcbb70b0 100644 --- a/security/krb5-17/distinfo +++ b/security/krb5-17/distinfo @@ -1,2 +1 @@ -MD5 (krb5-1.2.5.tar) = c91d4fbbe616a28b1652be5eb0a9e5ae -MD5 (krb5-1.2.5.tar.gz) = 980c7935b27281e65367c538366776ab +MD5 (krb5-1.2.6.tar) = 88a94d357c63e0c6b902f3e7cffe397c diff --git a/security/krb5-17/files/patch-kdc::kdc_preauth.c b/security/krb5-17/files/patch-kdc::kdc_preauth.c deleted file mode 100644 index 4e84ee941e85..000000000000 --- a/security/krb5-17/files/patch-kdc::kdc_preauth.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: kdc/kdc_preauth.c -===================================================================== -RCS file: /cvs/krbdev/krb5/src/kdc/kdc_preauth.c,v -retrieving revision 5.30 -diff -u -r5.30 kdc_preauth.c ---- kdc/kdc_preauth.c 2001/06/21 13:46:15 5.30 -+++ kdc/kdc_preauth.c 2002/06/24 22:28:01 -@@ -543,7 +543,7 @@ - while (1) { - retval = krb5_dbe_search_enctype(context, client, &start, -1, - -1, 0, &client_key); -- if (retval == ENOENT) -+ if (retval == KRB5_KDB_NO_MATCHING_KEY) - break; - if (retval) - goto cleanup; diff --git a/security/krb5-17/files/patch-lib::rpc::xdr_array.c b/security/krb5-17/files/patch-lib::rpc::xdr_array.c deleted file mode 100644 index be9be37eada6..000000000000 --- a/security/krb5-17/files/patch-lib::rpc::xdr_array.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/rpc/xdr_array.c.orig Fri Feb 13 20:27:23 1998 -+++ lib/rpc/xdr_array.c Fri Aug 2 13:03:55 2002 -@@ -40,6 +40,7 @@ - * arrays. See xdr.h for more info on the interface to xdr. - */ - -+#include <limits.h> - #include <stdio.h> - - #include <gssrpc/types.h> -@@ -75,7 +76,8 @@ - return (FALSE); - } - c = *sizep; -- if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { -+ if ((c > maxsize || UINT_MAX/elsize < c) && -+ (xdrs->x_op != XDR_FREE)) { - return (FALSE); - } - nodesize = c * elsize; |