aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--security/krb5-16/Makefile12
-rw-r--r--security/krb5-16/distinfo3
-rw-r--r--security/krb5-16/files/patch-kdc::kdc_preauth.c16
-rw-r--r--security/krb5-16/files/patch-lib::rpc::xdr_array.c20
-rw-r--r--security/krb5-17/Makefile12
-rw-r--r--security/krb5-17/distinfo3
-rw-r--r--security/krb5-17/files/patch-kdc::kdc_preauth.c16
-rw-r--r--security/krb5-17/files/patch-lib::rpc::xdr_array.c20
-rw-r--r--security/krb5-appl/Makefile12
-rw-r--r--security/krb5-appl/distinfo3
-rw-r--r--security/krb5-appl/files/patch-kdc::kdc_preauth.c16
-rw-r--r--security/krb5-appl/files/patch-lib::rpc::xdr_array.c20
-rw-r--r--security/krb5/Makefile12
-rw-r--r--security/krb5/distinfo3
-rw-r--r--security/krb5/files/patch-kdc::kdc_preauth.c16
-rw-r--r--security/krb5/files/patch-lib::rpc::xdr_array.c20
16 files changed, 36 insertions, 168 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 54537d1bcaa2..6542d43aba70 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/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-16/distinfo b/security/krb5-16/distinfo
index 7fb8cb4d4695..6942bcbb70b0 100644
--- a/security/krb5-16/distinfo
+++ b/security/krb5-16/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-16/files/patch-kdc::kdc_preauth.c b/security/krb5-16/files/patch-kdc::kdc_preauth.c
deleted file mode 100644
index 4e84ee941e85..000000000000
--- a/security/krb5-16/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-16/files/patch-lib::rpc::xdr_array.c b/security/krb5-16/files/patch-lib::rpc::xdr_array.c
deleted file mode 100644
index be9be37eada6..000000000000
--- a/security/krb5-16/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;
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;
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 54537d1bcaa2..6542d43aba70 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/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-appl/distinfo b/security/krb5-appl/distinfo
index 7fb8cb4d4695..6942bcbb70b0 100644
--- a/security/krb5-appl/distinfo
+++ b/security/krb5-appl/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-appl/files/patch-kdc::kdc_preauth.c b/security/krb5-appl/files/patch-kdc::kdc_preauth.c
deleted file mode 100644
index 4e84ee941e85..000000000000
--- a/security/krb5-appl/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-appl/files/patch-lib::rpc::xdr_array.c b/security/krb5-appl/files/patch-lib::rpc::xdr_array.c
deleted file mode 100644
index be9be37eada6..000000000000
--- a/security/krb5-appl/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;
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 54537d1bcaa2..6542d43aba70 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/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/distinfo b/security/krb5/distinfo
index 7fb8cb4d4695..6942bcbb70b0 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/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/files/patch-kdc::kdc_preauth.c b/security/krb5/files/patch-kdc::kdc_preauth.c
deleted file mode 100644
index 4e84ee941e85..000000000000
--- a/security/krb5/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/files/patch-lib::rpc::xdr_array.c b/security/krb5/files/patch-lib::rpc::xdr_array.c
deleted file mode 100644
index be9be37eada6..000000000000
--- a/security/krb5/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;