[src/trunk]: src/crypto/external/bsd/heimdal Update build framework for lates...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/heimdal Update build framework for lates...
From: pettai <pettai%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 18:28:17 +0000
details:   https://anonhg.NetBSD.org/src/rev/6e2b8064cfed
branches:  trunk
changeset: 328918:6e2b8064cfed
user:      pettai <pettai%NetBSD.org@localhost>
date:      Thu Apr 24 13:50:53 2014 +0000

description:
Update build framework for latest heimdal-1-5-branch

Ok'ed and reviewed by elric@

diffstat:

 crypto/external/bsd/heimdal/bin/krb5-config/Makefile  |    4 +-
 crypto/external/bsd/heimdal/include/config.h          |   39 +-
 crypto/external/bsd/heimdal/include/gsskrb5-private.h |   33 +-
 crypto/external/bsd/heimdal/include/hx509-private.h   |    2 +-
 crypto/external/bsd/heimdal/include/kdc-private.h     |    8 +-
 crypto/external/bsd/heimdal/include/krb5-private.h    |   54 ++-
 crypto/external/bsd/heimdal/include/krb5-protos.h     |  338 ++++++++++-------
 crypto/external/bsd/heimdal/include/krb5-types.h      |   10 +-
 crypto/external/bsd/heimdal/include/ntlm-private.h    |    8 +-
 crypto/external/bsd/heimdal/include/roken.h           |    2 +
 crypto/external/bsd/heimdal/include/version.h         |    4 +-
 crypto/external/bsd/heimdal/lib/libgssapi/Makefile    |    9 +-
 crypto/external/bsd/heimdal/lib/libkrb5/Makefile      |    4 +-
 13 files changed, 351 insertions(+), 164 deletions(-)

diffs (truncated from 1332 to 300 lines):

diff -r 8e33ca2560ee -r 6e2b8064cfed crypto/external/bsd/heimdal/bin/krb5-config/Makefile
--- a/crypto/external/bsd/heimdal/bin/krb5-config/Makefile      Thu Apr 24 13:45:33 2014 +0000
+++ b/crypto/external/bsd/heimdal/bin/krb5-config/Makefile      Thu Apr 24 13:50:53 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/04/12 18:08:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2014/04/24 13:50:53 pettai Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,7 +12,7 @@
 
 krb5-config: krb5-config.in
        ${TOOL_SED} -e "s!@PACKAGE\@!heimdal!g" \
-               -e "s!@VERSION\@!1.5pre1!g" \
+               -e "s!@VERSION\@!1.5.3!g" \
                -e "s!@prefix\@!/!g" \
                -e "s!@exec_prefix\@!/!g" \
                -e "s!@libdir\@!/usr/lib!g" \
diff -r 8e33ca2560ee -r 6e2b8064cfed crypto/external/bsd/heimdal/include/config.h
--- a/crypto/external/bsd/heimdal/include/config.h      Thu Apr 24 13:45:33 2014 +0000
+++ b/crypto/external/bsd/heimdal/include/config.h      Thu Apr 24 13:50:53 2014 +0000
@@ -143,6 +143,9 @@
 /* Define to 1 if you have the `atexit' function. */
 #define HAVE_ATEXIT 1
 
+/* Define to 1 if you have the `backtrace' function. */
+/* #undef HAVE_BACKTRACE */
+
 /* Define to 1 if you have the <bind/bitypes.h> header file. */
 /* #undef HAVE_BIND_BITYPES_H */
 
@@ -212,6 +215,9 @@
 /* Define to 1 if you have the <db5/db.h> header file. */
 /* #undef HAVE_DB5_DB_H */
 
+/* Define to 1 if you have the <db6/db.h> header file. */
+/* #undef HAVE_DB6_DB_H */
+
 /* Define if you have user supplied header location */
 /* #undef HAVE_DBHEADER */
 
@@ -224,9 +230,6 @@
 /* Define to 1 if you have the `dbopen' function. */
 #define HAVE_DBOPEN 1
 
-/* Define to 1 if you have the <db_185.h> header file. */
-/* #undef HAVE_DB_185_H */
-
 /* Define to 1 if you have the `db_create' function. */
 /* #undef HAVE_DB_CREATE */
 
@@ -341,6 +344,9 @@
 /* Define if you have the function `estrdup'. */
 #define HAVE_ESTRDUP 1
 
+/* Define to 1 if you have the <execinfo.h> header file. */
+#undef HAVE_EXECINFO_H
+
 /* Define if you have the function `fchown'. */
 #define HAVE_FCHOWN 1
 
@@ -720,6 +726,9 @@
 /* Define if you want support for cache in sqlite. */
 /* #undef HAVE_SCC */
 
+/* Define to 1 if you have the <search.h> header file. */
+/* #undef HAVE_SEARCH_H */
+
 /* Define to 1 if you have the <security/pam_modules.h> header file. */
 #define HAVE_SECURITY_PAM_MODULES_H 1
 
