svn commit: r206273 - in projects/ppc64: . bin/cp bin/ls bin/pax bin/rcp bin/sh bin/test cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/comm...

Nathan Whitehorn nwhitehorn at FreeBSD.org
Tue Apr 6 15:02:42 UTC 2010 

Author: nwhitehorn
Date: Tue Apr  6 15:02:41 2010
New Revision: 206273
URL: http://svn.freebsd.org/changeset/base/206273

Log:
  IFC @ 206272. While here, readd t1_reneg.c which svn merge sent into
  limbo at some point in the past (reported by Andreas Tobler).

Added:
  projects/ppc64/crypto/openssl/ssl/t1_reneg.c
  projects/ppc64/lib/libpmc/pmc.corei7.3
     - copied unchanged from r206272, head/lib/libpmc/pmc.corei7.3
  projects/ppc64/lib/libpmc/pmc.corei7uc.3
     - copied unchanged from r206272, head/lib/libpmc/pmc.corei7uc.3
  projects/ppc64/lib/libpmc/pmc.ucf.3
     - copied unchanged from r206272, head/lib/libpmc/pmc.ucf.3
  projects/ppc64/lib/libpmc/pmc.westmere.3
     - copied unchanged from r206272, head/lib/libpmc/pmc.westmere.3
  projects/ppc64/lib/libpmc/pmc.westmereuc.3
     - copied unchanged from r206272, head/lib/libpmc/pmc.westmereuc.3
  projects/ppc64/share/examples/indent/
     - copied from r206272, head/share/examples/indent/
  projects/ppc64/sys/dev/e1000/if_lem.c
     - copied unchanged from r206272, head/sys/dev/e1000/if_lem.c
  projects/ppc64/sys/dev/e1000/if_lem.h
     - copied unchanged from r206272, head/sys/dev/e1000/if_lem.h
  projects/ppc64/sys/dev/hwpmc/hwpmc_uncore.c
     - copied unchanged from r206272, head/sys/dev/hwpmc/hwpmc_uncore.c
  projects/ppc64/sys/dev/hwpmc/hwpmc_uncore.h
     - copied unchanged from r206272, head/sys/dev/hwpmc/hwpmc_uncore.h
  projects/ppc64/sys/modules/alq/
     - copied from r206272, head/sys/modules/alq/
  projects/ppc64/tools/regression/bin/sh/expansion/arith4.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/arith4.0
  projects/ppc64/tools/regression/bin/sh/expansion/arith5.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/arith5.0
  projects/ppc64/tools/regression/bin/sh/expansion/plus-minus2.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/plus-minus2.0
  projects/ppc64/tools/regression/bin/sh/expansion/tilde1.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/tilde1.0
  projects/ppc64/tools/regression/bin/sh/expansion/tilde2.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/tilde2.0
  projects/ppc64/tools/regression/bin/sh/expansion/trim1.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/trim1.0
  projects/ppc64/tools/regression/bin/sh/expansion/trim2.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/expansion/trim2.0
  projects/ppc64/tools/regression/bin/sh/parser/heredoc2.0
     - copied unchanged from r206272, head/tools/regression/bin/sh/parser/heredoc2.0
  projects/ppc64/usr.bin/calendar/dates.c
     - copied unchanged from r206272, head/usr.bin/calendar/dates.c
  projects/ppc64/usr.bin/calendar/events.c
     - copied unchanged from r206272, head/usr.bin/calendar/events.c
  projects/ppc64/usr.bin/calendar/locale.c
     - copied unchanged from r206272, head/usr.bin/calendar/locale.c
  projects/ppc64/usr.bin/calendar/parsedata.c
     - copied unchanged from r206272, head/usr.bin/calendar/parsedata.c
  projects/ppc64/usr.bin/calendar/pom.c
     - copied unchanged from r206272, head/usr.bin/calendar/pom.c
  projects/ppc64/usr.bin/calendar/sunpos.c
     - copied unchanged from r206272, head/usr.bin/calendar/sunpos.c
  projects/ppc64/usr.sbin/services_mkdb/
     - copied from r206272, head/usr.sbin/services_mkdb/
Deleted:
  projects/ppc64/bin/pax/cpio.1
  projects/ppc64/bin/pax/tar.1
  projects/ppc64/contrib/cpio/
  projects/ppc64/gnu/usr.bin/cpio/
  projects/ppc64/sys/ia64/include/nexusvar.h
  projects/ppc64/tools/build/options/WITH_GNU_CPIO
