svn commit: r238049 - in projects/altix2: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/lib/libdtrace/common contrib/less contrib/top contrib/traceroute ...

Marcel Moolenaar marcel at FreeBSD.org
Tue Jul 3 02:55:29 UTC 2012


Author: marcel
Date: Tue Jul  3 02:55:27 2012
New Revision: 238049
URL: http://svn.freebsd.org/changeset/base/238049

Log:
  Merge ^/head at 238048

Added:
  projects/altix2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/
     - copied from r238048, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/
  projects/altix2/share/man/man4/acpi_asus_wmi.4
     - copied unchanged from r238048, head/share/man/man4/acpi_asus_wmi.4
  projects/altix2/share/man/man4/bxe.4
     - copied unchanged from r238048, head/share/man/man4/bxe.4
  projects/altix2/sys/arm/at91/at91sam9x25.c
     - copied unchanged from r238048, head/sys/arm/at91/at91sam9x25.c
  projects/altix2/sys/arm/at91/at91sam9x25reg.h
     - copied unchanged from r238048, head/sys/arm/at91/at91sam9x25reg.h
  projects/altix2/sys/arm/at91/board_sam9x25ek.c
     - copied unchanged from r238048, head/sys/arm/at91/board_sam9x25ek.c
  projects/altix2/sys/arm/at91/std.atmel
     - copied unchanged from r238048, head/sys/arm/at91/std.atmel
  projects/altix2/sys/arm/at91/std.sam9x25ek
     - copied unchanged from r238048, head/sys/arm/at91/std.sam9x25ek
  projects/altix2/sys/arm/conf/ATMEL
     - copied unchanged from r238048, head/sys/arm/conf/ATMEL
  projects/altix2/sys/arm/conf/SAM9X25EK
     - copied unchanged from r238048, head/sys/arm/conf/SAM9X25EK
  projects/altix2/sys/arm/conf/SAM9X25EK.hints
     - copied unchanged from r238048, head/sys/arm/conf/SAM9X25EK.hints
  projects/altix2/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu
     - copied unchanged from r238048, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu
  projects/altix2/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu
     - copied unchanged from r238048, head/sys/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu
  projects/altix2/sys/dev/acpi_support/acpi_asus_wmi.c
     - copied unchanged from r238048, head/sys/dev/acpi_support/acpi_asus_wmi.c
  projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
     - copied unchanged from r238048, head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
  projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h
     - copied unchanged from r238048, head/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h
  projects/altix2/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
     - copied unchanged from r238048, head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
  projects/altix2/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h
     - copied unchanged from r238048, head/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h
  projects/altix2/sys/dev/nand/nfc_fsl.c
     - copied unchanged from r238048, head/sys/dev/nand/nfc_fsl.c
  projects/altix2/sys/dev/nand/nfc_fsl.h
     - copied unchanged from r238048, head/sys/dev/nand/nfc_fsl.h
  projects/altix2/sys/modules/acpi/acpi_asus_wmi/
     - copied from r238048, head/sys/modules/acpi/acpi_asus_wmi/
  projects/altix2/sys/modules/nand/
     - copied from r238048, head/sys/modules/nand/
  projects/altix2/tools/build/options/WITHOUT_PKGBOOTSTRAP
     - copied unchanged from r238048, head/tools/build/options/WITHOUT_PKGBOOTSTRAP
  projects/altix2/tools/build/options/WITH_GNU_SORT
     - copied unchanged from r238048, head/tools/build/options/WITH_GNU_SORT
  projects/altix2/tools/build/options/WITH_INSTALL_AS_USER
     - copied unchanged from r238048, head/tools/build/options/WITH_INSTALL_AS_USER
Deleted:
  projects/altix2/tools/build/options/WITH_BSD_SORT