@@ -810,6 +819,9 @@
 /* Define to 1 if the system has the type `socklen_t'. */
 #define HAVE_SOCKLEN_T 1
 
+/* Define if you want support for sqlite in Heimdal. */
+/* #undef HAVE_SQLITE3 */
+
 /* Define to 1 if the system has the type `ssize_t'. */
 #define HAVE_SSIZE_T 1
 
@@ -1101,6 +1113,9 @@
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #define HAVE_SYS_WAIT_H 1
 
+/* Define to 1 if you have the `tdelete' function. */
+/* #undef HAVE_TDELETE */
+
 /* Define to 1 if you have the <termcap.h> header file. */
 #define HAVE_TERMCAP_H 1
 
@@ -1113,6 +1128,9 @@
 /* Define to 1 if you have the <term.h> header file. */
 #define HAVE_TERM_H 1
 
+/* Define to 1 if you have the `tfind' function. */
+/* #undef HAVE_TFIND */
+
 /* Define to 1 if you have the `tgetent' function. */
 #define HAVE_TGETENT 1
 
@@ -1128,12 +1146,18 @@
 /* Define to 1 if you have the <tmpdir.h> header file. */
 /* #undef HAVE_TMPDIR_H */
 
+/* Define if you have the function `tsearch'. */
+/* #undef HAVE_TSEARCH 1 */
+
 /* Define to 1 if you have the `ttyname' function. */
 #define HAVE_TTYNAME 1
 
 /* Define to 1 if you have the `ttyslot' function. */
 #define HAVE_TTYSLOT 1
 
+/* Define to 1 if you have the `twalk' function. */
+/* #undef HAVE_TWALK */
+
 /* Define to 1 if you have the <udb.h> header file. */
 /* #undef HAVE_UDB_H */
 
@@ -1298,7 +1322,7 @@
 #define KRB5 1
 
 /* Define to enable kx509. */
-/* #undef KX509 */
+#define KX509 1
 
 /* path to lib */
 #define LIBDIR "/usr/lib"
@@ -1444,7 +1468,7 @@
 #define PACKAGE_NAME "Heimdal"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Heimdal 1.5pre1"
+#define PACKAGE_STRING "Heimdal 1.5.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "heimdal"
@@ -1453,7 +1477,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5pre1"
+#define PACKAGE_VERSION "1.5.3"
 
 /* Define to enable PKINIT. */
 #define PKINIT 1
@@ -1535,6 +1559,9 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
+/* Define to get POSIX getpwnam_r in some systems. */
+/* #undef _POSIX_PTHREAD_SEMANTICS */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
diff -r 8e33ca2560ee -r 6e2b8064cfed crypto/external/bsd/heimdal/include/gsskrb5-private.h
--- a/crypto/external/bsd/heimdal/include/gsskrb5-private.h     Thu Apr 24 13:45:33 2014 +0000
+++ b/crypto/external/bsd/heimdal/include/gsskrb5-private.h     Thu Apr 24 13:50:53 2014 +0000
@@ -193,7 +193,7 @@
        const gss_buffer_t /*token_buffer*/,
        gss_qop_t * /*qop_state*/,
        krb5_keyblock */*key*/,
-       char */*type*/);
+       const char */*type*/);
 
 OM_uint32
 _gssapi_verify_mic_cfx (
@@ -300,6 +300,17 @@
        OM_uint32 * time_rec );
 
 OM_uint32 GSSAPI_CALLCONV
+_gsskrb5_acquire_cred_ext (
+       OM_uint32 * /*minor_status*/,
+       const gss_name_t /*desired_name*/,
+       gss_const_OID /*credential_type*/,
+       const void */*credential_data*/,
+       OM_uint32 /*time_req*/,
+       gss_const_OID /*desired_mech*/,
+       gss_cred_usage_t /*cred_usage*/,
+       gss_cred_id_t * output_cred_handle );
+
+OM_uint32 GSSAPI_CALLCONV
 _gsskrb5_add_cred (
         OM_uint32 */*minor_status*/,
        const gss_cred_id_t /*input_cred_handle*/,
@@ -313,6 +324,13 @@
        OM_uint32 */*initiator_time_rec*/,
        OM_uint32 */*acceptor_time_rec*/);
 
+OM_uint32 GSSAPI_CALLCONV
+_gsskrb5_authorize_localname (
+       OM_uint32 */*minor_status*/,
+       const gss_name_t /*input_name*/,
+       gss_const_buffer_t /*user_name*/,
+       gss_const_OID /*user_name_type*/);
+
 OM_uint32
 _gsskrb5_canon_name (
        OM_uint32 */*minor_status*/,
@@ -599,6 +617,13 @@
        const gss_OID /*mech*/);
 
 OM_uint32 GSSAPI_CALLCONV