Modified:
  projects/ppc64/MAINTAINERS
  projects/ppc64/ObsoleteFiles.inc
  projects/ppc64/UPDATING
  projects/ppc64/bin/cp/utils.c
  projects/ppc64/bin/ls/cmp.c
  projects/ppc64/bin/pax/Makefile
  projects/ppc64/bin/pax/getoldopt.c
  projects/ppc64/bin/rcp/rcp.c
  projects/ppc64/bin/sh/expand.c
  projects/ppc64/bin/sh/mksyntax.c
  projects/ppc64/bin/sh/options.c
  projects/ppc64/bin/sh/parser.c
  projects/ppc64/bin/sh/sh.1
  projects/ppc64/bin/test/test.c
  projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/ppc64/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/ppc64/contrib/bsnmp/gensnmpdef/gensnmpdef.c
  projects/ppc64/contrib/bsnmp/snmpd/config.c
  projects/ppc64/contrib/top/utils.h
  projects/ppc64/contrib/tzdata/asia
  projects/ppc64/contrib/tzdata/europe
  projects/ppc64/contrib/tzdata/zone.tab
  projects/ppc64/crypto/openssl/CHANGES
  projects/ppc64/crypto/openssl/FAQ
  projects/ppc64/crypto/openssl/Makefile
  projects/ppc64/crypto/openssl/NEWS
  projects/ppc64/crypto/openssl/README
  projects/ppc64/crypto/openssl/apps/req.c
  projects/ppc64/crypto/openssl/apps/speed.c
  projects/ppc64/crypto/openssl/config
  projects/ppc64/crypto/openssl/crypto/asn1/a_object.c
  projects/ppc64/crypto/openssl/crypto/bio/bss_file.c
  projects/ppc64/crypto/openssl/crypto/bn/asm/ppc.pl
  projects/ppc64/crypto/openssl/crypto/bn/asm/x86_64-gcc.c
  projects/ppc64/crypto/openssl/crypto/bn/bn_div.c
  projects/ppc64/crypto/openssl/crypto/engine/eng_all.c
  projects/ppc64/crypto/openssl/crypto/engine/eng_cryptodev.c
  projects/ppc64/crypto/openssl/crypto/evp/digest.c
  projects/ppc64/crypto/openssl/crypto/evp/evp_locl.h
  projects/ppc64/crypto/openssl/crypto/evp/names.c
  projects/ppc64/crypto/openssl/crypto/md32_common.h
  projects/ppc64/crypto/openssl/crypto/ocsp/ocsp_prn.c
  projects/ppc64/crypto/openssl/crypto/opensslv.h
  projects/ppc64/crypto/openssl/crypto/rand/rand_win.c
  projects/ppc64/crypto/openssl/engines/e_capi.c
  projects/ppc64/crypto/openssl/engines/e_chil.c
  projects/ppc64/crypto/openssl/fips/Makefile
  projects/ppc64/crypto/openssl/openssl.spec
  projects/ppc64/crypto/openssl/ssl/kssl.c
  projects/ppc64/crypto/openssl/ssl/s3_pkt.c
  projects/ppc64/etc/inetd.conf
  projects/ppc64/etc/rc.subr
  projects/ppc64/games/fortune/Notes
  projects/ppc64/games/fortune/datfiles/fortunes
  projects/ppc64/games/fortune/datfiles/fortunes-o.real
  projects/ppc64/games/fortune/datfiles/fortunes.sp.ok
  projects/ppc64/games/fortune/datfiles/limerick
  projects/ppc64/games/fortune/datfiles/startrek
  projects/ppc64/games/fortune/datfiles/zippy
  projects/ppc64/gnu/usr.bin/Makefile
  projects/ppc64/gnu/usr.bin/diff/context.c.diff
  projects/ppc64/gnu/usr.bin/diff/diff.c.diff
  projects/ppc64/gnu/usr.bin/gdb/Makefile
  projects/ppc64/gnu/usr.bin/gdb/Makefile.inc
  projects/ppc64/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
  projects/ppc64/include/inttypes.h
  projects/ppc64/include/netdb.h
  projects/ppc64/include/nsswitch.h
  projects/ppc64/lib/libc/db/hash/hash.c
  projects/ppc64/lib/libc/db/hash/hash.h
  projects/ppc64/lib/libc/db/man/hash.3
  projects/ppc64/lib/libc/gen/__getosreldate.c
  projects/ppc64/lib/libc/gen/_spinlock_stub.c
  projects/ppc64/lib/libc/gen/_thread_init.c
  projects/ppc64/lib/libc/net/getservent.c
  projects/ppc64/lib/libc/net/nsdispatch.3
  projects/ppc64/lib/libc/posix1e/acl_to_text_nfs4.c
  projects/ppc64/lib/libc/stdio/printf.3
  projects/ppc64/lib/libc/stdio/vasprintf.c
  projects/ppc64/lib/libc/sys/stat.2
  projects/ppc64/lib/libpmc/Makefile
  projects/ppc64/lib/libpmc/libpmc.c
  projects/ppc64/lib/libstand/Makefile
  projects/ppc64/lib/libstand/assert.c
  projects/ppc64/lib/libusbhid/data.c
  projects/ppc64/lib/libusbhid/descr.c
  projects/ppc64/lib/libusbhid/parse.c
  projects/ppc64/lib/libusbhid/usage.c
  projects/ppc64/lib/libusbhid/usbhid.h
  projects/ppc64/lib/libusbhid/usbvar.h
  projects/ppc64/lib/libz/ChangeLog
  projects/ppc64/lib/libz/README
  projects/ppc64/lib/libz/crc32.c
  projects/ppc64/lib/libz/deflate.c
  projects/ppc64/lib/libz/gzguts.h   (contents, props changed)
  projects/ppc64/lib/libz/gzlib.c
  projects/ppc64/lib/libz/gzread.c
  projects/ppc64/lib/libz/inftrees.c
  projects/ppc64/lib/libz/minigzip.c
  projects/ppc64/lib/libz/zconf.h
  projects/ppc64/lib/libz/zlib.3
  projects/ppc64/lib/libz/zlib.h
  projects/ppc64/lib/libz/zutil.c
  projects/ppc64/lib/libz/zutil.h
  projects/ppc64/libexec/fingerd/fingerd.8
  projects/ppc64/libexec/fingerd/fingerd.c
  projects/ppc64/libexec/ftpd/popen.c
  projects/ppc64/sbin/geom/class/multipath/geom_multipath.c
  projects/ppc64/sbin/hastd/primary.c
  projects/ppc64/sbin/ipfw/ipfw2.c
  projects/ppc64/sbin/setkey/setkey.8
  projects/ppc64/secure/lib/libcrypto/Makefile.inc
  projects/ppc64/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/ppc64/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/ppc64/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/ppc64/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/ppc64/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_f_md.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_f_null.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_find_type.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_new.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_push.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_read.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_file.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_null.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/ppc64/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/ppc64/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/ppc64/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/ppc64/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/ppc64/secure/lib/libcrypto/man/BN_add.3
  projects/ppc64/secure/lib/libcrypto/man/BN_add_word.3
  projects/ppc64/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/ppc64/secure/lib/libcrypto/man/BN_cmp.3
  projects/ppc64/secure/lib/libcrypto/man/BN_copy.3
  projects/ppc64/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/ppc64/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/ppc64/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/ppc64/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/ppc64/secure/lib/libcrypto/man/BN_new.3
  projects/ppc64/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/ppc64/secure/lib/libcrypto/man/BN_rand.3
  projects/ppc64/secure/lib/libcrypto/man/BN_set_bit.3
  projects/ppc64/secure/lib/libcrypto/man/BN_swap.3
  projects/ppc64/secure/lib/libcrypto/man/BN_zero.3
  projects/ppc64/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/ppc64/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/ppc64/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/ppc64/secure/lib/libcrypto/man/DH_generate_key.3
  projects/ppc64/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/ppc64/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/ppc64/secure/lib/libcrypto/man/DH_new.3
  projects/ppc64/secure/lib/libcrypto/man/DH_set_method.3
  projects/ppc64/secure/lib/libcrypto/man/DH_size.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_new.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_set_method.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_sign.3
  projects/ppc64/secure/lib/libcrypto/man/DSA_size.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_error_string.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_get_error.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_put_error.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/ppc64/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/ppc64/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/ppc64/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/ppc64/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/ppc64/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/ppc64/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/ppc64/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/ppc64/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/ppc64/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/ppc64/secure/lib/libcrypto/man/PKCS12_create.3
  projects/ppc64/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/ppc64/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/ppc64/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/ppc64/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/ppc64/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/ppc64/secure/lib/libcrypto/man/RAND_add.3
  projects/ppc64/secure/lib/libcrypto/man/RAND_bytes.3
  projects/ppc64/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/ppc64/secure/lib/libcrypto/man/RAND_egd.3
  projects/ppc64/secure/lib/libcrypto/man/RAND_load_file.3
  projects/ppc64/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_check_key.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_new.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_print.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_set_method.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_sign.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/ppc64/secure/lib/libcrypto/man/RSA_size.3
  projects/ppc64/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/ppc64/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/ppc64/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/ppc64/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/ppc64/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/ppc64/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/ppc64/secure/lib/libcrypto/man/X509_new.3
  projects/ppc64/secure/lib/libcrypto/man/bio.3
  projects/ppc64/secure/lib/libcrypto/man/blowfish.3
  projects/ppc64/secure/lib/libcrypto/man/bn.3
  projects/ppc64/secure/lib/libcrypto/man/bn_internal.3
  projects/ppc64/secure/lib/libcrypto/man/buffer.3
  projects/ppc64/secure/lib/libcrypto/man/crypto.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_X509.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/ppc64/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/ppc64/secure/lib/libcrypto/man/des.3
  projects/ppc64/secure/lib/libcrypto/man/dh.3
  projects/ppc64/secure/lib/libcrypto/man/dsa.3
  projects/ppc64/secure/lib/libcrypto/man/ecdsa.3
  projects/ppc64/secure/lib/libcrypto/man/engine.3
  projects/ppc64/secure/lib/libcrypto/man/err.3
  projects/ppc64/secure/lib/libcrypto/man/evp.3
  projects/ppc64/secure/lib/libcrypto/man/hmac.3
  projects/ppc64/secure/lib/libcrypto/man/lh_stats.3
  projects/ppc64/secure/lib/libcrypto/man/lhash.3
  projects/ppc64/secure/lib/libcrypto/man/md5.3
  projects/ppc64/secure/lib/libcrypto/man/mdc2.3
  projects/ppc64/secure/lib/libcrypto/man/pem.3
  projects/ppc64/secure/lib/libcrypto/man/rand.3
  projects/ppc64/secure/lib/libcrypto/man/rc4.3
  projects/ppc64/secure/lib/libcrypto/man/ripemd.3
  projects/ppc64/secure/lib/libcrypto/man/rsa.3
  projects/ppc64/secure/lib/libcrypto/man/sha.3
  projects/ppc64/secure/lib/libcrypto/man/threads.3
  projects/ppc64/secure/lib/libcrypto/man/ui.3
  projects/ppc64/secure/lib/libcrypto/man/ui_compat.3
  projects/ppc64/secure/lib/libcrypto/man/x509.3
  projects/ppc64/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/ppc64/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_free.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_new.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/ppc64/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/ppc64/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/ppc64/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/ppc64/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/ppc64/secure/lib/libssl/man/SSL_accept.3
  projects/ppc64/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/ppc64/secure/lib/libssl/man/SSL_clear.3
  projects/ppc64/secure/lib/libssl/man/SSL_connect.3
  projects/ppc64/secure/lib/libssl/man/SSL_do_handshake.3
  projects/ppc64/secure/lib/libssl/man/SSL_free.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_error.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_fd.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_rbio.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_session.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/ppc64/secure/lib/libssl/man/SSL_get_version.3
  projects/ppc64/secure/lib/libssl/man/SSL_library_init.3
  projects/ppc64/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/ppc64/secure/lib/libssl/man/SSL_new.3
  projects/ppc64/secure/lib/libssl/man/SSL_pending.3
  projects/ppc64/secure/lib/libssl/man/SSL_read.3
  projects/ppc64/secure/lib/libssl/man/SSL_rstate_string.3
  projects/ppc64/secure/lib/libssl/man/SSL_session_reused.3
  projects/ppc64/secure/lib/libssl/man/SSL_set_bio.3
  projects/ppc64/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/ppc64/secure/lib/libssl/man/SSL_set_fd.3
  projects/ppc64/secure/lib/libssl/man/SSL_set_session.3
  projects/ppc64/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/ppc64/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/ppc64/secure/lib/libssl/man/SSL_shutdown.3
  projects/ppc64/secure/lib/libssl/man/SSL_state_string.3
  projects/ppc64/secure/lib/libssl/man/SSL_want.3
  projects/ppc64/secure/lib/libssl/man/SSL_write.3
  projects/ppc64/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/ppc64/secure/lib/libssl/man/ssl.3
  projects/ppc64/secure/usr.bin/openssl/man/CA.pl.1
  projects/ppc64/secure/usr.bin/openssl/man/asn1parse.1
  projects/ppc64/secure/usr.bin/openssl/man/ca.1
  projects/ppc64/secure/usr.bin/openssl/man/ciphers.1
  projects/ppc64/secure/usr.bin/openssl/man/crl.1
  projects/ppc64/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/ppc64/secure/usr.bin/openssl/man/dgst.1
  projects/ppc64/secure/usr.bin/openssl/man/dhparam.1
  projects/ppc64/secure/usr.bin/openssl/man/dsa.1
  projects/ppc64/secure/usr.bin/openssl/man/dsaparam.1
  projects/ppc64/secure/usr.bin/openssl/man/ec.1
  projects/ppc64/secure/usr.bin/openssl/man/ecparam.1
  projects/ppc64/secure/usr.bin/openssl/man/enc.1
  projects/ppc64/secure/usr.bin/openssl/man/errstr.1
  projects/ppc64/secure/usr.bin/openssl/man/gendsa.1
  projects/ppc64/secure/usr.bin/openssl/man/genrsa.1
  projects/ppc64/secure/usr.bin/openssl/man/nseq.1
  projects/ppc64/secure/usr.bin/openssl/man/ocsp.1
  projects/ppc64/secure/usr.bin/openssl/man/openssl.1
  projects/ppc64/secure/usr.bin/openssl/man/passwd.1
  projects/ppc64/secure/usr.bin/openssl/man/pkcs12.1
  projects/ppc64/secure/usr.bin/openssl/man/pkcs7.1
  projects/ppc64/secure/usr.bin/openssl/man/pkcs8.1
  projects/ppc64/secure/usr.bin/openssl/man/rand.1
  projects/ppc64/secure/usr.bin/openssl/man/req.1
  projects/ppc64/secure/usr.bin/openssl/man/rsa.1
  projects/ppc64/secure/usr.bin/openssl/man/rsautl.1
  projects/ppc64/secure/usr.bin/openssl/man/s_client.1
  projects/ppc64/secure/usr.bin/openssl/man/s_server.1
  projects/ppc64/secure/usr.bin/openssl/man/s_time.1
  projects/ppc64/secure/usr.bin/openssl/man/sess_id.1
  projects/ppc64/secure/usr.bin/openssl/man/smime.1
  projects/ppc64/secure/usr.bin/openssl/man/speed.1
  projects/ppc64/secure/usr.bin/openssl/man/spkac.1
  projects/ppc64/secure/usr.bin/openssl/man/verify.1
  projects/ppc64/secure/usr.bin/openssl/man/version.1
  projects/ppc64/secure/usr.bin/openssl/man/x509.1
  projects/ppc64/secure/usr.bin/openssl/man/x509v3_config.1
  projects/ppc64/share/man/man5/nsswitch.conf.5
  projects/ppc64/share/man/man5/services.5
  projects/ppc64/share/man/man5/src.conf.5
  projects/ppc64/share/man/man7/build.7
  projects/ppc64/share/man/man9/ieee80211.9
  projects/ppc64/share/man/man9/ieee80211_crypto.9
  projects/ppc64/share/man/man9/ieee80211_node.9
  projects/ppc64/share/man/man9/ieee80211_output.9
  projects/ppc64/share/man/man9/ieee80211_scan.9
  projects/ppc64/share/misc/committers-ports.dot
  projects/ppc64/share/mk/bsd.lib.mk
  projects/ppc64/share/mk/bsd.own.mk
  projects/ppc64/share/mk/bsd.port.mk
  projects/ppc64/share/mk/bsd.prog.mk
  projects/ppc64/share/mk/sys.mk
  projects/ppc64/sys/amd64/amd64/apic_vector.S
  projects/ppc64/sys/amd64/amd64/local_apic.c
  projects/ppc64/sys/amd64/amd64/pmap.c
  projects/ppc64/sys/amd64/include/apicvar.h
  projects/ppc64/sys/amd64/include/pmc_mdep.h
  projects/ppc64/sys/amd64/include/reg.h
  projects/ppc64/sys/amd64/linux32/linux.h
  projects/ppc64/sys/arm/conf/KB920X
  projects/ppc64/sys/arm/mv/mv_sata.c
  projects/ppc64/sys/arm/xscale/ixp425/cambria_fled.c
  projects/ppc64/sys/boot/i386/boot2/boot2.c
  projects/ppc64/sys/boot/i386/gptboot/gptboot.c
  projects/ppc64/sys/boot/i386/zfsboot/zfsboot.c
  projects/ppc64/sys/boot/powerpc/ps3/Makefile
  projects/ppc64/sys/boot/powerpc/ps3/conf.c
  projects/ppc64/sys/boot/powerpc/ps3/ps3cons.c
  projects/ppc64/sys/boot/powerpc/ps3/ps3net.c
  projects/ppc64/sys/cam/cam_xpt.c
  projects/ppc64/sys/cam/scsi/scsi_all.h
  projects/ppc64/sys/cam/scsi/scsi_da.c
  projects/ppc64/sys/compat/freebsd32/freebsd32.h
  projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c
  projects/ppc64/sys/compat/ia32/ia32_signal.h
  projects/ppc64/sys/compat/linprocfs/linprocfs.c
  projects/ppc64/sys/compat/linux/linux_ioctl.c
  projects/ppc64/sys/compat/linux/linux_stats.c
  projects/ppc64/sys/compat/svr4/svr4_stat.c
  projects/ppc64/sys/compat/x86bios/x86bios.c
  projects/ppc64/sys/conf/NOTES
  projects/ppc64/sys/conf/files
  projects/ppc64/sys/conf/files.amd64
  projects/ppc64/sys/conf/files.i386
  projects/ppc64/sys/conf/files.pc98
  projects/ppc64/sys/conf/kern.mk
  projects/ppc64/sys/conf/kern.post.mk
  projects/ppc64/sys/conf/kern.pre.mk
  projects/ppc64/sys/conf/kmod.mk
  projects/ppc64/sys/contrib/dev/acpica/changes.txt
  projects/ppc64/sys/contrib/dev/acpica/common/dmextern.c
  projects/ppc64/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/ppc64/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/ppc64/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/ppc64/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/ppc64/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/ppc64/sys/contrib/dev/acpica/debugger/dbdisply.c
  projects/ppc64/sys/contrib/dev/acpica/events/evgpe.c
  projects/ppc64/sys/contrib/dev/acpica/events/evgpeblk.c
  projects/ppc64/sys/contrib/dev/acpica/events/evxface.c
  projects/ppc64/sys/contrib/dev/acpica/events/evxfevnt.c
  projects/ppc64/sys/contrib/dev/acpica/executer/exdebug.c
  projects/ppc64/sys/contrib/dev/acpica/executer/exmutex.c
  projects/ppc64/sys/contrib/dev/acpica/executer/exoparg2.c
  projects/ppc64/sys/contrib/dev/acpica/executer/exregion.c
  projects/ppc64/sys/contrib/dev/acpica/include/acevents.h
  projects/ppc64/sys/contrib/dev/acpica/include/acexcep.h
  projects/ppc64/sys/contrib/dev/acpica/include/acglobal.h
  projects/ppc64/sys/contrib/dev/acpica/include/aclocal.h
  projects/ppc64/sys/contrib/dev/acpica/include/acpixf.h
  projects/ppc64/sys/contrib/dev/acpica/include/actables.h
  projects/ppc64/sys/contrib/dev/acpica/include/actypes.h
  projects/ppc64/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/ppc64/sys/contrib/dev/acpica/parser/psxface.c
  projects/ppc64/sys/contrib/dev/acpica/tables/tbutils.c
  projects/ppc64/sys/contrib/dev/acpica/tables/tbxface.c
  projects/ppc64/sys/contrib/dev/acpica/utilities/utglobal.c
  projects/ppc64/sys/dev/acpica/acpi.c
  projects/ppc64/sys/dev/acpica/acpi_button.c
  projects/ppc64/sys/dev/acpica/acpi_ec.c
  projects/ppc64/sys/dev/acpica/acpi_lid.c
  projects/ppc64/sys/dev/acpica/acpivar.h
  projects/ppc64/sys/dev/ata/ata-all.h
  projects/ppc64/sys/dev/ata/ata-raid.c
  projects/ppc64/sys/dev/bce/if_bce.c
  projects/ppc64/sys/dev/bce/if_bcereg.h
  projects/ppc64/sys/dev/bge/if_bge.c
  projects/ppc64/sys/dev/bktr/ioctl_bt848.h
  projects/ppc64/sys/dev/bktr/ioctl_meteor.h
  projects/ppc64/sys/dev/cxgb/common/cxgb_ael1002.c
  projects/ppc64/sys/dev/cxgb/common/cxgb_common.h
  projects/ppc64/sys/dev/cxgb/common/cxgb_t3_hw.c
  projects/ppc64/sys/dev/cxgb/cxgb_adapter.h
  projects/ppc64/sys/dev/cxgb/cxgb_main.c
  projects/ppc64/sys/dev/cxgb/cxgb_sge.c
  projects/ppc64/sys/dev/e1000/e1000_80003es2lan.c
  projects/ppc64/sys/dev/e1000/e1000_82571.c
  projects/ppc64/sys/dev/e1000/e1000_82575.c
  projects/ppc64/sys/dev/e1000/e1000_82575.h
  projects/ppc64/sys/dev/e1000/e1000_defines.h
  projects/ppc64/sys/dev/e1000/e1000_hw.h
  projects/ppc64/sys/dev/e1000/e1000_ich8lan.c
  projects/ppc64/sys/dev/e1000/e1000_ich8lan.h
  projects/ppc64/sys/dev/e1000/e1000_mac.c
  projects/ppc64/sys/dev/e1000/e1000_manage.c
  projects/ppc64/sys/dev/e1000/e1000_phy.c
  projects/ppc64/sys/dev/e1000/e1000_regs.h
  projects/ppc64/sys/dev/e1000/if_em.c
  projects/ppc64/sys/dev/e1000/if_em.h
  projects/ppc64/sys/dev/e1000/if_igb.c
  projects/ppc64/sys/dev/e1000/if_igb.h
  projects/ppc64/sys/dev/fb/vesa.c
  projects/ppc64/sys/dev/firewire/sbp.c
  projects/ppc64/sys/dev/hwpmc/hwpmc_core.c
  projects/ppc64/sys/dev/hwpmc/hwpmc_core.h
  projects/ppc64/sys/dev/hwpmc/hwpmc_intel.c
  projects/ppc64/sys/dev/hwpmc/hwpmc_logging.c
  projects/ppc64/sys/dev/hwpmc/hwpmc_mod.c
  projects/ppc64/sys/dev/hwpmc/pmc_events.h
  projects/ppc64/sys/dev/isp/isp.c
  projects/ppc64/sys/dev/isp/isp_freebsd.c
  projects/ppc64/sys/dev/isp/isp_freebsd.h
  projects/ppc64/sys/dev/isp/isp_library.c
  projects/ppc64/sys/dev/isp/ispvar.h
  projects/ppc64/sys/dev/ixgbe/LICENSE
  projects/ppc64/sys/dev/ixgbe/ixgbe.c
  projects/ppc64/sys/dev/ixgbe/ixgbe.h
  projects/ppc64/sys/dev/ixgbe/ixgbe_82598.c
  projects/ppc64/sys/dev/ixgbe/ixgbe_82599.c
  projects/ppc64/sys/dev/ixgbe/ixgbe_api.c
  projects/ppc64/sys/dev/ixgbe/ixgbe_api.h
  projects/ppc64/sys/dev/ixgbe/ixgbe_common.c
  projects/ppc64/sys/dev/ixgbe/ixgbe_phy.c
  projects/ppc64/sys/dev/ixgbe/ixgbe_phy.h
  projects/ppc64/sys/dev/ixgbe/ixgbe_type.h
  projects/ppc64/sys/dev/malo/if_malo.c
  projects/ppc64/sys/dev/mpt/mpt_cam.c
  projects/ppc64/sys/dev/ofw/ofw_standard.c
  projects/ppc64/sys/dev/sound/pci/envy24.c
  projects/ppc64/sys/dev/sound/pci/envy24.h
  projects/ppc64/sys/dev/sound/pci/envy24ht.c
  projects/ppc64/sys/dev/sound/pci/envy24ht.h
  projects/ppc64/sys/dev/sound/pci/es137x.c
  projects/ppc64/sys/dev/sound/pci/spicds.c
  projects/ppc64/sys/dev/sound/pci/spicds.h
  projects/ppc64/sys/dev/sound/pcm/dsp.c
  projects/ppc64/sys/dev/syscons/scvidctl.c
  projects/ppc64/sys/dev/syscons/syscons.c
  projects/ppc64/sys/dev/ubsec/ubsec.c
  projects/ppc64/sys/dev/usb/controller/ehci_pci.c
  projects/ppc64/sys/dev/usb/controller/ohci_pci.c
  projects/ppc64/sys/dev/usb/input/ukbd.c
  projects/ppc64/sys/dev/usb/quirk/usb_quirk.c
  projects/ppc64/sys/dev/usb/usb_compat_linux.c
  projects/ppc64/sys/dev/usb/usbdevs
  projects/ppc64/sys/fs/coda/cnode.h
  projects/ppc64/sys/fs/coda/coda.h
  projects/ppc64/sys/fs/coda/coda_subr.c
  projects/ppc64/sys/fs/coda/coda_subr.h
  projects/ppc64/sys/fs/coda/coda_venus.c
  projects/ppc64/sys/fs/coda/coda_venus.h
  projects/ppc64/sys/fs/coda/coda_vfsops.c
  projects/ppc64/sys/fs/coda/coda_vfsops.h
  projects/ppc64/sys/fs/coda/coda_vnops.c
  projects/ppc64/sys/fs/deadfs/dead_vnops.c
  projects/ppc64/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/ppc64/sys/fs/nfs/nfs_commonport.c
  projects/ppc64/sys/fs/nfs/nfs_commonsubs.c
  projects/ppc64/sys/fs/nfs/nfs_var.h
  projects/ppc64/sys/fs/nfs/nfsport.h
  projects/ppc64/sys/fs/nfs/nfsrvstate.h
  projects/ppc64/sys/fs/nfsserver/nfs_nfsdport.c
  projects/ppc64/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/ppc64/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/ppc64/sys/geom/geom_vfs.c
  projects/ppc64/sys/geom/multipath/g_multipath.c
  projects/ppc64/sys/i386/i386/apic_vector.s
  projects/ppc64/sys/i386/i386/local_apic.c
  projects/ppc64/sys/i386/i386/pmap.c
  projects/ppc64/sys/i386/ibcs2/ibcs2_stat.c
  projects/ppc64/sys/i386/include/apicvar.h
  projects/ppc64/sys/i386/include/pmc_mdep.h
  projects/ppc64/sys/i386/linux/linux.h
  projects/ppc64/sys/ia64/conf/GENERIC
  projects/ppc64/sys/ia64/ia64/autoconf.c
  projects/ppc64/sys/ia64/ia64/clock.c
  projects/ppc64/sys/ia64/ia64/interrupt.c
  projects/ppc64/sys/ia64/ia64/machdep.c
  projects/ppc64/sys/ia64/ia64/mp_machdep.c
  projects/ppc64/sys/ia64/ia64/nexus.c
  projects/ppc64/sys/ia64/ia64/sapic.c
  projects/ppc64/sys/ia64/ia64/trap.c
  projects/ppc64/sys/ia64/include/acpica_machdep.h
  projects/ppc64/sys/ia64/include/cpufunc.h
  projects/ppc64/sys/ia64/include/intr.h
  projects/ppc64/sys/ia64/include/pcpu.h
  projects/ppc64/sys/kern/init_main.c
  projects/ppc64/sys/kern/kern_alq.c
  projects/ppc64/sys/kern/kern_event.c
  projects/ppc64/sys/kern/kern_sig.c
  projects/ppc64/sys/kern/sys_pipe.c
  projects/ppc64/sys/kern/tty_pts.c
  projects/ppc64/sys/kern/uipc_mqueue.c
  projects/ppc64/sys/kern/uipc_sem.c
  projects/ppc64/sys/kern/uipc_shm.c
  projects/ppc64/sys/kern/vfs_bio.c
  projects/ppc64/sys/kern/vfs_default.c
  projects/ppc64/sys/kern/vfs_lookup.c
  projects/ppc64/sys/kern/vfs_subr.c
  projects/ppc64/sys/kern/vfs_syscalls.c
  projects/ppc64/sys/kern/vfs_vnops.c
  projects/ppc64/sys/mips/conf/AR71XX
  projects/ppc64/sys/mips/include/cpufunc.h
  projects/ppc64/sys/mips/mips/support.S
  projects/ppc64/sys/mips/sibyte/sb_asm.S
  projects/ppc64/sys/mips/sibyte/sb_scd.c
  projects/ppc64/sys/modules/Makefile
  projects/ppc64/sys/modules/em/Makefile
  projects/ppc64/sys/modules/hwpmc/Makefile
  projects/ppc64/sys/modules/ixgbe/Makefile
  projects/ppc64/sys/net/bpf.c
  projects/ppc64/sys/net80211/ieee80211_hostap.c
  projects/ppc64/sys/net80211/ieee80211_input.c
  projects/ppc64/sys/net80211/ieee80211_var.h
  projects/ppc64/sys/netgraph/ng_deflate.c
  projects/ppc64/sys/netgraph/ng_ksocket.c
  projects/ppc64/sys/netgraph/ng_l2tp.c
  projects/ppc64/sys/netgraph/ng_mppc.c
  projects/ppc64/sys/netgraph/ng_ppp.c
  projects/ppc64/sys/netgraph/ng_pptpgre.c
  projects/ppc64/sys/netgraph/ng_tcpmss.c
  projects/ppc64/sys/netinet/in.h
  projects/ppc64/sys/netinet/ipfw/ip_dn_io.c
  projects/ppc64/sys/netinet/ipfw/ip_fw_sockopt.c
  projects/ppc64/sys/netinet/sctp_asconf.c
  projects/ppc64/sys/netinet/sctp_constants.h
  projects/ppc64/sys/netinet/sctp_indata.c
  projects/ppc64/sys/netinet/sctp_indata.h
  projects/ppc64/sys/netinet/sctp_input.c
  projects/ppc64/sys/netinet/sctp_output.c
  projects/ppc64/sys/netinet/sctp_output.h
  projects/ppc64/sys/netinet/sctp_pcb.c
  projects/ppc64/sys/netinet/sctp_pcb.h
  projects/ppc64/sys/netinet/sctp_structs.h
  projects/ppc64/sys/netinet/sctp_usrreq.c
  projects/ppc64/sys/netinet/sctp_var.h
  projects/ppc64/sys/netinet/sctputil.c
  projects/ppc64/sys/netinet/sctputil.h
  projects/ppc64/sys/netinet6/sctp6_usrreq.c
  projects/ppc64/sys/netipsec/ipsec.c
  projects/ppc64/sys/netipsec/key.c
  projects/ppc64/sys/nfsserver/nfs_srvsubs.c
  projects/ppc64/sys/powerpc/ofw/ofw_real.c
  projects/ppc64/sys/powerpc/ofw/ofw_syscons.c
  projects/ppc64/sys/sparc64/fhc/fhc.c
  projects/ppc64/sys/sparc64/pci/apb.c
  projects/ppc64/sys/sparc64/pci/psycho.c
  projects/ppc64/sys/sparc64/pci/schizo.c
  projects/ppc64/sys/sparc64/sbus/sbus.c
  projects/ppc64/sys/sparc64/sparc64/trap.c
  projects/ppc64/sys/sys/_timespec.h
  projects/ppc64/sys/sys/ioccom.h
  projects/ppc64/sys/sys/pcpu.h
  projects/ppc64/sys/sys/pmc.h
  projects/ppc64/sys/sys/proc.h
  projects/ppc64/sys/sys/stat.h
  projects/ppc64/sys/sys/timespec.h
  projects/ppc64/sys/sys/vnode.h
  projects/ppc64/sys/sys/vtoc.h
  projects/ppc64/sys/teken/teken.c
  projects/ppc64/sys/ufs/ffs/ffs_vfsops.c
  projects/ppc64/sys/vm/vm_fault.c
  projects/ppc64/sys/vm/vm_map.c
  projects/ppc64/sys/vm/vm_map.h
  projects/ppc64/sys/vm/vm_page.c
  projects/ppc64/sys/vm/vm_pageout.c
  projects/ppc64/tools/build/mk/OptionalObsoleteFiles.inc
  projects/ppc64/tools/tools/nanobsd/gateworks/common
  projects/ppc64/tools/tools/nanobsd/nanobsd.sh
  projects/ppc64/usr.bin/calendar/Makefile
  projects/ppc64/usr.bin/calendar/calendar.1
  projects/ppc64/usr.bin/calendar/calendar.c
  projects/ppc64/usr.bin/calendar/calendar.h
  projects/ppc64/usr.bin/calendar/calendars/calendar.australia
  projects/ppc64/usr.bin/calendar/calendars/calendar.dutch
  projects/ppc64/usr.bin/calendar/calendars/calendar.freebsd
  projects/ppc64/usr.bin/calendar/day.c
  projects/ppc64/usr.bin/calendar/io.c
  projects/ppc64/usr.bin/calendar/ostern.c
  projects/ppc64/usr.bin/calendar/paskha.c
  projects/ppc64/usr.bin/calendar/pathnames.h
  projects/ppc64/usr.bin/compress/compress.c
  projects/ppc64/usr.bin/cpio/Makefile
  projects/ppc64/usr.bin/getent/getent.c
  projects/ppc64/usr.bin/gzip/gzip.c
  projects/ppc64/usr.bin/indent/args.c
  projects/ppc64/usr.bin/indent/indent.1
  projects/ppc64/usr.bin/indent/indent.c
  projects/ppc64/usr.bin/indent/indent_globs.h
  projects/ppc64/usr.bin/indent/lexi.c
  projects/ppc64/usr.bin/kdump/kdump.c
  projects/ppc64/usr.bin/mail/util.c
  projects/ppc64/usr.bin/make/main.c
  projects/ppc64/usr.bin/sed/main.c
  projects/ppc64/usr.bin/sed/sed.1
  projects/ppc64/usr.bin/sockstat/sockstat.c
  projects/ppc64/usr.bin/touch/touch.c
  projects/ppc64/usr.sbin/Makefile
  projects/ppc64/usr.sbin/ac/ac.c
  projects/ppc64/usr.sbin/config/config.y
  projects/ppc64/usr.sbin/config/lang.l
  projects/ppc64/usr.sbin/config/main.c
  projects/ppc64/usr.sbin/config/mkmakefile.c
  projects/ppc64/usr.sbin/config/mkoptions.c
  projects/ppc64/usr.sbin/mailwrapper/mailwrapper.8
  projects/ppc64/usr.sbin/mailwrapper/mailwrapper.c
  projects/ppc64/usr.sbin/mtree/compare.c
  projects/ppc64/usr.sbin/mtree/create.c
  projects/ppc64/usr.sbin/mtree/mtree.8
  projects/ppc64/usr.sbin/pkg_install/add/futil.c
  projects/ppc64/usr.sbin/pkg_install/add/perform.c
  projects/ppc64/usr.sbin/pkg_install/delete/perform.c
  projects/ppc64/usr.sbin/pkg_install/lib/file.c
  projects/ppc64/usr.sbin/pkg_install/lib/lib.h
  projects/ppc64/usr.sbin/pkg_install/lib/match.c
  projects/ppc64/usr.sbin/pkg_install/lib/pen.c
  projects/ppc64/usr.sbin/pkg_install/lib/plist.c
  projects/ppc64/usr.sbin/pkg_install/lib/url.c
  projects/ppc64/usr.sbin/pkg_install/version/perform.c
  projects/ppc64/usr.sbin/pmcstat/pmcpl_callgraph.c
  projects/ppc64/usr.sbin/pmcstat/pmcpl_calltree.c
  projects/ppc64/usr.sbin/pmcstat/pmcstat_log.c
  projects/ppc64/usr.sbin/pmcstat/pmcstat_log.h
  projects/ppc64/usr.sbin/sysinstall/sysinstall.8
  projects/ppc64/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  projects/ppc64/   (props changed)
  projects/ppc64/contrib/expat/   (props changed)
  projects/ppc64/contrib/groff/   (props changed)
  projects/ppc64/contrib/one-true-awk/   (props changed)
  projects/ppc64/contrib/tzcode/stdtime/   (props changed)
  projects/ppc64/contrib/tzcode/zic/   (props changed)
  projects/ppc64/contrib/tzdata/   (props changed)
  projects/ppc64/crypto/openssl/   (props changed)
  projects/ppc64/lib/libz/   (props changed)
  projects/ppc64/sys/   (props changed)
  projects/ppc64/sys/contrib/dev/acpica/   (props changed)
  projects/ppc64/sys/contrib/x86emu/   (props changed)
  projects/ppc64/sys/dev/xen/xenpci/   (props changed)