Modified:
  projects/altix2/UPDATING
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
  projects/altix2/contrib/less/LICENSE
  projects/altix2/contrib/less/Makefile.aut
  projects/altix2/contrib/less/NEWS
  projects/altix2/contrib/less/README
  projects/altix2/contrib/less/brac.c
  projects/altix2/contrib/less/ch.c
  projects/altix2/contrib/less/charset.c
  projects/altix2/contrib/less/charset.h
  projects/altix2/contrib/less/cmd.h
  projects/altix2/contrib/less/cmdbuf.c
  projects/altix2/contrib/less/command.c
  projects/altix2/contrib/less/configure
  projects/altix2/contrib/less/configure.ac
  projects/altix2/contrib/less/cvt.c
  projects/altix2/contrib/less/decode.c
  projects/altix2/contrib/less/defines.ds
  projects/altix2/contrib/less/defines.h.in
  projects/altix2/contrib/less/defines.o2
  projects/altix2/contrib/less/defines.o9
  projects/altix2/contrib/less/defines.wn
  projects/altix2/contrib/less/edit.c
  projects/altix2/contrib/less/filename.c
  projects/altix2/contrib/less/forwback.c
  projects/altix2/contrib/less/help.c
  projects/altix2/contrib/less/ifile.c
  projects/altix2/contrib/less/input.c
  projects/altix2/contrib/less/jump.c
  projects/altix2/contrib/less/less.h
  projects/altix2/contrib/less/less.hlp
  projects/altix2/contrib/less/less.man
  projects/altix2/contrib/less/less.nro
  projects/altix2/contrib/less/lessecho.c
  projects/altix2/contrib/less/lessecho.man
  projects/altix2/contrib/less/lessecho.nro
  projects/altix2/contrib/less/lesskey.c
  projects/altix2/contrib/less/lesskey.h
  projects/altix2/contrib/less/lesskey.man
  projects/altix2/contrib/less/lesskey.nro
  projects/altix2/contrib/less/lglob.h
  projects/altix2/contrib/less/line.c
  projects/altix2/contrib/less/linenum.c
  projects/altix2/contrib/less/lsystem.c
  projects/altix2/contrib/less/main.c
  projects/altix2/contrib/less/mark.c
  projects/altix2/contrib/less/mkhelp.c
  projects/altix2/contrib/less/optfunc.c
  projects/altix2/contrib/less/option.c
  projects/altix2/contrib/less/option.h
  projects/altix2/contrib/less/opttbl.c
  projects/altix2/contrib/less/os.c
  projects/altix2/contrib/less/output.c
  projects/altix2/contrib/less/pattern.c
  projects/altix2/contrib/less/pattern.h
  projects/altix2/contrib/less/pckeys.h
  projects/altix2/contrib/less/position.c
  projects/altix2/contrib/less/position.h
  projects/altix2/contrib/less/prompt.c
  projects/altix2/contrib/less/screen.c
  projects/altix2/contrib/less/scrsize.c
  projects/altix2/contrib/less/search.c
  projects/altix2/contrib/less/signal.c
  projects/altix2/contrib/less/tags.c
  projects/altix2/contrib/less/ttyin.c
  projects/altix2/contrib/less/version.c
  projects/altix2/contrib/top/display.c
  projects/altix2/contrib/top/layout.h
  projects/altix2/contrib/top/machine.h
  projects/altix2/contrib/top/top.c
  projects/altix2/contrib/traceroute/traceroute.8
  projects/altix2/crypto/openssl/CHANGES
  projects/altix2/crypto/openssl/Configure
  projects/altix2/crypto/openssl/FAQ
  projects/altix2/crypto/openssl/LICENSE
  projects/altix2/crypto/openssl/Makefile
  projects/altix2/crypto/openssl/NEWS
  projects/altix2/crypto/openssl/README
  projects/altix2/crypto/openssl/apps/Makefile
  projects/altix2/crypto/openssl/apps/asn1pars.c
  projects/altix2/crypto/openssl/apps/cms.c
  projects/altix2/crypto/openssl/apps/openssl.cnf
  projects/altix2/crypto/openssl/apps/pkcs12.c
  projects/altix2/crypto/openssl/apps/s_client.c
  projects/altix2/crypto/openssl/apps/s_server.c
  projects/altix2/crypto/openssl/apps/x509.c
  projects/altix2/crypto/openssl/config
  projects/altix2/crypto/openssl/crypto/asn1/a_object.c
  projects/altix2/crypto/openssl/crypto/asn1/a_strex.c
  projects/altix2/crypto/openssl/crypto/asn1/a_strnid.c
  projects/altix2/crypto/openssl/crypto/asn1/asn1.h
  projects/altix2/crypto/openssl/crypto/asn1/asn_mime.c
  projects/altix2/crypto/openssl/crypto/asn1/x_name.c
  projects/altix2/crypto/openssl/crypto/asn1/x_pubkey.c
  projects/altix2/crypto/openssl/crypto/bio/bf_buff.c
  projects/altix2/crypto/openssl/crypto/bio/bio.h
  projects/altix2/crypto/openssl/crypto/bio/bss_dgram.c
  projects/altix2/crypto/openssl/crypto/bn/asm/mo-586.pl
  projects/altix2/crypto/openssl/crypto/bn/asm/ppc.pl
  projects/altix2/crypto/openssl/crypto/bn/bn_blind.c
  projects/altix2/crypto/openssl/crypto/bn/bn_gf2m.c
  projects/altix2/crypto/openssl/crypto/cms/cms.h
  projects/altix2/crypto/openssl/crypto/cms/cms_enc.c
  projects/altix2/crypto/openssl/crypto/cms/cms_env.c
  projects/altix2/crypto/openssl/crypto/cms/cms_io.c
  projects/altix2/crypto/openssl/crypto/cms/cms_lcl.h
  projects/altix2/crypto/openssl/crypto/cms/cms_smime.c
  projects/altix2/crypto/openssl/crypto/comp/c_rle.c
  projects/altix2/crypto/openssl/crypto/conf/conf_api.c
  projects/altix2/crypto/openssl/crypto/cryptlib.c
  projects/altix2/crypto/openssl/crypto/crypto.h
  projects/altix2/crypto/openssl/crypto/ec/ec2_smpl.c
  projects/altix2/crypto/openssl/crypto/ec/ec_key.c
  projects/altix2/crypto/openssl/crypto/ec/ecp_smpl.c
  projects/altix2/crypto/openssl/crypto/ecdsa/ecdsatest.c
  projects/altix2/crypto/openssl/crypto/ecdsa/ecs_ossl.c
  projects/altix2/crypto/openssl/crypto/evp/evp_test.c
  projects/altix2/crypto/openssl/crypto/ocsp/ocsp_lib.c
  projects/altix2/crypto/openssl/crypto/opensslv.h
  projects/altix2/crypto/openssl/crypto/perlasm/cbc.pl
  projects/altix2/crypto/openssl/crypto/pkcs7/pk7_smime.c
  projects/altix2/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl
  projects/altix2/crypto/openssl/crypto/rc4/rc4_skey.c
  projects/altix2/crypto/openssl/crypto/rsa/rsa_eay.c
  projects/altix2/crypto/openssl/crypto/x509/x509_vfy.c
  projects/altix2/crypto/openssl/crypto/x509v3/v3_addr.c
  projects/altix2/crypto/openssl/crypto/x509v3/v3_asid.c
  projects/altix2/crypto/openssl/doc/HOWTO/proxy_certificates.txt
  projects/altix2/crypto/openssl/doc/apps/ca.pod
  projects/altix2/crypto/openssl/doc/apps/dgst.pod
  projects/altix2/crypto/openssl/doc/crypto/engine.pod
  projects/altix2/crypto/openssl/doc/ssl/SSL_clear.pod
  projects/altix2/crypto/openssl/engines/e_capi.c
  projects/altix2/crypto/openssl/engines/e_capi_err.h
  projects/altix2/crypto/openssl/fips/fips_canister.c
  projects/altix2/crypto/openssl/openssl.spec
  projects/altix2/crypto/openssl/ssl/bio_ssl.c
  projects/altix2/crypto/openssl/ssl/d1_both.c
  projects/altix2/crypto/openssl/ssl/d1_clnt.c
  projects/altix2/crypto/openssl/ssl/d1_enc.c
  projects/altix2/crypto/openssl/ssl/d1_lib.c
  projects/altix2/crypto/openssl/ssl/d1_pkt.c
  projects/altix2/crypto/openssl/ssl/d1_srvr.c
  projects/altix2/crypto/openssl/ssl/s2_srvr.c
  projects/altix2/crypto/openssl/ssl/s3_clnt.c
  projects/altix2/crypto/openssl/ssl/s3_lib.c
  projects/altix2/crypto/openssl/ssl/s3_srvr.c
  projects/altix2/crypto/openssl/ssl/ssl.h
  projects/altix2/crypto/openssl/ssl/ssl_ciph.c
  projects/altix2/crypto/openssl/ssl/ssl_err.c
  projects/altix2/crypto/openssl/ssl/ssl_lib.c
  projects/altix2/crypto/openssl/ssl/ssl_locl.h
  projects/altix2/crypto/openssl/ssl/t1_lib.c
  projects/altix2/crypto/openssl/util/fipslink.pl
  projects/altix2/crypto/openssl/util/mkerr.pl
  projects/altix2/crypto/openssl/util/pl/VC-32.pl
  projects/altix2/etc/syslog.conf
  projects/altix2/gnu/usr.bin/sort/Makefile
  projects/altix2/lib/libc/gen/sysconf.c
  projects/altix2/lib/libc/locale/ctype_l.3
  projects/altix2/lib/libc/stdlib/strfmon.3
  projects/altix2/libexec/rtld-elf/rtld.c
  projects/altix2/release/doc/en_US.ISO8859-1/hardware/article.sgml
  projects/altix2/release/doc/share/misc/dev.archlist.txt
  projects/altix2/sbin/geom/class/raid/graid.8
  projects/altix2/sbin/hastd/proto_common.c
  projects/altix2/sbin/mdconfig/mdconfig.8
  projects/altix2/sbin/ping/ping.c
  projects/altix2/secure/lib/libcrypto/Makefile.inc
  projects/altix2/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/altix2/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/altix2/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/altix2/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/altix2/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/altix2/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/altix2/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/altix2/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/altix2/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/altix2/secure/lib/libcrypto/man/BIO_f_md.3
  projects/altix2/secure/lib/libcrypto/man/BIO_f_null.3
  projects/altix2/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/altix2/secure/lib/libcrypto/man/BIO_find_type.3
  projects/altix2/secure/lib/libcrypto/man/BIO_new.3
  projects/altix2/secure/lib/libcrypto/man/BIO_push.3
  projects/altix2/secure/lib/libcrypto/man/BIO_read.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_file.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_null.3
  projects/altix2/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/altix2/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/altix2/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/altix2/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/altix2/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/altix2/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/altix2/secure/lib/libcrypto/man/BN_add.3
  projects/altix2/secure/lib/libcrypto/man/BN_add_word.3
  projects/altix2/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/altix2/secure/lib/libcrypto/man/BN_cmp.3
  projects/altix2/secure/lib/libcrypto/man/BN_copy.3
  projects/altix2/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/altix2/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/altix2/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/altix2/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/altix2/secure/lib/libcrypto/man/BN_new.3
  projects/altix2/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/altix2/secure/lib/libcrypto/man/BN_rand.3
  projects/altix2/secure/lib/libcrypto/man/BN_set_bit.3
  projects/altix2/secure/lib/libcrypto/man/BN_swap.3
  projects/altix2/secure/lib/libcrypto/man/BN_zero.3
  projects/altix2/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/altix2/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/altix2/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/altix2/secure/lib/libcrypto/man/DH_generate_key.3
  projects/altix2/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/altix2/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/altix2/secure/lib/libcrypto/man/DH_new.3
  projects/altix2/secure/lib/libcrypto/man/DH_set_method.3
  projects/altix2/secure/lib/libcrypto/man/DH_size.3
  projects/altix2/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/altix2/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/altix2/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/altix2/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/altix2/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/altix2/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/altix2/secure/lib/libcrypto/man/DSA_new.3
  projects/altix2/secure/lib/libcrypto/man/DSA_set_method.3
  projects/altix2/secure/lib/libcrypto/man/DSA_sign.3
  projects/altix2/secure/lib/libcrypto/man/DSA_size.3
  projects/altix2/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/altix2/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/altix2/secure/lib/libcrypto/man/ERR_error_string.3
  projects/altix2/secure/lib/libcrypto/man/ERR_get_error.3
  projects/altix2/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/altix2/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/altix2/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/altix2/secure/lib/libcrypto/man/ERR_put_error.3
  projects/altix2/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/altix2/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/altix2/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/altix2/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/altix2/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/altix2/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/altix2/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/altix2/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/altix2/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/altix2/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/altix2/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/altix2/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/altix2/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/altix2/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/altix2/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/altix2/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/altix2/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/altix2/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/altix2/secure/lib/libcrypto/man/PKCS12_create.3
  projects/altix2/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/altix2/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/altix2/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/altix2/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/altix2/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/altix2/secure/lib/libcrypto/man/RAND_add.3
  projects/altix2/secure/lib/libcrypto/man/RAND_bytes.3
  projects/altix2/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/altix2/secure/lib/libcrypto/man/RAND_egd.3
  projects/altix2/secure/lib/libcrypto/man/RAND_load_file.3
  projects/altix2/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/altix2/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/altix2/secure/lib/libcrypto/man/RSA_check_key.3
  projects/altix2/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/altix2/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/altix2/secure/lib/libcrypto/man/RSA_new.3
  projects/altix2/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/altix2/secure/lib/libcrypto/man/RSA_print.3
  projects/altix2/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/altix2/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/altix2/secure/lib/libcrypto/man/RSA_set_method.3
  projects/altix2/secure/lib/libcrypto/man/RSA_sign.3
  projects/altix2/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/altix2/secure/lib/libcrypto/man/RSA_size.3
  projects/altix2/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/altix2/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/altix2/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/altix2/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/altix2/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/altix2/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/altix2/secure/lib/libcrypto/man/X509_new.3
  projects/altix2/secure/lib/libcrypto/man/bio.3
  projects/altix2/secure/lib/libcrypto/man/blowfish.3
  projects/altix2/secure/lib/libcrypto/man/bn.3
  projects/altix2/secure/lib/libcrypto/man/bn_internal.3
  projects/altix2/secure/lib/libcrypto/man/buffer.3
  projects/altix2/secure/lib/libcrypto/man/crypto.3
  projects/altix2/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/altix2/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/altix2/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/altix2/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/altix2/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/altix2/secure/lib/libcrypto/man/d2i_X509.3
  projects/altix2/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/altix2/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/altix2/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/altix2/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/altix2/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/altix2/secure/lib/libcrypto/man/des.3
  projects/altix2/secure/lib/libcrypto/man/dh.3
  projects/altix2/secure/lib/libcrypto/man/dsa.3
  projects/altix2/secure/lib/libcrypto/man/ecdsa.3
  projects/altix2/secure/lib/libcrypto/man/engine.3
  projects/altix2/secure/lib/libcrypto/man/err.3
  projects/altix2/secure/lib/libcrypto/man/evp.3
  projects/altix2/secure/lib/libcrypto/man/hmac.3
  projects/altix2/secure/lib/libcrypto/man/lh_stats.3
  projects/altix2/secure/lib/libcrypto/man/lhash.3
  projects/altix2/secure/lib/libcrypto/man/md5.3
  projects/altix2/secure/lib/libcrypto/man/mdc2.3
  projects/altix2/secure/lib/libcrypto/man/pem.3
  projects/altix2/secure/lib/libcrypto/man/rand.3
  projects/altix2/secure/lib/libcrypto/man/rc4.3
  projects/altix2/secure/lib/libcrypto/man/ripemd.3
  projects/altix2/secure/lib/libcrypto/man/rsa.3
  projects/altix2/secure/lib/libcrypto/man/sha.3
  projects/altix2/secure/lib/libcrypto/man/threads.3
  projects/altix2/secure/lib/libcrypto/man/ui.3
  projects/altix2/secure/lib/libcrypto/man/ui_compat.3
  projects/altix2/secure/lib/libcrypto/man/x509.3
  projects/altix2/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/altix2/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_free.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_new.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/altix2/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/altix2/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/altix2/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/altix2/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/altix2/secure/lib/libssl/man/SSL_accept.3
  projects/altix2/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/altix2/secure/lib/libssl/man/SSL_clear.3
  projects/altix2/secure/lib/libssl/man/SSL_connect.3
  projects/altix2/secure/lib/libssl/man/SSL_do_handshake.3
  projects/altix2/secure/lib/libssl/man/SSL_free.3
  projects/altix2/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/altix2/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/altix2/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/altix2/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/altix2/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/altix2/secure/lib/libssl/man/SSL_get_error.3
  projects/altix2/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/altix2/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/altix2/secure/lib/libssl/man/SSL_get_fd.3
  projects/altix2/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/altix2/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/altix2/secure/lib/libssl/man/SSL_get_rbio.3
  projects/altix2/secure/lib/libssl/man/SSL_get_session.3
  projects/altix2/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/altix2/secure/lib/libssl/man/SSL_get_version.3
  projects/altix2/secure/lib/libssl/man/SSL_library_init.3
  projects/altix2/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/altix2/secure/lib/libssl/man/SSL_new.3
  projects/altix2/secure/lib/libssl/man/SSL_pending.3
  projects/altix2/secure/lib/libssl/man/SSL_read.3
  projects/altix2/secure/lib/libssl/man/SSL_rstate_string.3
  projects/altix2/secure/lib/libssl/man/SSL_session_reused.3
  projects/altix2/secure/lib/libssl/man/SSL_set_bio.3
  projects/altix2/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/altix2/secure/lib/libssl/man/SSL_set_fd.3
  projects/altix2/secure/lib/libssl/man/SSL_set_session.3
  projects/altix2/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/altix2/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/altix2/secure/lib/libssl/man/SSL_shutdown.3
  projects/altix2/secure/lib/libssl/man/SSL_state_string.3
  projects/altix2/secure/lib/libssl/man/SSL_want.3
  projects/altix2/secure/lib/libssl/man/SSL_write.3
  projects/altix2/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/altix2/secure/lib/libssl/man/ssl.3
  projects/altix2/secure/usr.bin/openssl/man/CA.pl.1
  projects/altix2/secure/usr.bin/openssl/man/asn1parse.1
  projects/altix2/secure/usr.bin/openssl/man/ca.1
  projects/altix2/secure/usr.bin/openssl/man/ciphers.1
  projects/altix2/secure/usr.bin/openssl/man/crl.1
  projects/altix2/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/altix2/secure/usr.bin/openssl/man/dgst.1
  projects/altix2/secure/usr.bin/openssl/man/dhparam.1
  projects/altix2/secure/usr.bin/openssl/man/dsa.1
  projects/altix2/secure/usr.bin/openssl/man/dsaparam.1
  projects/altix2/secure/usr.bin/openssl/man/ec.1
  projects/altix2/secure/usr.bin/openssl/man/ecparam.1
  projects/altix2/secure/usr.bin/openssl/man/enc.1
  projects/altix2/secure/usr.bin/openssl/man/errstr.1
  projects/altix2/secure/usr.bin/openssl/man/gendsa.1
  projects/altix2/secure/usr.bin/openssl/man/genrsa.1
  projects/altix2/secure/usr.bin/openssl/man/nseq.1
  projects/altix2/secure/usr.bin/openssl/man/ocsp.1
  projects/altix2/secure/usr.bin/openssl/man/openssl.1
  projects/altix2/secure/usr.bin/openssl/man/passwd.1
  projects/altix2/secure/usr.bin/openssl/man/pkcs12.1
  projects/altix2/secure/usr.bin/openssl/man/pkcs7.1
  projects/altix2/secure/usr.bin/openssl/man/pkcs8.1
  projects/altix2/secure/usr.bin/openssl/man/rand.1
  projects/altix2/secure/usr.bin/openssl/man/req.1
  projects/altix2/secure/usr.bin/openssl/man/rsa.1
  projects/altix2/secure/usr.bin/openssl/man/rsautl.1
  projects/altix2/secure/usr.bin/openssl/man/s_client.1
  projects/altix2/secure/usr.bin/openssl/man/s_server.1
  projects/altix2/secure/usr.bin/openssl/man/s_time.1
  projects/altix2/secure/usr.bin/openssl/man/sess_id.1
  projects/altix2/secure/usr.bin/openssl/man/smime.1
  projects/altix2/secure/usr.bin/openssl/man/speed.1
  projects/altix2/secure/usr.bin/openssl/man/spkac.1
  projects/altix2/secure/usr.bin/openssl/man/verify.1
  projects/altix2/secure/usr.bin/openssl/man/version.1
  projects/altix2/secure/usr.bin/openssl/man/x509.1
  projects/altix2/secure/usr.bin/openssl/man/x509v3_config.1
  projects/altix2/share/examples/pf/faq-example1
  projects/altix2/share/examples/pf/pf.conf
  projects/altix2/share/examples/scsi_target/scsi_target.c
  projects/altix2/share/man/man4/Makefile
  projects/altix2/share/man/man4/acpi_asus.4
  projects/altix2/share/man/man4/mps.4
  projects/altix2/share/man/man5/passwd.5
  projects/altix2/share/man/man5/src.conf.5
  projects/altix2/share/man/man7/build.7
  projects/altix2/share/man/man9/cd.9
  projects/altix2/share/man/man9/locking.9
  projects/altix2/share/misc/committers-ports.dot
  projects/altix2/share/misc/organization.dot
  projects/altix2/share/mk/bsd.own.mk
  projects/altix2/sys/amd64/amd64/pmap.c
  projects/altix2/sys/amd64/conf/GENERIC
  projects/altix2/sys/amd64/include/cpufunc.h
  projects/altix2/sys/arm/at91/at91_pmcvar.h
  projects/altix2/sys/arm/at91/std.at91
  projects/altix2/sys/arm/at91/std.at91sam9
  projects/altix2/sys/arm/at91/std.ethernut5
  projects/altix2/sys/arm/at91/std.hl201
  projects/altix2/sys/arm/at91/std.qila9g20
  projects/altix2/sys/arm/at91/std.sam9g20ek
  projects/altix2/sys/arm/xscale/std.xscale
  projects/altix2/sys/cam/cam_periph.c
  projects/altix2/sys/cam/ctl/ctl.c
  projects/altix2/sys/cam/ctl/ctl_backend.c
  projects/altix2/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/altix2/sys/cam/ctl/ctl_frontend_internal.c
  projects/altix2/sys/cam/ctl/scsi_ctl.c
  projects/altix2/sys/cam/scsi/scsi_cd.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/altix2/sys/cddl/dev/dtrace/amd64/dis_tables.c
  projects/altix2/sys/cddl/dev/dtrace/i386/dis_tables.c
  projects/altix2/sys/compat/linux/linux_file.c
  projects/altix2/sys/conf/files
  projects/altix2/sys/conf/files.powerpc
  projects/altix2/sys/conf/kern.post.mk
  projects/altix2/sys/contrib/dev/acpica/components/events/evxfgpe.c
  projects/altix2/sys/dev/aic7xxx/aic79xx.c
  projects/altix2/sys/dev/aic7xxx/aic79xx_osm.c
  projects/altix2/sys/dev/aic7xxx/aic7xxx.c
  projects/altix2/sys/dev/aic7xxx/aic7xxx_osm.c
  projects/altix2/sys/dev/ath/ah_osdep.c
  projects/altix2/sys/dev/ath/ah_osdep.h
  projects/altix2/sys/dev/ath/ath_hal/ah.h
  projects/altix2/sys/dev/ath/ath_hal/ah_debug.h
  projects/altix2/sys/dev/ath/ath_hal/ah_internal.h
  projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416.h
  projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c
  projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  projects/altix2/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c
  projects/altix2/sys/dev/ath/ath_hal/ar9002/ar9285.h
  projects/altix2/sys/dev/ath/if_ath_led.c
  projects/altix2/sys/dev/ath/if_ath_tx.c
  projects/altix2/sys/dev/ath/if_athvar.h
  projects/altix2/sys/dev/cxgb/cxgb_adapter.h
  projects/altix2/sys/dev/cxgb/cxgb_main.c
  projects/altix2/sys/dev/cxgb/cxgb_sge.c
  projects/altix2/sys/dev/cxgbe/adapter.h
  projects/altix2/sys/dev/cxgbe/t4_l2t.c
  projects/altix2/sys/dev/cxgbe/t4_main.c
  projects/altix2/sys/dev/cxgbe/t4_sge.c
  projects/altix2/sys/dev/drm2/drmP.h
  projects/altix2/sys/dev/fdt/fdtbus.c
  projects/altix2/sys/dev/fdt/simplebus.c
  projects/altix2/sys/dev/filemon/filemon_wrapper.c
  projects/altix2/sys/dev/firewire/sbp_targ.c
  projects/altix2/sys/dev/iwn/if_iwn.c
  projects/altix2/sys/dev/mps/mpi/mpi2.h
  projects/altix2/sys/dev/mps/mpi/mpi2_cnfg.h
  projects/altix2/sys/dev/mps/mpi/mpi2_hbd.h
  projects/altix2/sys/dev/mps/mpi/mpi2_history.txt
  projects/altix2/sys/dev/mps/mpi/mpi2_init.h
  projects/altix2/sys/dev/mps/mpi/mpi2_ioc.h
  projects/altix2/sys/dev/mps/mpi/mpi2_ra.h
  projects/altix2/sys/dev/mps/mpi/mpi2_raid.h
  projects/altix2/sys/dev/mps/mpi/mpi2_sas.h
  projects/altix2/sys/dev/mps/mpi/mpi2_targ.h
  projects/altix2/sys/dev/mps/mpi/mpi2_tool.h
  projects/altix2/sys/dev/mps/mpi/mpi2_type.h
  projects/altix2/sys/dev/mps/mps.c
  projects/altix2/sys/dev/mps/mps_config.c
  projects/altix2/sys/dev/mps/mps_ioctl.h
  projects/altix2/sys/dev/mps/mps_mapping.c
  projects/altix2/sys/dev/mps/mps_mapping.h
  projects/altix2/sys/dev/mps/mps_sas.c
  projects/altix2/sys/dev/mps/mps_sas.h
  projects/altix2/sys/dev/mps/mps_sas_lsi.c
  projects/altix2/sys/dev/mps/mps_user.c
  projects/altix2/sys/dev/mps/mpsvar.h
  projects/altix2/sys/dev/mpt/mpt_cam.c
  projects/altix2/sys/dev/nand/nand.c
  projects/altix2/sys/dev/nand/nandsim.c
  projects/altix2/sys/dev/pccard/pccard.c
  projects/altix2/sys/dev/pccard/pccardvarp.h
  projects/altix2/sys/dev/pci/pci_pci.c
  projects/altix2/sys/dev/sio/sio.c
  projects/altix2/sys/dev/sound/pci/hda/hdaa.c
  projects/altix2/sys/dev/sound/pci/hda/hdaa_patches.c
  projects/altix2/sys/dev/sound/pci/hdspe.c
  projects/altix2/sys/dev/usb/controller/ehci_pci.c
  projects/altix2/sys/dev/usb/controller/ohci_pci.c
  projects/altix2/sys/dev/usb/controller/xhci_pci.c
  projects/altix2/sys/dev/usb/usbdevs
  projects/altix2/sys/fs/devfs/devfs_vnops.c
  projects/altix2/sys/fs/nfsclient/nfs_clbio.c
  projects/altix2/sys/geom/geom_disk.c
  projects/altix2/sys/geom/geom_map.c
  projects/altix2/sys/geom/mirror/g_mirror.c
  projects/altix2/sys/geom/mirror/g_mirror.h
  projects/altix2/sys/i386/i386/machdep.c
  projects/altix2/sys/i386/i386/pmap.c
  projects/altix2/sys/i386/i386/vm86.c
  projects/altix2/sys/kern/imgact_aout.c
  projects/altix2/sys/kern/imgact_gzip.c
  projects/altix2/sys/kern/kern_descrip.c
  projects/altix2/sys/kern/kern_malloc.c
  projects/altix2/sys/kern/subr_witness.c
  projects/altix2/sys/kern/vfs_syscalls.c
  projects/altix2/sys/kern/vfs_vnops.c
  projects/altix2/sys/mips/cavium/uart_bus_octeonusart.c
  projects/altix2/sys/modules/Makefile
  projects/altix2/sys/modules/acpi/Makefile
  projects/altix2/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/altix2/sys/net/if.h
  projects/altix2/sys/net/if_gif.c
  projects/altix2/sys/net/if_lagg.c
  projects/altix2/sys/net80211/_ieee80211.h
  projects/altix2/sys/netinet/ip_mroute.c
  projects/altix2/sys/netinet/ip_mroute.h
  projects/altix2/sys/netinet/sctp_asconf.c
  projects/altix2/sys/netinet/sctp_asconf.h
  projects/altix2/sys/netinet/sctp_indata.c
  projects/altix2/sys/netinet/sctp_indata.h
  projects/altix2/sys/netinet/sctp_input.c
  projects/altix2/sys/netinet/sctp_input.h
  projects/altix2/sys/netinet/sctp_os_bsd.h
  projects/altix2/sys/netinet/sctp_output.c
  projects/altix2/sys/netinet/sctp_output.h
  projects/altix2/sys/netinet/sctp_pcb.c
  projects/altix2/sys/netinet/sctp_pcb.h
  projects/altix2/sys/netinet/sctp_usrreq.c
  projects/altix2/sys/netinet/sctputil.c
  projects/altix2/sys/netinet/sctputil.h
  projects/altix2/sys/netinet6/ip6_mroute.c
  projects/altix2/sys/netinet6/ip6_mroute.h
  projects/altix2/sys/netinet6/mld6.c
  projects/altix2/sys/netinet6/sctp6_usrreq.c
  projects/altix2/sys/powerpc/aim/locore32.S
  projects/altix2/sys/powerpc/aim/locore64.S
  projects/altix2/sys/powerpc/booke/machdep.c
  projects/altix2/sys/powerpc/booke/pmap.c
  projects/altix2/sys/powerpc/booke/trap.c
  projects/altix2/sys/powerpc/booke/trap_subr.S
  projects/altix2/sys/powerpc/conf/DEFAULTS
  projects/altix2/sys/powerpc/conf/GENERIC
  projects/altix2/sys/powerpc/conf/GENERIC64
  projects/altix2/sys/powerpc/mpc85xx/lbc.c
  projects/altix2/sys/powerpc/mpc85xx/lbc.h
  projects/altix2/sys/powerpc/mpc85xx/nexus.c
  projects/altix2/sys/powerpc/powermac/hrowpic.c
  projects/altix2/sys/sparc64/conf/GENERIC
  projects/altix2/sys/sparc64/sparc64/pmap.c
  projects/altix2/sys/sys/file.h
  projects/altix2/sys/sys/imgact_aout.h
  projects/altix2/sys/sys/param.h
  projects/altix2/sys/sys/proc.h
  projects/altix2/sys/ufs/ffs/ffs_alloc.c
  projects/altix2/sys/vm/uma_core.c
  projects/altix2/sys/vm/vm_map.c
  projects/altix2/sys/vm/vm_page.c
  projects/altix2/tools/build/mk/OptionalObsoleteFiles.inc
  projects/altix2/tools/regression/filemon/Makefile
  projects/altix2/tools/test/auxinfo/auxinfo.c
  projects/altix2/tools/tools/ath/common/dumpregs_5416.c
  projects/altix2/tools/tools/netmap/bridge.c
  projects/altix2/tools/tools/netmap/pcap.c
  projects/altix2/usr.bin/killall/killall.1
  projects/altix2/usr.bin/killall/killall.c
  projects/altix2/usr.bin/less/defines.h
  projects/altix2/usr.bin/sockstat/sockstat.c
  projects/altix2/usr.bin/sort/Makefile
  projects/altix2/usr.bin/top/machine.c
  projects/altix2/usr.bin/top/top.local.1
  projects/altix2/usr.bin/xinstall/xinstall.c
  projects/altix2/usr.sbin/Makefile
  projects/altix2/usr.sbin/cron/crontab/crontab.c
  projects/altix2/usr.sbin/crunch/crunchgen/crunched_main.c
  projects/altix2/usr.sbin/crunch/crunchgen/crunchgen.c
  projects/altix2/usr.sbin/crunch/crunchide/crunchide.c
  projects/altix2/usr.sbin/jail/jail.c
  projects/altix2/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  projects/altix2/   (props changed)
  projects/altix2/cddl/contrib/opensolaris/   (props changed)
  projects/altix2/contrib/less/   (props changed)
  projects/altix2/contrib/top/   (props changed)
  projects/altix2/crypto/openssl/   (props changed)
  projects/altix2/lib/libc/   (props changed)
  projects/altix2/sbin/   (props changed)
  projects/altix2/share/man/man4/   (props changed)
  projects/altix2/sys/   (props changed)
  projects/altix2/sys/cddl/contrib/opensolaris/   (props changed)
  projects/altix2/sys/conf/   (props changed)
  projects/altix2/sys/contrib/dev/acpica/   (props changed)
  projects/altix2/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/altix2/usr.sbin/jail/   (props changed)