+_gsskrb5_pname_to_uid (
+       OM_uint32 */*minor_status*/,
+       const gss_name_t /*pname*/,
+       const gss_OID /*mech_type*/,
+       uid_t */*uidp*/);
+
+OM_uint32 GSSAPI_CALLCONV
 _gsskrb5_process_context_token (
         OM_uint32 */*minor_status*/,
        const gss_ctx_id_t /*context_handle*/,
@@ -614,7 +639,9 @@
        gss_buffer_t /*prf_out*/);
 
 OM_uint32
-_gsskrb5_register_acceptor_identity (const char */*identity*/);
+_gsskrb5_register_acceptor_identity (
+       OM_uint32 */*min_stat*/,
+       const char */*identity*/);
 
 OM_uint32
 _gsskrb5_release_buffer (
@@ -702,7 +729,7 @@
        const gss_buffer_t /*message_buffer*/,
        const gss_buffer_t /*token_buffer*/,
        gss_qop_t * /*qop_state*/,
-       char * type );
+       const char * type );
 
 OM_uint32 GSSAPI_CALLCONV
 _gsskrb5_wrap (
diff -r 8e33ca2560ee -r 6e2b8064cfed crypto/external/bsd/heimdal/include/hx509-private.h
--- a/crypto/external/bsd/heimdal/include/hx509-private.h       Thu Apr 24 13:45:33 2014 +0000
+++ b/crypto/external/bsd/heimdal/include/hx509-private.h       Thu Apr 24 13:50:53 2014 +0000
@@ -425,7 +425,7 @@
 _hx509_revoke_ref (hx509_revoke_ctx /*ctx*/);
 
 void
-_hx509_sel_yyerror (char */*s*/);
+_hx509_sel_yyerror (const char */*s*/);
 
 int
 _hx509_self_signed_valid (
diff -r 8e33ca2560ee -r 6e2b8064cfed crypto/external/bsd/heimdal/include/kdc-private.h
--- a/crypto/external/bsd/heimdal/include/kdc-private.h Thu Apr 24 13:45:33 2014 +0000
+++ b/crypto/external/bsd/heimdal/include/kdc-private.h Thu Apr 24 13:50:53 2014 +0000
@@ -57,7 +57,7 @@
        krb5_kdc_configuration */*config*/,
        krb5_const_principal /*principal*/,
        unsigned /*flags*/,
-       krb5int32 */*kvno_ptr*/,
+       krb5uint32 */*kvno_ptr*/,
        HDB **/*db*/,
        hdb_entry_ex **/*h*/);
 
@@ -98,9 +98,12 @@
 krb5_error_code
 _kdc_find_etype (
        krb5_context /*context*/,
-       const hdb_entry_ex */*princ*/,
+       krb5_boolean /*use_strongest_session_key*/,
+       krb5_boolean /*is_preauth*/,
+       hdb_entry_ex */*princ*/,
        krb5_enctype */*etypes*/,
        unsigned /*len*/,
+       krb5_enctype */*ret_enctype*/,
        Key **/*ret_key*/);
 
 const PA_DATA*
@@ -159,6 +162,7 @@
 _kdc_pac_verify (
        krb5_context /*context*/,
        const krb5_principal /*client_principal*/,
+       const krb5_principal /*delegated_proxy_principal*/,
        hdb_entry_ex */*client*/,
        hdb_entry_ex */*server*/,
        hdb_entry_ex */*krbtgt*/,
diff -r 8e33ca2560ee -r 6e2b8064cfed crypto/external/bsd/heimdal/include/krb5-private.h
--- a/crypto/external/bsd/heimdal/include/krb5-private.h        Thu Apr 24 13:45:33 2014 +0000
+++ b/crypto/external/bsd/heimdal/include/krb5-private.h        Thu Apr 24 13:50:53 2014 +0000
@@ -8,6 +8,25 @@
 #define __attribute__(x)
 #endif
 
+#ifndef KRB5_DEPRECATED_FUNCTION
+#ifndef __has_extension
+#define __has_extension(x) 0
+#define KRB5_DEPRECATED_FUNCTIONhas_extension 1
+#endif
+#if __has_extension(attribute_deprecated_with_message)
+#define KRB5_DEPRECATED_FUNCTION(x) __attribute__((__deprecated__(x)))
+#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
+#define KRB5_DEPRECATED_FUNCTION(X) __attribute__((__deprecated__))
+#else
+#define KRB5_DEPRECATED_FUNCTION(X)
+#endif
Prev by Date: [src/trunk]: src/sys/arch/hp300/dev Pull random notes on the Apollo Domain ke...
Next by Date: [src/trunk]: src/crypto/external/bsd/heimdal/dist/lib/roken remove duplicate ...
Previous by Thread: [src/trunk]: src/sys/arch/hp300/dev Pull random notes on the Apollo Domain ke...
Next by Thread: [src/trunk]: src/crypto/external/bsd/heimdal/dist/lib/roken remove duplicate ...
Indexes:
Home | Main Index | Thread Index | Old Index