Modified: projects/ppc64/MAINTAINERS
==============================================================================
--- projects/ppc64/MAINTAINERS	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/MAINTAINERS	Tue Apr  6 15:02:41 2010	(r206273)
@@ -57,9 +57,9 @@ libfetch	des	Advance notification reques
 fetch		des	Advance notification requested.
 libpam		des	Pre-commit review requested.
 openssh		des	Pre-commit review requested.
-pseudofs	des	Advance notification requested.
-procfs		des	Advance notification requested.
-linprocfs	des	Advance notification requested.
+pseudofs	des	Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
 newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.

Modified: projects/ppc64/ObsoleteFiles.inc
==============================================================================
--- projects/ppc64/ObsoleteFiles.inc	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/ObsoleteFiles.inc	Tue Apr  6 15:02:41 2010	(r206273)
@@ -14,6 +14,14 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100326: [ia64] removed <machine/nexusvar.h>
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
 # 20100322: libz update
 OLD_LIBS+=lib/libz.so.5
 .if ${TARGET_ARCH} == "amd64"

Modified: projects/ppc64/UPDATING
==============================================================================
--- projects/ppc64/UPDATING	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/UPDATING	Tue Apr  6 15:02:41 2010	(r206273)
@@ -22,6 +22,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	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

Modified: projects/ppc64/bin/cp/utils.c
==============================================================================
--- projects/ppc64/bin/cp/utils.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/cp/utils.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -323,8 +323,8 @@ setfile(struct stat *fs, int fd)
 	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
 		       S_IRWXU | S_IRWXG | S_IRWXO;
 