Modified: projects/altix2/UPDATING
==============================================================================
--- projects/altix2/UPDATING	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/UPDATING	Tue Jul  3 02:55:27 2012	(r238049)
@@ -24,6 +24,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20120628:
+	The sort utility has been replaced with BSD sort.  For now, GNU sort
+	is also available as "gnusort" or the default can be set back to
+	GNU sort by setting WITH_GNU_SORT.  In this case, BSD sort will be
+	installed as "bsdsort".
+
 20120611:
 	A new version of ZFS (pool version 5000) has been merged to -HEAD.
 	Starting with this version the old system of ZFS pool versioning

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -24,7 +24,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
 
 #include <stdlib.h>
 #include <strings.h>
@@ -209,6 +211,83 @@ dt_aggregate_lquantizedcmp(int64_t *lhs,
 	return (0);
 }
 
+static void
+dt_aggregate_llquantize(int64_t *existing, int64_t *new, size_t size)
+{
+	int i;
+
+	for (i = 1; i < size / sizeof (int64_t); i++)
+		existing[i] = existing[i] + new[i];
+}
+
+static long double
+dt_aggregate_llquantizedsum(int64_t *llquanta)
+{
+	int64_t arg = *llquanta++;
+	uint16_t factor = DTRACE_LLQUANTIZE_FACTOR(arg);
+	uint16_t low = DTRACE_LLQUANTIZE_LOW(arg);
+	uint16_t high = DTRACE_LLQUANTIZE_HIGH(arg);
+	uint16_t nsteps = DTRACE_LLQUANTIZE_NSTEP(arg);
+	int bin = 0, order;
+	int64_t value = 1, next, step;
+	long double total;
+
+	assert(nsteps >= factor);
+	assert(nsteps % factor == 0);
+
+	for (order = 0; order < low; order++)
+		value *= factor;
+
+	total = (long double)llquanta[bin++] * (long double)(value - 1);
+
+	next = value * factor;
+	step = next > nsteps ? next / nsteps : 1;
+
+	while (order <= high) {
+		assert(value < next);
+		total += (long double)llquanta[bin++] * (long double)(value);
+
+		if ((value += step) != next)
+			continue;
+
+		next = value * factor;
+		step = next > nsteps ? next / nsteps : 1;
+		order++;
+	}
+
+	return (total + (long double)llquanta[bin] * (long double)value);
+}
+
+static int
+dt_aggregate_llquantizedcmp(int64_t *lhs, int64_t *rhs)
+{
+	long double lsum = dt_aggregate_llquantizedsum(lhs);
+	long double rsum = dt_aggregate_llquantizedsum(rhs);
+	int64_t lzero, rzero;
+
+	if (lsum < rsum)
+		return (DT_LESSTHAN);
+
+	if (lsum > rsum)
+		return (DT_GREATERTHAN);
+
+	/*
+	 * If they're both equal, then we will compare based on the weights at
+	 * zero.  If the weights at zero are equal, then this will be judged a
+	 * tie and will be resolved based on the key comparison.
+	 */
+	lzero = lhs[1];
+	rzero = rhs[1];
+
+	if (lzero < rzero)
+		return (DT_LESSTHAN);
+
+	if (lzero > rzero)
+		return (DT_GREATERTHAN);
+
+	return (0);
+}
+
 static int
 dt_aggregate_quantizedcmp(int64_t *lhs, int64_t *rhs)
 {
@@ -592,6 +671,10 @@ hashnext:
 			h->dtahe_aggregate = dt_aggregate_lquantize;
 			break;
 
+		case DTRACEAGG_LLQUANTIZE:
+			h->dtahe_aggregate = dt_aggregate_llquantize;
+			break;
+
 		case DTRACEAGG_COUNT:
 		case DTRACEAGG_SUM:
 		case DTRACEAGG_AVG:
@@ -859,6 +942,10 @@ dt_aggregate_valcmp(const void *lhs, con
 		rval = dt_aggregate_lquantizedcmp(laddr, raddr);
 		break;
 
+	case DTRACEAGG_LLQUANTIZE:
+		rval = dt_aggregate_llquantizedcmp(laddr, raddr);
+		break;
+
 	case DTRACEAGG_COUNT:
 	case DTRACEAGG_SUM:
 	case DTRACEAGG_MIN:

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -82,6 +82,7 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/sysmacros.h>
 
 #include <assert.h>
 #include <string.h>
@@ -1369,6 +1370,146 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_nod
 		argmax = 5;
 	}
 
+	if (fid->di_id == DTRACEAGG_LLQUANTIZE) {
+		/*
+		 * For log/linear quantizations, we have between one and five
+		 * arguments in addition to the expression:
+		 *
+		 *    arg1 => Factor
+		 *    arg2 => Low magnitude
+		 *    arg3 => High magnitude
+		 *    arg4 => Number of steps per magnitude
+		 *    arg5 => Quantization increment value (defaults to 1)
+		 */
+		dt_node_t *llarg = dnp->dn_aggfun->dn_args->dn_list;
+		uint64_t oarg, order, v;
+		dt_idsig_t *isp;
+		int i;
+
+		struct {
+			char *str;		/* string identifier */
+			int badtype;		/* error on bad type */
+			int badval;		/* error on bad value */
+			int mismatch;		/* error on bad match */
+			int shift;		/* shift value */
+			uint16_t value;		/* value itself */
+		} args[] = {
+			{ "factor", D_LLQUANT_FACTORTYPE,
+			    D_LLQUANT_FACTORVAL, D_LLQUANT_FACTORMATCH,
+			    DTRACE_LLQUANTIZE_FACTORSHIFT },
+			{ "low magnitude", D_LLQUANT_LOWTYPE,
+			    D_LLQUANT_LOWVAL, D_LLQUANT_LOWMATCH,
+			    DTRACE_LLQUANTIZE_LOWSHIFT },
+			{ "high magnitude", D_LLQUANT_HIGHTYPE,
+			    D_LLQUANT_HIGHVAL, D_LLQUANT_HIGHMATCH,
+			    DTRACE_LLQUANTIZE_HIGHSHIFT },
+			{ "linear steps per magnitude", D_LLQUANT_NSTEPTYPE,
+			    D_LLQUANT_NSTEPVAL, D_LLQUANT_NSTEPMATCH,
+			    DTRACE_LLQUANTIZE_NSTEPSHIFT },
+			{ NULL }
+		};
+
+		assert(arg == 0);
+
+		for (i = 0; args[i].str != NULL; i++) {
+			if (llarg->dn_kind != DT_NODE_INT) {
+				dnerror(llarg, args[i].badtype, "llquantize( ) "
+				    "argument #%d (%s) must be an "
+				    "integer constant\n", i + 1, args[i].str);
+			}
+
+			if ((uint64_t)llarg->dn_value > UINT16_MAX) {
+				dnerror(llarg, args[i].badval, "llquantize( ) "
+				    "argument #%d (%s) must be an unsigned "
+				    "16-bit quantity\n", i + 1, args[i].str);
+			}
+
+			args[i].value = (uint16_t)llarg->dn_value;
+
+			assert(!(arg & ((uint64_t)UINT16_MAX <<
+			    args[i].shift)));
+			arg |= ((uint64_t)args[i].value << args[i].shift);
+			llarg = llarg->dn_list;
+		}
+
+		assert(arg != 0);
+
+		if (args[0].value < 2) {
+			dnerror(dnp, D_LLQUANT_FACTORSMALL, "llquantize( ) "
+			    "factor (argument #1) must be two or more\n");
+		}
+
+		if (args[1].value >= args[2].value) {
+			dnerror(dnp, D_LLQUANT_MAGRANGE, "llquantize( ) "
+			    "high magnitude (argument #3) must be greater "
+			    "than low magnitude (argument #2)\n");
+		}
+
+		if (args[3].value < args[0].value) {
+			dnerror(dnp, D_LLQUANT_FACTORNSTEPS, "llquantize( ) "
+			    "factor (argument #1) must be less than or "
+			    "equal to the number of linear steps per "
+			    "magnitude (argument #4)\n");
+		}
+
+		for (v = args[0].value; v < args[3].value; v *= args[0].value)
+			continue;
+
+		if ((args[3].value % args[0].value) || (v % args[3].value)) {
+			dnerror(dnp, D_LLQUANT_FACTOREVEN, "llquantize( ) "
+			    "factor (argument #1) must evenly divide the "
+			    "number of steps per magnitude (argument #4), "
+			    "and the number of steps per magnitude must evenly "
+			    "divide a power of the factor\n");
+		}
+
+		for (i = 0, order = 1; i < args[2].value; i++) {
+			if (order * args[0].value > order) {
+				order *= args[0].value;
+				continue;
+			}
+
+			dnerror(dnp, D_LLQUANT_MAGTOOBIG, "llquantize( ) "
+			    "factor (%d) raised to power of high magnitude "
+			    "(%d) overflows 64-bits\n", args[0].value,
+			    args[2].value);
+		}
+
+		isp = (dt_idsig_t *)aid->di_data;
+
+		if (isp->dis_auxinfo == 0) {
+			/*
+			 * This is the first time we've seen an llquantize()
+			 * for this aggregation; we'll store our argument
+			 * as the auxiliary signature information.
+			 */
+			isp->dis_auxinfo = arg;
+		} else if ((oarg = isp->dis_auxinfo) != arg) {
+			/*
+			 * If we have seen this llquantize() before and the
+			 * argument doesn't match the original argument, pick
+			 * the original argument apart to concisely report the
+			 * mismatch.
+			 */
+			int expected = 0, found = 0;
+
+			for (i = 0; expected == found; i++) {
+				assert(args[i].str != NULL);
+
+				expected = (oarg >> args[i].shift) & UINT16_MAX;
+				found = (arg >> args[i].shift) & UINT16_MAX;
+			}
+
+			dnerror(dnp, args[i - 1].mismatch, "llquantize( ) "
+			    "%s (argument #%d) doesn't match previous "
+			    "declaration: expected %d, found %d\n",
+			    args[i - 1].str, i, expected, found);
+		}
+
+		incr = llarg;
+		argmax = 6;
+	}
+
 	if (fid->di_id == DTRACEAGG_QUANTIZE) {
 		incr = dnp->dn_aggfun->dn_args->dn_list;
 		argmax = 2;

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
+
 #include <stdlib.h>
 #include <strings.h>
 #include <errno.h>
@@ -686,6 +690,121 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FI
 	return (0);
 }
 
+int
+dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
+    size_t size, uint64_t normal)
+{
+	int i, first_bin, last_bin, bin = 1, order, levels;
+	uint16_t factor, low, high, nsteps;
+	const int64_t *data = addr;
+	int64_t value = 1, next, step;
+	char positives = 0, negatives = 0;
+	long double total = 0;
+	uint64_t arg;
+	char c[32];
+
+	if (size < sizeof (uint64_t))
+		return (dt_set_errno(dtp, EDT_DMISMATCH));
+
+	arg = *data++;
+	size -= sizeof (uint64_t);
+
+	factor = DTRACE_LLQUANTIZE_FACTOR(arg);
+	low = DTRACE_LLQUANTIZE_LOW(arg);
+	high = DTRACE_LLQUANTIZE_HIGH(arg);
+	nsteps = DTRACE_LLQUANTIZE_NSTEP(arg);
+
+	/*
+	 * We don't expect to be handed invalid llquantize() parameters here,
+	 * but sanity check them (to a degree) nonetheless.
+	 */
+	if (size > INT32_MAX || factor < 2 || low >= high ||
+	    nsteps == 0 || factor > nsteps)
+		return (dt_set_errno(dtp, EDT_DMISMATCH));
+
+	levels = (int)size / sizeof (uint64_t);
+
+	first_bin = 0;
+	last_bin = levels - 1;
+
+	while (first_bin < levels && data[first_bin] == 0)
+		first_bin++;
+
+	if (first_bin == levels) {
+		first_bin = 0;
+		last_bin = 1;
+	} else {
+		if (first_bin > 0)
+			first_bin--;
+
+		while (last_bin > 0 && data[last_bin] == 0)
+			last_bin--;
+
+		if (last_bin < levels - 1)
+			last_bin++;
+	}
+
+	for (i = first_bin; i <= last_bin; i++) {
+		positives |= (data[i] > 0);
+		negatives |= (data[i] < 0);
+		total += dt_fabsl((long double)data[i]);
+	}
+
+	if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
+	    "------------- Distribution -------------", "count") < 0)
+		return (-1);
+
+	for (order = 0; order < low; order++)
+		value *= factor;
+
+	next = value * factor;
+	step = next > nsteps ? next / nsteps : 1;
+
+	if (first_bin == 0) {
+		(void) snprintf(c, sizeof (c), "< %lld", (long long)value);
+
+		if (dt_printf(dtp, fp, "%16s ", c) < 0)
+			return (-1);
+
+		if (dt_print_quantline(dtp, fp, data[0], normal,
+		    total, positives, negatives) < 0)
+			return (-1);
+	}
+
+	while (order <= high) {
+		if (bin >= first_bin && bin <= last_bin) {
+			if (dt_printf(dtp, fp, "%16lld ", (long long)value) < 0)
+				return (-1);
+
+			if (dt_print_quantline(dtp, fp, data[bin],
+			    normal, total, positives, negatives) < 0)
+				return (-1);
+		}
+
+		assert(value < next);
+		bin++;
+
+		if ((value += step) != next)
+			continue;
+
+		next = value * factor;
+		step = next > nsteps ? next / nsteps : 1;
+		order++;
+	}
+
+	if (last_bin < bin)
+		return (0);
+
+	assert(last_bin == bin);
+	(void) snprintf(c, sizeof (c), ">= %lld", value);
+
+	if (dt_printf(dtp, fp, "%16s ", c) < 0)
+		return (-1);
+
+	return (dt_print_quantline(dtp, fp, data[bin], normal,
+	    total, positives, negatives));
+}
+
 /*ARGSUSED*/
 static int
 dt_print_average(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
@@ -1711,6 +1830,9 @@ dt_print_datum(dtrace_hdl_t *dtp, FILE *
 	case DTRACEAGG_LQUANTIZE:
 		return (dt_print_lquantize(dtp, fp, addr, size, normal));
 
+	case DTRACEAGG_LLQUANTIZE:
+		return (dt_print_llquantize(dtp, fp, addr, size, normal));
+
 	case DTRACEAGG_AVG:
 		return (dt_print_average(dtp, fp, addr, size, normal));
 

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h	Tue Jul  3 02:55:27 2012	(r238049)
@@ -236,6 +236,23 @@ typedef enum {
 	D_LQUANT_MATCHBASE,		/* lquantize() mismatch on base */
 	D_LQUANT_MATCHLIM,		/* lquantize() mismatch on limit */
 	D_LQUANT_MATCHSTEP,		/* lquantize() mismatch on step */
+	D_LLQUANT_FACTORTYPE,		/* llquantize() bad magnitude type */
+	D_LLQUANT_FACTORVAL,		/* llquantize() bad magnitude value */
+	D_LLQUANT_FACTORMATCH,		/* llquantize() mismatch on magnitude */
+	D_LLQUANT_LOWTYPE,		/* llquantize() bad low mag type */
+	D_LLQUANT_LOWVAL,		/* llquantize() bad low mag value */
+	D_LLQUANT_LOWMATCH,		/* llquantize() mismatch on low mag */
+	D_LLQUANT_HIGHTYPE,		/* llquantize() bad high mag type */
+	D_LLQUANT_HIGHVAL,		/* llquantize() bad high mag value */
+	D_LLQUANT_HIGHMATCH,		/* llquantize() mismatch on high mag */
+	D_LLQUANT_NSTEPTYPE,		/* llquantize() bad # steps type */
+	D_LLQUANT_NSTEPVAL,		/* llquantize() bad # steps value */
+	D_LLQUANT_NSTEPMATCH,		/* llquantize() mismatch on # steps */
+	D_LLQUANT_MAGRANGE,		/* llquantize() bad magnitude range */
+	D_LLQUANT_FACTORNSTEPS,		/* llquantize() # steps < factor */
+	D_LLQUANT_FACTOREVEN,		/* llquantize() bad # steps/factor */
+	D_LLQUANT_FACTORSMALL,		/* llquantize() magnitude too small */
+	D_LLQUANT_MAGTOOBIG,		/* llquantize() high mag too large */
 	D_PRINTM_ADDR,			/* printm() memref bad type */
 	D_PRINTM_SIZE,			/* printm() size bad type */
 	D_PRINTT_ADDR,			/* printt() typeref bad type */

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Tue Jul  3 02:55:27 2012	(r238049)
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
+
 #ifndef	_DT_IMPL_H
 #define	_DT_IMPL_H
 
@@ -641,6 +645,8 @@ extern int dt_print_quantize(dtrace_hdl_
     const void *, size_t, uint64_t);
 extern int dt_print_lquantize(dtrace_hdl_t *, FILE *,
     const void *, size_t, uint64_t);
+extern int dt_print_llquantize(dtrace_hdl_t *, FILE *,
+    const void *, size_t, uint64_t);
 extern int dt_print_agg(const dtrace_aggdata_t *, void *);
 
 extern int dt_handle(dtrace_hdl_t *, dtrace_probedata_t *);

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -114,8 +115,9 @@
 #define	DT_VERS_1_6_1	DT_VERSION_NUMBER(1, 6, 1)
 #define	DT_VERS_1_6_2	DT_VERSION_NUMBER(1, 6, 2)
 #define	DT_VERS_1_6_3	DT_VERSION_NUMBER(1, 6, 3)
-#define	DT_VERS_LATEST	DT_VERS_1_6_3
-#define	DT_VERS_STRING	"Sun D 1.6.3"
+#define	DT_VERS_1_7	DT_VERSION_NUMBER(1, 7, 0)
+#define	DT_VERS_LATEST	DT_VERS_1_7
+#define	DT_VERS_STRING	"Sun D 1.7"
 
 const dt_version_t _dtrace_versions[] = {
 	DT_VERS_1_0,	/* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */
@@ -131,6 +133,7 @@ const dt_version_t _dtrace_versions[] = 
 	DT_VERS_1_6_1,	/* D API 1.6.1 */
 	DT_VERS_1_6_2,	/* D API 1.6.2 */
 	DT_VERS_1_6_3,	/* D API 1.6.3 */
+	DT_VERS_1_7,	/* D API 1.7 */
 	0
 };
 
@@ -287,6 +290,9 @@ static const dt_ident_t _dtrace_globals[
 	&dt_idops_func, "stack(...)" },
 { "lltostr", DT_IDENT_FUNC, 0, DIF_SUBR_LLTOSTR, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "string(int64_t)" },
+{ "llquantize", DT_IDENT_AGGFUNC, 0, DTRACEAGG_LLQUANTIZE, DT_ATTR_STABCMN,
+	DT_VERS_1_7, &dt_idops_func,
+	"void(@, int32_t, int32_t, int32_t, int32_t, ...)" },
 { "lquantize", DT_IDENT_AGGFUNC, 0, DTRACEAGG_LQUANTIZE,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "void(@, int32_t, int32_t, ...)" },

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
  */
 
 #if defined(sun)
@@ -1322,6 +1323,14 @@ pfprint_lquantize(dtrace_hdl_t *dtp, FIL
 	return (dt_print_lquantize(dtp, fp, addr, size, normal));
 }
 
+/*ARGSUSED*/
+static int
+pfprint_llquantize(dtrace_hdl_t *dtp, FILE *fp, const char *format,
+    const dt_pfargd_t *pfd, const void *addr, size_t size, uint64_t normal)
+{
+	return (dt_print_llquantize(dtp, fp, addr, size, normal));
+}
+
 static int
 dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
     const dtrace_recdesc_t *recs, uint_t nrecs, const void *buf,
@@ -1507,6 +1516,9 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 		case DTRACEAGG_LQUANTIZE:
 			func = pfprint_lquantize;
 			break;
+		case DTRACEAGG_LLQUANTIZE:
+			func = pfprint_llquantize;
+			break;
 		case DTRACEACT_MOD:
 			func = pfprint_mod;
 			break;

Modified: projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h	Tue Jul  3 02:55:27 2012	(r238049)
@@ -24,11 +24,13 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
+
 #ifndef	_DTRACE_H
 #define	_DTRACE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/dtrace.h>
 #include <stdarg.h>
 #include <stdio.h>

Modified: projects/altix2/contrib/less/LICENSE
==============================================================================
--- projects/altix2/contrib/less/LICENSE	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/LICENSE	Tue Jul  3 02:55:27 2012	(r238049)
@@ -2,7 +2,7 @@
                           ------------
 
 Less
-Copyright (C) 1984-2011  Mark Nudelman
+Copyright (C) 1984-2012  Mark Nudelman
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: projects/altix2/contrib/less/Makefile.aut
==============================================================================
--- projects/altix2/contrib/less/Makefile.aut	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/Makefile.aut	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,6 +1,6 @@
 # Makefile for authoring less.
 
-EMAIL = markn at greenwoodsoftware.com
+EMAIL = bug-less at gnu.org
 HOMEPAGE = http://www.greenwoodsoftware.com/less
 SHELL = /bin/sh
 RCS = rcs
@@ -112,8 +112,7 @@ dist: ${DISTFILES}
 	echo "Preparing $$REL"; \
 	rm -rf $$REL; mkdir $$REL; \
 	for file in ${DISTFILES}; do \
-	  cp -p $$file $$REL; \
-	  chmod -w $$REL/$$file; \
+	  ./add_copyright $$file $$REL; \
 	done; \
 	cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \
 	echo "Creating release/$$REL/$$REL.tar.gz"; \

Modified: projects/altix2/contrib/less/NEWS
==============================================================================
--- projects/altix2/contrib/less/NEWS	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/NEWS	Tue Jul  3 02:55:27 2012	(r238049)
@@ -7,8 +7,34 @@
       http://www.greenwoodsoftware.com/less
   You can also download the latest version of less from there.
 
-  To report bugs, suggestions or comments, send email to 
-  bug-less at gnu.org or markn at greenwoodsoftware.com.
+  To report bugs, suggestions or comments, send email to bug-less at gnu.org.
+
+======================================================================
+
+	Major changes between "less" versions 444 and 449
+
+* Add ESC-F command to keep reading data until a pattern is found.
+
+* Use exit code of LESSOPEN script if LESSOPEN starts with "||".
+
+* When up/down arrow is used on the command line immediately after
+  typing text, the next command starting with that text is found.
+
+* Add support for GNU regex.
+
+* Add configure option --with-regex=none and fix compile errors
+  when compiling with no regex library.
+
+* Fix bugs handling SGR sequences in Win32.
+
+* Fix possible crashes caused by malformed LESSOPEN or 
+  LESSCLOSE variables.
+
+* Fix bug highlighting text which is discontiguous in the file 
+  due to backspace processing.
+
+* Fix bug in displaying status column when scrolling backwards 
+  with -J and -S in effect.
 
 ======================================================================
 

Modified: projects/altix2/contrib/less/README
==============================================================================
--- projects/altix2/contrib/less/README	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/README	Tue Jul  3 02:55:27 2012	(r238049)
@@ -7,9 +7,9 @@
 **************************************************************************
 **************************************************************************
 
-                            Less, version 444
+                            Less, version 449
 
-    This is the distribution of less, version 444, released 09 Jun 2011.
+    This is the distribution of less, version 449, released 26 Jun 2012.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or
@@ -21,7 +21,7 @@
     or
     2. The Less License, in the file LICENSE.
 
-    Please report any problems to bug-less at gnu.org or markn at greenwoodsoftware.com.
+    Please report any problems to bug-less at gnu.org.
     See http://www.greenwoodsoftware.com/less for the latest info.
 
 =========================================================================
@@ -60,10 +60,11 @@ INSTALLATION (Unix systems only):
         regcomp        Use the V8-compatible regcomp.
         regcomp-local  Use Henry Spencer's V8-compatible regcomp
                        (source is supplied with less).
+        none           No regular expressions, only simple string matching.
    --with-secure
      Builds a "secure" version of less, with some features disabled
-	 to prevent users from viewing other files, accessing shell
-	 commands, etc.
+     to prevent users from viewing other files, accessing shell
+     commands, etc.
 
 
 3. It is a good idea to look over the generated Makefile and defines.h
@@ -96,7 +97,7 @@ INSTALLATION (Unix systems only):
    bindir and/or mandir to the appropriate directories.
 
 If you have any problems building or running "less", suggestions, 
-complaints, etc., you may mail to the author at markn at greenwoodsoftware.com.
+complaints, etc., you may mail to bug-less at gnu.org.
 
 Note to hackers: comments noting possible improvements are enclosed
 in double curly brackets {{ like this }}.

Modified: projects/altix2/contrib/less/brac.c
==============================================================================
--- projects/altix2/contrib/less/brac.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/brac.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,12 +1,11 @@
-/*
- * Copyright (C) 1984-2011  Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information about less, or for information on how to 
- * contact the author, see the README file.
- */
+/*
+ * Copyright (C) 1984-2012  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*

Modified: projects/altix2/contrib/less/ch.c
==============================================================================
--- projects/altix2/contrib/less/ch.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/ch.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,12 +1,11 @@
-/*
- * Copyright (C) 1984-2011  Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information about less, or for information on how to 
- * contact the author, see the README file.
- */
+/*
+ * Copyright (C) 1984-2012  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -582,6 +581,8 @@ ch_length()
 		return (NULL_POSITION);
 	if (ch_flags & CH_HELPFILE)
 		return (size_helpdata);
+	if (ch_flags & CH_NODATA)
+		return (0);
 	return (ch_fsize);
 }
 

Modified: projects/altix2/contrib/less/charset.c
==============================================================================
--- projects/altix2/contrib/less/charset.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/charset.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,12 +1,11 @@
-/*
- * Copyright (C) 1984-2011  Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information about less, or for information on how to 
- * contact the author, see the README file.
- */
+/*
+ * Copyright (C) 1984-2012  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*

Modified: projects/altix2/contrib/less/charset.h
==============================================================================
--- projects/altix2/contrib/less/charset.h	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/charset.h	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,12 +1,11 @@
-/*
- * Copyright (C) 2005-2011  Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information about less, or for information on how to 
- * contact the author, see the README file.
- */
+/*
+ * Copyright (C) 1984-2012  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information, see the README file.
+ */
 
 #define IS_ASCII_OCTET(c)   (((c) & 0x80) == 0)
 #define IS_UTF8_TRAIL(c)    (((c) & 0xC0) == 0x80)

Modified: projects/altix2/contrib/less/cmd.h
==============================================================================
--- projects/altix2/contrib/less/cmd.h	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/cmd.h	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,12 +1,11 @@
-/*
- * Copyright (C) 1984-2011  Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information about less, or for information on how to 
- * contact the author, see the README file.
- */
+/*
+ * Copyright (C) 1984-2012  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information, see the README file.
+ */
 
 
 #define	MAX_USERCMD		500
@@ -66,6 +65,7 @@
 #define	A_NEXT_TAG		53
 #define	A_PREV_TAG		54
 #define	A_FILTER		55
+#define	A_F_UNTIL_HILITE	56
 
 #define	A_INVALID		100
 #define	A_NOACTION		101
@@ -78,7 +78,7 @@
 #define	A_EXTRA			0200
 
 
-/* Line editting characters */
+/* Line editing characters */
 
 #define	EC_BACKSPACE	1
 #define	EC_LINEKILL	2

Modified: projects/altix2/contrib/less/cmdbuf.c
==============================================================================
--- projects/altix2/contrib/less/cmdbuf.c	Tue Jul  3 01:45:38 2012	(r238048)
+++ projects/altix2/contrib/less/cmdbuf.c	Tue Jul  3 02:55:27 2012	(r238049)
@@ -1,12 +1,11 @@
-/*
- * Copyright (C) 1984-2011  Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information about less, or for information on how to 
- * contact the author, see the README file.
- */
+/*
+ * Copyright (C) 1984-2012  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -30,6 +29,7 @@ static int prompt_col;		/* Column of cur
 static char *cp;		/* Pointer into cmdbuf */
 static int cmd_offset;		/* Index into cmdbuf of first displayed char */
 static int literal;		/* Next input char should not be interpreted */
+static int updown_match = -1;	/* Prefix length in up/down movement */
 
 #if TAB_COMPLETE_FILENAME
 static int cmd_complete();
@@ -122,6 +122,7 @@ cmd_reset()
 	cmd_offset = 0;
 	literal = 0;
 	cmd_mbc_buf_len = 0;
+	updown_match = -1;
 }
 
 /*
@@ -132,6 +133,7 @@ clear_cmd()
 {
 	cmd_col = prompt_col = 0;
 	cmd_mbc_buf_len = 0;
+	updown_match = -1;
 }
 
 /*
@@ -504,6 +506,7 @@ cmd_ichar(cs, clen)
 	/*
 	 * Reprint the tail of the line from the inserted char.
 	 */
+	updown_match = -1;
 	cmd_repaint(cp);
 	cmd_right();
 	return (CC_OK);
@@ -547,6 +550,7 @@ cmd_erase()
 	/*
 	 * Repaint the buffer after the erased char.
 	 */
+	updown_match = -1;
 	cmd_repaint(cp);
 	
 	/*
@@ -643,6 +647,7 @@ cmd_kill()
 	cmd_offset = 0;
 	cmd_home();
 	*cp = '\0';
+	updown_match = -1;
 	cmd_repaint(cp);
 
 	/*
@@ -675,12 +680,15 @@ set_mlist(mlist, cmdflags)
 #if CMD_HISTORY
 /*
  * Move up or down in the currently selected command history list.
+ * Only consider entries whose first updown_match chars are equal to
+ * cmdbuf's corresponding chars.
  */
 	static int
 cmd_updown(action)
 	int action;
 {
 	char *s;
+	struct mlist *ml;
 	
 	if (curr_mlist == NULL)
 	{
@@ -690,24 +698,47 @@ cmd_updown(action)
 		bell();
 		return (CC_OK);
 	}
-	cmd_home();
-	clear_eol();
+
+	if (updown_match < 0)
+	{
+		updown_match = cp - cmdbuf;
+	}
+
 	/*
-	 * Move curr_mp to the next/prev entry.
+	 * Find the next history entry which matches.
 	 */
-	if (action == EC_UP)
-		curr_mlist->curr_mp = curr_mlist->curr_mp->prev;
-	else
-		curr_mlist->curr_mp = curr_mlist->curr_mp->next;
-	/*
-	 * Copy the entry into cmdbuf and echo it on the screen.
-	 */
-	s = curr_mlist->curr_mp->string;
-	if (s == NULL)
-		s = "";
-	strcpy(cmdbuf, s);
-	for (cp = cmdbuf;  *cp != '\0';  )
-		cmd_right();
+	for (ml = curr_mlist->curr_mp;;)
+	{
+		ml = (action == EC_UP) ? ml->prev : ml->next;
+		if (ml == curr_mlist)
+		{
+			/*
+			 * We reached the end (or beginning) of the list.
+			 */
+			break;
+		}
+		if (strncmp(cmdbuf, ml->string, updown_match) == 0)
+		{
+			/*
+			 * This entry matches; stop here.
+			 * Copy the entry into cmdbuf and echo it on the screen.
+			 */
+			curr_mlist->curr_mp = ml;
+			s = ml->string;
+			if (s == NULL)
+				s = "";
+			strcpy(cmdbuf, s);
+			cmd_home();
+			clear_eol();
+			for (cp = cmdbuf;  *cp != '\0';  )
+				cmd_right();
+			return (CC_OK);
+		}
+	}
+	/*
+	 * We didn't find a history entry that matches.
+	 */
+	bell();
 	return (CC_OK);
 }
 #endif
@@ -1457,9 +1488,6 @@ save_cmdhist()
 	FILE *f;
 	int modified = 0;
 
-	filename = histfile_name();
-	if (filename == NULL)
-		return;
 	if (mlist_search.modified)
 		modified = 1;
 #if SHELL_ESCAPE || PIPEC
@@ -1468,6 +1496,9 @@ save_cmdhist()
 #endif
 	if (!modified)
 		return;
+	filename = histfile_name();

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list