pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Pull in change from Heimdal CVS committed on 20051012 ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/620c001849e1
branches: trunk
changeset: 501712:620c001849e1
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Oct 26 16:44:24 2005 +0000
description:
Pull in change from Heimdal CVS committed on 20051012 where the field
in a publicly-exported structure was renamed from "private" to
"opt_private". This allows <krb5.h> to be used by C++ compilers.
Bump the PKGREVISION to 1.
diffstat:
doc/CHANGES | 3 +-
security/heimdal/Makefile | 3 +-
security/heimdal/distinfo | 6 +-
security/heimdal/patches/patch-ag | 13 +++++
security/heimdal/patches/patch-ah | 99 +++++++++++++++++++++++++++++++++++++++
security/heimdal/patches/patch-ai | 41 ++++++++++++++++
security/heimdal/patches/patch-aj | 71 +++++++++++++++++++++++++++
7 files changed, 233 insertions(+), 3 deletions(-)
diffs (283 lines):
diff -r 63e24ab651a2 -r 620c001849e1 doc/CHANGES
--- a/doc/CHANGES Wed Oct 26 15:58:54 2005 +0000
+++ b/doc/CHANGES Wed Oct 26 16:44:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11671 2005/10/26 15:44:17 adam Exp $
+$NetBSD: CHANGES,v 1.11672 2005/10/26 16:44:38 jlam Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -4858,3 +4858,4 @@
Updated databases/openldap to 2.3.11 [jlam 2005-10-26]
Updated security/heimdal to 0.7.1 [jlam 2005-10-26]
Updated net/ntop to 3.2 [adam 2005-10-26]
+ Updated security/heimdal to 0.7.1nb1 [jlam 2005-10-26]
diff -r 63e24ab651a2 -r 620c001849e1 security/heimdal/Makefile
--- a/security/heimdal/Makefile Wed Oct 26 15:58:54 2005 +0000
+++ b/security/heimdal/Makefile Wed Oct 26 16:44:24 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2005/10/26 15:12:45 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2005/10/26 16:44:24 jlam Exp $
DISTNAME= heimdal-0.7.1
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/
diff -r 63e24ab651a2 -r 620c001849e1 security/heimdal/distinfo
--- a/security/heimdal/distinfo Wed Oct 26 15:58:54 2005 +0000
+++ b/security/heimdal/distinfo Wed Oct 26 16:44:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2005/10/26 15:12:45 jlam Exp $
+$NetBSD: distinfo,v 1.16 2005/10/26 16:44:24 jlam Exp $
SHA1 (heimdal-0.7.1.tar.gz) = ab3e6f5fe6de86f7ba7413f8600f9b1ed956b620
RMD160 (heimdal-0.7.1.tar.gz) = 30373d227452e20187ca4bad1dc980c3f952be26
@@ -8,3 +8,7 @@
SHA1 (patch-ad) = a7cfc038e76f8c3da38f8eb0ee48a7f8c7a9c7df
SHA1 (patch-ae) = a9ec9b28a6291786631f900972fe231150d4afe0
SHA1 (patch-af) = c8ef770eba0647d71f3bbbaca1d3fb0eaa7875d2
+SHA1 (patch-ag) = 003307136227d75729fc4d7f95a7debc7e91136e
+SHA1 (patch-ah) = 797785f2f5f1530782d42393d2cc242f03fc20e6
+SHA1 (patch-ai) = 55276d0becee47ae62ccfe5cd837b0fd4d7e6ff6
+SHA1 (patch-aj) = ad30690ce7b7f11a80513df4d3e932bce095d863
diff -r 63e24ab651a2 -r 620c001849e1 security/heimdal/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/heimdal/patches/patch-ag Wed Oct 26 16:44:24 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2005/10/26 16:44:24 jlam Exp $
+
+--- lib/krb5/krb5.h.orig 2005-09-09 08:12:13.000000000 -0400
++++ lib/krb5/krb5.h
+@@ -657,7 +657,7 @@ typedef struct _krb5_get_init_creds_opt
+ krb5_preauthtype *preauth_list;
+ int preauth_list_length;
+ krb5_data *salt;
+- struct _krb5_get_init_creds_opt_private *private;
++ struct _krb5_get_init_creds_opt_private *opt_private;
+ } krb5_get_init_creds_opt;
+
+ #define KRB5_GET_INIT_CREDS_OPT_TKT_LIFE 0x0001
diff -r 63e24ab651a2 -r 620c001849e1 security/heimdal/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/heimdal/patches/patch-ah Wed Oct 26 16:44:24 2005 +0000
@@ -0,0 +1,99 @@
+$NetBSD: patch-ah,v 1.3 2005/10/26 16:44:24 jlam Exp $
+
+--- lib/krb5/init_creds.c.orig 2005-09-09 08:12:13.000000000 -0400
++++ lib/krb5/init_creds.c
+@@ -40,7 +40,7 @@ krb5_get_init_creds_opt_init(krb5_get_in
+ {
+ memset (opt, 0, sizeof(*opt));
+ opt->flags = 0;
+- opt->private = NULL;
++ opt->opt_private = NULL;
+ }
+
+ krb5_error_code KRB5_LIB_FUNCTION
+@@ -56,13 +56,13 @@ krb5_get_init_creds_opt_alloc(krb5_conte
+ return ENOMEM;
+ }
+ krb5_get_init_creds_opt_init(o);
+- o->private = calloc(1, sizeof(*o->private));
+- if (o->private == NULL) {
++ o->opt_private = calloc(1, sizeof(*o->opt_private));
++ if (o->opt_private == NULL) {
+ krb5_set_error_string(context, "out of memory");
+ free(o);
+ return ENOMEM;
+ }
+- o->private->refcount = 1;
++ o->opt_private->refcount = 1;
+ *opt = o;
+ return 0;
+ }
+@@ -82,16 +82,16 @@ _krb5_get_init_creds_opt_copy(krb5_conte
+ }
+ if (in)
+ *opt = *in;
+- if(opt->private == NULL) {
+- opt->private = calloc(1, sizeof(*opt->private));
+- if (opt->private == NULL) {
++ if(opt->opt_private == NULL) {
++ opt->opt_private = calloc(1, sizeof(*opt->opt_private));
++ if (opt->opt_private == NULL) {
+ krb5_set_error_string(context, "out of memory");
+ free(opt);
+ return ENOMEM;
+ }
+- opt->private->refcount = 1;
++ opt->opt_private->refcount = 1;
+ } else
+- opt->private->refcount++;
++ opt->opt_private->refcount++;
+ *out = opt;
+ return 0;
+ }
+@@ -99,13 +99,13 @@ _krb5_get_init_creds_opt_copy(krb5_conte
+ void KRB5_LIB_FUNCTION
+ krb5_get_init_creds_opt_free(krb5_get_init_creds_opt *opt)
+ {
+- if (opt->private == NULL)
++ if (opt->opt_private == NULL)
+ return;
+- if (opt->private->refcount < 1) /* abort ? */
++ if (opt->opt_private->refcount < 1) /* abort ? */
+ return;
+- if (--opt->private->refcount == 0) {
++ if (--opt->opt_private->refcount == 0) {
+ _krb5_get_init_creds_opt_free_pkinit(opt);
+- free(opt->private);
++ free(opt->opt_private);
+ }
+ memset(opt, 0, sizeof(*opt));
+ free(opt);
+@@ -293,7 +293,7 @@ require_ext_opt(krb5_context context,
+ krb5_get_init_creds_opt *opt,
+ const char *type)
+ {
+- if (opt->private == NULL) {
++ if (opt->opt_private == NULL) {
+ krb5_set_error_string(context, "%s on non extendable opt", type);
+ return EINVAL;
+ }
+@@ -310,8 +310,8 @@ krb5_get_init_creds_opt_set_pa_password(
+ ret = require_ext_opt(context, opt, "init_creds_opt_set_pa_password");
+ if (ret)
+ return ret;
+- opt->private->password = password;
+- opt->private->key_proc = key_proc;
++ opt->opt_private->password = password;
++ opt->opt_private->key_proc = key_proc;
+ return 0;
+ }
+
+@@ -324,7 +324,7 @@ krb5_get_init_creds_opt_set_pac_request(
+ ret = require_ext_opt(context, opt, "init_creds_opt_set_pac_req");
+ if (ret)
+ return ret;
+- opt->private->req_pac = req_pac ?
++ opt->opt_private->req_pac = req_pac ?
+ KRB5_PA_PAC_REQ_TRUE :
+ KRB5_PA_PAC_REQ_FALSE;
+ return 0;
diff -r 63e24ab651a2 -r 620c001849e1 security/heimdal/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/heimdal/patches/patch-ai Wed Oct 26 16:44:24 2005 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ai,v 1.1 2005/10/26 16:44:24 jlam Exp $
+
+--- lib/krb5/init_creds_pw.c.orig 2005-09-09 08:12:13.000000000 -0400
++++ lib/krb5/init_creds_pw.c
+@@ -274,11 +274,11 @@ get_init_creds_common(krb5_context conte
+ options = &default_opt;
+ }
+
+- if (options->private) {
+- ctx->password = options->private->password;
+- ctx->key_proc = options->private->key_proc;
+- ctx->req_pac = options->private->req_pac;
+- ctx->pk_init_ctx = options->private->pk_init_ctx;
++ if (options->opt_private) {
++ ctx->password = options->opt_private->password;
++ ctx->key_proc = options->opt_private->key_proc;
++ ctx->req_pac = options->opt_private->req_pac;
++ ctx->pk_init_ctx = options->opt_private->pk_init_ctx;
+ } else
+ ctx->req_pac = KRB5_PA_PAC_DONT_CARE;
+
+@@ -1458,8 +1458,8 @@ krb5_get_init_creds_password(krb5_contex
+ return ret;
+
+ if (password == NULL &&
+- options->private->password == NULL &&
+- options->private->pk_init_ctx == NULL)
++ options->opt_private->password == NULL &&
++ options->opt_private->pk_init_ctx == NULL)
+ {
+ krb5_prompt prompt;
+ krb5_data password_data;
+@@ -1487,7 +1487,7 @@ krb5_get_init_creds_password(krb5_contex
+ password = password_data.data;
+ }
+
+- if (options->private->password == NULL) {
++ if (options->opt_private->password == NULL) {
+ ret = krb5_get_init_creds_opt_set_pa_password(context, options,
+ password, NULL);
+ if (ret) {
diff -r 63e24ab651a2 -r 620c001849e1 security/heimdal/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/heimdal/patches/patch-aj Wed Oct 26 16:44:24 2005 +0000
@@ -0,0 +1,71 @@
+$NetBSD: patch-aj,v 1.1 2005/10/26 16:44:24 jlam Exp $
+
+--- lib/krb5/pkinit.c.orig 2005-09-09 08:12:14.000000000 -0400
++++ lib/krb5/pkinit.c
+@@ -2469,9 +2469,9 @@ _krb5_get_init_creds_opt_free_pkinit(krb
+ #ifdef PKINIT
+ krb5_pk_init_ctx ctx;
+
+- if (opt->private == NULL || opt->private->pk_init_ctx == NULL)
++ if (opt->opt_private == NULL || opt->opt_private->pk_init_ctx == NULL)
+ return;
+- ctx = opt->private->pk_init_ctx;
++ ctx = opt->opt_private->pk_init_ctx;
+ if (ctx->dh)
+ DH_free(ctx->dh);
+ ctx->dh = NULL;
+@@ -2490,7 +2490,7 @@ _krb5_get_init_creds_opt_free_pkinit(krb
+ free(ctx->id);
+ ctx->id = NULL;
+ }
+- opt->private->pk_init_ctx = NULL;
++ opt->opt_private->pk_init_ctx = NULL;
+ #endif
+ }
+
+@@ -2508,28 +2508,28 @@ krb5_get_init_creds_opt_set_pkinit(krb5_
+ #ifdef PKINIT
+ krb5_error_code ret;
+
+- if (opt->private == NULL) {
++ if (opt->opt_private == NULL) {
+ krb5_set_error_string(context, "PKINIT: on non extendable opt");
+ return EINVAL;
+ }
+
+- opt->private->pk_init_ctx = malloc(sizeof(*opt->private->pk_init_ctx));
+- if (opt->private->pk_init_ctx == NULL) {
++ opt->opt_private->pk_init_ctx = malloc(sizeof(*opt->opt_private->pk_init_ctx));
++ if (opt->opt_private->pk_init_ctx == NULL) {
+ krb5_set_error_string(context, "malloc: out of memory");
+ return ENOMEM;
+ }
+- opt->private->pk_init_ctx->dh = NULL;
+- opt->private->pk_init_ctx->id = NULL;
++ opt->opt_private->pk_init_ctx->dh = NULL;
++ opt->opt_private->pk_init_ctx->id = NULL;
+ ret = _krb5_pk_load_openssl_id(context,
+- &opt->private->pk_init_ctx->id,
++ &opt->opt_private->pk_init_ctx->id,
+ user_id,
+ x509_anchors,
+ prompter,
+ prompter_data,
+ password);
+ if (ret) {
+- free(opt->private->pk_init_ctx);
+- opt->private->pk_init_ctx = NULL;
++ free(opt->opt_private->pk_init_ctx);
++ opt->opt_private->pk_init_ctx = NULL;
+ }
+
+ /* XXX */
+@@ -2556,7 +2556,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_
+ _krb5_get_init_creds_opt_free_pkinit(opt);
+ return ENOMEM;
+ }
+- opt->private->pk_init_ctx->dh = dh;
++ opt->opt_private->pk_init_ctx->dh = dh;
+ if (!BN_hex2bn(&dh->p, P)) {
+ _krb5_get_init_creds_opt_free_pkinit(opt);
+ return ENOMEM;
Home |
Main Index |
Thread Index |
Old Index