-	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
+	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
 	if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
 		warn("%sutimes: %s", islink ? "l" : "", to.p_path);
 		rval = 1;

Modified: projects/ppc64/bin/ls/cmp.c
==============================================================================
--- projects/ppc64/bin/ls/cmp.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/ls/cmp.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -66,17 +66,17 @@ int
 modcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_mtimespec.tv_sec >
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec >
+	    a->fts_statp->st_mtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_sec <
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec <
+	    a->fts_statp->st_mtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_mtimespec.tv_nsec >
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec >
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_nsec <
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec <
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -92,17 +92,17 @@ int
 acccmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_atimespec.tv_sec >
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec >
+	    a->fts_statp->st_atim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_sec <
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec <
+	    a->fts_statp->st_atim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_atimespec.tv_nsec >
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec >
+	    a->fts_statp->st_atim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_nsec <
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec <
+	    a->fts_statp->st_atim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -118,17 +118,17 @@ int
 birthcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_birthtimespec.tv_sec >
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec >
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_sec <
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec <
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec >
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec >
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec <
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec <
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -144,17 +144,17 @@ int
 statcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_ctimespec.tv_sec >
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec >
+	    a->fts_statp->st_ctim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_sec <
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec <
+	    a->fts_statp->st_ctim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_ctimespec.tv_nsec >
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec >
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_nsec <
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec <
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }

