Built against submodules

2024-11-27 18:12:02 +00:00 · 2020-07-22 22:04:33 +00:00 · 2020-07-22 22:04:33 +00:00 · 8cd51af951
commit 8cd51af951
parent 017a433403
9 changed files with 424 additions and 22 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -180,3 +180,9 @@
 [submodule "contrib/stats"]
 	path = contrib/stats
 	url = https://github.com/kthohr/stats.git
+[submodule "contrib/krb5"]
+	path = contrib/krb5
+	url = https://github.com/krb5/krb5
+[submodule "contrib/cyrus-sasl"]
+	path = contrib/cyrus-sasl
+	url = https://github.com/cyrusimap/cyrus-sasl
--- a/contrib/cyrus-sasl
+++ b/contrib/cyrus-sasl
@ -0,0 +1 @@
+Subproject commit 6054630889fd1cd8d0659573d69badcee1e23a00
--- a/contrib/cyrus-sasl-cmake/CMakeLists.txt
+++ b/contrib/cyrus-sasl-cmake/CMakeLists.txt
@ -4,7 +4,7 @@ add_library(${CYRUS_SASL_LIBRARY})

 target_sources(${CYRUS_SASL_LIBRARY} PRIVATE
    ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapi.c
-    ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c
+    # ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c
    ${CYRUS_SASL_SOURCE_DIR}/common/plugin_common.c
    ${CYRUS_SASL_SOURCE_DIR}/lib/common.c
    ${CYRUS_SASL_SOURCE_DIR}/lib/canonusr.c
--- a/contrib/krb5
+++ b/contrib/krb5
@ -0,0 +1 @@
+Subproject commit 99f7ad2831a01f264c07eed42a0a3a9336b86184
--- a/contrib/krb5-cmake/CMakeLists.txt
+++ b/contrib/krb5-cmake/CMakeLists.txt
@ -1,8 +1,6 @@
 set(KRB5_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/krb5/src)

-add_library(krb5)
-
-target_sources(krb5 PRIVATE
+set(ALL_SRCS
    ${KRB5_SOURCE_DIR}/util/et/et_name.c
    ${KRB5_SOURCE_DIR}/util/et/com_err.c
    ${KRB5_SOURCE_DIR}/util/et/error_message.c
@ -68,6 +66,7 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_saslname.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_process_context.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_encapsulate_token.c
+    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_negoex.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/delete_sec_context.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/lucid_context.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/duplicate_name.c
@ -132,14 +131,20 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_seqstate.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_errmap.c
    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/rel_buffer.c
+
    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/spnego_mech.c
+    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_util.c
+    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_ctx.c
+
+    # ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_trace.c
+
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prng.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_cmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_cbc.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_cbc.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enctype_util.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_etm.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/combine_keys.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/combine_keys.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/default_state.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/decrypt_iov.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_dk_cmac.c
@ -147,10 +152,10 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/old_api_glue.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/cksumtypes.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_cmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_old.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_old.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/decrypt.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_dk.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_des.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_des.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_unkeyed.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/crypto_length.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/block_size.c
@ -160,7 +165,7 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/derive.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/random_to_key.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum_iov.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_confounder.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_confounder.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_length.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_hmac.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/make_checksum.c
@ -197,7 +202,7 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_rc4.c
    ${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_pbkdf2.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/aes.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/rc4.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des3.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c
@ -206,7 +211,7 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/pbkdf2.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/init.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/stubs.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_crc32.c
+    # ${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_crc32.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_evp.c
    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/des/des_keys.c
    ${KRB5_SOURCE_DIR}/util/support/fake-addrinfo.c
@ -228,6 +233,7 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/util/support/gmt_mktime.c
    ${KRB5_SOURCE_DIR}/util/support/zap.c
    ${KRB5_SOURCE_DIR}/util/support/bcmp.c
+    ${KRB5_SOURCE_DIR}/util/support/secure_getenv.c
    ${KRB5_SOURCE_DIR}/util/profile/prof_tree.c
    ${KRB5_SOURCE_DIR}/util/profile/prof_file.c
    ${KRB5_SOURCE_DIR}/util/profile/prof_parse.c
@ -347,6 +353,9 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/krb5/krb/pac.c
    ${KRB5_SOURCE_DIR}/lib/krb5/krb/valid_times.c
    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_data.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/krb/padata.c
+
+
    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm.c
    ${KRB5_SOURCE_DIR}/lib/krb5/os/thread_safe.c
    ${KRB5_SOURCE_DIR}/lib/krb5/os/krbfileio.c
@ -394,7 +403,14 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/krb5/os/lock_file.c
    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect.c
    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_realm.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ser_cc.c
+    # ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ser_cc.c
+
+    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/t_cc.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/t_cccol.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/t_cccol.py
+    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/t_cccursor.c
+
+
    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccdefops.c
    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_retr.c
    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_k5identity.c
@ -418,37 +434,165 @@ target_sources(krb5 PRIVATE
    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktremove.c
    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/read_servi.c
    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/kt_file.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/kt_srvtab.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/read_servi.c
    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktfr_entry.c
+
+
+
    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/k5e1_err.c
    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kdb5_err.c
    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/asn1_err.c
    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb5_err.c
    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb524_err.c
    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kv5m_err.c
+
+
+
    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_base.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_conv.c
    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_dfl.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rcdef.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/ser_rc.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_file2.c
    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_none.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rcfns.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_io.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/memrcache.c
+    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucdata/ucdata.c
    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucstr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucdata.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/urestubs.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/ure.c
    ${KRB5_SOURCE_DIR}/lib/krb5/asn.1/asn1_encode.c
    ${KRB5_SOURCE_DIR}/lib/krb5/asn.1/asn1_k_encode.c
    ${KRB5_SOURCE_DIR}/lib/krb5/asn.1/ldap_key_seq.c
    ${KRB5_SOURCE_DIR}/lib/krb5/krb5_libinit.c
 )

+add_custom_command(
+    OUTPUT ${KRB5_SOURCE_DIR}/util/et/compile_et
+    COMMAND /bin/sh
+    ./config_script
+    ./compile_et.sh
+    "/usr/local/share/et"
+    gawk
+    sed
+    >
+    compile_et
+    DEPENDS ${KRB5_SOURCE_DIR}/util/et/compile_et.sh ${KRB5_SOURCE_DIR}/util/et/config_script
+    WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/util/et"
+)
+
+add_custom_target(
+    CREATE_COMPILE_ET ALL
+    DEPENDS ${KRB5_SOURCE_DIR}/util/et/compile_et
+    COMMENT "creating compile_et"
+    VERBATIM
+)
+
+file(GLOB_RECURSE ET_FILES
+    # LIST_DIRECTORIES false
+    # RELATIVE ${KRB5_SOURCE_DIR}
+    # CONFIGURE_DEPENDS
+    "${KRB5_SOURCE_DIR}/*.et"
+)
+
+function(preprocess_et out_var)
+  set(result)
+  foreach(in_f ${ARGN})
+    string(REPLACE
+        .et
+        .c
+        F_C
+        ${in_f}
+    )
+
+    get_filename_component(ET_PATH ${in_f} DIRECTORY)
+    # add_dependencies(
+    #     ${F_C}
+    #     ${KRB5_SOURCE_DIR}/util/et/compile_et
+    # )
+
+    add_custom_command(OUTPUT ${F_C}
+      COMMAND perl ${KRB5_SOURCE_DIR}/util/et/compile_et -d "${KRB5_SOURCE_DIR}/util/et" ${in_f}
+      DEPENDS ${in_f} ${KRB5_SOURCE_DIR}/util/et/compile_et
+      WORKING_DIRECTORY ${ET_PATH}
+      COMMENT "Creating preprocessed file ${F_C}"
+      VERBATIM
+      )
+    list(APPEND result ${F_C})
+  endforeach()
+  set(${out_var} "${result}" PARENT_SCOPE)
+endfunction()
+
+# add_dependencies(
+#     ${ET_FILES}
+#     compile_et
+#     )
+
+
+add_custom_command(
+    OUTPUT ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h
+    COMMAND perl
+    -I../../../util
+    ../../../util/gen-map.pl
+    -oerror_map.h
+    NAME=gsserrmap
+    KEY=OM_uint32
+    VALUE=char*
+    COMPARE=compare_OM_uint32
+    FREEVALUE=free_string
+    WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/lib/gssapi/krb5"
+)
+
+
+add_custom_target(
+    ERROR_MAP_H ALL
+    DEPENDS ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h
+    COMMENT "generating error_map.h"
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h
+    COMMAND perl -w -I../../../util  ../../../util/gen.pl bimap errmap.h NAME=mecherrmap LEFT=OM_uint32 RIGHT=struct\ mecherror LEFTPRINT=print_OM_uint32 RIGHTPRINT=mecherror_print LEFTCMP=cmp_OM_uint32 RIGHTCMP=mecherror_cmp
+    WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/lib/gssapi/generic"
+)
+
+
+add_custom_target(
+    ERRMAP_H ALL
+    DEPENDS ${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h
+    COMMENT "generating errmap.h"
+    VERBATIM
+)
+
+
+
+
+
+add_library(krb5)
+
+add_dependencies(
+    krb5
+    ERRMAP_H
+    ERROR_MAP_H
+    )
+
+preprocess_et(processed_et_files ${ET_FILES})
+
+target_sources(krb5 PRIVATE
+    ${ALL_SRCS}
+    )
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi)
+
+file(GLOB GSSAPI_GENERIC_HEADERS
+  ${KRB5_SOURCE_DIR}/lib/gssapi/generic/*.h
+)
+file(COPY ${GSSAPI_GENERIC_HEADERS}
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/
+    )
+
 target_include_directories(krb5 PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}  #for autoconf.h
+    ${CMAKE_CURRENT_BINARY_DIR}/include
    ${KRB5_SOURCE_DIR}
    ${KRB5_SOURCE_DIR}/include
    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue
+    ${KRB5_SOURCE_DIR}/lib/
    ${KRB5_SOURCE_DIR}/lib/gssapi
    ${KRB5_SOURCE_DIR}/lib/gssapi/generic
    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5
--- a/contrib/krb5-cmake/krb5/krb5.h
+++ b/contrib/krb5-cmake/krb5/krb5.h
@ -0,0 +1,12 @@
+#ifndef KRB5_KRB5_H_INCLUDED
+#define KRB5_KRB5_H_INCLUDED
+
+#include "krb5/krb5.hin"
+#include "lib/krb5/error_tables/krb5_err.h"
+#include "lib/krb5/error_tables/k5e1_err.h"
+#include "lib/krb5/error_tables/kdb5_err.h"
+#include "lib/krb5/error_tables/kv5m_err.h"
+#include "lib/krb5/error_tables/krb524_err.h"
+#include "lib/krb5/error_tables/asn1_err.h"
+
+#endif /* KRB5_KRB5_H_INCLUDED */
--- a/contrib/krb5-cmake/osconf.h
+++ b/contrib/krb5-cmake/osconf.h
@ -0,0 +1,141 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 1990,1991,2008 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ */
+
+/* Site- and OS- dependent configuration */
+
+#ifndef KRB5_OSCONF__
+#define KRB5_OSCONF__
+
+#if !defined(_WIN32)
+/* Don't try to pull in autoconf.h for Windows, since it's not used */
+#ifndef KRB5_AUTOCONF__
+#define KRB5_AUTOCONF__
+#include "autoconf.h"
+#endif
+#endif
+
+#if defined(__MACH__) && defined(__APPLE__)
+# include <TargetConditionals.h>
+#endif
+
+#if defined(_WIN32)
+#define DEFAULT_PROFILE_FILENAME "krb5.ini"
+#else /* !_WINDOWS */
+#if TARGET_OS_MAC
+#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:/usr/local/etc/krb5.conf"
+#define DEFAULT_PROFILE_PATH        ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH)
+#define KRB5_PLUGIN_BUNDLE_DIR       "/System/Library/KerberosPlugins/KerberosFrameworkPlugins"
+#define KDB5_PLUGIN_BUNDLE_DIR       "/System/Library/KerberosPlugins/KerberosDatabasePlugins"
+#define KRB5_AUTHDATA_PLUGIN_BUNDLE_DIR  "/System/Library/KerberosPlugins/KerberosAuthDataPlugins"
+#else
+#define DEFAULT_SECURE_PROFILE_PATH     "/etc/krb5.conf:/usr/local/etc/krb5.conf"
+#define DEFAULT_PROFILE_PATH        DEFAULT_SECURE_PROFILE_PATH
+#endif
+#endif /* _WINDOWS  */
+
+#ifdef _WIN32
+#define DEFAULT_PLUGIN_BASE_DIR "%{LIBDIR}\\plugins"
+#else
+#define DEFAULT_PLUGIN_BASE_DIR "/usr/local/lib/krb5/plugins"
+#endif
+
+#if defined(_WIN64)
+#define PLUGIN_EXT              "64.dll"
+#elif defined(_WIN32)
+#define PLUGIN_EXT              "32.dll"
+#else
+#define PLUGIN_EXT              ".so"
+#endif
+
+#define KDC_DIR                 "/usr/local/var/krb5kdc"
+#define KDC_RUN_DIR             "/run/krb5kdc"
+#define DEFAULT_KDB_FILE        KDC_DIR "/principal"
+#define DEFAULT_KEYFILE_STUB    KDC_DIR "/.k5."
+#define KRB5_DEFAULT_ADMIN_ACL  KDC_DIR "/krb5_adm.acl"
+/* Used by old admin server */
+#define DEFAULT_ADMIN_ACL       KDC_DIR "/kadm_old.acl"
+
+/* Location of KDC profile */
+#define DEFAULT_KDC_PROFILE     KDC_DIR "/kdc.conf"
+#define KDC_PROFILE_ENV         "KRB5_KDC_PROFILE"
+
+#if TARGET_OS_MAC
+#define DEFAULT_KDB_LIB_PATH    { KDB5_PLUGIN_BUNDLE_DIR, "/usr/local/lib/krb5/plugins/kdb", NULL }
+#else
+#define DEFAULT_KDB_LIB_PATH    { "/usr/local/lib/krb5/plugins/kdb", NULL }
+#endif
+
+#define DEFAULT_KDC_ENCTYPE     ENCTYPE_AES256_CTS_HMAC_SHA1_96
+#define KDCRCACHE               "dfl:krb5kdc_rcache"
+
+#define KDC_PORTNAME            "kerberos" /* for /etc/services or equiv. */
+
+#define KRB5_DEFAULT_PORT       88
+
+#define DEFAULT_KPASSWD_PORT    464
+
+#define DEFAULT_KDC_UDP_PORTLIST "88"
+#define DEFAULT_KDC_TCP_PORTLIST "88"
+#define DEFAULT_TCP_LISTEN_BACKLOG 5
+
+/*
+ * Defaults for the KADM5 admin system.
+ */
+#define DEFAULT_KADM5_KEYTAB    KDC_DIR "/kadm5.keytab"
+#define DEFAULT_KADM5_ACL_FILE  KDC_DIR "/kadm5.acl"
+#define DEFAULT_KADM5_PORT      749 /* assigned by IANA */
+
+#define KRB5_DEFAULT_SUPPORTED_ENCTYPES                 \
+    "aes256-cts-hmac-sha1-96:normal "                   \
+    "aes128-cts-hmac-sha1-96:normal"
+
+#define MAX_DGRAM_SIZE  65536
+
+#define RCTMPDIR        "/var/tmp" /* directory to store replay caches */
+
+#define KRB5_PATH_TTY   "/dev/tty"
+#define KRB5_PATH_LOGIN "/usr/local/sbin/login.krb5"
+#define KRB5_PATH_RLOGIN "/usr/local/bin/rlogin"
+
+#define KRB5_ENV_CCNAME "KRB5CCNAME"
+
+/*
+ * krb5 replica support follows
+ */
+
+#define KPROP_DEFAULT_FILE KDC_DIR "/replica_datatrans"
+#define KPROPD_DEFAULT_FILE KDC_DIR "/from_master"
+#define KPROPD_DEFAULT_KDB5_UTIL "/usr/local/sbin/kdb5_util"
+#define KPROPD_DEFAULT_KPROP "/usr/local/sbin/kprop"
+#define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
+#define KPROPD_ACL_FILE KDC_DIR "/kpropd.acl"
+
+/*
+ * GSS mechglue
+ */
+#define MECH_CONF "/usr/local/etc/gss/mech"
+#define MECH_LIB_PREFIX "/usr/local/lib/gss/"
+
+#endif /* KRB5_OSCONF__ */
--- a/contrib/krb5-cmake/profile.h
+++ b/contrib/krb5-cmake/profile.h
@ -0,0 +1,2 @@
+#include "util/profile/profile.hin"
+#include "util/profile/prof_err.h"
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@ -0,0 +1,95 @@
+// Originally generated by ./configure
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+#define ARCH "x86_64"
+#define BUILT_WITH "GCC GXX PKGCONFIG OSXLD LIBDL PLUGINS ZLIB SSL SASL_CYRUS ZSTD HDRHISTOGRAM LZ4_EXT SNAPPY SOCKEM SASL_SCRAM CRC32C_HW"
+
+#define CPU "generic"
+#define WITHOUT_OPTIMIZATION 0
+#define ENABLE_DEVEL 0
+#define ENABLE_VALGRIND 0
+#define ENABLE_REFCNT_DEBUG 0
+#define ENABLE_SHAREDPTR_DEBUG 0
+#define ENABLE_LZ4_EXT 1
+#define ENABLE_SSL 1
+#define ENABLE_SASL 1
+#define MKL_APP_NAME "librdkafka"
+#define MKL_APP_DESC_ONELINE "The Apache Kafka C/C++ library"
+// distro
+#define SOLIB_EXT ".so"
+// gcc
+//#define WITH_GCC 1
+// gxx
+//#define WITH_GXX 1
+// pkgconfig
+//#define WITH_PKGCONFIG 1
+// install
+//#define WITH_INSTALL 1
+// PIC
+//#define HAVE_PIC 1
+// gnulib
+//#define WITH_GNULD 1
+// __atomic_32
+#define HAVE_ATOMICS_32 1
+// __atomic_32
+#define HAVE_ATOMICS_32_ATOMIC 1
+// atomic_32
+#define ATOMIC_OP32(OP1,OP2,PTR,VAL) __atomic_ ## OP1 ## _ ## OP2(PTR, VAL, __ATOMIC_SEQ_CST)
+// __atomic_64
+#define HAVE_ATOMICS_64 1
+// __atomic_64
+#define HAVE_ATOMICS_64_ATOMIC 1
+// atomic_64
+#define ATOMIC_OP64(OP1,OP2,PTR,VAL) __atomic_ ## OP1 ## _ ## OP2(PTR, VAL, __ATOMIC_SEQ_CST)
+// atomic_64
+#define ATOMIC_OP(OP1,OP2,PTR,VAL) __atomic_ ## OP1 ## _ ## OP2(PTR, VAL, __ATOMIC_SEQ_CST)
+// parseversion
+#define RDKAFKA_VERSION_STR "0.11.4"
+// parseversion
+#define MKL_APP_VERSION "0.11.4"
+// libdl
+#define WITH_LIBDL 1
+// WITH_PLUGINS
+#define WITH_PLUGINS 1
+// zlib
+#define WITH_ZLIB 1
+// zstd
+#define WITH_ZSTD 1
+// WITH_SNAPPY
+#define WITH_SNAPPY 1
+// WITH_SOCKEM
+#define WITH_SOCKEM 1
+// libssl
+#define WITH_SSL 1
+// WITH_SASL_SCRAM
+#define WITH_SASL_SCRAM 1
+// WITH_SASL_OAUTHBEARER
+#define WITH_SASL_OAUTHBEARER 1
+#cmakedefine WITH_SASL_CYRUS 1
+// crc32chw
+#if !defined(__PPC__)
+#define WITH_CRC32C_HW 1
+#endif
+// regex
+#define HAVE_REGEX 1
+// strndup
+#define HAVE_STRNDUP 1
+// strerror_r
+#define HAVE_STRERROR_R 1
+
+#ifdef __APPLE__
+// pthread_setname_np
+#define HAVE_PTHREAD_SETNAME_DARWIN 1
+#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ <= 101400)
+#define _TTHREAD_EMULATE_TIMESPEC_GET_
+#endif
+
+#else
+// pthread_setname_gnu
+#define HAVE_PTHREAD_SETNAME_GNU 1
+#endif
+// python
+//#define HAVE_PYTHON 1
+// disable C11 threads for compatibility with old libc
+//#define WITH_C11THREADS 1
+#endif /* _CONFIG_H_ */
				`@ -0,0 +1 @@`
				`Subproject commit 6054630889fd1cd8d0659573d69badcee1e23a00`
				`@ -0,0 +1 @@`
				`Subproject commit 99f7ad2831a01f264c07eed42a0a3a9336b86184`