Date: Wed, 7 May 2008 14:57:37 +0100 From: Doug Rabson <dfr@rabson.org> To: Doug Rabson <dfr@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 src/crypto/heimdal FREEBSD-Xlist acinclude.m4 ltconfig mkinstalldirs src/crypto/heimdal/admin ktutil_locl.h src/crypto/heimdal/appl/ftp/ftp ftp_locl.h src/crypto/heimdal/appl/su Makefile.am su.c src/crypto/heimdal/cf ... Message-ID: <836B6ECB-4374-4B2C-AFD4-6C00F38A4496@rabson.org> In-Reply-To: <200805071353.m47DrFir025984@repoman.freebsd.org> References: <200805071353.m47DrFir025984@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This includes one change to Heimdal which has already been committed upstream. Apart from that the only differences to vendor code in src/ crypto/heimdal are $FreeBSD$ tags. I don't currently plan to merge this work back to RELENG_7, mostly because it needs a long settling time in current. I may revisit that decision in a couple of months time. I don't believe I've broken the build but if so, I'll sort it out as soon as I hear about it. On 7 May 2008, at 14:53, Doug Rabson wrote: > dfr 2008-05-07 13:53:12 UTC > > FreeBSD src repository > > Modified files: > . Makefile.inc1 > crypto/heimdal FREEBSD-Xlist > crypto/heimdal/admin ktutil_locl.h > crypto/heimdal/appl/ftp/ftp ftp_locl.h > crypto/heimdal/appl/su Makefile.am su.c > crypto/heimdal/kadmin kadmin_locl.h > crypto/heimdal/kdc headers.h > crypto/heimdal/lib/gssapi/spnego accept_sec_context.c > spnego_locl.h > crypto/heimdal/lib/hdb hdb_locl.h > crypto/heimdal/lib/krb5 crypto.c krb5_locl.h > etc/gss mech > gnu/usr.bin/cvs/cvs Makefile > include/gssapi gssapi.h > kerberos5 Makefile.inc > kerberos5/include config.h crypto-headers.h > kerberos5/lib Makefile Makefile.inc > kerberos5/lib/libasn1 Makefile > kerberos5/lib/libhdb Makefile > kerberos5/lib/libkadm5clnt Makefile > kerberos5/lib/libkadm5srv Makefile > kerberos5/lib/libkafs5 Makefile > kerberos5/lib/libkrb5 Makefile > kerberos5/lib/libroken Makefile > kerberos5/libexec Makefile > kerberos5/libexec/hprop Makefile > kerberos5/libexec/hpropd Makefile > kerberos5/libexec/ipropd-master Makefile > kerberos5/libexec/ipropd-slave Makefile > kerberos5/libexec/kadmind Makefile > kerberos5/libexec/kdc Makefile > kerberos5/libexec/kpasswdd Makefile > kerberos5/tools Makefile > kerberos5/tools/asn1_compile Makefile > kerberos5/usr.bin/kadmin Makefile > kerberos5/usr.bin/kdestroy Makefile > kerberos5/usr.bin/kinit Makefile > kerberos5/usr.bin/klist Makefile > kerberos5/usr.bin/kpasswd Makefile > kerberos5/usr.bin/ksu Makefile > kerberos5/usr.bin/verify_krb5_conf Makefile > kerberos5/usr.sbin/kstash Makefile > kerberos5/usr.sbin/ktutil Makefile > lib/libgssapi Makefile context.h cred.h > gss_accept_sec_context.c > gss_acquire_cred.c gss_add_cred.c > gss_canonicalize_name.c > gss_compare_name.c > gss_create_empty_oid_set.c > gss_delete_sec_context.c > gss_display_name.c gss_display_status.c > gss_duplicate_name.c gss_export_name.c > gss_export_sec_context.c gss_get_mic.c > gss_import_name.c > gss_import_sec_context.c > gss_indicate_mechs.c > gss_init_sec_context.c > gss_inquire_context.c gss_inquire_cred.c > gss_inquire_cred_by_mech.c > gss_inquire_mechs_for_name.c > gss_inquire_names_for_mech.c > gss_mech_switch.c gss_names.c > gss_release_buffer.c gss_release_cred.c > gss_release_name.c gss_release_oid_set.c > gss_test_oid_set_member.c gss_unseal.c > gss_utils.c gss_verify.c gss_verify_mic.c > gss_wrap.c gss_wrap_size_limit.c mech.5 > mech_switch.h name.h utils.h > lib/libpam/modules/pam_krb5 Makefile > libexec/telnetd Makefile > secure/lib/libssh Makefile > secure/usr.sbin/sshd Makefile > share/mk bsd.libnames.mk > usr.bin/telnet Makefile > Added files: > crypto/heimdal acinclude.m4 > kerberos5/lib/libgssapi_krb5 Makefile gss_krb5.c prefix.c > kerberos5/lib/libgssapi_ntlm Makefile prefix.c > kerberos5/lib/libgssapi_spnego Makefile prefix.c > kerberos5/lib/libheimntlm Makefile > kerberos5/lib/libhx509 Makefile > kerberos5/libexec/kcm Makefile > kerberos5/tools/slc Makefile > lib/libgssapi Symbol.map gss_buffer_set.c > gss_decapsulate_token.c > gss_duplicate_oid.c > gss_encapsulate_token.c > gss_inquire_cred_by_oid.c > gss_inquire_sec_context_by_oid.c > gss_oid_to_str.c gss_pseudo_random.c > gss_release_oid.c gss_set_cred_option.c > gss_set_sec_context_option.c > Removed files: > crypto/heimdal ltconfig mkinstalldirs > crypto/heimdal/cf broken-getnameinfo.m4 > check-declaration.m4 > crypto/heimdal/kadmin version4.c > crypto/heimdal/kuser kauth_options.c kinit_options.c > crypto/heimdal/lib/asn1 gen.h x509.asn1 > crypto/heimdal/lib/gssapi 8003.c accept_sec_context.c > acquire_cred.c add_cred.c > add_oid_set_member.c > address_to_krb5addr.c arcfour.c > arcfour.h canonicalize_name.c > compare_name.c compat.c > context_time.c copy_ccache.c > create_emtpy_oid_set.c decapsulate.c > delete_sec_context.c display_name.c > display_status.c duplicate_name.c > encapsulate.c export_name.c > export_sec_context.c external.c > get_mic.c gssapi_locl.h > import_name.c import_sec_context.c > indicate_mechs.c init.c > init_sec_context.c inquire_context.c > inquire_cred.c > inquire_cred_by_mech.c > inquire_mechs_for_name.c > inquire_names_for_mech.c > process_context_token.c > release_buffer.c release_cred.c > release_name.c release_oid_set.c > test_oid_set_member.c unwrap.c v1.c > verify_mic.c wrap.c > crypto/heimdal/lib/hdb convert_db.c > crypto/heimdal/lib/kadm5 dump_log.c replay_log.c > truncate_log.c > crypto/heimdal/lib/krb5 dump_config.c krb5_build_principal.3 > krb5_free_addresses.3 > krb5_free_principal.3 > krb5_principal_get_realm.3 > krb5_sname_to_principal.3 > crypto/heimdal/lib/roken acconfig.h acinclude.m4 > print_version.c resource.h > crypto/heimdal/tools build.sh > kerberos5/lib/libgssapi Makefile > Log: > Fix conflicts after heimdal-1.1 import and add build > infrastructure. Import > all non-style changes made by heimdal to our own libgssapi. > > Revision Changes Path > 1.604 +10 -4 src/Makefile.inc1 > 1.3 +3 -0 src/crypto/heimdal/FREEBSD-Xlist > 1.3 +10 -0 src/crypto/heimdal/acinclude.m4 (new) > 1.8 +4 -12 src/crypto/heimdal/admin/ktutil_locl.h > 1.7 +1 -1 src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h > 1.4 +7 -4 src/crypto/heimdal/appl/su/Makefile.am > 1.4 +127 -56 src/crypto/heimdal/appl/su/su.c > 1.2 +0 -28 src/crypto/heimdal/cf/broken-getnameinfo.m4 > (dead) > 1.2 +0 -25 src/crypto/heimdal/cf/check-declaration.m4 > (dead) > 1.8 +28 -63 src/crypto/heimdal/kadmin/kadmin_locl.h > 1.2 +0 -985 src/crypto/heimdal/kadmin/version4.c (dead) > 1.8 +10 -9 src/crypto/heimdal/kdc/headers.h > 1.2 +0 -40 src/crypto/heimdal/kuser/kauth_options.c (dead) > 1.2 +0 -40 src/crypto/heimdal/kuser/kinit_options.c (dead) > 1.2 +0 -38 src/crypto/heimdal/lib/asn1/gen.h (dead) > 1.2 +0 -23 src/crypto/heimdal/lib/asn1/x509.asn1 (dead) > 1.2 +0 -152 src/crypto/heimdal/lib/gssapi/8003.c (dead) > 1.2 +0 -242 src/crypto/heimdal/lib/gssapi/ > accept_sec_context.c (dead) > 1.2 +0 -87 src/crypto/heimdal/lib/gssapi/acquire_cred.c > (dead) > 1.2 +0 -216 src/crypto/heimdal/lib/gssapi/add_cred.c (dead) > 1.2 +0 -54 src/crypto/heimdal/lib/gssapi/ > add_oid_set_member.c (dead) > 1.2 +0 -75 src/crypto/heimdal/lib/gssapi/ > address_to_krb5addr.c (dead) > 1.2 +0 -623 src/crypto/heimdal/lib/gssapi/arcfour.c (dead) > 1.2 +0 -98 src/crypto/heimdal/lib/gssapi/arcfour.h (dead) > 1.2 +0 -46 src/crypto/heimdal/lib/gssapi/ > canonicalize_name.c (dead) > 1.2 +0 -49 src/crypto/heimdal/lib/gssapi/compare_name.c > (dead) > 1.2 +0 -113 src/crypto/heimdal/lib/gssapi/compat.c (dead) > 1.2 +0 -64 src/crypto/heimdal/lib/gssapi/context_time.c > (dead) > 1.2 +0 -56 src/crypto/heimdal/lib/gssapi/copy_ccache.c > (dead) > 1.2 +0 -50 src/crypto/heimdal/lib/gssapi/ > create_emtpy_oid_set.c (dead) > 1.2 +0 -100 src/crypto/heimdal/lib/gssapi/decapsulate.c > (dead) > 1.2 +0 -64 src/crypto/heimdal/lib/gssapi/ > delete_sec_context.c (dead) > 1.2 +0 -68 src/crypto/heimdal/lib/gssapi/display_name.c > (dead) > 1.2 +0 -135 src/crypto/heimdal/lib/gssapi/display_status.c > (dead) > 1.2 +0 -55 src/crypto/heimdal/lib/gssapi/duplicate_name.c > (dead) > 1.2 +0 -100 src/crypto/heimdal/lib/gssapi/encapsulate.c > (dead) > 1.2 +0 -48 src/crypto/heimdal/lib/gssapi/export_name.c > (dead) > 1.2 +0 -142 src/crypto/heimdal/lib/gssapi/ > export_sec_context.c (dead) > 1.2 +0 -212 src/crypto/heimdal/lib/gssapi/external.c (dead) > 1.2 +0 -115 src/crypto/heimdal/lib/gssapi/get_mic.c (dead) > 1.3 +0 -180 src/crypto/heimdal/lib/gssapi/gssapi_locl.h > (dead) > 1.2 +0 -137 src/crypto/heimdal/lib/gssapi/import_name.c > (dead) > 1.2 +0 -180 src/crypto/heimdal/lib/gssapi/ > import_sec_context.c (dead) > 1.2 +0 -55 src/crypto/heimdal/lib/gssapi/indicate_mechs.c > (dead) > 1.2 +0 -43 src/crypto/heimdal/lib/gssapi/init.c (dead) > 1.2 +0 -360 src/crypto/heimdal/lib/gssapi/ > init_sec_context.c (dead) > 1.2 +0 -84 src/crypto/heimdal/lib/gssapi/ > inquire_context.c (dead) > 1.2 +0 -78 src/crypto/heimdal/lib/gssapi/inquire_cred.c > (dead) > 1.2 +0 -80 src/crypto/heimdal/lib/gssapi/ > inquire_cred_by_mech.c (dead) > 1.2 +0 -57 src/crypto/heimdal/lib/gssapi/ > inquire_mechs_for_name.c (dead) > 1.2 +0 -80 src/crypto/heimdal/lib/gssapi/ > inquire_names_for_mech.c (dead) > 1.2 +0 -65 src/crypto/heimdal/lib/gssapi/ > process_context_token.c (dead) > 1.2 +0 -46 src/crypto/heimdal/lib/gssapi/release_buffer.c > (dead) > 1.2 +0 -57 src/crypto/heimdal/lib/gssapi/release_cred.c > (dead) > 1.2 +0 -47 src/crypto/heimdal/lib/gssapi/release_name.c > (dead) > 1.2 +0 -46 src/crypto/heimdal/lib/gssapi/ > release_oid_set.c (dead) > 1.2 +22 -16 src/crypto/heimdal/lib/gssapi/spnego/ > accept_sec_context.c > 1.2 +1 -1 src/crypto/heimdal/lib/gssapi/spnego/ > spnego_locl.h > 1.2 +0 -57 src/crypto/heimdal/lib/gssapi/ > test_oid_set_member.c (dead) > 1.2 +0 -190 src/crypto/heimdal/lib/gssapi/unwrap.c (dead) > 1.2 +0 -104 src/crypto/heimdal/lib/gssapi/v1.c (dead) > 1.2 +0 -124 src/crypto/heimdal/lib/gssapi/verify_mic.c > (dead) > 1.2 +0 -169 src/crypto/heimdal/lib/gssapi/wrap.c (dead) > 1.2 +0 -219 src/crypto/heimdal/lib/hdb/convert_db.c (dead) > 1.9 +4 -1 src/crypto/heimdal/lib/hdb/hdb_locl.h > 1.2 +0 -262 src/crypto/heimdal/lib/kadm5/dump_log.c (dead) > 1.2 +0 -118 src/crypto/heimdal/lib/kadm5/replay_log.c (dead) > 1.2 +0 -88 src/crypto/heimdal/lib/kadm5/truncate_log.c > (dead) > 1.11 +994 -576 src/crypto/heimdal/lib/krb5/crypto.c > 1.2 +0 -71 src/crypto/heimdal/lib/krb5/dump_config.c (dead) > 1.2 +0 -78 src/crypto/heimdal/lib/krb5/ > krb5_build_principal.3 (dead) > 1.2 +0 -20 src/crypto/heimdal/lib/krb5/ > krb5_free_addresses.3 (dead) > 1.2 +0 -30 src/crypto/heimdal/lib/krb5/ > krb5_free_principal.3 (dead) > 1.10 +132 -2 src/crypto/heimdal/lib/krb5/krb5_locl.h > 1.2 +0 -48 src/crypto/heimdal/lib/krb5/ > krb5_principal_get_realm.3 (dead) > 1.2 +0 -58 src/crypto/heimdal/lib/krb5/ > krb5_sname_to_principal.3 (dead) > 1.2 +0 -36 src/crypto/heimdal/lib/roken/acconfig.h (dead) > 1.2 +0 -9 src/crypto/heimdal/lib/roken/acinclude.m4 (dead) > 1.2 +0 -78 src/crypto/heimdal/lib/roken/print_version.c > (dead) > 1.2 +0 -15 src/crypto/heimdal/lib/roken/resource.h (dead) > 1.2 +0 -2101 src/crypto/heimdal/ltconfig (dead) > 1.2 +0 -40 src/crypto/heimdal/mkinstalldirs (dead) > 1.2 +0 -212 src/crypto/heimdal/tools/build.sh (dead) > 1.3 +3 -1 src/etc/gss/mech > 1.53 +2 -2 src/gnu/usr.bin/cvs/cvs/Makefile > 1.2 +94 -13 src/include/gssapi/gssapi.h > 1.28 +4 -1 src/kerberos5/Makefile.inc > 1.16 +224 -151 src/kerberos5/include/config.h > 1.3 +8 -0 src/kerberos5/include/crypto-headers.h > 1.11 +4 -2 src/kerberos5/lib/Makefile > 1.9 +1 -1 src/kerberos5/lib/Makefile.inc > 1.24 +402 -9 src/kerberos5/lib/libasn1/Makefile > 1.13 +0 -58 src/kerberos5/lib/libgssapi/Makefile (dead) > 1.1 +79 -0 src/kerberos5/lib/libgssapi_krb5/Makefile (new) > 1.1 +831 -0 src/kerberos5/lib/libgssapi_krb5/gss_krb5.c > (new) > 1.1 +33 -0 src/kerberos5/lib/libgssapi_krb5/prefix.c (new) > 1.1 +44 -0 src/kerberos5/lib/libgssapi_ntlm/Makefile (new) > 1.1 +33 -0 src/kerberos5/lib/libgssapi_ntlm/prefix.c (new) > 1.1 +48 -0 src/kerberos5/lib/libgssapi_spnego/Makefile > (new) > 1.1 +45 -0 src/kerberos5/lib/libgssapi_spnego/prefix.c > (new) > 1.19 +18 -5 src/kerberos5/lib/libhdb/Makefile > 1.1 +11 -0 src/kerberos5/lib/libheimntlm/Makefile (new) > 1.1 +103 -0 src/kerberos5/lib/libhx509/Makefile (new) > 1.9 +2 -1 src/kerberos5/lib/libkadm5clnt/Makefile > 1.8 +1 -0 src/kerberos5/lib/libkadm5srv/Makefile > 1.10 +1 -1 src/kerberos5/lib/libkafs5/Makefile > 1.18 +62 -15 src/kerberos5/lib/libkrb5/Makefile > 1.18 +4 -1 src/kerberos5/lib/libroken/Makefile > 1.7 +1 -1 src/kerberos5/libexec/Makefile > 1.16 +9 -3 src/kerberos5/libexec/hprop/Makefile > 1.16 +3 -3 src/kerberos5/libexec/hpropd/Makefile > 1.18 +6 -3 src/kerberos5/libexec/ipropd-master/Makefile > 1.18 +3 -3 src/kerberos5/libexec/ipropd-slave/Makefile > 1.19 +2 -2 src/kerberos5/libexec/kadmind/Makefile > 1.1 +33 -0 src/kerberos5/libexec/kcm/Makefile (new) > 1.18 +13 -4 src/kerberos5/libexec/kdc/Makefile > 1.19 +3 -3 src/kerberos5/libexec/kpasswdd/Makefile > 1.3 +1 -1 src/kerberos5/tools/Makefile > 1.8 +5 -2 src/kerberos5/tools/asn1_compile/Makefile > 1.1 +34 -0 src/kerberos5/tools/slc/Makefile (new) > 1.19 +17 -4 src/kerberos5/usr.bin/kadmin/Makefile > 1.16 +2 -2 src/kerberos5/usr.bin/kdestroy/Makefile > 1.16 +2 -2 src/kerberos5/usr.bin/kinit/Makefile > 1.16 +2 -2 src/kerberos5/usr.bin/klist/Makefile > 1.15 +2 -2 src/kerberos5/usr.bin/kpasswd/Makefile > 1.18 +2 -2 src/kerberos5/usr.bin/ksu/Makefile > 1.4 +2 -2 src/kerberos5/usr.bin/verify_krb5_conf/Makefile > 1.17 +3 -3 src/kerberos5/usr.sbin/kstash/Makefile > 1.18 +11 -3 src/kerberos5/usr.sbin/ktutil/Makefile > 1.4 +47 -34 src/lib/libgssapi/Makefile > 1.1 +69 -0 src/lib/libgssapi/Symbol.map (new) > 1.2 +1 -0 src/lib/libgssapi/context.h > 1.2 +0 -1 src/lib/libgssapi/cred.h > 1.5 +144 -76 src/lib/libgssapi/gss_accept_sec_context.c > 1.3 +18 -11 src/lib/libgssapi/gss_acquire_cred.c > 1.3 +30 -16 src/lib/libgssapi/gss_add_cred.c > 1.1 +126 -0 src/lib/libgssapi/gss_buffer_set.c (new) > 1.3 +6 -5 src/lib/libgssapi/gss_canonicalize_name.c > 1.2 +8 -3 src/lib/libgssapi/gss_compare_name.c > 1.2 +1 -1 src/lib/libgssapi/gss_create_empty_oid_set.c > 1.1 +107 -0 src/lib/libgssapi/gss_decapsulate_token.c (new) > 1.2 +5 -4 src/lib/libgssapi/gss_delete_sec_context.c > 1.3 +10 -0 src/lib/libgssapi/gss_display_name.c > 1.4 +168 -23 src/lib/libgssapi/gss_display_status.c > 1.3 +30 -10 src/lib/libgssapi/gss_duplicate_name.c > 1.1 +65 -0 src/lib/libgssapi/gss_duplicate_oid.c (new) > 1.1 +131 -0 src/lib/libgssapi/gss_encapsulate_token.c (new) > 1.3 +3 -6 src/lib/libgssapi/gss_export_name.c > 1.3 +6 -0 src/lib/libgssapi/gss_export_sec_context.c > 1.2 +7 -0 src/lib/libgssapi/gss_get_mic.c > 1.3 +16 -12 src/lib/libgssapi/gss_import_name.c > 1.2 +2 -1 src/lib/libgssapi/gss_import_sec_context.c > 1.3 +7 -1 src/lib/libgssapi/gss_indicate_mechs.c > 1.5 +41 -22 src/lib/libgssapi/gss_init_sec_context.c > 1.2 +27 -6 src/lib/libgssapi/gss_inquire_context.c > 1.3 +54 -19 src/lib/libgssapi/gss_inquire_cred.c > 1.2 +19 -5 src/lib/libgssapi/gss_inquire_cred_by_mech.c > 1.1 +93 -0 src/lib/libgssapi/gss_inquire_cred_by_oid.c > (new) > 1.2 +2 -0 src/lib/libgssapi/gss_inquire_mechs_for_name.c > 1.2 +5 -4 src/lib/libgssapi/gss_inquire_names_for_mech.c > 1.1 +60 -0 src/lib/libgssapi/ > gss_inquire_sec_context_by_oid.c (new) > 1.3 +33 -21 src/lib/libgssapi/gss_mech_switch.c > 1.3 +26 -20 src/lib/libgssapi/gss_names.c > 1.1 +118 -0 src/lib/libgssapi/gss_oid_to_str.c (new) > 1.1 +72 -0 src/lib/libgssapi/gss_pseudo_random.c (new) > 1.2 +4 -2 src/lib/libgssapi/gss_release_buffer.c > 1.2 +1 -1 src/lib/libgssapi/gss_release_cred.c > 1.2 +2 -2 src/lib/libgssapi/gss_release_name.c > 1.1 +61 -0 src/lib/libgssapi/gss_release_oid.c (new) > 1.2 +2 -2 src/lib/libgssapi/gss_release_oid_set.c > 1.1 +125 -0 src/lib/libgssapi/gss_set_cred_option.c (new) > 1.1 +92 -0 src/lib/libgssapi/gss_set_sec_context_option.c > (new) > 1.3 +2 -2 src/lib/libgssapi/gss_test_oid_set_member.c > 1.2 +1 -1 src/lib/libgssapi/gss_unseal.c > 1.4 +3 -1 src/lib/libgssapi/gss_utils.c > 1.2 +2 -1 src/lib/libgssapi/gss_verify.c > 1.2 +7 -0 src/lib/libgssapi/gss_verify_mic.c > 1.2 +9 -0 src/lib/libgssapi/gss_wrap.c > 1.2 +6 -0 src/lib/libgssapi/gss_wrap_size_limit.c > 1.2 +8 -1 src/lib/libgssapi/mech.5 > 1.2 +44 -17 src/lib/libgssapi/mech_switch.h > 1.2 +4 -3 src/lib/libgssapi/name.h > 1.2 +2 -0 src/lib/libgssapi/utils.h > 1.16 +2 -2 src/lib/libpam/modules/pam_krb5/Makefile > 1.32 +2 -2 src/libexec/telnetd/Makefile > 1.44 +2 -2 src/secure/lib/libssh/Makefile > 1.52 +3 -3 src/secure/usr.sbin/sshd/Makefile > 1.107 +5 -2 src/share/mk/bsd.libnames.mk > 1.34 +2 -2 src/usr.bin/telnet/Makefile
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?836B6ECB-4374-4B2C-AFD4-6C00F38A4496>