Modified: projects/ppc64/bin/pax/Makefile
==============================================================================
--- projects/ppc64/bin/pax/Makefile	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/pax/Makefile	Tue Apr  6 15:02:41 2010	(r206273)
@@ -29,8 +29,5 @@ PROG=   pax
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
-#XXX NOTYET
-#MAN=	pax.1 tar.1 cpio.1
-#LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
 
 .include <bsd.prog.mk>

Modified: projects/ppc64/bin/pax/getoldopt.c
==============================================================================
--- projects/ppc64/bin/pax/getoldopt.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/pax/getoldopt.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*-
@@ -7,7 +7,7 @@
  * otherwise, it uses the old rules used by tar, dump, and ps.
  *
  * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
  */
 
 #include <sys/cdefs.h>
@@ -33,7 +33,8 @@ getoldopt(int argc, char **argv, const c
 	optarg = NULL;
 
 	if (key == NULL) {		/* First time */
-		if (argc < 2) return EOF;
+		if (argc < 2)
+			return (-1);
 		key = argv[1];
 		if (*key == '-')
 			use_getopt++;
@@ -42,18 +43,18 @@ getoldopt(int argc, char **argv, const c
 	}
 
 	if (use_getopt)
-		return getopt(argc, argv, optstring);
+		return (getopt(argc, argv, optstring));
 
 	c = *key++;
 	if (c == '\0') {
 		key--;
-		return EOF;
+		return (-1);
 	}
 	place = strchr(optstring, c);
 
 	if (place == NULL || c == ':') {
 		fprintf(stderr, "%s: unknown option %c\n", argv[0], c);
-		return('?');
+		return ('?');
 	}
 
 	place++;
@@ -64,9 +65,9 @@ getoldopt(int argc, char **argv, const c
 		} else {
 			fprintf(stderr, "%s: %c argument missing\n",
 				argv[0], c);
-			return('?');
+			return ('?');
 		}
 	}
 
-	return(c);
+	return (c);
 }

