Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) From: tlyu@mit.edu Subject: SVN Commit RT-Send-CC: X-RT-Original-Encoding: iso-8859-1 Content-Length: 13572 pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk ------------------------------------------------------------------------ r24537 | ghudson | 2010-11-30 12:46:10 -0500 (Tue, 30 Nov 2010) | 5 lines ticket: 6826 Install gssapi_ext.h on Windows. Include gssapi_ext.h in the header files considered by def-check.pl in verify-calling-conventions-gssapi. ------------------------------------------------------------------------ r24535 | ghudson | 2010-11-26 11:37:14 -0500 (Fri, 26 Nov 2010) | 5 lines ticket: 6826 Supply static ordinals for new symbols in gssapi32.def and krb5_32.def, for consistency with KFW 3.x. ------------------------------------------------------------------------ r24534 | ghudson | 2010-11-25 15:34:06 -0500 (Thu, 25 Nov 2010) | 5 lines ticket: 6826 Fix how gssapi.h is rebuilt on Windows; accidentally omitted from r24533. ------------------------------------------------------------------------ r24533 | ghudson | 2010-11-25 15:28:30 -0500 (Thu, 25 Nov 2010) | 29 lines ticket: 6826 subject: Fix Windows build target_version: 1.9 tags: pullup Repair the Windows build. Tested with the prepare-on-Unix method. Some specific changes include: * Removed the IPC finalizer (no longer used after r20787) from ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency chain for the pingtest build in ccapi/test. Also updated pingtest to use the k5_ipc_stream interfaces since cci_stream is gone. * Reverted the apparently non-functional r20277. * klist -V prints just "Kerberos for Windows", since it has no access to PACKAGE_NAME and PACKAGE_VERSION from autoconf. This should be addressed correctly. * krb5, telnet, gssftp, and NIM are removed from the build. * Some files had CRLFs; these were replaced with LFs and the svn:eol-style property set on the files. Otherwise the CRLFs became CRCRLFs after the zip transfer. * Windows does not have opendir/readdir, so added Windows code to prof_parse.c for includedir. Probable fodder for a libkrb5support portability shim. ------------------------------------------------------------------------ r24530 | ghudson | 2010-11-23 13:50:12 -0500 (Tue, 23 Nov 2010) | 3 lines Set svn:eol-style on some Windows files and remove the CRs from their repository representations. ------------------------------------------------------------------------ r24469 | ghudson | 2010-10-21 20:01:56 -0400 (Thu, 21 Oct 2010) | 3 lines Make it possible to override CRYPTO_IMPL_CFLAGS and CRYPTO_IMPL_LIBS at make time. https://github.com/krb5/krb5/commit/ad888de48a064e11f4b88640ac27d4bd166f69dc Commit By: tlyu Revision: 24553 Changed Files: U branches/krb5-1-9/src/Makefile.in U branches/krb5-1-9/src/appl/Makefile.in U branches/krb5-1-9/src/appl/gss-sample/Makefile.in U branches/krb5-1-9/src/appl/sample/Makefile.in U branches/krb5-1-9/src/appl/sample/sclient/Makefile.in U branches/krb5-1-9/src/appl/sample/sserver/Makefile.in U branches/krb5-1-9/src/appl/simple/Makefile.in U branches/krb5-1-9/src/appl/simple/client/Makefile.in U branches/krb5-1-9/src/appl/simple/server/Makefile.in U branches/krb5-1-9/src/appl/user_user/Makefile.in U branches/krb5-1-9/src/ccapi/Makefile.in U branches/krb5-1-9/src/ccapi/common/Makefile.in U branches/krb5-1-9/src/ccapi/common/unix/Makefile.in U branches/krb5-1-9/src/ccapi/lib/Makefile.in U branches/krb5-1-9/src/ccapi/lib/ccapi_context.c U branches/krb5-1-9/src/ccapi/lib/ccapi_ipc.c U branches/krb5-1-9/src/ccapi/lib/ccapi_ipc.h U branches/krb5-1-9/src/ccapi/lib/ccapi_os_ipc.h U branches/krb5-1-9/src/ccapi/lib/mac/ccapi_os_ipc.c U branches/krb5-1-9/src/ccapi/lib/unix/Makefile.in U branches/krb5-1-9/src/ccapi/lib/win/Makefile.in U branches/krb5-1-9/src/ccapi/lib/win/WINCCAPI.sln U branches/krb5-1-9/src/ccapi/lib/win/WINCCAPI.vcproj U branches/krb5-1-9/src/ccapi/lib/win/ccapi_os_ipc.cxx U branches/krb5-1-9/src/ccapi/lib/win/debug.exports U branches/krb5-1-9/src/ccapi/server/Makefile.in U branches/krb5-1-9/src/ccapi/server/unix/Makefile.in U branches/krb5-1-9/src/ccapi/server/win/Makefile.in U branches/krb5-1-9/src/ccapi/server/win/Server.sln U branches/krb5-1-9/src/ccapi/server/win/Server.vcproj U branches/krb5-1-9/src/ccapi/server/win/WorkItem.cpp U branches/krb5-1-9/src/ccapi/server/win/WorkQueue.cpp U branches/krb5-1-9/src/ccapi/server/win/ccs_os_server.cpp U branches/krb5-1-9/src/ccapi/test/Makefile.in U branches/krb5-1-9/src/ccapi/test/pingtest.c U branches/krb5-1-9/src/clients/Makefile.in U branches/krb5-1-9/src/clients/kdestroy/Makefile.in U branches/krb5-1-9/src/clients/kinit/Makefile.in U branches/krb5-1-9/src/clients/kinit/kinit.c U branches/krb5-1-9/src/clients/klist/Makefile.in U branches/krb5-1-9/src/clients/klist/klist.c U branches/krb5-1-9/src/clients/kpasswd/Makefile.in U branches/krb5-1-9/src/clients/ksu/Makefile.in U branches/krb5-1-9/src/clients/kvno/Makefile.in U branches/krb5-1-9/src/config/pre.in U branches/krb5-1-9/src/config/win-post.in U branches/krb5-1-9/src/config/win-pre.in U branches/krb5-1-9/src/include/Makefile.in U branches/krb5-1-9/src/include/k5-int.h U branches/krb5-1-9/src/include/win-mac.h U branches/krb5-1-9/src/kadmin/cli/Makefile.in U branches/krb5-1-9/src/kadmin/dbutil/Makefile.in U branches/krb5-1-9/src/kadmin/ktutil/Makefile.in U branches/krb5-1-9/src/kadmin/server/Makefile.in U branches/krb5-1-9/src/kadmin/testing/Makefile.in U branches/krb5-1-9/src/kadmin/testing/scripts/Makefile.in U branches/krb5-1-9/src/kadmin/testing/util/Makefile.in U branches/krb5-1-9/src/lib/Makefile.in U branches/krb5-1-9/src/lib/apputils/Makefile.in U branches/krb5-1-9/src/lib/crypto/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/aes/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/camellia/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/des/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/enc_provider/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/enc_provider/camellia.c U branches/krb5-1-9/src/lib/crypto/builtin/hash_provider/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/md4/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/md5/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/sha1/Makefile.in U branches/krb5-1-9/src/lib/crypto/builtin/sha2/Makefile.in U branches/krb5-1-9/src/lib/crypto/crypto_tests/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/arcfour/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/checksum/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/crc32/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/dk/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/old/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/prf/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/prng/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/prng/fortuna/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/prng/nss/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/prng/yarrow/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/rand2key/Makefile.in U branches/krb5-1-9/src/lib/crypto/krb/raw/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/aes/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/camellia/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/des/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/enc_provider/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/hash_provider/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/md4/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/md5/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/sha1/Makefile.in U branches/krb5-1-9/src/lib/crypto/nss/sha2/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/aes/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/camellia/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/des/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/enc_provider/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/hash_provider/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/md4/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/md5/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/sha1/Makefile.in U branches/krb5-1-9/src/lib/crypto/openssl/sha2/Makefile.in U branches/krb5-1-9/src/lib/gssapi/Makefile.in U branches/krb5-1-9/src/lib/gssapi/generic/Makefile.in U branches/krb5-1-9/src/lib/gssapi/krb5/Makefile.in U branches/krb5-1-9/src/lib/gssapi/krb5/copy_ccache.c U branches/krb5-1-9/src/lib/gssapi/krb5/get_tkt_flags.c U branches/krb5-1-9/src/lib/gssapi/krb5/gssapiP_krb5.h U branches/krb5-1-9/src/lib/gssapi/krb5/gssapi_krb5.c U branches/krb5-1-9/src/lib/gssapi/krb5/krb5_gss_glue.c U branches/krb5-1-9/src/lib/gssapi/krb5/lucid_context.c U branches/krb5-1-9/src/lib/gssapi/krb5/set_allowable_enctypes.c U branches/krb5-1-9/src/lib/gssapi/krb5/set_ccache.c U branches/krb5-1-9/src/lib/gssapi/mechglue/Makefile.in U branches/krb5-1-9/src/lib/gssapi/mechglue/g_mechattr.c U branches/krb5-1-9/src/lib/gssapi/mechglue/g_oid_ops.c U branches/krb5-1-9/src/lib/gssapi/mechglue/g_store_cred.c U branches/krb5-1-9/src/lib/gssapi/mechglue/mglueP.h U branches/krb5-1-9/src/lib/gssapi/spnego/Makefile.in U branches/krb5-1-9/src/lib/gssapi/spnego/gssapiP_spnego.h U branches/krb5-1-9/src/lib/gssapi/spnego/spnego_mech.c U branches/krb5-1-9/src/lib/gssapi32.def U branches/krb5-1-9/src/lib/kadm5/Makefile.in U branches/krb5-1-9/src/lib/kadm5/clnt/Makefile.in U branches/krb5-1-9/src/lib/kadm5/srv/Makefile.in U branches/krb5-1-9/src/lib/kadm5/unit-test/Makefile.in U branches/krb5-1-9/src/lib/kdb/Makefile.in U branches/krb5-1-9/src/lib/krb5/Makefile.in U branches/krb5-1-9/src/lib/krb5/asn.1/Makefile.in U branches/krb5-1-9/src/lib/krb5/asn.1/krb5_decode.c U branches/krb5-1-9/src/lib/krb5/ccache/Makefile.in U branches/krb5-1-9/src/lib/krb5/ccache/ccapi/Makefile.in U branches/krb5-1-9/src/lib/krb5/error_tables/Makefile.in U branches/krb5-1-9/src/lib/krb5/keytab/Makefile.in U branches/krb5-1-9/src/lib/krb5/krb/Makefile.in U branches/krb5-1-9/src/lib/krb5/krb/auth_con.c U branches/krb5-1-9/src/lib/krb5/krb/get_creds.c U branches/krb5-1-9/src/lib/krb5/krb/kfree.c U branches/krb5-1-9/src/lib/krb5/os/Makefile.in U branches/krb5-1-9/src/lib/krb5/os/hst_realm.c U branches/krb5-1-9/src/lib/krb5/rcache/Makefile.in U branches/krb5-1-9/src/lib/krb5/unicode/Makefile.in U branches/krb5-1-9/src/lib/krb5_32.def U branches/krb5-1-9/src/lib/rpc/Makefile.in U branches/krb5-1-9/src/lib/rpc/unit-test/Makefile.in U branches/krb5-1-9/src/lib/win_glue.c U branches/krb5-1-9/src/plugins/authdata/greet/Makefile.in U branches/krb5-1-9/src/plugins/authdata/greet_client/Makefile.in U branches/krb5-1-9/src/plugins/authdata/greet_server/Makefile.in U branches/krb5-1-9/src/plugins/kadm5_hook/test/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/btree/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/db/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/hash/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/mpool/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/recno/Makefile.in U branches/krb5-1-9/src/plugins/kdb/db2/libdb2/test/Makefile.in U branches/krb5-1-9/src/plugins/kdb/hdb/Makefile.in U branches/krb5-1-9/src/plugins/kdb/ldap/Makefile.in U branches/krb5-1-9/src/plugins/kdb/ldap/ldap_util/Makefile.in U branches/krb5-1-9/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in U branches/krb5-1-9/src/plugins/locate/python/Makefile.in U branches/krb5-1-9/src/plugins/preauth/cksum_body/Makefile.in U branches/krb5-1-9/src/plugins/preauth/encrypted_challenge/Makefile.in U branches/krb5-1-9/src/plugins/preauth/pkinit/Makefile.in U branches/krb5-1-9/src/plugins/preauth/securid_sam2/Makefile.in U branches/krb5-1-9/src/plugins/preauth/wpse/Makefile.in U branches/krb5-1-9/src/tests/asn.1/Makefile.in U branches/krb5-1-9/src/tests/create/Makefile.in U branches/krb5-1-9/src/tests/dejagnu/Makefile.in U branches/krb5-1-9/src/tests/gss-threads/Makefile.in U branches/krb5-1-9/src/tests/gssapi/Makefile.in U branches/krb5-1-9/src/tests/hammer/Makefile.in U branches/krb5-1-9/src/tests/misc/Makefile.in U branches/krb5-1-9/src/tests/mkeystash_compat/Makefile.in U branches/krb5-1-9/src/tests/resolve/Makefile.in U branches/krb5-1-9/src/tests/shlib/Makefile.in U branches/krb5-1-9/src/tests/threads/Makefile.in U branches/krb5-1-9/src/tests/verify/Makefile.in U branches/krb5-1-9/src/util/Makefile.in U branches/krb5-1-9/src/util/collected-client-lib/Makefile.in U branches/krb5-1-9/src/util/et/Makefile.in U branches/krb5-1-9/src/util/profile/Makefile.in U branches/krb5-1-9/src/util/profile/prof_parse.c U branches/krb5-1-9/src/util/send-pr/Makefile.in U branches/krb5-1-9/src/util/ss/Makefile.in U branches/krb5-1-9/src/util/support/Makefile.in U branches/krb5-1-9/src/windows/Makefile.in U branches/krb5-1-9/src/windows/README U branches/krb5-1-9/src/windows/build/bkw.pl D branches/krb5-1-9/src/windows/ntsecapitest.c D branches/krb5-1-9/src/windows/ntsecapitest.pl