From ngie at FreeBSD.org Wed Oct 1 04:07:24 2014 From: ngie at FreeBSD.org (Garrett Cooper) Date: Wed, 1 Oct 2014 04:07:19 +0000 (UTC) Subject: svn commit: r272343 - in vendor/NetBSD/tests: . dist dist/bin dist/bin/cat dist/bin/cp dist/bin/dd dist/bin/df dist/bin/expr dist/bin/pax dist/bin/ps dist/bin/sh dist/bin/sh/dotcmd dist/bin/sh/dotc... Message-ID: <201410010407.s9147JQg021511@svn.freebsd.org> Author: ngie Date: Wed Oct 1 04:07:17 2014 New Revision: 272343 URL: https://svnweb.freebsd.org/changeset/base/272343 Log: Check in first src/tests snapshot from NetBSD anoncvs Sources were obtained like so: % export CVSROOT="anoncvs at anoncvs.NetBSD.org:/cvsroot" % cvs -z9 co -D "09/30/2014 20:45" -P src/tests % mv src/tests/* tests/dist/. '*CVS*' has been added to svn:ignore to ease updating periodically from upstream Some line ending issues had to be resolved with test outputs and scripts via dos2unix and by deleting the eol-style property set in usr.bin/sort Discussed with: rpaulo Sponsored by: EMC / Isilon Storage Division Added: vendor/NetBSD/tests/ vendor/NetBSD/tests/dist/Makefile (contents, props changed) vendor/NetBSD/tests/dist/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/README vendor/NetBSD/tests/dist/bin/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/cat/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/cat/d_align.in (contents, props changed) vendor/NetBSD/tests/dist/bin/cat/d_align.out vendor/NetBSD/tests/dist/bin/cat/t_cat.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/cp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/cp/t_cp.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/dd/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/dd/t_dd.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/df/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/df/getmntinfo.c (contents, props changed) vendor/NetBSD/tests/dist/bin/df/t_df.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/expr/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/expr/t_expr.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/pax/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/pax/t_pax.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/ps/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/ps/keywords vendor/NetBSD/tests/dist/bin/ps/t_ps.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/dotcmd/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/case_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/compound_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/file_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/for_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/func_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/subshell_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/until_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_break_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_continue_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_case.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_compound.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_file.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_for.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_func.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_subshell.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_until.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/while_return_while.out vendor/NetBSD/tests/dist/bin/sh/dotcmd/scoped_command (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/dotcmd/t_dotcmd.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_compexit.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_evaltested.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_exit.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_expand.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_fsplit.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_here.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_set_e.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_ulimit.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_varquote.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_wait.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sleep/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/sleep/t_sleep.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/tar/Makefile (contents, props changed) vendor/NetBSD/tests/dist/bin/tar/t_tar.sh (contents, props changed) vendor/NetBSD/tests/dist/crypto/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/bn/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/div/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/exp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/cast/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/conf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/conf/d_conf.out vendor/NetBSD/tests/dist/crypto/libcrypto/conf/d_conf_ssleay.cnf vendor/NetBSD/tests/dist/crypto/libcrypto/des/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/dh/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/dsa/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ec/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ecdh/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ecdsa/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/engine/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/evp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/hmac/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/idea/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/lhash/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/md2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/md4/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/md5/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/mdc2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rand/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rc2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rc4/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rc5/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ripemd/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rsa/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/sha/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/sha1/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/srp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/t_certs.sh (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/t_ciphers.sh (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/t_hashes.sh (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/t_libcrypto.sh (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/t_pubkey.sh (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/threads/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/x509v3/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/Makefile (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_aesctr1.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_aesctr2.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_arc4.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_camellia.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_cbcdes.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_comp.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_comp_zlib.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_comp_zlib_rnd.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_gcm.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_md5.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_md5hmac.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_null.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_sha1hmac.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/h_xcbcmac.c (contents, props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/t_opencrypto.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/dev/audio/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/audio/h_pad.c (contents, props changed) vendor/NetBSD/tests/dist/dev/audio/h_pad_musa.c (contents, props changed) vendor/NetBSD/tests/dist/dev/audio/t_pad.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/audio/t_pad_output.bz2.uue vendor/NetBSD/tests/dist/dev/cgd/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/cgd/paramsfile vendor/NetBSD/tests/dist/dev/cgd/t_cgd.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/dm/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/dm/dm_targets_cmd.plist (contents, props changed) vendor/NetBSD/tests/dist/dev/dm/dm_version_cmd.plist (contents, props changed) vendor/NetBSD/tests/dist/dev/dm/h_dm.c (contents, props changed) vendor/NetBSD/tests/dist/dev/dm/t_dm.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/md/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/md/h_mdserv.c (contents, props changed) vendor/NetBSD/tests/dist/dev/md/t_md.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/raidframe/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/raidframe/t_raid.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/scsipi/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/scsipi/libscsitest/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/scsipi/libscsitest/SCSITEST.ioconf vendor/NetBSD/tests/dist/dev/scsipi/libscsitest/scsitest.c (contents, props changed) vendor/NetBSD/tests/dist/dev/scsipi/libscsitest/scsitest.h (contents, props changed) vendor/NetBSD/tests/dist/dev/scsipi/libscsitest/scsitest_component.c (contents, props changed) vendor/NetBSD/tests/dist/dev/scsipi/t_cd.c (contents, props changed) vendor/NetBSD/tests/dist/dev/sysmon/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/sysmon/t_swsensor.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/sysmon/t_swwdog.c (contents, props changed) vendor/NetBSD/tests/dist/fs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/fs/cd9660/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/cd9660/pr_48787.image.bz2.uue vendor/NetBSD/tests/dist/fs/cd9660/t_high_ino_big_file.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/common/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_ext2fs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_ffs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_lfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_msdosfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_nfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_puffs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_rumpfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_sysvbfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_tmpfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_udf.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_v7fs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/fstest_zfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/common/h_fsmacros.h (contents, props changed) vendor/NetBSD/tests/dist/fs/common/snapshot.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/ffs_common.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/h_ffs_server.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/h_quota2_tests.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/quotas_common.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_clearquota.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_fifos.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_getquota.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_miscquota.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_mount.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_quota2_1.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_quota2_remount.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_quotalimit.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_setquota.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_snapshot.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_log.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_v2.c (contents, props changed) vendor/NetBSD/tests/dist/fs/fifofs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/fifofs/t_fifo.c (contents, props changed) vendor/NetBSD/tests/dist/fs/h_funcs.subr vendor/NetBSD/tests/dist/fs/hfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/hfs/colon.hfs.bz2.uue vendor/NetBSD/tests/dist/fs/hfs/t_pathconvert.c (contents, props changed) vendor/NetBSD/tests/dist/fs/kernfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/kernfs/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/fs/lfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/lfs/t_pr.c (contents, props changed) vendor/NetBSD/tests/dist/fs/msdosfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/msdosfs/t_snapshot.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/README vendor/NetBSD/tests/dist/fs/nfs/nfsservice/exports vendor/NetBSD/tests/dist/fs/nfs/nfsservice/getmntinfo.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/mountd.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/nfsd.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/pathnames.h (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/check_bound.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/pmap_svc.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcb_stat.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcb_svc.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcbind.8 (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcbind.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/rpcbind.h (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/security.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/util.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rumpnfsd.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/t_mountd.c (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/t_rquotad.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/nullfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/nullfs/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/fs/psshfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/psshfs/h_have_puffs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/psshfs/ssh_config.in (contents, props changed) vendor/NetBSD/tests/dist/fs/psshfs/ssh_host_key vendor/NetBSD/tests/dist/fs/psshfs/ssh_host_key.pub vendor/NetBSD/tests/dist/fs/psshfs/sshd_config.in (contents, props changed) vendor/NetBSD/tests/dist/fs/psshfs/t_psshfs.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/ptyfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/ptyfs/t_nullpts.c (contents, props changed) vendor/NetBSD/tests/dist/fs/ptyfs/t_ptyfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/dtfs.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/dtfs.h (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/dtfs_subr.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/dtfs_vfsops.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/dtfs_vnops.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/t_fuzz.c (contents, props changed) vendor/NetBSD/tests/dist/fs/puffs/t_io.c (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/README vendor/NetBSD/tests/dist/fs/tmpfs/h_funcs.subr vendor/NetBSD/tests/dist/fs/tmpfs/h_tools.c (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_create.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_devices.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_dots.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_exec.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_link.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_mkdir.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_mknod.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_mount.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_pipes.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_read_write.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_readdir.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_remove.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_rename.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_renamerace.c (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_rmdir.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_setattr.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_sizes.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_sockets.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_statvfs.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_symlink.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_times.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_trail_slash.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_truncate.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_vnd.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/tmpfs/t_vnode_leak.sh (contents, props changed) vendor/NetBSD/tests/dist/fs/umapfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/umapfs/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/fs/union/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/union/t_pr.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_full.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_io.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_renamerace.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_rmdirrace.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_ro.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_union.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_unpriv.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_vfsops.c (contents, props changed) vendor/NetBSD/tests/dist/fs/vfs/t_vnops.c (contents, props changed) vendor/NetBSD/tests/dist/fs/zfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/zfs/t_zpool.sh (contents, props changed) vendor/NetBSD/tests/dist/games/Makefile (contents, props changed) vendor/NetBSD/tests/dist/games/t_factor.sh (contents, props changed) vendor/NetBSD/tests/dist/h_macros.h (contents, props changed) vendor/NetBSD/tests/dist/include/Makefile (contents, props changed) vendor/NetBSD/tests/dist/include/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/include/d_bitstring_27.out vendor/NetBSD/tests/dist/include/d_bitstring_32.out vendor/NetBSD/tests/dist/include/d_bitstring_49.out vendor/NetBSD/tests/dist/include/d_bitstring_64.out vendor/NetBSD/tests/dist/include/d_bitstring_67.out vendor/NetBSD/tests/dist/include/d_bitstring_8.out vendor/NetBSD/tests/dist/include/machine/Makefile (contents, props changed) vendor/NetBSD/tests/dist/include/machine/t_bswap.c (contents, props changed) vendor/NetBSD/tests/dist/include/sys/Makefile (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_bitops.c (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_bootblock.c (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_cdefs.c (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_socket.c (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_tree.c (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_types.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_bitstring.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_errno.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_glob.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_inttypes.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_limits.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_netdb.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_paths.c (contents, props changed) vendor/NetBSD/tests/dist/include/t_stdint.c (contents, props changed) vendor/NetBSD/tests/dist/ipf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/.cvsignore vendor/NetBSD/tests/dist/ipf/expected/Makefile (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/bpf-f1 vendor/NetBSD/tests/dist/ipf/expected/bpf1 vendor/NetBSD/tests/dist/ipf/expected/f1 vendor/NetBSD/tests/dist/ipf/expected/f10 vendor/NetBSD/tests/dist/ipf/expected/f11 vendor/NetBSD/tests/dist/ipf/expected/f12 vendor/NetBSD/tests/dist/ipf/expected/f13 vendor/NetBSD/tests/dist/ipf/expected/f14 vendor/NetBSD/tests/dist/ipf/expected/f15 vendor/NetBSD/tests/dist/ipf/expected/f16 vendor/NetBSD/tests/dist/ipf/expected/f17 vendor/NetBSD/tests/dist/ipf/expected/f18 vendor/NetBSD/tests/dist/ipf/expected/f19 vendor/NetBSD/tests/dist/ipf/expected/f2 vendor/NetBSD/tests/dist/ipf/expected/f20 vendor/NetBSD/tests/dist/ipf/expected/f21 vendor/NetBSD/tests/dist/ipf/expected/f22 vendor/NetBSD/tests/dist/ipf/expected/f24 vendor/NetBSD/tests/dist/ipf/expected/f25 vendor/NetBSD/tests/dist/ipf/expected/f26 vendor/NetBSD/tests/dist/ipf/expected/f27 vendor/NetBSD/tests/dist/ipf/expected/f28 vendor/NetBSD/tests/dist/ipf/expected/f29 vendor/NetBSD/tests/dist/ipf/expected/f3 vendor/NetBSD/tests/dist/ipf/expected/f30 vendor/NetBSD/tests/dist/ipf/expected/f4 vendor/NetBSD/tests/dist/ipf/expected/f5 vendor/NetBSD/tests/dist/ipf/expected/f6 vendor/NetBSD/tests/dist/ipf/expected/f7 vendor/NetBSD/tests/dist/ipf/expected/f8 vendor/NetBSD/tests/dist/ipf/expected/f9 vendor/NetBSD/tests/dist/ipf/expected/i1 vendor/NetBSD/tests/dist/ipf/expected/i10 vendor/NetBSD/tests/dist/ipf/expected/i11 vendor/NetBSD/tests/dist/ipf/expected/i12 vendor/NetBSD/tests/dist/ipf/expected/i13 vendor/NetBSD/tests/dist/ipf/expected/i14 vendor/NetBSD/tests/dist/ipf/expected/i15 vendor/NetBSD/tests/dist/ipf/expected/i16 vendor/NetBSD/tests/dist/ipf/expected/i17 vendor/NetBSD/tests/dist/ipf/expected/i18 vendor/NetBSD/tests/dist/ipf/expected/i19.dist vendor/NetBSD/tests/dist/ipf/expected/i2 vendor/NetBSD/tests/dist/ipf/expected/i20 vendor/NetBSD/tests/dist/ipf/expected/i21 vendor/NetBSD/tests/dist/ipf/expected/i22 vendor/NetBSD/tests/dist/ipf/expected/i23 vendor/NetBSD/tests/dist/ipf/expected/i3 vendor/NetBSD/tests/dist/ipf/expected/i4 vendor/NetBSD/tests/dist/ipf/expected/i5 vendor/NetBSD/tests/dist/ipf/expected/i6 vendor/NetBSD/tests/dist/ipf/expected/i7 vendor/NetBSD/tests/dist/ipf/expected/i8 vendor/NetBSD/tests/dist/ipf/expected/i9 vendor/NetBSD/tests/dist/ipf/expected/in1 vendor/NetBSD/tests/dist/ipf/expected/in100 vendor/NetBSD/tests/dist/ipf/expected/in100_6 vendor/NetBSD/tests/dist/ipf/expected/in101 vendor/NetBSD/tests/dist/ipf/expected/in101_6 vendor/NetBSD/tests/dist/ipf/expected/in102 vendor/NetBSD/tests/dist/ipf/expected/in102_6 vendor/NetBSD/tests/dist/ipf/expected/in1_6 vendor/NetBSD/tests/dist/ipf/expected/in2 vendor/NetBSD/tests/dist/ipf/expected/in2_6 vendor/NetBSD/tests/dist/ipf/expected/in3 vendor/NetBSD/tests/dist/ipf/expected/in3_6 vendor/NetBSD/tests/dist/ipf/expected/in4 vendor/NetBSD/tests/dist/ipf/expected/in4_6 vendor/NetBSD/tests/dist/ipf/expected/in5 vendor/NetBSD/tests/dist/ipf/expected/in5_6 vendor/NetBSD/tests/dist/ipf/expected/in6 vendor/NetBSD/tests/dist/ipf/expected/in6_6 vendor/NetBSD/tests/dist/ipf/expected/in7 vendor/NetBSD/tests/dist/ipf/expected/in8_6 vendor/NetBSD/tests/dist/ipf/expected/ip1 vendor/NetBSD/tests/dist/ipf/expected/ip2 vendor/NetBSD/tests/dist/ipf/expected/ip3 vendor/NetBSD/tests/dist/ipf/expected/ipv6.1 (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/ipv6.2 (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/ipv6.3 (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/ipv6.4 (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/ipv6.5 (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/ipv6.6 (contents, props changed) vendor/NetBSD/tests/dist/ipf/expected/l1 vendor/NetBSD/tests/dist/ipf/expected/l1.b vendor/NetBSD/tests/dist/ipf/expected/n1 vendor/NetBSD/tests/dist/ipf/expected/n10 vendor/NetBSD/tests/dist/ipf/expected/n100 vendor/NetBSD/tests/dist/ipf/expected/n101 vendor/NetBSD/tests/dist/ipf/expected/n102 vendor/NetBSD/tests/dist/ipf/expected/n103 vendor/NetBSD/tests/dist/ipf/expected/n104 vendor/NetBSD/tests/dist/ipf/expected/n105 vendor/NetBSD/tests/dist/ipf/expected/n106 vendor/NetBSD/tests/dist/ipf/expected/n11 vendor/NetBSD/tests/dist/ipf/expected/n11_6 vendor/NetBSD/tests/dist/ipf/expected/n12 vendor/NetBSD/tests/dist/ipf/expected/n12_6 vendor/NetBSD/tests/dist/ipf/expected/n13 vendor/NetBSD/tests/dist/ipf/expected/n13_6 vendor/NetBSD/tests/dist/ipf/expected/n14 vendor/NetBSD/tests/dist/ipf/expected/n14_6 vendor/NetBSD/tests/dist/ipf/expected/n15 vendor/NetBSD/tests/dist/ipf/expected/n15_6 vendor/NetBSD/tests/dist/ipf/expected/n16 vendor/NetBSD/tests/dist/ipf/expected/n17 vendor/NetBSD/tests/dist/ipf/expected/n18 vendor/NetBSD/tests/dist/ipf/expected/n1_6 vendor/NetBSD/tests/dist/ipf/expected/n2 vendor/NetBSD/tests/dist/ipf/expected/n200 vendor/NetBSD/tests/dist/ipf/expected/n2_6 vendor/NetBSD/tests/dist/ipf/expected/n3 vendor/NetBSD/tests/dist/ipf/expected/n4 vendor/NetBSD/tests/dist/ipf/expected/n4_6 vendor/NetBSD/tests/dist/ipf/expected/n5 vendor/NetBSD/tests/dist/ipf/expected/n5_6 vendor/NetBSD/tests/dist/ipf/expected/n6 vendor/NetBSD/tests/dist/ipf/expected/n6_6 vendor/NetBSD/tests/dist/ipf/expected/n7 vendor/NetBSD/tests/dist/ipf/expected/n7_6 vendor/NetBSD/tests/dist/ipf/expected/n8 vendor/NetBSD/tests/dist/ipf/expected/n8_6 vendor/NetBSD/tests/dist/ipf/expected/n9 vendor/NetBSD/tests/dist/ipf/expected/n9_6 vendor/NetBSD/tests/dist/ipf/expected/ni1 vendor/NetBSD/tests/dist/ipf/expected/ni10 vendor/NetBSD/tests/dist/ipf/expected/ni11 vendor/NetBSD/tests/dist/ipf/expected/ni12 vendor/NetBSD/tests/dist/ipf/expected/ni13 vendor/NetBSD/tests/dist/ipf/expected/ni14 vendor/NetBSD/tests/dist/ipf/expected/ni15 vendor/NetBSD/tests/dist/ipf/expected/ni16 vendor/NetBSD/tests/dist/ipf/expected/ni17 vendor/NetBSD/tests/dist/ipf/expected/ni18 vendor/NetBSD/tests/dist/ipf/expected/ni19 vendor/NetBSD/tests/dist/ipf/expected/ni2 vendor/NetBSD/tests/dist/ipf/expected/ni20 vendor/NetBSD/tests/dist/ipf/expected/ni21 vendor/NetBSD/tests/dist/ipf/expected/ni23 vendor/NetBSD/tests/dist/ipf/expected/ni3 vendor/NetBSD/tests/dist/ipf/expected/ni4 vendor/NetBSD/tests/dist/ipf/expected/ni5 vendor/NetBSD/tests/dist/ipf/expected/ni6 vendor/NetBSD/tests/dist/ipf/expected/ni7 vendor/NetBSD/tests/dist/ipf/expected/ni8 vendor/NetBSD/tests/dist/ipf/expected/ni9 vendor/NetBSD/tests/dist/ipf/expected/p1 vendor/NetBSD/tests/dist/ipf/expected/p10 vendor/NetBSD/tests/dist/ipf/expected/p11 vendor/NetBSD/tests/dist/ipf/expected/p12 vendor/NetBSD/tests/dist/ipf/expected/p13 vendor/NetBSD/tests/dist/ipf/expected/p2 vendor/NetBSD/tests/dist/ipf/expected/p3 vendor/NetBSD/tests/dist/ipf/expected/p4 vendor/NetBSD/tests/dist/ipf/expected/p5 vendor/NetBSD/tests/dist/ipf/expected/p6 vendor/NetBSD/tests/dist/ipf/expected/p7 vendor/NetBSD/tests/dist/ipf/expected/p9 vendor/NetBSD/tests/dist/ipf/h_common.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/Makefile (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/f1 vendor/NetBSD/tests/dist/ipf/input/f10 vendor/NetBSD/tests/dist/ipf/input/f11 vendor/NetBSD/tests/dist/ipf/input/f12 vendor/NetBSD/tests/dist/ipf/input/f13 vendor/NetBSD/tests/dist/ipf/input/f14 vendor/NetBSD/tests/dist/ipf/input/f15 vendor/NetBSD/tests/dist/ipf/input/f16 vendor/NetBSD/tests/dist/ipf/input/f17 vendor/NetBSD/tests/dist/ipf/input/f18 vendor/NetBSD/tests/dist/ipf/input/f19 vendor/NetBSD/tests/dist/ipf/input/f2 vendor/NetBSD/tests/dist/ipf/input/f20 vendor/NetBSD/tests/dist/ipf/input/f21 vendor/NetBSD/tests/dist/ipf/input/f22 vendor/NetBSD/tests/dist/ipf/input/f24 vendor/NetBSD/tests/dist/ipf/input/f25 vendor/NetBSD/tests/dist/ipf/input/f26 vendor/NetBSD/tests/dist/ipf/input/f27 vendor/NetBSD/tests/dist/ipf/input/f28 vendor/NetBSD/tests/dist/ipf/input/f29 vendor/NetBSD/tests/dist/ipf/input/f3 vendor/NetBSD/tests/dist/ipf/input/f30 vendor/NetBSD/tests/dist/ipf/input/f4 vendor/NetBSD/tests/dist/ipf/input/f5 vendor/NetBSD/tests/dist/ipf/input/f6 vendor/NetBSD/tests/dist/ipf/input/f7 vendor/NetBSD/tests/dist/ipf/input/f8 vendor/NetBSD/tests/dist/ipf/input/f9 vendor/NetBSD/tests/dist/ipf/input/ip2.data vendor/NetBSD/tests/dist/ipf/input/ipv6.1 (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/ipv6.2 (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/ipv6.3 (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/ipv6.4 (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/ipv6.5 (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/ipv6.6 (contents, props changed) vendor/NetBSD/tests/dist/ipf/input/l1 vendor/NetBSD/tests/dist/ipf/input/n1 vendor/NetBSD/tests/dist/ipf/input/n10 vendor/NetBSD/tests/dist/ipf/input/n100 vendor/NetBSD/tests/dist/ipf/input/n101 vendor/NetBSD/tests/dist/ipf/input/n102 vendor/NetBSD/tests/dist/ipf/input/n103 vendor/NetBSD/tests/dist/ipf/input/n104 vendor/NetBSD/tests/dist/ipf/input/n105 vendor/NetBSD/tests/dist/ipf/input/n106 vendor/NetBSD/tests/dist/ipf/input/n10_6 vendor/NetBSD/tests/dist/ipf/input/n11 vendor/NetBSD/tests/dist/ipf/input/n11_6 vendor/NetBSD/tests/dist/ipf/input/n12 vendor/NetBSD/tests/dist/ipf/input/n12_6 vendor/NetBSD/tests/dist/ipf/input/n13 vendor/NetBSD/tests/dist/ipf/input/n13_6 vendor/NetBSD/tests/dist/ipf/input/n14 vendor/NetBSD/tests/dist/ipf/input/n14_6 vendor/NetBSD/tests/dist/ipf/input/n15 vendor/NetBSD/tests/dist/ipf/input/n15_6 vendor/NetBSD/tests/dist/ipf/input/n16 vendor/NetBSD/tests/dist/ipf/input/n17 vendor/NetBSD/tests/dist/ipf/input/n18 vendor/NetBSD/tests/dist/ipf/input/n1_6 vendor/NetBSD/tests/dist/ipf/input/n2 vendor/NetBSD/tests/dist/ipf/input/n200 vendor/NetBSD/tests/dist/ipf/input/n2_6 vendor/NetBSD/tests/dist/ipf/input/n3 vendor/NetBSD/tests/dist/ipf/input/n4 vendor/NetBSD/tests/dist/ipf/input/n4_6 vendor/NetBSD/tests/dist/ipf/input/n5 vendor/NetBSD/tests/dist/ipf/input/n5_6 vendor/NetBSD/tests/dist/ipf/input/n6 vendor/NetBSD/tests/dist/ipf/input/n6_6 vendor/NetBSD/tests/dist/ipf/input/n7 vendor/NetBSD/tests/dist/ipf/input/n7_6 vendor/NetBSD/tests/dist/ipf/input/n8 vendor/NetBSD/tests/dist/ipf/input/n8_6 vendor/NetBSD/tests/dist/ipf/input/n9 vendor/NetBSD/tests/dist/ipf/input/n9_6 vendor/NetBSD/tests/dist/ipf/input/ni1 vendor/NetBSD/tests/dist/ipf/input/ni10 vendor/NetBSD/tests/dist/ipf/input/ni11 vendor/NetBSD/tests/dist/ipf/input/ni12 vendor/NetBSD/tests/dist/ipf/input/ni13 vendor/NetBSD/tests/dist/ipf/input/ni14 vendor/NetBSD/tests/dist/ipf/input/ni15 vendor/NetBSD/tests/dist/ipf/input/ni16 vendor/NetBSD/tests/dist/ipf/input/ni17 vendor/NetBSD/tests/dist/ipf/input/ni18 vendor/NetBSD/tests/dist/ipf/input/ni19 vendor/NetBSD/tests/dist/ipf/input/ni2 vendor/NetBSD/tests/dist/ipf/input/ni20 vendor/NetBSD/tests/dist/ipf/input/ni21 vendor/NetBSD/tests/dist/ipf/input/ni23 vendor/NetBSD/tests/dist/ipf/input/ni3 vendor/NetBSD/tests/dist/ipf/input/ni4 vendor/NetBSD/tests/dist/ipf/input/ni5 vendor/NetBSD/tests/dist/ipf/input/ni6 vendor/NetBSD/tests/dist/ipf/input/ni7 vendor/NetBSD/tests/dist/ipf/input/ni8 vendor/NetBSD/tests/dist/ipf/input/ni9 vendor/NetBSD/tests/dist/ipf/input/p1 vendor/NetBSD/tests/dist/ipf/input/p10 vendor/NetBSD/tests/dist/ipf/input/p11 vendor/NetBSD/tests/dist/ipf/input/p12 vendor/NetBSD/tests/dist/ipf/input/p13 vendor/NetBSD/tests/dist/ipf/input/p2 vendor/NetBSD/tests/dist/ipf/input/p3 vendor/NetBSD/tests/dist/ipf/input/p4 vendor/NetBSD/tests/dist/ipf/input/p5 vendor/NetBSD/tests/dist/ipf/input/p6 vendor/NetBSD/tests/dist/ipf/input/p7 vendor/NetBSD/tests/dist/ipf/input/p9 vendor/NetBSD/tests/dist/ipf/regress/Makefile (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/bpf-f1 vendor/NetBSD/tests/dist/ipf/regress/bpf1 vendor/NetBSD/tests/dist/ipf/regress/f1 vendor/NetBSD/tests/dist/ipf/regress/f10 vendor/NetBSD/tests/dist/ipf/regress/f11 vendor/NetBSD/tests/dist/ipf/regress/f12 vendor/NetBSD/tests/dist/ipf/regress/f13 vendor/NetBSD/tests/dist/ipf/regress/f14 vendor/NetBSD/tests/dist/ipf/regress/f15 vendor/NetBSD/tests/dist/ipf/regress/f16 vendor/NetBSD/tests/dist/ipf/regress/f17 vendor/NetBSD/tests/dist/ipf/regress/f18 vendor/NetBSD/tests/dist/ipf/regress/f19 vendor/NetBSD/tests/dist/ipf/regress/f2 vendor/NetBSD/tests/dist/ipf/regress/f20 vendor/NetBSD/tests/dist/ipf/regress/f21 vendor/NetBSD/tests/dist/ipf/regress/f22 vendor/NetBSD/tests/dist/ipf/regress/f24 vendor/NetBSD/tests/dist/ipf/regress/f25 vendor/NetBSD/tests/dist/ipf/regress/f26 vendor/NetBSD/tests/dist/ipf/regress/f27 vendor/NetBSD/tests/dist/ipf/regress/f28.ipf vendor/NetBSD/tests/dist/ipf/regress/f28.pool vendor/NetBSD/tests/dist/ipf/regress/f29.ipf vendor/NetBSD/tests/dist/ipf/regress/f29.pool vendor/NetBSD/tests/dist/ipf/regress/f3 vendor/NetBSD/tests/dist/ipf/regress/f30 vendor/NetBSD/tests/dist/ipf/regress/f4 vendor/NetBSD/tests/dist/ipf/regress/f5 vendor/NetBSD/tests/dist/ipf/regress/f6 vendor/NetBSD/tests/dist/ipf/regress/f7 vendor/NetBSD/tests/dist/ipf/regress/f8 vendor/NetBSD/tests/dist/ipf/regress/f9 vendor/NetBSD/tests/dist/ipf/regress/i1 vendor/NetBSD/tests/dist/ipf/regress/i10 vendor/NetBSD/tests/dist/ipf/regress/i11 vendor/NetBSD/tests/dist/ipf/regress/i12 vendor/NetBSD/tests/dist/ipf/regress/i13 vendor/NetBSD/tests/dist/ipf/regress/i14 vendor/NetBSD/tests/dist/ipf/regress/i15 vendor/NetBSD/tests/dist/ipf/regress/i16 vendor/NetBSD/tests/dist/ipf/regress/i17 vendor/NetBSD/tests/dist/ipf/regress/i18 vendor/NetBSD/tests/dist/ipf/regress/i19 vendor/NetBSD/tests/dist/ipf/regress/i2 vendor/NetBSD/tests/dist/ipf/regress/i20 vendor/NetBSD/tests/dist/ipf/regress/i21 vendor/NetBSD/tests/dist/ipf/regress/i22 vendor/NetBSD/tests/dist/ipf/regress/i23 vendor/NetBSD/tests/dist/ipf/regress/i3 vendor/NetBSD/tests/dist/ipf/regress/i4 vendor/NetBSD/tests/dist/ipf/regress/i5 vendor/NetBSD/tests/dist/ipf/regress/i6 vendor/NetBSD/tests/dist/ipf/regress/i7 vendor/NetBSD/tests/dist/ipf/regress/i8 vendor/NetBSD/tests/dist/ipf/regress/i9 vendor/NetBSD/tests/dist/ipf/regress/in1 vendor/NetBSD/tests/dist/ipf/regress/in100 vendor/NetBSD/tests/dist/ipf/regress/in100_6 vendor/NetBSD/tests/dist/ipf/regress/in101 vendor/NetBSD/tests/dist/ipf/regress/in101_6 vendor/NetBSD/tests/dist/ipf/regress/in102 vendor/NetBSD/tests/dist/ipf/regress/in102_6 vendor/NetBSD/tests/dist/ipf/regress/in1_6 vendor/NetBSD/tests/dist/ipf/regress/in2 vendor/NetBSD/tests/dist/ipf/regress/in2_6 vendor/NetBSD/tests/dist/ipf/regress/in3 vendor/NetBSD/tests/dist/ipf/regress/in3_6 vendor/NetBSD/tests/dist/ipf/regress/in4 vendor/NetBSD/tests/dist/ipf/regress/in4_6 vendor/NetBSD/tests/dist/ipf/regress/in5 vendor/NetBSD/tests/dist/ipf/regress/in5_6 vendor/NetBSD/tests/dist/ipf/regress/in6 vendor/NetBSD/tests/dist/ipf/regress/in6_6 vendor/NetBSD/tests/dist/ipf/regress/in7 vendor/NetBSD/tests/dist/ipf/regress/in8_6 vendor/NetBSD/tests/dist/ipf/regress/ip1 vendor/NetBSD/tests/dist/ipf/regress/ip2 vendor/NetBSD/tests/dist/ipf/regress/ip3 vendor/NetBSD/tests/dist/ipf/regress/ipv6.1 (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/ipv6.2 (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/ipv6.3 (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/ipv6.4 (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/ipv6.5 (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/ipv6.6 (contents, props changed) vendor/NetBSD/tests/dist/ipf/regress/l1 vendor/NetBSD/tests/dist/ipf/regress/n1 vendor/NetBSD/tests/dist/ipf/regress/n10 vendor/NetBSD/tests/dist/ipf/regress/n100 vendor/NetBSD/tests/dist/ipf/regress/n101 vendor/NetBSD/tests/dist/ipf/regress/n102 vendor/NetBSD/tests/dist/ipf/regress/n103 vendor/NetBSD/tests/dist/ipf/regress/n104 vendor/NetBSD/tests/dist/ipf/regress/n105 vendor/NetBSD/tests/dist/ipf/regress/n106 vendor/NetBSD/tests/dist/ipf/regress/n10_6 vendor/NetBSD/tests/dist/ipf/regress/n11 vendor/NetBSD/tests/dist/ipf/regress/n11_6 vendor/NetBSD/tests/dist/ipf/regress/n12 vendor/NetBSD/tests/dist/ipf/regress/n12_6 vendor/NetBSD/tests/dist/ipf/regress/n13 vendor/NetBSD/tests/dist/ipf/regress/n13_6 vendor/NetBSD/tests/dist/ipf/regress/n14 vendor/NetBSD/tests/dist/ipf/regress/n14_6 vendor/NetBSD/tests/dist/ipf/regress/n15 vendor/NetBSD/tests/dist/ipf/regress/n15_6 vendor/NetBSD/tests/dist/ipf/regress/n16 vendor/NetBSD/tests/dist/ipf/regress/n16_6 vendor/NetBSD/tests/dist/ipf/regress/n17 vendor/NetBSD/tests/dist/ipf/regress/n18 vendor/NetBSD/tests/dist/ipf/regress/n1_6 vendor/NetBSD/tests/dist/ipf/regress/n2 vendor/NetBSD/tests/dist/ipf/regress/n200 vendor/NetBSD/tests/dist/ipf/regress/n2_6 vendor/NetBSD/tests/dist/ipf/regress/n3 vendor/NetBSD/tests/dist/ipf/regress/n4 vendor/NetBSD/tests/dist/ipf/regress/n4_6 vendor/NetBSD/tests/dist/ipf/regress/n5 vendor/NetBSD/tests/dist/ipf/regress/n5_6 vendor/NetBSD/tests/dist/ipf/regress/n6 vendor/NetBSD/tests/dist/ipf/regress/n6_6 vendor/NetBSD/tests/dist/ipf/regress/n7 vendor/NetBSD/tests/dist/ipf/regress/n7_6 vendor/NetBSD/tests/dist/ipf/regress/n8 vendor/NetBSD/tests/dist/ipf/regress/n8_6 vendor/NetBSD/tests/dist/ipf/regress/n9 vendor/NetBSD/tests/dist/ipf/regress/n9_6 vendor/NetBSD/tests/dist/ipf/regress/ni1.ipf vendor/NetBSD/tests/dist/ipf/regress/ni1.nat vendor/NetBSD/tests/dist/ipf/regress/ni10.ipf vendor/NetBSD/tests/dist/ipf/regress/ni10.nat vendor/NetBSD/tests/dist/ipf/regress/ni11.ipf vendor/NetBSD/tests/dist/ipf/regress/ni11.nat vendor/NetBSD/tests/dist/ipf/regress/ni12.ipf vendor/NetBSD/tests/dist/ipf/regress/ni12.nat vendor/NetBSD/tests/dist/ipf/regress/ni13.ipf vendor/NetBSD/tests/dist/ipf/regress/ni13.nat vendor/NetBSD/tests/dist/ipf/regress/ni14.ipf vendor/NetBSD/tests/dist/ipf/regress/ni14.nat vendor/NetBSD/tests/dist/ipf/regress/ni15.ipf vendor/NetBSD/tests/dist/ipf/regress/ni15.nat vendor/NetBSD/tests/dist/ipf/regress/ni16.ipf vendor/NetBSD/tests/dist/ipf/regress/ni16.nat vendor/NetBSD/tests/dist/ipf/regress/ni17.ipf vendor/NetBSD/tests/dist/ipf/regress/ni17.nat vendor/NetBSD/tests/dist/ipf/regress/ni18.ipf vendor/NetBSD/tests/dist/ipf/regress/ni18.nat vendor/NetBSD/tests/dist/ipf/regress/ni19.ipf vendor/NetBSD/tests/dist/ipf/regress/ni19.nat vendor/NetBSD/tests/dist/ipf/regress/ni2.ipf vendor/NetBSD/tests/dist/ipf/regress/ni2.nat vendor/NetBSD/tests/dist/ipf/regress/ni20.ipf vendor/NetBSD/tests/dist/ipf/regress/ni20.nat vendor/NetBSD/tests/dist/ipf/regress/ni21.ipf vendor/NetBSD/tests/dist/ipf/regress/ni21.nat vendor/NetBSD/tests/dist/ipf/regress/ni23.ipf vendor/NetBSD/tests/dist/ipf/regress/ni23.nat vendor/NetBSD/tests/dist/ipf/regress/ni3.ipf vendor/NetBSD/tests/dist/ipf/regress/ni3.nat vendor/NetBSD/tests/dist/ipf/regress/ni4.ipf vendor/NetBSD/tests/dist/ipf/regress/ni4.nat vendor/NetBSD/tests/dist/ipf/regress/ni5.ipf vendor/NetBSD/tests/dist/ipf/regress/ni5.nat vendor/NetBSD/tests/dist/ipf/regress/ni6.ipf vendor/NetBSD/tests/dist/ipf/regress/ni6.nat vendor/NetBSD/tests/dist/ipf/regress/ni7.ipf vendor/NetBSD/tests/dist/ipf/regress/ni7.nat vendor/NetBSD/tests/dist/ipf/regress/ni8.ipf vendor/NetBSD/tests/dist/ipf/regress/ni8.nat vendor/NetBSD/tests/dist/ipf/regress/ni9.ipf vendor/NetBSD/tests/dist/ipf/regress/ni9.nat vendor/NetBSD/tests/dist/ipf/regress/p1.ipf vendor/NetBSD/tests/dist/ipf/regress/p1.pool vendor/NetBSD/tests/dist/ipf/regress/p10.nat vendor/NetBSD/tests/dist/ipf/regress/p10.pool vendor/NetBSD/tests/dist/ipf/regress/p11.nat vendor/NetBSD/tests/dist/ipf/regress/p11.pool vendor/NetBSD/tests/dist/ipf/regress/p12.nat vendor/NetBSD/tests/dist/ipf/regress/p12.pool vendor/NetBSD/tests/dist/ipf/regress/p13.ipf vendor/NetBSD/tests/dist/ipf/regress/p13.pool vendor/NetBSD/tests/dist/ipf/regress/p2.ipf vendor/NetBSD/tests/dist/ipf/regress/p3.ipf vendor/NetBSD/tests/dist/ipf/regress/p3.pool vendor/NetBSD/tests/dist/ipf/regress/p4.nat vendor/NetBSD/tests/dist/ipf/regress/p4.pool vendor/NetBSD/tests/dist/ipf/regress/p5.ipf vendor/NetBSD/tests/dist/ipf/regress/p5.pool vendor/NetBSD/tests/dist/ipf/regress/p6.ipf vendor/NetBSD/tests/dist/ipf/regress/p6.pool vendor/NetBSD/tests/dist/ipf/regress/p6.whois vendor/NetBSD/tests/dist/ipf/regress/p7.nat vendor/NetBSD/tests/dist/ipf/regress/p7.pool vendor/NetBSD/tests/dist/ipf/regress/p9.nat vendor/NetBSD/tests/dist/ipf/regress/p9.pool vendor/NetBSD/tests/dist/ipf/t_bpf.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_filter_exec.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_filter_parse.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_logging.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_nat_exec.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_nat_ipf_exec.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_nat_parse.sh (contents, props changed) vendor/NetBSD/tests/dist/ipf/t_pools.sh (contents, props changed) vendor/NetBSD/tests/dist/kernel/Makefile (contents, props changed) vendor/NetBSD/tests/dist/kernel/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/kernel/gen_t_subr_prf (contents, props changed) vendor/NetBSD/tests/dist/kernel/h_ps_strings1.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/h_ps_strings2.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/Makefile (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/Makefile (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/t_fifo.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file2.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/t_pipe.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/t_ttypty.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/t_ioctl.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/t_proc1.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/t_proc2.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/t_proc3.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/t_sig.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/write/Makefile (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/write/t_fifo.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/write/t_pipe.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/write/t_ttypty.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_extattrctl.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_extent.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_filedesc.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_kauth_pr_47598.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_lock.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_lockf.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_mqueue.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_ps_strings.sh (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_pty.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_rnd.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_sysctl.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_sysv.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_umount.sh (contents, props changed) vendor/NetBSD/tests/dist/kernel/t_umountstress.sh (contents, props changed) vendor/NetBSD/tests/dist/kernel/tty/Makefile (contents, props changed) vendor/NetBSD/tests/dist/kernel/tty/t_pr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/Makefile.check_stack (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/alpha/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/arm/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/hppa/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/i386/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/ia64/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/mips/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/powerpc/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/sparc/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/sparc64/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/vax/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/arch/x86_64/h_initfini_align.S (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/dso/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/dso/h_initfini3_dso.cxx (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/h_initfini1.cxx (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/h_initfini3.cxx (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/h_initfini_common.cxx (contents, props changed) vendor/NetBSD/tests/dist/lib/csu/t_crt0.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/t_bluetooth.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/t_sdp_data.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/t_sdp_get.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/t_sdp_match.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/t_sdp_put.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/t_sdp_set.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbpfjit/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libbpfjit/t_bpfjit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbpfjit/t_cop.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libbpfjit/t_extmem.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/Makefile.exec_prot (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/aarch64/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/aarch64/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/alpha/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/alpha/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/arm/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/arm/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/hppa/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/hppa/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/i386/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/i386/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/ia64/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/ia64/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/m68k/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/m68k/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/mips/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/mips/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/or1k/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/or1k/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/powerpc/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/powerpc/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/powerpc64/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/powerpc64/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/riscv/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/riscv/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sh3/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sh3/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sparc/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sparc/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sparc64/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sparc64/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/vax/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/vax/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/x86_64/exec_prot_support.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/arch/x86_64/return_one.S (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_faccessat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_fchmodat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_fchownat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_fexecve.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_fstatat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_linkat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_mkdirat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_mkfifoat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_mknodat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_o_search.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_openat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_readlinkat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_renameat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_symlinkat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_unlinkat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/c063/t_utimensat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/common/exec_prot.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/db/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/db/README vendor/NetBSD/tests/dist/lib/libc/db/h_db.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/db/t_db.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/execve/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/execve/t_execve.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/isqemu.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/h_fileactions.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/h_nonexec.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/h_spawn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/h_spawnattr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/t_fileactions.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/t_spawn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/t_spawnattr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_alarm.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_assert.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_basedirname.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_closefrom.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_cpuset.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_dir.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_floatunditf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_fmtcheck.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_fnmatch.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_fpclassify.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_fpsetmask.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_fpsetround.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_ftok.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_getcwd.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_getgrent.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_glob.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_humanize_number.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_isnan.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_nice.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_pause.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_raise.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_randomid.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_realpath.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_setdomainname.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_sethostname.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_siginfo.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_sleep.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_syslog.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_time.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_ttyname.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/gen/t_vis.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/hash/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/hash/data/md5test-in vendor/NetBSD/tests/dist/lib/libc/hash/data/md5test-out vendor/NetBSD/tests/dist/lib/libc/hash/data/sha1test-in vendor/NetBSD/tests/dist/lib/libc/hash/data/sha1test-out vendor/NetBSD/tests/dist/lib/libc/hash/data/sha1test2-out vendor/NetBSD/tests/dist/lib/libc/hash/h_hash.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/hash/t_hash.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/hash/t_sha2.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/inet/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/inet/t_inet_network.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_io.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_mbrtowc.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_mbsnrtowcs.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_mbstowcs.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_mbtowc.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_wcscspn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_wcspbrk.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_wcsspn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_wcstod.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/locale/t_wctomb.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/gen_ether_subr (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/README vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/basics_v4.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/basics_v4v6.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/h_gai.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/no_host_v4.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/no_host_v4v6.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/no_serv_v4.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/no_serv_v4v6.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/scoped.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/sock_raw_v4.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/sock_raw_v4v6.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/spec_fam_v4.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/spec_fam_v4v6.exp vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/t_getaddrinfo.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/unsup_fam.exp vendor/NetBSD/tests/dist/lib/libc/net/h_dns_server.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/h_hostent.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/h_nsd_recurse.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/h_protoent.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/h_servent.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/hosts vendor/NetBSD/tests/dist/lib/libc/net/resolv.conf (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/t_ether_aton.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/t_getprotoent.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/t_hostent.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/t_nsdispatch.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/t_protoent.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/net/t_servent.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/README vendor/NetBSD/tests/dist/lib/libc/regex/data/anchor.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/att/README vendor/NetBSD/tests/dist/lib/libc/regex/data/att/basic.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/att/categorization.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/att/forcedassoc.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/att/leftassoc.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/att/nullsubexpr.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/att/repetition.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/att/rightassoc.dat vendor/NetBSD/tests/dist/lib/libc/regex/data/backref.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/basic.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/bracket.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/c_comments.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/complex.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/error.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/meta.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/nospec.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/paren.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/regress.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/repet_bounded.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/repet_multi.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/repet_ordinary.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/startend.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/subexp.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/subtle.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/word_bound.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/zero.in (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/debug.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/main.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/split.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/t_exhaust.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/t_regex.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/t_regex_att.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/regex/test_regex.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/rpc/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/rpc/h_testbits.x vendor/NetBSD/tests/dist/lib/libc/rpc/t_rpc.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/rpc/t_xdr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/setjmp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/setjmp/t_setjmp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/setjmp/t_threadjmp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_fgets.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_getcwd.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_gets.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_memcpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_memmove.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_memset.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_raw.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_read.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_readlink.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_snprintf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_sprintf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_stpcpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_stpncpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_strcat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_strcpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_strncat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_strncpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_vsnprintf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/h_vsprintf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/t_ssp.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_clearerr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_fflush.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_fmemopen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_fopen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_fputc.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_mktemp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_popen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_printf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_scanf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/h_atexit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/h_getopt.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/h_getopt_long.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_abs.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_atexit.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_atoi.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_div.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_exit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_getenv.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_getenv_thread.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_getopt.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_hsearch.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_mi_vector_hash.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_posix_memalign.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_random.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_strtod.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_strtol.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_system.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_bm.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_memchr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_memcpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_memmem.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_memset.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_popcount.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strcat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strchr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strcmp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strcpy.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strcspn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strerror.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_stresep.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strlen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strpbrk.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strrchr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_strspn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/string/t_swab.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sync/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sync/all_sync_ops_linkable.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_access.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_chroot.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_clock_gettime.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_clone.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_connect.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_dup.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_fsync.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getcontext.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getgroups.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getitimer.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getlogin.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getpid.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getrusage.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getsid.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_gettimeofday.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_issetugid.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_kevent.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_kill.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_link.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_listen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_lwp_create.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_lwp_ctl.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mincore.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_minherit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mkdir.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mkfifo.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mknod.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mlock.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mmap.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_mprotect.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_msgctl.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_msgget.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_msgrcv.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_msgsnd.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_msync.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_nanosleep.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_pipe.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_pipe2.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_poll.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_posix_fadvise.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_recvmmsg.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_revoke.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_select.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_setrlimit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_setuid.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_sigaction.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_sigqueue.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_sigtimedwait.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_socketpair.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_stat.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_swapcontext.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_timer_create.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_truncate.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_ucontext.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_umask.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_unlink.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_write.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/t_cdb.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/t_convfp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/t_gdtoa.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/termios/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/termios/t_tcsetpgrp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/time/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/time/t_mktime.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/time/t_strptime.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/dso/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/dso/h_tls_dlopen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/t_tls_dlopen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/t_tls_dynamic.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/t_tls_static.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls/t_tls_static_helper.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls_dso/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/tls_dso/h_tls_dynamic.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ttyio/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ttyio/t_ptm.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/ttyio/t_ttyio.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libcrypt/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libcrypt/t_crypt.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/atf.terminfo (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/addch.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/addchstr.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/addstr.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/attributes.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/background1.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/background2.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/background3.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/background4.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/background5.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/bell.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/box_standout.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/chgat1.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/chgat2.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/chgat3.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear1.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear10.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear2.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear3.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear4.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear5.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear6.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear7.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear8.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/clear9.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/color_blank_draw.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/color_blue_back.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/color_default.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/color_red_fore.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/color_set.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/color_start.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin1.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin10.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin11.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin12.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin13.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin14.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin2.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin3.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin4.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin5.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin6.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin7.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin8.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/copywin9.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/curs_set1.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/curs_set2.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/curs_set3.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/curses_start.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/fill.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/home.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/timeout.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wborder.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wborder_refresh.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wgetstr.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wgetstr_refresh.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/window.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wprintw_refresh.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wscrl1.chk vendor/NetBSD/tests/dist/lib/libcurses/check_files/wscrl2.chk (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/director/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/director/director.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/director/returns.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/director/testlang_conf.l vendor/NetBSD/tests/dist/lib/libcurses/director/testlang_parse.y vendor/NetBSD/tests/dist/lib/libcurses/slave/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/command_table.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/commands.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/curses_commands.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/curses_commands.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/slave.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/slave.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/t_curses.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/testframe.txt (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/tests/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libcurses/tests/addch vendor/NetBSD/tests/dist/lib/libcurses/tests/addchnstr vendor/NetBSD/tests/dist/lib/libcurses/tests/addchstr vendor/NetBSD/tests/dist/lib/libcurses/tests/addnstr vendor/NetBSD/tests/dist/lib/libcurses/tests/addstr vendor/NetBSD/tests/dist/lib/libcurses/tests/assume_default_colors vendor/NetBSD/tests/dist/lib/libcurses/tests/attributes vendor/NetBSD/tests/dist/lib/libcurses/tests/background vendor/NetBSD/tests/dist/lib/libcurses/tests/beep vendor/NetBSD/tests/dist/lib/libcurses/tests/box vendor/NetBSD/tests/dist/lib/libcurses/tests/can_change_color vendor/NetBSD/tests/dist/lib/libcurses/tests/cbreak vendor/NetBSD/tests/dist/lib/libcurses/tests/chgat vendor/NetBSD/tests/dist/lib/libcurses/tests/clear vendor/NetBSD/tests/dist/lib/libcurses/tests/color_content vendor/NetBSD/tests/dist/lib/libcurses/tests/color_set vendor/NetBSD/tests/dist/lib/libcurses/tests/copywin vendor/NetBSD/tests/dist/lib/libcurses/tests/curs_set vendor/NetBSD/tests/dist/lib/libcurses/tests/fill_screen vendor/NetBSD/tests/dist/lib/libcurses/tests/getch vendor/NetBSD/tests/dist/lib/libcurses/tests/getstr vendor/NetBSD/tests/dist/lib/libcurses/tests/mvwin vendor/NetBSD/tests/dist/lib/libcurses/tests/start vendor/NetBSD/tests/dist/lib/libcurses/tests/start_color vendor/NetBSD/tests/dist/lib/libcurses/tests/std_defines vendor/NetBSD/tests/dist/lib/libcurses/tests/termattrs vendor/NetBSD/tests/dist/lib/libcurses/tests/timeout vendor/NetBSD/tests/dist/lib/libcurses/tests/wborder vendor/NetBSD/tests/dist/lib/libcurses/tests/window vendor/NetBSD/tests/dist/lib/libcurses/tests/window_create vendor/NetBSD/tests/dist/lib/libcurses/tests/wprintw vendor/NetBSD/tests/dist/lib/libcurses/tests/wscrl vendor/NetBSD/tests/dist/lib/libdes/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libdes/t_des.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libevent/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libevent/t_event.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libexecinfo/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libexecinfo/t_backtrace.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_acos.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_asin.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_atan.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_cbrt.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_ceil.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_cos.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_cosh.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_erf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_exp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_fmod.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_infinity.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_ldexp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_libm.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_log.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_modf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_pow.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_precision.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_round.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_scalbn.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_sin.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_sinh.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_sqrt.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_tan.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_tanh.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libobjc/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libobjc/t_threads.m vendor/NetBSD/tests/dist/lib/libposix/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libposix/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/libposix/bsd/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libposix/posix1/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libposix/posix2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libposix/t_rename.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libppath/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libppath/personnel.plist (contents, props changed) vendor/NetBSD/tests/dist/lib/libppath/plist_to_c (contents, props changed) vendor/NetBSD/tests/dist/lib/libppath/t_ppath.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libprop/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libprop/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/d_mach vendor/NetBSD/tests/dist/lib/libpthread/dlopen/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/dso/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/dso/h_pthread_dlopen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/t_dlopen.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/t_dso_pthread_create.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/t_main_pthread_create.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/h_atexit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/h_cancel.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/h_common.h (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/h_exit.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/h_resolv.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_atexit.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_barrier.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_cancel.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_cond.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_condwait.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_detach.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_equal.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_exit.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_fork.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_fpu.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_join.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_kill.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_mutex.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_name.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_once.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_preempt.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_resolv.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_rwlock.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_sem.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_sigalarm.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_siglongjmp.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_sigmask.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_sigsuspend.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_sleep.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libpthread/t_swapcontext.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librt/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/librt/t_sched.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librt/t_sem.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumpclient/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/librumpclient/h_exec.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumpclient/h_execthr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumpclient/t_exec.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/librumpclient/t_fd.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/h_client.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/h_cwd.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/h_netget.c (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/index.html (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/netstat.expout vendor/NetBSD/tests/dist/lib/librumphijack/ssh_config.in (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/ssh_host_key vendor/NetBSD/tests/dist/lib/librumphijack/ssh_host_key.pub vendor/NetBSD/tests/dist/lib/librumphijack/sshd_config.in (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/t_asyncio.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/t_config.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/t_cwd.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/t_sh.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/t_tcpip.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/librumphijack/t_vfs.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libskey/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libskey/t_algorithms.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libsljit/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libsljit/t_sljit.sh (contents, props changed) vendor/NetBSD/tests/dist/lib/libtre/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libutil/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libutil/t_efun.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libutil/t_parsedate.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libutil/t_pidfile.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libutil/t_snprintb.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libutil/t_sockaddr_snprintf.c (contents, props changed) vendor/NetBSD/tests/dist/lib/semaphore/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/semaphore/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/lib/semaphore/pthread/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/semaphore/pthread/t_sem_pth.c (contents, props changed) vendor/NetBSD/tests/dist/lib/semaphore/sem.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v0 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v1 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v2 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v0 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v1 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v2 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v0 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v1 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v2 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v0 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v1 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v2 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v0 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v1 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v2 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v0 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v1 vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v2 vendor/NetBSD/tests/dist/libexec/ld.elf_so/h_df_1_noopen.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/h_dl_symver.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/h_ifunc.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/h_locking.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_dso1/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_dso2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_dso2/h_helper_dso2.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_ifunc_dso/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso0/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso0/h_helper_symver_dso0.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso1/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.map vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.map vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_df_1_noopen.sh (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dl_symver.sh (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlerror-cleared.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlerror-false.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlinfo.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlvsym.c (contents, props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_ifunc.c (contents, props changed) vendor/NetBSD/tests/dist/modules/Makefile (contents, props changed) vendor/NetBSD/tests/dist/modules/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/modules/k_helper/Makefile (contents, props changed) vendor/NetBSD/tests/dist/modules/k_helper/k_helper.c (contents, props changed) vendor/NetBSD/tests/dist/modules/k_helper2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/modules/k_helper2/k_helper2.c (contents, props changed) vendor/NetBSD/tests/dist/modules/k_helper3/Makefile (contents, props changed) vendor/NetBSD/tests/dist/modules/k_helper3/k_helper3.c (contents, props changed) vendor/NetBSD/tests/dist/modules/k_uvm/Makefile (contents, props changed) vendor/NetBSD/tests/dist/modules/k_uvm/k_uvm.c (contents, props changed) vendor/NetBSD/tests/dist/modules/t_abi_uvm.sh (contents, props changed) vendor/NetBSD/tests/dist/modules/t_builtin.c (contents, props changed) vendor/NetBSD/tests/dist/modules/t_modctl.c (contents, props changed) vendor/NetBSD/tests/dist/modules/t_modload.sh (contents, props changed) vendor/NetBSD/tests/dist/net/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/net/bpf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/bpf/h_bpf.h (contents, props changed) vendor/NetBSD/tests/dist/net/bpf/t_bpf.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpf/t_div-by-zero.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpf/t_mbuf.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpfilter/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/bpfilter/t_bpfilter.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpfjit/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/bpfjit/t_bpfjit.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpfjit/t_cop.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpfjit/t_extmem.c (contents, props changed) vendor/NetBSD/tests/dist/net/bpfjit/t_mbuf.c (contents, props changed) vendor/NetBSD/tests/dist/net/carp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/carp/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/net/config/netconfig.c (contents, props changed) vendor/NetBSD/tests/dist/net/fdpass/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/fdpass/fdpass.c (contents, props changed) vendor/NetBSD/tests/dist/net/fdpass/t_fdpass.sh (contents, props changed) vendor/NetBSD/tests/dist/net/icmp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/icmp/t_forward.c (contents, props changed) vendor/NetBSD/tests/dist/net/icmp/t_ping.c (contents, props changed) vendor/NetBSD/tests/dist/net/icmp/t_ping2.sh (contents, props changed) vendor/NetBSD/tests/dist/net/if/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/if/t_compat.c (contents, props changed) vendor/NetBSD/tests/dist/net/if_bridge/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/if_bridge/t_bridge.sh (contents, props changed) vendor/NetBSD/tests/dist/net/if_loop/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/if_loop/t_pr.c (contents, props changed) vendor/NetBSD/tests/dist/net/mpls/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/mpls/t_ldp_regen.sh (contents, props changed) vendor/NetBSD/tests/dist/net/mpls/t_mpls_fw.sh (contents, props changed) vendor/NetBSD/tests/dist/net/mpls/t_rfc4182.sh (contents, props changed) vendor/NetBSD/tests/dist/net/net/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/net/t_pktinfo.c (contents, props changed) vendor/NetBSD/tests/dist/net/net/t_raw.c (contents, props changed) vendor/NetBSD/tests/dist/net/net/t_tcp.c (contents, props changed) vendor/NetBSD/tests/dist/net/net/t_udp.c (contents, props changed) vendor/NetBSD/tests/dist/net/net/t_unix.c (contents, props changed) vendor/NetBSD/tests/dist/net/npf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/npf/t_npf.sh (contents, props changed) vendor/NetBSD/tests/dist/net/route/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/route/t_change.sh (contents, props changed) vendor/NetBSD/tests/dist/net/sys/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/sys/t_rfc6056.c (contents, props changed) vendor/NetBSD/tests/dist/rump/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/alloc.c (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/busypage.c (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/kernspace.h (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/lockme.c (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/sendsig.c (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/thread.c (contents, props changed) vendor/NetBSD/tests/dist/rump/kernspace/tsleep.c (contents, props changed) vendor/NetBSD/tests/dist/rump/modautoload/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/modautoload/t_modautoload.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/h_forkcli.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/h_reconcli.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/h_sigcli.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/h_simplecli.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/h_stresscli.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_server/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_server/h_simpleserver.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_copy.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_kern.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_lwproc.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_modcmd.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_modlinkset.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_signals.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_sp.sh (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_threads.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_tsleep.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpkern/t_vm.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpnet/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpnet/t_shmif.sh (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpvfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpvfs/t_basic.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpvfs/t_etfs.c (contents, props changed) vendor/NetBSD/tests/dist/rump/rumpvfs/t_p2kifs.c (contents, props changed) vendor/NetBSD/tests/dist/sbin/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/sbin/fsck_ffs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/fsck_ffs/quotas_common.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/fsck_ffs/t_check_quotas.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/fsck_ffs/t_enable_quotas.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/ifconfig/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/ifconfig/t_nonexistent.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/newfs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/newfs/quotas_common.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/newfs/t_enable_quotas.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/newfs_msdos/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/newfs_msdos/t_create.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/common.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/t_grow.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/t_grow_swapped.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/t_shrink.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/t_shrink_swapped.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/testdata.md5 vendor/NetBSD/tests/dist/sbin/resize_ffs/testdata.tar.gz.base64 vendor/NetBSD/tests/dist/sbin/route/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/route/t_missing.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/sysctl/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sbin/sysctl/t_perm.sh (contents, props changed) vendor/NetBSD/tests/dist/sbin/sysctl/t_sysctl.sh (contents, props changed) vendor/NetBSD/tests/dist/share/Makefile (contents, props changed) vendor/NetBSD/tests/dist/share/examples/Makefile (contents, props changed) vendor/NetBSD/tests/dist/share/examples/t_asm.sh (contents, props changed) vendor/NetBSD/tests/dist/share/mk/Makefile (contents, props changed) vendor/NetBSD/tests/dist/share/mk/common.subr vendor/NetBSD/tests/dist/share/mk/t_lib.sh (contents, props changed) vendor/NetBSD/tests/dist/share/mk/t_own.sh (contents, props changed) vendor/NetBSD/tests/dist/share/mk/t_prog.sh (contents, props changed) vendor/NetBSD/tests/dist/share/mk/t_test.sh (contents, props changed) vendor/NetBSD/tests/dist/sys/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sys/rc/Makefile (contents, props changed) vendor/NetBSD/tests/dist/sys/rc/h_args.sh (contents, props changed) vendor/NetBSD/tests/dist/sys/rc/h_simple.sh (contents, props changed) vendor/NetBSD/tests/dist/sys/rc/t_rc_d_cli.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_assign_NF.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_assign_NF.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_assign_NF.out vendor/NetBSD/tests/dist/usr.bin/awk/d_big_regexp.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_big_regexp.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_big_regexp.out vendor/NetBSD/tests/dist/usr.bin/awk/d_end1.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_end1.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_end1.out vendor/NetBSD/tests/dist/usr.bin/awk/d_end2.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_end2.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_end2.out vendor/NetBSD/tests/dist/usr.bin/awk/d_period.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_period.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_period.out vendor/NetBSD/tests/dist/usr.bin/awk/d_string1.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_string1.out vendor/NetBSD/tests/dist/usr.bin/awk/d_tolower.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_tolower.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_tolower.out (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_toupper.awk (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_toupper.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/d_toupper.out (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/awk/t_awk.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/basename/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/basename/t_basename.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/bzip2/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/bzip2/t_bzip2.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cc/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cc/t_hello.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cmp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cmp/t_cmp.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/d_deffs_redef vendor/NetBSD/tests/dist/usr.bin/config/d_loop vendor/NetBSD/tests/dist/usr.bin/config/d_loop2 vendor/NetBSD/tests/dist/usr.bin/config/d_no_pseudo vendor/NetBSD/tests/dist/usr.bin/config/d_postponed_orphan vendor/NetBSD/tests/dist/usr.bin/config/d_pseudo_parent vendor/NetBSD/tests/dist/usr.bin/config/d_shadow_instance vendor/NetBSD/tests/dist/usr.bin/config/support/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/conf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/conf/Makefile.regress (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/conf/files.regress vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/conf/std.regress vendor/NetBSD/tests/dist/usr.bin/config/support/conf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/conf/files vendor/NetBSD/tests/dist/usr.bin/config/t_config.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cut/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cut/d_basic.out vendor/NetBSD/tests/dist/usr.bin/cut/d_cut.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cut/d_dflag.out vendor/NetBSD/tests/dist/usr.bin/cut/d_dsflag.out vendor/NetBSD/tests/dist/usr.bin/cut/d_latin1.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cut/d_sflag.out vendor/NetBSD/tests/dist/usr.bin/cut/d_utf8.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/cut/t_cut.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/diff/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/diff/d_mallocv1.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/diff/d_mallocv2.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/diff/t_diff.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/dirname/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/dirname/t_dirname.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/find/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/find/t_find.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_basic.out vendor/NetBSD/tests/dist/usr.bin/grep/d_begin_end_a.out vendor/NetBSD/tests/dist/usr.bin/grep/d_begin_end_b.out vendor/NetBSD/tests/dist/usr.bin/grep/d_binary.out vendor/NetBSD/tests/dist/usr.bin/grep/d_context2_a.out (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_context2_b.out (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_context2_c.out (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_context_a.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_context_a.out vendor/NetBSD/tests/dist/usr.bin/grep/d_context_b.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_context_b.out vendor/NetBSD/tests/dist/usr.bin/grep/d_context_c.out vendor/NetBSD/tests/dist/usr.bin/grep/d_context_d.out vendor/NetBSD/tests/dist/usr.bin/grep/d_egrep.out vendor/NetBSD/tests/dist/usr.bin/grep/d_file_exp.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_file_exp.out vendor/NetBSD/tests/dist/usr.bin/grep/d_ignore_case.out vendor/NetBSD/tests/dist/usr.bin/grep/d_input vendor/NetBSD/tests/dist/usr.bin/grep/d_invert.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/grep/d_invert.out vendor/NetBSD/tests/dist/usr.bin/grep/d_recurse.out vendor/NetBSD/tests/dist/usr.bin/grep/d_recurse_symlink.err vendor/NetBSD/tests/dist/usr.bin/grep/d_recurse_symlink.out vendor/NetBSD/tests/dist/usr.bin/grep/d_whole_line.out vendor/NetBSD/tests/dist/usr.bin/grep/d_word_regexps.out vendor/NetBSD/tests/dist/usr.bin/grep/d_zgrep.out vendor/NetBSD/tests/dist/usr.bin/grep/t_grep.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/gzip/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/gzip/t_gzip.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/id/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/id/pwgr.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/id/t_groups.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/id/t_id.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/id/t_whoami.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/infocmp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/infocmp/t_terminfo.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/jot/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/jot/d_basic.out vendor/NetBSD/tests/dist/usr.bin/jot/t_jot.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/m4/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/m4/d_ff_after_dnl.m4.uue vendor/NetBSD/tests/dist/usr.bin/m4/d_ff_after_dnl.out vendor/NetBSD/tests/dist/usr.bin/m4/d_m4wrap-P.m4 vendor/NetBSD/tests/dist/usr.bin/m4/d_m4wrap-P.out vendor/NetBSD/tests/dist/usr.bin/m4/d_m4wrap.m4 vendor/NetBSD/tests/dist/usr.bin/m4/d_m4wrap.out vendor/NetBSD/tests/dist/usr.bin/m4/t_m4.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/make/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/make/t_make.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/mkdep/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/mkdep/t_mkdep.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/nbperf/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/nbperf/h_nbperf.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/nbperf/hash_driver.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/nbperf/t_nbperf.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/netpgpverify/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/netpgpverify/t_netpgpverify.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/pr/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/pr/d_basic.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/pr/d_basic.out vendor/NetBSD/tests/dist/usr.bin/pr/t_basic.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/rump_server/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/rump_server/t_disk.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/d_dot.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/d_flags_l.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_flags_s.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_flags_w.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_a1.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_a2.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_b1.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_b2.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_c1.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_c2.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_d1.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_iflags_d2.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_input1 vendor/NetBSD/tests/dist/usr.bin/sdiff/d_input2 vendor/NetBSD/tests/dist/usr.bin/sdiff/d_oneline.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/d_oneline_a.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_oneline_b.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_same.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_short.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabends.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabends_a.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabends_b.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabends_c.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabs.out vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabs1.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/d_tabs2.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/t_sdiff.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sed/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sed/d_c2048.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sed/t_sed.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/shmif_dumpbus/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue vendor/NetBSD/tests/dist/usr.bin/shmif_dumpbus/d_pkthdrs.out.bz2.uue vendor/NetBSD/tests/dist/usr.bin/shmif_dumpbus/shmbus.bz2.uue vendor/NetBSD/tests/dist/usr.bin/shmif_dumpbus/t_basic.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sort/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sort/d_any_char_dflag_out.txt (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sort/d_any_char_fflag_out.txt (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sort/d_any_char_iflag_out.txt (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sort/d_any_char_in.txt (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/sort/t_sort.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/tmux/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/tmux/t_tmux.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/tr/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/tr/t_basic.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/unifdef/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/unifdef/d_basic.in (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/unifdef/d_basic.out vendor/NetBSD/tests/dist/usr.bin/unifdef/t_basic.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/vmstat/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/vmstat/t_vmstat.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_alignof.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_complex_num.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_complex_split.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_for_loops.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_func.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_recursive_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_struct_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_union_init1.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_union_init2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c99_union_init3.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c9x_array_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_c9x_recursive_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_cast_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_cast_init2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_cast_lhs.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_compound_literals1.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_compound_literals2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_constant_conv1.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_constant_conv2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_cvt_constant.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_cvt_in_ternary.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_ellipsis_in_switch.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_gcc_compound_statements1.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_gcc_compound_statements2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_gcc_compound_statements3.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_gcc_extension.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_gcc_func.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_gcc_variable_array_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_incorrect_array_size.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_long_double_int.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_nested_structs.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_nolimit_init.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_packed_structs.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_shift_to_narrower_type.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_type_conv1.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_type_conv2.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_type_conv3.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_typename_as_var.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/d_zero_sized_arrays.c (contents, props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/t_integration.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/mtree/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/mtree/d_convert.in (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/mtree/d_convert_C.out vendor/NetBSD/tests/dist/usr.sbin/mtree/d_convert_C_S.out vendor/NetBSD/tests/dist/usr.sbin/mtree/d_convert_D.out vendor/NetBSD/tests/dist/usr.sbin/mtree/d_convert_D_S.out vendor/NetBSD/tests/dist/usr.sbin/mtree/d_merge.in (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/mtree/d_merge_C_M.out vendor/NetBSD/tests/dist/usr.sbin/mtree/d_merge_C_M_S.out vendor/NetBSD/tests/dist/usr.sbin/mtree/mtree_d_create.out vendor/NetBSD/tests/dist/usr.sbin/mtree/netbsd6_d_create.out vendor/NetBSD/tests/dist/usr.sbin/mtree/t_mtree.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/tcpdump/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/tcpdump/t_tcpdump.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/traceroute/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/traceroute/t_traceroute.sh (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/useradd/Makefile (contents, props changed) vendor/NetBSD/tests/dist/usr.sbin/useradd/t_useradd.sh (contents, props changed) Directory Properties: vendor/NetBSD/tests/dist/ (props changed) vendor/NetBSD/tests/dist/bin/ (props changed) vendor/NetBSD/tests/dist/bin/cat/ (props changed) vendor/NetBSD/tests/dist/bin/cp/ (props changed) vendor/NetBSD/tests/dist/bin/dd/ (props changed) vendor/NetBSD/tests/dist/bin/df/ (props changed) vendor/NetBSD/tests/dist/bin/expr/ (props changed) vendor/NetBSD/tests/dist/bin/pax/ (props changed) vendor/NetBSD/tests/dist/bin/ps/ (props changed) vendor/NetBSD/tests/dist/bin/sh/ (props changed) vendor/NetBSD/tests/dist/bin/sh/dotcmd/ (props changed) vendor/NetBSD/tests/dist/bin/sh/dotcmd/out/ (props changed) vendor/NetBSD/tests/dist/bin/sleep/ (props changed) vendor/NetBSD/tests/dist/bin/tar/ (props changed) vendor/NetBSD/tests/dist/crypto/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bf/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/bn/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/div/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/bn/exp/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/cast/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/conf/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/des/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/dh/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/dsa/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ec/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ecdh/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ecdsa/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/engine/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/evp/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/hmac/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/idea/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/lhash/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/md2/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/md4/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/md5/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/mdc2/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rand/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rc2/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rc4/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rc5/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/ripemd/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/rsa/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/sha/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/sha1/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/srp/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/threads/ (props changed) vendor/NetBSD/tests/dist/crypto/libcrypto/x509v3/ (props changed) vendor/NetBSD/tests/dist/crypto/opencrypto/ (props changed) vendor/NetBSD/tests/dist/dev/ (props changed) vendor/NetBSD/tests/dist/dev/audio/ (props changed) vendor/NetBSD/tests/dist/dev/cgd/ (props changed) vendor/NetBSD/tests/dist/dev/dm/ (props changed) vendor/NetBSD/tests/dist/dev/md/ (props changed) vendor/NetBSD/tests/dist/dev/raidframe/ (props changed) vendor/NetBSD/tests/dist/dev/scsipi/ (props changed) vendor/NetBSD/tests/dist/dev/scsipi/libscsitest/ (props changed) vendor/NetBSD/tests/dist/dev/sysmon/ (props changed) vendor/NetBSD/tests/dist/fs/ (props changed) vendor/NetBSD/tests/dist/fs/cd9660/ (props changed) vendor/NetBSD/tests/dist/fs/common/ (props changed) vendor/NetBSD/tests/dist/fs/ffs/ (props changed) vendor/NetBSD/tests/dist/fs/fifofs/ (props changed) vendor/NetBSD/tests/dist/fs/hfs/ (props changed) vendor/NetBSD/tests/dist/fs/kernfs/ (props changed) vendor/NetBSD/tests/dist/fs/lfs/ (props changed) vendor/NetBSD/tests/dist/fs/msdosfs/ (props changed) vendor/NetBSD/tests/dist/fs/nfs/ (props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/ (props changed) vendor/NetBSD/tests/dist/fs/nfs/nfsservice/rpcbind/ (props changed) vendor/NetBSD/tests/dist/fs/nullfs/ (props changed) vendor/NetBSD/tests/dist/fs/psshfs/ (props changed) vendor/NetBSD/tests/dist/fs/ptyfs/ (props changed) vendor/NetBSD/tests/dist/fs/puffs/ (props changed) vendor/NetBSD/tests/dist/fs/puffs/h_dtfs/ (props changed) vendor/NetBSD/tests/dist/fs/tmpfs/ (props changed) vendor/NetBSD/tests/dist/fs/umapfs/ (props changed) vendor/NetBSD/tests/dist/fs/union/ (props changed) vendor/NetBSD/tests/dist/fs/vfs/ (props changed) vendor/NetBSD/tests/dist/fs/zfs/ (props changed) vendor/NetBSD/tests/dist/games/ (props changed) vendor/NetBSD/tests/dist/include/ (props changed) vendor/NetBSD/tests/dist/include/machine/ (props changed) vendor/NetBSD/tests/dist/include/sys/ (props changed) vendor/NetBSD/tests/dist/ipf/ (props changed) vendor/NetBSD/tests/dist/ipf/expected/ (props changed) vendor/NetBSD/tests/dist/ipf/input/ (props changed) vendor/NetBSD/tests/dist/ipf/regress/ (props changed) vendor/NetBSD/tests/dist/kernel/ (props changed) vendor/NetBSD/tests/dist/kernel/kqueue/ (props changed) vendor/NetBSD/tests/dist/kernel/kqueue/read/ (props changed) vendor/NetBSD/tests/dist/kernel/kqueue/write/ (props changed) vendor/NetBSD/tests/dist/kernel/tty/ (props changed) vendor/NetBSD/tests/dist/lib/ (props changed) vendor/NetBSD/tests/dist/lib/csu/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/alpha/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/arm/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/hppa/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/i386/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/ia64/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/mips/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/powerpc/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/sparc/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/sparc64/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/vax/ (props changed) vendor/NetBSD/tests/dist/lib/csu/arch/x86_64/ (props changed) vendor/NetBSD/tests/dist/lib/csu/dso/ (props changed) vendor/NetBSD/tests/dist/lib/libbluetooth/ (props changed) vendor/NetBSD/tests/dist/lib/libbpfjit/ (props changed) vendor/NetBSD/tests/dist/lib/libc/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/aarch64/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/alpha/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/arm/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/hppa/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/i386/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/ia64/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/m68k/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/mips/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/or1k/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/powerpc/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/powerpc64/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/riscv/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sh3/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sparc/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/sparc64/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/vax/ (props changed) vendor/NetBSD/tests/dist/lib/libc/arch/x86_64/ (props changed) vendor/NetBSD/tests/dist/lib/libc/c063/ (props changed) vendor/NetBSD/tests/dist/lib/libc/common/ (props changed) vendor/NetBSD/tests/dist/lib/libc/db/ (props changed) vendor/NetBSD/tests/dist/lib/libc/gen/ (props changed) vendor/NetBSD/tests/dist/lib/libc/gen/execve/ (props changed) vendor/NetBSD/tests/dist/lib/libc/gen/posix_spawn/ (props changed) vendor/NetBSD/tests/dist/lib/libc/hash/ (props changed) vendor/NetBSD/tests/dist/lib/libc/hash/data/ (props changed) vendor/NetBSD/tests/dist/lib/libc/inet/ (props changed) vendor/NetBSD/tests/dist/lib/libc/locale/ (props changed) vendor/NetBSD/tests/dist/lib/libc/net/ (props changed) vendor/NetBSD/tests/dist/lib/libc/net/getaddrinfo/ (props changed) vendor/NetBSD/tests/dist/lib/libc/regex/ (props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/ (props changed) vendor/NetBSD/tests/dist/lib/libc/regex/data/att/ (props changed) vendor/NetBSD/tests/dist/lib/libc/rpc/ (props changed) vendor/NetBSD/tests/dist/lib/libc/setjmp/ (props changed) vendor/NetBSD/tests/dist/lib/libc/ssp/ (props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/ (props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/ (props changed) vendor/NetBSD/tests/dist/lib/libc/string/ (props changed) vendor/NetBSD/tests/dist/lib/libc/sync/ (props changed) vendor/NetBSD/tests/dist/lib/libc/sys/ (props changed) vendor/NetBSD/tests/dist/lib/libc/termios/ (props changed) vendor/NetBSD/tests/dist/lib/libc/time/ (props changed) vendor/NetBSD/tests/dist/lib/libc/tls/ (props changed) vendor/NetBSD/tests/dist/lib/libc/tls/dso/ (props changed) vendor/NetBSD/tests/dist/lib/libc/tls_dso/ (props changed) vendor/NetBSD/tests/dist/lib/libc/ttyio/ (props changed) vendor/NetBSD/tests/dist/lib/libcrypt/ (props changed) vendor/NetBSD/tests/dist/lib/libcurses/ (props changed) vendor/NetBSD/tests/dist/lib/libcurses/check_files/ (props changed) vendor/NetBSD/tests/dist/lib/libcurses/director/ (props changed) vendor/NetBSD/tests/dist/lib/libcurses/slave/ (props changed) vendor/NetBSD/tests/dist/lib/libcurses/tests/ (props changed) vendor/NetBSD/tests/dist/lib/libdes/ (props changed) vendor/NetBSD/tests/dist/lib/libevent/ (props changed) vendor/NetBSD/tests/dist/lib/libexecinfo/ (props changed) vendor/NetBSD/tests/dist/lib/libm/ (props changed) vendor/NetBSD/tests/dist/lib/libobjc/ (props changed) vendor/NetBSD/tests/dist/lib/libposix/ (props changed) vendor/NetBSD/tests/dist/lib/libposix/bsd/ (props changed) vendor/NetBSD/tests/dist/lib/libposix/posix1/ (props changed) vendor/NetBSD/tests/dist/lib/libposix/posix2/ (props changed) vendor/NetBSD/tests/dist/lib/libppath/ (props changed) vendor/NetBSD/tests/dist/lib/libprop/ (props changed) vendor/NetBSD/tests/dist/lib/libpthread/ (props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/ (props changed) vendor/NetBSD/tests/dist/lib/libpthread/dlopen/dso/ (props changed) vendor/NetBSD/tests/dist/lib/librt/ (props changed) vendor/NetBSD/tests/dist/lib/librumpclient/ (props changed) vendor/NetBSD/tests/dist/lib/librumphijack/ (props changed) vendor/NetBSD/tests/dist/lib/libskey/ (props changed) vendor/NetBSD/tests/dist/lib/libsljit/ (props changed) vendor/NetBSD/tests/dist/lib/libtre/ (props changed) vendor/NetBSD/tests/dist/lib/libutil/ (props changed) vendor/NetBSD/tests/dist/lib/semaphore/ (props changed) vendor/NetBSD/tests/dist/lib/semaphore/pthread/ (props changed) vendor/NetBSD/tests/dist/libexec/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/data/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_dso1/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_dso2/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_ifunc_dso/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso0/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso1/ (props changed) vendor/NetBSD/tests/dist/libexec/ld.elf_so/helper_symver_dso2/ (props changed) vendor/NetBSD/tests/dist/modules/ (props changed) vendor/NetBSD/tests/dist/modules/k_helper/ (props changed) vendor/NetBSD/tests/dist/modules/k_helper2/ (props changed) vendor/NetBSD/tests/dist/modules/k_helper3/ (props changed) vendor/NetBSD/tests/dist/modules/k_uvm/ (props changed) vendor/NetBSD/tests/dist/net/ (props changed) vendor/NetBSD/tests/dist/net/bpf/ (props changed) vendor/NetBSD/tests/dist/net/bpfilter/ (props changed) vendor/NetBSD/tests/dist/net/bpfjit/ (props changed) vendor/NetBSD/tests/dist/net/carp/ (props changed) vendor/NetBSD/tests/dist/net/config/ (props changed) vendor/NetBSD/tests/dist/net/fdpass/ (props changed) vendor/NetBSD/tests/dist/net/icmp/ (props changed) vendor/NetBSD/tests/dist/net/if/ (props changed) vendor/NetBSD/tests/dist/net/if_bridge/ (props changed) vendor/NetBSD/tests/dist/net/if_loop/ (props changed) vendor/NetBSD/tests/dist/net/mpls/ (props changed) vendor/NetBSD/tests/dist/net/net/ (props changed) vendor/NetBSD/tests/dist/net/npf/ (props changed) vendor/NetBSD/tests/dist/net/route/ (props changed) vendor/NetBSD/tests/dist/net/sys/ (props changed) vendor/NetBSD/tests/dist/rump/ (props changed) vendor/NetBSD/tests/dist/rump/kernspace/ (props changed) vendor/NetBSD/tests/dist/rump/modautoload/ (props changed) vendor/NetBSD/tests/dist/rump/rumpkern/ (props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_client/ (props changed) vendor/NetBSD/tests/dist/rump/rumpkern/h_server/ (props changed) vendor/NetBSD/tests/dist/rump/rumpnet/ (props changed) vendor/NetBSD/tests/dist/rump/rumpvfs/ (props changed) vendor/NetBSD/tests/dist/sbin/ (props changed) vendor/NetBSD/tests/dist/sbin/fsck_ffs/ (props changed) vendor/NetBSD/tests/dist/sbin/ifconfig/ (props changed) vendor/NetBSD/tests/dist/sbin/newfs/ (props changed) vendor/NetBSD/tests/dist/sbin/newfs_msdos/ (props changed) vendor/NetBSD/tests/dist/sbin/resize_ffs/ (props changed) vendor/NetBSD/tests/dist/sbin/route/ (props changed) vendor/NetBSD/tests/dist/sbin/sysctl/ (props changed) vendor/NetBSD/tests/dist/share/ (props changed) vendor/NetBSD/tests/dist/share/examples/ (props changed) vendor/NetBSD/tests/dist/share/mk/ (props changed) vendor/NetBSD/tests/dist/sys/ (props changed) vendor/NetBSD/tests/dist/sys/rc/ (props changed) vendor/NetBSD/tests/dist/usr.bin/ (props changed) vendor/NetBSD/tests/dist/usr.bin/awk/ (props changed) vendor/NetBSD/tests/dist/usr.bin/basename/ (props changed) vendor/NetBSD/tests/dist/usr.bin/bzip2/ (props changed) vendor/NetBSD/tests/dist/usr.bin/cc/ (props changed) vendor/NetBSD/tests/dist/usr.bin/cmp/ (props changed) vendor/NetBSD/tests/dist/usr.bin/config/ (props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/ (props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/ (props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/ (props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/arch/regress/conf/ (props changed) vendor/NetBSD/tests/dist/usr.bin/config/support/conf/ (props changed) vendor/NetBSD/tests/dist/usr.bin/cut/ (props changed) vendor/NetBSD/tests/dist/usr.bin/diff/ (props changed) vendor/NetBSD/tests/dist/usr.bin/dirname/ (props changed) vendor/NetBSD/tests/dist/usr.bin/find/ (props changed) vendor/NetBSD/tests/dist/usr.bin/grep/ (props changed) vendor/NetBSD/tests/dist/usr.bin/gzip/ (props changed) vendor/NetBSD/tests/dist/usr.bin/id/ (props changed) vendor/NetBSD/tests/dist/usr.bin/infocmp/ (props changed) vendor/NetBSD/tests/dist/usr.bin/jot/ (props changed) vendor/NetBSD/tests/dist/usr.bin/m4/ (props changed) vendor/NetBSD/tests/dist/usr.bin/make/ (props changed) vendor/NetBSD/tests/dist/usr.bin/mkdep/ (props changed) vendor/NetBSD/tests/dist/usr.bin/nbperf/ (props changed) vendor/NetBSD/tests/dist/usr.bin/netpgpverify/ (props changed) vendor/NetBSD/tests/dist/usr.bin/pr/ (props changed) vendor/NetBSD/tests/dist/usr.bin/rump_server/ (props changed) vendor/NetBSD/tests/dist/usr.bin/sdiff/ (props changed) vendor/NetBSD/tests/dist/usr.bin/sed/ (props changed) vendor/NetBSD/tests/dist/usr.bin/shmif_dumpbus/ (props changed) vendor/NetBSD/tests/dist/usr.bin/sort/ (props changed) vendor/NetBSD/tests/dist/usr.bin/tmux/ (props changed) vendor/NetBSD/tests/dist/usr.bin/tr/ (props changed) vendor/NetBSD/tests/dist/usr.bin/unifdef/ (props changed) vendor/NetBSD/tests/dist/usr.bin/vmstat/ (props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/ (props changed) vendor/NetBSD/tests/dist/usr.bin/xlint/lint1/ (props changed) vendor/NetBSD/tests/dist/usr.sbin/ (props changed) vendor/NetBSD/tests/dist/usr.sbin/mtree/ (props changed) vendor/NetBSD/tests/dist/usr.sbin/tcpdump/ (props changed) vendor/NetBSD/tests/dist/usr.sbin/traceroute/ (props changed) vendor/NetBSD/tests/dist/usr.sbin/useradd/ (props changed) Added: vendor/NetBSD/tests/dist/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/Makefile Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,45 @@ +# $NetBSD: Makefile,v 1.44 2013/02/25 00:33:19 jmmv Exp $ + +.include + +.if ${MKATF} != "no" + +TESTSDIR= ${TESTSBASE} + +TESTS_SUBDIRS= bin dev games include kernel lib libexec net +TESTS_SUBDIRS+= sbin sys usr.bin usr.sbin + +. if (${MKRUMP} != "no") +TESTS_SUBDIRS+= fs rump + +. if ${MKKMOD} != "no" +TESTS_SUBDIRS+= modules +. endif +. endif + +. if ${MKCRYPTO} != "no" +TESTS_SUBDIRS+= crypto +. endif + +. if ${MKIPFILTER} != "no" +TESTS_SUBDIRS+= ipf +. endif + +. if ${MKSHARE} != "no" +TESTS_SUBDIRS+= share +. endif + +. if ${MKATF} != "no" +ATFFILE_EXTRA_SUBDIRS+= atf +. endif + +. if ${MKKYUA} != "no" +ATFFILE_EXTRA_SUBDIRS+= kyua-atf-compat kyua-cli kyua-testers +. endif + +.include + +.else + +.include +.endif Added: vendor/NetBSD/tests/dist/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/Makefile.inc Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,3 @@ +# $NetBSD: Makefile.inc,v 1.2 2011/09/16 16:30:18 joerg Exp $ +WARNS ?= 4 +CWARNFLAGS+= -Wno-missing-noreturn Added: vendor/NetBSD/tests/dist/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/README Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,20 @@ +$NetBSD: README,v 1.4 2012/05/18 15:36:21 jruoho Exp $ + +When adding new tests, please try to follow the following conventions. + +1. For library routines, including system calls, the directory structure of + the tests should follow the directory structure of the real source tree. + For instance, interfaces available via the C library should follow: + + src/lib/libc/gen -> src/tests/lib/libc/gen + src/lib/libc/sys -> src/tests/lib/libc/sys + ... + +2. Equivalently, all tests for userland utilities should try to follow their + location in the source tree. If this can not be satisfied, the tests for + a utility should be located under the directory to which the utility is + installed. Thus, a test for env(1) should go to src/tests/usr.bin/env. + Likewise, a test for tcpdump(8) should be in src/tests/usr.sbin/tcpdump, + even though the source code for the program is located under src/external. + +3. Otherwise use your own discretion. Added: vendor/NetBSD/tests/dist/bin/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/Makefile Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,9 @@ +# $NetBSD: Makefile,v 1.3 2012/03/30 15:49:24 njoly Exp $ + +.include + +TESTSDIR= ${TESTSBASE}/bin + +TESTS_SUBDIRS= cat cp dd df expr pax ps sh sleep tar + +.include Added: vendor/NetBSD/tests/dist/bin/cat/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/cat/Makefile Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2012/03/27 08:16:33 jruoho Exp $ + +.include + +TESTSDIR= ${TESTSBASE}/bin/cat +TESTS_SH= t_cat + +FILESDIR= ${TESTSDIR} +FILES+= d_align.in +FILES+= d_align.out + +.include Added: vendor/NetBSD/tests/dist/bin/cat/d_align.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/cat/d_align.in Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,3 @@ +a b c +1 2 3 +x y z Added: vendor/NetBSD/tests/dist/bin/cat/d_align.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/cat/d_align.out Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,3 @@ + 1 a b c$ + 2 1 2 3$ + 3 x y z$ Added: vendor/NetBSD/tests/dist/bin/cat/t_cat.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/cat/t_cat.sh Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,59 @@ +# $NetBSD: t_cat.sh,v 1.2 2012/03/27 17:57:02 jruoho Exp $ +# +# Copyright (c) 2012 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Jukka Ruohonen. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +atf_test_case align +align_head() { + atf_set "descr" "Test that cat(1) aligns the output " \ + "right with options '-be' (PR bin/4841)" +} + +align_body() { + + atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \ + -x "cat -be $(atf_get_srcdir)/d_align.in" +} + +atf_test_case nonexistent +nonexistent_head() { + atf_set "descr" "Test that cat(1) doesn't return zero exit " \ + "status for a nonexistent file (PR bin/3538)" +} + +nonexistent_body() { + + atf_check -s not-exit:0 -o empty -e not-empty \ + -x "cat /some/name/that/does/not/exist" +} + +atf_init_test_cases() +{ + atf_add_test_case align + atf_add_test_case nonexistent +} Added: vendor/NetBSD/tests/dist/bin/cp/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/cp/Makefile Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:10 jruoho Exp $ + +.include + +TESTSDIR= ${TESTSBASE}/bin/cp +TESTS_SH= t_cp + +.include Added: vendor/NetBSD/tests/dist/bin/cp/t_cp.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/cp/t_cp.sh Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,294 @@ +# $NetBSD: t_cp.sh,v 1.1 2012/03/17 16:33:10 jruoho Exp $ +# +# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +FILES="file file2 file3 link dir dir2 dirlink target" + +cleanup() { + rm -fr ${FILES} +} + +cp_compare() { + echo "Ensuring that $2 and $3 are identical" + cmp -s $2 $3 || atf_fail "$2 and $3 are different" +} + +reset() { + cleanup + echo "I'm a file" > file + echo "I'm a file, 2" > file2 + echo "I'm a file, 3" > file3 + ln -s file link + mkdir dir + ln -s dir dirlink +} + +atf_test_case file_to_file +file_to_file_head() { + atf_set "descr" "Checks the copy of a file to a file" +} +file_to_file_body() { + reset + + file_to_file_simple + file_to_file_preserve + file_to_file_noflags +} + +file_to_file_simple() { + rm -f file2 + umask 022 + chmod 777 file + atf_check -s eq:0 -o empty -e empty cp file file2 + cp_compare file_to_file_simple file file2 + if [ `stat -f "%Lp" file2` != "755" ]; then + atf_fail "new file not created with umask" + fi + + chmod 644 file + chmod 777 file2 + cp_compare file_to_file_simple file file2 + if [ `stat -f "%Lp" file2` != "777" ]; then + atf_fail "existing files permissions not retained" + fi +} + +file_to_file_preserve() { + rm file3 + chmod 644 file + chflags nodump file + atf_check -s eq:0 -o empty -e empty cp -p file file3 + finfo=`stat -f "%p%u%g%m%z%f" file` + f3info=`stat -f "%p%u%g%m%z%f" file3` + if [ $finfo != $f3info ]; then + atf_fail "attributes not preserved" + fi +} + +file_to_file_noflags() { + rm file3 + chmod 644 file + chflags nodump file + atf_check -s eq:0 -o empty -e empty cp -p -N file file3 + finfo=`stat -f "%f" file` + f3info=`stat -f "%f" file3` + if [ $finfo = $f3info ]; then + atf_fail "-p -N preserved file flags" + fi +} + +atf_test_case file_to_link +file_to_link_head() { + atf_set "descr" "Checks the copy of a file to a symbolic link" +} +file_to_link_body() { + reset + atf_check -s eq:0 -o empty -e empty cp file2 link + cp_compare file_to_link file file2 +} + +atf_test_case link_to_file +link_to_file_head() { + atf_set "descr" "Checks the copy of a symbolic link to a file" +} +link_to_file_body() { + reset + # file and link are identical (not copied). + atf_check -s eq:1 -o empty -e ignore cp link file + atf_check -s eq:0 -o empty -e empty cp link file2 + cp_compare link_to_file file file2 +} + +atf_test_case file_over_link +file_over_link_head() { + atf_set "descr" "Checks the copy of a file to a symbolic link" \ + "without following it" +} +file_over_link_body() { + reset + atf_check -s eq:0 -o empty -e empty cp -P file link + cp_compare file_over_link file link +} + +atf_test_case link_over_file +link_over_file_head() { + atf_set "descr" "Checks the copy of a symbolic link to a file" \ + "without following the former" +} +link_over_file_body() { + reset + atf_check -s eq:0 -o empty -e empty cp -P link file + if [ `readlink link` != `readlink file` ]; then + atf_fail "readlink link != readlink file" + fi +} + +atf_test_case files_to_dir +files_to_dir_head() { + atf_set "descr" "Checks the copy of multiple files into a directory" +} +files_to_dir_body() { + reset + # can't copy multiple files to a file + atf_check -s eq:1 -o empty -e ignore cp file file2 file3 + atf_check -s eq:0 -o empty -e empty cp file file2 link dir + cp_compare files_to_dir file "dir/file" +} + +atf_test_case dir_to_file +dir_to_file_head() { + atf_set "descr" "Checks the copy of a directory onto a file, which" \ + "should not work" +} +dir_to_file_body() { + reset + # can't copy a dir onto a file + atf_check -s eq:1 -o empty -e ignore cp dir file + atf_check -s eq:1 -o empty -e ignore cp -R dir file +} + +atf_test_case file_to_linkdir +file_to_linkdir_head() { + atf_set "descr" "Checks the copy of a file to a symbolic link that" \ + "points to a directory" +} +file_to_linkdir_body() { + reset + atf_check -s eq:0 -o empty -e empty cp file dirlink + cp_compare file_to_linkdir file "dir/file" + + # overwrite the link + atf_check -s eq:0 -o empty -e empty cp -P file dirlink + atf_check -s eq:1 -o empty -e empty readlink dirlink + cp_compare file_to_linkdir file dirlink +} + +atf_test_case linkdir_to_file +linkdir_to_file_head() { + atf_set "descr" "Checks the copy of a symbolic link that points to" \ + "a directory onto a file" +} +linkdir_to_file_body() { + reset + # cannot copy a dir onto a file + atf_check -s eq:1 -o empty -e ignore cp dirlink file + + # overwrite the link + atf_check -s eq:0 -o empty -e empty cp -P dirlink file + if [ `readlink file` != `readlink dirlink` ]; then + atf_fail "readlink link != readlink file" + fi +} + +dir_to_dne_no_R() { + atf_check -s eq:1 -o empty -e ignore cp dir dir2 +} + +dir_to_dne() { + atf_check -s eq:0 -o empty -e empty cp -R dir dir2 + cp_compare dir_to_dne "dir/file" "dir2/file" + readlink dir2/link >/dev/null + if [ $? -gt 0 ]; then + atf_fail "-R didn't copy a link as a link" + fi +} + +dir_to_dir_H() { + dir_to_dir_setup + atf_check -s eq:0 -o empty -e empty cp -R dir dir2 + + chmod 777 dir + + # copy a dir into a dir, only command-line links are followed + atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2 + cp_compare dir_to_dir_H "dir/file" "dir2/dirlink/file" + readlink dir2/dirlink/link >/dev/null + if [ $? -gt 0 ]; then + atf_fail "didn't copy a link as a link" + fi + + # Created directories have the same mode as the corresponding + # source directory, unmodified by the process's umask. + if [ `stat -f "%Lp" dir2/dirlink` != "777" ]; then + atf_fail "-R modified dir perms with umask" + fi +} + +dir_to_dir_L() { + dir_to_dir_setup + atf_check -s eq:0 -o empty -e empty cp -R dir dir2 + atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2 + + # copy a dir into a dir, following all links + atf_check -s eq:0 -o empty -e empty cp -R -H -L dirlink dir2/dirlink + cp_compare dir_to_dir_L "dir/file" "dir2/dirlink/dirlink/file" + # fail if -R -L copied a link as a link + atf_check -s eq:1 -o ignore -e empty readlink dir2/dirlink/dirlink/link +} + +dir_to_dir_subdir_exists() { + # recursively copy a dir into another dir, with some subdirs already + # existing + cleanup + + mkdir -p dir/1 dir/2 dir/3 target/2 + echo "file" > dir/2/file + atf_check -s eq:0 -o empty -e empty cp -R dir/* target + cp_compare dir_to_dir_subdir_exists "dir/2/file" "target/2/file" +} + +dir_to_dir_setup() { + reset + umask 077 + cp -P file file2 file3 link dir +} + +atf_test_case dir_to_dir +dir_to_dir_head() { + atf_set "descr" "Checks the copy of a directory onto another directory" +} +dir_to_dir_body() { + dir_to_dir_setup + dir_to_dne_no_R + dir_to_dne + dir_to_dir_H + dir_to_dir_L + dir_to_dir_subdir_exists +} + +atf_init_test_cases() +{ + atf_add_test_case file_to_file + atf_add_test_case file_to_link + atf_add_test_case link_to_file + atf_add_test_case file_over_link + atf_add_test_case link_over_file + atf_add_test_case files_to_dir + atf_add_test_case file_to_linkdir + atf_add_test_case linkdir_to_file + atf_add_test_case dir_to_file + atf_add_test_case dir_to_dir +} Added: vendor/NetBSD/tests/dist/bin/dd/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/dd/Makefile Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $ + +.include + +TESTSDIR= ${TESTSBASE}/bin/dd +TESTS_SH= t_dd + +.include Added: vendor/NetBSD/tests/dist/bin/dd/t_dd.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/dd/t_dd.sh Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,130 @@ +# $NetBSD: t_dd.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $ +# +# Copyright (c) 2007 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +test_dd_length() { + result=$1 + cmd=$2 + set -- x `eval $cmd | wc -c` + res=$2 + if [ x"$res" != x"$result" ]; then + atf_fail "Expected $result bytes of output, got $res: $cmd" + fi +} + +atf_test_case length +length_head() { + # XXX The PR should be stored in a tag. + atf_set "descr" "Test for result messages accidentally pumped into" \ + "the output file if the standard IO descriptors are" \ + "closed. The last of the three following tests is" \ + "the one expected to fail. (NetBSD PR bin/8521)" +} +length_body() { + test_dd_length 512 \ + "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >/dev/null 2>/dev/null" + test_dd_length 512 \ + "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >&- 2>/dev/null" + test_dd_length 512 \ + "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >&- 2>&-" +} + +test_dd_io() { + res="`echo -n "$2" | eval $1`" + if [ x"$res" != x"$3" ]; then + atf_fail "Expected \"$3\", got \"$res\": $1" + fi +} + +allbits1="\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\36 6\367\370\371\372\373\374\375\376\377" + +ebcdicbits1="\000\001\002\003\067\055\056\057\026\005\045\013\014\015\016\017\020\021\022\023\074\075\062\046\030\031\077\047\034\035\036\037\100\132\177\173\133\154\120\175\115\135\134\116\153\140\113\141\360\361\362\363\364\365\366\367\370\371\172\136\114\176\156\157\174\301\302\303\304\305\306\307\310\311\321\322\323\324\325\326\327\330\331\342\343\344\345\346\347\350\351\255\340\275\232\155\171\201\202\203\204\205\206\207\210\211\221\222\223\224\225\226\227\230\231\242\243\244\245\246\247\250\251\300\117\320\137\007\040\041\042\043\044\025\006\027\050\051\052\053\054\011\012\033\060\061\032\063\064\065\066\010\070\071\072\073\004\024\076\341\101\102\103\104\105\106\107\110\111\121\122\123\124\125\126\127\130\131\142\143\144\145\146\147\150\151\160\161\162\163\164\165\166\167\170\200\212\213\214\215\216\217\220\152\233\234\235\236\237\240\252\253\254\112\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\241\276\277\312\313\314\315\316\317\332\333\334\335\336\337\352\353 \354\355\356\357\372\373\374\375\376\377" + +allvisbits=`echo -n "$allbits1" | unvis | vis` +ebcdicvisbits=`echo -n "$ebcdicbits1" | unvis | vis` + +atf_test_case io +io_head() { + atf_set "descr" "This checks the combination of bs= with" \ + "conv=ebcdic. Prior to revision 1.24 of dd's" \ + "args.c, the conv option would be ignored." +} +io_body() { + test_dd_io "unvis | dd 2>/dev/null | vis" \ + "$allvisbits" "$allvisbits" + test_dd_io "unvis | dd ibs=1 2>/dev/null | vis" \ + "$allvisbits" "$allvisbits" + test_dd_io "unvis | dd obs=1 2>/dev/null | vis" \ + "$allvisbits" "$allvisbits" + test_dd_io "unvis | dd bs=1 2>/dev/null | vis" \ + "$allvisbits" "$allvisbits" + + test_dd_io "unvis | dd conv=ebcdic 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + test_dd_io "unvis | dd conv=ebcdic ibs=512 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + test_dd_io "unvis | dd conv=ebcdic obs=512 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + test_dd_io "unvis | dd conv=ebcdic bs=512 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + + test_dd_io "unvis | dd conv=ebcdic 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + test_dd_io "unvis | dd conv=ebcdic ibs=1 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + test_dd_io "unvis | dd conv=ebcdic obs=1 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" + test_dd_io "unvis | dd conv=ebcdic bs=1 2>/dev/null | vis" \ + "$allvisbits" "$ebcdicvisbits" +} + +atf_test_case seek +seek_head() { + atf_set "descr" "Tests output file seeking" +} + +seek_body() { + echo TEST1234 > testfile + atf_check -s exit:0 -e ignore \ + dd if=/dev/zero of=testfile seek=1 bs=8k count=1 + atf_check -s exit:0 -e ignore -o match:'^TEST1234$' dd if=testfile + eval $(stat -s testfile) + atf_check_equal $st_size $((2*8192)) + + echo -n TEST1234 > tf2 + atf_check -s exit:0 -e ignore -x \ + 'dd bs=4 if=/dev/zero count=1 | tr \\0 \\n | dd of=tf2 bs=4 seek=1' + atf_check -s exit:0 -e ignore -o match:'^TEST$' dd if=tf2 + eval $(stat -s tf2) + atf_check_equal $st_size 8 +} + +atf_init_test_cases() +{ + atf_add_test_case length + atf_add_test_case io + atf_add_test_case seek +} Added: vendor/NetBSD/tests/dist/bin/df/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/df/Makefile Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $ + +NOMAN= # defined + +.include + +TESTSDIR= ${TESTSBASE}/bin/df + +TESTS_SH= t_df + +BINDIR= ${TESTSDIR} +PROG= h_df +.PATH: ${NETBSDSRCDIR}/bin/df +SRCS= df.c getmntinfo.c + +LDADD+= -lutil +DPADD+= ${LIBUTIL} + +# Pass -DINTREE to make to test using humanize_number.c in source tree +# directly instead of the one in libc. +.if defined(INTREE) +.PATH: ${NETBSDSRCDIR}/lib/libc/gen +CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/include +SRCS+= humanize_number.c +.endif + +.include Added: vendor/NetBSD/tests/dist/bin/df/getmntinfo.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/df/getmntinfo.c Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,218 @@ +/* $NetBSD: getmntinfo.c,v 1.1 2012/03/17 16:33:11 jruoho Exp $ */ +/* + * Copyright (c) 2007 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include + +#include +#include +#include + +#define KB * 1024 +#define MB * 1024 KB +#define GB * 1024 MB + +static struct statvfs *getnewstatvfs(void); +static void other_variants(const struct statvfs *, const int *, int, + const int *, int); +static void setup_filer(void); +static void setup_ld0g(void); +static void setup_strpct(void); + +static struct statvfs *allstatvfs; +static int sftotal, sfused; + +struct statvfs * +getnewstatvfs(void) +{ + + if (sftotal == sfused) { + sftotal = sftotal ? sftotal * 2 : 1; + allstatvfs = realloc(allstatvfs, + sftotal * sizeof(struct statvfs)); + if (allstatvfs == NULL) + err(EXIT_FAILURE, "realloc"); + } + + return (&allstatvfs[sfused++]); +} + +void +other_variants(const struct statvfs *tmpl, const int *minfree, int minfreecnt, + const int *consumed, int consumedcnt) +{ + int64_t total, used; + struct statvfs *sf; + int i, j; + + for (i = 0; i < minfreecnt; i++) + for (j = 0; j < consumedcnt; j++) { + sf = getnewstatvfs(); + *sf = *tmpl; + total = (int64_t)(u_long)sf->f_blocks * sf->f_bsize; + used = total * consumed[j] / 100; + sf->f_bfree = (total - used) / sf->f_bsize; + sf->f_bavail = (total * (100 - minfree[i]) / 100 - + used) / (int)sf->f_bsize; + sf->f_bresvd = sf->f_bfree - sf->f_bavail; + } +} + +/* + * Parameter taken from: + * http://mail-index.NetBSD.org/tech-userlevel/2004/03/24/0001.html + */ +void +setup_filer(void) +{ + static const struct statvfs tmpl = { +#define BSIZE 512 +#define TOTAL 1147ULL GB +#define USED 132ULL MB + .f_bsize = BSIZE, + .f_frsize = BSIZE, + .f_blocks = TOTAL / BSIZE, + .f_bfree = (TOTAL - USED) / BSIZE, + .f_bavail = (TOTAL - USED) / BSIZE, + .f_bresvd = 0, + .f_mntfromname = "filer:/", + .f_mntonname = "/filer", +#undef USED +#undef TOTAL +#undef BSIZE + }; + static const int minfree[] = { 0, 5, 10, 15, }; + static const int consumed[] = { 0, 20, 60, 95, 100 }; + + *getnewstatvfs() = tmpl; + other_variants(&tmpl, minfree, sizeof(minfree) / sizeof(minfree[0]), + consumed, sizeof(consumed) / sizeof(consumed[0])); +} + +/* + * Parameter taken from: + * http://mail-index.NetBSD.org/current-users/2004/03/01/0038.html + */ +void +setup_ld0g(void) +{ + static const struct statvfs tmpl = { +#define BSIZE 4096 /* Guess */ +#define TOTAL 1308726116ULL KB +#define USED 17901268ULL KB +#define AVAIL 1225388540ULL KB + .f_bsize = BSIZE, + .f_frsize = BSIZE, + .f_blocks = TOTAL / BSIZE, + .f_bfree = (TOTAL - USED) / BSIZE, + .f_bavail = AVAIL / BSIZE, + .f_bresvd = (TOTAL - USED) / BSIZE - AVAIL / BSIZE, + .f_mntfromname = "/dev/ld0g", + .f_mntonname = "/anon-root", +#undef AVAIL +#undef USED +#undef TOTAL +#undef BSIZE + }; + static const int minfree[] = { 0, 5, 10, 15, }; + static const int consumed[] = { 0, 20, 60, 95, 100 }; + + *getnewstatvfs() = tmpl; + other_variants(&tmpl, minfree, sizeof(minfree) / sizeof(minfree[0]), + consumed, sizeof(consumed) / sizeof(consumed[0])); +} + +/* + * Test of strpct() with huge number. + */ +void +setup_strpct(void) +{ + static const struct statvfs tmpl = { +#define BSIZE 4096 /* Guess */ +#define TOTAL 0x4ffffffffULL KB +#define USED (TOTAL / 2) +#define AVAIL (TOTAL / 2) + .f_bsize = BSIZE, + .f_frsize = BSIZE, + .f_blocks = TOTAL / BSIZE, + .f_bfree = (TOTAL - USED) / BSIZE, + .f_bavail = AVAIL / BSIZE, + .f_bresvd = (TOTAL - USED) / BSIZE - AVAIL / BSIZE, + .f_mntfromname = "/dev/strpct", + .f_mntonname = "/strpct", +#undef AVAIL +#undef USED +#undef TOTAL +#undef BSIZE + }; + + *getnewstatvfs() = tmpl; +} + +/* + * Parameter taken from: + * http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=23600 + */ +static void +setup_pr23600(void) +{ + static const struct statvfs tmpl = { +#define BSIZE 512 +#define TOTAL 20971376ULL +#define USED 5719864ULL +#define AVAIL 15251512ULL + .f_bsize = BSIZE, + .f_frsize = BSIZE, + .f_blocks = TOTAL, + .f_bfree = TOTAL - USED, + .f_bavail = AVAIL, + .f_bresvd = TOTAL - USED - AVAIL, + .f_mntfromname = "/dev/wd0e", + .f_mntonname = "/mount/windows/C", +#undef AVAIL +#undef USED +#undef TOTAL +#undef BSIZE + }; + + *getnewstatvfs() = tmpl; +} + +int +getmntinfo(struct statvfs **mntbuf, int flags) +{ + + setup_filer(); + setup_ld0g(); + setup_strpct(); + setup_pr23600(); + + *mntbuf = allstatvfs; + return (sfused); +} Added: vendor/NetBSD/tests/dist/bin/df/t_df.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/tests/dist/bin/df/t_df.sh Wed Oct 1 04:07:17 2014 (r272343) @@ -0,0 +1,148 @@ +# $NetBSD: t_df.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $ +# +# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +atf_test_case normal +normal_head() { + atf_set "descr" "Checks that the output of df without flags is" \ + "correct according to some already-known, sane" \ + "output" +} +normal_body() { + cat >expout <expout < Author: ngie Date: Wed Oct 1 04:12:38 2014 New Revision: 272345 URL: https://svnweb.freebsd.org/changeset/base/272345 Log: Tag ^/base/vendor/NetBSD/tests/09.30.2014_20.45 from ^/base/vendor/NetBSD/tests/dist Sponsored by: EMC / Isilon Storage Division Added: vendor/NetBSD/tests/09.30.2014_20.45/ - copied from r272344, vendor/NetBSD/tests/dist/ From delphij at FreeBSD.org Sat Oct 4 07:24:36 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:24:36 +0000 (UTC) Subject: svn commit: r272493 - in vendor/illumos/dist: cmd/zpool lib/libzfs/common Message-ID: <201410040724.s947OapX079325@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:24:35 2014 New Revision: 272493 URL: https://svnweb.freebsd.org/changeset/base/272493 Log: 5147 zpool list -v should show individual disk capacity Reviewed by: Adam Leventhal Reviewed by: Christopher Siden Reviewed by: Matthew Ahrens Reviewed by: Richard Elling Approved by: Dan McDonald Author: George Wilson illumos/illumos-gate at 7a09f97bc0d52b763c580864e78a665b15be37f8 Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c ============================================================================== --- vendor/illumos/dist/cmd/zpool/zpool_main.c Sat Oct 4 06:01:30 2014 (r272492) +++ vendor/illumos/dist/cmd/zpool/zpool_main.c Sat Oct 4 07:24:35 2014 (r272493) @@ -2711,10 +2711,7 @@ print_pool(zpool_handle_t *zhp, list_cbd right_justify = B_FALSE; if (pl->pl_prop != ZPROP_INVAL) { - if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ && - zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0) - propstr = "-"; - else if (zpool_get_prop(zhp, pl->pl_prop, property, + if (zpool_get_prop(zhp, pl->pl_prop, property, sizeof (property), NULL, cb->cb_literal) != 0) propstr = "-"; else @@ -2748,21 +2745,37 @@ print_pool(zpool_handle_t *zhp, list_cbd } static void -print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted) +print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted, + boolean_t valid) { char propval[64]; boolean_t fixed; size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL); - - if (prop == ZPOOL_PROP_EXPANDSZ && value == 0) - (void) strlcpy(propval, "-", sizeof (propval)); - else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID) - (void) strlcpy(propval, "-", sizeof (propval)); - else if (prop == ZPOOL_PROP_FRAGMENTATION) + switch (prop) { + case ZPOOL_PROP_EXPANDSZ: + if (value == 0) + (void) strlcpy(propval, "-", sizeof (propval)); + else + zfs_nicenum(value, propval, sizeof (propval)); + break; + case ZPOOL_PROP_FRAGMENTATION: + if (value == ZFS_FRAG_INVALID) { + (void) strlcpy(propval, "-", sizeof (propval)); + } else { + (void) snprintf(propval, sizeof (propval), "%llu%%", + value); + } + break; + case ZPOOL_PROP_CAPACITY: (void) snprintf(propval, sizeof (propval), "%llu%%", value); - else + break; + default: zfs_nicenum(value, propval, sizeof (propval)); + } + + if (!valid) + (void) strlcpy(propval, "-", sizeof (propval)); if (scripted) (void) printf("\t%s", propval); @@ -2784,6 +2797,9 @@ print_list_stats(zpool_handle_t *zhp, co (uint64_t **)&vs, &c) == 0); if (name != NULL) { + boolean_t toplevel = (vs->vs_space != 0); + uint64_t cap; + if (scripted) (void) printf("\t%s", name); else if (strlen(name) + depth > cb->cb_namewidth) @@ -2792,24 +2808,26 @@ print_list_stats(zpool_handle_t *zhp, co (void) printf("%*s%s%*s", depth, "", name, (int)(cb->cb_namewidth - strlen(name) - depth), ""); - /* only toplevel vdevs have capacity stats */ - if (vs->vs_space == 0) { - if (scripted) - (void) printf("\t-\t-\t-\t-"); - else - (void) printf(" - - - -"); - } else { - print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, - scripted); - print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc, - scripted); - print_one_column(ZPOOL_PROP_FREE, - vs->vs_space - vs->vs_alloc, scripted); - print_one_column(ZPOOL_PROP_FRAGMENTATION, - vs->vs_fragmentation, scripted); - } - print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, - scripted); + /* + * Print the properties for the individual vdevs. Some + * properties are only applicable to toplevel vdevs. The + * 'toplevel' boolean value is passed to the print_one_column() + * to indicate that the value is valid. + */ + print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, scripted, + toplevel); + print_one_column(ZPOOL_PROP_ALLOCATED, vs->vs_alloc, scripted, + toplevel); + print_one_column(ZPOOL_PROP_FREE, vs->vs_space - vs->vs_alloc, + scripted, toplevel); + print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, scripted, + B_TRUE); + print_one_column(ZPOOL_PROP_FRAGMENTATION, + vs->vs_fragmentation, scripted, + (vs->vs_fragmentation != ZFS_FRAG_INVALID && toplevel)); + cap = (vs->vs_space == 0) ? 0 : + (vs->vs_alloc * 100 / vs->vs_space); + print_one_column(ZPOOL_PROP_CAPACITY, cap, scripted, toplevel); (void) printf("\n"); } @@ -2878,7 +2896,8 @@ list_callback(zpool_handle_t *zhp, void * -H Scripted mode. Don't display headers, and separate properties * by a single tab. * -o List of properties to display. Defaults to - * "name,size,allocated,free,capacity,health,altroot" + * "name,size,allocated,free,expandsize,fragmentation,capacity," + * "dedupratio,health,altroot" * -p Diplay values in parsable (exact) format. * -T Display a timestamp in date(1) or Unix format * @@ -2892,7 +2911,7 @@ zpool_do_list(int argc, char **argv) int ret; list_cbdata_t cb = { 0 }; static char default_props[] = - "name,size,allocated,free,fragmentation,expandsize,capacity," + "name,size,allocated,free,expandsize,fragmentation,capacity," "dedupratio,health,altroot"; char *props = default_props; unsigned long interval = 0, count = 0; Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c ============================================================================== --- vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c Sat Oct 4 06:01:30 2014 (r272492) +++ vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c Sat Oct 4 07:24:35 2014 (r272493) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -276,7 +276,6 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo case ZPOOL_PROP_FREE: case ZPOOL_PROP_FREEING: case ZPOOL_PROP_LEAKED: - case ZPOOL_PROP_EXPANDSZ: if (literal) { (void) snprintf(buf, len, "%llu", (u_longlong_t)intval); @@ -284,7 +283,16 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo (void) zfs_nicenum(intval, buf, len); } break; - + case ZPOOL_PROP_EXPANDSZ: + if (intval == 0) { + (void) strlcpy(buf, "-", len); + } else if (literal) { + (void) snprintf(buf, len, "%llu", + (u_longlong_t)intval); + } else { + (void) zfs_nicenum(intval, buf, len); + } + break; case ZPOOL_PROP_CAPACITY: if (literal) { (void) snprintf(buf, len, "%llu", @@ -302,13 +310,11 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo (u_longlong_t)intval); } break; - case ZPOOL_PROP_DEDUPRATIO: (void) snprintf(buf, len, "%llu.%02llux", (u_longlong_t)(intval / 100), (u_longlong_t)(intval % 100)); break; - case ZPOOL_PROP_HEALTH: verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL), ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0); From delphij at FreeBSD.org Sat Oct 4 07:26:43 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:26:42 +0000 (UTC) Subject: svn commit: r272494 - in vendor-sys/illumos/dist/uts/common/fs/zfs: . sys Message-ID: <201410040726.s947Qg34079638@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:26:42 2014 New Revision: 272494 URL: https://svnweb.freebsd.org/changeset/base/272494 Log: 5164 space_map_max_blksz causes panic, does not work 5165 zdb fails assertion when run on pool with recently-enabled spacemap_histogram feature Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Saso Kiselkov Approved by: Dan McDonald Author: Matthew Ahrens illumos/illumos-gate at b1be2892dd07cf9a97d47ad06334cdc879196aaf Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c vendor-sys/illumos/dist/uts/common/fs/zfs/space_map.c vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c Sat Oct 4 07:24:35 2014 (r272493) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c Sat Oct 4 07:26:42 2014 (r272494) @@ -65,7 +65,7 @@ int zfs_condense_pct = 200; /* * Condensing a metaslab is not guaranteed to actually reduce the amount of * space used on disk. In particular, a space map uses data in increments of - * MAX(1 << ashift, SPACE_MAP_INITIAL_BLOCKSIZE), so a metaslab might use the + * MAX(1 << ashift, space_map_blksize), so a metaslab might use the * same number of blocks after condensing. Since the goal of condensing is to * reduce the number of IOPs required to read the space map, we only want to * condense when we can be sure we will reduce the number of blocks used by the @@ -1381,10 +1381,12 @@ metaslab_fragmentation(metaslab_t *msp) uint64_t txg = spa_syncing_txg(spa); vdev_t *vd = msp->ms_group->mg_vd; - msp->ms_condense_wanted = B_TRUE; - vdev_dirty(vd, VDD_METASLAB, msp, txg + 1); - spa_dbgmsg(spa, "txg %llu, requesting force condense: " - "msp %p, vd %p", txg, msp, vd); + if (spa_writeable(spa)) { + msp->ms_condense_wanted = B_TRUE; + vdev_dirty(vd, VDD_METASLAB, msp, txg + 1); + spa_dbgmsg(spa, "txg %llu, requesting force condense: " + "msp %p, vd %p", txg, msp, vd); + } return (ZFS_FRAG_INVALID); } @@ -1828,6 +1830,15 @@ metaslab_sync(metaslab_t *msp, uint64_t mutex_enter(&msp->ms_lock); + /* + * Note: metaslab_condense() clears the space_map's histogram. + * Therefore we must verify and remove this histogram before + * condensing. + */ + metaslab_group_histogram_verify(mg); + metaslab_class_histogram_verify(mg->mg_class); + metaslab_group_histogram_remove(mg, msp); + if (msp->ms_loaded && spa_sync_pass(spa) == 1 && metaslab_should_condense(msp)) { metaslab_condense(msp, txg, tx); @@ -1836,9 +1847,6 @@ metaslab_sync(metaslab_t *msp, uint64_t space_map_write(msp->ms_sm, *freetree, SM_FREE, tx); } - metaslab_group_histogram_verify(mg); - metaslab_class_histogram_verify(mg->mg_class); - metaslab_group_histogram_remove(mg, msp); if (msp->ms_loaded) { /* * When the space map is loaded, we have an accruate Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/space_map.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/space_map.c Sat Oct 4 07:24:35 2014 (r272493) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/space_map.c Sat Oct 4 07:26:42 2014 (r272494) @@ -38,15 +38,12 @@ #include /* - * This value controls how the space map's block size is allowed to grow. - * If the value is set to the same size as SPACE_MAP_INITIAL_BLOCKSIZE then - * the space map block size will remain fixed. Setting this value to something - * greater than SPACE_MAP_INITIAL_BLOCKSIZE will allow the space map to - * increase its block size as needed. To maintain backwards compatibilty the - * space map's block size must be a power of 2 and SPACE_MAP_INITIAL_BLOCKSIZE - * or larger. + * The data for a given space map can be kept on blocks of any size. + * Larger blocks entail fewer i/o operations, but they also cause the + * DMU to keep more data in-core, and also to waste more i/o bandwidth + * when only a few blocks have changed since the last transaction group. */ -int space_map_max_blksz = (1 << 12); +int space_map_blksz = (1 << 12); /* * Load the space map disk into the specified range tree. Segments of maptype @@ -233,58 +230,6 @@ space_map_entries(space_map_t *sm, range return (entries); } -void -space_map_set_blocksize(space_map_t *sm, uint64_t size, dmu_tx_t *tx) -{ - uint32_t blksz; - u_longlong_t blocks; - - ASSERT3U(sm->sm_blksz, !=, 0); - ASSERT3U(space_map_object(sm), !=, 0); - ASSERT(sm->sm_dbuf != NULL); - VERIFY(ISP2(space_map_max_blksz)); - - if (sm->sm_blksz >= space_map_max_blksz) - return; - - /* - * The object contains more than one block so we can't adjust - * its size. - */ - if (sm->sm_phys->smp_objsize > sm->sm_blksz) - return; - - if (size > sm->sm_blksz) { - uint64_t newsz; - - /* - * Older software versions treat space map blocks as fixed - * entities. The DMU is capable of handling different block - * sizes making it possible for us to increase the - * block size and maintain backwards compatibility. The - * caveat is that the new block sizes must be a - * power of 2 so that old software can append to the file, - * adding more blocks. The block size can grow until it - * reaches space_map_max_blksz. - */ - newsz = ISP2(size) ? size : 1ULL << highbit64(size); - if (newsz > space_map_max_blksz) - newsz = space_map_max_blksz; - - VERIFY0(dmu_object_set_blocksize(sm->sm_os, - space_map_object(sm), newsz, 0, tx)); - dmu_object_size_from_db(sm->sm_dbuf, &blksz, &blocks); - - zfs_dbgmsg("txg %llu, spa %s, increasing blksz from %d to %d", - dmu_tx_get_txg(tx), spa_name(dmu_objset_spa(sm->sm_os)), - sm->sm_blksz, blksz); - - VERIFY3U(newsz, ==, blksz); - VERIFY3U(sm->sm_blksz, <, blksz); - sm->sm_blksz = blksz; - } -} - /* * Note: space_map_write() will drop sm_lock across dmu_write() calls. */ @@ -298,7 +243,7 @@ space_map_write(space_map_t *sm, range_t range_seg_t *rs; uint64_t size, total, rt_space, nodes; uint64_t *entry, *entry_map, *entry_map_end; - uint64_t newsz, expected_entries, actual_entries = 1; + uint64_t expected_entries, actual_entries = 1; ASSERT(MUTEX_HELD(rt->rt_lock)); ASSERT(dsl_pool_sync_context(dmu_objset_pool(os))); @@ -324,13 +269,6 @@ space_map_write(space_map_t *sm, range_t expected_entries = space_map_entries(sm, rt); - /* - * Calculate the new size for the space map on-disk and see if - * we can grow the block size to accommodate the new size. - */ - newsz = sm->sm_phys->smp_objsize + expected_entries * sizeof (uint64_t); - space_map_set_blocksize(sm, newsz, tx); - entry_map = zio_buf_alloc(sm->sm_blksz); entry_map_end = entry_map + (sm->sm_blksz / sizeof (uint64_t)); entry = entry_map; @@ -457,46 +395,48 @@ space_map_close(space_map_t *sm) kmem_free(sm, sizeof (*sm)); } -static void -space_map_reallocate(space_map_t *sm, dmu_tx_t *tx) -{ - ASSERT(dmu_tx_is_syncing(tx)); - - space_map_free(sm, tx); - dmu_buf_rele(sm->sm_dbuf, sm); - - sm->sm_object = space_map_alloc(sm->sm_os, tx); - VERIFY0(space_map_open_impl(sm)); -} - void space_map_truncate(space_map_t *sm, dmu_tx_t *tx) { objset_t *os = sm->sm_os; spa_t *spa = dmu_objset_spa(os); dmu_object_info_t doi; - int bonuslen; ASSERT(dsl_pool_sync_context(dmu_objset_pool(os))); ASSERT(dmu_tx_is_syncing(tx)); - VERIFY0(dmu_free_range(os, space_map_object(sm), 0, -1ULL, tx)); dmu_object_info_from_db(sm->sm_dbuf, &doi); - if (spa_feature_is_enabled(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM)) { - bonuslen = sizeof (space_map_phys_t); - ASSERT3U(bonuslen, <=, dmu_bonus_max()); - } else { - bonuslen = SPACE_MAP_SIZE_V0; - } - - if (bonuslen != doi.doi_bonus_size || - doi.doi_data_block_size != SPACE_MAP_INITIAL_BLOCKSIZE) { + /* + * If the space map has the wrong bonus size (because + * SPA_FEATURE_SPACEMAP_HISTOGRAM has recently been enabled), or + * the wrong block size (because space_map_blksz has changed), + * free and re-allocate its object with the updated sizes. + * + * Otherwise, just truncate the current object. + */ + if ((spa_feature_is_enabled(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM) && + doi.doi_bonus_size != sizeof (space_map_phys_t)) || + doi.doi_data_block_size != space_map_blksz) { zfs_dbgmsg("txg %llu, spa %s, reallocating: " "old bonus %u, old blocksz %u", dmu_tx_get_txg(tx), spa_name(spa), doi.doi_bonus_size, doi.doi_data_block_size); - space_map_reallocate(sm, tx); - VERIFY3U(sm->sm_blksz, ==, SPACE_MAP_INITIAL_BLOCKSIZE); + + space_map_free(sm, tx); + dmu_buf_rele(sm->sm_dbuf, sm); + + sm->sm_object = space_map_alloc(sm->sm_os, tx); + VERIFY0(space_map_open_impl(sm)); + } else { + VERIFY0(dmu_free_range(os, space_map_object(sm), 0, -1ULL, tx)); + + /* + * If the spacemap is reallocated, its histogram + * will be reset. Do the same in the common case so that + * bugs related to the uncommon case do not go unnoticed. + */ + bzero(sm->sm_phys->smp_histogram, + sizeof (sm->sm_phys->smp_histogram)); } dmu_buf_will_dirty(sm->sm_dbuf, tx); @@ -535,7 +475,7 @@ space_map_alloc(objset_t *os, dmu_tx_t * } object = dmu_object_alloc(os, - DMU_OT_SPACE_MAP, SPACE_MAP_INITIAL_BLOCKSIZE, + DMU_OT_SPACE_MAP, space_map_blksz, DMU_OT_SPACE_MAP_HEADER, bonuslen, tx); return (object); Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h Sat Oct 4 07:24:35 2014 (r272493) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/space_map.h Sat Oct 4 07:26:42 2014 (r272494) @@ -133,17 +133,6 @@ typedef enum { SM_FREE } maptype_t; -/* - * The data for a given space map can be kept on blocks of any size. - * Larger blocks entail fewer i/o operations, but they also cause the - * DMU to keep more data in-core, and also to waste more i/o bandwidth - * when only a few blocks have changed since the last transaction group. - * Rather than having a fixed block size for all space maps the block size - * can adjust as needed (see space_map_max_blksz). Set the initial block - * size for the space map to 4k. - */ -#define SPACE_MAP_INITIAL_BLOCKSIZE (1ULL << 12) - int space_map_load(space_map_t *sm, range_tree_t *rt, maptype_t maptype); void space_map_histogram_clear(space_map_t *sm); From delphij at FreeBSD.org Sat Oct 4 07:32:20 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:32:19 +0000 (UTC) Subject: svn commit: r272495 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040732.s947WJ6H083774@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:32:19 2014 New Revision: 272495 URL: https://svnweb.freebsd.org/changeset/base/272495 Log: 5163 arc should reap range_seg_cache Reviewed by: Christopher Siden Reviewed by: Matthew Ahrens Reviewed by: Richard Elling Reviewed by: Saso Kiselkov Approved by: Dan McDonald Author: George Wilson illumos/illumos at 83803b51e1fa57fbf4e86ca5aa58eab6c5822dae Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c vendor-sys/illumos/dist/uts/common/fs/zfs/range_tree.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c Sat Oct 4 07:26:42 2014 (r272494) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c Sat Oct 4 07:32:19 2014 (r272495) @@ -2303,6 +2303,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t kmem_cache_t *prev_data_cache = NULL; extern kmem_cache_t *zio_buf_cache[]; extern kmem_cache_t *zio_data_buf_cache[]; + extern kmem_cache_t *range_seg_cache; #ifdef _KERNEL if (arc_meta_used >= arc_meta_limit) { @@ -2339,6 +2340,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t } kmem_cache_reap_now(buf_cache); kmem_cache_reap_now(hdr_cache); + kmem_cache_reap_now(range_seg_cache); /* * Ask the vmem areana to reclaim unused memory from its Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/range_tree.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/range_tree.c Sat Oct 4 07:26:42 2014 (r272494) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/range_tree.c Sat Oct 4 07:32:19 2014 (r272495) @@ -33,7 +33,7 @@ #include #include -static kmem_cache_t *range_seg_cache; +kmem_cache_t *range_seg_cache; void range_tree_init(void) From delphij at FreeBSD.org Sat Oct 4 07:34:51 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:34:50 +0000 (UTC) Subject: svn commit: r272496 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040734.s947YoiV084134@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:34:50 2014 New Revision: 272496 URL: https://svnweb.freebsd.org/changeset/base/272496 Log: 5161 add tunable for number of metaslabs per vdev Reviewed by: Alex Reece Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Paul Dagnelie Reviewed by: Saso Kiselkov Reviewed by: Richard Elling Approved by: Richard Lowe Author: Matthew Ahrens illumos/illumos-gate at bf3e216c7efa56332b456f4cf19d208e21d63839 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Sat Oct 4 07:32:19 2014 (r272495) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Sat Oct 4 07:34:50 2014 (r272496) @@ -65,6 +65,12 @@ static vdev_ops_t *vdev_ops_table[] = { int zfs_scrub_limit = 10; /* + * When a vdev is added, it will be divided into approximately (but no + * more than) this number of metaslabs. + */ +int metaslabs_per_vdev = 200; + +/* * Given a vdev type, return the appropriate ops vector. */ static vdev_ops_t * @@ -1551,9 +1557,9 @@ void vdev_metaslab_set_size(vdev_t *vd) { /* - * Aim for roughly 200 metaslabs per vdev. + * Aim for roughly metaslabs_per_vdev (default 200) metaslabs per vdev. */ - vd->vdev_ms_shift = highbit64(vd->vdev_asize / 200); + vd->vdev_ms_shift = highbit64(vd->vdev_asize / metaslabs_per_vdev); vd->vdev_ms_shift = MAX(vd->vdev_ms_shift, SPA_MAXBLOCKSHIFT); } From delphij at FreeBSD.org Sat Oct 4 07:35:51 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:35:51 +0000 (UTC) Subject: svn commit: r272497 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040735.s947Zpw5084334@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:35:50 2014 New Revision: 272497 URL: https://svnweb.freebsd.org/changeset/base/272497 Log: 5148 zvol's DKIOCFREE holds zfsdev_state_lock too long Reviewed by: Matthew Ahrens Reviewed by: Paul Dagnelie Reviewed by: Sebastien Roy Reviewed by: Josef 'Jeff' Sipek Reviewed by: Dan McDonald Approved by: Richard Lowe Author: George Wilson illumos/illumos-gate at 574e2414ac6a50c9d6097c2e4a98eb9263f90c44 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c Sat Oct 4 07:34:50 2014 (r272496) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c Sat Oct 4 07:35:50 2014 (r272497) @@ -1781,8 +1781,8 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t */ if (df.df_start >= zv->zv_volsize) break; /* No need to do anything... */ - if (df.df_start + df.df_length > zv->zv_volsize) - df.df_length = DMU_OBJECT_END; + + mutex_exit(&zfsdev_state_lock); rl = zfs_range_lock(&zv->zv_znode, df.df_start, df.df_length, RL_WRITER); @@ -1821,7 +1821,7 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t dmu_objset_pool(zv->zv_objset), 0); } } - break; + return (error); } default: From delphij at FreeBSD.org Sat Oct 4 07:37:18 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:37:17 +0000 (UTC) Subject: svn commit: r272498 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040737.s947bHS8084559@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:37:17 2014 New Revision: 272498 URL: https://svnweb.freebsd.org/changeset/base/272498 Log: 5149 zvols need a way to ignore DKIOCFREE Reviewed by: Adam Leventhal Reviewed by: Matthew Ahrens Reviewed by: Sebastien Roy Reviewed by: Dan McDonald Reviewed by: Saso Kiselkov Approved by: Robert Mustacchi Author: George Wilson illumos/illumos-gate at 893c83ba3e1c87a785b5274ce2ef02f45fba6087 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c Sat Oct 4 07:35:50 2014 (r272497) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zvol.c Sat Oct 4 07:37:17 2014 (r272498) @@ -142,6 +142,11 @@ typedef struct zvol_state { */ int zvol_maxphys = DMU_MAX_ACCESS/2; +/* + * Toggle unmap functionality. + */ +boolean_t zvol_unmap_enabled = B_TRUE; + extern int zfs_set_prop_nvlist(const char *, zprop_source_t, nvlist_t *, nvlist_t *); static int zvol_remove_zv(zvol_state_t *); @@ -1769,6 +1774,9 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t dkioc_free_t df; dmu_tx_t *tx; + if (!zvol_unmap_enabled) + break; + if (ddi_copyin((void *)arg, &df, sizeof (df), flag)) { error = SET_ERROR(EFAULT); break; From delphij at FreeBSD.org Sat Oct 4 07:39:00 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:39:00 +0000 (UTC) Subject: svn commit: r272499 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040739.s947d0Em084797@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:38:59 2014 New Revision: 272499 URL: https://svnweb.freebsd.org/changeset/base/272499 Log: 5174 add sdt probe for blocked read in dbuf_read() Reviewed by: Basil Crow Reviewed by: Matthew Ahrens Reviewed by: Steven Hartland Reviewed by: Richard Elling Reviewed by: Boris Protopopov Reviewed by: Steven Hartland Reviewed by: Garrett D'Amore Approved by: Robert Mustacchi Author: Adam H. Leventhal illumos/illumos-gate at f6164ad638e7346c4ae4ba393760a897cf6eb744 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c Sat Oct 4 07:37:17 2014 (r272498) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c Sat Oct 4 07:38:59 2014 (r272499) @@ -671,6 +671,8 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio db->db_state == DB_FILL) { ASSERT(db->db_state == DB_READ || (flags & DB_RF_HAVESTRUCT) == 0); + DTRACE_PROBE2(blocked__read, dmu_buf_impl_t *, + db, zio_t *, zio); cv_wait(&db->db_changed, &db->db_mtx); } if (db->db_state == DB_UNCACHED) From delphij at FreeBSD.org Sat Oct 4 07:49:07 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:49:07 +0000 (UTC) Subject: svn commit: r272500 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040749.s947n7iY089576@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:49:06 2014 New Revision: 272500 URL: https://svnweb.freebsd.org/changeset/base/272500 Log: 5150 zfs clone of a defer_destroy snapshot causes strangeness Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Max Grossman Reviewed by: Saso Kiselkov Reviewed by: Richard Elling Approved by: Robert Mustacchi Author: Matthew Ahrens illumos/illumos-gate at 42fcb65ea4f2c6f8cc5a3c6142a486cb49871fd2 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sat Oct 4 07:38:59 2014 (r272499) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sat Oct 4 07:49:06 2014 (r272500) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013, 2014 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2014, Joyent, Inc. All rights reserved. * Copyright (c) 2014 RackTop Systems. */ @@ -692,7 +692,13 @@ dsl_dataset_create_sync_dd(dsl_dir_t *dd dsphys->ds_uncompressed_bytes = origin->ds_phys->ds_uncompressed_bytes; dsphys->ds_bp = origin->ds_phys->ds_bp; - dsphys->ds_flags |= origin->ds_phys->ds_flags; + + /* + * Inherit flags that describe the dataset's contents + * (INCONSISTENT) or properties (Case Insensitive). + */ + dsphys->ds_flags |= origin->ds_phys->ds_flags & + (DS_FLAG_INCONSISTENT | DS_FLAG_CI_DATASET); dmu_buf_will_dirty(origin->ds_dbuf, tx); origin->ds_phys->ds_num_children++; From delphij at FreeBSD.org Sat Oct 4 07:50:07 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 4 Oct 2014 07:50:06 +0000 (UTC) Subject: svn commit: r272501 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410040750.s947o6Vs089809@svn.freebsd.org> Author: delphij Date: Sat Oct 4 07:50:06 2014 New Revision: 272501 URL: https://svnweb.freebsd.org/changeset/base/272501 Log: 5177 remove dead code from dsl_scan.c Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Richard Elling Reviewed by: Richard Lowe Approved by: Robert Mustacchi Author: Matthew Ahrens illumos/illumos-gate at 5f37736ac8f99922368294d745d3fefa22b49d11 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c Sat Oct 4 07:49:06 2014 (r272500) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c Sat Oct 4 07:50:06 2014 (r272501) @@ -351,13 +351,12 @@ dsl_scan_cancel(dsl_pool_t *dp) dsl_scan_cancel_sync, NULL, 3, ZFS_SPACE_CHECK_RESERVED)); } -static void dsl_scan_visitbp(blkptr_t *bp, - const zbookmark_phys_t *zb, dnode_phys_t *dnp, arc_buf_t *pbuf, - dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype, - dmu_tx_t *tx); +static void dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb, + dnode_phys_t *dnp, dsl_dataset_t *ds, dsl_scan_t *scn, + dmu_objset_type_t ostype, dmu_tx_t *tx); static void dsl_scan_visitdnode(dsl_scan_t *, dsl_dataset_t *ds, dmu_objset_type_t ostype, - dnode_phys_t *dnp, arc_buf_t *buf, uint64_t object, dmu_tx_t *tx); + dnode_phys_t *dnp, uint64_t object, dmu_tx_t *tx); void dsl_free(dsl_pool_t *dp, uint64_t txg, const blkptr_t *bp) @@ -590,7 +589,7 @@ dsl_scan_check_resume(dsl_scan_t *scn, c static int dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype, dnode_phys_t *dnp, const blkptr_t *bp, - const zbookmark_phys_t *zb, dmu_tx_t *tx, arc_buf_t **bufp) + const zbookmark_phys_t *zb, dmu_tx_t *tx) { dsl_pool_t *dp = scn->scn_dp; int zio_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCAN_THREAD; @@ -601,76 +600,72 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_da int i; blkptr_t *cbp; int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT; + arc_buf_t *buf; - err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp, + err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, &buf, ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb); if (err) { scn->scn_phys.scn_errors++; return (err); } - for (i = 0, cbp = (*bufp)->b_data; i < epb; i++, cbp++) { - dsl_scan_prefetch(scn, *bufp, cbp, zb->zb_objset, + for (i = 0, cbp = buf->b_data; i < epb; i++, cbp++) { + dsl_scan_prefetch(scn, buf, cbp, zb->zb_objset, zb->zb_object, zb->zb_blkid * epb + i); } - for (i = 0, cbp = (*bufp)->b_data; i < epb; i++, cbp++) { + for (i = 0, cbp = buf->b_data; i < epb; i++, cbp++) { zbookmark_phys_t czb; SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object, zb->zb_level - 1, zb->zb_blkid * epb + i); dsl_scan_visitbp(cbp, &czb, dnp, - *bufp, ds, scn, ostype, tx); - } - } else if (BP_GET_TYPE(bp) == DMU_OT_USERGROUP_USED) { - uint32_t flags = ARC_WAIT; - - err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp, - ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb); - if (err) { - scn->scn_phys.scn_errors++; - return (err); + ds, scn, ostype, tx); } + (void) arc_buf_remove_ref(buf, &buf); } else if (BP_GET_TYPE(bp) == DMU_OT_DNODE) { uint32_t flags = ARC_WAIT; dnode_phys_t *cdnp; int i, j; int epb = BP_GET_LSIZE(bp) >> DNODE_SHIFT; + arc_buf_t *buf; - err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp, + err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, &buf, ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb); if (err) { scn->scn_phys.scn_errors++; return (err); } - for (i = 0, cdnp = (*bufp)->b_data; i < epb; i++, cdnp++) { + for (i = 0, cdnp = buf->b_data; i < epb; i++, cdnp++) { for (j = 0; j < cdnp->dn_nblkptr; j++) { blkptr_t *cbp = &cdnp->dn_blkptr[j]; - dsl_scan_prefetch(scn, *bufp, cbp, + dsl_scan_prefetch(scn, buf, cbp, zb->zb_objset, zb->zb_blkid * epb + i, j); } } - for (i = 0, cdnp = (*bufp)->b_data; i < epb; i++, cdnp++) { + for (i = 0, cdnp = buf->b_data; i < epb; i++, cdnp++) { dsl_scan_visitdnode(scn, ds, ostype, - cdnp, *bufp, zb->zb_blkid * epb + i, tx); + cdnp, zb->zb_blkid * epb + i, tx); } + (void) arc_buf_remove_ref(buf, &buf); } else if (BP_GET_TYPE(bp) == DMU_OT_OBJSET) { uint32_t flags = ARC_WAIT; objset_phys_t *osp; + arc_buf_t *buf; - err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp, + err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, &buf, ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb); if (err) { scn->scn_phys.scn_errors++; return (err); } - osp = (*bufp)->b_data; + osp = buf->b_data; dsl_scan_visitdnode(scn, ds, osp->os_type, - &osp->os_meta_dnode, *bufp, DMU_META_DNODE_OBJECT, tx); + &osp->os_meta_dnode, DMU_META_DNODE_OBJECT, tx); - if (OBJSET_BUF_HAS_USERUSED(*bufp)) { + if (OBJSET_BUF_HAS_USERUSED(buf)) { /* * We also always visit user/group accounting * objects, and never skip them, even if we are @@ -678,12 +673,13 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_da * deltas from this txg get integrated. */ dsl_scan_visitdnode(scn, ds, osp->os_type, - &osp->os_groupused_dnode, *bufp, + &osp->os_groupused_dnode, DMU_GROUPUSED_OBJECT, tx); dsl_scan_visitdnode(scn, ds, osp->os_type, - &osp->os_userused_dnode, *bufp, + &osp->os_userused_dnode, DMU_USERUSED_OBJECT, tx); } + (void) arc_buf_remove_ref(buf, &buf); } return (0); @@ -691,7 +687,7 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_da static void dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds, - dmu_objset_type_t ostype, dnode_phys_t *dnp, arc_buf_t *buf, + dmu_objset_type_t ostype, dnode_phys_t *dnp, uint64_t object, dmu_tx_t *tx) { int j; @@ -702,7 +698,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object, dnp->dn_nlevels - 1, j); dsl_scan_visitbp(&dnp->dn_blkptr[j], - &czb, dnp, buf, ds, scn, ostype, tx); + &czb, dnp, ds, scn, ostype, tx); } if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) { @@ -710,7 +706,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object, 0, DMU_SPILL_BLKID); dsl_scan_visitbp(&dnp->dn_spill, - &czb, dnp, buf, ds, scn, ostype, tx); + &czb, dnp, ds, scn, ostype, tx); } } @@ -720,9 +716,8 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl */ static void dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb, - dnode_phys_t *dnp, arc_buf_t *pbuf, - dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype, - dmu_tx_t *tx) + dnode_phys_t *dnp, dsl_dataset_t *ds, dsl_scan_t *scn, + dmu_objset_type_t ostype, dmu_tx_t *tx) { dsl_pool_t *dp = scn->scn_dp; arc_buf_t *buf = NULL; @@ -742,16 +737,15 @@ dsl_scan_visitbp(blkptr_t *bp, const zbo scn->scn_visited_this_txg++; dprintf_bp(bp, - "visiting ds=%p/%llu zb=%llx/%llx/%llx/%llx buf=%p bp=%p", + "visiting ds=%p/%llu zb=%llx/%llx/%llx/%llx bp=%p", ds, ds ? ds->ds_object : 0, zb->zb_objset, zb->zb_object, zb->zb_level, zb->zb_blkid, - pbuf, bp); + bp); if (bp->blk_birth <= scn->scn_phys.scn_cur_min_txg) return; - if (dsl_scan_recurse(scn, ds, ostype, dnp, &bp_toread, zb, tx, - &buf) != 0) + if (dsl_scan_recurse(scn, ds, ostype, dnp, &bp_toread, zb, tx) != 0) return; /* @@ -775,8 +769,6 @@ dsl_scan_visitbp(blkptr_t *bp, const zbo if (BP_PHYSICAL_BIRTH(bp) <= scn->scn_phys.scn_cur_max_txg) { scan_funcs[scn->scn_phys.scn_func](dp, bp, zb); } - if (buf) - (void) arc_buf_remove_ref(buf, &buf); } static void @@ -787,7 +779,7 @@ dsl_scan_visit_rootbp(dsl_scan_t *scn, d SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET, ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID); - dsl_scan_visitbp(bp, &zb, NULL, NULL, + dsl_scan_visitbp(bp, &zb, NULL, ds, scn, DMU_OST_NONE, tx); dprintf_ds(ds, "finished scan%s", ""); From delphij at FreeBSD.org Mon Oct 6 05:54:40 2014 From: delphij at FreeBSD.org (Xin LI) Date: Mon, 6 Oct 2014 05:54:39 +0000 (UTC) Subject: svn commit: r272585 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zdb Message-ID: <201410060554.s965sdTP065144@svn.freebsd.org> Author: delphij Date: Mon Oct 6 05:54:39 2014 New Revision: 272585 URL: https://svnweb.freebsd.org/changeset/base/272585 Log: 5176 lock contention on godfather zio Reviewed by: Adam Leventhal Reviewed by: Alex Reece Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Richard Elling Reviewed by: Bayard Bell Approved by: Garrett D'Amore Author: Matthew Ahrens illumos/illumos-gate at 6f834bc197c703a6568554c889157fb345bac079 Modified: vendor/illumos/dist/cmd/zdb/zdb.c Changes in other areas also in this revision: Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Modified: vendor/illumos/dist/cmd/zdb/zdb.c ============================================================================== --- vendor/illumos/dist/cmd/zdb/zdb.c Mon Oct 6 05:46:51 2014 (r272584) +++ vendor/illumos/dist/cmd/zdb/zdb.c Mon Oct 6 05:54:39 2014 (r272585) @@ -2565,10 +2565,12 @@ dump_block_stats(spa_t *spa) * all async I/Os to complete. */ if (dump_opt['c']) { - (void) zio_wait(spa->spa_async_zio_root); - spa->spa_async_zio_root = zio_root(spa, NULL, NULL, - ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | - ZIO_FLAG_GODFATHER); + for (int i = 0; i < max_ncpus; i++) { + (void) zio_wait(spa->spa_async_zio_root[i]); + spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | + ZIO_FLAG_GODFATHER); + } } if (zcb.zcb_haderrors) { From delphij at FreeBSD.org Mon Oct 6 05:54:41 2014 From: delphij at FreeBSD.org (Xin LI) Date: Mon, 6 Oct 2014 05:54:40 +0000 (UTC) Subject: svn commit: r272585 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zdb Message-ID: <201410060554.s965segc065150@svn.freebsd.org> Author: delphij Date: Mon Oct 6 05:54:39 2014 New Revision: 272585 URL: https://svnweb.freebsd.org/changeset/base/272585 Log: 5176 lock contention on godfather zio Reviewed by: Adam Leventhal Reviewed by: Alex Reece Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Richard Elling Reviewed by: Bayard Bell Approved by: Garrett D'Amore Author: Matthew Ahrens illumos/illumos-gate at 6f834bc197c703a6568554c889157fb345bac079 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Changes in other areas also in this revision: Modified: vendor/illumos/dist/cmd/zdb/zdb.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Mon Oct 6 05:46:51 2014 (r272584) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Mon Oct 6 05:54:39 2014 (r272585) @@ -1222,7 +1222,9 @@ spa_unload(spa_t *spa) * Wait for any outstanding async I/O to complete. */ if (spa->spa_async_zio_root != NULL) { - (void) zio_wait(spa->spa_async_zio_root); + for (int i = 0; i < max_ncpus; i++) + (void) zio_wait(spa->spa_async_zio_root[i]); + kmem_free(spa->spa_async_zio_root, max_ncpus * sizeof (void *)); spa->spa_async_zio_root = NULL; } @@ -2141,8 +2143,13 @@ spa_load_impl(spa_t *spa, uint64_t pool_ /* * Create "The Godfather" zio to hold all async IOs */ - spa->spa_async_zio_root = zio_root(spa, NULL, NULL, - ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_GODFATHER); + spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *), + KM_SLEEP); + for (int i = 0; i < max_ncpus; i++) { + spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | + ZIO_FLAG_GODFATHER); + } /* * Parse the configuration into a vdev tree. We explicitly set the @@ -3481,8 +3488,13 @@ spa_create(const char *pool, nvlist_t *n /* * Create "The Godfather" zio to hold all async IOs */ - spa->spa_async_zio_root = zio_root(spa, NULL, NULL, - ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_GODFATHER); + spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *), + KM_SLEEP); + for (int i = 0; i < max_ncpus; i++) { + spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | + ZIO_FLAG_GODFATHER); + } /* * Create the root vdev. Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h Mon Oct 6 05:46:51 2014 (r272584) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/spa_impl.h Mon Oct 6 05:54:39 2014 (r272585) @@ -204,7 +204,8 @@ struct spa { uint64_t spa_failmode; /* failure mode for the pool */ uint64_t spa_delegation; /* delegation on/off */ list_t spa_config_list; /* previous cache file(s) */ - zio_t *spa_async_zio_root; /* root of all async I/O */ + /* per-CPU array of root of async I/O: */ + zio_t **spa_async_zio_root; zio_t *spa_suspend_zio_root; /* root of all suspended I/O */ kmutex_t spa_suspend_lock; /* protects suspend_zio_root */ kcondvar_t spa_suspend_cv; /* notification of resume */ Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Mon Oct 6 05:46:51 2014 (r272584) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Mon Oct 6 05:54:39 2014 (r272585) @@ -1367,7 +1367,7 @@ zio_nowait(zio_t *zio) */ spa_t *spa = zio->io_spa; - zio_add_child(spa->spa_async_zio_root, zio); + zio_add_child(spa->spa_async_zio_root[CPU_SEQID], zio); } zio_execute(zio); From delphij at FreeBSD.org Mon Oct 6 06:00:51 2014 From: delphij at FreeBSD.org (Xin LI) Date: Mon, 6 Oct 2014 06:00:51 +0000 (UTC) Subject: svn commit: r272588 - vendor/illumos/dist/cmd/zdb Message-ID: <201410060600.s9660pJr068709@svn.freebsd.org> Author: delphij Date: Mon Oct 6 06:00:50 2014 New Revision: 272588 URL: https://svnweb.freebsd.org/changeset/base/272588 Log: 5178 zdb -vvvvv on old-format pool fails in dump_deadlist() Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Richard Lowe Reviewed by: Saso Kiselkov Reviewed by: Richard Elling Reviewed by: Alek Pinchuk Approved by: Garrett D'Amore Author: Matthew Ahrens illumos/illumos-gate at 90c76c66a2e21307c5370ae1bd3c7145a60c874f Modified: vendor/illumos/dist/cmd/zdb/zdb.c Modified: vendor/illumos/dist/cmd/zdb/zdb.c ============================================================================== --- vendor/illumos/dist/cmd/zdb/zdb.c Mon Oct 6 06:00:06 2014 (r272587) +++ vendor/illumos/dist/cmd/zdb/zdb.c Mon Oct 6 06:00:50 2014 (r272588) @@ -1434,6 +1434,11 @@ dump_deadlist(dsl_deadlist_t *dl) if (dump_opt['d'] < 3) return; + if (dl->dl_oldfmt) { + dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0); + return; + } + zdb_nicenum(dl->dl_phys->dl_used, bytes); zdb_nicenum(dl->dl_phys->dl_comp, comp); zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp); From delphij at FreeBSD.org Mon Oct 6 06:04:11 2014 From: delphij at FreeBSD.org (Xin LI) Date: Mon, 6 Oct 2014 06:04:10 +0000 (UTC) Subject: svn commit: r272591 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201410060604.s9664Abr070219@svn.freebsd.org> Author: delphij Date: Mon Oct 6 06:04:10 2014 New Revision: 272591 URL: https://svnweb.freebsd.org/changeset/base/272591 Log: 5162 zfs recv should use loaned arc buffer to avoid copy Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Bayard Bell Reviewed by: Richard Elling Approved by: Garrett D'Amore Author: Matthew Ahrens illumos/illumos-gate at 8a9047098ad8ce5afa38b6d012c8b509bb619f40 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Mon Oct 6 06:03:25 2014 (r272590) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Mon Oct 6 06:04:10 2014 (r272591) @@ -1264,7 +1264,14 @@ dmu_assign_arcbuf(dmu_buf_t *handle, uin rw_exit(&dn->dn_struct_rwlock); DB_DNODE_EXIT(dbuf); - if (offset == db->db.db_offset && blksz == db->db.db_size) { + /* + * We can only assign if the offset is aligned, the arc buf is the + * same size as the dbuf, and the dbuf is not metadata. It + * can't be metadata because the loaned arc buf comes from the + * user-data kmem arena. + */ + if (offset == db->db.db_offset && blksz == db->db.db_size && + DBUF_GET_BUFC_TYPE(db) == ARC_BUFC_DATA) { dbuf_assign_arcbuf(db, buf, tx); dbuf_rele(db, FTAG); } else { Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c Mon Oct 6 06:03:25 2014 (r272590) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c Mon Oct 6 06:04:10 2014 (r272591) @@ -1212,11 +1212,13 @@ free_guid_map_onexit(void *arg) } static void * -restore_read(struct restorearg *ra, int len) +restore_read(struct restorearg *ra, int len, char *buf) { - void *rv; int done = 0; + if (buf == NULL) + buf = ra->buf; + /* some things will require 8-byte alignment, so everything must */ ASSERT0(len % 8); @@ -1224,7 +1226,7 @@ restore_read(struct restorearg *ra, int ssize_t resid; ra->err = vn_rdwr(UIO_READ, ra->vp, - (caddr_t)ra->buf + done, len - done, + buf + done, len - done, ra->voff, UIO_SYSSPACE, FAPPEND, RLIM64_INFINITY, CRED(), &resid); @@ -1237,12 +1239,11 @@ restore_read(struct restorearg *ra, int } ASSERT3U(done, ==, len); - rv = ra->buf; if (ra->byteswap) - fletcher_4_incremental_byteswap(rv, len, &ra->cksum); + fletcher_4_incremental_byteswap(buf, len, &ra->cksum); else - fletcher_4_incremental_native(rv, len, &ra->cksum); - return (rv); + fletcher_4_incremental_native(buf, len, &ra->cksum); + return (buf); } static void @@ -1357,7 +1358,7 @@ restore_object(struct restorearg *ra, ob return (SET_ERROR(EINVAL)); if (drro->drr_bonuslen) { - data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8), NULL); if (ra->err != 0) return (ra->err); } @@ -1454,19 +1455,30 @@ restore_write(struct restorearg *ra, obj !DMU_OT_IS_VALID(drrw->drr_type)) return (SET_ERROR(EINVAL)); - data = restore_read(ra, drrw->drr_length); - if (data == NULL) - return (ra->err); - if (dmu_object_info(os, drrw->drr_object, NULL) != 0) return (SET_ERROR(EINVAL)); + dmu_buf_t *bonus; + if (dmu_bonus_hold(os, drrw->drr_object, FTAG, &bonus) != 0) + return (SET_ERROR(EINVAL)); + + arc_buf_t *abuf = dmu_request_arcbuf(bonus, drrw->drr_length); + + data = restore_read(ra, drrw->drr_length, abuf->b_data); + if (data == NULL) { + dmu_return_arcbuf(abuf); + dmu_buf_rele(bonus, FTAG); + return (ra->err); + } + tx = dmu_tx_create(os); dmu_tx_hold_write(tx, drrw->drr_object, drrw->drr_offset, drrw->drr_length); err = dmu_tx_assign(tx, TXG_WAIT); if (err != 0) { + dmu_return_arcbuf(abuf); + dmu_buf_rele(bonus, FTAG); dmu_tx_abort(tx); return (err); } @@ -1475,9 +1487,9 @@ restore_write(struct restorearg *ra, obj DMU_OT_BYTESWAP(drrw->drr_type); dmu_ot_byteswap[byteswap].ob_func(data, drrw->drr_length); } - dmu_write(os, drrw->drr_object, - drrw->drr_offset, drrw->drr_length, data, tx); + dmu_assign_arcbuf(bonus, drrw->drr_offset, abuf, tx); dmu_tx_commit(tx); + dmu_buf_rele(bonus, FTAG); return (0); } @@ -1559,7 +1571,7 @@ restore_write_embedded(struct restorearg if (drrwnp->drr_compression >= ZIO_COMPRESS_FUNCTIONS) return (EINVAL); - data = restore_read(ra, P2ROUNDUP(drrwnp->drr_psize, 8)); + data = restore_read(ra, P2ROUNDUP(drrwnp->drr_psize, 8), NULL); if (data == NULL) return (ra->err); @@ -1594,7 +1606,7 @@ restore_spill(struct restorearg *ra, obj drrs->drr_length > SPA_MAXBLOCKSIZE) return (SET_ERROR(EINVAL)); - data = restore_read(ra, drrs->drr_length); + data = restore_read(ra, drrs->drr_length, NULL); if (data == NULL) return (ra->err); @@ -1735,7 +1747,7 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, */ pcksum = ra.cksum; while (ra.err == 0 && - NULL != (drr = restore_read(&ra, sizeof (*drr)))) { + NULL != (drr = restore_read(&ra, sizeof (*drr), NULL))) { if (issig(JUSTLOOKING) && issig(FORREAL)) { ra.err = SET_ERROR(EINTR); goto out; From bapt at FreeBSD.org Mon Oct 6 14:55:41 2014 From: bapt at FreeBSD.org (Baptiste Daroussin) Date: Mon, 6 Oct 2014 14:55:39 +0000 (UTC) Subject: svn commit: r272651 - in vendor/byacc/dist: . package package/debian package/pkgsrc test test/btyacc test/yacc Message-ID: <201410061455.s96Etdw5028006@svn.freebsd.org> Author: bapt Date: Mon Oct 6 14:55:38 2014 New Revision: 272651 URL: https://svnweb.freebsd.org/changeset/base/272651 Log: import byacc 20141005 Added: vendor/byacc/dist/test/btyacc/btyacc_demo2.error vendor/byacc/dist/test/btyacc/btyacc_demo2.output vendor/byacc/dist/test/btyacc/btyacc_demo2.tab.c (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_demo2.tab.h (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_destroy1.error vendor/byacc/dist/test/btyacc/btyacc_destroy1.output vendor/byacc/dist/test/btyacc/btyacc_destroy1.tab.c (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_destroy1.tab.h (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_destroy2.error vendor/byacc/dist/test/btyacc/btyacc_destroy2.output vendor/byacc/dist/test/btyacc/btyacc_destroy2.tab.c (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_destroy2.tab.h (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_destroy3.error vendor/byacc/dist/test/btyacc/btyacc_destroy3.output vendor/byacc/dist/test/btyacc/btyacc_destroy3.tab.c (contents, props changed) vendor/byacc/dist/test/btyacc/btyacc_destroy3.tab.h (contents, props changed) vendor/byacc/dist/test/btyacc_destroy1.y vendor/byacc/dist/test/btyacc_destroy2.y vendor/byacc/dist/test/btyacc_destroy3.y Modified: vendor/byacc/dist/CHANGES vendor/byacc/dist/MANIFEST vendor/byacc/dist/VERSION vendor/byacc/dist/aclocal.m4 vendor/byacc/dist/btyaccpar.c vendor/byacc/dist/closure.c vendor/byacc/dist/config.sub vendor/byacc/dist/configure vendor/byacc/dist/defs.h vendor/byacc/dist/lalr.c vendor/byacc/dist/main.c vendor/byacc/dist/output.c vendor/byacc/dist/package/byacc.spec vendor/byacc/dist/package/debian/changelog vendor/byacc/dist/package/mingw-byacc.spec vendor/byacc/dist/package/pkgsrc/Makefile vendor/byacc/dist/reader.c vendor/byacc/dist/test/btyacc/btyacc_calc1.tab.c vendor/byacc/dist/test/btyacc/btyacc_demo.tab.c vendor/byacc/dist/test/btyacc/calc.tab.c vendor/byacc/dist/test/btyacc/calc1.tab.c vendor/byacc/dist/test/btyacc/calc2.tab.c vendor/byacc/dist/test/btyacc/calc3.tab.c vendor/byacc/dist/test/btyacc/code_calc.code.c vendor/byacc/dist/test/btyacc/code_calc.tab.c vendor/byacc/dist/test/btyacc/code_error.code.c vendor/byacc/dist/test/btyacc/code_error.tab.c vendor/byacc/dist/test/btyacc/empty.tab.c vendor/byacc/dist/test/btyacc/err_inherit1.tab.c vendor/byacc/dist/test/btyacc/err_inherit2.tab.c vendor/byacc/dist/test/btyacc/err_inherit3.tab.c vendor/byacc/dist/test/btyacc/err_inherit4.tab.c vendor/byacc/dist/test/btyacc/err_inherit5.tab.c vendor/byacc/dist/test/btyacc/err_syntax1.tab.c vendor/byacc/dist/test/btyacc/err_syntax10.tab.c vendor/byacc/dist/test/btyacc/err_syntax11.tab.c vendor/byacc/dist/test/btyacc/err_syntax12.tab.c vendor/byacc/dist/test/btyacc/err_syntax13.tab.c vendor/byacc/dist/test/btyacc/err_syntax14.tab.c vendor/byacc/dist/test/btyacc/err_syntax15.tab.c vendor/byacc/dist/test/btyacc/err_syntax16.tab.c vendor/byacc/dist/test/btyacc/err_syntax17.tab.c vendor/byacc/dist/test/btyacc/err_syntax18.tab.c vendor/byacc/dist/test/btyacc/err_syntax19.tab.c vendor/byacc/dist/test/btyacc/err_syntax2.tab.c vendor/byacc/dist/test/btyacc/err_syntax20.tab.c vendor/byacc/dist/test/btyacc/err_syntax21.tab.c vendor/byacc/dist/test/btyacc/err_syntax22.tab.c vendor/byacc/dist/test/btyacc/err_syntax23.tab.c vendor/byacc/dist/test/btyacc/err_syntax24.tab.c vendor/byacc/dist/test/btyacc/err_syntax25.tab.c vendor/byacc/dist/test/btyacc/err_syntax26.tab.c vendor/byacc/dist/test/btyacc/err_syntax27.tab.c vendor/byacc/dist/test/btyacc/err_syntax3.tab.c vendor/byacc/dist/test/btyacc/err_syntax4.tab.c vendor/byacc/dist/test/btyacc/err_syntax5.tab.c vendor/byacc/dist/test/btyacc/err_syntax6.tab.c vendor/byacc/dist/test/btyacc/err_syntax7.tab.c vendor/byacc/dist/test/btyacc/err_syntax7a.tab.c vendor/byacc/dist/test/btyacc/err_syntax7b.tab.c vendor/byacc/dist/test/btyacc/err_syntax8.tab.c vendor/byacc/dist/test/btyacc/err_syntax8a.tab.c vendor/byacc/dist/test/btyacc/err_syntax9.tab.c vendor/byacc/dist/test/btyacc/error.tab.c vendor/byacc/dist/test/btyacc/grammar.tab.c vendor/byacc/dist/test/btyacc/inherit0.tab.c vendor/byacc/dist/test/btyacc/inherit1.tab.c vendor/byacc/dist/test/btyacc/inherit2.tab.c vendor/byacc/dist/test/btyacc/ok_syntax1.tab.c vendor/byacc/dist/test/btyacc/pure_calc.tab.c vendor/byacc/dist/test/btyacc/pure_error.tab.c vendor/byacc/dist/test/btyacc/quote_calc-s.tab.c vendor/byacc/dist/test/btyacc/quote_calc.tab.c vendor/byacc/dist/test/btyacc/quote_calc2-s.tab.c vendor/byacc/dist/test/btyacc/quote_calc2.tab.c vendor/byacc/dist/test/btyacc/quote_calc3-s.tab.c vendor/byacc/dist/test/btyacc/quote_calc3.tab.c vendor/byacc/dist/test/btyacc/quote_calc4-s.tab.c vendor/byacc/dist/test/btyacc/quote_calc4.tab.c vendor/byacc/dist/test/btyacc/rename_debug.c vendor/byacc/dist/test/btyacc/varsyntax_calc1.tab.c vendor/byacc/dist/test/yacc/calc2.tab.c vendor/byacc/dist/test/yacc/calc3.tab.c vendor/byacc/dist/test/yacc/ok_syntax1.tab.c vendor/byacc/dist/yacc.1 Modified: vendor/byacc/dist/CHANGES ============================================================================== --- vendor/byacc/dist/CHANGES Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/CHANGES Mon Oct 6 14:55:38 2014 (r272651) @@ -1,3 +1,125 @@ +2014-10-05 Thomas E. Dickey + + * main.c: + make change to umask before calling mkstemp, as suggested in Coverity #56902 + + * reader.c: + adjust logic in copy_action to avoid potential null-pointer dereference + (Coverity #56901) + + * reader.c: + adjust logic to avoid potential null-pointer dereference in compile_args + (Coverity #63407) + + * reader.c: eliminate strcpy into fixed-size buffer (Coverity #63408) + + * yacc.1: document changes made with respect to %parse-param + + * output.c: + add parameters from %parse-param to destructor. The order of the parameters + is intentionally inconsistent with yyparse/yyerror, for "compatibility" with + bison. + + * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c: + regen + + * output.c: + use puts_param_types/puts_param_names to output lex_param data. + + * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c , test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c: + regen + + * btyaccpar.c: add casts, change types to fix strict compiler warnings + + * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c: + regen + + * output.c: gcc-warning + + * test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c: regen + + * output.c: fix limit when merging real/workaround tables + + * output.c: + for btyacc, it is possible to have no conflicts - but in that case, the + "ctable" was not generated at all, while the skeleton uses the table. + The most straightforward (workaround) is generating a dummy table which + rejects any state. + + * test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y: + fix "make check_make" + + * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c: + regen + + * reader.c: + trim blanks from interim value in copy_param() to handle special case when + a space precedes a comma. + + * output.c: + use two new functions, puts_param_types and puts_param_names, to improve + format of the parse_param list (by trimming space after "*") as well as + correcting the output of the comma-separated names (only the last name + was output). + + * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c: + regen + + * reader.c: + modify copy_param() to handle resulting comma-separated list. Before, it + only expected a single parameter. + +2014-10-04 Thomas E. Dickey + + * reader.c: split-out save_param() from copy_param() + + * reader.c: trim_blanks() did not always convert spaces - fix. + + * reader.c: fix some minor regressions with error-reporting + + * aclocal.m4: update CF_XOPEN_SOURCE for Unixware change from lynx + + * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + + * reader.c: + modify copy_param() to accept multiple parameters, each in curly braces like + recent bison, as well as honoring bison's undocumented feature to accept the + parameters as a comma-separated list. + + * test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.error, test/btyacc/btyacc_destroy3.output, test/btyacc/btyacc_destroy3.tab.h, test/btyacc/btyacc_destroy2.error, test/btyacc/btyacc_destroy2.output, test/btyacc/btyacc_destroy2.tab.h: + RCS_BASE + +2014-10-03 Thomas E. Dickey + + * test/btyacc/btyacc_demo2.error, test/btyacc/btyacc_demo2.output, test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h, test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output, test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y, test/btyacc_destroy1.y, test/btyacc_destroy2.y: + RCS_BASE + +2014-10-02 Thomas E. Dickey + + * main.c, reader.c, defs.h: + use calloc in get_line() when allocating line to ensure it is fully initialized, + fixes a later uninitialized value in copy_param() (FreeBSD #193499). + +2014-09-17 Thomas E. Dickey + + * closure.c, lalr.c, output.c, defs.h: + rephrase odd addressing to fix Coverity #48848, #38950, #38860, not actually + a bug. + +2014-09-01 Thomas E. Dickey + + * config.sub: update to 2014-07-28 + +2014-07-27 Thomas E. Dickey + + * configure: regen + + * aclocal.m4: modified to support port to Minix3.2 + + * package/pkgsrc/Makefile, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec: + bump + 2014-07-15 Thomas E. Dickey * aclocal.m4: resync with my-autoconf (no change to configure script) Modified: vendor/byacc/dist/MANIFEST ============================================================================== --- vendor/byacc/dist/MANIFEST Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/MANIFEST Mon Oct 6 14:55:38 2014 (r272651) @@ -1,4 +1,4 @@ -MANIFEST for byacc-20140715, version t20140715 +MANIFEST for byacc-20141005, version t20141005 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 Modified: vendor/byacc/dist/VERSION ============================================================================== --- vendor/byacc/dist/VERSION Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/VERSION Mon Oct 6 14:55:38 2014 (r272651) @@ -1 +1 @@ -20140715 +20141005 Modified: vendor/byacc/dist/aclocal.m4 ============================================================================== --- vendor/byacc/dist/aclocal.m4 Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/aclocal.m4 Mon Oct 6 14:55:38 2014 (r272651) @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $ +dnl $Id: aclocal.m4,v 1.37 2014/10/04 16:40:06 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- dnl Copyright 2004-2013,2014 Thomas E. Dickey @@ -54,7 +54,7 @@ define([CF_ACVERSION_COMPARE], [ifelse([$8], , ,[$8])], [ifelse([$9], , ,[$9])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42 +dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl The second parameter if given makes this macro verbose. @@ -79,7 +79,7 @@ no) -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -116,7 +116,7 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -1085,7 +1085,7 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15 +dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -1136,6 +1136,9 @@ irix[[56]].*) #(vi linux*|gnu*|mint*|k*bsd*-gnu) #(vi CF_GNU_SOURCE ;; +minix*) #(vi + cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... + ;; mirbsd*) #(vi # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= @@ -1165,6 +1168,10 @@ solaris2.*) #(vi cf_xopen_source="-D__EXTENSIONS__" cf_cv_xopen_source=broken ;; +sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) + cf_XOPEN_SOURCE= + cf_POSIX_C_SOURCE= + ;; *) CF_TRY_XOPEN_SOURCE CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) @@ -1172,7 +1179,7 @@ solaris2.*) #(vi esac if test -n "$cf_xopen_source" ; then - CF_ADD_CFLAGS($cf_xopen_source) + CF_ADD_CFLAGS($cf_xopen_source,true) fi dnl In anything but the default case, we may have system-specific setting Modified: vendor/byacc/dist/btyaccpar.c ============================================================================== --- vendor/byacc/dist/btyaccpar.c Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/btyaccpar.c Mon Oct 6 14:55:38 2014 (r272651) @@ -18,7 +18,7 @@ const char *const banner[] = { "/* original parser id follows */", "/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */", - "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */", + "/* (use YYMAJOR/YYMINOR for ifdefs dependent of parser version) */", "", "#define YYBYACC 1", CONCAT1("#define YYMAJOR ", YYMAJOR), @@ -56,7 +56,7 @@ const char *const tables[] = "#if YYBTYACC", "extern const YYINT yycindex[];", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "extern const YYINT yygindex[];", "extern const YYINT yytable[];", "extern const YYINT yycheck[];", @@ -64,7 +64,7 @@ const char *const tables[] = "#if YYBTYACC", "extern const YYINT yyctable[];", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", "#if YYDEBUG", "extern const char *const yyname[];", @@ -127,7 +127,7 @@ const char *const hdr_defs[] = "#define YYLVQUEUEGROWTH 32", "#endif", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", "/* define the initial stack-sizes */", "#ifdef YYSTACKSIZE", @@ -172,7 +172,7 @@ const char *const hdr_defs[] = "};", "typedef struct YYParseState_s YYParseState;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ 0 }; @@ -220,7 +220,7 @@ const char *const hdr_vars[] = "", "static short *yylexemes = 0;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ 0 }; @@ -277,7 +277,7 @@ const char *const body_vars[] = "", " static short *yylexemes = 0;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ 0 }; @@ -290,14 +290,14 @@ const char *const body_1[] = "#if YYBTYACC", "#define yytrial (yyps->save)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", "#if YYDEBUG", - "#include /* needed for printf */", + "#include /* needed for printf */", "#endif", "", - "#include /* needed for malloc, etc */", - "#include /* needed for memset */", + "#include /* needed for malloc, etc */", + "#include /* needed for memset */", "", "/* allocate initial stack or double stack size, up to YYMAXDEPTH */", "static int yygrowstack(YYSTACKDATA *data)", @@ -404,7 +404,7 @@ const char *const body_1[] = " free(p);", "}", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", "#define YYABORT goto yyabort", "#define YYREJECT goto yyabort", @@ -416,7 +416,7 @@ const char *const body_1[] = "#define YYVALID_NESTED do { if (yyps->save && \\", " yyps->save->save == 0) goto yyvalid; } while(0)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", "int", "YYPARSE_DECL()", @@ -432,7 +432,7 @@ const char *const body_2[] = " int yynewerrflag;", " YYParseState *yyerrctx = NULL;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " YYLTYPE yyerror_loc_range[2]; /* position of error start & end */", "#endif", @@ -454,7 +454,7 @@ const char *const body_2[] = " yyps = yyNewState(0); if (yyps == 0) goto yyenomem;", " yyps->save = 0;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " yynerrs = 0;", " yyerrflag = 0;", " yychar = YYEMPTY;", @@ -495,8 +495,8 @@ const char *const body_2[] = " /* in trial mode; save scanner results for future parse attempts */", " if (yylvp == yylvlim)", " { /* Enlarge lexical value queue */", - " int p = yylvp - yylvals;", - " int s = yylvlim - yylvals;", + " size_t p = (size_t) (yylvp - yylvals);", + " size_t s = (size_t) (yylvlim - yylvals);", "", " s += YYLVQUEUEGROWTH;", " if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL) goto yyenomem;", @@ -524,13 +524,13 @@ const char *const body_2[] = " }", " /* normal operation, no conflict encountered */", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " yychar = YYLEX;", #if defined(YYBTYACC) "#if YYBTYACC", " } while (0);", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " if (yychar < 0) yychar = YYEOF;", " /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */", "#if YYDEBUG", @@ -544,7 +544,7 @@ const char *const body_2[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " fprintf(stderr, \" <%s>\", YYSTYPE_TOSTRING(yychar, yylval));", "#endif", " fputc('\\n', stderr);", @@ -598,12 +598,12 @@ const char *const body_2[] = " save->state = yystate;", " save->errflag = yyerrflag;", " save->yystack.s_mark = save->yystack.s_base + (yystack.s_mark - yystack.s_base);", - " memcpy (save->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", + " memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", " save->yystack.l_mark = save->yystack.l_base + (yystack.l_mark - yystack.l_base);", - " memcpy (save->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", + " memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " save->yystack.p_mark = save->yystack.p_base + (yystack.p_mark - yystack.p_base);", - " memcpy (save->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", + " memcpy (save->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", "#endif", " ctry = yytable[yyn];", " if (yyctable[ctry] == -1)", @@ -658,7 +658,7 @@ const char *const body_2[] = " yylexp--;", " yychar = YYEMPTY;", " }", - " save->lexeme = yylvp - yylvals;", + " save->lexeme = (int) (yylvp - yylvals);", " yyps->save = save;", " }", " if (yytable[yyn] == ctry)", @@ -695,7 +695,7 @@ const char *const body_2[] = " }", " } /* End of code dealing with conflicts */", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&", " yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)", " {", @@ -754,14 +754,14 @@ const char *const body_2[] = " yyerrctx->state = yystate;", " yyerrctx->errflag = yyerrflag;", " yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);", - " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", + " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", " yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);", - " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", + " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " yyerrctx->yystack.p_mark = yyerrctx->yystack.p_base + (yystack.p_mark - yystack.p_base);", - " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", + " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", "#endif", - " yyerrctx->lexeme = yylvp - yylvals;", + " yyerrctx->lexeme = (int) (yylvp - yylvals);", " }", " yylvp = yylvals + save->lexeme;", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", @@ -770,12 +770,12 @@ const char *const body_2[] = " yylexp = yylexemes + save->lexeme;", " yychar = YYEMPTY;", " yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);", - " memcpy (yystack.s_base, save->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", + " memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", " yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);", - " memcpy (yystack.l_base, save->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", + " memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " yystack.p_mark = yystack.p_base + (save->yystack.p_mark - save->yystack.p_base);", - " memcpy (yystack.p_base, save->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", + " memcpy (yystack.p_base, save->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", "#endif", " ctry = ++save->ctry;", " yystate = save->state;", @@ -805,12 +805,12 @@ const char *const body_2[] = " yylloc = yylpp[-1];", "#endif", " yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);", - " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", + " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", " yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);", - " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", + " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " yystack.p_mark = yystack.p_base + (yyerrctx->yystack.p_mark - yyerrctx->yystack.p_base);", - " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", + " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", "#endif", " yystate = yyerrctx->state;", " yyFreeState(yyerrctx);", @@ -820,7 +820,7 @@ const char *const body_2[] = " }", " if (yynewerrflag == 0) goto yyinrecovery;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", " YYERROR_CALL(\"syntax error\");", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", @@ -876,7 +876,7 @@ const char *const body_2[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " YYDESTRUCT_CALL(\"error: discarding state\",", " yystos[*yystack.s_mark], yystack.l_mark, yystack.p_mark);", @@ -909,7 +909,7 @@ const char *const body_2[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " YYDESTRUCT_CALL(\"error: discarding token\", yychar, &yylval, &yylloc);", "#else", @@ -932,7 +932,7 @@ const char *const body_2[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " if (yym > 0)", " {", " int i;", @@ -961,7 +961,7 @@ const char *const body_2[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " {", " YYLLOC_DEFAULT(yyloc, &yystack.p_mark[1-yym], yym);", " /* just in case YYERROR is invoked within the action, save", @@ -998,7 +998,7 @@ const char *const trailer[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[YYFINAL], yyval));", "#endif", " fprintf(stderr, \"shifting from state 0 to final state %d\\n\", YYFINAL);", @@ -1030,8 +1030,8 @@ const char *const trailer[] = " /* in trial mode; save scanner results for future parse attempts */", " if (yylvp == yylvlim)", " { /* Enlarge lexical value queue */", - " int p = yylvp - yylvals;", - " int s = yylvlim - yylvals;", + " size_t p = (size_t) (yylvp - yylvals);", + " size_t s = (size_t) (yylvlim - yylvals);", "", " s += YYLVQUEUEGROWTH;", " if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL)", @@ -1062,13 +1062,13 @@ const char *const trailer[] = " }", " /* normal operation, no conflict encountered */", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " yychar = YYLEX;", #if defined(YYBTYACC) "#if YYBTYACC", " } while (0);", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " if (yychar < 0) yychar = YYEOF;", " /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */", "#if YYDEBUG", @@ -1097,7 +1097,7 @@ const char *const trailer[] = "#if YYBTYACC", " if (!yytrial)", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[yystate], yyval));", "#endif", " fprintf(stderr, \"shifting from state %d to state %d\\n\", *yystack.s_mark, yystate);", @@ -1140,17 +1140,17 @@ const char *const trailer[] = " yylexp = yylexemes + yypath->lexeme;", " yychar = YYEMPTY;", " yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base);", - " memcpy (yystack.s_base, yypath->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", + " memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));", " yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base);", - " memcpy (yystack.l_base, yypath->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", + " memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " yystack.p_mark = yystack.p_base + (yypath->yystack.p_mark - yypath->yystack.p_base);", - " memcpy (yystack.p_base, yypath->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", + " memcpy (yystack.p_base, yypath->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));", "#endif", " yystate = yypath->state;", " goto yyloop;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ "", "yyoverflow:", " YYERROR_CALL(\"yacc stack overflow\");", @@ -1161,7 +1161,7 @@ const char *const trailer[] = " YYERROR_CALL(\"memory exhausted\");", "yyabort_nomem:", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " yyresult = 2;", " goto yyreturn;", "", @@ -1174,7 +1174,7 @@ const char *const trailer[] = "#if YYBTYACC", " if (yyps->save) goto yyvalid;", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " yyresult = 0;", "", "yyreturn:", @@ -1224,7 +1224,7 @@ const char *const trailer[] = " yyFreeState(save);", " }", "#endif /* YYBTYACC */", -#endif /* defined(YYBTYACC) */ +#endif /* defined(YYBTYACC) */ " yyfreestack(&yystack);", " return (yyresult);", "}", Modified: vendor/byacc/dist/closure.c ============================================================================== --- vendor/byacc/dist/closure.c Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/closure.c Mon Oct 6 14:55:38 2014 (r272651) @@ -1,4 +1,4 @@ -/* $Id: closure.c,v 1.10 2014/02/19 00:45:42 Tom.Shields Exp $ */ +/* $Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp $ */ #include "defs.h" @@ -6,6 +6,7 @@ Value_t *itemset; Value_t *itemsetend; unsigned *ruleset; +static unsigned *first_base; static unsigned *first_derives; static unsigned *EFF; @@ -68,7 +69,8 @@ set_first_derives(void) rulesetsize = WORDSIZE(nrules); varsetsize = WORDSIZE(nvars); - first_derives = NEW2(nvars * rulesetsize, unsigned) - ntokens * rulesetsize; + first_base = NEW2(nvars * rulesetsize, unsigned); + first_derives = first_base - ntokens * rulesetsize; set_EFF(); @@ -176,7 +178,7 @@ finalize_closure(void) { FREE(itemset); FREE(ruleset); - FREE(first_derives + ntokens * WORDSIZE(nrules)); + FREE(first_base); } #ifdef DEBUG Modified: vendor/byacc/dist/config.sub ============================================================================== --- vendor/byacc/dist/config.sub Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/config.sub Mon Oct 6 14:55:38 2014 (r272651) @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-04-03' +timestamp='2014-07-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -283,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -401,8 +403,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -824,6 +828,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1369,7 +1377,7 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ Modified: vendor/byacc/dist/configure ============================================================================== --- vendor/byacc/dist/configure Mon Oct 6 14:52:04 2014 (r272650) +++ vendor/byacc/dist/configure Mon Oct 6 14:55:38 2014 (r272651) @@ -1936,7 +1936,7 @@ no) -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -1977,7 +1977,7 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2498,6 +2498,9 @@ echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ;; +minix*) #(vi + cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... + ;; mirbsd*) #(vi # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= @@ -2515,16 +2518,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:2518: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:2521: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:2524: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2527: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2527 "configure" +#line 2530 "configure" #include "confdefs.h" #include int @@ -2539,16 +2542,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2542: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2545: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2545: \$? = $ac_status" >&5 + echo "$as_me:2548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2548: \"$ac_try\"") >&5 + { (eval echo "$as_me:2551: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2551: \$? = $ac_status" >&5 + echo "$as_me:2554: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -2569,7 +2572,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 2572 "configure" +#line 2575 "configure" #include "confdefs.h" #include int @@ -2584,16 +2587,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2587: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2590: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2590: \$? = $ac_status" >&5 + echo "$as_me:2593: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2593: \"$ac_try\"") >&5 + { (eval echo "$as_me:2596: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2596: \$? = $ac_status" >&5 + echo "$as_me:2599: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2604,15 +2607,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:2607: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:2610: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:2612: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:2615: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2615 "configure" +#line 2618 "configure" #include "confdefs.h" #include int @@ -2627,16 +2630,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2630: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2633: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2633: \$? = $ac_status" >&5 + echo "$as_me:2636: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2636: \"$ac_try\"") >&5 + { (eval echo "$as_me:2639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2639: \$? = $ac_status" >&5 + echo "$as_me:2642: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2652,7 +2655,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2655: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:2658: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -2674,7 +2677,7 @@ no) -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2715,7 +2718,7 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2766,14 +2769,14 @@ solaris2.*) #(vi ;; *) -echo "$as_me:2769: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:2772: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2776 "configure" +#line 2779 "configure" #include "confdefs.h" #include @@ -2792,16 +2795,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2795: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2798: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2798: \$? = $ac_status" >&5 + echo "$as_me:2801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2801: \"$ac_try\"") >&5 + { (eval echo "$as_me:2804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2804: \$? = $ac_status" >&5 + echo "$as_me:2807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2810,7 +2813,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2813 "configure" +#line 2816 "configure" #include "confdefs.h" #include @@ -2829,16 +2832,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2832: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2835: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2835: \$? = $ac_status" >&5 + echo "$as_me:2838: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2838: \"$ac_try\"") >&5 + { (eval echo "$as_me:2841: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2841: \$? = $ac_status" >&5 + echo "$as_me:2844: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2853,7 +2856,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2856: result: $cf_cv_xopen_source" >&5 +echo "$as_me:2859: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -2883,7 +2886,7 @@ no) -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2924,7 +2927,7 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2961,16 +2964,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:2964: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:2967: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:2970: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2973: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2973 "configure" +#line 2976 "configure" #include "confdefs.h" #include int @@ -2985,16 +2988,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2988: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2991: \$? = $ac_status" >&5 + echo "$as_me:2994: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2994: \"$ac_try\"") >&5 + { (eval echo "$as_me:2997: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2997: \$? = $ac_status" >&5 + echo "$as_me:3000: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3015,7 +3018,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3018 "configure" +#line 3021 "configure" #include "confdefs.h" #include int @@ -3030,16 +3033,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From bapt at FreeBSD.org Mon Oct 6 14:57:26 2014 From: bapt at FreeBSD.org (Baptiste Daroussin) Date: Mon, 6 Oct 2014 14:57:26 +0000 (UTC) Subject: svn commit: r272652 - vendor/byacc/20141005 Message-ID: <201410061457.s96EvQfc028289@svn.freebsd.org> Author: bapt Date: Mon Oct 6 14:57:26 2014 New Revision: 272652 URL: https://svnweb.freebsd.org/changeset/base/272652 Log: Tag import of byacc 20141005 Added: vendor/byacc/20141005/ - copied from r272651, vendor/byacc/dist/ From bapt at FreeBSD.org Wed Oct 8 20:41:57 2014 From: bapt at FreeBSD.org (Baptiste Daroussin) Date: Wed, 8 Oct 2014 20:41:56 +0000 (UTC) Subject: svn commit: r272767 - in vendor/byacc/dist: . package package/debian package/debian/source package/pkgsrc Message-ID: <201410082041.s98KfuGj001928@svn.freebsd.org> Author: bapt Date: Wed Oct 8 20:41:56 2014 New Revision: 272767 URL: https://svnweb.freebsd.org/changeset/base/272767 Log: Import byacc 20140906 Modified: vendor/byacc/dist/CHANGES vendor/byacc/dist/MANIFEST vendor/byacc/dist/VERSION vendor/byacc/dist/configure vendor/byacc/dist/configure.in vendor/byacc/dist/main.c vendor/byacc/dist/package/byacc.spec vendor/byacc/dist/package/debian/changelog vendor/byacc/dist/package/debian/source/format vendor/byacc/dist/package/mingw-byacc.spec vendor/byacc/dist/package/pkgsrc/Makefile vendor/byacc/dist/reader.c Modified: vendor/byacc/dist/CHANGES ============================================================================== --- vendor/byacc/dist/CHANGES Wed Oct 8 20:25:21 2014 (r272766) +++ vendor/byacc/dist/CHANGES Wed Oct 8 20:41:56 2014 (r272767) @@ -1,3 +1,23 @@ +2014-10-06 Thomas E. Dickey + + * package/debian/source/format: + change to native format to work around regression in Debian packaging. + + * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + + * configure: regen + + * main.c: + correct parameter for umask - for very old mkstemp's - and use type mode_t + to quiet compiler warning + + * configure.in: add configure check for mode_t + + * reader.c: + better fix for get_line, by ensuring there is enough space to null-terminate + its result (prompted by discussion with Craig Rodrigues). + 2014-10-05 Thomas E. Dickey * main.c: Modified: vendor/byacc/dist/MANIFEST ============================================================================== --- vendor/byacc/dist/MANIFEST Wed Oct 8 20:25:21 2014 (r272766) +++ vendor/byacc/dist/MANIFEST Wed Oct 8 20:41:56 2014 (r272767) @@ -1,4 +1,4 @@ -MANIFEST for byacc-20141005, version t20141005 +MANIFEST for byacc-20141006, version t20141006 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 Modified: vendor/byacc/dist/VERSION ============================================================================== --- vendor/byacc/dist/VERSION Wed Oct 8 20:25:21 2014 (r272766) +++ vendor/byacc/dist/VERSION Wed Oct 8 20:41:56 2014 (r272767) @@ -1 +1 @@ -20141005 +20141006 Modified: vendor/byacc/dist/configure ============================================================================== --- vendor/byacc/dist/configure Wed Oct 8 20:25:21 2014 (r272766) +++ vendor/byacc/dist/configure Wed Oct 8 20:41:56 2014 (r272767) @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.19 . +# From configure.in Revision: 1.20 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20121002. # @@ -106,6 +106,42 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} ac_unique_file="main.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include +#endif" # Initialize some variables set by options. ac_init_help= @@ -854,7 +890,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:857: loading site script $ac_site_file" >&5 + { echo "$as_me:893: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -865,7 +901,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:868: loading cache $cache_file" >&5 + { echo "$as_me:904: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -873,7 +909,7 @@ echo "$as_me: loading cache $cache_file" esac fi else - { echo "$as_me:876: creating cache $cache_file" >&5 + { echo "$as_me:912: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -889,21 +925,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:892: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:928: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:896: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:932: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:902: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:938: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:904: former value: $ac_old_val" >&5 + { echo "$as_me:940: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:906: current value: $ac_new_val" >&5 + { echo "$as_me:942: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -922,9 +958,9 @@ echo "$as_me: current value: $ac_new_v fi done if $ac_cache_corrupted; then - { echo "$as_me:925: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:961: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:927: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:963: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -945,10 +981,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:948: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:984: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:951: \$? = $ac_status" >&5 + echo "$as_me:987: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -976,7 +1012,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:979: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1015: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -986,11 +1022,11 @@ ac_configure="$SHELL $ac_aux_dir/configu # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:989: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1025: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:993: checking build system type" >&5 +echo "$as_me:1029: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -999,23 +1035,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1002: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1038: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1006: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1042: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1011: result: $ac_cv_build" >&5 +echo "$as_me:1047: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1018: checking host system type" >&5 +echo "$as_me:1054: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1024,12 +1060,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1027: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1063: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1032: result: $ac_cv_host" >&5 +echo "$as_me:1068: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1037,7 +1073,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1040: checking target system type" >&5 + echo "$as_me:1076: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1046,12 +1082,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1049: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1085: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1054: result: $ac_cv_target" >&5 +echo "$as_me:1090: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1083,13 +1119,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1086: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1122: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1090: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1126: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1092: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1128: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1116,7 +1152,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1119: checking for $ac_word" >&5 +echo "$as_me:1155: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1131,7 +1167,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1134: found $ac_dir/$ac_word" >&5 +echo "$as_me:1170: found $ac_dir/$ac_word" >&5 break done @@ -1139,10 +1175,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1142: result: $CC" >&5 + echo "$as_me:1178: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1145: result: no" >&5 + echo "$as_me:1181: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1151,7 +1187,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1154: checking for $ac_word" >&5 +echo "$as_me:1190: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1166,7 +1202,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1169: found $ac_dir/$ac_word" >&5 +echo "$as_me:1205: found $ac_dir/$ac_word" >&5 break done @@ -1174,10 +1210,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1177: result: $ac_ct_CC" >&5 + echo "$as_me:1213: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1180: result: no" >&5 + echo "$as_me:1216: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1190,7 +1226,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1193: checking for $ac_word" >&5 +echo "$as_me:1229: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1205,7 +1241,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1208: found $ac_dir/$ac_word" >&5 +echo "$as_me:1244: found $ac_dir/$ac_word" >&5 break done @@ -1213,10 +1249,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1216: result: $CC" >&5 + echo "$as_me:1252: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1219: result: no" >&5 + echo "$as_me:1255: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1225,7 +1261,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1228: checking for $ac_word" >&5 +echo "$as_me:1264: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1240,7 +1276,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1243: found $ac_dir/$ac_word" >&5 +echo "$as_me:1279: found $ac_dir/$ac_word" >&5 break done @@ -1248,10 +1284,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1251: result: $ac_ct_CC" >&5 + echo "$as_me:1287: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1254: result: no" >&5 + echo "$as_me:1290: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1264,7 +1300,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1267: checking for $ac_word" >&5 +echo "$as_me:1303: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1284,7 +1320,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/c continue fi ac_cv_prog_CC="cc" -echo "$as_me:1287: found $ac_dir/$ac_word" >&5 +echo "$as_me:1323: found $ac_dir/$ac_word" >&5 break done @@ -1306,10 +1342,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1309: result: $CC" >&5 + echo "$as_me:1345: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1312: result: no" >&5 + echo "$as_me:1348: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1320,7 +1356,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1323: checking for $ac_word" >&5 +echo "$as_me:1359: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1335,7 +1371,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1338: found $ac_dir/$ac_word" >&5 +echo "$as_me:1374: found $ac_dir/$ac_word" >&5 break done @@ -1343,10 +1379,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1346: result: $CC" >&5 + echo "$as_me:1382: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1349: result: no" >&5 + echo "$as_me:1385: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1359,7 +1395,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1362: checking for $ac_word" >&5 +echo "$as_me:1398: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1374,7 +1410,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1377: found $ac_dir/$ac_word" >&5 +echo "$as_me:1413: found $ac_dir/$ac_word" >&5 break done @@ -1382,10 +1418,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1385: result: $ac_ct_CC" >&5 + echo "$as_me:1421: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1388: result: no" >&5 + echo "$as_me:1424: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1397,32 +1433,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1400: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1436: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1405:" \ +echo "$as_me:1441:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1408: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1444: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1411: \$? = $ac_status" >&5 + echo "$as_me:1447: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1413: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1449: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1416: \$? = $ac_status" >&5 + echo "$as_me:1452: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1418: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1454: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1421: \$? = $ac_status" >&5 + echo "$as_me:1457: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1425 "configure" +#line 1461 "configure" #include "confdefs.h" int @@ -1438,13 +1474,13 @@ ac_clean_files="$ac_clean_files a.out a. # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1441: checking for C compiler default output" >&5 +echo "$as_me:1477: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1444: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1480: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1447: \$? = $ac_status" >&5 + echo "$as_me:1483: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1467,34 +1503,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1470: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1506: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1476: result: $ac_file" >&5 +echo "$as_me:1512: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1481: checking whether the C compiler works" >&5 +echo "$as_me:1517: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1487: \"$ac_try\"") >&5 + { (eval echo "$as_me:1523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1490: \$? = $ac_status" >&5 + echo "$as_me:1526: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1497: error: cannot run C compiled programs. + { { echo "$as_me:1533: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1502,24 +1538,24 @@ If you meant to cross compile, use \`--h fi fi fi -echo "$as_me:1505: result: yes" >&5 +echo "$as_me:1541: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1512: checking whether we are cross compiling" >&5 +echo "$as_me:1548: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1514: result: $cross_compiling" >&5 +echo "$as_me:1550: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1517: checking for executable suffix" >&5 +echo "$as_me:1553: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1519: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1522: \$? = $ac_status" >&5 + echo "$as_me:1558: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1535,25 +1571,25 @@ for ac_file in `(ls conftest.exe; ls con esac done else - { { echo "$as_me:1538: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1574: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1544: result: $ac_cv_exeext" >&5 +echo "$as_me:1580: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1550: checking for object suffix" >&5 +echo "$as_me:1586: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1556 "configure" +#line 1592 "configure" #include "confdefs.h" int @@ -1565,10 +1601,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1568: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1571: \$? = $ac_status" >&5 + echo "$as_me:1607: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1580,24 +1616,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1583: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1619: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1590: result: $ac_cv_objext" >&5 +echo "$as_me:1626: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1594: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1630: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1600 "configure" +#line 1636 "configure" #include "confdefs.h" int @@ -1612,16 +1648,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1615: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1651: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1618: \$? = $ac_status" >&5 + echo "$as_me:1654: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1621: \"$ac_try\"") >&5 + { (eval echo "$as_me:1657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1624: \$? = $ac_status" >&5 + echo "$as_me:1660: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1633,19 +1669,19 @@ rm -f conftest.$ac_objext conftest.$ac_e ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1636: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1672: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1642: checking whether $CC accepts -g" >&5 +echo "$as_me:1678: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1648 "configure" +#line 1684 "configure" #include "confdefs.h" int @@ -1657,16 +1693,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1663: \$? = $ac_status" >&5 + echo "$as_me:1699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1666: \"$ac_try\"") >&5 + { (eval echo "$as_me:1702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1669: \$? = $ac_status" >&5 + echo "$as_me:1705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1676,7 +1712,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1679: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1715: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1703,16 +1739,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1706: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1742: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1709: \$? = $ac_status" >&5 + echo "$as_me:1745: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1712: \"$ac_try\"") >&5 + { (eval echo "$as_me:1748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1715: \$? = $ac_status" >&5 + echo "$as_me:1751: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1724,7 +1760,7 @@ if { (eval echo "$as_me:1706: \"$ac_comp 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1727 "configure" +#line 1763 "configure" #include "confdefs.h" #include $ac_declaration @@ -1737,16 +1773,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1740: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1776: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1743: \$? = $ac_status" >&5 + echo "$as_me:1779: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1746: \"$ac_try\"") >&5 + { (eval echo "$as_me:1782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1749: \$? = $ac_status" >&5 + echo "$as_me:1785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1756,7 +1792,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1759 "configure" +#line 1795 "configure" #include "confdefs.h" $ac_declaration int @@ -1768,16 +1804,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1771: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1807: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1774: \$? = $ac_status" >&5 + echo "$as_me:1810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1777: \"$ac_try\"") >&5 + { (eval echo "$as_me:1813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1780: \$? = $ac_status" >&5 + echo "$as_me:1816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1807,15 +1843,15 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1810: checking version of $CC" >&5 + echo "$as_me:1846: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1814: result: $GCC_VERSION" >&5 + echo "$as_me:1850: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1818: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:1854: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1823,7 +1859,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1826 "configure" +#line 1862 "configure" #include "confdefs.h" #include #include @@ -1872,16 +1908,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:1875: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1878: \$? = $ac_status" >&5 + echo "$as_me:1914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1881: \"$ac_try\"") >&5 + { (eval echo "$as_me:1917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1884: \$? = $ac_status" >&5 + echo "$as_me:1920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -1898,10 +1934,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1901: result: none needed" >&5 + echo "$as_me:1937: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1904: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:1940: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -1909,13 +1945,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:1912: checking \$CC variable" >&5 +echo "$as_me:1948: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in #(vi *[\ \ ]-[IUD]*) - echo "$as_me:1916: result: broken" >&5 + echo "$as_me:1952: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1918: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:1954: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -2001,12 +2037,12 @@ fi ;; *) - echo "$as_me:2004: result: ok" >&5 + echo "$as_me:2040: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2009: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2045: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -2026,11 +2062,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2029: result: yes" >&5 + echo "$as_me:2065: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2033: result: no" >&5 + echo "$as_me:2069: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2047,7 +2083,7 @@ fi # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2050: checking for a BSD compatible install" >&5 +echo "$as_me:2086: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2096,7 +2132,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2099: result: $INSTALL" >&5 +echo "$as_me:2135: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2107,7 +2143,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2110: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2146: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2134,7 +2170,7 @@ else fi fi -echo "$as_me:2137: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2173: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2145,7 +2181,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From bapt at FreeBSD.org Wed Oct 8 20:44:06 2014 From: bapt at FreeBSD.org (Baptiste Daroussin) Date: Wed, 8 Oct 2014 20:44:05 +0000 (UTC) Subject: svn commit: r272768 - vendor/byacc/20141006 Message-ID: <201410082044.s98Ki5NO002261@svn.freebsd.org> Author: bapt Date: Wed Oct 8 20:44:05 2014 New Revision: 272768 URL: https://svnweb.freebsd.org/changeset/base/272768 Log: Tag import of byacc 20141006 Added: vendor/byacc/20141006/ - copied from r272767, vendor/byacc/dist/ From delphij at FreeBSD.org Thu Oct 9 05:48:07 2014 From: delphij at FreeBSD.org (Xin LI) Date: Thu, 9 Oct 2014 05:48:06 +0000 (UTC) Subject: svn commit: r272802 - vendor/illumos/dist/cmd/zdb Message-ID: <201410090548.s995m6q1062601@svn.freebsd.org> Author: delphij Date: Thu Oct 9 05:48:06 2014 New Revision: 272802 URL: https://svnweb.freebsd.org/changeset/base/272802 Log: 5169 zdb should limit its ARC size 5170 zdb -c should create more scrub i/os by default 5171 zdb should print status while loading metaslabs for leak detection Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Paul Dagnelie Reviewed by: Bayard Bell Approved by: Robert Mustacchi Author: Matthew Ahrens illumos/illumos-gate at 06be98028b8a84e7f327188613dd09a708294d1a Modified: vendor/illumos/dist/cmd/zdb/zdb.c Modified: vendor/illumos/dist/cmd/zdb/zdb.c ============================================================================== --- vendor/illumos/dist/cmd/zdb/zdb.c Thu Oct 9 05:42:07 2014 (r272801) +++ vendor/illumos/dist/cmd/zdb/zdb.c Thu Oct 9 05:48:06 2014 (r272802) @@ -76,8 +76,10 @@ #ifndef lint extern boolean_t zfs_recover; +extern uint64_t zfs_arc_max, zfs_arc_meta_limit; #else boolean_t zfs_recover; +uint64_t zfs_arc_max, zfs_arc_meta_limit; #endif const char cmdname[] = "zdb"; @@ -89,7 +91,7 @@ extern void dump_intent_log(zilog_t *); uint64_t *zopt_object = NULL; int zopt_objects = 0; libzfs_handle_t *g_zfs; -uint64_t max_inflight = 200; +uint64_t max_inflight = 1000; /* * These libumem hooks provide a reasonable set of defaults for the allocator's @@ -2353,7 +2355,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog zcb->zcb_readfails = 0; - if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) && + if (dump_opt['b'] < 5 && gethrtime() > zcb->zcb_lastprint + NANOSEC) { uint64_t now = gethrtime(); char buf[10]; @@ -2438,9 +2440,9 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb) if (!dump_opt['L']) { vdev_t *rvd = spa->spa_root_vdev; - for (int c = 0; c < rvd->vdev_children; c++) { + for (uint64_t c = 0; c < rvd->vdev_children; c++) { vdev_t *vd = rvd->vdev_child[c]; - for (int m = 0; m < vd->vdev_ms_count; m++) { + for (uint64_t m = 0; m < vd->vdev_ms_count; m++) { metaslab_t *msp = vd->vdev_ms[m]; mutex_enter(&msp->ms_lock); metaslab_unload(msp); @@ -2453,6 +2455,15 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb) * interfaces. */ if (msp->ms_sm != NULL) { + (void) fprintf(stderr, + "\rloading space map for " + "vdev %llu of %llu, " + "metaslab %llu of %llu ...", + (longlong_t)c, + (longlong_t)rvd->vdev_children, + (longlong_t)m, + (longlong_t)vd->vdev_ms_count); + msp->ms_ops = &zdb_metaslab_ops; VERIFY0(space_map_load(msp->ms_sm, msp->ms_tree, SM_ALLOC)); @@ -2461,6 +2472,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb) mutex_exit(&msp->ms_lock); } } + (void) fprintf(stderr, "\n"); } spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); @@ -3460,6 +3472,12 @@ main(int argc, char **argv) usage(); } + /* + * ZDB does not typically re-read blocks; therefore limit the ARC + * to 256 MB, which can be used entirely for metadata. + */ + zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024; + kernel_init(FREAD); g_zfs = libzfs_init(); ASSERT(g_zfs != NULL); From delphij at FreeBSD.org Thu Oct 9 05:50:25 2014 From: delphij at FreeBSD.org (Xin LI) Date: Thu, 9 Oct 2014 05:50:24 +0000 (UTC) Subject: svn commit: r272803 - in vendor-sys/illumos/dist/uts/common/fs/zfs: . sys Message-ID: <201410090550.s995oOuP062966@svn.freebsd.org> Author: delphij Date: Thu Oct 9 05:50:23 2014 New Revision: 272803 URL: https://svnweb.freebsd.org/changeset/base/272803 Log: 5175 implement dmu_read_uio_dbuf() to improve cached read performance Reviewed by: Adam Leventhal Reviewed by: Alex Reece Reviewed by: George Wilson Reviewed by: Richard Elling Approved by: Robert Mustacchi Author: Matthew Ahrens illumos/illumos-gate at f8554bb92be6be88a684bea58293b41a6168a538 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Thu Oct 9 05:48:06 2014 (r272802) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Thu Oct 9 05:50:23 2014 (r272803) @@ -1015,8 +1015,8 @@ xuio_stat_wbuf_nocopy() } #ifdef _KERNEL -int -dmu_read_uio(objset_t *os, uint64_t object, uio_t *uio, uint64_t size) +static int +dmu_read_uio_dnode(dnode_t *dn, uio_t *uio, uint64_t size) { dmu_buf_t **dbp; int numbufs, i, err; @@ -1026,8 +1026,8 @@ dmu_read_uio(objset_t *os, uint64_t obje * NB: we could do this block-at-a-time, but it's nice * to be reading in parallel. */ - err = dmu_buf_hold_array(os, object, uio->uio_loffset, size, TRUE, FTAG, - &numbufs, &dbp); + err = dmu_buf_hold_array_by_dnode(dn, uio->uio_loffset, size, + TRUE, FTAG, &numbufs, &dbp, 0); if (err) return (err); @@ -1072,6 +1072,58 @@ dmu_read_uio(objset_t *os, uint64_t obje return (err); } +/* + * Read 'size' bytes into the uio buffer. + * From object zdb->db_object. + * Starting at offset uio->uio_loffset. + * + * If the caller already has a dbuf in the target object + * (e.g. its bonus buffer), this routine is faster than dmu_read_uio(), + * because we don't have to find the dnode_t for the object. + */ +int +dmu_read_uio_dbuf(dmu_buf_t *zdb, uio_t *uio, uint64_t size) +{ + dmu_buf_impl_t *db = (dmu_buf_impl_t *)zdb; + dnode_t *dn; + int err; + + if (size == 0) + return (0); + + DB_DNODE_ENTER(db); + dn = DB_DNODE(db); + err = dmu_read_uio_dnode(dn, uio, size); + DB_DNODE_EXIT(db); + + return (err); +} + +/* + * Read 'size' bytes into the uio buffer. + * From the specified object + * Starting at offset uio->uio_loffset. + */ +int +dmu_read_uio(objset_t *os, uint64_t object, uio_t *uio, uint64_t size) +{ + dnode_t *dn; + int err; + + if (size == 0) + return (0); + + err = dnode_hold(os, object, FTAG, &dn); + if (err) + return (err); + + err = dmu_read_uio_dnode(dn, uio, size); + + dnode_rele(dn, FTAG); + + return (err); +} + static int dmu_write_uio_dnode(dnode_t *dn, uio_t *uio, uint64_t size, dmu_tx_t *tx) { @@ -1124,6 +1176,15 @@ dmu_write_uio_dnode(dnode_t *dn, uio_t * return (err); } +/* + * Write 'size' bytes from the uio buffer. + * To object zdb->db_object. + * Starting at offset uio->uio_loffset. + * + * If the caller already has a dbuf in the target object + * (e.g. its bonus buffer), this routine is faster than dmu_write_uio(), + * because we don't have to find the dnode_t for the object. + */ int dmu_write_uio_dbuf(dmu_buf_t *zdb, uio_t *uio, uint64_t size, dmu_tx_t *tx) @@ -1143,6 +1204,11 @@ dmu_write_uio_dbuf(dmu_buf_t *zdb, uio_t return (err); } +/* + * Write 'size' bytes from the uio buffer. + * To the specified object. + * Starting at offset uio->uio_loffset. + */ int dmu_write_uio(objset_t *os, uint64_t object, uio_t *uio, uint64_t size, dmu_tx_t *tx) Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h Thu Oct 9 05:48:06 2014 (r272802) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h Thu Oct 9 05:50:23 2014 (r272803) @@ -614,6 +614,7 @@ void dmu_write(objset_t *os, uint64_t ob void dmu_prealloc(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, dmu_tx_t *tx); int dmu_read_uio(objset_t *os, uint64_t object, struct uio *uio, uint64_t size); +int dmu_read_uio_dbuf(dmu_buf_t *zdb, struct uio *uio, uint64_t size); int dmu_write_uio(objset_t *os, uint64_t object, struct uio *uio, uint64_t size, dmu_tx_t *tx); int dmu_write_uio_dbuf(dmu_buf_t *zdb, struct uio *uio, uint64_t size, Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Thu Oct 9 05:48:06 2014 (r272802) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Thu Oct 9 05:50:23 2014 (r272803) @@ -406,7 +406,6 @@ static int mappedread(vnode_t *vp, int nbytes, uio_t *uio) { znode_t *zp = VTOZ(vp); - objset_t *os = zp->z_zfsvfs->z_os; int64_t start, off; int len = nbytes; int error = 0; @@ -425,7 +424,8 @@ mappedread(vnode_t *vp, int nbytes, uio_ zfs_unmap_page(pp, va); page_unlock(pp); } else { - error = dmu_read_uio(os, zp->z_id, uio, bytes); + error = dmu_read_uio_dbuf(sa_get_db(zp->z_sa_hdl), + uio, bytes); } len -= bytes; off = 0; @@ -460,7 +460,6 @@ zfs_read(vnode_t *vp, uio_t *uio, int io { znode_t *zp = VTOZ(vp); zfsvfs_t *zfsvfs = zp->z_zfsvfs; - objset_t *os; ssize_t n, nbytes; int error = 0; rl_t *rl; @@ -468,7 +467,6 @@ zfs_read(vnode_t *vp, uio_t *uio, int io ZFS_ENTER(zfsvfs); ZFS_VERIFY_ZP(zp); - os = zfsvfs->z_os; if (zp->z_pflags & ZFS_AV_QUARANTINED) { ZFS_EXIT(zfsvfs); @@ -558,10 +556,12 @@ zfs_read(vnode_t *vp, uio_t *uio, int io nbytes = MIN(n, zfs_read_chunk_size - P2PHASE(uio->uio_loffset, zfs_read_chunk_size)); - if (vn_has_cached_data(vp)) + if (vn_has_cached_data(vp)) { error = mappedread(vp, nbytes, uio); - else - error = dmu_read_uio(os, zp->z_id, uio, nbytes); + } else { + error = dmu_read_uio_dbuf(sa_get_db(zp->z_sa_hdl), + uio, nbytes); + } if (error) { /* convert checksum errors into IO errors */ if (error == ECKSUM) From delphij at FreeBSD.org Thu Oct 9 05:53:06 2014 From: delphij at FreeBSD.org (Xin LI) Date: Thu, 9 Oct 2014 05:53:05 +0000 (UTC) Subject: svn commit: r272804 - in vendor-sys/illumos/dist/uts/common/fs/zfs: . sys Message-ID: <201410090553.s995r5Di066650@svn.freebsd.org> Author: delphij Date: Thu Oct 9 05:53:04 2014 New Revision: 272804 URL: https://svnweb.freebsd.org/changeset/base/272804 Log: 3693 restore_object uses at least two transactions to restore an object Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Andriy Gapon Approved by: Robert Mustacchi Author: Matthew Ahrens illumos/illumos-gate at e77d42eaa49fe55bfae1e0e0065c6e99affc001b Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Thu Oct 9 05:50:23 2014 (r272803) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Thu Oct 9 05:53:04 2014 (r272804) @@ -1848,6 +1848,7 @@ dmu_object_info_from_dnode(dnode_t *dn, doi->doi_indirection = dn->dn_nlevels; doi->doi_checksum = dn->dn_checksum; doi->doi_compress = dn->dn_compress; + doi->doi_nblkptr = dn->dn_nblkptr; doi->doi_physical_blocks_512 = (DN_USED_BYTES(dnp) + 256) >> 9; doi->doi_max_offset = (dn->dn_maxblkid + 1) * dn->dn_datablksz; doi->doi_fill_count = 0; Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c Thu Oct 9 05:50:23 2014 (r272803) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c Thu Oct 9 05:53:04 2014 (r272804) @@ -20,7 +20,8 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2013, 2014 by Delphix. All rights reserved. + * Copyright 2014 HybridCluster. All rights reserved. */ #include @@ -107,11 +108,9 @@ dmu_object_claim(objset_t *os, uint64_t int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen) + int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { dnode_t *dn; - dmu_tx_t *tx; - int nblkptr; int err; if (object == DMU_META_DNODE_OBJECT) @@ -122,44 +121,9 @@ dmu_object_reclaim(objset_t *os, uint64_ if (err) return (err); - if (dn->dn_type == ot && dn->dn_datablksz == blocksize && - dn->dn_bonustype == bonustype && dn->dn_bonuslen == bonuslen) { - /* nothing is changing, this is a noop */ - dnode_rele(dn, FTAG); - return (0); - } - - if (bonustype == DMU_OT_SA) { - nblkptr = 1; - } else { - nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); - } - - /* - * If we are losing blkptrs or changing the block size this must - * be a new file instance. We must clear out the previous file - * contents before we can change this type of metadata in the dnode. - */ - if (dn->dn_nblkptr > nblkptr || dn->dn_datablksz != blocksize) { - err = dmu_free_long_range(os, object, 0, DMU_OBJECT_END); - if (err) - goto out; - } - - tx = dmu_tx_create(os); - dmu_tx_hold_bonus(tx, object); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err) { - dmu_tx_abort(tx); - goto out; - } - dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx); - dmu_tx_commit(tx); -out: dnode_rele(dn, FTAG); - return (err); } Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c Thu Oct 9 05:50:23 2014 (r272803) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c Thu Oct 9 05:53:04 2014 (r272804) @@ -23,6 +23,7 @@ * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2014, Joyent, Inc. All rights reserved. + * Copyright 2014 HybridCluster. All rights reserved. */ #include @@ -1333,12 +1334,25 @@ backup_byteswap(dmu_replay_record_t *drr #undef DO32 } +static inline uint8_t +deduce_nblkptr(dmu_object_type_t bonus_type, uint64_t bonus_size) +{ + if (bonus_type == DMU_OT_SA) { + return (1); + } else { + return (1 + + ((DN_MAX_BONUSLEN - bonus_size) >> SPA_BLKPTRSHIFT)); + } +} + static int restore_object(struct restorearg *ra, objset_t *os, struct drr_object *drro) { - int err; + dmu_object_info_t doi; dmu_tx_t *tx; void *data = NULL; + uint64_t object; + int err; if (drro->drr_type == DMU_OT_NONE || !DMU_OT_IS_VALID(drro->drr_type) || @@ -1352,10 +1366,11 @@ restore_object(struct restorearg *ra, ob return (SET_ERROR(EINVAL)); } - err = dmu_object_info(os, drro->drr_object, NULL); + err = dmu_object_info(os, drro->drr_object, &doi); if (err != 0 && err != ENOENT) return (SET_ERROR(EINVAL)); + object = err == 0 ? drro->drr_object : DMU_NEW_OBJECT; if (drro->drr_bonuslen) { data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8), NULL); @@ -1363,37 +1378,53 @@ restore_object(struct restorearg *ra, ob return (ra->err); } - if (err == ENOENT) { - /* currently free, want to be allocated */ - tx = dmu_tx_create(os); - dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err != 0) { - dmu_tx_abort(tx); - return (err); + /* + * If we are losing blkptrs or changing the block size this must + * be a new file instance. We must clear out the previous file + * contents before we can change this type of metadata in the dnode. + */ + if (err == 0) { + int nblkptr; + + nblkptr = deduce_nblkptr(drro->drr_bonustype, + drro->drr_bonuslen); + + if (drro->drr_blksz != doi.doi_data_block_size || + nblkptr < doi.doi_nblkptr) { + err = dmu_free_long_range(os, drro->drr_object, + 0, DMU_OBJECT_END); + if (err != 0) + return (SET_ERROR(EINVAL)); } + } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, object); + err = dmu_tx_assign(tx, TXG_WAIT); + if (err != 0) { + dmu_tx_abort(tx); + return (err); + } + + if (object == DMU_NEW_OBJECT) { + /* currently free, want to be allocated */ err = dmu_object_claim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, drro->drr_bonustype, drro->drr_bonuslen, tx); - dmu_tx_commit(tx); - } else { - /* currently allocated, want to be allocated */ + } else if (drro->drr_type != doi.doi_type || + drro->drr_blksz != doi.doi_data_block_size || + drro->drr_bonustype != doi.doi_bonus_type || + drro->drr_bonuslen != doi.doi_bonus_size) { + /* currently allocated, but with different properties */ err = dmu_object_reclaim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, - drro->drr_bonustype, drro->drr_bonuslen); + drro->drr_bonustype, drro->drr_bonuslen, tx); } if (err != 0) { + dmu_tx_commit(tx); return (SET_ERROR(EINVAL)); } - tx = dmu_tx_create(os); - dmu_tx_hold_bonus(tx, drro->drr_object); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err != 0) { - dmu_tx_abort(tx); - return (err); - } - dmu_object_set_checksum(os, drro->drr_object, drro->drr_checksumtype, tx); dmu_object_set_compress(os, drro->drr_object, drro->drr_compress, tx); Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h Thu Oct 9 05:50:23 2014 (r272803) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu.h Thu Oct 9 05:53:04 2014 (r272804) @@ -25,6 +25,7 @@ * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright 2013 DEY Storage Systems, Inc. + * Copyright 2014 HybridCluster. All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */ @@ -339,7 +340,7 @@ uint64_t dmu_object_alloc(objset_t *os, int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonus_type, int bonus_len, dmu_tx_t *tx); int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen); + int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *txp); /* * Free an object from this objset. @@ -653,7 +654,8 @@ typedef struct dmu_object_info { uint8_t doi_indirection; /* 2 = dnode->indirect->data */ uint8_t doi_checksum; uint8_t doi_compress; - uint8_t doi_pad[5]; + uint8_t doi_nblkptr; + uint8_t doi_pad[4]; uint64_t doi_physical_blocks_512; /* data + metadata, 512b blks */ uint64_t doi_max_offset; uint64_t doi_fill_count; /* number of non-empty blocks */ From markj at FreeBSD.org Thu Oct 9 23:11:36 2014 From: markj at FreeBSD.org (Mark Johnston) Date: Thu, 9 Oct 2014 23:11:36 +0000 (UTC) Subject: svn commit: r272851 - vendor/illumos/dist/man/man4 Message-ID: <201410092311.s99NBaZ7067093@svn.freebsd.org> Author: markj Date: Thu Oct 9 23:11:36 2014 New Revision: 272851 URL: https://svnweb.freebsd.org/changeset/base/272851 Log: 5202 want ctf(4) Reviewed by: Keith M Wesolowski Reviewed by: Jerry Jelinek Reviewed by: Garrett D'Amore Approved by: Dan McDonald Author: Robert Mustacchi illumos/illumos-gate at fe2e029eea29fd49d0d9058dbd5b79a252667e6b Added: vendor/illumos/dist/man/man4/ vendor/illumos/dist/man/man4/ctf.4 (contents, props changed) Added: vendor/illumos/dist/man/man4/ctf.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/illumos/dist/man/man4/ctf.4 Thu Oct 9 23:11:36 2014 (r272851) @@ -0,0 +1,1140 @@ +.\" +.\" This file and its contents are supplied under the terms of the +.\" Common Development and Distribution License ("CDDL"), version 1.0. +.\" You may only use this file in accordance with the terms of version +.\" 1.0 of the CDDL. +.\" +.\" A full copy of the text of the CDDL should have accompanied this +.\" source. A copy of the CDDL is also available via the Internet at +.\" http://www.illumos.org/license/CDDL. +.\" +.\" +.\" Copyright (c) 2014 Joyent, Inc. +.\" +.Dd Sep 26, 2014 +.Dt CTF 4 +.Os +.Sh NAME +.Nm ctf +.Nd Compact C Type Format +.Sh SYNOPSIS +.In sys/ctf.h +.Sh DESCRIPTION +.Nm +is designed to be a compact representation of the C programming +language's type information focused on serving the needs of dynamic +tracing, debuggers, and other in-situ and post-mortem introspection +tools. +.Nm +data is generally included in +.Sy ELF +objects and is tagged as +.Sy SHT_PROGBITS +to ensure that the data is accessible in a running process and in subsequent +core dumps, if generated. +.Lp +The +.Nm +data contained in each file has information about the layout and +sizes of C types, including intrinsic types, enumerations, structures, +typedefs, and unions, that are used by the corresponding +.Sy ELF +object. The +.Nm +data may also include information about the types of global objects and +the return type and arguments of functions in the symbol table. +.Lp +Because a +.Nm +file is often embedded inside a file, rather than being a standalone +file itself, it may also be referred to as a +.Nm +.Sy container . +.Lp +On illumos systems, +.Nm +data is consumed by multiple programs. It can be used by the modular +debugger, +.Xr mdb 1 , +as well as by +.Xr dtrace 1M . +Programmatic access to +.Nm +data can be obtained through +.Xr libctf 3LIB . +.Lp +The +.Nm +file format is broken down into seven different sections. The first +section is the +.Sy preamble +and +.Sy header , +which describes the version of the +.Nm +file, links it has to other +.Nm +files, and the sizes of the other sections. The next section is the +.Sy label +section, +which provides a way of identifying similar groups of +.Nm +data across multiple files. This is followed by the +.Sy object +information section, which describes the type of global +symbols. The subsequent section is the +.Sy function +information section, which describes the return +types and arguments of functions. The next section is the +.Sy type +information section, which describes +the format and layout of the C types themselves, and finally the last +section is the +.Sy string +section, which contains the names of types, enumerations, members, and +labels. +.Lp +While strictly speaking, only the +.Sy preamble +and +.Sy header +are required, to be actually useful, both the type and string +sections are necessary. +.Lp +A +.Nm +file may contain all of the type information that it requires, or it +may optionally refer to another +.Nm +file which holds the remaining types. When a +.Nm +file refers to another file, it is called the +.Sy child +and the file it refers to is called the +.Sy parent . +A given file may only refer to one parent. This process is called +.Em uniquification +because it ensures each child only has type information that is +unique to it. A common example of this is that most kernel modules in +illumos are uniquified against the kernel module +.Sy genunix +and the type information that comes from the +.Sy IP +module. This means that a module only has types that are unique to +itself and the most common types in the kernel are not duplicated. +.Sh FILE FORMAT +This documents version +.Em two +of the +.Nm +file format. All applications and tools currently produce and operate on +this version. +.Lp +The file format can be summarized with the following image, the +following sections will cover this in more detail. +.Bd -literal + + +-------------+ 0t0 ++--------| Preamble | +| +-------------+ 0t4 +|+-------| Header | +|| +-------------+ 0t36 + cth_lbloff +||+------| Labels | +||| +-------------+ 0t36 + cth_objtoff +|||+-----| Objects | +|||| +-------------+ 0t36 + cth_funcoff +||||+----| Functions | +||||| +-------------+ 0t36 + cth_typeoff +|||||+---| Types | +|||||| +-------------+ 0t36 + cth_stroff +||||||+--| Strings | +||||||| +-------------+ 0t36 + cth_stroff + cth_strlen +||||||| +||||||| +||||||| +||||||| +-- magic - vers flags +||||||| | | | | +||||||| +------+------+------+------+ ++---------| 0xcf | 0xf1 | 0x02 | 0x00 | + |||||| +------+------+------+------+ + |||||| 0 1 2 3 4 + |||||| + |||||| + parent label + objects + |||||| | + parent name | + functions + strings + |||||| | | + label | | + types | + strlen + |||||| | | | | | | | | + |||||| +------+------+------+------+------+-------+-------+-------+ + +--------| 0x00 | 0x00 | 0x00 | 0x08 | 0x36 | 0x110 | 0x5f4 | 0x611 | + ||||| +------+------+------+------+------+-------+-------+-------+ + ||||| 0x04 0x08 0x0c 0x10 0x14 0x18 0x1c 0x20 0x24 + ||||| + ||||| + Label name + ||||| | + Label type + ||||| | | + Next label + ||||| | | | + ||||| +-------+------+-----+ + +-----------| 0x01 | 0x42 | ... | + |||| +-------+------+-----+ + |||| cth_lbloff +0x4 +0x8 cth_objtoff + |||| + |||| + |||| Symidx 0t15 0t43 0t44 + |||| +------+------+------+-----+ + +----------| 0x00 | 0x42 | 0x36 | ... | + ||| +------+------+------+-----+ + ||| cth_objtoff +0x2 +0x4 +0x6 cth_funcoff + ||| + ||| + CTF_TYPE_INFO + CTF_TYPE_INFO + ||| | + Return type | + ||| | | + arg0 | + ||| +--------+------+------+-----+ + +---------| 0x2c10 | 0x08 | 0x0c | ... | + || +--------+------+------+-----+ + || cth_funcff +0x2 +0x4 +0x6 cth_typeoff + || + || + ctf_stype_t for type 1 + || | integer + integer encoding + || | | + ctf_stype_t for type 2 + || | | | + || +--------------------+-----------+-----+ + +--------| 0x19 * 0xc01 * 0x0 | 0x1000000 | ... | + | +--------------------+-----------+-----+ + | cth_typeoff +0x08 +0x0c cth_stroff + | + | +--- str 0 + | | +--- str 1 + str 2 + | | | | + | v v v + | +----+---+---+---+----+---+---+---+---+---+----+ + +---| \\0 | i | n | t | \\0 | f | o | o | _ | t | \\0 | + +----+---+---+---+----+---+---+---+---+---+----+ + 0 1 2 3 4 5 6 7 8 9 10 11 +.Ed +.Lp +Every +.Nm +file begins with a +.Sy preamble , +followed by a +.Sy header . +The +.Sy preamble +is defined as follows: +.Bd -literal +typedef struct ctf_preamble { + ushort_t ctp_magic; /* magic number (CTF_MAGIC) */ + uchar_t ctp_version; /* data format version number (CTF_VERSION) */ + uchar_t ctp_flags; /* flags (see below) */ +} ctf_preamble_t; +.Ed +.Pp +The +.Sy preamble +is four bytes long and must be four byte aligned. +This +.Sy preamble +defines the version of the +.Nm +file which defines the format of the rest of the header. While the +header may change in subsequent versions, the preamble will not change +across versions, though the interpretation of its flags may change from +version to version. The +.Em ctp_magic +member defines the magic number for the +.Nm +file format. This must always be +.Li 0xcff1 . +If another value is encountered, then the file should not be treated as +a +.Nm +file. The +.Em ctp_version +member defines the version of the +.Nm +file. The current version is +.Li 2 . +It is possible to encounter an unsupported version. In that case, +software should not try to parse the format, as it may have changed. +Finally, the +.Em ctp_flags +member describes aspects of the file which modify its interpretation. +The following flags are currently defined: +.Bd -literal +#define CTF_F_COMPRESS 0x01 +.Ed +.Pp +The flag +.Sy CTF_F_COMPRESS +indicates that the body of the +.Nm +file, all the data following the +.Sy header , +has been compressed through the +.Sy zlib +library and its +.Sy deflate +algorithm. If this flag is not present, then the body has not been +compressed and no special action is needed to interpret it. All offsets +into the data as described by +.Sy header , +always refer to the +.Sy uncompressed +data. +.Lp +In version two of the +.Nm +file format, the +.Sy header +denotes whether whether or not this +.Nm +file is the child of another +.Nm +file and also indicates the size of the remaining sections. The +structure for the +.Sy header , +logically contains a copy of the +.Sy preamble +and the two have a combined size of 36 bytes. +.Bd -literal +typedef struct ctf_header { + ctf_preamble_t cth_preamble; + uint_t cth_parlabel; /* ref to name of parent lbl uniq'd against */ + uint_t cth_parname; /* ref to basename of parent */ + uint_t cth_lbloff; /* offset of label section */ + uint_t cth_objtoff; /* offset of object section */ + uint_t cth_funcoff; /* offset of function section */ + uint_t cth_typeoff; /* offset of type section */ + uint_t cth_stroff; /* offset of string section */ + uint_t cth_strlen; /* length of string section in bytes */ +} ctf_header_t; +.Ed +.Pp +After the +.Sy preamble , +the next two members +.Em cth_parlablel +and +.Em cth_parname , +are used to identify the parent. The value of both members are offsets +into the +.Sy string +section which point to the start of a null-terminated string. For more +information on the encoding of strings, see the subsection on +.Sx String Identifiers . +If the value of either is zero, then there is no entry for that +member. If the member +.Em cth_parlabel +is set, then the +.Em ctf_parname +member must be set, otherwise it will not be possible to find the +parent. If +.Em ctf_parname +is set, it is not necessary to define +.Em cth_parlabel , +as the parent may not have a label. For more information on labels +and their interpretation, see +.Sx The Label Section . +.Lp +The remaining members (excepting +.Em cth_strlen ) +describe the beginning of the corresponding sections. These offsets are +relative to the end of the +.Sy header . +Therefore, something with an offset of 0 is at an offset of thirty-six +bytes relative to the start of the +.Nm +file. The difference between members +indicates the size of the section itself. Different offsets have +different alignment requirements. The start of the +.Em cth_objotoff +and +.Em cth_funcoff +must be two byte aligned, while the sections +.Em cth_lbloff +and +.Em cth_typeoff +must be four-byte aligned. The section +.Em cth_stroff +has no alignment requirements. To calculate the size of a given section, +excepting the +.Sy string +section, one should subtract the offset of the section from the following one. For +example, the size of the +.Sy types +section can be calculated by subtracting +.Em cth_stroff +from +.Em cth_typeoff . +.Lp +Finally, the member +.Em cth_strlen +describes the length of the string section itself. From it, you can also +calculate the size of the entire +.Nm +file by adding together the size of the +.Sy ctf_header_t , +the offset of the string section in +.Em cth_stroff , +and the size of the string section in +.Em cth_srlen . +.Ss Type Identifiers +Through the +.Nm ctf +data, types are referred to by identifiers. A given +.Nm +file supports up to 32767 (0x7fff) types. The first valid type identifier is 0x1. +When a given +.Nm +file is a child, indicated by a non-zero entry for the +.Sy header Ns 's +.Em cth_parname , +then the first valid type identifier is 0x8000 and the last is 0xffff. +In this case, type identifiers 0x1 through 0x7fff are references to the +parent. +.Lp +The type identifier zero is a sentinel value used to indicate that there +is no type information available or it is an unknown type. +.Lp +Throughout the file format, the identifier is stored in different sized +values; however, the minimum size to represent a given identifier is a +.Sy uint16_t . +Other consumers of +.Nm +information may use larger or opaque identifiers. +.Ss String Identifiers +String identifiers are always encoded as four byte unsigned integers +which are an offset into a string table. The +.Nm +format supports two different string tables which have an identifier of +zero or one. This identifier is stored in the high-order bit of the +unsigned four byte offset. Therefore, the maximum supported offset into +one of these tables is 0x7ffffffff. +.Lp +Table identifier zero, always refers to the +.Sy string +section in the CTF file itself. String table identifier one refers to an +external string table which is the ELF string table for the ELF symbol +table associated with the +.Nm +container. +.Ss Type Encoding +Every +.Nm +type begins with metadata encoded into a +.Sy uint16_t . +This encoded information tells us three different pieces of information: +.Bl -bullet -offset indent -compact +.It +The kind of the type +.It +Whether this type is a root type or not +.It +The length of the variable data +.El +.Lp +The 16 bits that make up the encoding are broken down such that you have +five bits for the kind, one bit for indicating whether or not it is a +root type, and 10 bits for the variable length. This is laid out as +follows: +.Bd -literal -offset indent ++--------------------+ +| kind | root | vlen | ++--------------------+ +15 11 10 9 0 +.Ed +.Lp +The current version of the file format defines 14 different kinds. The +interpretation of these different kinds will be discussed in the section +.Sx The Type Section . +If a kind is encountered that is not listed below, then it is not a valid +.Nm +file. The kinds are defined as follows: +.Bd -literal -offset indent +#define CTF_K_UNKNOWN 0 +#define CTF_K_INTEGER 1 +#define CTF_K_FLOAT 2 +#define CTF_K_POINTER 3 +#define CTF_K_ARRAY 4 +#define CTF_K_FUNCTION 5 +#define CTF_K_STRUCT 6 +#define CTF_K_UNION 7 +#define CTF_K_ENUM 8 +#define CTF_K_FORWARD 9 +#define CTF_K_TYPEDEF 10 +#define CTF_K_VOLATILE 11 +#define CTF_K_CONST 12 +#define CTF_K_RESTRICT 13 +.Ed +.Lp +Programs directly reference many types; however, other types are referenced +indirectly because they are part of some other structure. These types that are +referenced directly and used are called +.Sy root +types. Other types may be used indirectly, for example, a program may reference +a structure directly, but not one of its members which has a type. That type is +not considered a +.Sy root +type. If a type is a +.Sy root +type, then it will have bit 10 set. +.Lp +The variable length section is specific to each kind and is discussed in the +section +.Sx The Type Section . +.Lp +The following macros are useful for constructing and deconstructing the encoded +type information: +.Bd -literal -offset indent + +#define CTF_MAX_VLEN 0x3ff +#define CTF_INFO_KIND(info) (((info) & 0xf800) >> 11) +#define CTF_INFO_ISROOT(info) (((info) & 0x0400) >> 10) +#define CTF_INFO_VLEN(info) (((info) & CTF_MAX_VLEN)) + +#define CTF_TYPE_INFO(kind, isroot, vlen) \\ + (((kind) << 11) | (((isroot) ? 1 : 0) << 10) | ((vlen) & CTF_MAX_VLEN)) +.Ed +.Ss The Label Section +When consuming +.Nm +data, it is often useful to know whether two different +.Nm +containers come from the same source base and version. For example, when +building illumos, there are many kernel modules that are built against a +single collection of source code. A label is encoded into the +.Nm +files that corresponds with the particular build. This ensures that if +files on the system were to become mixed up from multiple releases, that +they are not used together by tools, particularly when a child needs to +refer to a type in the parent. Because they are linked used the type +identifiers, if the wrong parent is used then the wrong type will be +encountered. +.Lp +Each label is encoded in the file format using the following eight byte +structure: +.Bd -literal +typedef struct ctf_lblent { + uint_t ctl_label; /* ref to name of label */ + uint_t ctl_typeidx; /* last type associated with this label */ +} ctf_lblent_t; +.Ed +.Lp +Each label has two different components, a name and a type identifier. +The name is encoded in the +.Em ctl_label +member which is in the format defined in the section +.Sx String Identifiers . +Generally, the names of all labels are found in the internal string +section. +.Lp +The type identifier encoded in the member +.Em ctl_typeidx +refers to the last type identifier that a label refers to in the current +file. Labels only refer to types in the current file, if the +.Nm +file is a child, then it will have the same label as its parent; +however, its label will only refer to its types, not its parents. +.Lp +It is also possible, though rather uncommon, for a +.Nm +file to have multiple labels. Labels are placed one after another, every +eight bytes. When multiple labels are present, types may only belong to +a single label. +.Ss The Object Section +The object section provides a mapping from ELF symbols of type +.Sy STT_OBJECT +in the symbol table to a type identifier. Every entry in this section is +a +.Sy uint16_t +which contains a type identifier as described in the section +.Sx Type Identifiers . +If there is no information for an object, then the type identifier 0x0 +is stored for that entry. +.Lp +To walk the object section, you need to have a corresponding +.Sy symbol table +in the ELF object that contains the +.Nm +data. Not every object is included in this section. Specifically, when +walking the symbol table. An entry is skipped if it matches any of the +following conditions: +.Lp +.Bl -bullet -offset indent -compact +.It +The symbol type is not +.Sy STT_OBJECT +.It +The symbol's section index is +.Sy SHN_UNDEF +.It +The symbol's name offset is zero +.It +The symbol's section index is +.Sy SHN_ABS +and the value of the symbol is zero. +.It +The symbol's name is +.Li _START_ +or +.Li _END_ . +These are skipped because they are used for scoping local symbols in +ELF. +.El +.Lp +The following sample code shows an example of iterating the object +section and skipping the correct symbols: +.Bd -literal +#include +#include + +/* + * Given the start of the object section in the CTF file, the number of symbols, + * and the ELF Data sections for the symbol table and the string table, this + * prints the type identifiers that correspond to objects. Note, a more robust + * implementation should ensure that they don't walk beyond the end of the CTF + * object section. + */ +static int +walk_symbols(uint16_t *objtoff, Elf_Data *symdata, Elf_Data *strdata, + long nsyms) +{ + long i; + uintptr_t strbase = strdata->d_buf; + + for (i = 1; i < nsyms; i++, objftoff++) { + const char *name; + GElf_Sym sym; + + if (gelf_getsym(symdata, i, &sym) == NULL) + return (1); + + if (GELF_ST_TYPE(sym.st_info) != STT_OBJECT) + continue; + if (sym.st_shndx == SHN_UNDEF || sym.st_name == 0) + continue; + if (sym.st_shndx == SHN_ABS && sym.st_value == 0) + continue; + name = (const char *)(strbase + sym.st_name); + if (strcmp(name, "_START_") == 0 || strcmp(name, "_END_") == 0) + continue; + + (void) printf("Symbol %d has type %d\n", i, *objtoff); + } + + return (0); +} +.Ed +.Ss The Function Section +The function section of the +.Nm +file encodes the types of both the function's arguments and the function's +return type. Similar to +.Sx The Object Section , +the function section encodes information for all symbols of type +.Sy STT_FUNCTION , +excepting those that fit specific criteria. Unlike with objects, because +functions have a variable number of arguments, they start with a type encoding +as defined in +.Sx Type Encoding , +which is the size of a +.Sy uint16_t . +For functions which have no type information available, they are encoded as +.Li CTF_TYPE_INFO(CTF_K_UNKNOWN, 0, 0) . +Functions with arguments are encoded differently. Here, the variable length is +turned into the number of arguments in the function. If a function is a +.Sy varargs +type function, then the number of arguments is increased by one. Functions with +type information are encoded as: +.Li CTF_TYPE_INFO(CTF_K_FUNCTION, 0, nargs) . +.Lp +For functions that have no type information, nothing else is encoded, and the +next function is encoded. For functions with type information, the next +.Sy uint16_t +is encoded with the type identifier of the return type of the function. It is +followed by each of the type identifiers of the arguments, if any exist, in the +order that they appear in the function. Therefore, argument 0 is the first type +identifier and so on. When a function has a final varargs argument, that is +encoded with the type identifier of zero. +.Lp +Like +.Sx The Object Section , +the function section is encoded in the order of the symbol table. It has +similar, but slightly different considerations from objects. While iterating the +symbol table, if any of the following conditions are true, then the entry is +skipped and no corresponding entry is written: +.Lp +.Bl -bullet -offset indent -compact +.It +The symbol type is not +.Sy STT_FUNCTION +.It +The symbol's section index is +.Sy SHN_UNDEF +.It +The symbol's name offset is zero +.It +The symbol's name is +.Li _START_ +or +.Li _END_ . +These are skipped because they are used for scoping local symbols in +ELF. +.El +.Ss The Type Section +The type section is the heart of the +.Nm +data. It encodes all of the information about the types themselves. The base of +the type information comes in two forms, a short form and a long form, each of +which may be followed by a variable number of arguments. The following +definitions describe the short and long forms: +.Bd -literal +#define CTF_MAX_SIZE 0xfffe /* max size of a type in bytes */ +#define CTF_LSIZE_SENT 0xffff /* sentinel for ctt_size */ +#define CTF_MAX_LSIZE UINT64_MAX + +typedef struct ctf_stype { + uint_t ctt_name; /* reference to name in string table */ + ushort_t ctt_info; /* encoded kind, variant length */ + union { + ushort_t _size; /* size of entire type in bytes */ + ushort_t _type; /* reference to another type */ + } _u; +} ctf_stype_t; + +typedef struct ctf_type { + uint_t ctt_name; /* reference to name in string table */ + ushort_t ctt_info; /* encoded kind, variant length */ + union { + ushort_t _size; /* always CTF_LSIZE_SENT */ + ushort_t _type; /* do not use */ + } _u; + uint_t ctt_lsizehi; /* high 32 bits of type size in bytes */ + uint_t ctt_lsizelo; /* low 32 bits of type size in bytes */ +} ctf_type_t; + +#define ctt_size _u._size /* for fundamental types that have a size */ +#define ctt_type _u._type /* for types that reference another type */ +.Ed +.Pp +Type sizes are stored in +.Sy bytes . +The basic small form uses a +.Sy ushort_t +to store the number of bytes. If the number of bytes in a structure would exceed +0xfffe, then the alternate form, the +.Sy ctf_type_t , +is used instead. To indicate that the larger form is being used, the member +.Em ctt_size +is set to value of +.Sy CTF_LSIZE_SENT +(0xffff). In general, when going through the type section, consumers use the +.Sy ctf_type_t +structure, but pay attention to the value of the member +.Em ctt_size +to determine whether they should increment their scan by the size of the +.Sy ctf_stype_t +or +.Sy ctf_type_t . +Not all kinds of types use +.Sy ctt_size . +Those which do not, will always use the +.Sy ctf_stype_t +structure. The individual sections for each kind have more information. +.Lp +Types are written out in order. Therefore the first entry encountered has a type +id of 0x1, or 0x8000 if a child. The member +.Em ctt_name +is encoded as described in the section +.Sx String Identifiers . +The string that it points to is the name of the type. If the identifier points +to an empty string (one that consists solely of a null terminator) then the type +does not have a name, this is common with anonymous structures and unions that +only have a typedef to name them, as well as, pointers and qualifiers. +.Lp +The next member, the +.Em ctt_info , +is encoded as described in the section +.Sx Type Encoding . +The types kind tells us how to interpret the remaining data in the +.Sy ctf_type_t +and any variable length data that may exist. The rest of this section will be +broken down into the interpretation of the various kinds. +.Ss Encoding of Integers +Integers, which are of type +.Sy CTF_K_INTEGER , +have no variable length arguments. Instead, they are followed by a four byte +.Sy uint_t +which describes their encoding. All integers must be encoded with a variable +length of zero. The +.Em ctt_size +member describes the length of the integer in bytes. In general, integer sizes +will be rounded up to the closest power of two. +.Lp +The integer encoding contains three different pieces of information: +.Bl -bullet -offset indent -compact +.It +The encoding of the integer +.It +The offset in +.Sy bits +of the type +.It +The size in +.Sy bits +of the type +.El +.Pp +This encoding can be expressed through the following macros: +.Bd -literal -offset indent +#define CTF_INT_ENCODING(data) (((data) & 0xff000000) >> 24) +#define CTF_INT_OFFSET(data) (((data) & 0x00ff0000) >> 16) +#define CTF_INT_BITS(data) (((data) & 0x0000ffff)) + +#define CTF_INT_DATA(encoding, offset, bits) \\ + (((encoding) << 24) | ((offset) << 16) | (bits)) +.Ed +.Pp +The following flags are defined for the encoding at this time: +.Bd -literal -offset indent +#define CTF_INT_SIGNED 0x01 +#define CTF_INT_CHAR 0x02 +#define CTF_INT_BOOL 0x04 +#define CTF_INT_VARARGS 0x08 +.Ed +.Lp +By default, an integer is considered to be unsigned, unless it has the +.Sy CTF_INT_SIGNED +flag set. If the flag +.Sy CTF_INT_CHAR +is set, that indicates that the integer is of a type that stores character +data, for example the intrinsic C type +.Sy char +would have the +.Sy CTF_INT_CHAR +flag set. If the flag +.Sy CTF_INT_BOOL +is set, that indicates that the integer represents a boolean type. For example, +the intrinsic C type +.Sy _Bool +would have the +.Sy CTF_INT_BOOL +flag set. Finally, the flag +.Sy CTF_INT_VARARGS +indicates that the integer is used as part of a variable number of arguments. +This encoding is rather uncommon. +.Ss Encoding of Floats +Floats, which are of type +.Sy CTF_K_FLOAT , +are similar to their integer counterparts. They have no variable length +arguments and are followed by a four byte encoding which describes the kind of +float that exists. The +.Em ctt_size +member is the size, in bytes, of the float. The float encoding has three +different pieces of information inside of it: +.Lp +.Bl -bullet -offset indent -compact +.It +The specific kind of float that exists +.It +The offset in +.Sy bits +of the float +.It +The size in +.Sy bits +of the float +.El +.Lp +This encoding can be expressed through the following macros: +.Bd -literal -offset indent +#define CTF_FP_ENCODING(data) (((data) & 0xff000000) >> 24) +#define CTF_FP_OFFSET(data) (((data) & 0x00ff0000) >> 16) +#define CTF_FP_BITS(data) (((data) & 0x0000ffff)) + +#define CTF_FP_DATA(encoding, offset, bits) \\ + (((encoding) << 24) | ((offset) << 16) | (bits)) +.Ed +.Lp +Where as the encoding for integers was a series of flags, the encoding for +floats maps to a specific kind of float. It is not a flag-based value. The kinds of floats +correspond to both their size, and the encoding. This covers all of the basic C +intrinsic floating point types. The following are the different kinds of floats +represented in the encoding: +.Bd -literal -offset indent +#define CTF_FP_SINGLE 1 /* IEEE 32-bit float encoding */ +#define CTF_FP_DOUBLE 2 /* IEEE 64-bit float encoding */ +#define CTF_FP_CPLX 3 /* Complex encoding */ +#define CTF_FP_DCPLX 4 /* Double complex encoding */ +#define CTF_FP_LDCPLX 5 /* Long double complex encoding */ +#define CTF_FP_LDOUBLE 6 /* Long double encoding */ +#define CTF_FP_INTRVL 7 /* Interval (2x32-bit) encoding */ +#define CTF_FP_DINTRVL 8 /* Double interval (2x64-bit) encoding */ +#define CTF_FP_LDINTRVL 9 /* Long double interval (2x128-bit) encoding */ +#define CTF_FP_IMAGRY 10 /* Imaginary (32-bit) encoding */ +#define CTF_FP_DIMAGRY 11 /* Long imaginary (64-bit) encoding */ +#define CTF_FP_LDIMAGRY 12 /* Long double imaginary (128-bit) encoding */ +.Ed +.Ss Encoding of Arrays +Arrays, which are of type +.Sy CTF_K_ARRAY , +have no variable length arguments. They are followed by a structure which +describes the number of elements in the array, the type identifier of the +elements in the array, and the type identifier of the index of the array. With +arrays, the +.Em ctt_size +member is set to zero. The structure that follows an array is defined as: +.Bd -literal +typedef struct ctf_array { + ushort_t cta_contents; /* reference to type of array contents */ + ushort_t cta_index; /* reference to type of array index */ + uint_t cta_nelems; /* number of elements */ +} ctf_array_t; +.Ed +.Lp +The +.Em cta_contents +and +.Em cta_index +members of the +.Sy ctf_array_t +are type identifiers which are encoded as per the section +.Sx Type Identifiers . +The member +.Em cta_nelems +is a simple four byte unsigned count of the number of elements. This count may +be zero when encountering C99's flexible array members. +.Ss Encoding of Functions +Function types, which are of type +.Sy CTF_K_FUNCTION , +use the variable length list to be the number of arguments in the function. When +the function has a final member which is a varargs, then the argument count is +incremented by one to account for the variable argument. Here, the +.Em ctt_type +member is encoded with the type identifier of the return type of the function. +Note that the +.Em ctt_size +member is not used here. +.Lp +The variable argument list contains the type identifiers for the arguments of +the function, if any. Each one is represented by a +.Sy uint16_t +and encoded according to the +.Sx Type Identifiers +section. If the function's last argument is of type varargs, then it is also +written out, but the type identifier is zero. This is included in the count of +the function's arguments. +.Ss Encoding of Structures and Unions +Structures and Unions, which are encoded with +.Sy CTF_K_STRUCT +and +.Sy CTF_K_UNION +respectively, are very similar constructs in C. The main difference +between them is the fact that every member of a structure follows one another, +where as in a union, all members share the same memory. They are also very +similar in terms of their encoding in +.Nm . +The variable length argument for structures and unions represents the number of +members that they have. The value of the member +.Em ctt_size +is the size of the structure and union. There are two different structures which +are used to encode members in the variable list. When the size of a structure or +union is greater than or equal to the large member threshold, 8192, then a +different structure is used to encode the member, all members are encoded using +the same structure. The structure for members is as follows: +.Bd -literal +typedef struct ctf_member { + uint_t ctm_name; /* reference to name in string table */ + ushort_t ctm_type; /* reference to type of member */ + ushort_t ctm_offset; /* offset of this member in bits */ +} ctf_member_t; + +typedef struct ctf_lmember { + uint_t ctlm_name; /* reference to name in string table */ + ushort_t ctlm_type; /* reference to type of member */ + ushort_t ctlm_pad; /* padding */ + uint_t ctlm_offsethi; /* high 32 bits of member offset in bits */ + uint_t ctlm_offsetlo; /* low 32 bits of member offset in bits */ +} ctf_lmember_t; +.Ed +.Lp +Both the +.Em ctm_name +and +.Em ctlm_name +refer to the name of the member. The name is encoded as an offset into the +string table as described by the section +.Sx String Identifiers . +The members +.Sy ctm_type +and +.Sy ctlm_type +both refer to the type of the member. They are encoded as per the section +.Sx Type Identifiers . +.Lp +The last piece of information that is present is the offset which describes the +offset in memory that the member begins at. For unions, this value will always +be zero because the start of unions in memory is always zero. For structures, +this is the offset in +.Sy bits +that the member begins at. Note that a compiler may lay out a type with padding. +This means that the difference in offset between two consecutive members may be +larger than the size of the member. When the size of the overall structure is +strictly less than 8192 bytes, the normal structure, +.Sy ctf_member_t , +is used and the offset in bits is stored in the member +.Em ctm_offset . +However, when the size of the structure is greater than or equal to 8192 bytes, +then the number of bits is split into two 32-bit quantities. One member, +.Em ctlm_offsethi , +represents the upper 32 bits of the offset, while the other member, +.Em ctlm_offsetlo , +represents the lower 32 bits of the offset. These can be joined together to get +a 64-bit sized offset in bits by shifting the member +.Em ctlm_offsethi +to the left by thirty two and then doing a binary or of +.Em ctlm_offsetlo . +.Ss Encoding of Enumerations +Enumerations, noted by the type *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From jkim at FreeBSD.org Wed Oct 15 17:33:03 2014 From: jkim at FreeBSD.org (Jung-uk Kim) Date: Wed, 15 Oct 2014 17:32:58 +0000 (UTC) Subject: svn commit: r273138 - in vendor-crypto/openssl/dist: . apps crypto crypto/aes/asm crypto/asn1 crypto/bn crypto/bn/asm crypto/dsa crypto/ec crypto/evp crypto/md5/asm crypto/modes crypto/ocsp crypto/... Message-ID: <201410151732.s9FHWwtv061031@svn.freebsd.org> Author: jkim Date: Wed Oct 15 17:32:57 2014 New Revision: 273138 URL: https://svnweb.freebsd.org/changeset/base/273138 Log: Import OpenSSL 1.0.1j. Added: vendor-crypto/openssl/dist/crypto/constant_time_locl.h (contents, props changed) vendor-crypto/openssl/dist/crypto/constant_time_test.c (contents, props changed) vendor-crypto/openssl/dist/doc/apps/c_rehash.pod vendor-crypto/openssl/dist/doc/crypto/CMS_add1_signer.pod Deleted: vendor-crypto/openssl/dist/doc/crypto/CMS_sign_add1_signer.pod Modified: vendor-crypto/openssl/dist/CHANGES vendor-crypto/openssl/dist/Configure vendor-crypto/openssl/dist/FREEBSD-upgrade vendor-crypto/openssl/dist/Makefile vendor-crypto/openssl/dist/NEWS vendor-crypto/openssl/dist/README vendor-crypto/openssl/dist/apps/s_client.c vendor-crypto/openssl/dist/crypto/Makefile vendor-crypto/openssl/dist/crypto/aes/asm/aesni-x86_64.pl vendor-crypto/openssl/dist/crypto/asn1/a_strex.c vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-gcc.c vendor-crypto/openssl/dist/crypto/bn/bn_exp.c vendor-crypto/openssl/dist/crypto/bn/bn_nist.c vendor-crypto/openssl/dist/crypto/bn/exptest.c vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c vendor-crypto/openssl/dist/crypto/ebcdic.h vendor-crypto/openssl/dist/crypto/ec/ec.h vendor-crypto/openssl/dist/crypto/ec/ec2_smpl.c vendor-crypto/openssl/dist/crypto/ec/ec_ameth.c vendor-crypto/openssl/dist/crypto/ec/ec_asn1.c vendor-crypto/openssl/dist/crypto/ec/ecp_mont.c vendor-crypto/openssl/dist/crypto/ec/ecp_nist.c vendor-crypto/openssl/dist/crypto/ec/ecp_smpl.c vendor-crypto/openssl/dist/crypto/ec/ectest.c vendor-crypto/openssl/dist/crypto/evp/Makefile vendor-crypto/openssl/dist/crypto/evp/e_aes.c vendor-crypto/openssl/dist/crypto/evp/evp_enc.c vendor-crypto/openssl/dist/crypto/md5/asm/md5-x86_64.pl vendor-crypto/openssl/dist/crypto/modes/modes.h vendor-crypto/openssl/dist/crypto/ocsp/ocsp_vfy.c vendor-crypto/openssl/dist/crypto/opensslconf.h vendor-crypto/openssl/dist/crypto/opensslv.h vendor-crypto/openssl/dist/crypto/ossl_typ.h vendor-crypto/openssl/dist/crypto/pkcs7/pkcs7.h vendor-crypto/openssl/dist/crypto/pqueue/pqueue.h vendor-crypto/openssl/dist/crypto/rsa/Makefile vendor-crypto/openssl/dist/crypto/rsa/rsa.h vendor-crypto/openssl/dist/crypto/rsa/rsa_err.c vendor-crypto/openssl/dist/crypto/rsa/rsa_oaep.c vendor-crypto/openssl/dist/crypto/rsa/rsa_pk1.c vendor-crypto/openssl/dist/crypto/rsa/rsa_sign.c vendor-crypto/openssl/dist/crypto/stack/safestack.h vendor-crypto/openssl/dist/doc/apps/dgst.pod vendor-crypto/openssl/dist/doc/crypto/BIO_s_accept.pod vendor-crypto/openssl/dist/doc/crypto/EVP_DigestInit.pod vendor-crypto/openssl/dist/doc/crypto/EVP_DigestVerifyInit.pod vendor-crypto/openssl/dist/doc/crypto/EVP_EncryptInit.pod vendor-crypto/openssl/dist/doc/crypto/EVP_PKEY_set1_RSA.pod vendor-crypto/openssl/dist/doc/crypto/EVP_PKEY_sign.pod vendor-crypto/openssl/dist/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod vendor-crypto/openssl/dist/e_os.h vendor-crypto/openssl/dist/ssl/Makefile vendor-crypto/openssl/dist/ssl/d1_both.c vendor-crypto/openssl/dist/ssl/d1_lib.c vendor-crypto/openssl/dist/ssl/d1_srtp.c vendor-crypto/openssl/dist/ssl/dtls1.h vendor-crypto/openssl/dist/ssl/s23_clnt.c vendor-crypto/openssl/dist/ssl/s23_srvr.c vendor-crypto/openssl/dist/ssl/s2_lib.c vendor-crypto/openssl/dist/ssl/s3_cbc.c vendor-crypto/openssl/dist/ssl/s3_clnt.c vendor-crypto/openssl/dist/ssl/s3_enc.c vendor-crypto/openssl/dist/ssl/s3_lib.c vendor-crypto/openssl/dist/ssl/s3_pkt.c vendor-crypto/openssl/dist/ssl/s3_srvr.c vendor-crypto/openssl/dist/ssl/srtp.h vendor-crypto/openssl/dist/ssl/ssl.h vendor-crypto/openssl/dist/ssl/ssl3.h vendor-crypto/openssl/dist/ssl/ssl_err.c vendor-crypto/openssl/dist/ssl/ssl_lib.c vendor-crypto/openssl/dist/ssl/t1_enc.c vendor-crypto/openssl/dist/ssl/t1_lib.c vendor-crypto/openssl/dist/ssl/tls1.h vendor-crypto/openssl/dist/util/mk1mf.pl vendor-crypto/openssl/dist/util/mkdef.pl vendor-crypto/openssl/dist/util/ssleay.num Modified: vendor-crypto/openssl/dist/CHANGES ============================================================================== --- vendor-crypto/openssl/dist/CHANGES Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/CHANGES Wed Oct 15 17:32:57 2014 (r273138) @@ -2,6 +2,57 @@ OpenSSL CHANGES _______________ + Changes between 1.0.1i and 1.0.1j [15 Oct 2014] + + *) SRTP Memory Leak. + + A flaw in the DTLS SRTP extension parsing code allows an attacker, who + sends a carefully crafted handshake message, to cause OpenSSL to fail + to free up to 64k of memory causing a memory leak. This could be + exploited in a Denial Of Service attack. This issue affects OpenSSL + 1.0.1 server implementations for both SSL/TLS and DTLS regardless of + whether SRTP is used or configured. Implementations of OpenSSL that + have been compiled with OPENSSL_NO_SRTP defined are not affected. + + The fix was developed by the OpenSSL team. + (CVE-2014-3513) + [OpenSSL team] + + *) Session Ticket Memory Leak. + + When an OpenSSL SSL/TLS/DTLS server receives a session ticket the + integrity of that ticket is first verified. In the event of a session + ticket integrity check failing, OpenSSL will fail to free memory + causing a memory leak. By sending a large number of invalid session + tickets an attacker could exploit this issue in a Denial Of Service + attack. + (CVE-2014-3567) + [Steve Henson] + + *) Build option no-ssl3 is incomplete. + + When OpenSSL is configured with "no-ssl3" as a build option, servers + could accept and complete a SSL 3.0 handshake, and clients could be + configured to send them. + (CVE-2014-3568) + [Akamai and the OpenSSL team] + + *) Add support for TLS_FALLBACK_SCSV. + Client applications doing fallback retries should call + SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV). + (CVE-2014-3566) + [Adam Langley, Bodo Moeller] + + *) Add additional DigestInfo checks. + + Reencode DigestInto in DER and check against the original when + verifying RSA signature: this will reject any improperly encoded + DigestInfo structures. + + Note: this is a precautionary measure and no attacks are currently known. + + [Steve Henson] + Changes between 1.0.1h and 1.0.1i [6 Aug 2014] *) Fix SRP buffer overrun vulnerability. Invalid parameters passed to the Modified: vendor-crypto/openssl/dist/Configure ============================================================================== --- vendor-crypto/openssl/dist/Configure Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/Configure Wed Oct 15 17:32:57 2014 (r273138) @@ -1767,6 +1767,9 @@ open(OUT,'>crypto/opensslconf.h.new') || print OUT "/* opensslconf.h */\n"; print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n"; +print OUT "#ifdef __cplusplus\n"; +print OUT "extern \"C\" {\n"; +print OUT "#endif\n"; print OUT "/* OpenSSL was configured with the following options: */\n"; my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; $openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg; @@ -1871,6 +1874,9 @@ while () { print OUT $_; } } close(IN); +print OUT "#ifdef __cplusplus\n"; +print OUT "}\n"; +print OUT "#endif\n"; close(OUT); rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h"; rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n"; Modified: vendor-crypto/openssl/dist/FREEBSD-upgrade ============================================================================== --- vendor-crypto/openssl/dist/FREEBSD-upgrade Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/FREEBSD-upgrade Wed Oct 15 17:32:57 2014 (r273138) @@ -11,8 +11,8 @@ First, read http://wiki.freebsd.org/Subv # Xlist setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist setenv FSVN "svn+ssh://svn.freebsd.org/base" -setenv OSSLVER 1.0.1i -# OSSLTAG format: v1_0_1i +setenv OSSLVER 1.0.1j +# OSSLTAG format: v1_0_1j ###setenv OSSLTAG v`echo ${OSSLVER} | tr . _` Modified: vendor-crypto/openssl/dist/Makefile ============================================================================== --- vendor-crypto/openssl/dist/Makefile Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/Makefile Wed Oct 15 17:32:57 2014 (r273138) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.1i +VERSION=1.0.1j MAJOR=1 MINOR=0.1 SHLIB_VERSION_NUMBER=1.0.0 Modified: vendor-crypto/openssl/dist/NEWS ============================================================================== --- vendor-crypto/openssl/dist/NEWS Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/NEWS Wed Oct 15 17:32:57 2014 (r273138) @@ -5,6 +5,13 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014] + + o Fix for CVE-2014-3513 + o Fix for CVE-2014-3567 + o Mitigation for CVE-2014-3566 (SSL protocol vulnerability) + o Fix for CVE-2014-3568 + Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014] o Fix for CVE-2014-3512 Modified: vendor-crypto/openssl/dist/README ============================================================================== --- vendor-crypto/openssl/dist/README Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/README Wed Oct 15 17:32:57 2014 (r273138) @@ -1,5 +1,5 @@ - OpenSSL 1.0.1i 6 Aug 2014 + OpenSSL 1.0.1j 15 Oct 2014 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: vendor-crypto/openssl/dist/apps/s_client.c ============================================================================== --- vendor-crypto/openssl/dist/apps/s_client.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/apps/s_client.c Wed Oct 15 17:32:57 2014 (r273138) @@ -337,6 +337,7 @@ static void sc_usage(void) BIO_printf(bio_err," -tls1_1 - just use TLSv1.1\n"); BIO_printf(bio_err," -tls1 - just use TLSv1\n"); BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); + BIO_printf(bio_err," -fallback_scsv - send TLS_FALLBACK_SCSV\n"); BIO_printf(bio_err," -mtu - set the link layer MTU\n"); BIO_printf(bio_err," -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n"); @@ -617,6 +618,7 @@ int MAIN(int argc, char **argv) char *sess_out = NULL; struct sockaddr peer; int peerlen = sizeof(peer); + int fallback_scsv = 0; int enable_timeouts = 0 ; long socket_mtu = 0; #ifndef OPENSSL_NO_JPAKE @@ -823,6 +825,10 @@ int MAIN(int argc, char **argv) meth=DTLSv1_client_method(); socket_type=SOCK_DGRAM; } + else if (strcmp(*argv,"-fallback_scsv") == 0) + { + fallback_scsv = 1; + } else if (strcmp(*argv,"-timeout") == 0) enable_timeouts=1; else if (strcmp(*argv,"-mtu") == 0) @@ -1235,6 +1241,10 @@ bad: SSL_set_session(con, sess); SSL_SESSION_free(sess); } + + if (fallback_scsv) + SSL_set_mode(con, SSL_MODE_SEND_FALLBACK_SCSV); + #ifndef OPENSSL_NO_TLSEXT if (servername != NULL) { Modified: vendor-crypto/openssl/dist/crypto/Makefile ============================================================================== --- vendor-crypto/openssl/dist/crypto/Makefile Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/Makefile Wed Oct 15 17:32:57 2014 (r273138) @@ -31,6 +31,7 @@ CPUID_OBJ=mem_clr.o LIBS= GENERAL=Makefile README crypto-lib.com install.com +TEST=constant_time_test.c LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) @@ -43,7 +44,8 @@ SRC= $(LIBSRC) EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ ossl_typ.h -HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER) +HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h \ + constant_time_locl.h $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) Modified: vendor-crypto/openssl/dist/crypto/aes/asm/aesni-x86_64.pl ============================================================================== --- vendor-crypto/openssl/dist/crypto/aes/asm/aesni-x86_64.pl Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/aes/asm/aesni-x86_64.pl Wed Oct 15 17:32:57 2014 (r273138) @@ -525,6 +525,16 @@ $code.=<<___; .type aesni_ecb_encrypt,\@function,5 .align 16 aesni_ecb_encrypt: +___ +$code.=<<___ if ($win64); + lea -0x58(%rsp),%rsp + movaps %xmm6,(%rsp) + movaps %xmm7,0x10(%rsp) + movaps %xmm8,0x20(%rsp) + movaps %xmm9,0x30(%rsp) +.Lecb_enc_body: +___ +$code.=<<___; and \$-16,$len jz .Lecb_ret @@ -805,6 +815,16 @@ $code.=<<___; movups $inout5,0x50($out) .Lecb_ret: +___ +$code.=<<___ if ($win64); + movaps (%rsp),%xmm6 + movaps 0x10(%rsp),%xmm7 + movaps 0x20(%rsp),%xmm8 + movaps 0x30(%rsp),%xmm9 + lea 0x58(%rsp),%rsp +.Lecb_enc_ret: +___ +$code.=<<___; ret .size aesni_ecb_encrypt,.-aesni_ecb_encrypt ___ @@ -2730,28 +2750,9 @@ $code.=<<___; .extern __imp_RtlVirtualUnwind ___ $code.=<<___ if ($PREFIX eq "aesni"); -.type ecb_se_handler,\@abi-omnipotent -.align 16 -ecb_se_handler: - push %rsi - push %rdi - push %rbx - push %rbp - push %r12 - push %r13 - push %r14 - push %r15 - pushfq - sub \$64,%rsp - - mov 152($context),%rax # pull context->Rsp - - jmp .Lcommon_seh_tail -.size ecb_se_handler,.-ecb_se_handler - -.type ccm64_se_handler,\@abi-omnipotent +.type ecb_ccm64_se_handler,\@abi-omnipotent .align 16 -ccm64_se_handler: +ecb_ccm64_se_handler: push %rsi push %rdi push %rbx @@ -2788,7 +2789,7 @@ ccm64_se_handler: lea 0x58(%rax),%rax # adjust stack pointer jmp .Lcommon_seh_tail -.size ccm64_se_handler,.-ccm64_se_handler +.size ecb_ccm64_se_handler,.-ecb_ccm64_se_handler .type ctr32_se_handler,\@abi-omnipotent .align 16 @@ -2993,14 +2994,15 @@ ___ $code.=<<___ if ($PREFIX eq "aesni"); .LSEH_info_ecb: .byte 9,0,0,0 - .rva ecb_se_handler + .rva ecb_ccm64_se_handler + .rva .Lecb_enc_body,.Lecb_enc_ret # HandlerData[] .LSEH_info_ccm64_enc: .byte 9,0,0,0 - .rva ccm64_se_handler + .rva ecb_ccm64_se_handler .rva .Lccm64_enc_body,.Lccm64_enc_ret # HandlerData[] .LSEH_info_ccm64_dec: .byte 9,0,0,0 - .rva ccm64_se_handler + .rva ecb_ccm64_se_handler .rva .Lccm64_dec_body,.Lccm64_dec_ret # HandlerData[] .LSEH_info_ctr32: .byte 9,0,0,0 Modified: vendor-crypto/openssl/dist/crypto/asn1/a_strex.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/asn1/a_strex.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/asn1/a_strex.c Wed Oct 15 17:32:57 2014 (r273138) @@ -568,6 +568,7 @@ int ASN1_STRING_to_UTF8(unsigned char ** mbflag |= MBSTRING_FLAG; stmp.data = NULL; stmp.length = 0; + stmp.flags = 0; ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING); if(ret < 0) return ret; *out = stmp.data; Modified: vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-gcc.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-gcc.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-gcc.c Wed Oct 15 17:32:57 2014 (r273138) @@ -189,7 +189,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".p2align 4 \n" "1: movq (%4,%2,8),%0 \n" @@ -200,7 +200,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; @@ -212,7 +212,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".p2align 4 \n" "1: movq (%4,%2,8),%0 \n" @@ -223,7 +223,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; Modified: vendor-crypto/openssl/dist/crypto/bn/bn_exp.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_exp.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/bn/bn_exp.c Wed Oct 15 17:32:57 2014 (r273138) @@ -874,7 +874,14 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ bits = BN_num_bits(p); if (bits == 0) { - ret = BN_one(rr); + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) + { + ret = 1; + BN_zero(rr); + } + else + ret = BN_one(rr); return ret; } if (a == 0) Modified: vendor-crypto/openssl/dist/crypto/bn/bn_nist.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/bn_nist.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/bn/bn_nist.c Wed Oct 15 17:32:57 2014 (r273138) @@ -1088,9 +1088,9 @@ int BN_nist_mod_521(BIGNUM *r, const BIG /* ... and right shift */ for (val=t_d[0],i=0; i>BN_NIST_521_RSHIFT; - val = t_d[i+1]; - t_d[i] = (tmp | val<>BN_NIST_521_RSHIFT | + (tmp=t_d[i+1])<>BN_NIST_521_RSHIFT; /* lower 521 bits */ Modified: vendor-crypto/openssl/dist/crypto/bn/exptest.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/bn/exptest.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/bn/exptest.c Wed Oct 15 17:32:57 2014 (r273138) @@ -71,6 +71,43 @@ static const char rnd_seed[] = "string to make the random number generator think it has entropy"; +/* test_exp_mod_zero tests that x**0 mod 1 == 0. It returns zero on success. */ +static int test_exp_mod_zero() { + BIGNUM a, p, m; + BIGNUM r; + BN_CTX *ctx = BN_CTX_new(); + int ret = 1; + + BN_init(&m); + BN_one(&m); + + BN_init(&a); + BN_one(&a); + + BN_init(&p); + BN_zero(&p); + + BN_init(&r); + BN_mod_exp(&r, &a, &p, &m, ctx); + BN_CTX_free(ctx); + + if (BN_is_zero(&r)) + ret = 0; + else + { + printf("1**0 mod 1 = "); + BN_print_fp(stdout, &r); + printf(", should be 0\n"); + } + + BN_free(&r); + BN_free(&a); + BN_free(&p); + BN_free(&m); + + return ret; +} + int main(int argc, char *argv[]) { BN_CTX *ctx; @@ -190,7 +227,13 @@ int main(int argc, char *argv[]) ERR_remove_thread_state(NULL); CRYPTO_mem_leaks(out); BIO_free(out); - printf(" done\n"); + printf("\n"); + + if (test_exp_mod_zero() != 0) + goto err; + + printf("done\n"); + EXIT(0); err: ERR_load_crypto_strings(); Added: vendor-crypto/openssl/dist/crypto/constant_time_locl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-crypto/openssl/dist/crypto/constant_time_locl.h Wed Oct 15 17:32:57 2014 (r273138) @@ -0,0 +1,216 @@ +/* crypto/constant_time_locl.h */ +/* + * Utilities for constant-time cryptography. + * + * Author: Emilia Kasper (emilia at openssl.org) + * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley + * (Google). + * ==================================================================== + * Copyright (c) 2014 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay at cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +#ifndef HEADER_CONSTANT_TIME_LOCL_H +#define HEADER_CONSTANT_TIME_LOCL_H + +#include "e_os.h" /* For 'inline' */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * The boolean methods return a bitmask of all ones (0xff...f) for true + * and 0 for false. This is useful for choosing a value based on the result + * of a conditional in constant time. For example, + * + * if (a < b) { + * c = a; + * } else { + * c = b; + * } + * + * can be written as + * + * unsigned int lt = constant_time_lt(a, b); + * c = constant_time_select(lt, a, b); + */ + +/* + * Returns the given value with the MSB copied to all the other + * bits. Uses the fact that arithmetic shift shifts-in the sign bit. + * However, this is not ensured by the C standard so you may need to + * replace this with something else on odd CPUs. + */ +static inline unsigned int constant_time_msb(unsigned int a); + +/* + * Returns 0xff..f if a < b and 0 otherwise. + */ +static inline unsigned int constant_time_lt(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b); + +/* + * Returns 0xff..f if a >= b and 0 otherwise. + */ +static inline unsigned int constant_time_ge(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b); + +/* + * Returns 0xff..f if a == 0 and 0 otherwise. + */ +static inline unsigned int constant_time_is_zero(unsigned int a); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_is_zero_8(unsigned int a); + + +/* + * Returns 0xff..f if a == b and 0 otherwise. + */ +static inline unsigned int constant_time_eq(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b); +/* Signed integers. */ +static inline unsigned int constant_time_eq_int(int a, int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_eq_int_8(int a, int b); + + +/* + * Returns (mask & a) | (~mask & b). + * + * When |mask| is all 1s or all 0s (as returned by the methods above), + * the select methods return either |a| (if |mask| is nonzero) or |b| + * (if |mask| is zero). + */ +static inline unsigned int constant_time_select(unsigned int mask, + unsigned int a, unsigned int b); +/* Convenience method for unsigned chars. */ +static inline unsigned char constant_time_select_8(unsigned char mask, + unsigned char a, unsigned char b); +/* Convenience method for signed integers. */ +static inline int constant_time_select_int(unsigned int mask, int a, int b); + +static inline unsigned int constant_time_msb(unsigned int a) + { + return (unsigned int)((int)(a) >> (sizeof(int) * 8 - 1)); + } + +static inline unsigned int constant_time_lt(unsigned int a, unsigned int b) + { + unsigned int lt; + /* Case 1: msb(a) == msb(b). a < b iff the MSB of a - b is set.*/ + lt = ~(a ^ b) & (a - b); + /* Case 2: msb(a) != msb(b). a < b iff the MSB of b is set. */ + lt |= ~a & b; + return constant_time_msb(lt); + } + +static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_lt(a, b)); + } + +static inline unsigned int constant_time_ge(unsigned int a, unsigned int b) + { + unsigned int ge; + /* Case 1: msb(a) == msb(b). a >= b iff the MSB of a - b is not set.*/ + ge = ~((a ^ b) | (a - b)); + /* Case 2: msb(a) != msb(b). a >= b iff the MSB of a is set. */ + ge |= a & ~b; + return constant_time_msb(ge); + } + +static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_ge(a, b)); + } + +static inline unsigned int constant_time_is_zero(unsigned int a) + { + return constant_time_msb(~a & (a - 1)); + } + +static inline unsigned char constant_time_is_zero_8(unsigned int a) + { + return (unsigned char)(constant_time_is_zero(a)); + } + +static inline unsigned int constant_time_eq(unsigned int a, unsigned int b) + { + return constant_time_is_zero(a ^ b); + } + +static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_eq(a, b)); + } + +static inline unsigned int constant_time_eq_int(int a, int b) + { + return constant_time_eq((unsigned)(a), (unsigned)(b)); + } + +static inline unsigned char constant_time_eq_int_8(int a, int b) + { + return constant_time_eq_8((unsigned)(a), (unsigned)(b)); + } + +static inline unsigned int constant_time_select(unsigned int mask, + unsigned int a, unsigned int b) + { + return (mask & a) | (~mask & b); + } + +static inline unsigned char constant_time_select_8(unsigned char mask, + unsigned char a, unsigned char b) + { + return (unsigned char)(constant_time_select(mask, a, b)); + } + +inline int constant_time_select_int(unsigned int mask, int a, int b) + { + return (int)(constant_time_select(mask, (unsigned)(a), (unsigned)(b))); + } + +#ifdef __cplusplus +} +#endif + +#endif /* HEADER_CONSTANT_TIME_LOCL_H */ Added: vendor-crypto/openssl/dist/crypto/constant_time_test.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-crypto/openssl/dist/crypto/constant_time_test.c Wed Oct 15 17:32:57 2014 (r273138) @@ -0,0 +1,330 @@ +/* crypto/constant_time_test.c */ +/* + * Utilities for constant-time cryptography. + * + * Author: Emilia Kasper (emilia at openssl.org) + * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley + * (Google). + * ==================================================================== + * Copyright (c) 2014 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay at cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +#include "../crypto/constant_time_locl.h" + +#include +#include +#include + +static const unsigned int CONSTTIME_TRUE = (unsigned)(~0); +static const unsigned int CONSTTIME_FALSE = 0; +static const unsigned char CONSTTIME_TRUE_8 = 0xff; +static const unsigned char CONSTTIME_FALSE_8 = 0; + +static int test_binary_op(unsigned int (*op)(unsigned int a, unsigned int b), + const char* op_name, unsigned int a, unsigned int b, int is_true) + { + unsigned c = op(a, b); + if (is_true && c != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %du " + "(TRUE), got %du\n", op_name, a, b, CONSTTIME_TRUE, c); + return 1; + } + else if (!is_true && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %du " + "(FALSE), got %du\n", op_name, a, b, CONSTTIME_FALSE, + c); + return 1; + } + return 0; + } + +static int test_binary_op_8(unsigned char (*op)(unsigned int a, unsigned int b), + const char* op_name, unsigned int a, unsigned int b, int is_true) + { + unsigned char c = op(a, b); + if (is_true && c != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %u " + "(TRUE), got %u\n", op_name, a, b, CONSTTIME_TRUE_8, c); + return 1; + } + else if (!is_true && c != CONSTTIME_FALSE_8) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %u " + "(FALSE), got %u\n", op_name, a, b, CONSTTIME_FALSE_8, + c); + return 1; + } + return 0; + } + +static int test_is_zero(unsigned int a) + { + unsigned int c = constant_time_is_zero(a); + if (a == 0 && c != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %du (TRUE), got %du\n", a, CONSTTIME_TRUE, c); + return 1; + } + else if (a != 0 && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %du (FALSE), got %du\n", a, CONSTTIME_FALSE, + c); + return 1; + } + return 0; + } + +static int test_is_zero_8(unsigned int a) + { + unsigned char c = constant_time_is_zero_8(a); + if (a == 0 && c != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %u (TRUE), got %u\n", a, CONSTTIME_TRUE_8, c); + return 1; + } + else if (a != 0 && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %u (FALSE), got %u\n", a, CONSTTIME_FALSE_8, + c); + return 1; + } + return 0; + } + +static int test_select(unsigned int a, unsigned int b) + { + unsigned int selected = constant_time_select(CONSTTIME_TRUE, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %du," + "%du): expected %du(first value), got %du\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select(CONSTTIME_FALSE, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %du," + "%du): expected %du(second value), got %du\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_select_8(unsigned char a, unsigned char b) + { + unsigned char selected = constant_time_select_8(CONSTTIME_TRUE_8, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%u, %u," + "%u): expected %u(first value), got %u\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select_8(CONSTTIME_FALSE_8, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%u, %u," + "%u): expected %u(second value), got %u\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_select_int(int a, int b) + { + int selected = constant_time_select_int(CONSTTIME_TRUE, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %d," + "%d): expected %d(first value), got %d\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select_int(CONSTTIME_FALSE, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %d," + "%d): expected %d(second value), got %d\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_eq_int(int a, int b) + { + unsigned int equal = constant_time_eq_int(a, b); + if (a == b && equal != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): " + "expected %du(TRUE), got %du\n", + a, b, CONSTTIME_TRUE, equal); + return 1; + } + else if (a != b && equal != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): " + "expected %du(FALSE), got %du\n", + a, b, CONSTTIME_FALSE, equal); + return 1; + } + return 0; + } + +static int test_eq_int_8(int a, int b) + { + unsigned char equal = constant_time_eq_int_8(a, b); + if (a == b && equal != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): " + "expected %u(TRUE), got %u\n", + a, b, CONSTTIME_TRUE_8, equal); + return 1; + } + else if (a != b && equal != CONSTTIME_FALSE_8) + { + fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): " + "expected %u(FALSE), got %u\n", + a, b, CONSTTIME_FALSE_8, equal); + return 1; + } + return 0; + } + +static unsigned int test_values[] = {0, 1, 1024, 12345, 32000, UINT_MAX/2-1, + UINT_MAX/2, UINT_MAX/2+1, UINT_MAX-1, + UINT_MAX}; + +static unsigned char test_values_8[] = {0, 1, 2, 20, 32, 127, 128, 129, 255}; + +static int signed_test_values[] = {0, 1, -1, 1024, -1024, 12345, -12345, + 32000, -32000, INT_MAX, INT_MIN, INT_MAX-1, + INT_MIN+1}; + + +int main(int argc, char *argv[]) + { + unsigned int a, b, i, j; + int c, d; + unsigned char e, f; + int num_failed = 0, num_all = 0; + fprintf(stdout, "Testing constant time operations...\n"); + + for (i = 0; i < sizeof(test_values)/sizeof(int); ++i) + { + a = test_values[i]; + num_failed += test_is_zero(a); + num_failed += test_is_zero_8(a); + num_all += 2; + for (j = 0; j < sizeof(test_values)/sizeof(int); ++j) + { + b = test_values[j]; + num_failed += test_binary_op(&constant_time_lt, + "constant_time_lt", a, b, a < b); + num_failed += test_binary_op_8(&constant_time_lt_8, + "constant_time_lt_8", a, b, a < b); + num_failed += test_binary_op(&constant_time_lt, + "constant_time_lt_8", b, a, b < a); + num_failed += test_binary_op_8(&constant_time_lt_8, + "constant_time_lt_8", b, a, b < a); + num_failed += test_binary_op(&constant_time_ge, + "constant_time_ge", a, b, a >= b); + num_failed += test_binary_op_8(&constant_time_ge_8, + "constant_time_ge_8", a, b, a >= b); + num_failed += test_binary_op(&constant_time_ge, + "constant_time_ge", b, a, b >= a); + num_failed += test_binary_op_8(&constant_time_ge_8, + "constant_time_ge_8", b, a, b >= a); + num_failed += test_binary_op(&constant_time_eq, + "constant_time_eq", a, b, a == b); + num_failed += test_binary_op_8(&constant_time_eq_8, + "constant_time_eq_8", a, b, a == b); + num_failed += test_binary_op(&constant_time_eq, + "constant_time_eq", b, a, b == a); + num_failed += test_binary_op_8(&constant_time_eq_8, + "constant_time_eq_8", b, a, b == a); + num_failed += test_select(a, b); + num_all += 13; + } + } + + for (i = 0; i < sizeof(signed_test_values)/sizeof(int); ++i) + { + c = signed_test_values[i]; + for (j = 0; j < sizeof(signed_test_values)/sizeof(int); ++j) + { + d = signed_test_values[j]; + num_failed += test_select_int(c, d); + num_failed += test_eq_int(c, d); + num_failed += test_eq_int_8(c, d); + num_all += 3; + } + } + + for (i = 0; i < sizeof(test_values_8); ++i) + { + e = test_values_8[i]; + for (j = 0; j < sizeof(test_values_8); ++j) + { + f = test_values_8[j]; + num_failed += test_select_8(e, f); + num_all += 1; + } + } + + if (!num_failed) + { + fprintf(stdout, "ok (ran %d tests)\n", num_all); + return EXIT_SUCCESS; + } + else + { + fprintf(stdout, "%d of %d tests failed!\n", num_failed, num_all); + return EXIT_FAILURE; + } + } Modified: vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c Wed Oct 15 16:54:18 2014 (r273137) +++ vendor-crypto/openssl/dist/crypto/dsa/dsa_ameth.c Wed Oct 15 17:32:57 2014 (r273138) @@ -307,6 +307,12 @@ static int dsa_priv_encode(PKCS8_PRIV_KE unsigned char *dp = NULL; int dplen; + if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key) + { + DSAerr(DSA_F_DSA_PRIV_ENCODE,DSA_R_MISSING_PARAMETERS); + goto err; + } + params = ASN1_STRING_new(); if (!params) @@ -701,4 +707,3 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meth old_dsa_priv_encode } }; - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From jkim at FreeBSD.org Wed Oct 15 17:33:50 2014 From: jkim at FreeBSD.org (Jung-uk Kim) Date: Wed, 15 Oct 2014 17:33:49 +0000 (UTC) Subject: svn commit: r273139 - vendor-crypto/openssl/1.0.1j Message-ID: <201410151733.s9FHXnCR061239@svn.freebsd.org> Author: jkim Date: Wed Oct 15 17:33:49 2014 New Revision: 273139 URL: https://svnweb.freebsd.org/changeset/base/273139 Log: Tag OpenSSL 1.0.1j. Added: vendor-crypto/openssl/1.0.1j/ - copied from r273138, vendor-crypto/openssl/dist/ From jkim at FreeBSD.org Wed Oct 15 17:35:45 2014 From: jkim at FreeBSD.org (Jung-uk Kim) Date: Wed, 15 Oct 2014 17:35:40 +0000 (UTC) Subject: svn commit: r273140 - in vendor-crypto/openssl/dist-0.9.8: . apps crypto crypto/bn crypto/bn/asm crypto/ec crypto/err crypto/evp crypto/rsa doc/apps doc/ssl ssl test Message-ID: <201410151735.s9FHZeT7061531@svn.freebsd.org> Author: jkim Date: Wed Oct 15 17:35:39 2014 New Revision: 273140 URL: https://svnweb.freebsd.org/changeset/base/273140 Log: Import OpenSSL 0.9.8zc. Added: vendor-crypto/openssl/dist-0.9.8/crypto/constant_time_locl.h (contents, props changed) vendor-crypto/openssl/dist-0.9.8/crypto/constant_time_test.c (contents, props changed) vendor-crypto/openssl/dist-0.9.8/test/constant_time_test.c (contents, props changed) Modified: vendor-crypto/openssl/dist-0.9.8/CHANGES vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade vendor-crypto/openssl/dist-0.9.8/Makefile vendor-crypto/openssl/dist-0.9.8/NEWS vendor-crypto/openssl/dist-0.9.8/README vendor-crypto/openssl/dist-0.9.8/apps/s_client.c vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_vms.c vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_win.c vendor-crypto/openssl/dist-0.9.8/crypto/Makefile vendor-crypto/openssl/dist-0.9.8/crypto/bn/asm/x86_64-gcc.c vendor-crypto/openssl/dist-0.9.8/crypto/bn/bn_exp.c vendor-crypto/openssl/dist-0.9.8/crypto/bn/exptest.c vendor-crypto/openssl/dist-0.9.8/crypto/ec/ec_key.c vendor-crypto/openssl/dist-0.9.8/crypto/ec/ecp_smpl.c vendor-crypto/openssl/dist-0.9.8/crypto/err/openssl.ec vendor-crypto/openssl/dist-0.9.8/crypto/evp/Makefile vendor-crypto/openssl/dist-0.9.8/crypto/evp/evp_enc.c vendor-crypto/openssl/dist-0.9.8/crypto/opensslv.h vendor-crypto/openssl/dist-0.9.8/crypto/rsa/Makefile vendor-crypto/openssl/dist-0.9.8/crypto/rsa/rsa.h vendor-crypto/openssl/dist-0.9.8/crypto/rsa/rsa_err.c vendor-crypto/openssl/dist-0.9.8/crypto/rsa/rsa_oaep.c vendor-crypto/openssl/dist-0.9.8/crypto/rsa/rsa_pk1.c vendor-crypto/openssl/dist-0.9.8/crypto/rsa/rsa_sign.c vendor-crypto/openssl/dist-0.9.8/doc/apps/s_client.pod vendor-crypto/openssl/dist-0.9.8/doc/ssl/SSL_CTX_set_mode.pod vendor-crypto/openssl/dist-0.9.8/e_os.h vendor-crypto/openssl/dist-0.9.8/openssl.spec vendor-crypto/openssl/dist-0.9.8/ssl/Makefile vendor-crypto/openssl/dist-0.9.8/ssl/d1_lib.c vendor-crypto/openssl/dist-0.9.8/ssl/dtls1.h vendor-crypto/openssl/dist-0.9.8/ssl/s23_clnt.c vendor-crypto/openssl/dist-0.9.8/ssl/s23_srvr.c vendor-crypto/openssl/dist-0.9.8/ssl/s2_lib.c vendor-crypto/openssl/dist-0.9.8/ssl/s3_cbc.c vendor-crypto/openssl/dist-0.9.8/ssl/s3_clnt.c vendor-crypto/openssl/dist-0.9.8/ssl/s3_enc.c vendor-crypto/openssl/dist-0.9.8/ssl/s3_lib.c vendor-crypto/openssl/dist-0.9.8/ssl/s3_pkt.c vendor-crypto/openssl/dist-0.9.8/ssl/s3_srvr.c vendor-crypto/openssl/dist-0.9.8/ssl/ssl.h vendor-crypto/openssl/dist-0.9.8/ssl/ssl3.h vendor-crypto/openssl/dist-0.9.8/ssl/ssl_err.c vendor-crypto/openssl/dist-0.9.8/ssl/ssl_lib.c vendor-crypto/openssl/dist-0.9.8/ssl/t1_enc.c vendor-crypto/openssl/dist-0.9.8/ssl/t1_lib.c vendor-crypto/openssl/dist-0.9.8/ssl/tls1.h vendor-crypto/openssl/dist-0.9.8/test/Makefile Modified: vendor-crypto/openssl/dist-0.9.8/CHANGES ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/CHANGES Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/CHANGES Wed Oct 15 17:35:39 2014 (r273140) @@ -2,6 +2,43 @@ OpenSSL CHANGES _______________ + Changes between 0.9.8zb and 0.9.8zc [15 Oct 2014] + + *) Session Ticket Memory Leak. + + When an OpenSSL SSL/TLS/DTLS server receives a session ticket the + integrity of that ticket is first verified. In the event of a session + ticket integrity check failing, OpenSSL will fail to free memory + causing a memory leak. By sending a large number of invalid session + tickets an attacker could exploit this issue in a Denial Of Service + attack. + (CVE-2014-3567) + [Steve Henson] + + *) Build option no-ssl3 is incomplete. + + When OpenSSL is configured with "no-ssl3" as a build option, servers + could accept and complete a SSL 3.0 handshake, and clients could be + configured to send them. + (CVE-2014-3568) + [Akamai and the OpenSSL team] + + *) Add support for TLS_FALLBACK_SCSV. + Client applications doing fallback retries should call + SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV). + (CVE-2014-3566) + [Adam Langley, Bodo Moeller] + + *) Add additional DigestInfo checks. + + Reencode DigestInto in DER and check against the original when + verifying RSA signature: this will reject any improperly encoded + DigestInfo structures. + + Note: this is a precautionary measure and no attacks are currently known. + + [Steve Henson] + Changes between 0.9.8za and 0.9.8zb [6 Aug 2014] *) OpenSSL DTLS clients enabling anonymous (EC)DH ciphersuites are subject Modified: vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Wed Oct 15 17:35:39 2014 (r273140) @@ -11,8 +11,8 @@ First, read http://wiki.freebsd.org/Subv # Xlist setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist setenv FSVN "svn+ssh://svn.freebsd.org/base" -setenv OSSLVER 0.9.8zb -# OSSLTAG format: v0_9_8zb +setenv OSSLVER 0.9.8zc +# OSSLTAG format: v0_9_8zc ###setenv OSSLTAG v`echo ${OSSLVER} | tr . _` Modified: vendor-crypto/openssl/dist-0.9.8/Makefile ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/Makefile Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/Makefile Wed Oct 15 17:35:39 2014 (r273140) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.8zb +VERSION=0.9.8zc MAJOR=0 MINOR=9.8 SHLIB_VERSION_NUMBER=0.9.8 Modified: vendor-crypto/openssl/dist-0.9.8/NEWS ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/NEWS Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/NEWS Wed Oct 15 17:35:39 2014 (r273140) @@ -5,6 +5,13 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 0.9.8zb and OpenSSL 0.9.8zc [15 Oct 2014]: + + o Fix for CVE-2014-3513 + o Fix for CVE-2014-3567 + o Mitigation for CVE-2014-3566 (SSL protocol vulnerability) + o Fix for CVE-2014-3568 + Major changes between OpenSSL 0.9.8za and OpenSSL 0.9.8zb [6 Aug 2014]: o Fix for CVE-2014-3510 Modified: vendor-crypto/openssl/dist-0.9.8/README ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/README Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/README Wed Oct 15 17:35:39 2014 (r273140) @@ -1,5 +1,5 @@ - OpenSSL 0.9.8zb 6 Aug 2014 + OpenSSL 0.9.8zc 15 Oct 2014 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: vendor-crypto/openssl/dist-0.9.8/apps/s_client.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/apps/s_client.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/apps/s_client.c Wed Oct 15 17:35:39 2014 (r273140) @@ -226,6 +226,7 @@ static void sc_usage(void) BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); BIO_printf(bio_err," -tls1 - just use TLSv1\n"); BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); + BIO_printf(bio_err," -fallback_scsv - send TLS_FALLBACK_SCSV\n"); BIO_printf(bio_err," -mtu - set the link layer MTU\n"); BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n"); @@ -339,6 +340,7 @@ int MAIN(int argc, char **argv) char *sess_out = NULL; struct sockaddr peer; int peerlen = sizeof(peer); + int fallback_scsv = 0; int enable_timeouts = 0 ; long socket_mtu = 0; #ifndef OPENSSL_NO_JPAKE @@ -488,6 +490,10 @@ int MAIN(int argc, char **argv) socket_mtu = atol(*(++argv)); } #endif + else if (strcmp(*argv,"-fallback_scsv") == 0) + { + fallback_scsv = 1; + } else if (strcmp(*argv,"-bugs") == 0) bugs=1; else if (strcmp(*argv,"-keyform") == 0) @@ -778,6 +784,10 @@ bad: SSL_set_session(con, sess); SSL_SESSION_free(sess); } + + if (fallback_scsv) + SSL_set_mode(con, SSL_MODE_SEND_FALLBACK_SCSV); + #ifndef OPENSSL_NO_TLSEXT if (servername != NULL) { Modified: vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_vms.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_vms.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_vms.c Wed Oct 15 17:35:39 2014 (r273140) @@ -1,4 +1,3 @@ -/* $LP: LPlib/source/LPdir_vms.c,v 1.20 2004/08/26 13:36:05 _cvs_levitte Exp $ */ /* * Copyright (c) 2004, Richard Levitte * All rights reserved. @@ -82,6 +81,12 @@ const char *LP_find_file(LP_DIR_CTX **ct size_t filespeclen = strlen(directory); char *filespec = NULL; + if (filespeclen == 0) + { + errno = ENOENT; + return 0; + } + /* MUST be a VMS directory specification! Let's estimate if it is. */ if (directory[filespeclen-1] != ']' && directory[filespeclen-1] != '>' Modified: vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_win.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_win.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/LPdir_win.c Wed Oct 15 17:35:39 2014 (r273140) @@ -1,4 +1,3 @@ -/* $LP: LPlib/source/LPdir_win.c,v 1.10 2004/08/26 13:36:05 _cvs_levitte Exp $ */ /* * Copyright (c) 2004, Richard Levitte * All rights reserved. @@ -65,6 +64,16 @@ const char *LP_find_file(LP_DIR_CTX **ct errno = 0; if (*ctx == NULL) { + const char *extdir = directory; + char *extdirbuf = NULL; + size_t dirlen = strlen (directory); + + if (dirlen == 0) + { + errno = ENOENT; + return 0; + } + *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX)); if (*ctx == NULL) { @@ -73,15 +82,35 @@ const char *LP_find_file(LP_DIR_CTX **ct } memset(*ctx, '\0', sizeof(LP_DIR_CTX)); + if (directory[dirlen-1] != '*') + { + extdirbuf = (char *)malloc(dirlen + 3); + if (extdirbuf == NULL) + { + free(*ctx); + *ctx = NULL; + errno = ENOMEM; + return 0; + } + if (directory[dirlen-1] != '/' && directory[dirlen-1] != '\\') + extdir = strcat(strcpy (extdirbuf,directory),"/*"); + else + extdir = strcat(strcpy (extdirbuf,directory),"*"); + } + if (sizeof(TCHAR) != sizeof(char)) { TCHAR *wdir = NULL; /* len_0 denotes string length *with* trailing 0 */ - size_t index = 0,len_0 = strlen(directory) + 1; + size_t index = 0,len_0 = strlen(extdir) + 1; - wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR)); + wdir = (TCHAR *)calloc(len_0, sizeof(TCHAR)); if (wdir == NULL) { + if (extdirbuf != NULL) + { + free (extdirbuf); + } free(*ctx); *ctx = NULL; errno = ENOMEM; @@ -89,17 +118,23 @@ const char *LP_find_file(LP_DIR_CTX **ct } #ifdef LP_MULTIBYTE_AVAILABLE - if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, (WCHAR *)wdir, len_0)) + if (!MultiByteToWideChar(CP_ACP, 0, extdir, len_0, (WCHAR *)wdir, len_0)) #endif for (index = 0; index < len_0; index++) - wdir[index] = (TCHAR)directory[index]; + wdir[index] = (TCHAR)extdir[index]; (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx); free(wdir); } else - (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx); + { + (*ctx)->handle = FindFirstFile((TCHAR *)extdir, &(*ctx)->ctx); + } + if (extdirbuf != NULL) + { + free (extdirbuf); + } if ((*ctx)->handle == INVALID_HANDLE_VALUE) { @@ -116,7 +151,6 @@ const char *LP_find_file(LP_DIR_CTX **ct return 0; } } - if (sizeof(TCHAR) != sizeof(char)) { TCHAR *wdir = (*ctx)->ctx.cFileName; Modified: vendor-crypto/openssl/dist-0.9.8/crypto/Makefile ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/Makefile Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/Makefile Wed Oct 15 17:35:39 2014 (r273140) @@ -30,6 +30,7 @@ AFLAGS=$(ASFLAGS) LIBS= GENERAL=Makefile README crypto-lib.com install.com +TEST=constant_time_test.c LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) Modified: vendor-crypto/openssl/dist-0.9.8/crypto/bn/asm/x86_64-gcc.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/bn/asm/x86_64-gcc.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/bn/asm/x86_64-gcc.c Wed Oct 15 17:35:39 2014 (r273140) @@ -185,7 +185,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".align 16 \n" "1: movq (%4,%2,8),%0 \n" @@ -196,7 +196,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; @@ -208,7 +208,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".align 16 \n" "1: movq (%4,%2,8),%0 \n" @@ -219,7 +219,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; Modified: vendor-crypto/openssl/dist-0.9.8/crypto/bn/bn_exp.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/bn/bn_exp.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/bn/bn_exp.c Wed Oct 15 17:35:39 2014 (r273140) @@ -767,7 +767,14 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ bits = BN_num_bits(p); if (bits == 0) { - ret = BN_one(rr); + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) + { + ret = 1; + BN_zero(rr); + } + else + ret = BN_one(rr); return ret; } if (a == 0) Modified: vendor-crypto/openssl/dist-0.9.8/crypto/bn/exptest.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/bn/exptest.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/bn/exptest.c Wed Oct 15 17:35:39 2014 (r273140) @@ -71,6 +71,43 @@ static const char rnd_seed[] = "string to make the random number generator think it has entropy"; +/* test_exp_mod_zero tests that x**0 mod 1 == 0. It returns zero on success. */ +static int test_exp_mod_zero() { + BIGNUM a, p, m; + BIGNUM r; + BN_CTX *ctx = BN_CTX_new(); + int ret = 1; + + BN_init(&m); + BN_one(&m); + + BN_init(&a); + BN_one(&a); + + BN_init(&p); + BN_zero(&p); + + BN_init(&r); + BN_mod_exp(&r, &a, &p, &m, ctx); + BN_CTX_free(ctx); + + if (BN_is_zero(&r)) + ret = 0; + else + { + printf("1**0 mod 1 = "); + BN_print_fp(stdout, &r); + printf(", should be 0\n"); + } + + BN_free(&r); + BN_free(&a); + BN_free(&p); + BN_free(&m); + + return ret; +} + int main(int argc, char *argv[]) { BN_CTX *ctx; @@ -190,7 +227,13 @@ int main(int argc, char *argv[]) ERR_remove_state(0); CRYPTO_mem_leaks(out); BIO_free(out); - printf(" done\n"); + printf("\n"); + + if (test_exp_mod_zero() != 0) + goto err; + + printf("done\n"); + EXIT(0); err: ERR_load_crypto_strings(); Added: vendor-crypto/openssl/dist-0.9.8/crypto/constant_time_locl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-crypto/openssl/dist-0.9.8/crypto/constant_time_locl.h Wed Oct 15 17:35:39 2014 (r273140) @@ -0,0 +1,216 @@ +/* crypto/constant_time_locl.h */ +/* + * Utilities for constant-time cryptography. + * + * Author: Emilia Kasper (emilia at openssl.org) + * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley + * (Google). + * ==================================================================== + * Copyright (c) 2014 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay at cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +#ifndef HEADER_CONSTANT_TIME_LOCL_H +#define HEADER_CONSTANT_TIME_LOCL_H + +#include "e_os.h" /* For 'inline' */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * The boolean methods return a bitmask of all ones (0xff...f) for true + * and 0 for false. This is useful for choosing a value based on the result + * of a conditional in constant time. For example, + * + * if (a < b) { + * c = a; + * } else { + * c = b; + * } + * + * can be written as + * + * unsigned int lt = constant_time_lt(a, b); + * c = constant_time_select(lt, a, b); + */ + +/* + * Returns the given value with the MSB copied to all the other + * bits. Uses the fact that arithmetic shift shifts-in the sign bit. + * However, this is not ensured by the C standard so you may need to + * replace this with something else on odd CPUs. + */ +static inline unsigned int constant_time_msb(unsigned int a); + +/* + * Returns 0xff..f if a < b and 0 otherwise. + */ +static inline unsigned int constant_time_lt(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b); + +/* + * Returns 0xff..f if a >= b and 0 otherwise. + */ +static inline unsigned int constant_time_ge(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b); + +/* + * Returns 0xff..f if a == 0 and 0 otherwise. + */ +static inline unsigned int constant_time_is_zero(unsigned int a); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_is_zero_8(unsigned int a); + + +/* + * Returns 0xff..f if a == b and 0 otherwise. + */ +static inline unsigned int constant_time_eq(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b); +/* Signed integers. */ +static inline unsigned int constant_time_eq_int(int a, int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_eq_int_8(int a, int b); + + +/* + * Returns (mask & a) | (~mask & b). + * + * When |mask| is all 1s or all 0s (as returned by the methods above), + * the select methods return either |a| (if |mask| is nonzero) or |b| + * (if |mask| is zero). + */ +static inline unsigned int constant_time_select(unsigned int mask, + unsigned int a, unsigned int b); +/* Convenience method for unsigned chars. */ +static inline unsigned char constant_time_select_8(unsigned char mask, + unsigned char a, unsigned char b); +/* Convenience method for signed integers. */ +static inline int constant_time_select_int(unsigned int mask, int a, int b); + +static inline unsigned int constant_time_msb(unsigned int a) + { + return (unsigned int)((int)(a) >> (sizeof(int) * 8 - 1)); + } + +static inline unsigned int constant_time_lt(unsigned int a, unsigned int b) + { + unsigned int lt; + /* Case 1: msb(a) == msb(b). a < b iff the MSB of a - b is set.*/ + lt = ~(a ^ b) & (a - b); + /* Case 2: msb(a) != msb(b). a < b iff the MSB of b is set. */ + lt |= ~a & b; + return constant_time_msb(lt); + } + +static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_lt(a, b)); + } + +static inline unsigned int constant_time_ge(unsigned int a, unsigned int b) + { + unsigned int ge; + /* Case 1: msb(a) == msb(b). a >= b iff the MSB of a - b is not set.*/ + ge = ~((a ^ b) | (a - b)); + /* Case 2: msb(a) != msb(b). a >= b iff the MSB of a is set. */ + ge |= a & ~b; + return constant_time_msb(ge); + } + +static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_ge(a, b)); + } + +static inline unsigned int constant_time_is_zero(unsigned int a) + { + return constant_time_msb(~a & (a - 1)); + } + +static inline unsigned char constant_time_is_zero_8(unsigned int a) + { + return (unsigned char)(constant_time_is_zero(a)); + } + +static inline unsigned int constant_time_eq(unsigned int a, unsigned int b) + { + return constant_time_is_zero(a ^ b); + } + +static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_eq(a, b)); + } + +static inline unsigned int constant_time_eq_int(int a, int b) + { + return constant_time_eq((unsigned)(a), (unsigned)(b)); + } + +static inline unsigned char constant_time_eq_int_8(int a, int b) + { + return constant_time_eq_8((unsigned)(a), (unsigned)(b)); + } + +static inline unsigned int constant_time_select(unsigned int mask, + unsigned int a, unsigned int b) + { + return (mask & a) | (~mask & b); + } + +static inline unsigned char constant_time_select_8(unsigned char mask, + unsigned char a, unsigned char b) + { + return (unsigned char)(constant_time_select(mask, a, b)); + } + +inline int constant_time_select_int(unsigned int mask, int a, int b) + { + return (int)(constant_time_select(mask, (unsigned)(a), (unsigned)(b))); + } + +#ifdef __cplusplus +} +#endif + +#endif /* HEADER_CONSTANT_TIME_LOCL_H */ Added: vendor-crypto/openssl/dist-0.9.8/crypto/constant_time_test.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-crypto/openssl/dist-0.9.8/crypto/constant_time_test.c Wed Oct 15 17:35:39 2014 (r273140) @@ -0,0 +1,330 @@ +/* crypto/constant_time_test.c */ +/* + * Utilities for constant-time cryptography. + * + * Author: Emilia Kasper (emilia at openssl.org) + * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley + * (Google). + * ==================================================================== + * Copyright (c) 2014 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay at cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +#include "../crypto/constant_time_locl.h" + +#include +#include +#include + +static const unsigned int CONSTTIME_TRUE = (unsigned)(~0); +static const unsigned int CONSTTIME_FALSE = 0; +static const unsigned char CONSTTIME_TRUE_8 = 0xff; +static const unsigned char CONSTTIME_FALSE_8 = 0; + +static int test_binary_op(unsigned int (*op)(unsigned int a, unsigned int b), + const char* op_name, unsigned int a, unsigned int b, int is_true) + { + unsigned c = op(a, b); + if (is_true && c != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %du " + "(TRUE), got %du\n", op_name, a, b, CONSTTIME_TRUE, c); + return 1; + } + else if (!is_true && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %du " + "(FALSE), got %du\n", op_name, a, b, CONSTTIME_FALSE, + c); + return 1; + } + return 0; + } + +static int test_binary_op_8(unsigned char (*op)(unsigned int a, unsigned int b), + const char* op_name, unsigned int a, unsigned int b, int is_true) + { + unsigned char c = op(a, b); + if (is_true && c != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %u " + "(TRUE), got %u\n", op_name, a, b, CONSTTIME_TRUE_8, c); + return 1; + } + else if (!is_true && c != CONSTTIME_FALSE_8) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %u " + "(FALSE), got %u\n", op_name, a, b, CONSTTIME_FALSE_8, + c); + return 1; + } + return 0; + } + +static int test_is_zero(unsigned int a) + { + unsigned int c = constant_time_is_zero(a); + if (a == 0 && c != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %du (TRUE), got %du\n", a, CONSTTIME_TRUE, c); + return 1; + } + else if (a != 0 && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %du (FALSE), got %du\n", a, CONSTTIME_FALSE, + c); + return 1; + } + return 0; + } + +static int test_is_zero_8(unsigned int a) + { + unsigned char c = constant_time_is_zero_8(a); + if (a == 0 && c != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %u (TRUE), got %u\n", a, CONSTTIME_TRUE_8, c); + return 1; + } + else if (a != 0 && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %u (FALSE), got %u\n", a, CONSTTIME_FALSE_8, + c); + return 1; + } + return 0; + } + +static int test_select(unsigned int a, unsigned int b) + { + unsigned int selected = constant_time_select(CONSTTIME_TRUE, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %du," + "%du): expected %du(first value), got %du\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select(CONSTTIME_FALSE, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %du," + "%du): expected %du(second value), got %du\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_select_8(unsigned char a, unsigned char b) + { + unsigned char selected = constant_time_select_8(CONSTTIME_TRUE_8, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%u, %u," + "%u): expected %u(first value), got %u\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select_8(CONSTTIME_FALSE_8, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%u, %u," + "%u): expected %u(second value), got %u\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_select_int(int a, int b) + { + int selected = constant_time_select_int(CONSTTIME_TRUE, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %d," + "%d): expected %d(first value), got %d\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select_int(CONSTTIME_FALSE, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %d," + "%d): expected %d(second value), got %d\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_eq_int(int a, int b) + { + unsigned int equal = constant_time_eq_int(a, b); + if (a == b && equal != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): " + "expected %du(TRUE), got %du\n", + a, b, CONSTTIME_TRUE, equal); + return 1; + } + else if (a != b && equal != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): " + "expected %du(FALSE), got %du\n", + a, b, CONSTTIME_FALSE, equal); + return 1; + } + return 0; + } + +static int test_eq_int_8(int a, int b) + { + unsigned char equal = constant_time_eq_int_8(a, b); + if (a == b && equal != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): " + "expected %u(TRUE), got %u\n", + a, b, CONSTTIME_TRUE_8, equal); + return 1; + } + else if (a != b && equal != CONSTTIME_FALSE_8) + { + fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): " + "expected %u(FALSE), got %u\n", + a, b, CONSTTIME_FALSE_8, equal); + return 1; + } + return 0; + } + +static unsigned int test_values[] = {0, 1, 1024, 12345, 32000, UINT_MAX/2-1, + UINT_MAX/2, UINT_MAX/2+1, UINT_MAX-1, + UINT_MAX}; + +static unsigned char test_values_8[] = {0, 1, 2, 20, 32, 127, 128, 129, 255}; + +static int signed_test_values[] = {0, 1, -1, 1024, -1024, 12345, -12345, + 32000, -32000, INT_MAX, INT_MIN, INT_MAX-1, + INT_MIN+1}; + + +int main(int argc, char *argv[]) + { + unsigned int a, b, i, j; + int c, d; + unsigned char e, f; + int num_failed = 0, num_all = 0; + fprintf(stdout, "Testing constant time operations...\n"); + + for (i = 0; i < sizeof(test_values)/sizeof(int); ++i) + { + a = test_values[i]; + num_failed += test_is_zero(a); + num_failed += test_is_zero_8(a); + num_all += 2; + for (j = 0; j < sizeof(test_values)/sizeof(int); ++j) + { + b = test_values[j]; + num_failed += test_binary_op(&constant_time_lt, + "constant_time_lt", a, b, a < b); + num_failed += test_binary_op_8(&constant_time_lt_8, + "constant_time_lt_8", a, b, a < b); + num_failed += test_binary_op(&constant_time_lt, + "constant_time_lt_8", b, a, b < a); + num_failed += test_binary_op_8(&constant_time_lt_8, + "constant_time_lt_8", b, a, b < a); + num_failed += test_binary_op(&constant_time_ge, + "constant_time_ge", a, b, a >= b); + num_failed += test_binary_op_8(&constant_time_ge_8, + "constant_time_ge_8", a, b, a >= b); + num_failed += test_binary_op(&constant_time_ge, + "constant_time_ge", b, a, b >= a); + num_failed += test_binary_op_8(&constant_time_ge_8, + "constant_time_ge_8", b, a, b >= a); + num_failed += test_binary_op(&constant_time_eq, + "constant_time_eq", a, b, a == b); + num_failed += test_binary_op_8(&constant_time_eq_8, + "constant_time_eq_8", a, b, a == b); + num_failed += test_binary_op(&constant_time_eq, + "constant_time_eq", b, a, b == a); + num_failed += test_binary_op_8(&constant_time_eq_8, + "constant_time_eq_8", b, a, b == a); + num_failed += test_select(a, b); + num_all += 13; + } + } + + for (i = 0; i < sizeof(signed_test_values)/sizeof(int); ++i) + { + c = signed_test_values[i]; + for (j = 0; j < sizeof(signed_test_values)/sizeof(int); ++j) + { + d = signed_test_values[j]; + num_failed += test_select_int(c, d); + num_failed += test_eq_int(c, d); + num_failed += test_eq_int_8(c, d); + num_all += 3; + } + } + + for (i = 0; i < sizeof(test_values_8); ++i) + { + e = test_values_8[i]; + for (j = 0; j < sizeof(test_values_8); ++j) + { + f = test_values_8[j]; + num_failed += test_select_8(e, f); + num_all += 1; + } + } + + if (!num_failed) + { + fprintf(stdout, "ok (ran %d tests)\n", num_all); + return EXIT_SUCCESS; + } + else + { + fprintf(stdout, "%d of %d tests failed!\n", num_failed, num_all); + return EXIT_FAILURE; + } + } Modified: vendor-crypto/openssl/dist-0.9.8/crypto/ec/ec_key.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/ec/ec_key.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/ec/ec_key.c Wed Oct 15 17:35:39 2014 (r273140) @@ -64,7 +64,6 @@ #include #include "ec_lcl.h" #include -#include EC_KEY *EC_KEY_new(void) { Modified: vendor-crypto/openssl/dist-0.9.8/crypto/ec/ecp_smpl.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/ec/ecp_smpl.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/ec/ecp_smpl.c Wed Oct 15 17:35:39 2014 (r273140) @@ -1676,8 +1676,8 @@ int ec_GFp_simple_points_make_affine(con { for (i = 0; i < num; i++) { - if (prod_Z[i] != NULL) - BN_clear_free(prod_Z[i]); + if (prod_Z[i] == NULL) break; + BN_clear_free(prod_Z[i]); } OPENSSL_free(prod_Z); } Modified: vendor-crypto/openssl/dist-0.9.8/crypto/err/openssl.ec ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/err/openssl.ec Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/err/openssl.ec Wed Oct 15 17:35:39 2014 (r273140) @@ -69,6 +69,7 @@ R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION 1070 R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 +R SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086 R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090 R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 R SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110 Modified: vendor-crypto/openssl/dist-0.9.8/crypto/evp/Makefile ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/evp/Makefile Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/evp/Makefile Wed Oct 15 17:35:39 2014 (r273140) @@ -385,7 +385,8 @@ evp_enc.o: ../../include/openssl/ossl_ty evp_enc.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h evp_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h evp_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -evp_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_enc.c evp_locl.h +evp_enc.o: ../../include/openssl/x509_vfy.h ../constant_time_locl.h +evp_enc.o: ../cryptlib.h evp_enc.c evp_locl.h evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h Modified: vendor-crypto/openssl/dist-0.9.8/crypto/evp/evp_enc.c ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/crypto/evp/evp_enc.c Wed Oct 15 17:33:49 2014 (r273139) +++ vendor-crypto/openssl/dist-0.9.8/crypto/evp/evp_enc.c Wed Oct 15 17:35:39 2014 (r273140) @@ -64,6 +64,7 @@ #ifndef OPENSSL_NO_ENGINE #include #endif +#include "../constant_time_locl.h" #include "evp_locl.h" #ifdef OPENSSL_FIPS @@ -301,11 +302,11 @@ int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) { - int i,n; - unsigned int b; + unsigned int i, b; + unsigned char pad, padding_good; *outl=0; - b=ctx->cipher->block_size; + b=(unsigned int)(ctx->cipher->block_size); if (ctx->flags & EVP_CIPH_NO_PADDING) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From jkim at FreeBSD.org Wed Oct 15 17:36:31 2014 From: jkim at FreeBSD.org (Jung-uk Kim) Date: Wed, 15 Oct 2014 17:36:31 +0000 (UTC) Subject: svn commit: r273141 - vendor-crypto/openssl/0.9.8zc Message-ID: <201410151736.s9FHaVsO061720@svn.freebsd.org> Author: jkim Date: Wed Oct 15 17:36:30 2014 New Revision: 273141 URL: https://svnweb.freebsd.org/changeset/base/273141 Log: Tag OpenSSL 0.9.8zc. Added: vendor-crypto/openssl/0.9.8zc/ - copied from r273140, vendor-crypto/openssl/dist-0.9.8/ From des at FreeBSD.org Sat Oct 18 22:49:19 2014 From: des at FreeBSD.org (Dag-Erling Smørgrav) Date: Sat, 18 Oct 2014 22:49:19 +0000 (UTC) Subject: svn commit: r273269 - vendor/openpam/dist/lib/libpam Message-ID: <201410182249.s9IMnJTh008434@svn.freebsd.org> Author: des Date: Sat Oct 18 22:49:18 2014 New Revision: 273269 URL: https://svnweb.freebsd.org/changeset/base/273269 Log: Merge upstream r825: fix line continuation in whitespace Modified: vendor/openpam/dist/lib/libpam/openpam_readword.c Modified: vendor/openpam/dist/lib/libpam/openpam_readword.c ============================================================================== --- vendor/openpam/dist/lib/libpam/openpam_readword.c Sat Oct 18 22:15:11 2014 (r273268) +++ vendor/openpam/dist/lib/libpam/openpam_readword.c Sat Oct 18 22:49:18 2014 (r273269) @@ -55,18 +55,35 @@ openpam_readword(FILE *f, int *lineno, s { char *word; size_t size, len; - int ch, comment, escape, quote; + int ch, escape, quote; int serrno; errno = 0; /* skip initial whitespace */ - comment = 0; - while ((ch = getc(f)) != EOF && ch != '\n') { - if (ch == '#') - comment = 1; - if (!is_lws(ch) && !comment) + escape = quote = 0; + while ((ch = getc(f)) != EOF) { + if (ch == '\n') { + /* either EOL or line continuation */ + if (!escape) + break; + if (lineno != NULL) + ++*lineno; + escape = 0; + } else if (escape) { + /* escaped something else */ + break; + } else if (ch == '#') { + /* comment: until EOL, no continuation */ + while ((ch = getc(f)) != EOF) + if (ch == '\n') + break; break; + } else if (ch == '\\') { + escape = 1; + } else if (!is_ws(ch)) { + break; + } } if (ch == EOF) return (NULL); @@ -76,7 +93,6 @@ openpam_readword(FILE *f, int *lineno, s word = NULL; size = len = 0; - escape = quote = 0; while ((ch = fgetc(f)) != EOF && (!is_ws(ch) || quote || escape)) { if (ch == '\\' && !escape && quote != '\'') { /* escape next character */ @@ -90,7 +106,7 @@ openpam_readword(FILE *f, int *lineno, s } else if (ch == quote && !escape) { /* end quote */ quote = 0; - } else if (ch == '\n' && escape && quote != '\'') { + } else if (ch == '\n' && escape) { /* line continuation */ escape = 0; } else { From delphij at FreeBSD.org Thu Oct 23 00:09:16 2014 From: delphij at FreeBSD.org (Xin LI) Date: Thu, 23 Oct 2014 00:09:16 +0000 (UTC) Subject: svn commit: r273492 - vendor/xz/dist/po Message-ID: <201410230009.s9N09Ght061073@svn.freebsd.org> Author: delphij Date: Thu Oct 23 00:09:16 2014 New Revision: 273492 URL: https://svnweb.freebsd.org/changeset/base/273492 Log: Remove gettext files as we don't enable NLS. Deleted: vendor/xz/dist/po/ From delphij at FreeBSD.org Thu Oct 23 00:33:26 2014 From: delphij at FreeBSD.org (Xin LI) Date: Thu, 23 Oct 2014 00:33:25 +0000 (UTC) Subject: svn commit: r273494 - in vendor/xz/dist: . src/liblzma/api/lzma src/liblzma/check src/liblzma/lzma src/xz Message-ID: <201410230033.s9N0XPT1074454@svn.freebsd.org> Author: delphij Date: Thu Oct 23 00:33:25 2014 New Revision: 273494 URL: https://svnweb.freebsd.org/changeset/base/273494 Log: Vendor import of xz 5.0.7. Modified: vendor/xz/dist/ChangeLog vendor/xz/dist/THANKS vendor/xz/dist/TODO vendor/xz/dist/src/liblzma/api/lzma/block.h vendor/xz/dist/src/liblzma/api/lzma/version.h vendor/xz/dist/src/liblzma/check/crc32_fast.c vendor/xz/dist/src/liblzma/check/sha256.c vendor/xz/dist/src/liblzma/lzma/lzma_encoder_presets.c vendor/xz/dist/src/xz/coder.c vendor/xz/dist/src/xz/signals.c vendor/xz/dist/src/xz/suffix.c Modified: vendor/xz/dist/ChangeLog ============================================================================== --- vendor/xz/dist/ChangeLog Thu Oct 23 00:31:26 2014 (r273493) +++ vendor/xz/dist/ChangeLog Thu Oct 23 00:33:25 2014 (r273494) @@ -1,6 +1,337 @@ +commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af +Author: Lasse Collin +Date: 2014-09-20 20:44:32 +0300 + + Bump version and soname for 5.0.7. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ac6c8921d1d8d2d749d5c97f9a0b0594cc863cea +Author: Lasse Collin +Date: 2014-09-20 20:43:29 +0300 + + Update NEWS for 5.0.7. + + NEWS | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit d1b0276aafd441a3d4db9dfd5dd9880e9f834d49 +Author: Lasse Collin +Date: 2014-09-20 20:21:18 +0300 + + liblzma: Fix invalid Libs.private value in liblzma.pc. + + src/liblzma/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cac72956b1e56788182ac14bfb25519636afd503 +Author: Lasse Collin +Date: 2014-09-20 19:42:56 +0300 + + liblzma: Fix a portability problem in Makefile.am. + + POSIX supports $< only in inference rules (suffix rules). + Using it elsewhere is a GNU make extension and doesn't + work e.g. with OpenBSD make. + + Thanks to Christian Weisgerber for the patch. + + src/liblzma/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2cdf0875dedca3e89b02ad5ac8aa1109f902ae11 +Author: Lasse Collin +Date: 2014-09-14 19:35:45 +0300 + + Bump version and soname for 5.0.6. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 0168b6c8fbc88cae61b1f5fb41d6c33c9e127967 +Author: Lasse Collin +Date: 2014-09-14 19:33:46 +0300 + + Update NEWS for 5.0.6. + + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 13337714e89d002af7af48d6853f977de985d7de +Author: Lasse Collin +Date: 2014-06-13 19:21:54 +0300 + + xzgrep: List xzgrep_expected_output in tests/Makefile.am. + + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ccc728d8290c0464c7af62790b1c5528eceaae35 +Author: Lasse Collin +Date: 2014-06-13 18:58:22 +0300 + + xzgrep: Improve the test script. + + Now it should be close to the functionality of the original + version by Pavel Raiskup. + + tests/Makefile.am | 3 ++- + tests/test_scripts.sh | 24 ++++++++++++++---------- + tests/xzgrep_expected_output | 39 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 11 deletions(-) + +commit 948f5865fe65061e215baa8ed63be570bae152ea +Author: Lasse Collin +Date: 2014-06-11 21:03:25 +0300 + + xzgrep: Add a test for the previous fix. + + This is a simplified version of Pavel Raiskup's + original patch. + + tests/test_scripts.sh | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +commit 64228d0d5cd75af31e5c330cc3a792016413fabf +Author: Lasse Collin +Date: 2014-06-11 20:43:28 +0300 + + xzgrep: exit 0 when at least one file matches. + + Mimic the original grep behavior and return exit_success when + at least one xz compressed file matches given pattern. + + Original bugreport: + https://bugzilla.redhat.com/show_bug.cgi?id=1108085 + + Thanks to Pavel Raiskup for the patch. + + src/scripts/xzgrep.in | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 98d3368ef4bff0face78d6932f2156730c8cb658 +Author: Lasse Collin +Date: 2014-04-25 17:53:42 +0300 + + Build: Fix the combination of --disable-xzdec --enable-lzmadec. + + In this case "make install" could fail if the man page directory + didn't already exist at the destination. If it did exist, a + dangling symlink was created there. Now the link is omitted + instead. This isn't the best fix but it's better than the old + behavior. + + src/xzdec/Makefile.am | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit ba3b5dd082db2cb5973e877a74221d739c663fb4 +Author: Lasse Collin +Date: 2014-04-25 17:44:26 +0300 + + Build: Add --disable-doc to configure. + + INSTALL | 6 ++++++ + Makefile.am | 2 ++ + configure.ac | 6 ++++++ + 3 files changed, 14 insertions(+) + +commit 3d4575f2367fe8f1f2dcacba014e6c0aef388535 +Author: Lasse Collin +Date: 2014-04-24 18:06:24 +0300 + + Update INSTALL. + + Add a note about failing "make check". The source of + the problem should be fixed in libtool (if it really is + a libtool bug and not mine) but I'm unable to spend time + on that for now. Thanks to Nelson H. F. Beebe for reporting + the issue. + + Add a note about a possible need to run "ldconfig" after + "make install". + + INSTALL | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit b9f0584e3eff421eadbb6604de0b0b40bf87e129 +Author: Lasse Collin +Date: 2014-04-09 17:26:10 +0300 + + xz: Rename a variable to avoid a namespace collision on Solaris. + + I don't know the details but I have an impression that there's + no problem in practice if using GCC since people have built xz + with GCC (without patching xz), but renaming the variable cannot + hurt either. + + Thanks to Mark Ashley. + + src/xz/signals.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit cc41bcaf77c9c27ec09ef033fb3300e994e828e6 +Author: Lasse Collin +Date: 2014-04-26 08:45:49 +0300 + + xz: Fix a comment. + + src/xz/coder.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e34025d666852839388f997d076e3577847dd10f +Author: Lasse Collin +Date: 2014-01-12 16:44:52 +0200 + + liblzma: Avoid C99 compound literal arrays. + + MSVC 2013 doesn't like them. Maybe they aren't so good + for readability either since many aren't used to them. + + src/liblzma/lzma/lzma_encoder_presets.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 0b6168974f1fac3a06157039235b66e4161b9b42 +Author: Lasse Collin +Date: 2014-01-12 12:50:30 +0200 + + liblzma: Remove a useless C99ism from sha256.c. + + Unsurprisingly it makes no difference in compiled output. + + src/liblzma/check/sha256.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 41e436076cfdcccc7e853de73b0d56b3d6d42053 +Author: Lasse Collin +Date: 2014-01-12 12:17:08 +0200 + + xz: Fix use of wrong variable. + + Since the only call to suffix_set() uses optarg + as the argument, fixing this bug doesn't change + the behavior of the program. + + src/xz/suffix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c33efefd4ef0931e5795e13725d4bd2203571ce0 +Author: Lasse Collin +Date: 2014-04-26 08:37:00 +0300 + + Fix typos in comments. + + src/liblzma/check/crc32_fast.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e560c82f1f5693d88db9dc71f656436135f17595 +Author: Lasse Collin +Date: 2013-11-26 18:20:16 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 05192b32e553eac5dfbd646b6102d10187f29a05 +Author: Lasse Collin +Date: 2013-11-26 18:20:09 +0200 + + liblzma: Document the need for block->check for lzma_block_header_decode(). + + Thanks to Tomer Chachamu. + + src/liblzma/api/lzma/block.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0f35eafe51db7b1eb0711bc8cc829ea6896b34f4 +Author: Lasse Collin +Date: 2013-10-26 12:47:04 +0300 + + Update TODO. + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit fc9eaf81d718488b052e5c65f9d6f08acc858873 +Author: Lasse Collin +Date: 2013-09-11 14:40:35 +0300 + + Build: Remove a comment about Automake 1.10 from configure.ac. + + The previous commit supports silent rules and that requires + Automake 1.11. + + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +commit 090c69dda59e00fc86d0792879bd921bb1156029 +Author: Lasse Collin +Date: 2013-09-09 20:37:03 +0300 + + Build: Create liblzma.pc in a src/liblzma/Makefile.am. + + Previously it was done in configure, but doing that goes + against the Autoconf manual. Autoconf requires that it is + possible to override e.g. prefix after running configure + and that doesn't work correctly if liblzma.pc is created + by configure. + + A potential downside of this change is that now e.g. + libdir in liblzma.pc is a standalone string instead of + being defined via ${prefix}, so if one overrides prefix + when running pkg-config the libdir won't get the new value. + I don't know if this matters in practice. + + Thanks to Vincent Torri. + + configure.ac | 1 - + src/liblzma/Makefile.am | 20 ++++++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +commit 1f35331332273de01c46897cafdb37f8e6e285db +Author: Anders F Bjorklund +Date: 2013-08-02 15:59:46 +0200 + + macosx: separate liblzma package + + macosx/build.sh | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 1415f1d94644f28e07d544bc1e06b0636081abee +Author: Anders F Bjorklund +Date: 2013-08-02 15:58:44 +0200 + + macosx: set minimum to leopard + + macosx/build.sh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 41913949b93414a21ae9fb1a8e9b7cdde8b37f98 +Author: Anders F Bjorklund +Date: 2011-08-07 13:13:30 +0200 + + move configurables into variables + + macosx/build.sh | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +commit 3dffda33f47dc220bb1738564fe02effa9da4c8e +Author: Lasse Collin +Date: 2013-07-15 14:08:02 +0300 + + Build: Fix the detection of missing CRC32. + + Thanks to Vincent Torri. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit b69900ed0b2f914fc6c0a180dcb522dbe5b80ea7 Author: Lasse Collin -Date: Sun Jun 30 18:02:27 2013 +0300 +Date: 2013-06-30 18:02:27 +0300 Man pages: Use similar syntax for synopsis as in xz. @@ -10,38 +341,56 @@ Date: Sun Jun 30 18:02:27 2013 +0300 didn't mention these man pages in his bug report, but it's nice to be consistent. + src/lzmainfo/lzmainfo.1 | 4 ++-- + src/scripts/xzmore.1 | 6 +++--- + src/xzdec/xzdec.1 | 10 +++++----- + 3 files changed, 10 insertions(+), 10 deletions(-) + commit cf4a1e1879d89be314ef3c064bd2656ea452f87e Author: Lasse Collin -Date: Sun Jun 30 15:55:09 2013 +0300 +Date: 2013-06-30 15:55:09 +0300 Update NEWS for 5.0.5. + NEWS | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + commit cb94bb6d1f34e1e93c2d634ea9c3b7dfb3981d05 Author: Lasse Collin -Date: Sun Jun 30 15:54:38 2013 +0300 +Date: 2013-06-30 15:54:38 +0300 Bump version and soname for 5.0.5. + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + commit b7dee202d5b041ccae028d0c5433b83cecbe9e5d Author: Lasse Collin -Date: Fri Jun 28 23:56:17 2013 +0300 +Date: 2013-06-28 23:56:17 +0300 xz: Fix return value type in io_write_buf(). It didn't affect the behavior of the code since -1 becomes true anyway. + src/xz/file_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 265e7b44d804b47373f10b7da28350db7611cea6 Author: Lasse Collin -Date: Fri Jun 28 18:46:13 2013 +0300 +Date: 2013-06-28 18:46:13 +0300 xz: Remove an outdated NetBSD-specific comment. Nowadays errno == EFTYPE is documented in open(2). + src/xz/file_io.c | 4 ---- + 1 file changed, 4 deletions(-) + commit 78c2f8db902195468b8249c432252a6b281db836 Author: Lasse Collin -Date: Fri Jun 28 18:09:47 2013 +0300 +Date: 2013-06-28 18:09:47 +0300 xz: Fix error detection of fcntl(fd, F_SETFL, flags) calls. @@ -51,9 +400,12 @@ Date: Fri Jun 28 18:09:47 2013 +0300 F_SETFL is always 0 (at least accorinding to fcntl(2) from man-pages 3.51). + src/xz/file_io.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + commit 91750dff8f2c654ff636f12a2acdffe5492374b3 Author: Lasse Collin -Date: Fri Jun 28 17:36:47 2013 +0300 +Date: 2013-06-28 17:36:47 +0300 xz: Fix use of wrong variable in a fcntl() call. @@ -69,9 +421,12 @@ Date: Fri Jun 28 17:36:47 2013 +0300 indicate when the flags should be restored instead of relying on a special value in stdout_flags. + src/xz/file_io.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + commit e11888a79a4a77a69afde60445880d44f63d01aa Author: Lasse Collin -Date: Wed Jun 26 13:30:57 2013 +0300 +Date: 2013-06-26 13:30:57 +0300 xz: Check the value of lzma_stream_flags.version in --list. @@ -80,9 +435,12 @@ Date: Wed Jun 26 13:30:57 2013 +0300 then this check becomes important and will stop the old xz from trying to parse files that it won't understand. + src/xz/list.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + commit f39ddd88f3222219ada88998cf30abfdd3e0e96c Author: Lasse Collin -Date: Wed Jun 26 12:17:00 2013 +0300 +Date: 2013-06-26 12:17:00 +0300 Build: Require Automake 1.12 and use serial-tests option. @@ -95,9 +453,12 @@ Date: Wed Jun 26 12:17:00 2013 +0300 in XZ Utils but they hide the progress output from test_compress.sh. + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + commit cb84e278027a90e9827a6f4d3bb0b4d4744a2fbb Author: Lasse Collin -Date: Sun Jun 23 17:36:47 2013 +0300 +Date: 2013-06-23 17:36:47 +0300 xz: Validate Uncompressed Size from Block Header in list.c. @@ -107,23 +468,32 @@ Date: Sun Jun 23 17:36:47 2013 +0300 show such files as corrupt instead of showing the Uncompressed Size from Index. + src/xz/list.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + commit f01780fce454c7489f7dcbf806299b50da5f51b7 Author: Lasse Collin -Date: Wed Jun 26 10:58:58 2013 +0300 +Date: 2013-06-26 10:58:58 +0300 Update THANKS. + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + commit d98ede7d700b892e32d9c2f46563b6ebc566786d Author: Lasse Collin -Date: Fri Jun 21 22:04:45 2013 +0300 +Date: 2013-06-21 22:04:45 +0300 xz: Make the man page more friendly to doclifter. Thanks to Eric S. Raymond. + src/xz/xz.1 | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + commit 19b447b64b3f520cd5b11429000b092f7c76709b Author: Lasse Collin -Date: Fri Jun 21 21:54:59 2013 +0300 +Date: 2013-06-21 21:54:59 +0300 xz: A couple of man page fixes. @@ -133,9 +503,12 @@ Date: Fri Jun 21 21:54:59 2013 +0300 Thanks to DevHC who reported these issues on IRC to me on 2012-12-14. + src/xz/xz.1 | 35 +++++++++++++++++++++++------------ + 1 file changed, 23 insertions(+), 12 deletions(-) + commit 45edf2966fc9a4d2eae8f84b2fa027fb4fa1df8b Author: Lasse Collin -Date: Fri Jun 21 21:50:26 2013 +0300 +Date: 2013-06-21 21:50:26 +0300 xz: Fix interaction between preset and custom filter chains. @@ -158,15 +531,22 @@ Date: Fri Jun 21 21:50:26 2013 +0300 Thanks to Conley Moorhous. + src/xz/coder.c | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + commit b065984e5a9272eb50bc0c6d3731e6199c0ae8a8 Author: Lasse Collin -Date: Fri Apr 8 17:53:05 2011 +0300 +Date: 2011-04-08 17:53:05 +0300 xz: Change size_t to uint32_t in a few places. + src/xz/coder.c | 6 +++--- + src/xz/coder.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + commit 32be621f52f2e1686db88baa7b01dc1ae338f426 Author: Lasse Collin -Date: Sat Apr 27 22:07:46 2013 +0300 +Date: 2013-04-27 22:07:46 +0300 Build: Use -Wvla with GCC if supported. @@ -175,9 +555,12 @@ Date: Sat Apr 27 22:07:46 2013 +0300 future either to stay compatible with C11 without requiring any optional C11 features. + configure.ac | 1 + + 1 file changed, 1 insertion(+) + commit efb07cfba65e9e05984c02cd796c1b0338ce04dc Author: Lasse Collin -Date: Mon Apr 15 19:29:09 2013 +0300 +Date: 2013-04-15 19:29:09 +0300 xzdec: Improve the --help message. @@ -189,23 +572,32 @@ Date: Mon Apr 15 19:29:09 2013 +0300 because I find it easier to spot the ignored vs. non-ignored options from the list that way. + src/xzdec/xzdec.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + commit e3c8be13699e2813f5e2879d8187444b46d82d89 Author: Lasse Collin -Date: Fri Apr 5 19:25:40 2013 +0300 +Date: 2013-04-05 19:25:40 +0300 Update THANKS. + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + commit ad8282efe483612f6b5544f9a0d2e4914fb2532a Author: Jeff Bastian -Date: Wed Apr 3 13:59:17 2013 +0200 +Date: 2013-04-03 13:59:17 +0200 xzgrep: make the '-h' option to be --no-filename equivalent * src/scripts/xzgrep.in: Accept the '-h' option in argument parsing. + src/scripts/xzgrep.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 9271a3eb0e022b23e8712154be851d0afe4c02e4 Author: Lasse Collin -Date: Fri Apr 5 19:34:09 2013 +0300 +Date: 2013-04-05 19:34:09 +0300 liblzma: Be less picky in lzma_alone_decoder(). @@ -231,9 +623,14 @@ Date: Fri Apr 5 19:34:09 2013 +0300 src/liblzma/common/alone_decoder.c src/liblzma/common/alone_decoder.h + src/liblzma/common/alone_decoder.c | 22 ++++++++++++++-------- + src/liblzma/common/alone_decoder.h | 5 +++-- + src/liblzma/common/auto_decoder.c | 2 +- + 3 files changed, 18 insertions(+), 11 deletions(-) + commit 211b931cee58626c1d2e021810cb108cb5cbc10f Author: Lasse Collin -Date: Tue Mar 5 19:14:50 2013 +0200 +Date: 2013-03-05 19:14:50 +0200 Avoid unneeded use of awk in xzless. @@ -243,9 +640,12 @@ Date: Tue Mar 5 19:14:50 2013 +0200 Thanks to Ariel P for the patch. + src/scripts/xzless.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + commit 9f62fd9605eade23b62b07a235d1f02156f7a5c6 Author: Jonathan Nieder -Date: Mon Nov 19 00:10:10 2012 -0800 +Date: 2012-11-19 00:10:10 -0800 xzless: Make "less -V" parsing more robust @@ -282,46 +682,66 @@ Date: Mon Nov 19 00:10:10 2012 -0800 Reported-by: J?rg-Volker Peetz Signed-off-by: Jonathan Nieder + src/scripts/xzless.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + commit 1d05980f5b5c2c94d833001daccacce4a466876e Author: Lasse Collin -Date: Wed Oct 3 15:54:24 2012 +0300 +Date: 2012-10-03 15:54:24 +0300 xz: Fix the note about --rsyncable on the man page. + src/xz/xz.1 | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + commit fb68497333598688d309a92838d91fd560f7e9f0 Author: Lasse Collin -Date: Fri Sep 28 20:11:09 2012 +0300 +Date: 2012-09-28 20:11:09 +0300 xz: Improve handling of failed realloc in xrealloc. Thanks to Jim Meyering. + src/xz/util.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + commit 75013db6d4d63c195bd8b8d45729b4be0665a812 Author: Lasse Collin -Date: Sat Dec 15 20:01:02 2012 +0200 +Date: 2012-12-15 20:01:02 +0200 A few typo fixes to comments and the xz man page. Thanks to Jim Meyering. + configure.ac | 2 +- + src/liblzma/check/sha256.c | 1 - + src/xz/xz.1 | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) + commit e44b21839b1dcbac5097be39b87dd2ddb6e114fd Author: Lasse Collin -Date: Thu Aug 2 17:13:30 2012 +0300 +Date: 2012-08-02 17:13:30 +0300 Build: Bump gettext version requirement to 0.18. Otherwise too old version of m4/lib-link.m4 gets included when autoreconf -fi is run. + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit fd3dbb23ca7e75a7a888d7e897c381dc06308307 Author: Lasse Collin -Date: Thu Jul 5 07:36:28 2012 +0300 +Date: 2012-07-05 07:36:28 +0300 Tests: Remove tests/test_block.c that had gotten committed accidentally. + tests/test_block.c | 52 ---------------------------------------------------- + 1 file changed, 52 deletions(-) + commit 05a735d279d74af437c31f25f69aded4713c1a3d Author: Lasse Collin -Date: Thu Jul 5 07:33:35 2012 +0300 +Date: 2012-07-05 07:33:35 +0300 Build: Include macosx/build.sh in the distribution. @@ -329,55 +749,81 @@ Date: Thu Jul 5 07:33:35 2012 +0300 few people have seen it since it hasn't been included in the release tarballs. :-( + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + commit 4e6d62793b5e7b87edcc93c7ded072c1ecd94173 Author: Lasse Collin -Date: Thu Jul 5 07:24:45 2012 +0300 +Date: 2012-07-05 07:24:45 +0300 Docs: Fix the name LZMA Utils -> XZ Utils in debug/README. + debug/README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit dd95b5e7614baf1f07a1316b5106bd616a9efa79 Author: Lasse Collin -Date: Thu Jul 5 07:23:17 2012 +0300 +Date: 2012-07-05 07:23:17 +0300 Include debug/translation.bash in the distribution. Also fix the script name mentioned in README. + README | 4 ++-- + debug/Makefile.am | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + commit 20778053a07eb90c159c1377ca8dc05a90fd530b Author: Lasse Collin -Date: Fri Jun 22 14:36:16 2012 +0300 +Date: 2012-06-22 14:36:16 +0300 xz: Update man page date to match the latest update. + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 2cefa84af676da37d7e9c466d55d46c67ab00c22 Author: Lasse Collin -Date: Fri Jun 22 10:25:43 2012 +0300 +Date: 2012-06-22 10:25:43 +0300 Bump version and soname for 5.0.4. + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + commit 433fec191a17e45690809e54146ea7a773f54cff Author: Lasse Collin -Date: Fri Jun 22 10:25:09 2012 +0300 +Date: 2012-06-22 10:25:09 +0300 Update NEWS for 5.0.4. + NEWS | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + commit 711fa680f552a4003df73b37e6dc4d6e00b47bcd Author: Lasse Collin -Date: Mon Jun 18 21:27:47 2012 +0300 +Date: 2012-06-18 21:27:47 +0300 Docs: Language fix to 01_compress_easy.c. Thanks to Jonathan Nieder. + doc/examples/01_compress_easy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 3d7ab1dc61a75c560828be5df96598388b771456 Author: Lasse Collin -Date: Thu Jun 14 20:15:30 2012 +0300 +Date: 2012-06-14 20:15:30 +0300 Fix the top-level Makefile.am for the new example programs. + Makefile.am | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + commit ef8b8e5f111469b5bc005975f7abb9abbd372b25 Author: Lasse Collin -Date: Thu Jun 14 10:52:33 2012 +0300 +Date: 2012-06-14 10:52:33 +0300 Docs: Add new example programs. @@ -385,9 +831,16 @@ Date: Thu Jun 14 10:52:33 2012 +0300 human-readable error messages. More tutorial-like examples are needed but these are a start. + doc/examples/00_README.txt | 27 ++++ + doc/examples/01_compress_easy.c | 297 ++++++++++++++++++++++++++++++++++++++ + doc/examples/02_decompress.c | 287 ++++++++++++++++++++++++++++++++++++ + doc/examples/03_compress_custom.c | 193 +++++++++++++++++++++++++ + doc/examples/Makefile | 23 +++ + 5 files changed, 827 insertions(+) + commit 75c149bc8045a26f8bc719cb8ed20668dab79091 Author: Lasse Collin -Date: Thu Jun 14 10:33:27 2012 +0300 +Date: 2012-06-14 10:33:27 +0300 Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old. @@ -395,49 +848,73 @@ Date: Thu Jun 14 10:33:27 2012 +0300 copied the decompressor bug from xz_pipe_decomp.c he has an example how to easily fix it. + doc/examples/xz_pipe_comp.c | 127 -------------------------------------- + doc/examples/xz_pipe_decomp.c | 123 ------------------------------------ + doc/examples_old/xz_pipe_comp.c | 127 ++++++++++++++++++++++++++++++++++++++ + doc/examples_old/xz_pipe_decomp.c | 123 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 250 insertions(+), 250 deletions(-) + commit 456307ebf947a5f50bd995d617b99c1215572308 Author: Lasse Collin -Date: Thu Jun 14 10:33:01 2012 +0300 +Date: 2012-06-14 10:33:01 +0300 Docs: Fix a bug in xz_pipe_decomp.c example program. + doc/examples/xz_pipe_decomp.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + commit 4c310b8a29bc257e6ccbd2310f12f258678f3fef Author: Lasse Collin -Date: Thu May 31 15:53:25 2012 +0300 +Date: 2012-05-31 15:53:25 +0300 Translations: Update the Italian translation. Thanks to Milo Casagrande. + po/it.po | 311 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 146 insertions(+), 165 deletions(-) + commit ec32b79366dc47a55ea877589df9e8509ba113a7 Author: Lasse Collin -Date: Wed May 30 23:15:07 2012 +0300 +Date: 2012-05-30 23:15:07 +0300 Translations: Update the French translation. Thanks to Adrien Nader. + po/fr.po | 237 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 118 insertions(+), 119 deletions(-) + commit dd06f40e4dd7649525e4f28d890dc238a3aa37e5 Author: Lasse Collin -Date: Tue May 29 22:26:27 2012 +0300 +Date: 2012-05-29 22:26:27 +0300 Translations: Update the German translation. + po/de.po | 169 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 91 insertions(+), 78 deletions(-) + commit c66808d1f55d0149ed57c536cc9b52e9c8b583bc Author: Lasse Collin -Date: Tue May 29 22:12:57 2012 +0300 +Date: 2012-05-29 22:12:57 +0300 Translations: Update Polish translation. + po/pl.po | 150 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 82 insertions(+), 68 deletions(-) + commit 556c22dfed195c1466b298183b850d6c28544900 Author: Lasse Collin -Date: Tue May 29 13:10:36 2012 +0300 +Date: 2012-05-29 13:10:36 +0300 Preliminary NEWS for 5.0.4. + NEWS | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + commit dd13b66bf582f49d3aec36e3410ff8541b7506da Author: Lasse Collin -Date: Mon May 28 20:42:11 2012 +0300 +Date: 2012-05-28 20:42:11 +0300 liblzma: Fix possibility of incorrect LZMA_BUF_ERROR. @@ -465,21 +942,32 @@ Date: Mon May 28 20:42:11 2012 +0300 A similar bug was fixed in XZ Embedded on 2011-09-19. + src/liblzma/simple/simple_coder.c | 2 +- + tests/Makefile.am | 4 +- + tests/test_bcj_exact_size.c | 112 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 116 insertions(+), 2 deletions(-) + commit a0223bf796fdaad51a11ad02c4195c694849cc78 Author: Lasse Collin -Date: Mon May 28 15:38:32 2012 +0300 +Date: 2012-05-28 15:38:32 +0300 Update THANKS. + THANKS | 1 + + 1 file changed, 1 insertion(+) + commit 86e57e4bfefe3fd8e13615c41604165bb2359501 Author: Lasse Collin -Date: Mon May 28 15:37:43 2012 +0300 +Date: 2012-05-28 15:37:43 +0300 xz: Don't show a huge number in -vv when memory limit is disabled. + src/xz/message.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + commit 13e44a94da19d1ef14832ff12d3877a6fd2c54c0 Author: Lasse Collin -Date: Sun May 27 22:30:17 2012 +0300 +Date: 2012-05-27 22:30:17 +0300 xz: Document the "summary" lines of --robot -lvv. @@ -487,30 +975,43 @@ Date: Sun May 27 22:30:17 2012 +0300 The new columns added in the master branch aren't necessarily stable yet. + src/xz/xz.1 | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + commit 2f90345e13ab8fea4de45a4f1caa73ebc63a62e7 Author: Lasse Collin -Date: Sun May 27 21:53:20 2012 +0300 +Date: 2012-05-27 21:53:20 +0300 xz: Fix output of verbose --robot --list modes. It printed the filename in "filename (x/y)" format which it obviously shouldn't do in robot mode. + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 8d4864f53ffae5d862c691a0b334a6b69bc5366e Author: Lasse Collin -Date: Thu May 10 21:15:17 2012 +0300 +Date: 2012-05-10 21:15:17 +0300 Update THANKS. + THANKS | 1 + + 1 file changed, 1 insertion(+) + commit 35e9c58abb0ce3993da844aaeaa3e7231cd2be8f Author: Lasse Collin -Date: Thu May 10 21:14:16 2012 +0300 +Date: 2012-05-10 21:14:16 +0300 Docs: Cleanup line wrapping a bit. + README | 12 ++++++------ + doc/history.txt | 49 +++++++++++++++++++++++++------------------------ + 2 files changed, 31 insertions(+), 30 deletions(-) + commit 532b3e4c568a228309b56f95c13435fd078dbe02 Author: Benno Schulenberg -Date: Tue Mar 13 22:04:04 2012 +0100 +Date: 2012-03-13 22:04:04 +0100 Fix a few typos and add some missing articles in some documents. @@ -518,42 +1019,64 @@ Date: Tue Mar 13 22:04:04 2012 +0100 Signed-off-by: Benno Schulenberg + AUTHORS | 6 +++--- + README | 42 ++++++++++++++++++++--------------------- + doc/faq.txt | 24 ++++++++++++------------ + doc/history.txt | 58 ++++++++++++++++++++++++++++----------------------------- + 4 files changed, 65 insertions(+), 65 deletions(-) + commit afb6ce8c82ffef8f2505a3759da72a733c7b0b8f Author: Lasse Collin -Date: Sun Apr 29 11:51:25 2012 +0300 +Date: 2012-04-29 11:51:25 +0300 Windows: Update notes about static linking with MSVC. + windows/README-Windows.txt | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + commit 7c3ba2ed5c3c878d4a14ca549b46dbff60c6d565 Author: Lasse Collin -Date: Thu Apr 19 15:25:26 2012 +0300 +Date: 2012-04-19 15:25:26 +0300 liblzma: Remove outdated comments. + src/liblzma/simple/simple_coder.c | 3 --- + src/liblzma/simple/simple_private.h | 3 +-- + 2 files changed, 1 insertion(+), 5 deletions(-) + commit f55db9c187651094f43881c49db2b2d9ffee6b80 Author: Lasse Collin -Date: Thu Apr 19 14:17:52 2012 +0300 +Date: 2012-04-19 14:17:52 +0300 DOS: Link against DJGPP's libemu to support FPU emulation. This way xz should work on 386SX and 486SX. Floating point only is needed for verbose output in xz. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From delphij at FreeBSD.org Thu Oct 23 00:37:52 2014 From: delphij at FreeBSD.org (Xin LI) Date: Thu, 23 Oct 2014 00:37:52 +0000 (UTC) Subject: svn commit: r273495 - vendor/xz/5.0.7 Message-ID: <201410230037.s9N0bqNC075225@svn.freebsd.org> Author: delphij Date: Thu Oct 23 00:37:52 2014 New Revision: 273495 URL: https://svnweb.freebsd.org/changeset/base/273495 Log: Tag xz 5.0.7. Added: vendor/xz/5.0.7/ - copied from r273494, vendor/xz/dist/ From edwin at FreeBSD.org Thu Oct 23 06:11:17 2014 From: edwin at FreeBSD.org (Edwin Groothuis) Date: Thu, 23 Oct 2014 06:11:16 +0000 (UTC) Subject: svn commit: r273518 - vendor/tzdata/dist Message-ID: <201410230611.s9N6BGkF031543@svn.freebsd.org> Author: edwin Date: Thu Oct 23 06:11:16 2014 New Revision: 273518 URL: https://svnweb.freebsd.org/changeset/base/273518 Log: Upgrade to 2014i Lots of historical data Pacific/Fiji will go into DST from 2014-11-02 to 2015-01-18 Pacific/Bougainville will go from UTC+10 to UTC+11. Europe/Minsk will go from FET to MSK. Obtained from: ftp://ftp.iana.org/tz/releases/ Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/antarctica vendor/tzdata/dist/asia vendor/tzdata/dist/australasia vendor/tzdata/dist/backward vendor/tzdata/dist/europe vendor/tzdata/dist/northamerica vendor/tzdata/dist/southamerica vendor/tzdata/dist/zone.tab vendor/tzdata/dist/zone1970.tab Modified: vendor/tzdata/dist/africa ============================================================================== --- vendor/tzdata/dist/africa Thu Oct 23 05:58:02 2014 (r273517) +++ vendor/tzdata/dist/africa Thu Oct 23 06:11:16 2014 (r273518) @@ -1,9 +1,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. -# This data is by no means authoritative; if you think you know better, +# This file is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz at iana.org for general use in the future). +# tz at iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-02-21): # @@ -25,8 +26,8 @@ # I found in the UCLA library. # # For data circa 1899, a common source is: -# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -# . +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. +# http://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -93,9 +94,9 @@ Rule Algeria 1980 only - Oct 31 2:00 0 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 - 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time - 0:00 Algeria WE%sT 1940 Feb 25 2:00 +Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 + 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time + 0:00 Algeria WE%sT 1940 Feb 25 2:00 1:00 Algeria CE%sT 1946 Oct 7 0:00 - WET 1956 Jan 29 1:00 - CET 1963 Apr 14 @@ -105,82 +106,57 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 M 1:00 - CET # Angola -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Luanda 0:52:56 - LMT 1892 - 0:52:04 - AOT 1911 May 26 # Angola Time - 1:00 - WAT - # Benin -# Whitman says they switched to 1:00 in 1946, not 1934; -# go with Shanks & Pottenger. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Porto-Novo 0:10:28 - LMT 1912 - 0:00 - GMT 1934 Feb 26 - 1:00 - WAT +# See Africa/Lagos. # Botswana -# From Paul Eggert (2013-02-21): -# Milne says they were regulated by the Cape Town Signal in 1899; -# assume they switched to 2:00 when Cape Town did. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Gaborone 1:43:40 - LMT 1885 - 1:30 - SAST 1903 Mar - 2:00 - CAT 1943 Sep 19 2:00 - 2:00 1:00 CAST 1944 Mar 19 2:00 - 2:00 - CAT +# See Africa/Maputo. # Burkina Faso # See Africa/Abidjan. # Burundi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bujumbura 1:57:28 - LMT 1890 - 2:00 - CAT +# See Africa/Maputo. # Cameroon -# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Douala 0:38:48 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. # Cape Verde +# +# Shanks gives 1907 for the transition to CVT. +# Perhaps the 1911-05-26 Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# merely made it official? +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia +Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia -2:00 - CVT 1942 Sep -2:00 1:00 CVST 1945 Oct 15 - -2:00 - CVT 1975 Nov 25 2:00 + -2:00 - CVT 1975 Nov 25 2:00 -1:00 - CVT # Central African Republic -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bangui 1:14:20 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. # Chad # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena +Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00 - WAT 1979 Oct 14 1:00 1:00 WAST 1980 Mar 8 1:00 - WAT # Comoros # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro +Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro 3:00 - EAT -# Democratic Republic of Congo -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 - 1:00 - WAT -Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 - 2:00 - CAT +# Democratic Republic of the Congo +# See Africa/Lagos for the western part and Africa/Maputo for the eastern. # Republic of the Congo -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Brazzaville 1:01:08 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. -# C?te D'Ivoire / Ivory Coast +# C?te d'Ivoire / Ivory Coast # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Abidjan -0:16:08 - LMT 1912 0:00 - GMT @@ -327,7 +303,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 # Egypt is to change back to Daylight system on May 15 # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx -# From Gunther Vermier (2015-05-13): +# From Gunther Vermier (2014-05-13): # our Egypt office confirms that the change will be at 15 May "midnight" (24:00) # From Imed Chihi (2014-06-04): @@ -408,16 +384,13 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Malabo 0:35:08 - LMT 1912 - 0:00 - GMT 1963 Dec 15 - 1:00 - WAT +# See Africa/Lagos. # Eritrea # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890 # Asmara Mean Time - 2:35:20 - ADMT 1936 May 5 # Adis Dera MT + 2:35:32 - AMT 1890 # Asmara Mean Time + 2:35:20 - ADMT 1936 May 5 # Adis Dera MT 3:00 - EAT # Ethiopia @@ -429,16 +402,15 @@ Zone Africa/Asmara 2:35:32 - LMT 1870 # Shanks & Pottenger write that Ethiopia had six narrowly-spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 -# was for Adis Dera. Quite likely the Shanks data are wrong anyway. +# was for Adis Dera. Quite likely the Shanks data entries are wrong +# anyway. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Addis_Ababa 2:34:48 - LMT 1870 - 2:35:20 - ADMT 1936 May 5 # Adis Dera MT + 2:35:20 - ADMT 1936 May 5 # Adis Dera MT 3:00 - EAT # Gabon -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Libreville 0:37:48 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. # Gambia # See Africa/Abidjan. @@ -461,8 +433,14 @@ Zone Africa/Accra -0:00:52 - LMT 1918 # See Africa/Abidjan. # Guinea-Bissau +# +# Shanks gives 1911-05-26 for the transition to WAT, +# evidently confusing the date of the Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# with the date that it took effect, namely 1912-01-01. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bissau -1:02:20 - LMT 1911 May 26 +Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 -1:00 - WAT 1975 0:00 - GMT @@ -475,11 +453,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1928 J 3:00 - EAT # Lesotho -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Maseru 1:50:00 - LMT 1903 Mar - 2:00 - SAST 1943 Sep 19 2:00 - 2:00 1:00 SAST 1944 Mar 19 2:00 - 2:00 - SAST +# See Africa/Johannesburg. # Liberia # From Paul Eggert (2006-03-22): @@ -546,11 +520,11 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 # The 1996 and 1997 entries are from Shanks & Pottenger; -# the IATA SSIM data contain some obvious errors. +# the IATA SSIM data entries contain some obvious errors. 2:00 - EET 1996 Sep 30 1:00 Libya CE%sT 1997 Oct 4 - 2:00 - EET 2012 Nov 10 2:00 - 1:00 Libya CE%sT 2013 Oct 25 2:00 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT 2013 Oct 25 2:00 2:00 - EET # Madagascar @@ -561,9 +535,7 @@ Zone Indian/Antananarivo 3:10:04 - LMT 1 3:00 - EAT # Malawi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. # Mali # Mauritania @@ -606,7 +578,7 @@ Zone Africa/Blantyre 2:20:00 - LMT 1903 # From Alex Krivenyshev (2008-07-11): # Seems that English language article "The revival of daylight saving -# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally +# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally # published on Monday, June 30, 2008... # # I guess that article in French "Le gouvernement avance l'introduction @@ -657,14 +629,14 @@ Rule Mauritius 1983 only - Mar 21 0:00 0 Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 S Rule Mauritius 2009 only - Mar lastSun 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis +Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis 4:00 Mauritius MU%sT # Mauritius Time # Agalega Is, Rodriguez # no information; probably like Indian/Mauritius # Mayotte # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou +Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou 3:00 - EAT # Morocco @@ -682,7 +654,8 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://en.afrik.com/news11892.html # From Alex Krivenyshev (2008-05-09): -# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse: +# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe +# Presse: # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view # # Morocco shifts to daylight time on June 1st through September 27, Govt. @@ -760,8 +733,8 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # From Dan Abitol (2011-03-30): # ...Rules for Africa/Casablanca are the following (24h format) -# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00 -# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00 +# The 3rd April 2011 at 00:00:00, [it] will be 3rd April 01:00:00 +# The 31st July 2011 at 00:59:59, [it] will be 31st July 00:00:00 # ...Official links of change in morocco # The change was broadcast on the FM Radio # I ve called ANRT (telecom regulations in Morocco) at @@ -831,7 +804,7 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced a bit in advance. On 2012-07-11 the Moroccan government # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see -# . +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 # From Andrew Paprocki (2013-07-02): # Morocco announced that the year's Ramadan daylight-savings @@ -963,16 +936,29 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 0:00 Morocco WE%sT # Mozambique +# +# Shanks gives 1903-03-01 for the transition to CAT. +# Perhaps the 1911-05-26 Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# merely made it official? +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Maputo 2:10:20 - LMT 1903 Mar 2:00 - CAT +Link Africa/Maputo Africa/Blantyre # Malawi +Link Africa/Maputo Africa/Bujumbura # Burundi +Link Africa/Maputo Africa/Gaborone # Botswana +Link Africa/Maputo Africa/Harare # Zimbabwe +Link Africa/Maputo Africa/Kigali # Rwanda +Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo +Link Africa/Maputo Africa/Lusaka # Zambia # Namibia # The 1994-04-03 transition is from Shanks & Pottenger. # Shanks & Pottenger report no DST after 1998-04; go with IATA. -# From Petronella Sibeene (2007-03-30) in -# : +# From Petronella Sibeene (2007-03-30): +# http://allafrica.com/stories/200703300178.html # While the entire country changes its time, Katima Mulilo and other # settlements in Caprivi unofficially will not because the sun there # rises and sets earlier compared to other regions. Chief of @@ -989,28 +975,33 @@ Rule Namibia 1994 max - Sep Sun>=1 2:00 Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 - 1:30 - SWAT 1903 Mar # SW Africa Time - 2:00 - SAST 1942 Sep 20 2:00 - 2:00 1:00 SAST 1943 Mar 21 2:00 + 1:30 - SWAT 1903 Mar # SW Africa Time + 2:00 - SAST 1942 Sep 20 2:00 + 2:00 1:00 SAST 1943 Mar 21 2:00 2:00 - SAST 1990 Mar 21 # independence 2:00 - CAT 1994 Apr 3 1:00 Namibia WA%sT # Niger -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Niamey 0:08:28 - LMT 1912 - -1:00 - WAT 1934 Feb 26 - 0:00 - GMT 1960 - 1:00 - WAT +# See Africa/Lagos. # Nigeria # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Lagos 0:13:36 - LMT 1919 Sep 1:00 - WAT +Link Africa/Lagos Africa/Bangui # Central African Republic +Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo +Link Africa/Lagos Africa/Douala # Cameroon +Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west) +Link Africa/Lagos Africa/Libreville # Gabon +Link Africa/Lagos Africa/Luanda # Angola +Link Africa/Lagos Africa/Malabo # Equatorial Guinea +Link Africa/Lagos Africa/Niamey # Niger +Link Africa/Lagos Africa/Porto-Novo # Benin # R?union # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis +Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis 4:00 - RET # R?union Time # # Crozet Islands also observes R?union time; see the 'antarctica' file. @@ -1028,9 +1019,7 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 J # Tromelin - inhabited until at least 1958 # Rwanda -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Kigali 2:00:16 - LMT 1935 Jun - 2:00 - CAT +# See Africa/Maputo. # St Helena # See Africa/Abidjan. @@ -1047,7 +1036,7 @@ Zone Africa/Kigali 2:00:16 - LMT 1935 Ju # Seychelles # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria +Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria 4:00 - SCT # Seychelles Time # From Paul Eggert (2001-05-30): # Aldabra, Farquhar, and Desroches, originally dependencies of the @@ -1074,6 +1063,9 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 1:30 - SAST 1903 Mar 2:00 SA SAST +Link Africa/Johannesburg Africa/Maseru # Lesotho +Link Africa/Johannesburg Africa/Mbabane # Swaziland +# # Marion and Prince Edward Is # scientific station since 1947 # no information @@ -1101,9 +1093,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 Link Africa/Khartoum Africa/Juba # Swaziland -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar - 2:00 - SAST +# See Africa/Johannesburg. # Tanzania # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1128,7 +1118,7 @@ Zone Africa/Dar_es_Salaam 2:37:08 - LMT # # From Oscar van Vlijmen (2005-05-02): # La Presse, the first national daily newspaper ... -# +# http://www.lapresse.tn/archives/archives280405/actualites/lheure.html # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30, # 1h standard time. # @@ -1212,7 +1202,7 @@ Rule Tunisia 2006 2008 - Oct lastSun 2: # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tunis 0:40:44 - LMT 1881 May 12 - 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time + 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time 1:00 Tunisia CE%sT # Uganda @@ -1224,11 +1214,5 @@ Zone Africa/Kampala 2:09:40 - LMT 1928 J 3:00 - EAT # Zambia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar - 2:00 - CAT - # Zimbabwe -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Harare 2:04:12 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. Modified: vendor/tzdata/dist/antarctica ============================================================================== --- vendor/tzdata/dist/antarctica Thu Oct 23 05:58:02 2014 (r273517) +++ vendor/tzdata/dist/antarctica Thu Oct 23 06:11:16 2014 (r273518) @@ -4,10 +4,10 @@ # From Paul Eggert (1999-11-15): # To keep things manageable, we list only locations occupied year-round; see # COMNAP - Stations and Bases -# +# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/ # and # Summary of the Peri-Antarctic Islands (1998-07-23) -# +# http://www.spri.cam.ac.uk/bob/periant.htm # for information. # Unless otherwise specified, we have no time zone information. # @@ -63,7 +63,7 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u # Heard Island, McDonald Islands (uninhabited) # previously sealers and scientific personnel wintered # Margaret Turner reports -# +# http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html # (1999-09-30) that they're UTC+5, with no DST; # presumably this is when they have visitors. # @@ -103,32 +103,30 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Casey 0 - zzz 1969 - 8:00 - AWST 2009 Oct 18 2:00 + 8:00 - AWST 2009 Oct 18 2:00 # Australian Western Std Time - 11:00 - CAST 2010 Mar 5 2:00 - # Casey Time - 8:00 - AWST 2011 Oct 28 2:00 + 11:00 - CAST 2010 Mar 5 2:00 # Casey Time + 8:00 - AWST 2011 Oct 28 2:00 11:00 - CAST 2012 Feb 21 17:00u 8:00 - AWST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 - 7:00 - DAVT 1964 Nov # Davis Time + 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb - 7:00 - DAVT 2009 Oct 18 2:00 + 7:00 - DAVT 2009 Oct 18 2:00 5:00 - DAVT 2010 Mar 10 20:00u - 7:00 - DAVT 2011 Oct 28 2:00 + 7:00 - DAVT 2011 Oct 28 2:00 5:00 - DAVT 2012 Feb 21 20:00u 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 - 6:00 - MAWT 2009 Oct 18 2:00 - # Mawson Time + 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT # References: # Casey Weather (1998-02-26) -# +# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html # Davis Station, Antarctica (1998-02-26) -# +# http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html # Mawson Station, Antarctica (1998-02-25) -# +# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html # Belgium - year-round base # Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007 @@ -154,7 +152,7 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb # France - year-round bases (also see "France & Italy") # # From Antoine Leca (1997-01-20): -# Time data are from Nicole Pailleau at the IFRTP +# Time data entries are from Nicole Pailleau at the IFRTP # (French Institute for Polar Research and Technology). # She confirms that French Southern Territories and Terre Ad?lie bases # don't observe daylight saving time, even if Terre Ad?lie supplies came @@ -174,7 +172,7 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb # fishing stations operated variously 1819/1931 # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Fran?ais +Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Fran?ais 5:00 - TFT # ISO code TF Time # # year-round base in the main continent @@ -217,7 +215,7 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 3:00 - SYOT # Syowa Time # See: # NIPR Antarctic Research Activities (1999-08-17) -# +# http://www.nipr.ac.jp/english/ara01.html # S Korea - year-round base # Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014 @@ -264,7 +262,7 @@ Rule Troll 2005 max - Mar lastSun 1:00u Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Troll 0 - zzz 2005 Feb 12 - 0:00 Troll %s + 0:00 Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 @@ -281,8 +279,8 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 1 # year-round from 1960/61 to 1992 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 -# From Craig Mundell (1994-12-15) -# : +# From Craig Mundell (1994-12-15): +# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP # Vostok, which is one of the Russian stations, is set on the same # time as Moscow, Russia. # Modified: vendor/tzdata/dist/asia ============================================================================== --- vendor/tzdata/dist/asia Thu Oct 23 05:58:02 2014 (r273517) +++ vendor/tzdata/dist/asia Thu Oct 23 06:11:16 2014 (r273518) @@ -1,9 +1,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. -# This data is by no means authoritative; if you think you know better, +# This file is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz at iana.org for general use in the future). +# tz at iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-08-11): # @@ -25,8 +26,12 @@ # I found in the UCLA library. # # For data circa 1899, a common source is: -# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -# . +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. +# http://www.jstor.org/stable/1774359 +# +# For Russian data circa 1919, a source is: +# Byalokoz EL. New Counting of Time in Russia since July 1, 1919. +# (See the 'europe' file for a fuller citation.) # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -42,10 +47,11 @@ # 3:30 IRST IRDT Iran # 4:00 GST Gulf* # 5:30 IST India -# 7:00 ICT Indochina* +# 7:00 ICT Indochina, most times and locations* # 7:00 WIB west Indonesia (Waktu Indonesia Barat) # 8:00 WITA central Indonesia (Waktu Indonesia Tengah) # 8:00 CST China +# 8:00 IDT Indochina, 1943-45, 1947-55, 1960-75 (some locations)* # 8:00 JWST Western Standard Time (Japan, 1896/1937)* # 9:00 JCST Central Standard Time (Japan, 1896/1937) # 9:00 WIT east Indonesia (Waktu Indonesia Timur) @@ -115,11 +121,11 @@ Zone Asia/Kabul 4:36:48 - LMT 1890 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 3:00 - YERT 1957 Mar # Yerevan Time - 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s + 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s 3:00 1:00 YERST 1991 Sep 23 # independence - 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s + 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s 4:00 - AMT 1997 - 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s + 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s 4:00 - AMT # Azerbaijan @@ -132,16 +138,16 @@ Rule Azer 1997 max - Oct lastSun 5:00 0 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Baku 3:19:24 - LMT 1924 May 2 3:00 - BAKT 1957 Mar # Baku Time - 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s + 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s 3:00 1:00 BAKST 1991 Aug 30 # independence 3:00 RussiaAsia AZ%sT 1992 Sep lastSat 23:00 - 4:00 - AZT 1996 # Azerbaijan time + 4:00 - AZT 1996 # Azerbaijan Time 4:00 EUAsia AZ%sT 1997 4:00 Azer AZ%sT # Bahrain # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah +Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah 4:00 - GST 1972 Jun 3:00 - AST @@ -219,7 +225,7 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Dhaka 2009 only - Jun 19 23:00 1:00 S -Rule Dhaka 2009 only - Dec 31 23:59 0 - +Rule Dhaka 2009 only - Dec 31 24:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 @@ -250,7 +256,7 @@ Zone Indian/Chagos 4:49:40 - LMT 1907 # Brunei # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan +Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan 7:30 - BNT 1933 8:00 - BNT @@ -259,19 +265,15 @@ Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon - 6:24:40 - RMT 1920 # Rangoon Mean Time? - 6:30 - BURT 1942 May # Burma Time - 9:00 - JST 1945 May 3 - 6:30 - MMT # Myanmar Time +Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon + 6:24:40 - RMT 1920 # Rangoon Mean Time? + 6:30 - BURT 1942 May # Burma Time + 9:00 - JST 1945 May 3 + 6:30 - MMT # Myanmar Time # Cambodia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jun 9 - 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? - 7:00 - ICT 1912 May - 8:00 - ICT 1931 May - 7:00 - ICT +# See Asia/Bangkok. + # China @@ -356,8 +358,8 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # * The Republic of China instituted Beijing mean solar time effective # the official calendar book of 1914. # * The French Concession in Shanghai set up signal stations in -# French docks in the 1890s, controled by Xujiahui (Zikawei) -# Obervatory and set to local mean time. +# French docks in the 1890s, controlled by Xujiahui (Zikawei) +# Observatory and set to local mean time. # * "From the end of the 19th century" it changed to UT+8. # * Chinese Customs (by then reduced to a tool of foreign powers) # eventually standardized on this time for all ports, and it @@ -381,7 +383,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # Xujiahui Observatory was under French control and stuck with UT+8. # # In earlier versions of this file, China had many separate Zone entries, but -# this was based on what was apparently incorrect data in Shanks & Pottenger. +# this was based on what were apparently incorrect data in Shanks & Pottenger. # This has now been simplified to the two entries Asia/Shanghai and # Asia/Urumqi, with the others being links for backward compatibility. # Proposed in 1918 and theoretically in effect until 1949 (although in practice @@ -501,7 +503,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government" # (2014-04-22). # Unfortunately, we have no good records of time in Xinjiang before 1986. -# During the 20th century parts of Xinjiang were ruled by the Qing dyansty, +# During the 20th century parts of Xinjiang were ruled by the Qing dynasty, # the Republic of China, various warlords, the First and Second East Turkestan # Republics, the Soviet Union, the Kuomintang, and the People's Republic of # China, and tracking down all these organizations' timekeeping rules would be @@ -698,19 +700,19 @@ Zone Asia/Hong_Kong 7:36:42 - LMT 1904 O # Central Weather Bureau website was not correct. # # Original Bulletin: -# -# (cont.) +# http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF +# http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0 (cont.) # # In 1947, DST in Taiwan was expanded to Oct 31. There is a backup of that # telegram announcement from Taiwan Province Government: # -# +# http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431 # # Here is a brief translation: # # The Summer Time this year is adopted from midnight Apr 15 until Sep 20 # midnight. To save (energy?) consumption, we're expanding Summer Time -# adption till Oct 31 midnight. +# adoption till Oct 31 midnight. # # The Central Weather Bureau website didn't mention that, however it can # be found from historical government announcement database. @@ -741,7 +743,7 @@ Rule Taiwan 1979 only - Oct 1 0:00 0 S # Taipei or Taibei or T'ai-pei Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1 8:00 - JWST 1937 Oct 1 - 9:00 - JST 1945 Sep 21 01:00 + 9:00 - JST 1945 Sep 21 1:00 8:00 Taiwan C%sT # Macau (Macao, Aomen) @@ -761,7 +763,7 @@ Rule Macau 1975 1977 - Apr Sun>=15 3:30 Rule Macau 1978 1980 - Apr Sun>=15 0:00 1:00 S Rule Macau 1978 1980 - Oct Sun>=15 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Macau 7:34:20 - LMT 1912 +Zone Asia/Macau 7:34:20 - LMT 1912 Jan 1 8:00 Macau MO%sT 1999 Dec 20 # return to China 8:00 PRC C%sT @@ -823,20 +825,22 @@ Link Asia/Nicosia Europe/Nicosia # I don't know what can be done, especially knowing that some years ago our # DST rules where changed THREE TIMES during one month. -# Milne says Tbilisi (Tiflis) time was 2:59:05.7; round to nearest.) +# Milne 1899 says Tbilisi (Tiflis) time was 2:59:05.7. +# Byalokoz 1919 says Georgia was 2:59:11. +# Go with Byalokoz. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Tbilisi 2:59:06 - LMT 1880 - 2:59:06 - TBMT 1924 May 2 # Tbilisi Mean Time +Zone Asia/Tbilisi 2:59:11 - LMT 1880 + 2:59:11 - TBMT 1924 May 2 # Tbilisi Mean Time 3:00 - TBIT 1957 Mar # Tbilisi Time - 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s + 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s 3:00 1:00 TBIST 1991 Apr 9 # independence - 3:00 RussiaAsia GE%sT 1992 # Georgia Time + 3:00 RussiaAsia GE%sT 1992 # Georgia Time 3:00 E-EurAsia GE%sT 1994 Sep lastSun 4:00 E-EurAsia GE%sT 1996 Oct lastSun 4:00 1:00 GEST 1997 Mar lastSun 4:00 E-EurAsia GE%sT 2004 Jun 27 - 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00 + 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00 4:00 - GET # East Timor @@ -864,16 +868,16 @@ Zone Asia/Tbilisi 2:59:06 - LMT 1880 # midnight on Saturday, September 16. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Dili 8:22:20 - LMT 1912 +Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time 9:00 - JST 1945 Sep 23 9:00 - TLT 1976 May 3 - 8:00 - WITA 2000 Sep 17 00:00 + 8:00 - WITA 2000 Sep 17 0:00 9:00 - TLT # India # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata +Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata 5:53:20 - HMT 1941 Oct # Howrah Mean Time? 6:30 - BURT 1942 May 15 # Burma Time 5:30 - IST 1942 Sep @@ -886,8 +890,12 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # K # Indonesia # +# From Paul Eggert (2014-09-06): +# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia +# civil time was 7:07:12.5; round to even for Jakarta. +# # From Gwillim Law (2001-05-28), overriding Shanks & Pottenger: -# +# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime # says that Indonesia's time zones changed on 1988-01-01. Looking at some # time zone maps, I think that must refer to Western Borneo (Kalimantan Barat # and Kalimantan Tengah) switching from UTC+8 to UTC+7. @@ -924,7 +932,7 @@ Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, # but this must be a typo. 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia - 7:20 - JAVT 1932 Nov # Java Time + 7:20 - JAVT 1932 Nov # Java Time 7:30 - WIB 1942 Mar 23 9:00 - JST 1945 Sep 23 7:30 - WIB 1948 May @@ -1082,7 +1090,7 @@ Rule Iran 2036 2037 - Mar 21 0:00 1:00 D Rule Iran 2036 2037 - Sep 21 0:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Tehran 3:25:44 - LMT 1916 - 3:25:44 - TMT 1946 # Tehran Mean Time + 3:25:44 - TMT 1946 # Tehran Mean Time 3:30 - IRST 1977 Nov 4:00 Iran IR%sT 1979 3:30 Iran IR%sT @@ -1127,7 +1135,7 @@ Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 Rule Iraq 1991 2007 - Oct 1 3:00s 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Baghdad 2:57:40 - LMT 1890 - 2:57:36 - BMT 1918 # Baghdad Mean Time? + 2:57:36 - BMT 1918 # Baghdad Mean Time? 3:00 - AST 1982 May 3:00 Iraq A%sT @@ -1355,7 +1363,7 @@ Rule Zion 2013 max - Oct lastSun 2:00 0 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Jerusalem 2:20:54 - LMT 1880 - 2:20:40 - JMT 1918 # Jerusalem Mean Time? + 2:20:40 - JMT 1918 # Jerusalem Mean Time? 2:00 Zion I%sT @@ -1371,8 +1379,8 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880 # daylight saving between 1948 and 1951, but "the system was discontinued # because the public believed it would lead to longer working hours." -# From Mayumi Negishi in the 2005-08-10 Japan Times -# : +# From Mayumi Negishi in the 2005-08-10 Japan Times: +# http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm # Occupation authorities imposed daylight-saving time on Japan on # [1948-05-01].... But lack of prior debate and the execution of # daylight-saving time just three days after the bill was passed generated @@ -1396,7 +1404,8 @@ Rule Japan 1950 1951 - May Sun>=1 2:00 1 # From Hideyuki Suzuki (1998-11-09): # 'Tokyo' usually stands for the former location of Tokyo Astronomical -# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s), 35 degrees 39' 16.0" N. +# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s), +# 35 degrees 39' 16.0" N. # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996' # edited by National Astronomical Observatory of Japan.... # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST). @@ -1586,10 +1595,10 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 M 6:00 - KIZT 1982 Apr 1 5:00 RussiaAsia KIZ%sT 1991 5:00 - KIZT 1991 Dec 16 # independence - 5:00 - QYZT 1992 Jan 19 2:00 + 5:00 - QYZT 1992 Jan 19 2:00 6:00 RussiaAsia QYZ%sT 2005 Mar 15 6:00 - QYZT -# Aqtobe (aka Aktobe, formerly Akt'ubinsk) +# Aqtobe (aka Aktobe, formerly Aktyubinsk) Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 4:00 - AKTT 1930 Jun 21 # Aktyubinsk Time 5:00 - AKTT 1981 Apr 1 @@ -1609,7 +1618,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 6:00 - SHET 1982 Apr 1 5:00 RussiaAsia SHE%sT 1991 5:00 - SHET 1991 Dec 16 # independence - 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time + 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time 4:00 RussiaAsia AQT%sT 2005 Mar 15 5:00 - AQTT # West Kazakhstan @@ -1618,7 +1627,7 @@ Zone Asia/Oral 3:25:24 - LMT 1924 May 2 5:00 - URAT 1981 Apr 1 5:00 1:00 URAST 1981 Oct 1 6:00 - URAT 1982 Apr 1 - 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00 + 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00 4:00 RussiaAsia URA%sT 1991 4:00 - URAT 1991 Dec 16 # independence 4:00 RussiaAsia ORA%sT 2005 Mar 15 # Oral Time @@ -1629,7 +1638,7 @@ Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # From Paul Eggert (2005-08-15): # According to an article dated today in the Kyrgyzstan Development Gateway -# +# http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml # Kyrgyzstan is canceling the daylight saving time system. I take the article # to mean that they will leave their clocks at 6 hours ahead of UTC. # From Malik Abdugaliev (2005-09-21): @@ -1644,17 +1653,17 @@ Rule Kyrgyz 1997 2004 - Oct lastSun 2:30 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Bishkek 4:58:24 - LMT 1924 May 2 5:00 - FRUT 1930 Jun 21 # Frunze Time - 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s - 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence - 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time + 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s + 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence + 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time 6:00 - KGT ############################################################################### # Korea (North and South) -# From Annie I. Bang (2006-07-10) in -# : +# From Annie I. Bang (2006-07-10): +# http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp # The Ministry of Commerce, Industry and Energy has already # commissioned a research project [to reintroduce DST] and has said # the system may begin as early as 2008.... Korea ran a daylight @@ -1702,12 +1711,8 @@ Zone Asia/Kuwait 3:11:56 - LMT 1950 3:00 - AST # Laos -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Vientiane 6:50:24 - LMT 1906 Jun 9 # or Viangchan - 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? - 7:00 - ICT 1912 May - 8:00 - ICT 1931 May - 7:00 - ICT +# See Asia/Bangkok. + # Lebanon # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1745,8 +1750,8 @@ Rule NBorneo 1935 1941 - Sep 14 0:00 0:2 Rule NBorneo 1935 1941 - Dec 14 0:00 0 - # # peninsular Malaysia -# The data here are taken from Mok Ly Yng (2003-10-30) -# . +# taken from Mok Ly Yng (2003-10-30) +# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kuala_Lumpur 6:46:46 - LMT 1901 Jan 1 6:55:25 - SMT 1905 Jun 1 # Singapore M.T. @@ -1758,12 +1763,12 @@ Zone Asia/Kuala_Lumpur 6:46:46 - LMT 190 7:30 - MALT 1982 Jan 1 8:00 - MYT # Malaysia Time # Sabah & Sarawak -# From Paul Eggert (2006-03-22): -# The data here are mostly from Shanks & Pottenger, but the 1942, 1945 and 1982 -# transition dates are from Mok Ly Yng. +# From Paul Eggert (2014-08-12): +# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945 +# and 1982 transition dates are from Mok Ly Yng. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kuching 7:21:20 - LMT 1926 Mar - 7:30 - BORT 1933 # Borneo Time + 7:30 - BORT 1933 # Borneo Time 8:00 NBorneo BOR%sT 1942 Feb 16 9:00 - JST 1945 Sep 12 8:00 - BORT 1982 Jan 1 @@ -1771,9 +1776,9 @@ Zone Asia/Kuching 7:21:20 - LMT 1926 Mar # Maldives # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Maldives 4:54:00 - LMT 1880 # Male - 4:54:00 - MMT 1960 # Male Mean Time - 5:00 - MVT # Maldives Time +Zone Indian/Maldives 4:54:00 - LMT 1880 # Male + 4:54:00 - MMT 1960 # Male Mean Time + 5:00 - MVT # Maldives Time # Mongolia @@ -1835,7 +1840,7 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in # Washington, DC says there are two time zones, with DST observed. # He also found *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From edwin at FreeBSD.org Thu Oct 23 06:13:43 2014 From: edwin at FreeBSD.org (Edwin Groothuis) Date: Thu, 23 Oct 2014 06:13:42 +0000 (UTC) Subject: svn commit: r273519 - vendor/tzdata/tzdata2014i Message-ID: <201410230613.s9N6DgIM034322@svn.freebsd.org> Author: edwin Date: Thu Oct 23 06:13:42 2014 New Revision: 273519 URL: https://svnweb.freebsd.org/changeset/base/273519 Log: Tag of tzdata2014i sources Added: vendor/tzdata/tzdata2014i/ - copied from r273518, vendor/tzdata/dist/ From delphij at FreeBSD.org Sat Oct 25 00:32:06 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 25 Oct 2014 00:32:06 +0000 (UTC) Subject: svn commit: r273617 - vendor/netcat/dist Message-ID: <201410250032.s9P0W6gu047323@svn.freebsd.org> Author: delphij Date: Sat Oct 25 00:32:05 2014 New Revision: 273617 URL: https://svnweb.freebsd.org/changeset/base/273617 Log: Vendor import nc(1) from OPENBSD_5_6. Modified: vendor/netcat/dist/netcat.c Modified: vendor/netcat/dist/netcat.c ============================================================================== --- vendor/netcat/dist/netcat.c Sat Oct 25 00:16:36 2014 (r273616) +++ vendor/netcat/dist/netcat.c Sat Oct 25 00:32:05 2014 (r273617) @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.117 2013/10/26 21:33:29 sthen Exp $ */ +/* $OpenBSD: netcat.c,v 1.122 2014/07/20 01:38:40 guenther Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -133,7 +133,6 @@ main(int argc, char *argv[]) host = NULL; uport = NULL; sv = NULL; - rtableid = getrtable(); while ((ch = getopt(argc, argv, "46DdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) { @@ -609,7 +608,7 @@ remote_connect(const char *host, const c if (bind(s, (struct sockaddr *)ares->ai_addr, ares->ai_addrlen) < 0) - errx(1, "bind failed: %s", strerror(errno)); + err(1, "bind failed"); freeaddrinfo(ares); } @@ -698,7 +697,7 @@ local_listen(char *host, char *port, str res0->ai_protocol)) < 0) continue; - if (rtableid >= 0 && (setsockopt(s, IPPROTO_IP, SO_RTABLE, + if (rtableid >= 0 && (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid, sizeof(rtableid)) == -1)) err(1, "setsockopt SO_RTABLE"); @@ -734,12 +733,12 @@ void readwrite(int nfd) { struct pollfd pfd[2]; - unsigned char buf[16384]; + unsigned char buf[16 * 1024]; int n, wfd = fileno(stdin); int lfd = fileno(stdout); int plen; - plen = 2048; + plen = sizeof(buf); /* Setup Network FD */ pfd[0].fd = nfd; @@ -754,8 +753,9 @@ readwrite(int nfd) sleep(iflag); if ((n = poll(pfd, 2 - dflag, timeout)) < 0) { + int saved_errno = errno; close(nfd); - err(1, "Polling Error"); + errc(1, saved_errno, "Polling Error"); } if (n == 0) From delphij at FreeBSD.org Sat Oct 25 00:32:31 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sat, 25 Oct 2014 00:32:31 +0000 (UTC) Subject: svn commit: r273618 - vendor/netcat/5.6 Message-ID: <201410250032.s9P0WV40047415@svn.freebsd.org> Author: delphij Date: Sat Oct 25 00:32:30 2014 New Revision: 273618 URL: https://svnweb.freebsd.org/changeset/base/273618 Log: Tag netcat from OpenBSD 5.6. Added: vendor/netcat/5.6/ - copied from r273617, vendor/netcat/dist/ From delphij at FreeBSD.org Sun Oct 26 09:24:33 2014 From: delphij at FreeBSD.org (Xin LI) Date: Sun, 26 Oct 2014 09:24:33 +0000 (UTC) Subject: svn commit: r273688 - vendor/file/dist/magic/Magdir Message-ID: <201410260924.s9Q9OXUx087779@svn.freebsd.org> Author: delphij Date: Sun Oct 26 09:24:32 2014 New Revision: 273688 URL: https://svnweb.freebsd.org/changeset/base/273688 Log: Update filesystems magic to CVS version 1.106. Submitted by: madpilot Modified: vendor/file/dist/magic/Magdir/filesystems Modified: vendor/file/dist/magic/Magdir/filesystems ============================================================================== --- vendor/file/dist/magic/Magdir/filesystems Sun Oct 26 07:40:37 2014 (r273687) +++ vendor/file/dist/magic/Magdir/filesystems Sun Oct 26 09:24:32 2014 (r273688) @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# $File: filesystems,v 1.95 2014/06/03 19:17:27 christos Exp $ +# $File: filesystems,v 1.106 2014/10/23 17:17:09 christos Exp $ # filesystems: file(1) magic for different filesystems # 0 name partid @@ -254,19 +254,13 @@ 30 search/481 \x55\xAA # to display DOS/MBR boot sector (40) before old one (strength=50+21),Syslinux bootloader (71),SYSLINUX MBR (37+36),NetBSD mbr (110),AdvanceMAME mbr (111) # DOS BPB information (70) and after DOS floppy (120) like in previous file version -!:strength +72 +!:strength +65 # for sector sizes < 512 Bytes >11 uleshort <512 >>(11.s-2) uleshort 0xAA55 DOS/MBR boot sector # for sector sizes with 512 or more Bytes >0x1FE leshort 0xAA55 DOS/MBR boot sector -# keep old DOS/MBR boot sector as dummy for mbr and bootloader displaying -# only for sector sizes with 512 or more Bytes -0x1FE leshort 0xAA55 -# -# to display information (50) before DOS BPB (strength=70) and after DOS floppy (120) like in old file version -!:strength +21 ->2 string OSBS \b, OS/BS MBR +>2 string OSBS OS/BS MBR # added by Joerg Jenderek at Feb 2013 according to http://thestarman.pcministry.com/asm/mbr/ # and http://en.wikipedia.org/wiki/Master_Boot_Record # test for nearly all MS-DOS Master Boot Record initial program loader (IPL) is now done by @@ -538,6 +532,8 @@ >>>514 string !HdrS # not BeOS >>>>422 string !Be\ Boot\ Loader +>>>>>32769 string CD001 +>>>>>>0 use cdrom # jump over BPB instruction implies DOS bootsector or AdvanceMAME mbr >>>>>0 ubelong&0xFD000000 =0xE9000000 # AdvanceMAME mbr @@ -1043,7 +1039,7 @@ >>>>>>466 ubyte <0x10 >>>>>>>466 ubyte 0x05 \b, extended partition table >>>>>>>466 ubyte 0x0F \b, extended partition table (LBA) ->>>>>>>466 ubyte 0x0 \b, extended partition table (last) +>>>>>>>466 ubyte 0x0 \b, extended partition table (last) # DOS x86 sector separated and moved from "DOS/MBR boot sector" by Joerg Jenderek at May 2011 @@ -1236,6 +1232,7 @@ >>>>>181 search/166 Error\ \0 # "a: disk" , "Fn: diskn" or "NetBSD MBR boot" >>>>>>&3 string x \b,"%s" +>>>446 use partition-table # Andrea Mazzoleni AdvanceCD mbr loader of http://advancemame.sourceforge.net/boot-readme.html # added by Joerg Jenderek at Nov 2012 for versions 1.3 - 1.4 # assembler instructions: jmp short 0x58;nop;ASCII @@ -1353,18 +1350,19 @@ # minimal short forward jump found 0x29 for bootloaders or 0x0 # maximal short forward jump is 0x7f # OEM-ID is empty or contain readable bytes -0 ulelong&0x804000E9 0x000000E9 +0 ulelong&0x804000E9 0x000000E9 +!:strength +60 # mtools-3.9.8/msdos.h # usual values are marked with comments to get only informations of strange FAT systems # valid sectorsize must be a power of 2 from 32 to 32768 ->11 uleshort&0xf001f 0 +>11 uleshort&0x001f 0 >>11 uleshort <32769 >>>11 uleshort >31 >>>>21 ubyte&0xf0 0xF0 ->>>>>0 ubyte 0xEB +>>>>>0 ubyte 0xEB DOS/MBR boot sector >>>>>>1 ubyte x \b, code offset 0x%x+2 >>>>>0 ubyte 0xE9 ->>>>>>1 uleshort x \b, code offset 0x%x+2 +>>>>>>1 uleshort x \b, code offset 0x%x+3 >>>>>3 string >\0 \b, OEM-ID "%-.8s" #http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC >>>>>>8 string IHC \b cached by Windows 9M @@ -1373,10 +1371,11 @@ >>>>>11 uleshort <512 \b, Bytes/sector %u >>>>>13 ubyte >1 \b, sectors/cluster %u #>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies) ->>>>>82 string FAT32 +# for lazy FAT32 implementation like Transcend digital photo frame PF830 +>>>>>82 string/c fat32 >>>>>>14 uleshort !32 \b, reserved sectors %u #>>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32) ->>>>>82 string !FAT32 +>>>>>82 string/c !fat32 >>>>>>14 uleshort >1 \b, reserved sectors %u #>>>>>>14 uleshort =1 \b, reserved sectors %u (usual FAT12,FAT16) #>>>>>>14 uleshort 0 \b, reserved sectors %u (usual NTFS) @@ -1399,24 +1398,29 @@ >>>>>26 ubyte =1 \b, heads %u # valid only for sector sizes with more then 32 Bytes >>>>>11 uleshort >32 -# skip for Digital Research DOS (version 3.41) 1440 kB Bootdisk ->>>>>>38 ubyte !0x70 +# http://en.wikipedia.org/wiki/Design_of_the_FAT_file_system#Extended_BIOS_Parameter_Block +# skip for values 2,2Ah,70h,73h,DFh +# and continue for extended boot signature values 0,28h,29h,80h +>>>>>>38 ubyte&0x56 =0 >>>>>>>28 ulelong >0 \b, hidden sectors %u #>>>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy) >>>>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB) #>>>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB) # FAT<32 bit specific ->>>>>>>82 string !FAT32 +>>>>>>>82 string/c !fat32 #>>>>>>>>36 ubyte 0x80 \b, physical drive 0x%x=0x80 (usual harddisk) #>>>>>>>>36 ubyte 0 \b, physical drive 0x%x=0 (usual floppy) >>>>>>>>36 ubyte !0x80 >>>>>>>>>36 ubyte !0 \b, physical drive 0x%x +# VGA-copy CRC or +# in Windows NT bit 0 is a dirty flag to request chkdsk at boot time. bit 1 requests surface scan too >>>>>>>>37 ubyte >0 \b, reserved 0x%x #>>>>>>>>37 ubyte =0 \b, reserved 0x%x -# value is 0x80 for NTFS +# extended boot signatur value is 0x80 for NTFS, 0x28 or 0x29 for others >>>>>>>>38 ubyte !0x29 \b, dos < 4.0 BootSector (0x%x) ->>>>>>>>38 ubyte =0x29 +>>>>>>>>38 ubyte&0xFE =0x28 >>>>>>>>>39 ulelong x \b, serial number 0x%x +>>>>>>>>38 ubyte =0x29 >>>>>>>>>43 string >>>>>>>>43 string >NO\ NAME \b, label: "%11.11s" >>>>>>>>>43 string =NO\ NAME \b, unlabeled @@ -1426,11 +1430,35 @@ # if it is small enough FAT is 12 bit, if it is too big enough FAT is 32 bit, # otherwise FAT is 16 bit. # http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-fat-widths.html ->>>>>>54 string FAT \b, FAT ->>>>>>>54 string FAT12 \b (12 bit) ->>>>>>>54 string FAT16 \b (16 bit) +>>>>>82 string/c !fat32 +>>>>>>54 string FAT12 \b, FAT (12 bit) +>>>>>>54 string FAT16 \b, FAT (16 bit) +>>>>>>54 default x +# determinate FAT bit size by media descriptor +# small floppies implies FAT12 +>>>>>>>21 ubyte <0xF0 \b, FAT (12 bit by descriptor) +# with media descriptor F0h floppy or maybe superfloppy with FAT16 +>>>>>>>21 ubyte =0xF0 +# superfloppy (many sectors) implies FAT16 +>>>>>>>>32 ulelong >0xFFFF \b, FAT (16 bit by descriptor+sectors) +# no superfloppy with media descriptor F0h implies FAT12 +>>>>>>>>32 default x \b, FAT (12 bit by descriptor+sectors) +# with media descriptor F8h floppy or hard disc with FAT12 or FAT16 +>>>>>>>21 ubyte =0xF8 +# 360 KiB with media descriptor F8h, 9 sectors per track ,single sided floppy implies FAT12 +>>>>>>>>19 ubequad 0xd002f80300090001 \b, FAT (12 bit by descriptor+geometry) +# hard disc with FAT12 or FAT16 +>>>>>>>>19 default x \b, FAT (1Y bit by descriptor) +# with media descriptor FAh floppy, RAM disc with FAT12 or FAT16 or Tandy hard disc +>>>>>>>21 ubyte =0xFA +# 320 KiB with media descriptor FAh, 8 sectors per track ,single sided floppy implies FAT12 +>>>>>>>>19 ubequad 0x8002fa0200080001 \b, FAT (12 bit by descriptor+geometry) +# RAM disc with FAT12 or FAT16 or Tandy hard disc +>>>>>>>>19 default x \b, FAT (1Y bit by descriptor) +# others are floppy +>>>>>>>21 default x \b, FAT (12 bit by descriptor) # FAT32 bit specific ->>>>>82 string FAT32 \b, FAT (32 bit) +>>>>>82 string/c fat32 \b, FAT (32 bit) >>>>>>36 ulelong x \b, sectors/FAT %u # http://technet.microsoft.com/en-us/library/cc977221.aspx >>>>>>40 uleshort >0 \b, extension flags 0x%x @@ -1443,9 +1471,12 @@ >>>>>>48 uleshort >1 \b, infoSector %u #>>>>>>48 uleshort =1 \b, infoSector %u (usual) >>>>>>48 uleshort <1 \b, infoSector %u ->>>>>>50 uleshort >6 \b, Backup boot sector %u +# 0 or 0xFFFF instead of usual 6 means no backup sector +>>>>>>50 uleshort =0xFFFF \b, no Backup boot sector +>>>>>>50 uleshort =0 \b, no Backup boot sector #>>>>>>50 uleshort =6 \b, Backup boot sector %u (usual) ->>>>>>50 uleshort <6 \b, Backup boot sector %u +>>>>>>50 default x +>>>>>>>50 uleshort x \b, Backup boot sector %u # corrected by Joerg Jenderek at Feb 2011 according to http://thestarman.pcministry.com/asm/mbr/MSWIN41.htm#FSINFO >>>>>>52 ulelong >0 \b, reserved1 0x%x >>>>>>56 ulelong >0 \b, reserved2 0x%x @@ -1880,12 +1911,11 @@ # defect IO.SYS+MSDOS.SYS ? #>>>>>0x162 use 2xDOS-filename -# CDROM Filesystems -# Modified for UDF by gerardo.cacciari at gmail.com -32769 string CD001 # -!:mime application/x-iso9660-image +0 name cdrom >38913 string !NSR0 ISO 9660 CD-ROM filesystem data +!:mime application/x-iso9660-image >38913 string NSR0 UDF filesystem data +!:mime application/x-iso9660-image >>38917 string 1 (version 1.0) >>38917 string 2 (version 1.5) >>38917 string 3 (version 2.0) @@ -1898,6 +1928,18 @@ !:mime application/x-iso9660-image 32777 string CDROM High Sierra CD-ROM filesystem data +# CDROM Filesystems +# https://en.wikipedia.org/wiki/ISO_9660 +# Modified for UDF by gerardo.cacciari at gmail.com +32769 string CD001 +# mime line at that position does not work +# to display CD-ROM (70=81-11) after MBR (113=40+72+1), partition-table (71=50+21) and before Apple Driver Map (51) +!:strength -11 +# to display CD-ROM (114=81+33) before MBR (113=40+72+1), partition-table (71=50+21) and Apple Driver Map (51) +# does not work +#!:strength +33 +>0 use cdrom + # .cso files 0 string CISO Compressed ISO CD image @@ -2131,7 +2173,6 @@ # which is mapped to VBN 2 of [000000]INDEXF.SYS;1 - gerardo.cacciari at gmail.com # 1008 string DECFILE11 Files-11 On-Disk Structure ->525 byte x Level %d >525 byte x (ODS-%d); >1017 string A RSX-11, VAX/VMS or OpenVMS VAX file system; >1017 string B @@ -2266,14 +2307,31 @@ # UBIfs # Linux kernel sources: fs/ubifs/ubifs-media.h -0 belong 0x31181006 ->0x16 short 0 UBIfs image ->0x08 lequad x \b, sequence number %llu ->0x10 leshort x \b, length %u ->0x04 lelong x \b, CRC 0x%08x - -0 belong 0x55424923 ->0x04 short <2 ->0x05 string \0\0\0 ->0x1c string \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 ->0x04 short x UBI image, version %u +0 lelong 0x06101831 +>0x16 leshort 0 UBIfs image +>0x08 lequad x \b, sequence number %llu +>0x10 leshort x \b, length %u +>0x04 lelong x \b, CRC 0x%08x + +0 lelong 0x23494255 +>0x04 leshort <2 +>0x05 string \0\0\0 +>0x1c string \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 +>0x04 leshort x UBI image, version %u + +# NEC PC-88 2D disk image +# From Fabio R. Schmidlin +0x20 ulelong&0xFFFFFEFF 0x2A0 +>0x10 string \0\0\0\0\0\0\0\0\0\0 +>>0x280 string \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 +>>>0x1A ubyte&0xEF 0 +>>>>0x1B ubyte&0x8F 0 +>>>>>0x1B ubyte&70 <0x40 +>>>>>>0x1C ulelong >0x21 +>>>>>>>0 regex [[:print:]]* NEC PC-88 disk image, name=%s +>>>>>>>>0x1B ubyte 0 \b, media=2D +>>>>>>>>0x1B ubyte 0x10 \b, media=2DD +>>>>>>>>0x1B ubyte 0x20 \b, media=2HD +>>>>>>>>0x1B ubyte 0x30 \b, media=1D +>>>>>>>>0x1B ubyte 0x40 \b, media=1DD +>>>>>>>>0x1A ubyte 0x10 \b, write-protected From brooks at FreeBSD.org Tue Oct 28 16:24:09 2014 From: brooks at FreeBSD.org (Brooks Davis) Date: Tue, 28 Oct 2014 16:24:08 +0000 (UTC) Subject: svn commit: r273789 - vendor/NetBSD/mtree/dist Message-ID: <201410281624.s9SGO8tI041418@svn.freebsd.org> Author: brooks Date: Tue Oct 28 16:24:07 2014 New Revision: 273789 URL: https://svnweb.freebsd.org/changeset/base/273789 Log: Vendor import of NetBSD's mtree(8) at 2014-10-28 Modified: vendor/NetBSD/mtree/dist/create.c vendor/NetBSD/mtree/dist/extern.h vendor/NetBSD/mtree/dist/getid.c vendor/NetBSD/mtree/dist/mtree.c vendor/NetBSD/mtree/dist/spec.c Modified: vendor/NetBSD/mtree/dist/create.c ============================================================================== --- vendor/NetBSD/mtree/dist/create.c Tue Oct 28 16:19:02 2014 (r273788) +++ vendor/NetBSD/mtree/dist/create.c Tue Oct 28 16:24:07 2014 (r273789) @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $ */ +/* $NetBSD: create.c,v 1.73 2014/04/24 17:22:41 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.73 2014/04/24 17:22:41 christos Exp $"); #endif #endif /* not lint */ @@ -91,13 +91,14 @@ static u_long flags; #endif static int dcmp(const FTSENT *FTS_CONST *, const FTSENT *FTS_CONST *); -static void output(int, int *, const char *, ...) - __attribute__((__format__(__printf__, 3, 4))); -static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *); -static void statf(int, FTSENT *); +static void output(FILE *, int, int *, const char *, ...) + __printflike(4, 5); +static int statd(FILE *, FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, + u_long *); +static void statf(FILE *, int, FTSENT *); void -cwalk(void) +cwalk(FILE *fp) { FTS *t; FTSENT *p; @@ -121,7 +122,7 @@ cwalk(void) } if (!nflag) - printf( + fprintf(fp, "#\t user: %s\n#\tmachine: %s\n#\t tree: %s\n" "#\t date: %s", user, host, fullpath, ctime(&clocktime)); @@ -142,21 +143,21 @@ cwalk(void) switch(p->fts_info) { case FTS_D: if (!bflag) - printf("\n"); + fprintf(fp, "\n"); if (!nflag) - printf("# %s\n", p->fts_path); - statd(t, p, &uid, &gid, &mode, &flags); - statf(indent, p); + fprintf(fp, "# %s\n", p->fts_path); + statd(fp, t, p, &uid, &gid, &mode, &flags); + statf(fp, indent, p); break; case FTS_DP: if (p->fts_level > 0) if (!nflag) - printf("%*s# %s\n", indent, "", + fprintf(fp, "%*s# %s\n", indent, "", p->fts_path); if (p->fts_level > 0 || flavor == F_FREEBSD9) { - printf("%*s..\n", indent, ""); + fprintf(fp, "%*s..\n", indent, ""); if (!bflag) - printf("\n"); + fprintf(fp, "\n"); } break; case FTS_DNR: @@ -167,7 +168,7 @@ cwalk(void) break; default: if (!dflag) - statf(indent, p); + statf(fp, indent, p); break; } @@ -178,7 +179,7 @@ cwalk(void) } static void -statf(int indent, FTSENT *p) +statf(FILE *fp, int indent, FTSENT *p) { u_int32_t len, val; int fd, offset; @@ -187,51 +188,54 @@ statf(int indent, FTSENT *p) char *digestbuf; #endif - offset = printf("%*s%s%s", indent, "", + offset = fprintf(fp, "%*s%s%s", indent, "", S_ISDIR(p->fts_statp->st_mode) ? "" : " ", vispath(p->fts_name)); if (offset > (INDENTNAMELEN + indent)) offset = MAXLINELEN; else - offset += printf("%*s", (INDENTNAMELEN + indent) - offset, ""); + offset += fprintf(fp, "%*s", + (INDENTNAMELEN + indent) - offset, ""); if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) - output(indent, &offset, "type=%s", + output(fp, indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) { if (keys & F_UNAME && (name = user_from_uid(p->fts_statp->st_uid, 1)) != NULL) - output(indent, &offset, "uname=%s", name); + output(fp, indent, &offset, "uname=%s", name); if (keys & F_UID || (keys & F_UNAME && name == NULL)) - output(indent, &offset, "uid=%u", p->fts_statp->st_uid); + output(fp, indent, &offset, "uid=%u", + p->fts_statp->st_uid); } if (keys & (F_GID | F_GNAME) && p->fts_statp->st_gid != gid) { if (keys & F_GNAME && (name = group_from_gid(p->fts_statp->st_gid, 1)) != NULL) - output(indent, &offset, "gname=%s", name); + output(fp, indent, &offset, "gname=%s", name); if (keys & F_GID || (keys & F_GNAME && name == NULL)) - output(indent, &offset, "gid=%u", p->fts_statp->st_gid); + output(fp, indent, &offset, "gid=%u", + p->fts_statp->st_gid); } if (keys & F_MODE && (p->fts_statp->st_mode & MBITS) != mode) - output(indent, &offset, "mode=%#o", + output(fp, indent, &offset, "mode=%#o", p->fts_statp->st_mode & MBITS); if (keys & F_DEV && (S_ISBLK(p->fts_statp->st_mode) || S_ISCHR(p->fts_statp->st_mode))) - output(indent, &offset, "device=%#jx", + output(fp, indent, &offset, "device=%#jx", (uintmax_t)p->fts_statp->st_rdev); if (keys & F_NLINK && p->fts_statp->st_nlink != 1) - output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink); + output(fp, indent, &offset, "nlink=%u", p->fts_statp->st_nlink); if (keys & F_SIZE && (flavor == F_FREEBSD9 || S_ISREG(p->fts_statp->st_mode))) - output(indent, &offset, "size=%ju", + output(fp, indent, &offset, "size=%ju", (uintmax_t)p->fts_statp->st_size); if (keys & F_TIME) #if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H) - output(indent, &offset, "time=%jd.%09ld", + output(fp, indent, &offset, "time=%jd.%09ld", (intmax_t)p->fts_statp->st_mtimespec.tv_sec, p->fts_statp->st_mtimespec.tv_nsec); #else - output(indent, &offset, "time=%jd.%09ld", + output(fp, indent, &offset, "time=%jd.%09ld", (intmax_t)p->fts_statp->st_mtime, (long)0); #endif if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) { @@ -239,14 +243,14 @@ statf(int indent, FTSENT *p) crc(fd, &val, &len)) mtree_err("%s: %s", p->fts_accpath, strerror(errno)); close(fd); - output(indent, &offset, "cksum=%lu", (long)val); + output(fp, indent, &offset, "cksum=%lu", (long)val); } #ifndef NO_MD5 if (keys & F_MD5 && S_ISREG(p->fts_statp->st_mode)) { if ((digestbuf = MD5File(p->fts_accpath, NULL)) == NULL) mtree_err("%s: MD5File failed: %s", p->fts_accpath, strerror(errno)); - output(indent, &offset, "%s=%s", MD5KEY, digestbuf); + output(fp, indent, &offset, "%s=%s", MD5KEY, digestbuf); free(digestbuf); } #endif /* ! NO_MD5 */ @@ -255,7 +259,7 @@ statf(int indent, FTSENT *p) if ((digestbuf = RMD160File(p->fts_accpath, NULL)) == NULL) mtree_err("%s: RMD160File failed: %s", p->fts_accpath, strerror(errno)); - output(indent, &offset, "%s=%s", RMD160KEY, digestbuf); + output(fp, indent, &offset, "%s=%s", RMD160KEY, digestbuf); free(digestbuf); } #endif /* ! NO_RMD160 */ @@ -264,7 +268,7 @@ statf(int indent, FTSENT *p) if ((digestbuf = SHA1File(p->fts_accpath, NULL)) == NULL) mtree_err("%s: SHA1File failed: %s", p->fts_accpath, strerror(errno)); - output(indent, &offset, "%s=%s", SHA1KEY, digestbuf); + output(fp, indent, &offset, "%s=%s", SHA1KEY, digestbuf); free(digestbuf); } #endif /* ! NO_SHA1 */ @@ -273,7 +277,7 @@ statf(int indent, FTSENT *p) if ((digestbuf = SHA256_File(p->fts_accpath, NULL)) == NULL) mtree_err("%s: SHA256_File failed: %s", p->fts_accpath, strerror(errno)); - output(indent, &offset, "%s=%s", SHA256KEY, digestbuf); + output(fp, indent, &offset, "%s=%s", SHA256KEY, digestbuf); free(digestbuf); } #ifdef SHA384_BLOCK_LENGTH @@ -281,7 +285,7 @@ statf(int indent, FTSENT *p) if ((digestbuf = SHA384_File(p->fts_accpath, NULL)) == NULL) mtree_err("%s: SHA384_File failed: %s", p->fts_accpath, strerror(errno)); - output(indent, &offset, "%s=%s", SHA384KEY, digestbuf); + output(fp, indent, &offset, "%s=%s", SHA384KEY, digestbuf); free(digestbuf); } #endif @@ -289,18 +293,18 @@ statf(int indent, FTSENT *p) if ((digestbuf = SHA512_File(p->fts_accpath, NULL)) == NULL) mtree_err("%s: SHA512_File failed: %s", p->fts_accpath, strerror(errno)); - output(indent, &offset, "%s=%s", SHA512KEY, digestbuf); + output(fp, indent, &offset, "%s=%s", SHA512KEY, digestbuf); free(digestbuf); } #endif /* ! NO_SHA2 */ if (keys & F_SLINK && (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) - output(indent, &offset, "link=%s", + output(fp, indent, &offset, "link=%s", vispath(rlink(p->fts_accpath))); #if HAVE_STRUCT_STAT_ST_FLAGS if (keys & F_FLAGS && p->fts_statp->st_flags != flags) { char *str = flags_to_string(p->fts_statp->st_flags, "none"); - output(indent, &offset, "flags=%s", str); + output(fp, indent, &offset, "flags=%s", str); free(str); } #endif @@ -324,8 +328,8 @@ statf(int indent, FTSENT *p) #define MTREE_MAXS 16 static int -statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode, - u_long *pflags) +statd(FILE *fp, FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode, + u_long *pflags) { FTSENT *p; gid_t sgid; @@ -398,33 +402,33 @@ statd(FTS *t, FTSENT *parent, uid_t *pui first) { first = 0; if (flavor != F_NETBSD6 && dflag) - printf("/set type=dir"); + fprintf(fp, "/set type=dir"); else - printf("/set type=file"); + fprintf(fp, "/set type=file"); if (keys & (F_UID | F_UNAME)) { if (keys & F_UNAME && (name = user_from_uid(saveuid, 1)) != NULL) - printf(" uname=%s", name); + fprintf(fp, " uname=%s", name); if (keys & F_UID || (keys & F_UNAME && name == NULL)) - printf(" uid=%lu", (u_long)saveuid); + fprintf(fp, " uid=%lu", (u_long)saveuid); } if (keys & (F_GID | F_GNAME)) { if (keys & F_GNAME && (name = group_from_gid(savegid, 1)) != NULL) - printf(" gname=%s", name); + fprintf(fp, " gname=%s", name); if (keys & F_GID || (keys & F_GNAME && name == NULL)) - printf(" gid=%lu", (u_long)savegid); + fprintf(fp, " gid=%lu", (u_long)savegid); } if (keys & F_MODE) - printf(" mode=%#lo", (u_long)savemode); + fprintf(fp, " mode=%#lo", (u_long)savemode); if (keys & F_NLINK) - printf(" nlink=1"); + fprintf(fp, " nlink=1"); if (keys & F_FLAGS) { char *str = flags_to_string(saveflags, "none"); - printf(" flags=%s", str); + fprintf(fp, " flags=%s", str); free(str); } - printf("\n"); + fprintf(fp, "\n"); *puid = saveuid; *pgid = savegid; *pmode = savemode; @@ -455,7 +459,7 @@ dcmp(const FTSENT *FTS_CONST *a, const F } void -output(int indent, int *offset, const char *fmt, ...) +output(FILE *fp, int indent, int *offset, const char *fmt, ...) { va_list ap; char buf[1024]; @@ -465,8 +469,8 @@ output(int indent, int *offset, const ch va_end(ap); if (*offset + strlen(buf) > MAXLINELEN - 3) { - printf(" \\\n%*s", INDENTNAMELEN + indent, ""); + fprintf(fp, " \\\n%*s", INDENTNAMELEN + indent, ""); *offset = INDENTNAMELEN + indent; } - *offset += printf(" %s", buf) + 1; + *offset += fprintf(fp, " %s", buf) + 1; } Modified: vendor/NetBSD/mtree/dist/extern.h ============================================================================== --- vendor/NetBSD/mtree/dist/extern.h Tue Oct 28 16:19:02 2014 (r273788) +++ vendor/NetBSD/mtree/dist/extern.h Tue Oct 28 16:24:07 2014 (r273789) @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.38 2013/02/03 19:15:17 christos Exp $ */ +/* $NetBSD: extern.h,v 1.39 2014/04/24 17:22:41 christos Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -63,8 +63,8 @@ void addtag(slist_t *, char *); int check_excludes(const char *, const char *); int compare(NODE *, FTSENT *); int crc(int, u_int32_t *, u_int32_t *); -void cwalk(void); -void dump_nodes(const char *, NODE *, int); +void cwalk(FILE *); +void dump_nodes(FILE *, const char *, NODE *, int); void init_excludes(void); int matchtags(NODE *); __dead __printflike(1,2) void mtree_err(const char *, ...); Modified: vendor/NetBSD/mtree/dist/getid.c ============================================================================== --- vendor/NetBSD/mtree/dist/getid.c Tue Oct 28 16:19:02 2014 (r273788) +++ vendor/NetBSD/mtree/dist/getid.c Tue Oct 28 16:24:07 2014 (r273789) @@ -1,4 +1,4 @@ -/* $NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $ */ +/* $NetBSD: getid.c,v 1.10 2014/10/27 21:46:45 christos Exp $ */ /* from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */ /* from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */ @@ -65,7 +65,7 @@ #endif #include -__RCSID("$NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $"); +__RCSID("$NetBSD: getid.c,v 1.10 2014/10/27 21:46:45 christos Exp $"); #include @@ -206,7 +206,12 @@ grstart(void) } if (grfile[0] == '\0') /* sanity check */ return 0; - return (_gr_fp = fopen(grfile, "r")) ? 1 : 0; + + _gr_fp = fopen(grfile, "r"); + if (_gr_fp != NULL) + return 1; + warn("Can't open `%s'", grfile); + return 0; } @@ -231,7 +236,7 @@ grscan(int search, gid_t gid, const char continue; } /* skip comments */ - if (pwline[0] == '#') + if (grline[0] == '#') continue; if (grmatchline(search, gid, name)) return 1; @@ -350,7 +355,11 @@ pwstart(void) } if (pwfile[0] == '\0') /* sanity check */ return 0; - return (_pw_fp = fopen(pwfile, "r")) ? 1 : 0; + _pw_fp = fopen(pwfile, "r"); + if (_pw_fp != NULL) + return 1; + warn("Can't open `%s'", pwfile); + return 0; } Modified: vendor/NetBSD/mtree/dist/mtree.c ============================================================================== --- vendor/NetBSD/mtree/dist/mtree.c Tue Oct 28 16:19:02 2014 (r273788) +++ vendor/NetBSD/mtree/dist/mtree.c Tue Oct 28 16:24:07 2014 (r273789) @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.48 2013/04/08 17:39:11 christos Exp $ */ +/* $NetBSD: mtree.c,v 1.49 2014/04/24 17:22:41 christos Exp $ */ /*- * Copyright (c) 1989, 1990, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: mtree.c,v 1.48 2013/04/08 17:39:11 christos Exp $"); +__RCSID("$NetBSD: mtree.c,v 1.49 2014/04/24 17:22:41 christos Exp $"); #endif #endif /* not lint */ @@ -296,11 +296,11 @@ main(int argc, char **argv) mtree_err("-l and -u flags are mutually exclusive"); if (cflag) { - cwalk(); + cwalk(stdout); exit(0); } if (Cflag || Dflag) { - dump_nodes("", spec(spec1), Dflag); + dump_nodes(stdout, "", spec(spec1), Dflag); exit(0); } if (spec2 != NULL) Modified: vendor/NetBSD/mtree/dist/spec.c ============================================================================== --- vendor/NetBSD/mtree/dist/spec.c Tue Oct 28 16:19:02 2014 (r273788) +++ vendor/NetBSD/mtree/dist/spec.c Tue Oct 28 16:24:07 2014 (r273789) @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.88 2013/10/17 17:22:59 christos Exp $ */ +/* $NetBSD: spec.c,v 1.89 2014/04/24 17:22:41 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: spec.c,v 1.88 2013/10/17 17:22:59 christos Exp $"); +__RCSID("$NetBSD: spec.c,v 1.89 2014/04/24 17:22:41 christos Exp $"); #endif #endif /* not lint */ @@ -102,7 +102,7 @@ static void set(char *, NODE *); static void unset(char *, NODE *); static void addchild(NODE *, NODE *); static int nodecmp(const NODE *, const NODE *); -static int appendfield(int, const char *, ...) __printflike(2, 3); +static int appendfield(FILE *, int, const char *, ...) __printflike(3, 4); #define REPLACEPTR(x,v) do { if ((x)) free((x)); (x) = (v); } while (0) @@ -290,21 +290,21 @@ free_nodes(NODE *root) /* * appendfield -- - * Like printf(), but output a space either before or after + * Like fprintf(), but output a space either before or after * the regular output, according to the pathlast flag. */ static int -appendfield(int pathlast, const char *fmt, ...) +appendfield(FILE *fp, int pathlast, const char *fmt, ...) { va_list ap; int result; va_start(ap, fmt); if (!pathlast) - printf(" "); + fprintf(fp, " "); result = vprintf(fmt, ap); if (pathlast) - printf(" "); + fprintf(fp, " "); va_end(ap); return result; } @@ -316,7 +316,7 @@ appendfield(int pathlast, const char *fm * it first. */ void -dump_nodes(const char *dir, NODE *root, int pathlast) +dump_nodes(FILE *fp, const char *dir, NODE *root, int pathlast) { NODE *cur; char path[MAXPATHLEN]; @@ -334,70 +334,75 @@ dump_nodes(const char *dir, NODE *root, mtree_err("Pathname too long."); if (!pathlast) - printf("%s", vispath(path)); + fprintf(fp, "%s", vispath(path)); #define MATCHFLAG(f) ((keys & (f)) && (cur->flags & (f))) if (MATCHFLAG(F_TYPE)) - appendfield(pathlast, "type=%s", nodetype(cur->type)); + appendfield(fp, pathlast, "type=%s", + nodetype(cur->type)); if (MATCHFLAG(F_UID | F_UNAME)) { if (keys & F_UNAME && (name = user_from_uid(cur->st_uid, 1)) != NULL) - appendfield(pathlast, "uname=%s", name); + appendfield(fp, pathlast, "uname=%s", name); else - appendfield(pathlast, "uid=%u", cur->st_uid); + appendfield(fp, pathlast, "uid=%u", + cur->st_uid); } if (MATCHFLAG(F_GID | F_GNAME)) { if (keys & F_GNAME && (name = group_from_gid(cur->st_gid, 1)) != NULL) - appendfield(pathlast, "gname=%s", name); + appendfield(fp, pathlast, "gname=%s", name); else - appendfield(pathlast, "gid=%u", cur->st_gid); + appendfield(fp, pathlast, "gid=%u", + cur->st_gid); } if (MATCHFLAG(F_MODE)) - appendfield(pathlast, "mode=%#o", cur->st_mode); + appendfield(fp, pathlast, "mode=%#o", cur->st_mode); if (MATCHFLAG(F_DEV) && (cur->type == F_BLOCK || cur->type == F_CHAR)) - appendfield(pathlast, "device=%#jx", + appendfield(fp, pathlast, "device=%#jx", (uintmax_t)cur->st_rdev); if (MATCHFLAG(F_NLINK)) - appendfield(pathlast, "nlink=%d", cur->st_nlink); + appendfield(fp, pathlast, "nlink=%d", cur->st_nlink); if (MATCHFLAG(F_SLINK)) - appendfield(pathlast, "link=%s", vispath(cur->slink)); + appendfield(fp, pathlast, "link=%s", + vispath(cur->slink)); if (MATCHFLAG(F_SIZE)) - appendfield(pathlast, "size=%ju", + appendfield(fp, pathlast, "size=%ju", (uintmax_t)cur->st_size); if (MATCHFLAG(F_TIME)) - appendfield(pathlast, "time=%jd.%09ld", + appendfield(fp, pathlast, "time=%jd.%09ld", (intmax_t)cur->st_mtimespec.tv_sec, cur->st_mtimespec.tv_nsec); if (MATCHFLAG(F_CKSUM)) - appendfield(pathlast, "cksum=%lu", cur->cksum); + appendfield(fp, pathlast, "cksum=%lu", cur->cksum); if (MATCHFLAG(F_MD5)) - appendfield(pathlast, "%s=%s", MD5KEY, cur->md5digest); + appendfield(fp, pathlast, "%s=%s", MD5KEY, + cur->md5digest); if (MATCHFLAG(F_RMD160)) - appendfield(pathlast, "%s=%s", RMD160KEY, + appendfield(fp, pathlast, "%s=%s", RMD160KEY, cur->rmd160digest); if (MATCHFLAG(F_SHA1)) - appendfield(pathlast, "%s=%s", SHA1KEY, + appendfield(fp, pathlast, "%s=%s", SHA1KEY, cur->sha1digest); if (MATCHFLAG(F_SHA256)) - appendfield(pathlast, "%s=%s", SHA256KEY, + appendfield(fp, pathlast, "%s=%s", SHA256KEY, cur->sha256digest); if (MATCHFLAG(F_SHA384)) - appendfield(pathlast, "%s=%s", SHA384KEY, + appendfield(fp, pathlast, "%s=%s", SHA384KEY, cur->sha384digest); if (MATCHFLAG(F_SHA512)) - appendfield(pathlast, "%s=%s", SHA512KEY, + appendfield(fp, pathlast, "%s=%s", SHA512KEY, cur->sha512digest); if (MATCHFLAG(F_FLAGS)) { str = flags_to_string(cur->st_flags, "none"); - appendfield(pathlast, "flags=%s", str); + appendfield(fp, pathlast, "flags=%s", str); free(str); } if (MATCHFLAG(F_IGN)) - appendfield(pathlast, "ignore"); + appendfield(fp, pathlast, "ignore"); if (MATCHFLAG(F_OPT)) - appendfield(pathlast, "optional"); + appendfield(fp, pathlast, "optional"); if (MATCHFLAG(F_TAGS)) { /* don't output leading or trailing commas */ p = cur->tags; @@ -406,12 +411,12 @@ dump_nodes(const char *dir, NODE *root, q = p + strlen(p); while(q > p && q[-1] == ',') q--; - appendfield(pathlast, "tags=%.*s", (int)(q - p), p); + appendfield(fp, pathlast, "tags=%.*s", (int)(q - p), p); } puts(pathlast ? vispath(path) : ""); if (cur->child) - dump_nodes(path, cur->child, pathlast); + dump_nodes(fp, path, cur->child, pathlast); } } From brooks at FreeBSD.org Tue Oct 28 16:24:45 2014 From: brooks at FreeBSD.org (Brooks Davis) Date: Tue, 28 Oct 2014 16:24:44 +0000 (UTC) Subject: svn commit: r273790 - vendor/NetBSD/mtree/20141028 Message-ID: <201410281624.s9SGOivx041534@svn.freebsd.org> Author: brooks Date: Tue Oct 28 16:24:44 2014 New Revision: 273790 URL: https://svnweb.freebsd.org/changeset/base/273790 Log: Tag 2014-10-28 import of NetBSD's mtree(8) Added: vendor/NetBSD/mtree/20141028/ - copied from r273789, vendor/NetBSD/mtree/dist/ From jmmv at FreeBSD.org Thu Oct 30 17:14:08 2014 From: jmmv at FreeBSD.org (Julio Merino) Date: Thu, 30 Oct 2014 17:14:07 +0000 (UTC) Subject: svn commit: r273869 - in vendor/atf/dist: . admin atf-c atf-c++ atf-c++/detail atf-c/detail atf-sh bootstrap doc m4 test-programs Message-ID: <201410301714.s9UHE7mp038635@svn.freebsd.org> Author: jmmv Date: Thu Oct 30 17:14:07 2014 New Revision: 273869 URL: https://svnweb.freebsd.org/changeset/base/273869 Log: Import atf-0.21: Released on October 23rd, 2014. * Restored the atf(7) manual page to serve as a reference to all the other manual pages shipped by ATF. * Added the -s flag to atf-sh to support specifying the shell interpreter to be used. * Removed ATF_WORKDIR. The only remaining consumers have been converted to use the standard TMPDIR environment variable. As a benefit, and because Kyua forces the TMPDIR to live within the test case's work directory, any stale files left behind by ATF will be automatically cleaned up. * Documented the environment variables recognized by each component in the relevant manual pages. This information was lost with the atf-config(1) removal. * Added a new "require.diskspace" metadata property to test cases so that they can specify the minimum amount of disk space required for the test to run. * Renamed the atf-{c,c++,sh}-api(3) manual pages to atf-{c,c++,sh}(3) for discoverability purposes. Symbolic links are provided for the time being to still make the old names visible. * Issue #5: Recommend the (expected, actual) idiom for calls to the test macros in the manual pages. * Issue #7: Stopped catching unhandled exceptions in atf-c++ tests. This propagates the crash to the caller, which in turn allows it to obtain proper debugging information. In particular, Kyua should now be able to extract a stacktrace pinpointing the problem. * Issue #8: Fixed atf-c/macros_test:use test failures spotted by the clang that ships with FreeBSD 11.0-CURRENT. * Issue #12: Improved documentation of atf-sh(3) and atf-check(1) by better explaining how they relate to each other. * Issue #14: Stopped setting 'set -e' in atf-sh. This setting was initially added as a way to enable a "strict" mode in the library and to make test cases fail fast when they run unprotected commands. However, doing so in the library is surprising as the responsibility of enabling 'set -e' should be on the user's code. Also, 'set -e' introduces inconsistent behavior on subshells and users do not expect that. * Issue #15: Fixed atf_utils_{fork,wait} to support nested calls. * Issue #16: Fixed test failures (by removing a long-standing hack) on systems that lack \e support in printf(1). * Issue #19: Removed stale references to atf-config and atf-run. Added: vendor/atf/dist/atf-c++/atf-c++.3 (contents, props changed) vendor/atf/dist/atf-c/atf-c.3 (contents, props changed) vendor/atf/dist/atf-sh/atf-sh.3 (contents, props changed) vendor/atf/dist/config.h.in (contents, props changed) vendor/atf/dist/doc/atf.7.in (contents, props changed) Deleted: vendor/atf/dist/atf-c++/atf-c++-api.3 vendor/atf/dist/atf-c++/config.cpp vendor/atf/dist/atf-c++/config.hpp vendor/atf/dist/atf-c++/config_test.cpp vendor/atf/dist/atf-c++/detail/sanity_test.cpp vendor/atf/dist/atf-c/atf-c-api.3 vendor/atf/dist/atf-c/config.c vendor/atf/dist/atf-c/config.h vendor/atf/dist/atf-c/config_test.c vendor/atf/dist/atf-sh/atf-sh-api.3 vendor/atf/dist/bconfig.h.in Modified: vendor/atf/dist/INSTALL vendor/atf/dist/Makefile.am vendor/atf/dist/Makefile.in vendor/atf/dist/NEWS vendor/atf/dist/admin/Makefile.am.inc vendor/atf/dist/admin/check-style-c.awk vendor/atf/dist/admin/check-style-common.awk vendor/atf/dist/admin/check-style-cpp.awk vendor/atf/dist/admin/check-style-man.awk vendor/atf/dist/admin/check-style-shell.awk vendor/atf/dist/admin/check-style.sh vendor/atf/dist/admin/config.guess vendor/atf/dist/admin/config.sub vendor/atf/dist/admin/install-sh vendor/atf/dist/admin/ltmain.sh vendor/atf/dist/atf-c++.hpp vendor/atf/dist/atf-c++/Kyuafile vendor/atf/dist/atf-c++/Makefile.am.inc vendor/atf/dist/atf-c++/atf-c++.m4 vendor/atf/dist/atf-c++/atf_c++_test.cpp vendor/atf/dist/atf-c++/build.cpp vendor/atf/dist/atf-c++/build.hpp vendor/atf/dist/atf-c++/build_test.cpp vendor/atf/dist/atf-c++/check.cpp vendor/atf/dist/atf-c++/check.hpp vendor/atf/dist/atf-c++/check_test.cpp vendor/atf/dist/atf-c++/detail/Kyuafile vendor/atf/dist/atf-c++/detail/Makefile.am.inc vendor/atf/dist/atf-c++/detail/application.cpp vendor/atf/dist/atf-c++/detail/application.hpp vendor/atf/dist/atf-c++/detail/application_test.cpp vendor/atf/dist/atf-c++/detail/auto_array.hpp vendor/atf/dist/atf-c++/detail/auto_array_test.cpp vendor/atf/dist/atf-c++/detail/env.cpp vendor/atf/dist/atf-c++/detail/env.hpp vendor/atf/dist/atf-c++/detail/env_test.cpp vendor/atf/dist/atf-c++/detail/exceptions.cpp vendor/atf/dist/atf-c++/detail/exceptions.hpp vendor/atf/dist/atf-c++/detail/exceptions_test.cpp vendor/atf/dist/atf-c++/detail/fs.cpp vendor/atf/dist/atf-c++/detail/fs.hpp vendor/atf/dist/atf-c++/detail/fs_test.cpp vendor/atf/dist/atf-c++/detail/process.cpp vendor/atf/dist/atf-c++/detail/process.hpp vendor/atf/dist/atf-c++/detail/process_test.cpp vendor/atf/dist/atf-c++/detail/sanity.hpp vendor/atf/dist/atf-c++/detail/test_helpers.cpp vendor/atf/dist/atf-c++/detail/test_helpers.hpp vendor/atf/dist/atf-c++/detail/text.cpp vendor/atf/dist/atf-c++/detail/text.hpp vendor/atf/dist/atf-c++/detail/text_test.cpp vendor/atf/dist/atf-c++/detail/version_helper.cpp vendor/atf/dist/atf-c++/macros.hpp vendor/atf/dist/atf-c++/macros_hpp_test.cpp vendor/atf/dist/atf-c++/macros_test.cpp vendor/atf/dist/atf-c++/pkg_config_test.sh vendor/atf/dist/atf-c++/tests.cpp vendor/atf/dist/atf-c++/tests.hpp vendor/atf/dist/atf-c++/tests_test.cpp vendor/atf/dist/atf-c++/unused_test.cpp vendor/atf/dist/atf-c++/utils.cpp vendor/atf/dist/atf-c++/utils.hpp vendor/atf/dist/atf-c++/utils_test.cpp vendor/atf/dist/atf-c.h vendor/atf/dist/atf-c/Kyuafile vendor/atf/dist/atf-c/Makefile.am.inc vendor/atf/dist/atf-c/atf-c.m4 vendor/atf/dist/atf-c/atf-common.m4 vendor/atf/dist/atf-c/atf_c_test.c vendor/atf/dist/atf-c/build.c vendor/atf/dist/atf-c/build.h vendor/atf/dist/atf-c/build_test.c vendor/atf/dist/atf-c/check.c vendor/atf/dist/atf-c/check.h vendor/atf/dist/atf-c/check_test.c vendor/atf/dist/atf-c/defs.h.in vendor/atf/dist/atf-c/detail/Makefile.am.inc vendor/atf/dist/atf-c/detail/dynstr.c vendor/atf/dist/atf-c/detail/dynstr.h vendor/atf/dist/atf-c/detail/dynstr_test.c vendor/atf/dist/atf-c/detail/env.c vendor/atf/dist/atf-c/detail/env.h vendor/atf/dist/atf-c/detail/env_test.c vendor/atf/dist/atf-c/detail/fs.c vendor/atf/dist/atf-c/detail/fs.h vendor/atf/dist/atf-c/detail/fs_test.c vendor/atf/dist/atf-c/detail/list.c vendor/atf/dist/atf-c/detail/list.h vendor/atf/dist/atf-c/detail/list_test.c vendor/atf/dist/atf-c/detail/map.c vendor/atf/dist/atf-c/detail/map.h vendor/atf/dist/atf-c/detail/map_test.c vendor/atf/dist/atf-c/detail/process.c vendor/atf/dist/atf-c/detail/process.h vendor/atf/dist/atf-c/detail/process_helpers.c vendor/atf/dist/atf-c/detail/process_test.c vendor/atf/dist/atf-c/detail/sanity.c vendor/atf/dist/atf-c/detail/sanity.h vendor/atf/dist/atf-c/detail/sanity_test.c vendor/atf/dist/atf-c/detail/test_helpers.c vendor/atf/dist/atf-c/detail/test_helpers.h vendor/atf/dist/atf-c/detail/text.c vendor/atf/dist/atf-c/detail/text.h vendor/atf/dist/atf-c/detail/text_test.c vendor/atf/dist/atf-c/detail/tp_main.c vendor/atf/dist/atf-c/detail/user.c vendor/atf/dist/atf-c/detail/user.h vendor/atf/dist/atf-c/detail/user_test.c vendor/atf/dist/atf-c/detail/version_helper.c vendor/atf/dist/atf-c/error.c vendor/atf/dist/atf-c/error.h vendor/atf/dist/atf-c/error_fwd.h vendor/atf/dist/atf-c/error_test.c vendor/atf/dist/atf-c/h_build.h vendor/atf/dist/atf-c/macros.h vendor/atf/dist/atf-c/macros_h_test.c vendor/atf/dist/atf-c/macros_test.c vendor/atf/dist/atf-c/pkg_config_test.sh vendor/atf/dist/atf-c/tc.c vendor/atf/dist/atf-c/tc.h vendor/atf/dist/atf-c/tc_test.c vendor/atf/dist/atf-c/tp.c vendor/atf/dist/atf-c/tp.h vendor/atf/dist/atf-c/tp_test.c vendor/atf/dist/atf-c/unused_test.c vendor/atf/dist/atf-c/utils.c vendor/atf/dist/atf-c/utils.h vendor/atf/dist/atf-c/utils_test.c vendor/atf/dist/atf-sh/Makefile.am.inc vendor/atf/dist/atf-sh/atf-check.1 vendor/atf/dist/atf-sh/atf-check.cpp vendor/atf/dist/atf-sh/atf-check_test.sh vendor/atf/dist/atf-sh/atf-sh.1 vendor/atf/dist/atf-sh/atf-sh.cpp vendor/atf/dist/atf-sh/atf-sh.m4 vendor/atf/dist/atf-sh/atf_check_test.sh vendor/atf/dist/atf-sh/config_test.sh vendor/atf/dist/atf-sh/integration_test.sh vendor/atf/dist/atf-sh/libatf-sh.subr vendor/atf/dist/atf-sh/misc_helpers.sh vendor/atf/dist/atf-sh/normalize_test.sh vendor/atf/dist/atf-sh/tc_test.sh vendor/atf/dist/atf-sh/tp_test.sh vendor/atf/dist/bootstrap/Makefile.am.inc vendor/atf/dist/bootstrap/h_tp_atf_check_sh.sh vendor/atf/dist/bootstrap/h_tp_basic_c.c vendor/atf/dist/bootstrap/h_tp_basic_cpp.cpp vendor/atf/dist/bootstrap/h_tp_basic_sh.sh vendor/atf/dist/bootstrap/h_tp_fail.sh vendor/atf/dist/bootstrap/h_tp_pass.sh vendor/atf/dist/bootstrap/package.m4 vendor/atf/dist/bootstrap/t_subr_atf_check.at vendor/atf/dist/bootstrap/t_test_program_compare.at vendor/atf/dist/bootstrap/t_test_program_filter.at vendor/atf/dist/bootstrap/t_test_program_list.at vendor/atf/dist/bootstrap/t_test_program_run.at vendor/atf/dist/bootstrap/testsuite vendor/atf/dist/bootstrap/testsuite.at vendor/atf/dist/configure vendor/atf/dist/configure.ac vendor/atf/dist/doc/Makefile.am.inc vendor/atf/dist/doc/atf-test-case.4 vendor/atf/dist/doc/atf-test-program.1 vendor/atf/dist/m4/cxx-std-funcs.m4 vendor/atf/dist/m4/libtool.m4 vendor/atf/dist/m4/ltoptions.m4 vendor/atf/dist/m4/ltsugar.m4 vendor/atf/dist/m4/ltversion.m4 vendor/atf/dist/m4/lt~obsolete.m4 vendor/atf/dist/m4/module-application.m4 vendor/atf/dist/m4/module-defs.m4 vendor/atf/dist/m4/module-env.m4 vendor/atf/dist/m4/module-fs.m4 vendor/atf/dist/m4/runtime-tool.m4 vendor/atf/dist/test-programs/Makefile.am.inc vendor/atf/dist/test-programs/c_helpers.c vendor/atf/dist/test-programs/common.sh vendor/atf/dist/test-programs/config_test.sh vendor/atf/dist/test-programs/cpp_helpers.cpp vendor/atf/dist/test-programs/expect_test.sh vendor/atf/dist/test-programs/meta_data_test.sh vendor/atf/dist/test-programs/result_test.sh vendor/atf/dist/test-programs/sh_helpers.sh vendor/atf/dist/test-programs/srcdir_test.sh Modified: vendor/atf/dist/INSTALL ============================================================================== --- vendor/atf/dist/INSTALL Thu Oct 30 17:05:32 2014 (r273868) +++ vendor/atf/dist/INSTALL Thu Oct 30 17:14:07 2014 (r273869) @@ -153,14 +153,6 @@ script: library. If empty, the configure script will try to find a suitable interpreter for you. -* ATF_WORKDIR - Possible values: empty, an absolute path. - Default: /tmp or /var/tmp, depending on availability. - - Specifies the directory that ATF will use to place its temporary files - and work directories for test cases. This is just a default and can be - overriden at run time. - The following flags are specific to ATF's 'configure' script: * --enable-developer Modified: vendor/atf/dist/Makefile.am ============================================================================== --- vendor/atf/dist/Makefile.am Thu Oct 30 17:05:32 2014 (r273868) +++ vendor/atf/dist/Makefile.am Thu Oct 30 17:14:07 2014 (r273869) @@ -1,6 +1,3 @@ -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -25,7 +22,6 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# atf_aclocal_DATA = BUILT_SOURCES = @@ -68,6 +64,10 @@ EXTRA_DIST += $(doc_DATA) INSTALL README TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \ PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig +# Allow the caller to override the configuration file to passed to our +# test runs below. +KYUA_TEST_CONFIG_FILE = none + testsdir = $(exec_prefix)/tests pkgtestsdir = $(testsdir)/$(PACKAGE) @@ -75,7 +75,8 @@ PHONY_TARGETS += installcheck-kyua if HAVE_KYUA INSTALLCHECK_TARGETS += installcheck-kyua installcheck-kyua: - cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test + cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) \ + $(KYUA) --config='$(KYUA_TEST_CONFIG_FILE)' test endif installcheck-local: $(INSTALLCHECK_TARGETS) @@ -84,10 +85,14 @@ pkgtests_DATA = Kyuafile EXTRA_DIST += $(pkgtests_DATA) BUILD_SH_TP = \ - echo "Creating $${dst}"; \ - echo "\#! $(bindir)/atf-sh" >$${dst}; \ - cat $${src} >>$${dst}; \ - chmod +x $${dst} + test -d "$$(dirname "$${dst}")" || mkdir -p "$$(dirname "$${dst}")"; \ + echo "\#! $(bindir)/atf-sh" >"$${dst}"; \ + if [ -n "$${substs}" ]; then \ + cat $${src} | sed $${substs} >>"$${dst}"; \ + else \ + cat $${src} >>"$${dst}"; \ + fi; \ + chmod +x "$${dst}" # # Custom targets. @@ -97,14 +102,14 @@ PHONY_TARGETS += clean-all clean-all: GIT="$(GIT)" $(SH) $(srcdir)/admin/clean-all.sh -PHONY_TARGETS += release -release: - $(SH) $(srcdir)/admin/release.sh $(PACKAGE_VERSION) $(DIST_ARCHIVES) - -PHONY_TARGETS += release-test -release-test: - $(SH) $(srcdir)/admin/release-test.sh $(DIST_ARCHIVES) - .PHONY: $(PHONY_TARGETS) +# TODO(jmmv): Remove after atf 0.22. +install-data-hook: + cd $(DESTDIR)$(man3dir) && \ + for binding in c c++ sh; do \ + rm -f "atf-$${binding}-api.3"; \ + $(LN_S) "atf-$${binding}.3" "atf-$${binding}-api.3"; \ + done + # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 Modified: vendor/atf/dist/Makefile.in ============================================================================== --- vendor/atf/dist/Makefile.in Thu Oct 30 17:05:32 2014 (r273868) +++ vendor/atf/dist/Makefile.in Thu Oct 30 17:14:07 2014 (r273869) @@ -14,9 +14,6 @@ @SET_MAKE@ -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -41,11 +38,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -70,11 +63,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -99,11 +88,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -128,11 +113,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -157,11 +138,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -186,11 +163,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -215,11 +188,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -244,11 +213,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -273,11 +238,7 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -# Automated Testing Framework (atf) -# # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. # @@ -302,7 +263,6 @@ # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# @@ -385,7 +345,7 @@ DIST_COMMON = $(srcdir)/admin/Makefile.a $(srcdir)/doc/Makefile.am.inc \ $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/bconfig.h.in \ + $(am__configure_deps) $(srcdir)/config.h.in \ $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/admin/depcomp \ $(dist_man_MANS) $(atf_c_HEADERS) $(atf_c___HEADERS) \ $(include_HEADERS) AUTHORS COPYING INSTALL NEWS README \ @@ -397,9 +357,9 @@ DIST_COMMON = $(srcdir)/admin/Makefile.a $(top_srcdir)/admin/ltmain.sh $(top_srcdir)/admin/missing tests_atf_c_PROGRAMS = atf-c/atf_c_test$(EXEEXT) \ atf-c/build_test$(EXEEXT) atf-c/check_test$(EXEEXT) \ - atf-c/config_test$(EXEEXT) atf-c/error_test$(EXEEXT) \ - atf-c/macros_test$(EXEEXT) atf-c/tc_test$(EXEEXT) \ - atf-c/tp_test$(EXEEXT) atf-c/utils_test$(EXEEXT) + atf-c/error_test$(EXEEXT) atf-c/macros_test$(EXEEXT) \ + atf-c/tc_test$(EXEEXT) atf-c/tp_test$(EXEEXT) \ + atf-c/utils_test$(EXEEXT) tests_atf_c_detail_PROGRAMS = atf-c/detail/dynstr_test$(EXEEXT) \ atf-c/detail/env_test$(EXEEXT) atf-c/detail/fs_test$(EXEEXT) \ atf-c/detail/list_test$(EXEEXT) atf-c/detail/map_test$(EXEEXT) \ @@ -411,8 +371,8 @@ tests_atf_c_detail_PROGRAMS = atf-c/deta atf-c/detail/version_helper$(EXEEXT) tests_atf_c___PROGRAMS = atf-c++/atf_c++_test$(EXEEXT) \ atf-c++/build_test$(EXEEXT) atf-c++/check_test$(EXEEXT) \ - atf-c++/config_test$(EXEEXT) atf-c++/macros_test$(EXEEXT) \ - atf-c++/tests_test$(EXEEXT) atf-c++/utils_test$(EXEEXT) + atf-c++/macros_test$(EXEEXT) atf-c++/tests_test$(EXEEXT) \ + atf-c++/utils_test$(EXEEXT) tests_atf_c___detail_PROGRAMS = \ atf-c++/detail/application_test$(EXEEXT) \ atf-c++/detail/auto_array_test$(EXEEXT) \ @@ -420,7 +380,6 @@ tests_atf_c___detail_PROGRAMS = \ atf-c++/detail/exceptions_test$(EXEEXT) \ atf-c++/detail/fs_test$(EXEEXT) \ atf-c++/detail/process_test$(EXEEXT) \ - atf-c++/detail/sanity_test$(EXEEXT) \ atf-c++/detail/text_test$(EXEEXT) \ atf-c++/detail/version_helper$(EXEEXT) check_PROGRAMS = bootstrap/h_tp_basic_c$(EXEEXT) \ @@ -444,7 +403,7 @@ am__configure_deps = $(am__aclocal_m4_de am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = bconfig.h +CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = atf-c/defs.h CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -484,7 +443,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tests_atf_shdir)" \ "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" \ - "$(DESTDIR)$(atf_aclocaldir)" \ + "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(atf_aclocaldir)" \ "$(DESTDIR)$(atf_c__dirpkgconfigdir)" \ "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" \ "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(docdir)" \ @@ -494,12 +453,12 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tests_atf_c_detaildir)" \ "$(DESTDIR)$(tests_atf_shdir)" \ "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(atf_cdir)" \ - "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)" + "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(atf_cdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) atf_c___detail_libtest_helpers_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp -am_atf_c___detail_libtest_helpers_la_OBJECTS = \ - atf-c++/detail/test_helpers.lo +am_atf_c___detail_libtest_helpers_la_OBJECTS = atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo atf_c___detail_libtest_helpers_la_OBJECTS = \ $(am_atf_c___detail_libtest_helpers_la_OBJECTS) AM_V_lt = $(am__v_lt_ at AM_V@) @@ -513,7 +472,7 @@ atf_c_detail_libtest_helpers_la_OBJECTS $(am_atf_c_detail_libtest_helpers_la_OBJECTS) libatf_c___la_DEPENDENCIES = libatf-c.la am_libatf_c___la_OBJECTS = atf-c++/build.lo atf-c++/check.lo \ - atf-c++/config.lo atf-c++/tests.lo atf-c++/utils.lo \ + atf-c++/tests.lo atf-c++/utils.lo \ atf-c++/detail/application.lo atf-c++/detail/env.lo \ atf-c++/detail/exceptions.lo atf-c++/detail/fs.lo \ atf-c++/detail/process.lo atf-c++/detail/text.lo @@ -524,10 +483,9 @@ libatf_c___la_LINK = $(LIBTOOL) $(AM_V_l -o $@ libatf_c_la_LIBADD = am_libatf_c_la_OBJECTS = atf-c/libatf_c_la-build.lo \ - atf-c/libatf_c_la-check.lo atf-c/libatf_c_la-config.lo \ - atf-c/libatf_c_la-error.lo atf-c/libatf_c_la-tc.lo \ - atf-c/libatf_c_la-tp.lo atf-c/libatf_c_la-utils.lo \ - atf-c/detail/libatf_c_la-dynstr.lo \ + atf-c/libatf_c_la-check.lo atf-c/libatf_c_la-error.lo \ + atf-c/libatf_c_la-tc.lo atf-c/libatf_c_la-tp.lo \ + atf-c/libatf_c_la-utils.lo atf-c/detail/libatf_c_la-dynstr.lo \ atf-c/detail/libatf_c_la-env.lo atf-c/detail/libatf_c_la-fs.lo \ atf-c/detail/libatf_c_la-list.lo \ atf-c/detail/libatf_c_la-map.lo \ @@ -557,10 +515,6 @@ am_atf_c___check_test_OBJECTS = atf-c++/ atf_c___check_test_OBJECTS = $(am_atf_c___check_test_OBJECTS) atf_c___check_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \ $(ATF_CXX_LIBS) -am_atf_c___config_test_OBJECTS = atf-c++/config_test.$(OBJEXT) -atf_c___config_test_OBJECTS = $(am_atf_c___config_test_OBJECTS) -atf_c___config_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \ - $(ATF_CXX_LIBS) am_atf_c___detail_application_test_OBJECTS = \ atf-c++/detail/application_test.$(OBJEXT) atf_c___detail_application_test_OBJECTS = \ @@ -595,12 +549,6 @@ atf_c___detail_process_test_OBJECTS = \ $(am_atf_c___detail_process_test_OBJECTS) atf_c___detail_process_test_DEPENDENCIES = \ atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -am_atf_c___detail_sanity_test_OBJECTS = \ - atf-c++/detail/sanity_test.$(OBJEXT) -atf_c___detail_sanity_test_OBJECTS = \ - $(am_atf_c___detail_sanity_test_OBJECTS) -atf_c___detail_sanity_test_DEPENDENCIES = \ - atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) am_atf_c___detail_text_test_OBJECTS = \ atf-c++/detail/text_test.$(OBJEXT) atf_c___detail_text_test_OBJECTS = \ @@ -636,10 +584,6 @@ am_atf_c_check_test_OBJECTS = atf-c/chec atf_c_check_test_OBJECTS = $(am_atf_c_check_test_OBJECTS) atf_c_check_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \ libatf-c.la -am_atf_c_config_test_OBJECTS = atf-c/config_test.$(OBJEXT) -atf_c_config_test_OBJECTS = $(am_atf_c_config_test_OBJECTS) -atf_c_config_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \ - libatf-c.la am_atf_c_detail_dynstr_test_OBJECTS = \ atf-c/detail/dynstr_test.$(OBJEXT) atf_c_detail_dynstr_test_OBJECTS = \ @@ -712,10 +656,11 @@ am_atf_c_utils_test_OBJECTS = atf-c/util atf_c_utils_test_OBJECTS = $(am_atf_c_utils_test_OBJECTS) atf_c_utils_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \ libatf-c.la -am_atf_sh_atf_check_OBJECTS = atf-sh/atf-check.$(OBJEXT) +am_atf_sh_atf_check_OBJECTS = \ + atf-sh/atf_sh_atf_check-atf-check.$(OBJEXT) atf_sh_atf_check_OBJECTS = $(am_atf_sh_atf_check_OBJECTS) atf_sh_atf_check_DEPENDENCIES = $(ATF_CXX_LIBS) -am_atf_sh_atf_sh_OBJECTS = atf-sh/atf-sh.$(OBJEXT) +am_atf_sh_atf_sh_OBJECTS = atf-sh/atf_sh_atf_sh-atf-sh.$(OBJEXT) atf_sh_atf_sh_OBJECTS = $(am_atf_sh_atf_sh_OBJECTS) atf_sh_atf_sh_DEPENDENCIES = $(ATF_CXX_LIBS) am_bootstrap_h_tp_basic_c_OBJECTS = bootstrap/h_tp_basic_c.$(OBJEXT) @@ -795,20 +740,17 @@ SOURCES = $(atf_c___detail_libtest_helpe $(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \ $(nodist_libatf_c_la_SOURCES) $(atf_c___atf_c___test_SOURCES) \ $(atf_c___build_test_SOURCES) $(atf_c___check_test_SOURCES) \ - $(atf_c___config_test_SOURCES) \ $(atf_c___detail_application_test_SOURCES) \ $(atf_c___detail_auto_array_test_SOURCES) \ $(atf_c___detail_env_test_SOURCES) \ $(atf_c___detail_exceptions_test_SOURCES) \ $(atf_c___detail_fs_test_SOURCES) \ $(atf_c___detail_process_test_SOURCES) \ - $(atf_c___detail_sanity_test_SOURCES) \ $(atf_c___detail_text_test_SOURCES) \ $(atf_c___detail_version_helper_SOURCES) \ $(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \ $(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \ $(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \ - $(atf_c_config_test_SOURCES) \ $(atf_c_detail_dynstr_test_SOURCES) \ $(atf_c_detail_env_test_SOURCES) \ $(atf_c_detail_fs_test_SOURCES) \ @@ -831,20 +773,18 @@ DIST_SOURCES = $(atf_c___detail_libtest_ $(atf_c_detail_libtest_helpers_la_SOURCES) \ $(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \ $(atf_c___atf_c___test_SOURCES) $(atf_c___build_test_SOURCES) \ - $(atf_c___check_test_SOURCES) $(atf_c___config_test_SOURCES) \ + $(atf_c___check_test_SOURCES) \ $(atf_c___detail_application_test_SOURCES) \ $(atf_c___detail_auto_array_test_SOURCES) \ $(atf_c___detail_env_test_SOURCES) \ $(atf_c___detail_exceptions_test_SOURCES) \ $(atf_c___detail_fs_test_SOURCES) \ $(atf_c___detail_process_test_SOURCES) \ - $(atf_c___detail_sanity_test_SOURCES) \ $(atf_c___detail_text_test_SOURCES) \ $(atf_c___detail_version_helper_SOURCES) \ $(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \ $(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \ $(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \ - $(atf_c_config_test_SOURCES) \ $(atf_c_detail_dynstr_test_SOURCES) \ $(atf_c_detail_env_test_SOURCES) \ $(atf_c_detail_fs_test_SOURCES) \ @@ -871,6 +811,7 @@ am__can_run_installinfo = \ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 man4dir = $(mandir)/man4 +man7dir = $(mandir)/man7 NROFF = nroff MANS = $(dist_man_MANS) $(man_MANS) DATA = $(atf_aclocal_DATA) $(atf_c__dirpkgconfig_DATA) \ @@ -879,9 +820,10 @@ DATA = $(atf_aclocal_DATA) $(atf_c__dirp $(tests_atf_c_DATA) $(tests_atf_c___DATA) \ $(tests_atf_c___detail_DATA) $(tests_atf_c_detail_DATA) \ $(tests_atf_sh_DATA) $(tests_test_programs_DATA) -HEADERS = $(atf_c_HEADERS) $(atf_c___HEADERS) $(include_HEADERS) +HEADERS = $(atf_c_HEADERS) $(atf_c___HEADERS) $(include_HEADERS) \ + $(nodist_atf_c_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)bconfig.h.in + $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -930,7 +872,6 @@ ATF_BUILD_CPPFLAGS = @ATF_BUILD_CPPFLAGS ATF_BUILD_CXX = @ATF_BUILD_CXX@ ATF_BUILD_CXXFLAGS = @ATF_BUILD_CXXFLAGS@ ATF_SHELL = @ATF_SHELL@ -ATF_WORKDIR = @ATF_WORKDIR@ ATTRIBUTE_FORMAT_PRINTF = @ATTRIBUTE_FORMAT_PRINTF@ ATTRIBUTE_NORETURN = @ATTRIBUTE_NORETURN@ ATTRIBUTE_UNUSED = @ATTRIBUTE_UNUSED@ @@ -1067,7 +1008,7 @@ CLEANFILES = atf-c/atf-c.pc atf-c/pkg_co atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \ atf-sh/tp_test bootstrap/h_tp_basic_sh \ bootstrap/h_tp_atf_check_sh bootstrap/h_tp_fail \ - bootstrap/h_tp_pass test-programs/sh_helpers \ + bootstrap/h_tp_pass doc/atf.7 test-programs/sh_helpers \ test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ test-programs/srcdir_test @@ -1087,18 +1028,18 @@ EXTRA_DIST = admin/check-style-common.aw bootstrap/h_tp_basic_sh.sh bootstrap/h_tp_atf_check_sh.sh \ bootstrap/h_tp_fail.sh bootstrap/h_tp_pass.sh \ bootstrap/testsuite bootstrap/package.m4 \ - bootstrap/testsuite.at $(testsuite_incs) \ + bootstrap/testsuite.at $(testsuite_incs) doc/atf.7.in \ $(tests_test_programs_DATA) test-programs/common.sh \ test-programs/sh_helpers.sh test-programs/config_test.sh \ test-programs/expect_test.sh test-programs/meta_data_test.sh \ test-programs/result_test.sh test-programs/srcdir_test.sh \ $(doc_DATA) INSTALL README $(pkgtests_DATA) -dist_man_MANS = atf-c/atf-c-api.3 atf-c++/atf-c++-api.3 \ - atf-sh/atf-check.1 atf-sh/atf-sh.1 atf-sh/atf-sh-api.3 \ - doc/atf-test-case.4 doc/atf-test-program.1 +dist_man_MANS = atf-c/atf-c.3 atf-c++/atf-c++.3 atf-sh/atf-check.1 \ + atf-sh/atf-sh.1 atf-sh/atf-sh.3 doc/atf-test-case.4 \ + doc/atf-test-program.1 include_HEADERS = atf-c.h atf-c++.hpp lib_LTLIBRARIES = libatf-c.la libatf-c++.la -man_MANS = +man_MANS = doc/atf.7 noinst_DATA = INSTALL README noinst_LTLIBRARIES = atf-c/detail/libtest_helpers.la \ atf-c++/detail/libtest_helpers.la @@ -1108,38 +1049,31 @@ INSTALLCHECK_TARGETS = installcheck-boot # Custom targets. # PHONY_TARGETS = check-style installcheck-bootstrap installcheck-kyua \ - clean-all release release-test + clean-all ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tools libatf_c_la_SOURCES = atf-c/build.c atf-c/build.h atf-c/check.c \ - atf-c/check.h atf-c/config.c atf-c/config.h atf-c/error.c \ - atf-c/error.h atf-c/error_fwd.h atf-c/macros.h atf-c/tc.c \ - atf-c/tc.h atf-c/tp.c atf-c/tp.h atf-c/utils.c atf-c/utils.h \ - atf-c/detail/dynstr.c atf-c/detail/dynstr.h atf-c/detail/env.c \ - atf-c/detail/env.h atf-c/detail/fs.c atf-c/detail/fs.h \ - atf-c/detail/list.c atf-c/detail/list.h atf-c/detail/map.c \ - atf-c/detail/map.h atf-c/detail/process.c \ - atf-c/detail/process.h atf-c/detail/sanity.c \ - atf-c/detail/sanity.h atf-c/detail/text.c atf-c/detail/text.h \ - atf-c/detail/tp_main.c atf-c/detail/user.c atf-c/detail/user.h + atf-c/check.h atf-c/error.c atf-c/error.h atf-c/error_fwd.h \ + atf-c/macros.h atf-c/tc.c atf-c/tc.h atf-c/tp.c atf-c/tp.h \ + atf-c/utils.c atf-c/utils.h atf-c/detail/dynstr.c \ + atf-c/detail/dynstr.h atf-c/detail/env.c atf-c/detail/env.h \ + atf-c/detail/fs.c atf-c/detail/fs.h atf-c/detail/list.c \ + atf-c/detail/list.h atf-c/detail/map.c atf-c/detail/map.h \ + atf-c/detail/process.c atf-c/detail/process.h \ + atf-c/detail/sanity.c atf-c/detail/sanity.h \ + atf-c/detail/text.c atf-c/detail/text.h atf-c/detail/tp_main.c \ + atf-c/detail/user.c atf-c/detail/user.h nodist_libatf_c_la_SOURCES = atf-c/defs.h libatf_c_la_CPPFLAGS = "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ - "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ - "-DATF_INCLUDEDIR=\"$(includedir)\"" \ - "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ - "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ - "-DATF_SHELL=\"$(ATF_SHELL)\"" \ - "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" + "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" -libatf_c_la_LDFLAGS = -version-info 0:0:0 +libatf_c_la_LDFLAGS = -version-info 1:0:0 atf_c_HEADERS = atf-c/build.h \ atf-c/check.h \ - atf-c/config.h \ - atf-c/defs.h \ atf-c/error.h \ atf-c/error_fwd.h \ atf-c/macros.h \ @@ -1147,6 +1081,7 @@ atf_c_HEADERS = atf-c/build.h \ atf-c/tp.h \ atf-c/utils.h +nodist_atf_c_HEADERS = atf-c/defs.h atf_cdir = $(includedir)/atf-c atf_cpkgconfigdir = $(atf_pkgconfigdir) atf_cpkgconfig_DATA = atf-c/atf-c.pc @@ -1161,8 +1096,6 @@ atf_c_build_test_SOURCES = atf-c/build_t atf_c_build_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_check_test_SOURCES = atf-c/check_test.c atf_c_check_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la -atf_c_config_test_SOURCES = atf-c/config_test.c -atf_c_config_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_error_test_SOURCES = atf-c/error_test.c atf_c_error_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_macros_test_SOURCES = atf-c/macros_test.c @@ -1179,7 +1112,9 @@ tests_atf_c_detaildir = $(pkgtestsdir)/a atf_c_detail_libtest_helpers_la_SOURCES = atf-c/detail/test_helpers.c \ atf-c/detail/test_helpers.h -atf_c_detail_libtest_helpers_la_CPPFLAGS = -I$(srcdir)/atf-c +atf_c_detail_libtest_helpers_la_CPPFLAGS = -I$(srcdir)/atf-c \ + -DATF_INCLUDEDIR=\"$(includedir)\" + atf_c_detail_dynstr_test_SOURCES = atf-c/detail/dynstr_test.c atf_c_detail_dynstr_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_detail_env_test_SOURCES = atf-c/detail/env_test.c @@ -1203,20 +1138,19 @@ atf_c_detail_version_helper_SOURCES = at ATF_CXX_LIBS = libatf-c++.la libatf-c.la libatf_c___la_LIBADD = libatf-c.la libatf_c___la_SOURCES = atf-c++/build.cpp atf-c++/build.hpp \ - atf-c++/check.cpp atf-c++/check.hpp atf-c++/config.cpp \ - atf-c++/config.hpp atf-c++/macros.hpp atf-c++/tests.cpp \ - atf-c++/tests.hpp atf-c++/utils.cpp atf-c++/utils.hpp \ - atf-c++/detail/application.cpp atf-c++/detail/application.hpp \ - atf-c++/detail/auto_array.hpp atf-c++/detail/env.cpp \ - atf-c++/detail/env.hpp atf-c++/detail/exceptions.cpp \ - atf-c++/detail/exceptions.hpp atf-c++/detail/fs.cpp \ - atf-c++/detail/fs.hpp atf-c++/detail/process.cpp \ - atf-c++/detail/process.hpp atf-c++/detail/sanity.hpp \ - atf-c++/detail/text.cpp atf-c++/detail/text.hpp -libatf_c___la_LDFLAGS = -version-info 1:0:0 + atf-c++/check.cpp atf-c++/check.hpp atf-c++/macros.hpp \ + atf-c++/tests.cpp atf-c++/tests.hpp atf-c++/utils.cpp \ + atf-c++/utils.hpp atf-c++/detail/application.cpp \ + atf-c++/detail/application.hpp atf-c++/detail/auto_array.hpp \ + atf-c++/detail/env.cpp atf-c++/detail/env.hpp \ + atf-c++/detail/exceptions.cpp atf-c++/detail/exceptions.hpp \ + atf-c++/detail/fs.cpp atf-c++/detail/fs.hpp \ + atf-c++/detail/process.cpp atf-c++/detail/process.hpp \ + atf-c++/detail/sanity.hpp atf-c++/detail/text.cpp \ + atf-c++/detail/text.hpp +libatf_c___la_LDFLAGS = -version-info 2:0:0 atf_c___HEADERS = atf-c++/build.hpp \ atf-c++/check.hpp \ - atf-c++/config.hpp \ atf-c++/macros.hpp \ atf-c++/tests.hpp \ atf-c++/utils.hpp @@ -1235,8 +1169,6 @@ atf_c___build_test_SOURCES = atf-c++/bui atf_c___build_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___check_test_SOURCES = atf-c++/check_test.cpp atf_c___check_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -atf_c___config_test_SOURCES = atf-c++/config_test.cpp -atf_c___config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___macros_test_SOURCES = atf-c++/macros_test.cpp atf_c___macros_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) tests_atf_c___SCRIPTS = atf-c++/pkg_config_test @@ -1249,6 +1181,7 @@ tests_atf_c___detaildir = $(pkgtestsdir) atf_c___detail_libtest_helpers_la_SOURCES = atf-c++/detail/test_helpers.cpp \ atf-c++/detail/test_helpers.hpp +atf_c___detail_libtest_helpers_la_CPPFLAGS = -DATF_INCLUDEDIR=\"$(includedir)\" atf_c___detail_application_test_SOURCES = atf-c++/detail/application_test.cpp atf_c___detail_application_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_auto_array_test_SOURCES = atf-c++/detail/auto_array_test.cpp @@ -1261,14 +1194,17 @@ atf_c___detail_fs_test_SOURCES = atf-c++ atf_c___detail_fs_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_process_test_SOURCES = atf-c++/detail/process_test.cpp atf_c___detail_process_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -atf_c___detail_sanity_test_SOURCES = atf-c++/detail/sanity_test.cpp -atf_c___detail_sanity_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_text_test_SOURCES = atf-c++/detail/text_test.cpp atf_c___detail_text_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_version_helper_SOURCES = atf-c++/detail/version_helper.cpp atf_sh_atf_check_SOURCES = atf-sh/atf-check.cpp atf_sh_atf_check_LDADD = $(ATF_CXX_LIBS) +atf_sh_atf_check_CPPFLAGS = -DATF_SHELL=\"$(ATF_SHELL)\" atf_sh_atf_sh_SOURCES = atf-sh/atf-sh.cpp +atf_sh_atf_sh_CPPFLAGS = -DATF_LIBEXECDIR=\"$(libexecdir)\" \ + -DATF_PKGDATADIR=\"$(pkgdatadir)\" \ + -DATF_SHELL=\"$(ATF_SHELL)\" + atf_sh_atf_sh_LDADD = $(ATF_CXX_LIBS) atf_sh_DATA = atf-sh/libatf-sh.subr atf_shdir = $(pkgdatadir) @@ -1320,16 +1256,24 @@ doc_DATA = AUTHORS COPYING NEWS README TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \ PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig + +# Allow the caller to override the configuration file to passed to our +# test runs below. +KYUA_TEST_CONFIG_FILE = none testsdir = $(exec_prefix)/tests pkgtestsdir = $(testsdir)/$(PACKAGE) pkgtests_DATA = Kyuafile BUILD_SH_TP = \ - echo "Creating $${dst}"; \ - echo "\#! $(bindir)/atf-sh" >$${dst}; \ - cat $${src} >>$${dst}; \ - chmod +x $${dst} + test -d "$$(dirname "$${dst}")" || mkdir -p "$$(dirname "$${dst}")"; \ + echo "\#! $(bindir)/atf-sh" >"$${dst}"; \ + if [ -n "$${substs}" ]; then \ + cat $${src} | sed $${substs} >>"$${dst}"; \ + else \ + cat $${src} >>"$${dst}"; \ + fi; \ + chmod +x "$${dst}" -all: $(BUILT_SOURCES) bconfig.h +all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -1370,20 +1314,20 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -bconfig.h: stamp-h1 +config.h: stamp-h1 @test -f $@ || rm -f stamp-h1 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 -stamp-h1: $(srcdir)/bconfig.h.in $(top_builddir)/config.status +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status bconfig.h -$(srcdir)/bconfig.h.in: $(am__configure_deps) + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ distclean-hdr: - -rm -f bconfig.h stamp-h1 + -rm -f config.h stamp-h1 atf-c/defs.h: $(top_builddir)/config.status $(top_srcdir)/atf-c/defs.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -1438,7 +1382,8 @@ atf-c++/detail/$(am__dirstamp): atf-c++/detail/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) atf-c++/detail/$(DEPDIR) @: > atf-c++/detail/$(DEPDIR)/$(am__dirstamp) -atf-c++/detail/test_helpers.lo: atf-c++/detail/$(am__dirstamp) \ +atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo: \ + atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) atf-c++/detail/libtest_helpers.la: $(atf_c___detail_libtest_helpers_la_OBJECTS) $(atf_c___detail_libtest_helpers_la_DEPENDENCIES) $(EXTRA_atf_c___detail_libtest_helpers_la_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) @@ -1465,8 +1410,6 @@ atf-c++/build.lo: atf-c++/$(am__dirstamp atf-c++/$(DEPDIR)/$(am__dirstamp) atf-c++/check.lo: atf-c++/$(am__dirstamp) \ atf-c++/$(DEPDIR)/$(am__dirstamp) -atf-c++/config.lo: atf-c++/$(am__dirstamp) \ - atf-c++/$(DEPDIR)/$(am__dirstamp) atf-c++/tests.lo: atf-c++/$(am__dirstamp) \ atf-c++/$(DEPDIR)/$(am__dirstamp) atf-c++/utils.lo: atf-c++/$(am__dirstamp) \ @@ -1496,8 +1439,6 @@ atf-c/libatf_c_la-build.lo: atf-c/$(am__ atf-c/$(DEPDIR)/$(am__dirstamp) atf-c/libatf_c_la-check.lo: atf-c/$(am__dirstamp) \ atf-c/$(DEPDIR)/$(am__dirstamp) -atf-c/libatf_c_la-config.lo: atf-c/$(am__dirstamp) \ - atf-c/$(DEPDIR)/$(am__dirstamp) atf-c/libatf_c_la-error.lo: atf-c/$(am__dirstamp) \ atf-c/$(DEPDIR)/$(am__dirstamp) atf-c/libatf_c_la-tc.lo: atf-c/$(am__dirstamp) \ @@ -1899,12 +1840,6 @@ atf-c++/check_test.$(OBJEXT): atf-c++/$( atf-c++/check_test$(EXEEXT): $(atf_c___check_test_OBJECTS) $(atf_c___check_test_DEPENDENCIES) $(EXTRA_atf_c___check_test_DEPENDENCIES) atf-c++/$(am__dirstamp) @rm -f atf-c++/check_test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_c___check_test_OBJECTS) $(atf_c___check_test_LDADD) $(LIBS) -atf-c++/config_test.$(OBJEXT): atf-c++/$(am__dirstamp) \ - atf-c++/$(DEPDIR)/$(am__dirstamp) - -atf-c++/config_test$(EXEEXT): $(atf_c___config_test_OBJECTS) $(atf_c___config_test_DEPENDENCIES) $(EXTRA_atf_c___config_test_DEPENDENCIES) atf-c++/$(am__dirstamp) - @rm -f atf-c++/config_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_c___config_test_OBJECTS) $(atf_c___config_test_LDADD) $(LIBS) atf-c++/detail/application_test.$(OBJEXT): \ atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) @@ -1944,12 +1879,6 @@ atf-c++/detail/process_test.$(OBJEXT): a atf-c++/detail/process_test$(EXEEXT): $(atf_c___detail_process_test_OBJECTS) $(atf_c___detail_process_test_DEPENDENCIES) $(EXTRA_atf_c___detail_process_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) @rm -f atf-c++/detail/process_test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_process_test_OBJECTS) $(atf_c___detail_process_test_LDADD) $(LIBS) -atf-c++/detail/sanity_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ - atf-c++/detail/$(DEPDIR)/$(am__dirstamp) - -atf-c++/detail/sanity_test$(EXEEXT): $(atf_c___detail_sanity_test_OBJECTS) $(atf_c___detail_sanity_test_DEPENDENCIES) $(EXTRA_atf_c___detail_sanity_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) - @rm -f atf-c++/detail/sanity_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_sanity_test_OBJECTS) $(atf_c___detail_sanity_test_LDADD) $(LIBS) atf-c++/detail/text_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) @@ -1999,12 +1928,6 @@ atf-c/check_test.$(OBJEXT): atf-c/$(am__ atf-c/check_test$(EXEEXT): $(atf_c_check_test_OBJECTS) $(atf_c_check_test_DEPENDENCIES) $(EXTRA_atf_c_check_test_DEPENDENCIES) atf-c/$(am__dirstamp) @rm -f atf-c/check_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(atf_c_check_test_OBJECTS) $(atf_c_check_test_LDADD) $(LIBS) -atf-c/config_test.$(OBJEXT): atf-c/$(am__dirstamp) \ - atf-c/$(DEPDIR)/$(am__dirstamp) - -atf-c/config_test$(EXEEXT): $(atf_c_config_test_OBJECTS) $(atf_c_config_test_DEPENDENCIES) $(EXTRA_atf_c_config_test_DEPENDENCIES) atf-c/$(am__dirstamp) - @rm -f atf-c/config_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(atf_c_config_test_OBJECTS) $(atf_c_config_test_LDADD) $(LIBS) atf-c/detail/dynstr_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \ atf-c/detail/$(DEPDIR)/$(am__dirstamp) @@ -2107,13 +2030,13 @@ atf-sh/$(am__dirstamp): atf-sh/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) atf-sh/$(DEPDIR) @: > atf-sh/$(DEPDIR)/$(am__dirstamp) -atf-sh/atf-check.$(OBJEXT): atf-sh/$(am__dirstamp) \ +atf-sh/atf_sh_atf_check-atf-check.$(OBJEXT): atf-sh/$(am__dirstamp) \ atf-sh/$(DEPDIR)/$(am__dirstamp) atf-sh/atf-check$(EXEEXT): $(atf_sh_atf_check_OBJECTS) $(atf_sh_atf_check_DEPENDENCIES) $(EXTRA_atf_sh_atf_check_DEPENDENCIES) atf-sh/$(am__dirstamp) @rm -f atf-sh/atf-check$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_sh_atf_check_OBJECTS) $(atf_sh_atf_check_LDADD) $(LIBS) -atf-sh/atf-sh.$(OBJEXT): atf-sh/$(am__dirstamp) \ +atf-sh/atf_sh_atf_sh-atf-sh.$(OBJEXT): atf-sh/$(am__dirstamp) \ atf-sh/$(DEPDIR)/$(am__dirstamp) atf-sh/atf-sh$(EXEEXT): $(atf_sh_atf_sh_OBJECTS) $(atf_sh_atf_sh_DEPENDENCIES) $(EXTRA_atf_sh_atf_sh_DEPENDENCIES) atf-sh/$(am__dirstamp) @@ -2318,8 +2241,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/build_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/check.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/check_test.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/config.Plo at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/config_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/macros_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/tests.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/tests_test.Po at am__quote@ @@ -2327,6 +2248,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/$(DEPDIR)/utils_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/application.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/application_test.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/atf_c___detail_libtest_helpers_la-test_helpers.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/auto_array_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/env.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/env_test.Po at am__quote@ @@ -2336,19 +2258,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/fs_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/process.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/process_test.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/sanity_test.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/test_helpers.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/text.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/text_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c++/detail/$(DEPDIR)/version_helper.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/atf_c_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/build_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/check_test.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/config_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/error_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/libatf_c_la-build.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/libatf_c_la-check.Plo at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/libatf_c_la-config.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/libatf_c_la-error.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/libatf_c_la-tc.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/$(DEPDIR)/libatf_c_la-tp.Plo at am__quote@ @@ -2379,8 +2297,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at atf-c/detail/$(DEPDIR)/text_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/detail/$(DEPDIR)/user_test.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at atf-c/detail/$(DEPDIR)/version_helper.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-sh/$(DEPDIR)/atf-check.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at atf-sh/$(DEPDIR)/atf-sh.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at bootstrap/$(DEPDIR)/h_tp_basic_c.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at bootstrap/$(DEPDIR)/h_tp_basic_cpp.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at test-programs/$(DEPDIR)/c_helpers.Po at am__quote@ @@ -2431,13 +2349,6 @@ atf-c/libatf_c_la-check.lo: atf-c/check. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-check.lo `test -f 'atf-c/check.c' || echo '$(srcdir)/'`atf-c/check.c -atf-c/libatf_c_la-config.lo: atf-c/config.c - at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-config.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-config.Tpo -c -o atf-c/libatf_c_la-config.lo `test -f 'atf-c/config.c' || echo '$(srcdir)/'`atf-c/config.c - at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-config.Tpo atf-c/$(DEPDIR)/libatf_c_la-config.Plo - at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='atf-c/config.c' object='atf-c/libatf_c_la-config.lo' libtool=yes @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-config.lo `test -f 'atf-c/config.c' || echo '$(srcdir)/'`atf-c/config.c - atf-c/libatf_c_la-error.lo: atf-c/error.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-error.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-error.Tpo -c -o atf-c/libatf_c_la-error.lo `test -f 'atf-c/error.c' || echo '$(srcdir)/'`atf-c/error.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-error.Tpo atf-c/$(DEPDIR)/libatf_c_la-error.Plo @@ -2560,6 +2471,41 @@ atf-c/detail/libatf_c_la-user.lo: atf-c/ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< +atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo: atf-c++/detail/test_helpers.cpp + at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_c___detail_libtest_helpers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo -MD -MP -MF atf-c++/detail/$(DEPDIR)/atf_c___detail_libtest_helpers_la-test_helpers.Tpo -c -o atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo `test -f 'atf-c++/detail/test_helpers.cpp' || echo '$(srcdir)/'`atf-c++/detail/test_helpers.cpp + at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-c++/detail/$(DEPDIR)/atf_c___detail_libtest_helpers_la-test_helpers.Tpo atf-c++/detail/$(DEPDIR)/atf_c___detail_libtest_helpers_la-test_helpers.Plo + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-c++/detail/test_helpers.cpp' object='atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_c___detail_libtest_helpers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-c++/detail/atf_c___detail_libtest_helpers_la-test_helpers.lo `test -f 'atf-c++/detail/test_helpers.cpp' || echo '$(srcdir)/'`atf-c++/detail/test_helpers.cpp + +atf-sh/atf_sh_atf_check-atf-check.o: atf-sh/atf-check.cpp + at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_check_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-sh/atf_sh_atf_check-atf-check.o -MD -MP -MF atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Tpo -c -o atf-sh/atf_sh_atf_check-atf-check.o `test -f 'atf-sh/atf-check.cpp' || echo '$(srcdir)/'`atf-sh/atf-check.cpp + at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Tpo atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Po + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-sh/atf-check.cpp' object='atf-sh/atf_sh_atf_check-atf-check.o' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_check_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-sh/atf_sh_atf_check-atf-check.o `test -f 'atf-sh/atf-check.cpp' || echo '$(srcdir)/'`atf-sh/atf-check.cpp + +atf-sh/atf_sh_atf_check-atf-check.obj: atf-sh/atf-check.cpp + at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_check_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-sh/atf_sh_atf_check-atf-check.obj -MD -MP -MF atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Tpo -c -o atf-sh/atf_sh_atf_check-atf-check.obj `if test -f 'atf-sh/atf-check.cpp'; then $(CYGPATH_W) 'atf-sh/atf-check.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-sh/atf-check.cpp'; fi` + at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Tpo atf-sh/$(DEPDIR)/atf_sh_atf_check-atf-check.Po + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-sh/atf-check.cpp' object='atf-sh/atf_sh_atf_check-atf-check.obj' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_check_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-sh/atf_sh_atf_check-atf-check.obj `if test -f 'atf-sh/atf-check.cpp'; then $(CYGPATH_W) 'atf-sh/atf-check.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-sh/atf-check.cpp'; fi` + +atf-sh/atf_sh_atf_sh-atf-sh.o: atf-sh/atf-sh.cpp + at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_sh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-sh/atf_sh_atf_sh-atf-sh.o -MD -MP -MF atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Tpo -c -o atf-sh/atf_sh_atf_sh-atf-sh.o `test -f 'atf-sh/atf-sh.cpp' || echo '$(srcdir)/'`atf-sh/atf-sh.cpp + at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Tpo atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Po + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-sh/atf-sh.cpp' object='atf-sh/atf_sh_atf_sh-atf-sh.o' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_sh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-sh/atf_sh_atf_sh-atf-sh.o `test -f 'atf-sh/atf-sh.cpp' || echo '$(srcdir)/'`atf-sh/atf-sh.cpp + +atf-sh/atf_sh_atf_sh-atf-sh.obj: atf-sh/atf-sh.cpp + at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_sh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-sh/atf_sh_atf_sh-atf-sh.obj -MD -MP -MF atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Tpo -c -o atf-sh/atf_sh_atf_sh-atf-sh.obj `if test -f 'atf-sh/atf-sh.cpp'; then $(CYGPATH_W) 'atf-sh/atf-sh.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-sh/atf-sh.cpp'; fi` + at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Tpo atf-sh/$(DEPDIR)/atf_sh_atf_sh-atf-sh.Po + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-sh/atf-sh.cpp' object='atf-sh/atf_sh_atf_sh-atf-sh.obj' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_sh_atf_sh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-sh/atf_sh_atf_sh-atf-sh.obj `if test -f 'atf-sh/atf-sh.cpp'; then $(CYGPATH_W) 'atf-sh/atf-sh.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-sh/atf-sh.cpp'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -2704,6 +2650,49 @@ uninstall-man4: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man4dir)'; $(am__uninstall_files_from_dir) +install-man7: $(dist_man_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(dist_man_MANS) $(man_MANS)'; \ + test -n "$(man7dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.7[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \ + done; } + +uninstall-man7: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man7dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.7[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir) install-atf_aclocalDATA: $(atf_aclocal_DATA) @$(NORMAL_INSTALL) @list='$(atf_aclocal_DATA)'; test -n "$(atf_aclocaldir)" || list=; \ @@ -3040,6 +3029,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-nodist_atf_cHEADERS: $(nodist_atf_c_HEADERS) + @$(NORMAL_INSTALL) + @list='$(nodist_atf_c_HEADERS)'; test -n "$(atf_cdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(atf_cdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(atf_cdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(atf_cdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(atf_cdir)" || exit $$?; \ + done + +uninstall-nodist_atf_cHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_atf_c_HEADERS)'; test -n "$(atf_cdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(atf_cdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -3276,11 +3286,11 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ - $(HEADERS) bconfig.h + $(HEADERS) config.h install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(atf_cdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -3363,18 +3373,19 @@ install-data-am: install-atf_aclocalDATA install-atf_c__HEADERS install-atf_c__dirpkgconfigDATA \ install-atf_cpkgconfigDATA install-atf_shDATA \ install-atf_shpkgconfigDATA install-docDATA \ - install-includeHEADERS install-man install-pkgtestsDATA \ - install-tests_atf_cDATA install-tests_atf_cPROGRAMS \ - install-tests_atf_cSCRIPTS install-tests_atf_c__DATA \ - install-tests_atf_c__PROGRAMS install-tests_atf_c__SCRIPTS \ - install-tests_atf_c___detailDATA \ + install-includeHEADERS install-man install-nodist_atf_cHEADERS \ + install-pkgtestsDATA install-tests_atf_cDATA \ + install-tests_atf_cPROGRAMS install-tests_atf_cSCRIPTS \ + install-tests_atf_c__DATA install-tests_atf_c__PROGRAMS \ + install-tests_atf_c__SCRIPTS install-tests_atf_c___detailDATA \ install-tests_atf_c___detailPROGRAMS \ install-tests_atf_c_detailDATA \ install-tests_atf_c_detailPROGRAMS install-tests_atf_shDATA \ install-tests_atf_shSCRIPTS install-tests_test_programsDATA \ install-tests_test_programsPROGRAMS \ install-tests_test_programsSCRIPTS - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am install-dvi-am: @@ -3390,7 +3401,7 @@ install-info: install-info-am install-info-am: -install-man: install-man1 install-man3 install-man4 +install-man: install-man1 install-man3 install-man4 install-man7 install-pdf: install-pdf-am @@ -3428,7 +3439,8 @@ uninstall-am: uninstall-atf_aclocalDATA uninstall-atf_shpkgconfigDATA uninstall-binPROGRAMS \ uninstall-docDATA uninstall-includeHEADERS \ uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From jmmv at FreeBSD.org Thu Oct 30 17:14:51 2014 From: jmmv at FreeBSD.org (Julio Merino) Date: Thu, 30 Oct 2014 17:14:51 +0000 (UTC) Subject: svn commit: r273870 - vendor/atf/atf-0.21 Message-ID: <201410301714.s9UHEpf3038774@svn.freebsd.org> Author: jmmv Date: Thu Oct 30 17:14:51 2014 New Revision: 273870 URL: https://svnweb.freebsd.org/changeset/base/273870 Log: Tag import of atf-0.21. Added: vendor/atf/atf-0.21/ - copied from r273869, vendor/atf/dist/