Modified: projects/ppc64/bin/rcp/rcp.c
==============================================================================
--- projects/ppc64/bin/rcp/rcp.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/rcp/rcp.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -390,8 +390,8 @@ syserr:			run_err("%s: %s", name, strerr
 			 * versions expecting microseconds.
 			 */
 			(void)snprintf(buf, sizeof(buf), "T%ld 0 %ld 0\n",
-			    (long)stb.st_mtimespec.tv_sec,
-			    (long)stb.st_atimespec.tv_sec);
+			    (long)stb.st_mtim.tv_sec,
+			    (long)stb.st_atim.tv_sec);
 			(void)write(rem, buf, strlen(buf));
 			if (response() < 0)
 				goto next;
@@ -454,8 +454,8 @@ rsource(char *name, struct stat *statp)
 		last++;
 	if (pflag) {
 		(void)snprintf(path, sizeof(path), "T%ld 0 %ld 0\n",
-		    (long)statp->st_mtimespec.tv_sec,
-		    (long)statp->st_atimespec.tv_sec);
+		    (long)statp->st_mtim.tv_sec,
+		    (long)statp->st_atim.tv_sec);
 		(void)write(rem, path, strlen(path));
 		if (response() < 0) {
 			closedir(dirp);

Modified: projects/ppc64/bin/sh/expand.c
==============================================================================
--- projects/ppc64/bin/sh/expand.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/sh/expand.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -273,7 +273,6 @@ exptilde(char *p, int flag)
 		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 @@ exptilde(char *p, int flag)
 				goto done;
 			break;
 		case '/':
+		case CTLENDVAR:
 			goto done;
 		}
 		p++;
