diff options
20 files changed, 16 insertions, 196 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index 661421f59e83..c70bf1adf75e 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -6,8 +6,7 @@ # PORTNAME= krb5 -PORTVERSION= 1.3.4 -PORTREVISION= 2 +PORTVERSION= 1.3.5 CATEGORIES= security # USE_TARBALL tells the port that the user has fetched the source # directly from MIT or crypto-publish.org (CRYTPO-PUBLISH). @@ -21,7 +20,7 @@ PORTREVISION= 5 MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ EXTRACT_SUFX= .tar.gz .else -MASTER_SITES= http://web.mit.edu/kerberos/www/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ +MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ EXTRACT_SUFX= .tar .endif diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo index 48b18a657c5d..e8ef40139095 100644 --- a/security/krb5-16/distinfo +++ b/security/krb5-16/distinfo @@ -1,4 +1,4 @@ -MD5 (krb5-1.3.4.tar) = 33fdee0c5e78f67a18a781dee31e3e19 -SIZE (krb5-1.3.4.tar) = 6369280 +MD5 (krb5-1.3.5.tar) = 8da4179bfd929eebc9f005fb427db1a0 +SIZE (krb5-1.3.5.tar) = 6522880 MD5 (krb5-1.3.1.tar.gz) = 73f868cf65bec56d7c718834ca5665fd SIZE (krb5-1.3.1.tar.gz) = 6157946 diff --git a/security/krb5-16/files/patch-lib::krb5::asn.1::asn1buf.c b/security/krb5-16/files/patch-lib::krb5::asn.1::asn1buf.c deleted file mode 100644 index 6d3da983adc3..000000000000 --- a/security/krb5-16/files/patch-lib::krb5::asn.1::asn1buf.c +++ /dev/null @@ -1,13 +0,0 @@ -*** lib/krb5/asn.1/asn1buf.c 12 Mar 2003 04:33:30 -0000 5.24 ---- lib/krb5/asn.1/asn1buf.c 23 Aug 2004 03:43:47 -0000 -*************** -*** 122,127 **** ---- 122,129 ---- - return ASN1_OVERRUN; - } - while (nestlevel > 0) { -+ if (buf->bound - buf->next + 1 <= 0) -+ return ASN1_OVERRUN; - retval = asn1_get_tag_2(buf, &t); - if (retval) return retval; - if (!t.indef) { diff --git a/security/krb5-16/files/patch-lib::krb5::krb::rd_rep.c b/security/krb5-16/files/patch-lib::krb5::krb::rd_rep.c deleted file mode 100644 index 0772c869f063..000000000000 --- a/security/krb5-16/files/patch-lib::krb5::krb::rd_rep.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/krb5/krb/rd_rep.c.orig Fri Jun 13 17:09:47 2003 -+++ lib/krb5/krb/rd_rep.c Wed Sep 1 11:46:52 2004 -@@ -71,6 +71,8 @@ - - /* now decode the decrypted stuff */ - retval = decode_krb5_ap_rep_enc_part(&scratch, repl); -+ if (retval) -+ goto clean_scratch; - - /* Check reply fields */ - if (((*repl)->ctime != auth_context->authentp->ctime) || diff --git a/security/krb5-16/files/patch-lib::krb5::krb::send_tgs.c b/security/krb5-16/files/patch-lib::krb5::krb::send_tgs.c deleted file mode 100644 index 07b494ffd93e..000000000000 --- a/security/krb5-16/files/patch-lib::krb5::krb::send_tgs.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/krb5/krb/send_tgs.c.orig Thu May 13 12:27:59 2004 -+++ lib/krb5/krb/send_tgs.c Wed Sep 1 11:46:52 2004 -@@ -269,6 +269,8 @@ - if (!tcp_only) { - krb5_error *err_reply; - retval = decode_krb5_error(&rep->response, &err_reply); -+ if (retval) -+ goto send_tgs_error_3; - if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) { - tcp_only = 1; - krb5_free_error(context, err_reply); -@@ -277,6 +279,8 @@ - goto send_again; - } - krb5_free_error(context, err_reply); -+ send_tgs_error_3: -+ ; - } - rep->message_type = KRB5_ERROR; - } else if (krb5_is_tgs_rep(&rep->response)) diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile index 661421f59e83..c70bf1adf75e 100644 --- a/security/krb5-17/Makefile +++ b/security/krb5-17/Makefile @@ -6,8 +6,7 @@ # PORTNAME= krb5 -PORTVERSION= 1.3.4 -PORTREVISION= 2 +PORTVERSION= 1.3.5 CATEGORIES= security # USE_TARBALL tells the port that the user has fetched the source # directly from MIT or crypto-publish.org (CRYTPO-PUBLISH). @@ -21,7 +20,7 @@ PORTREVISION= 5 MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ EXTRACT_SUFX= .tar.gz .else -MASTER_SITES= http://web.mit.edu/kerberos/www/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ +MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ EXTRACT_SUFX= .tar .endif diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo index 48b18a657c5d..e8ef40139095 100644 --- a/security/krb5-17/distinfo +++ b/security/krb5-17/distinfo @@ -1,4 +1,4 @@ -MD5 (krb5-1.3.4.tar) = 33fdee0c5e78f67a18a781dee31e3e19 -SIZE (krb5-1.3.4.tar) = 6369280 +MD5 (krb5-1.3.5.tar) = 8da4179bfd929eebc9f005fb427db1a0 +SIZE (krb5-1.3.5.tar) = 6522880 MD5 (krb5-1.3.1.tar.gz) = 73f868cf65bec56d7c718834ca5665fd SIZE (krb5-1.3.1.tar.gz) = 6157946 diff --git a/security/krb5-17/files/patch-lib::krb5::asn.1::asn1buf.c b/security/krb5-17/files/patch-lib::krb5::asn.1::asn1buf.c deleted file mode 100644 index 6d3da983adc3..000000000000 --- a/security/krb5-17/files/patch-lib::krb5::asn.1::asn1buf.c +++ /dev/null @@ -1,13 +0,0 @@ -*** lib/krb5/asn.1/asn1buf.c 12 Mar 2003 04:33:30 -0000 5.24 ---- lib/krb5/asn.1/asn1buf.c 23 Aug 2004 03:43:47 -0000 -*************** -*** 122,127 **** ---- 122,129 ---- - return ASN1_OVERRUN; - } - while (nestlevel > 0) { -+ if (buf->bound - buf->next + 1 <= 0) -+ return ASN1_OVERRUN; - retval = asn1_get_tag_2(buf, &t); - if (retval) return retval; - if (!t.indef) { diff --git a/security/krb5-17/files/patch-lib::krb5::krb::rd_rep.c b/security/krb5-17/files/patch-lib::krb5::krb::rd_rep.c deleted file mode 100644 index 0772c869f063..000000000000 --- a/security/krb5-17/files/patch-lib::krb5::krb::rd_rep.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/krb5/krb/rd_rep.c.orig Fri Jun 13 17:09:47 2003 -+++ lib/krb5/krb/rd_rep.c Wed Sep 1 11:46:52 2004 -@@ -71,6 +71,8 @@ - - /* now decode the decrypted stuff */ - retval = decode_krb5_ap_rep_enc_part(&scratch, repl); -+ if (retval) -+ goto clean_scratch; - - /* Check reply fields */ - if (((*repl)->ctime != auth_context->authentp->ctime) || diff --git a/security/krb5-17/files/patch-lib::krb5::krb::send_tgs.c b/security/krb5-17/files/patch-lib::krb5::krb::send_tgs.c deleted file mode 100644 index 07b494ffd93e..000000000000 --- a/security/krb5-17/files/patch-lib::krb5::krb::send_tgs.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/krb5/krb/send_tgs.c.orig Thu May 13 12:27:59 2004 -+++ lib/krb5/krb/send_tgs.c Wed Sep 1 11:46:52 2004 -@@ -269,6 +269,8 @@ - if (!tcp_only) { - krb5_error *err_reply; - retval = decode_krb5_error(&rep->response, &err_reply); -+ if (retval) -+ goto send_tgs_error_3; - if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) { - tcp_only = 1; - krb5_free_error(context, err_reply); -@@ -277,6 +279,8 @@ - goto send_again; - } - krb5_free_error(context, err_reply); -+ send_tgs_error_3: -+ ; - } - rep->message_type = KRB5_ERROR; - } else if (krb5_is_tgs_rep(&rep->response)) diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index 661421f59e83..c70bf1adf75e 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -6,8 +6,7 @@ # PORTNAME= krb5 -PORTVERSION= 1.3.4 -PORTREVISION= 2 +PORTVERSION= 1.3.5 CATEGORIES= security # USE_TARBALL tells the port that the user has fetched the source # directly from MIT or crypto-publish.org (CRYTPO-PUBLISH). @@ -21,7 +20,7 @@ PORTREVISION= 5 MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ EXTRACT_SUFX= .tar.gz .else -MASTER_SITES= http://web.mit.edu/kerberos/www/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ +MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ EXTRACT_SUFX= .tar .endif diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo index 48b18a657c5d..e8ef40139095 100644 --- a/security/krb5-appl/distinfo +++ b/security/krb5-appl/distinfo @@ -1,4 +1,4 @@ -MD5 (krb5-1.3.4.tar) = 33fdee0c5e78f67a18a781dee31e3e19 -SIZE (krb5-1.3.4.tar) = 6369280 +MD5 (krb5-1.3.5.tar) = 8da4179bfd929eebc9f005fb427db1a0 +SIZE (krb5-1.3.5.tar) = 6522880 MD5 (krb5-1.3.1.tar.gz) = 73f868cf65bec56d7c718834ca5665fd SIZE (krb5-1.3.1.tar.gz) = 6157946 diff --git a/security/krb5-appl/files/patch-lib::krb5::asn.1::asn1buf.c b/security/krb5-appl/files/patch-lib::krb5::asn.1::asn1buf.c deleted file mode 100644 index 6d3da983adc3..000000000000 --- a/security/krb5-appl/files/patch-lib::krb5::asn.1::asn1buf.c +++ /dev/null @@ -1,13 +0,0 @@ -*** lib/krb5/asn.1/asn1buf.c 12 Mar 2003 04:33:30 -0000 5.24 ---- lib/krb5/asn.1/asn1buf.c 23 Aug 2004 03:43:47 -0000 -*************** -*** 122,127 **** ---- 122,129 ---- - return ASN1_OVERRUN; - } - while (nestlevel > 0) { -+ if (buf->bound - buf->next + 1 <= 0) -+ return ASN1_OVERRUN; - retval = asn1_get_tag_2(buf, &t); - if (retval) return retval; - if (!t.indef) { diff --git a/security/krb5-appl/files/patch-lib::krb5::krb::rd_rep.c b/security/krb5-appl/files/patch-lib::krb5::krb::rd_rep.c deleted file mode 100644 index 0772c869f063..000000000000 --- a/security/krb5-appl/files/patch-lib::krb5::krb::rd_rep.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/krb5/krb/rd_rep.c.orig Fri Jun 13 17:09:47 2003 -+++ lib/krb5/krb/rd_rep.c Wed Sep 1 11:46:52 2004 -@@ -71,6 +71,8 @@ - - /* now decode the decrypted stuff */ - retval = decode_krb5_ap_rep_enc_part(&scratch, repl); -+ if (retval) -+ goto clean_scratch; - - /* Check reply fields */ - if (((*repl)->ctime != auth_context->authentp->ctime) || diff --git a/security/krb5-appl/files/patch-lib::krb5::krb::send_tgs.c b/security/krb5-appl/files/patch-lib::krb5::krb::send_tgs.c deleted file mode 100644 index 07b494ffd93e..000000000000 --- a/security/krb5-appl/files/patch-lib::krb5::krb::send_tgs.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/krb5/krb/send_tgs.c.orig Thu May 13 12:27:59 2004 -+++ lib/krb5/krb/send_tgs.c Wed Sep 1 11:46:52 2004 -@@ -269,6 +269,8 @@ - if (!tcp_only) { - krb5_error *err_reply; - retval = decode_krb5_error(&rep->response, &err_reply); -+ if (retval) -+ goto send_tgs_error_3; - if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) { - tcp_only = 1; - krb5_free_error(context, err_reply); -@@ -277,6 +279,8 @@ - goto send_again; - } - krb5_free_error(context, err_reply); -+ send_tgs_error_3: -+ ; - } - rep->message_type = KRB5_ERROR; - } else if (krb5_is_tgs_rep(&rep->response)) diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 661421f59e83..c70bf1adf75e 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -6,8 +6,7 @@ # PORTNAME= krb5 -PORTVERSION= 1.3.4 -PORTREVISION= 2 +PORTVERSION= 1.3.5 CATEGORIES= security # USE_TARBALL tells the port that the user has fetched the source # directly from MIT or crypto-publish.org (CRYTPO-PUBLISH). @@ -21,7 +20,7 @@ PORTREVISION= 5 MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ EXTRACT_SUFX= .tar.gz .else -MASTER_SITES= http://web.mit.edu/kerberos/www/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ +MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$//}/ EXTRACT_SUFX= .tar .endif diff --git a/security/krb5/distinfo b/security/krb5/distinfo index 48b18a657c5d..e8ef40139095 100644 --- a/security/krb5/distinfo +++ b/security/krb5/distinfo @@ -1,4 +1,4 @@ -MD5 (krb5-1.3.4.tar) = 33fdee0c5e78f67a18a781dee31e3e19 -SIZE (krb5-1.3.4.tar) = 6369280 +MD5 (krb5-1.3.5.tar) = 8da4179bfd929eebc9f005fb427db1a0 +SIZE (krb5-1.3.5.tar) = 6522880 MD5 (krb5-1.3.1.tar.gz) = 73f868cf65bec56d7c718834ca5665fd SIZE (krb5-1.3.1.tar.gz) = 6157946 diff --git a/security/krb5/files/patch-lib::krb5::asn.1::asn1buf.c b/security/krb5/files/patch-lib::krb5::asn.1::asn1buf.c deleted file mode 100644 index 6d3da983adc3..000000000000 --- a/security/krb5/files/patch-lib::krb5::asn.1::asn1buf.c +++ /dev/null @@ -1,13 +0,0 @@ -*** lib/krb5/asn.1/asn1buf.c 12 Mar 2003 04:33:30 -0000 5.24 ---- lib/krb5/asn.1/asn1buf.c 23 Aug 2004 03:43:47 -0000 -*************** -*** 122,127 **** ---- 122,129 ---- - return ASN1_OVERRUN; - } - while (nestlevel > 0) { -+ if (buf->bound - buf->next + 1 <= 0) -+ return ASN1_OVERRUN; - retval = asn1_get_tag_2(buf, &t); - if (retval) return retval; - if (!t.indef) { diff --git a/security/krb5/files/patch-lib::krb5::krb::rd_rep.c b/security/krb5/files/patch-lib::krb5::krb::rd_rep.c deleted file mode 100644 index 0772c869f063..000000000000 --- a/security/krb5/files/patch-lib::krb5::krb::rd_rep.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/krb5/krb/rd_rep.c.orig Fri Jun 13 17:09:47 2003 -+++ lib/krb5/krb/rd_rep.c Wed Sep 1 11:46:52 2004 -@@ -71,6 +71,8 @@ - - /* now decode the decrypted stuff */ - retval = decode_krb5_ap_rep_enc_part(&scratch, repl); -+ if (retval) -+ goto clean_scratch; - - /* Check reply fields */ - if (((*repl)->ctime != auth_context->authentp->ctime) || diff --git a/security/krb5/files/patch-lib::krb5::krb::send_tgs.c b/security/krb5/files/patch-lib::krb5::krb::send_tgs.c deleted file mode 100644 index 07b494ffd93e..000000000000 --- a/security/krb5/files/patch-lib::krb5::krb::send_tgs.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/krb5/krb/send_tgs.c.orig Thu May 13 12:27:59 2004 -+++ lib/krb5/krb/send_tgs.c Wed Sep 1 11:46:52 2004 -@@ -269,6 +269,8 @@ - if (!tcp_only) { - krb5_error *err_reply; - retval = decode_krb5_error(&rep->response, &err_reply); -+ if (retval) -+ goto send_tgs_error_3; - if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) { - tcp_only = 1; - krb5_free_error(context, err_reply); -@@ -277,6 +279,8 @@ - goto send_again; - } - krb5_free_error(context, err_reply); -+ send_tgs_error_3: -+ ; - } - rep->message_type = KRB5_ERROR; - } else if (krb5_is_tgs_rep(&rep->response)) |