Date: Wed, 7 Apr 2010 16:10:36 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 176626 for review Message-ID: <201004071610.o37GAa9R071653@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@176626?ac=10 Change 176626 by raj@raj_fdt on 2010/04/07 16:10:27 IFC @176625 Affected files ... .. //depot/projects/fdt/UPDATING#9 integrate .. //depot/projects/fdt/bin/sh/expand.c#3 integrate .. //depot/projects/fdt/bin/sh/mksyntax.c#3 integrate .. //depot/projects/fdt/bin/sh/options.c#3 integrate .. //depot/projects/fdt/bin/sh/parser.c#7 integrate .. //depot/projects/fdt/bin/sh/sh.1#4 integrate .. //depot/projects/fdt/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/fdt/contrib/top/utils.h#2 integrate .. //depot/projects/fdt/contrib/tzdata/asia#4 integrate .. //depot/projects/fdt/contrib/tzdata/europe#2 integrate .. //depot/projects/fdt/contrib/tzdata/zone.tab#3 integrate .. //depot/projects/fdt/crypto/openssl/CHANGES#3 integrate .. //depot/projects/fdt/crypto/openssl/FAQ#3 integrate .. //depot/projects/fdt/crypto/openssl/Makefile#3 integrate .. //depot/projects/fdt/crypto/openssl/NEWS#3 integrate .. //depot/projects/fdt/crypto/openssl/README#3 integrate .. //depot/projects/fdt/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/fdt/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/fdt/crypto/openssl/config#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/asn1/a_object.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/bn/asm/ppc.pl#2 integrate .. //depot/projects/fdt/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/bn/bn_div.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/fdt/crypto/openssl/crypto/engine/eng_cryptodev.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/evp/digest.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/fdt/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/fdt/crypto/openssl/crypto/ocsp/ocsp_prn.c#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/fdt/crypto/openssl/crypto/rand/rand_win.c#3 integrate .. //depot/projects/fdt/crypto/openssl/engines/e_capi.c#3 integrate .. //depot/projects/fdt/crypto/openssl/engines/e_chil.c#2 integrate .. //depot/projects/fdt/crypto/openssl/fips/Makefile#3 integrate .. //depot/projects/fdt/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/fdt/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/fdt/crypto/openssl/ssl/s3_pkt.c#4 integrate .. //depot/projects/fdt/etc/inetd.conf#2 integrate .. //depot/projects/fdt/etc/rc.subr#4 integrate .. //depot/projects/fdt/games/fortune/Notes#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/fdt/include/netdb.h#3 integrate .. //depot/projects/fdt/include/nsswitch.h#3 integrate .. //depot/projects/fdt/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/fdt/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/fdt/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/__getosreldate.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/_thread_init.c#2 integrate .. //depot/projects/fdt/lib/libc/net/getservent.c#2 integrate .. //depot/projects/fdt/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/fdt/lib/libc/stdio/printf.3#4 integrate .. //depot/projects/fdt/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/fdt/lib/libpmc/Makefile#3 integrate .. //depot/projects/fdt/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/fdt/lib/libpmc/pmc.corei7.3#1 branch .. //depot/projects/fdt/lib/libpmc/pmc.corei7uc.3#1 branch .. //depot/projects/fdt/lib/libpmc/pmc.ucf.3#1 branch .. //depot/projects/fdt/lib/libpmc/pmc.westmere.3#1 branch .. //depot/projects/fdt/lib/libpmc/pmc.westmereuc.3#1 branch .. //depot/projects/fdt/lib/libz/ChangeLog#3 integrate .. //depot/projects/fdt/lib/libz/README#3 integrate .. //depot/projects/fdt/lib/libz/crc32.c#3 integrate .. //depot/projects/fdt/lib/libz/deflate.c#3 integrate .. //depot/projects/fdt/lib/libz/gzguts.h#2 integrate .. //depot/projects/fdt/lib/libz/gzlib.c#2 integrate .. //depot/projects/fdt/lib/libz/gzread.c#2 integrate .. //depot/projects/fdt/lib/libz/inftrees.c#3 integrate .. //depot/projects/fdt/lib/libz/minigzip.c#3 integrate .. //depot/projects/fdt/lib/libz/zconf.h#3 integrate .. //depot/projects/fdt/lib/libz/zlib.3#3 integrate .. //depot/projects/fdt/lib/libz/zlib.h#3 integrate .. //depot/projects/fdt/lib/libz/zutil.c#3 integrate .. //depot/projects/fdt/lib/libz/zutil.h#3 integrate .. //depot/projects/fdt/libexec/fingerd/fingerd.8#2 integrate .. //depot/projects/fdt/libexec/fingerd/fingerd.c#2 integrate .. //depot/projects/fdt/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/fdt/secure/lib/libcrypto/Makefile.inc#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ASN1_STRING_length.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ASN1_STRING_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ASN1_generate_nconf.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_push.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_read.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_BLINDING_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_add.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_add_word.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_cmp.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_copy.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_rand.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_swap.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/BN_zero.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/CONF_modules_free.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/CONF_modules_load_file.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DH_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DH_set_method.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DH_size.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_sign.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/DSA_size.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_GET_LIB.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_clear_error.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_error_string.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_get_error.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_load_strings.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_print_errors.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_put_error.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_remove_state.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ERR_set_mark.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_BytesToKey.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_DigestInit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_EncryptInit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_OpenInit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_PKEY_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_SealInit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_SignInit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/EVP_VerifyInit.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OBJ_nid2obj.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OPENSSL_Applink.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OPENSSL_config.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/PKCS12_create.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/PKCS12_parse.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/PKCS7_decrypt.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/PKCS7_encrypt.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/PKCS7_sign.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/PKCS7_verify.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RAND_add.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RAND_bytes.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RAND_cleanup.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RAND_egd.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RAND_load_file.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RAND_set_rand_method.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_blinding_on.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_check_key.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_generate_key.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_print.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_private_encrypt.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_public_encrypt.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_set_method.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_sign.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/RSA_size.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/X509_NAME_print_ex.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/X509_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/bio.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/blowfish.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/bn.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/bn_internal.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/buffer.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/crypto.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_DHparams.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_X509.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_X509_CRL.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_X509_NAME.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_X509_REQ.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/d2i_X509_SIG.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/des.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/dh.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/dsa.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ecdsa.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/engine.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/err.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/evp.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/hmac.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/lh_stats.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/lhash.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/md5.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/mdc2.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/pem.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/rand.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/rc4.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ripemd.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/rsa.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/sha.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/threads.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ui.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/ui_compat.3#3 integrate .. //depot/projects/fdt/secure/lib/libcrypto/man/x509.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CIPHER_get_name.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_add_session.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_ctrl.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_free.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_sess_number.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_sessions.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_mode.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_options.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_timeout.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_set_verify.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_CTX_use_certificate.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_SESSION_free.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_SESSION_get_time.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_accept.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_alert_type_string.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_clear.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_connect.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_do_handshake.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_free.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_SSL_CTX.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_ciphers.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_client_CA_list.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_current_cipher.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_default_timeout.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_error.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_ex_new_index.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_fd.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_peer_certificate.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_rbio.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_session.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_verify_result.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_get_version.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_library_init.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_load_client_CA_file.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_new.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_pending.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_read.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_rstate_string.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_session_reused.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_set_bio.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_set_connect_state.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_set_fd.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_set_session.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_set_shutdown.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_set_verify_result.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_shutdown.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_state_string.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_want.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/SSL_write.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/d2i_SSL_SESSION.3#3 integrate .. //depot/projects/fdt/secure/lib/libssl/man/ssl.3#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/CA.pl.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/asn1parse.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/ca.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/ciphers.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/crl.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/crl2pkcs7.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/dgst.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/dhparam.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/dsa.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/dsaparam.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/ec.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/ecparam.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/enc.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/errstr.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/gendsa.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/genrsa.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/nseq.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/ocsp.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/openssl.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/passwd.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/pkcs12.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/pkcs7.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/pkcs8.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/rand.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/req.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/rsa.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/rsautl.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/s_client.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/s_server.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/s_time.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/sess_id.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/smime.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/speed.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/spkac.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/verify.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/version.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/x509.1#3 integrate .. //depot/projects/fdt/secure/usr.bin/openssl/man/x509v3_config.1#3 integrate .. //depot/projects/fdt/share/examples/indent/indent.pro#1 branch .. //depot/projects/fdt/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/fdt/share/man/man5/services.5#2 integrate .. //depot/projects/fdt/share/man/man7/build.7#3 integrate .. //depot/projects/fdt/share/misc/committers-ports.dot#4 integrate .. //depot/projects/fdt/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/fdt/share/mk/bsd.port.mk#2 integrate .. //depot/projects/fdt/share/mk/bsd.prog.mk#3 integrate .. //depot/projects/fdt/share/mk/sys.mk#4 integrate .. //depot/projects/fdt/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/fdt/sys/arm/mv/mv_sata.c#5 integrate .. //depot/projects/fdt/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/fdt/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/fdt/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/fdt/sys/conf/files#22 integrate .. //depot/projects/fdt/sys/conf/files.amd64#6 integrate .. //depot/projects/fdt/sys/conf/files.i386#5 integrate .. //depot/projects/fdt/sys/conf/files.pc98#5 integrate .. //depot/projects/fdt/sys/conf/kern.mk#4 integrate .. //depot/projects/fdt/sys/conf/kern.post.mk#3 integrate .. //depot/projects/fdt/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/fdt/sys/conf/kmod.mk#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/changes.txt#6 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/dmextern.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evgpe.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evgpeblk.c#5 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evxface.c#5 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evxfevnt.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exdebug.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exmutex.c#5 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg2.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exregion.c#5 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acevents.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acexcep.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acglobal.h#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpixf.h#6 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actables.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/platform/acfreebsd.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psxface.c#5 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbutils.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbxface.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/fdt/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/fdt/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/fdt/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/fdt/sys/dev/bwi/if_bwivar.h#3 integrate .. //depot/projects/fdt/sys/dev/bwn/if_bwn.c#5 integrate .. //depot/projects/fdt/sys/dev/bwn/if_bwnvar.h#4 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.h#5 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.h#5 integrate .. //depot/projects/fdt/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/fdt/sys/dev/e1000/if_lem.h#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_core.h#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_uncore.c#1 branch .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_uncore.h#1 branch .. //depot/projects/fdt/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnvar.h#4 integrate .. //depot/projects/fdt/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/fdt/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/fdt/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/fdt/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/fdt/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/fdt/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_runvar.h#3 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/fdt/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/fdt/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/fdt/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda.h#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/fdt/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdport.c#6 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/fdt/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/fdt/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/fdt/sys/kern/init_main.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_alq.c#3 integrate .. //depot/projects/fdt/sys/kern/kern_sig.c#7 integrate .. //depot/projects/fdt/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_default.c#4 integrate .. //depot/projects/fdt/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/fdt/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/fdt/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/fdt/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_amrr.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_ratectl.c#1 branch .. //depot/projects/fdt/sys/net80211/ieee80211_ratectl.h#1 branch .. //depot/projects/fdt/sys/net80211/ieee80211_rssadapt.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_rssadapt.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/fdt/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/fdt/sys/netinet/in.h#5 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_sockopt.c#9 integrate .. //depot/projects/fdt/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/fdt/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/fdt/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/fdt/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/fdt/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/fdt/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/fdt/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/fdt/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/fdt/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctputil.c#7 integrate .. //depot/projects/fdt/sys/netinet/sctputil.h#3 integrate .. //depot/projects/fdt/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/fdt/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/fdt/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/fdt/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/fdt/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/fdt/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/fdt/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/fdt/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/fdt/sys/sys/ioccom.h#2 integrate .. //depot/projects/fdt/sys/sys/pmc.h#5 integrate .. //depot/projects/fdt/sys/sys/proc.h#6 integrate .. //depot/projects/fdt/sys/sys/vnode.h#4 integrate .. //depot/projects/fdt/sys/teken/teken.c#3 integrate .. //depot/projects/fdt/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/fdt/sys/vm/vm_fault.c#6 integrate .. //depot/projects/fdt/sys/vm/vm_map.c#6 integrate .. //depot/projects/fdt/sys/vm/vm_map.h#4 integrate .. //depot/projects/fdt/sys/vm/vm_page.c#3 integrate .. //depot/projects/fdt/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/fdt/tools/regression/bin/sh/expansion/arith4.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/arith5.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/plus-minus2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/tilde1.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/tilde2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/trim1.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/expansion/trim2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/parser/heredoc2.0#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/gateworks/common#2 integrate .. //depot/projects/fdt/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/fdt/usr.bin/getent/getent.c#5 integrate .. //depot/projects/fdt/usr.bin/indent/args.c#2 integrate .. //depot/projects/fdt/usr.bin/indent/indent.1#2 integrate .. //depot/projects/fdt/usr.bin/indent/indent.c#2 integrate .. //depot/projects/fdt/usr.bin/indent/indent_globs.h#2 integrate .. //depot/projects/fdt/usr.bin/indent/lexi.c#2 integrate .. //depot/projects/fdt/usr.bin/make/main.c#3 integrate .. //depot/projects/fdt/usr.bin/sed/main.c#3 integrate .. //depot/projects/fdt/usr.bin/sed/sed.1#2 integrate .. //depot/projects/fdt/usr.sbin/Makefile#7 integrate .. //depot/projects/fdt/usr.sbin/ac/ac.c#3 integrate .. //depot/projects/fdt/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/add/futil.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/file.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/pen.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/fdt/usr.sbin/pmcstat/pmcpl_callgraph.c#3 integrate .. //depot/projects/fdt/usr.sbin/pmcstat/pmcpl_calltree.c#4 integrate .. //depot/projects/fdt/usr.sbin/pmcstat/pmcstat_log.c#6 integrate .. //depot/projects/fdt/usr.sbin/pmcstat/pmcstat_log.h#2 integrate .. //depot/projects/fdt/usr.sbin/services_mkdb/Makefile#1 branch .. //depot/projects/fdt/usr.sbin/services_mkdb/services_mkdb.8#1 branch .. //depot/projects/fdt/usr.sbin/services_mkdb/services_mkdb.c#1 branch .. //depot/projects/fdt/usr.sbin/services_mkdb/uniq.c#1 branch Differences ... ==== //depot/projects/fdt/UPDATING#9 (text+ko) ==== @@ -22,6 +22,16 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100402: + WITH_CTF can now be specified in src.conf (not recommended, there + are some problems with static executables), make.conf (would also + affect ports which do not use GNU make and do not override the + compile targets) or in the kernel config (via "makeoptions + WITH_CTF=yes"). + When WITH_CTF was specified there before this was silently ignored, + so make sure that WITH_CTF is not used in places which could lead + to unwanted behavior. + 20100311: The kernel option COMPAT_IA32 has been replaced with COMPAT_FREEBSD32 to allow 32-bit compatibility on non-x86 platforms. All kernel @@ -1120,4 +1130,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.656 2010/03/11 14:49:06 nwhitehorn Exp $ +$FreeBSD: src/UPDATING,v 1.657 2010/04/02 06:55:31 netchild Exp $ ==== //depot/projects/fdt/bin/sh/expand.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.60 2010/01/01 18:17:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.62 2010/04/03 22:04:44 jilles Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -273,7 +273,6 @@ switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: - case CTLENDVAR: case CTLBACKQ: case CTLBACKQ | CTLQUOTE: case CTLARI: @@ -285,6 +284,7 @@ goto done; break; case '/': + case CTLENDVAR: goto done; } p++; @@ -506,7 +506,9 @@ int amount; herefd = -1; - argstr(p, 0); + argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || + subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? + EXP_CASE : 0) | EXP_TILDE); STACKSTRNUL(expdest); herefd = saveherefd; argbackq = saveargbackq; ==== //depot/projects/fdt/bin/sh/mksyntax.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.27 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.28 2010/04/03 21:01:01 jilles Exp $"); /* * This program creates syntax.h and syntax.c. @@ -232,8 +232,6 @@ add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); - add("'", "CSQUOTE"); - add("\"", "CDQUOTE"); add("$", "CVAR"); add("}", "CENDVAR"); add("(", "CLP"); ==== //depot/projects/fdt/bin/sh/options.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.29 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.30 2010/04/05 14:15:51 jilles Exp $"); #include <signal.h> #include <unistd.h> @@ -93,8 +93,11 @@ options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; - if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1)) + if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { iflag = 1; + if (Eflag == 2) + Eflag = 1; + } if (mflag == 2) mflag = iflag; for (i = 0; i < NOPTS; i++) ==== //depot/projects/fdt/bin/sh/parser.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.74 2010/03/13 20:43:11 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.77 2010/04/03 21:01:01 jilles Exp $"); #include <stdlib.h> #include <unistd.h> @@ -79,6 +79,10 @@ int striptabs; /* if set, strip leading tabs */ }; +struct parser_temp { + struct parser_temp *next; + void *data; +}; STATIC struct heredoc *heredoclist; /* list of here documents to read */ @@ -94,6 +98,7 @@ STATIC int quoteflag; /* set if (part of) last token was quoted */ STATIC int startlinno; /* line # where last token started */ STATIC int funclinno; /* line # where the current function started */ +STATIC struct parser_temp *parser_temp; /* XXX When 'noaliases' is set to one, no alias expansion takes place. */ static int noaliases = 0; @@ -117,6 +122,73 @@ STATIC void setprompt(int); +STATIC void * +parser_temp_alloc(size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = ckmalloc(sizeof(*t)); + t->data = NULL; + t->next = parser_temp; + parser_temp = t; + t->data = ckmalloc(len); + INTON; + return t->data; +} + + +STATIC void * +parser_temp_realloc(void *ptr, size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = parser_temp; + if (ptr != t->data) + error("bug: parser_temp_realloc misused"); + t->data = ckrealloc(t->data, len); + INTON; + return t->data; +} + + +STATIC void +parser_temp_free_upto(void *ptr) +{ + struct parser_temp *t; + int done = 0; + + INTOFF; + while (parser_temp != NULL && !done) { + t = parser_temp; + parser_temp = t->next; + done = t->data == ptr; + ckfree(t->data); + ckfree(t); + } + INTON; + if (!done) + error("bug: parser_temp_free_upto misused"); +} + + +STATIC void +parser_temp_free_all(void) +{ + struct parser_temp *t; + + INTOFF; + while (parser_temp != NULL) { + t = parser_temp; + parser_temp = t->next; + ckfree(t->data); + ckfree(t); + } + INTON; +} + + /* * Read and parse a command. Returns NEOF on end of file. (NULL is a * valid parse tree indicating a blank line.) @@ -127,6 +199,11 @@ { int t; + /* This assumes the parser is not re-entered, + * which could happen if we add command substitution on PS1/PS2. + */ + parser_temp_free_all(); + tokpushback = 0; doprompt = interact; if (doprompt) @@ -863,6 +940,21 @@ } +#define MAXNEST_STATIC 8 +struct tokenstate +{ + const char *syntax; /* *SYNTAX */ + int parenlevel; /* levels of parentheses in arithmetic */ + enum tokenstate_category + { + TSTATE_TOP, + TSTATE_VAR_OLD, /* ${var+-=?}, inherits dquotes */ + TSTATE_VAR_NEW, /* other ${var...}, own dquote state */ + TSTATE_ARITH + } category; +}; + + /* * Called to parse command substitutions. */ @@ -1040,7 +1132,7 @@ #define PARSEARITH() {goto parsearith; parsearith_return:;} STATIC int -readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) +readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs) { int c = firstc; char *out; @@ -1048,22 +1140,21 @@ char line[EOFMARKLEN + 1]; struct nodelist *bqlist; int quotef; - int dblquote; - int varnest; /* levels of variables expansion */ - int arinest; /* levels of arithmetic expansion */ - int parenlevel; /* levels of parens in arithmetic */ - char const *prevsyntax; /* syntax before arithmetic */ + int newvarnest; + int level; int synentry; + struct tokenstate state_static[MAXNEST_STATIC]; + int maxnest = MAXNEST_STATIC; + struct tokenstate *state = state_static; startlinno = plinno; - dblquote = 0; - if (syntax == DQSYNTAX) - dblquote = 1; quotef = 0; bqlist = NULL; - varnest = 0; - arinest = 0; - parenlevel = 0; + newvarnest = 0; + level = 0; + state[level].syntax = initialsyntax; + state[level].parenlevel = 0; + state[level].category = TSTATE_TOP; STARTSTACKSTR(out); loop: { /* for each line, until end of word */ @@ -1071,11 +1162,11 @@ for (;;) { /* until end of line or end of word */ CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */ - synentry = syntax[c]; + synentry = state[level].syntax[c]; switch(synentry) { case CNL: /* '\n' */ - if (syntax == BASESYNTAX) + if (state[level].syntax == BASESYNTAX) goto endword; /* exit outer loop */ USTPUTC(c, out); plinno++; @@ -1089,7 +1180,7 @@ USTPUTC(c, out); break; case CCTL: - if (eofmark == NULL || dblquote) + if (eofmark == NULL || initialsyntax != SQSYNTAX) USTPUTC(CTLESC, out); USTPUTC(c, out); break; @@ -1105,41 +1196,34 @@ else setprompt(0); } else { - if (dblquote && c != '\\' && - c != '`' && c != '$' && - (c != '"' || eofmark != NULL)) + if (state[level].syntax == DQSYNTAX && + c != '\\' && c != '`' && c != '$' && + (c != '"' || (eofmark != NULL && + newvarnest == 0)) && + (c != '}' || state[level].category != TSTATE_VAR_OLD)) USTPUTC('\\', out); if (SQSYNTAX[c] == CCTL) USTPUTC(CTLESC, out); - else if (eofmark == NULL) + else if (eofmark == NULL || + newvarnest > 0) USTPUTC(CTLQUOTEMARK, out); USTPUTC(c, out); quotef++; } break; case CSQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = SQSYNTAX; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = SQSYNTAX; break; case CDQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = DQSYNTAX; - dblquote = 1; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = DQSYNTAX; break; case CENDQUOTE: - if (eofmark != NULL && arinest == 0 && - varnest == 0) { + if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); - } else { - if (arinest) { - syntax = ARISYNTAX; - dblquote = 0; - } else if (eofmark == NULL) { - syntax = BASESYNTAX; - dblquote = 0; - } + else { + state[level].syntax = BASESYNTAX; quotef++; } break; @@ -1147,30 +1231,33 @@ PARSESUB(); /* parse substitution */ break; case CENDVAR: /* '}' */ - if (varnest > 0) { - varnest--; + if (level > 0 && + (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW)) { + if (state[level].category == TSTATE_VAR_OLD) + state[level - 1].syntax = state[level].syntax; + else + newvarnest--; + level--; USTPUTC(CTLENDVAR, out); } else { USTPUTC(c, out); } break; case CLP: /* '(' in arithmetic */ - parenlevel++; + state[level].parenlevel++; USTPUTC(c, out); break; case CRP: /* ')' in arithmetic */ - if (parenlevel > 0) { + if (state[level].parenlevel > 0) { USTPUTC(c, out); - --parenlevel; + --state[level].parenlevel; } else { if (pgetc() == ')') { - if (--arinest == 0) { + if (level > 0 && + state[level].category == TSTATE_ARITH) { + level--; USTPUTC(CTLENDARI, out); - syntax = prevsyntax; - if (syntax == DQSYNTAX) - dblquote = 1; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004071610.o37GAa9R071653>