@@ -506,7 +506,9 @@ subevalvar(char *p, char *str, int strlo
 	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;

Modified: projects/ppc64/bin/sh/mksyntax.c
==============================================================================
--- projects/ppc64/bin/sh/mksyntax.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/sh/mksyntax.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -232,8 +232,6 @@ main(int argc __unused, char **argv __un
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("`", "CBQUOTE");
-	add("'", "CSQUOTE");
-	add("\"", "CDQUOTE");
 	add("$", "CVAR");
 	add("}", "CENDVAR");
 	add("(", "CLP");

Modified: projects/ppc64/bin/sh/options.c
==============================================================================
--- projects/ppc64/bin/sh/options.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/sh/options.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -93,8 +93,11 @@ procargs(int argc, char **argv)
 	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++)

Modified: projects/ppc64/bin/sh/parser.c
==============================================================================
--- projects/ppc64/bin/sh/parser.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/sh/parser.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -79,6 +79,10 @@ struct heredoc {
 	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 struct heredoc *heredoc;
 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 synerror(const char *);
 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 @@ parsecmd(int interact)
 {
 	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 @@ breakloop:
 }
 
 
+#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 @@ done:
 #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 @@ readtoken1(int firstc, char const *synta
 	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 @@ readtoken1(int firstc, char const *synta
 		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 @@ readtoken1(int firstc, char const *synta
 				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 @@ readtoken1(int firstc, char const *synta
 					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 @@ readtoken1(int firstc, char const *synta
 				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;
-							else
-								dblquote = 0;
 						} else
 							USTPUTC(')', out);
 					} else {
@@ -1184,13 +1271,15 @@ readtoken1(int firstc, char const *synta
 				}
 				break;
 			case CBQUOTE:	/* '`' */
-				out = parsebackq(out, &bqlist, 1, dblquote,
-						arinest || dblquote);
+				out = parsebackq(out, &bqlist, 1,
+				    state[level].syntax == DQSYNTAX &&
+				    (eofmark == NULL || newvarnest > 0),
+				    state[level].syntax == DQSYNTAX || state[level].syntax == ARISYNTAX);
 				break;
 			case CEOF:
 				goto endword;		/* exit outer loop */
 			default:
-				if (varnest == 0)
+				if (level == 0)
 					goto endword;	/* exit outer loop */
 				USTPUTC(c, out);
 			}
@@ -1198,14 +1287,17 @@ readtoken1(int firstc, char const *synta
 		}
 	}
 endword:
-	if (syntax == ARISYNTAX)
+	if (state[level].syntax == ARISYNTAX)
 		synerror("Missing '))'");
-	if (syntax != BASESYNTAX && eofmark == NULL)
+	if (state[level].syntax != BASESYNTAX && eofmark == NULL)
 		synerror("Unterminated quoted string");
-	if (varnest != 0) {
+	if (state[level].category == TSTATE_VAR_OLD ||
+	    state[level].category == TSTATE_VAR_NEW) {
 		startlinno = plinno;
 		synerror("Missing '}'");
 	}
+	if (state != state_static)
+		parser_temp_free_upto(state);
 	USTPUTC('\0', out);
 	len = out - stackblock();
 	out = stackblock();
@@ -1228,7 +1320,6 @@ endword:
 /* end of readtoken routine */
 
 
-
 /*
  * Check to see whether we are at the end of the here document.  When this
  * is called, c is set to the first character of the next input line.  If
@@ -1345,8 +1436,11 @@ parsesub: {
 			PARSEARITH();
 		} else {
 			pungetc();
-			out = parsebackq(out, &bqlist, 0, dblquote,
-					arinest || dblquote);
+			out = parsebackq(out, &bqlist, 0,
+			    state[level].syntax == DQSYNTAX &&
+			    (eofmark == NULL || newvarnest > 0),
+			    state[level].syntax == DQSYNTAX ||
+			    state[level].syntax == ARISYNTAX);
 		}
 	} else {
 		USTPUTC(CTLVAR, out);
@@ -1401,6 +1495,8 @@ parsesub: {
 				subtype = VSERROR;
 				if (c == '}')
 					pungetc();
+				else if (c == '\n' || c == PEOF)
+					synerror("Unexpected end of line in substitution");
 				else
 					USTPUTC(c, out);
 			} else {
@@ -1417,6 +1513,8 @@ parsesub: {
 			default:
 				p = strchr(types, c);
 				if (p == NULL) {
+					if (c == '\n' || c == PEOF)
+						synerror("Unexpected end of line in substitution");
 					if (flags == VSNUL)
 						STPUTC(':', out);
 					STPUTC(c, out);
@@ -1442,11 +1540,44 @@ parsesub: {
 			pungetc();
 		}
 		STPUTC('=', out);
-		if (subtype != VSLENGTH && (dblquote || arinest))
+		if (subtype != VSLENGTH && (state[level].syntax == DQSYNTAX ||
+		    state[level].syntax == ARISYNTAX))
 			flags |= VSQUOTE;
 		*(stackblock() + typeloc) = subtype | flags;
-		if (subtype != VSNORMAL)
-			varnest++;
+		if (subtype != VSNORMAL) {
+			if (level + 1 >= maxnest) {
+				maxnest *= 2;
+				if (state == state_static) {
+					state = parser_temp_alloc(
+					    maxnest * sizeof(*state));
+					memcpy(state, state_static,
+					    MAXNEST_STATIC * sizeof(*state));
+				} else
+					state = parser_temp_realloc(state,
+					    maxnest * sizeof(*state));
+			}
+			level++;
+			state[level].parenlevel = 0;
+			if (subtype == VSMINUS || subtype == VSPLUS ||
+			    subtype == VSQUESTION || subtype == VSASSIGN) {
+				/*
+				 * For operators that were in the Bourne shell,
+				 * inherit the double-quote state.
+				 */
+				state[level].syntax = state[level - 1].syntax;
+				state[level].category = TSTATE_VAR_OLD;
+			} else {
+				/*
+				 * The other operators take a pattern,
+				 * so go to BASESYNTAX.
+				 * Also, ' and " are now special, even
+				 * in here documents.
+				 */
+				state[level].syntax = BASESYNTAX;
+				state[level].category = TSTATE_VAR_NEW;
+				newvarnest++;
+			}
+		}
 	}
 	goto parsesub_return;
 }
@@ -1457,21 +1588,26 @@ parsesub: {
  */
 parsearith: {
 
-	if (++arinest == 1) {
-		prevsyntax = syntax;
-		syntax = ARISYNTAX;
-		USTPUTC(CTLARI, out);
-		if (dblquote)
-			USTPUTC('"',out);
-		else
-			USTPUTC(' ',out);
-	} else {
-		/*
-		 * we collapse embedded arithmetic expansion to
-		 * parenthesis, which should be equivalent
-		 */
-		USTPUTC('(', out);
+	if (level + 1 >= maxnest) {
+		maxnest *= 2;
+		if (state == state_static) {
+			state = parser_temp_alloc(
+			    maxnest * sizeof(*state));
+			memcpy(state, state_static,
+			    MAXNEST_STATIC * sizeof(*state));
+		} else
+			state = parser_temp_realloc(state,
+			    maxnest * sizeof(*state));
 	}
+	level++;
+	state[level].syntax = ARISYNTAX;
+	state[level].parenlevel = 0;
+	state[level].category = TSTATE_ARITH;
+	USTPUTC(CTLARI, out);
+	if (state[level - 1].syntax == DQSYNTAX)
+		USTPUTC('"',out);
+	else
+		USTPUTC(' ',out);
 	goto parsearith_return;
 }
 

Modified: projects/ppc64/bin/sh/sh.1
==============================================================================
--- projects/ppc64/bin/sh/sh.1	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/sh/sh.1	Tue Apr  6 15:02:41 2010	(r206273)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2010
+.Dd April 5, 2010
 .Dt SH 1
 .Os
 .Sh NAME
@@ -210,7 +210,8 @@ Enable the built-in
 .Xr emacs 1
 command line editor (disables the
 .Fl V
-option if it has been set).
+option if it has been set;
+set automatically when interactive on terminals).
 .It Fl e Li errexit
 Exit immediately if any untested command fails in non-interactive mode.
 The exit status of a command is considered to be
@@ -1178,10 +1179,20 @@ consists of all characters until the mat
 .Ql } .
 Any
 .Ql }
-escaped by a backslash or within a quoted string, and characters in
+escaped by a backslash or within a single-quoted string, and characters in
 embedded arithmetic expansions, command substitutions, and variable
 expansions, are not examined in determining the matching
 .Ql } .
+Except for the variants with
+.Ql + ,
+.Ql - ,
+.Ql =
+or
+.Ql ?\& ,
+any
+.Ql }
+within a double-quoted string is also not examined in determining the matching
+.Ql } .
 .Pp
 The simplest form for parameter expansion is:
 .Pp
@@ -1265,6 +1276,14 @@ is substituted.
 In the parameter expansions shown previously, use of the colon in the
 format results in a test for a parameter that is unset or null; omission
 of the colon results in a test for a parameter that is only unset.
+.Pp
+The
+.Ar word
+inherits the type of quoting
+(unquoted, double-quoted or here-document)
+from the surroundings,
+with the exception that a backslash that quotes a closing brace is removed
+during quote removal.
 .Bl -tag -width indent
 .It Li ${# Ns Ar parameter Ns Li }
 String Length.

Modified: projects/ppc64/bin/test/test.c
==============================================================================
--- projects/ppc64/bin/test/test.c	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/bin/test/test.c	Tue Apr  6 15:02:41 2010	(r206273)
@@ -572,12 +572,12 @@ newerf (const char *f1, const char *f2)
 	if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
 		return 0;
 
-	if (b1.st_mtimespec.tv_sec > b2.st_mtimespec.tv_sec)
+	if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec)
 		return 1;
-	if (b1.st_mtimespec.tv_sec < b2.st_mtimespec.tv_sec)
+	if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec)
 		return 0;
 
-       return (b1.st_mtimespec.tv_nsec > b2.st_mtimespec.tv_nsec);
+       return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec);
 }
 
 static int

Modified: projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Apr  6 14:35:30 2010	(r206272)
+++ projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Apr  6 15:02:41 2010	(r206273)
@@ -1,24 +1,9 @@
 '\" te
-.\" CDDL HEADER START
-.\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").  
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
-.\" Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
-.TH zfs 1M "8 Apr 2008" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
+.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH zfs 1M "14 Feb 2009" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 zfs \- configures ZFS file systems
 .SH SYNOPSIS
@@ -44,7 +29,8 @@ zfs \- configures ZFS file systems
 
 .LP
 .nf
-\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem at snapname\fR|\fIvolume at snapname\fR
+\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... 
+      \fIfilesystem at snapname\fR|\fIvolume at snapname\fR
 .fi
 
 .LP
@@ -54,7 +40,7 @@ zfs \- configures ZFS file systems
 
 .LP
 .nf
-\fBzfs\fR \fBclone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
+\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
 .fi
 
 .LP
@@ -65,7 +51,7 @@ zfs \- configures ZFS file systems
 .LP
 .nf
 \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR 
-    \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
+     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
 .fi
 
 .LP
@@ -81,23 +67,23 @@ zfs \- configures ZFS file systems
 .LP
 .nf
 \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]]
-    [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
+     [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
 .fi
 
 .LP
 .nf
-\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ...
+\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|snapshot ...
 .fi
 
 .LP
 .nf
 \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]] "\fIall\fR" | \fIproperty\fR[,...]
-     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
+      \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
 .fi
 
 .LP
 .nf
-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR ...
+\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ...
 .fi
 
 .LP
@@ -132,12 +118,12 @@ zfs \- configures ZFS file systems
 
 .LP
 .nf
-\fBzfs\fR \fBunshare\fR  \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
+\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
 .fi
 
 .LP
 .nf
-\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fB-iI\fR] \fIsnapshot\fR] \fIsnapshot\fR
+\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
 .fi
 
 .LP
@@ -153,7 +139,7 @@ zfs \- configures ZFS file systems
 .LP
 .nf
 \fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI at setname\fR[,...] 
-    \fIfilesystem\fR|\fIvolume\fR
+     \fIfilesystem\fR|\fIvolume\fR
 .fi
 
 .LP
@@ -174,7 +160,7 @@ zfs \- configures ZFS file systems
 .LP
 .nf
 \fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]] 
-    \fIfilesystem\fR|\fIvolume\fR
+     \fIfilesystem\fR|\fIvolume\fR
 .fi
 
 .LP
@@ -192,20 +178,10 @@ zfs \- configures ZFS file systems
 \fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @setname [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
 .fi
 
-.LP
-.nf
-\fBzfs\fR \fBjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
-.fi
-.LP
-.nf
-\fBzfs\fR \fBunjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
-.fi
-
 .SH DESCRIPTION
 .sp
 .LP
-The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A
-dataset is identified by a unique path within the \fBZFS\fR namespace. For example:

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

More information about the svn-src-projects mailing list