From owner-svn-src-projects@FreeBSD.ORG Thu Oct 2 08:57:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D754CD3; Thu, 2 Oct 2014 08:57:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59C1CF05; Thu, 2 Oct 2014 08:57:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s928vNwN050051; Thu, 2 Oct 2014 08:57:23 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s928vEMT049936; Thu, 2 Oct 2014 08:57:14 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201410020857.s928vEMT049936@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 2 Oct 2014 08:57:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272400 - in projects/sendfile: . bin/csh bin/pkill/tests bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/contrib/opensolaris/cmd... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2014 08:57:23 -0000 Author: glebius Date: Thu Oct 2 08:57:11 2014 New Revision: 272400 URL: https://svnweb.freebsd.org/changeset/base/272400 Log: Merge head r258543 through r272399. Added: projects/sendfile/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff - copied unchanged from r272399, head/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff projects/sendfile/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff - copied unchanged from r272399, head/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff projects/sendfile/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff - copied unchanged from r272399, head/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff projects/sendfile/contrib/pjdfstest/ - copied from r272399, head/contrib/pjdfstest/ projects/sendfile/etc/devd/hyperv.conf - copied unchanged from r272399, head/etc/devd/hyperv.conf projects/sendfile/games/primes/spsp.c - copied unchanged from r272399, head/games/primes/spsp.c projects/sendfile/lib/libproc/tests/ - copied from r272399, head/lib/libproc/tests/ projects/sendfile/lib/msun/ld128/e_lgammal_r.c - copied unchanged from r272399, head/lib/msun/ld128/e_lgammal_r.c projects/sendfile/lib/msun/ld80/e_lgammal_r.c - copied unchanged from r272399, head/lib/msun/ld80/e_lgammal_r.c projects/sendfile/lib/msun/src/e_lgammal.c - copied unchanged from r272399, head/lib/msun/src/e_lgammal.c projects/sendfile/share/man/man4/ipheth.4 - copied unchanged from r272399, head/share/man/man4/ipheth.4 projects/sendfile/share/man/man4/man4.arm/cgem.4 - copied unchanged from r272399, head/share/man/man4/man4.arm/cgem.4 projects/sendfile/share/man/man4/smsc.4 - copied unchanged from r272399, head/share/man/man4/smsc.4 projects/sendfile/sys/arm/arm/syscall.c - copied unchanged from r272399, head/sys/arm/arm/syscall.c projects/sendfile/sys/arm/include/sysreg.h - copied unchanged from r272399, head/sys/arm/include/sysreg.h projects/sendfile/sys/arm/samsung/s3c2xx0/ - copied from r272399, head/sys/arm/samsung/s3c2xx0/ projects/sendfile/sys/boot/efi/include/eficonsctl.h - copied unchanged from r272399, head/sys/boot/efi/include/eficonsctl.h projects/sendfile/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c - copied unchanged from r272399, head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c projects/sendfile/sys/compat/linux/linux_timer.c - copied unchanged from r272399, head/sys/compat/linux/linux_timer.c projects/sendfile/sys/compat/linux/linux_timer.h - copied unchanged from r272399, head/sys/compat/linux/linux_timer.h projects/sendfile/sys/dev/alpm/ - copied from r272399, head/sys/dev/alpm/ projects/sendfile/sys/dev/amdpm/ - copied from r272399, head/sys/dev/amdpm/ projects/sendfile/sys/dev/amdsmb/ - copied from r272399, head/sys/dev/amdsmb/ projects/sendfile/sys/dev/ath/if_ath_pci_devlist.h - copied unchanged from r272399, head/sys/dev/ath/if_ath_pci_devlist.h projects/sendfile/sys/dev/drm2/i915/i915_gem_context.c - copied unchanged from r272399, head/sys/dev/drm2/i915/i915_gem_context.c projects/sendfile/sys/dev/dwc/ - copied from r272399, head/sys/dev/dwc/ projects/sendfile/sys/dev/fdc/fdc_cbus.c - copied unchanged from r272399, head/sys/dev/fdc/fdc_cbus.c projects/sendfile/sys/dev/intpm/ - copied from r272399, head/sys/dev/intpm/ projects/sendfile/sys/dev/ncr/ - copied from r272399, head/sys/dev/ncr/ projects/sendfile/sys/dev/nfsmb/ - copied from r272399, head/sys/dev/nfsmb/ projects/sendfile/sys/dev/rl/ - copied from r272399, head/sys/dev/rl/ projects/sendfile/sys/dev/uart/uart_dev_msm.c - copied unchanged from r272399, head/sys/dev/uart/uart_dev_msm.c projects/sendfile/sys/dev/uart/uart_dev_msm.h - copied unchanged from r272399, head/sys/dev/uart/uart_dev_msm.h projects/sendfile/sys/dev/viapm/ - copied from r272399, head/sys/dev/viapm/ projects/sendfile/sys/dev/xen/xenstore/ - copied from r272399, head/sys/dev/xen/xenstore/ projects/sendfile/sys/mips/conf/TP-MR3020 - copied unchanged from r272399, head/sys/mips/conf/TP-MR3020 projects/sendfile/sys/mips/conf/TP-MR3020.hints - copied unchanged from r272399, head/sys/mips/conf/TP-MR3020.hints projects/sendfile/sys/modules/ncr/ - copied from r272399, head/sys/modules/ncr/ projects/sendfile/sys/ofed/drivers/net/mlx4/mlx4_stats.h - copied unchanged from r272399, head/sys/ofed/drivers/net/mlx4/mlx4_stats.h projects/sendfile/sys/ofed/drivers/net/mlx4/utils.c - copied unchanged from r272399, head/sys/ofed/drivers/net/mlx4/utils.c projects/sendfile/sys/ofed/drivers/net/mlx4/utils.h - copied unchanged from r272399, head/sys/ofed/drivers/net/mlx4/utils.h projects/sendfile/sys/x86/xen/xen_msi.c - copied unchanged from r272399, head/sys/x86/xen/xen_msi.c projects/sendfile/sys/x86/xen/xen_pci.c - copied unchanged from r272399, head/sys/x86/xen/xen_pci.c projects/sendfile/sys/xen/xen_msi.h - copied unchanged from r272399, head/sys/xen/xen_msi.h projects/sendfile/usr.bin/mkimg/qcow.c - copied unchanged from r272399, head/usr.bin/mkimg/qcow.c projects/sendfile/usr.bin/mkimg/tests/ - copied from r272399, head/usr.bin/mkimg/tests/ Deleted: projects/sendfile/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff projects/sendfile/etc/rc.d/hv_kvpd projects/sendfile/lib/libc/arm/Symbol_oabi.map projects/sendfile/lib/libproc/test/ projects/sendfile/sys/amd64/vmm/vmm_msr.c projects/sendfile/sys/amd64/vmm/vmm_msr.h projects/sendfile/sys/arm/s3c2xx0/ projects/sendfile/sys/pc98/cbus/fdc.c projects/sendfile/sys/pc98/cbus/fdc_cbus.c projects/sendfile/sys/pc98/cbus/fdcreg.h projects/sendfile/sys/pc98/cbus/fdcvar.h projects/sendfile/sys/pci/ projects/sendfile/sys/xen/xenstore/xenstore.c projects/sendfile/sys/xen/xenstore/xenstore_dev.c projects/sendfile/tools/regression/pjdfstest/ Modified: projects/sendfile/Makefile.inc1 projects/sendfile/ObsoleteFiles.inc projects/sendfile/UPDATING projects/sendfile/bin/csh/Makefile projects/sendfile/bin/pkill/tests/pgrep-j_test.sh projects/sendfile/bin/pkill/tests/pkill-j_test.sh projects/sendfile/bin/sh/sh.1 projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/sendfile/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/sendfile/cddl/usr.sbin/Makefile projects/sendfile/contrib/apr-util/CHANGES projects/sendfile/contrib/apr-util/NOTICE projects/sendfile/contrib/apr-util/apr-util.spec projects/sendfile/contrib/apr-util/configure projects/sendfile/contrib/apr-util/crypto/apr_crypto.c projects/sendfile/contrib/apr-util/crypto/apr_passwd.c projects/sendfile/contrib/apr-util/dbd/apr_dbd_mysql.c projects/sendfile/contrib/apr-util/dbd/apr_dbd_odbc.c projects/sendfile/contrib/apr-util/dbm/NWGNUmakefile projects/sendfile/contrib/apr-util/include/apu_version.h projects/sendfile/contrib/apr-util/test/Makefile.win projects/sendfile/contrib/atf/FREEBSD-upgrade projects/sendfile/contrib/atf/NEWS projects/sendfile/contrib/atf/atf-c++/atf-c++-api.3 projects/sendfile/contrib/atf/atf-c/atf-c-api.3 projects/sendfile/contrib/atf/atf-c/macros_h_test.c projects/sendfile/contrib/atf/atf-sh/atf-check.1 projects/sendfile/contrib/atf/atf-sh/atf-sh-api.3 projects/sendfile/contrib/atf/atf-sh/atf-sh.1 projects/sendfile/contrib/atf/doc/atf-test-case.4 projects/sendfile/contrib/atf/doc/atf-test-program.1 projects/sendfile/contrib/hyperv/tools/hv_kvp_daemon.c projects/sendfile/contrib/ipfilter/lib/gethost.c projects/sendfile/contrib/ipfilter/lib/printnat.c projects/sendfile/contrib/ipfilter/tools/ipf_y.y projects/sendfile/contrib/ipfilter/tools/ipnat_y.y projects/sendfile/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff projects/sendfile/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff projects/sendfile/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff projects/sendfile/contrib/ofed/libibverbs/examples/asyncwatch.c projects/sendfile/contrib/ofed/libibverbs/examples/device_list.c projects/sendfile/contrib/ofed/libibverbs/examples/devinfo.c projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h projects/sendfile/contrib/one-true-awk/awk.1 projects/sendfile/contrib/one-true-awk/main.c projects/sendfile/contrib/one-true-awk/run.c projects/sendfile/etc/defaults/periodic.conf projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/devd/Makefile projects/sendfile/etc/devd/usb.conf projects/sendfile/etc/mail/Makefile projects/sendfile/etc/motd projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/etc/rc.d/Makefile projects/sendfile/etc/rc.d/ipropd_slave projects/sendfile/etc/rc.d/syscons projects/sendfile/etc/rc.subr projects/sendfile/games/factor/factor.6 projects/sendfile/games/factor/factor.c projects/sendfile/games/primes/Makefile projects/sendfile/games/primes/primes.c projects/sendfile/games/primes/primes.h projects/sendfile/gnu/lib/csu/Makefile projects/sendfile/gnu/lib/libgcc/Makefile projects/sendfile/gnu/lib/libgcov/Makefile projects/sendfile/gnu/lib/libstdc++/Makefile projects/sendfile/gnu/lib/libsupc++/Makefile projects/sendfile/gnu/usr.bin/cc/Makefile.inc projects/sendfile/gnu/usr.bin/cc/cc_tools/Makefile projects/sendfile/include/unistd.h projects/sendfile/kerberos5/lib/libasn1/Makefile projects/sendfile/lib/clang/clang.build.mk projects/sendfile/lib/libc/Makefile projects/sendfile/lib/libc/arm/Makefile.inc projects/sendfile/lib/libc/arm/aeabi/Makefile.inc projects/sendfile/lib/libc/arm/gen/Makefile.inc projects/sendfile/lib/libc/gen/nlist.c projects/sendfile/lib/libc/powerpc/gen/_ctx_start.S projects/sendfile/lib/libc/powerpc/gen/_setjmp.S projects/sendfile/lib/libc/powerpc/gen/eabi.S projects/sendfile/lib/libc/powerpc/gen/fabs.S projects/sendfile/lib/libc/powerpc/gen/setjmp.S projects/sendfile/lib/libc/powerpc/gen/sigsetjmp.S projects/sendfile/lib/libc/powerpc/sys/brk.S projects/sendfile/lib/libc/powerpc/sys/exect.S projects/sendfile/lib/libc/powerpc/sys/pipe.S projects/sendfile/lib/libc/powerpc/sys/ptrace.S projects/sendfile/lib/libc/powerpc/sys/sbrk.S projects/sendfile/lib/libc/powerpc64/gen/_ctx_start.S projects/sendfile/lib/libc/powerpc64/gen/_setjmp.S projects/sendfile/lib/libc/powerpc64/gen/fabs.S projects/sendfile/lib/libc/powerpc64/gen/setjmp.S projects/sendfile/lib/libc/powerpc64/gen/sigsetjmp.S projects/sendfile/lib/libc/powerpc64/sys/brk.S projects/sendfile/lib/libc/powerpc64/sys/exect.S projects/sendfile/lib/libc/powerpc64/sys/pipe.S projects/sendfile/lib/libc/powerpc64/sys/ptrace.S projects/sendfile/lib/libc/powerpc64/sys/sbrk.S projects/sendfile/lib/libc/quad/Makefile.inc projects/sendfile/lib/libc/stdtime/strptime.c projects/sendfile/lib/libc/sys/access.2 projects/sendfile/lib/libc/sys/connect.2 projects/sendfile/lib/libc/sys/mmap.2 projects/sendfile/lib/libc/sys/mq_open.2 projects/sendfile/lib/libcompiler_rt/Makefile projects/sendfile/lib/libgeom/geom_stats.c projects/sendfile/lib/libnv/nv.3 projects/sendfile/lib/libnv/nvpair.c projects/sendfile/lib/libpam/modules/pam_login_access/pam_login_access.c projects/sendfile/lib/libproc/Makefile projects/sendfile/lib/libproc/proc_sym.c projects/sendfile/lib/libstand/Makefile projects/sendfile/lib/libthr/libthr.3 projects/sendfile/lib/libthr/thread/thr_init.c projects/sendfile/lib/libunbound/Makefile projects/sendfile/lib/msun/Makefile projects/sendfile/lib/msun/Symbol.map projects/sendfile/lib/msun/man/lgamma.3 projects/sendfile/lib/msun/src/e_lgamma.c projects/sendfile/lib/msun/src/e_lgamma_r.c projects/sendfile/lib/msun/src/e_lgammaf_r.c projects/sendfile/lib/msun/src/imprecise.c projects/sendfile/lib/msun/src/math.h projects/sendfile/libexec/rtld-elf/Makefile projects/sendfile/release/arm/BEAGLEBONE.conf projects/sendfile/release/arm/PANDABOARD.conf projects/sendfile/release/arm/RPI-B.conf projects/sendfile/release/arm/WANDBOARD-QUAD.conf projects/sendfile/release/arm/ZEDBOARD.conf projects/sendfile/release/arm/release.sh projects/sendfile/release/doc/en_US.ISO8859-1/hardware/article.xml projects/sendfile/release/picobsd/tinyware/simple_httpd/simple_httpd.c projects/sendfile/release/scripts/pkg-stage.sh projects/sendfile/rescue/rescue/Makefile projects/sendfile/sbin/fdisk_pc98/Makefile projects/sendfile/sbin/ifconfig/ifconfig.8 projects/sendfile/sbin/ifconfig/ifconfig.c projects/sendfile/sbin/ifconfig/iflagg.c projects/sendfile/sbin/ping6/Makefile projects/sendfile/sbin/ping6/ping6.c projects/sendfile/sbin/routed/defs.h projects/sendfile/sbin/routed/input.c projects/sendfile/sbin/routed/main.c projects/sendfile/sbin/routed/output.c projects/sendfile/sbin/routed/routed.8 projects/sendfile/sbin/savecore/savecore.c projects/sendfile/sbin/sysctl/sysctl.c projects/sendfile/share/man/man4/Makefile projects/sendfile/share/man/man4/ada.4 projects/sendfile/share/man/man4/cdce.4 projects/sendfile/share/man/man4/icmp.4 projects/sendfile/share/man/man4/lagg.4 projects/sendfile/share/man/man4/malo.4 projects/sendfile/share/man/man4/man4.arm/Makefile projects/sendfile/share/man/man4/miibus.4 projects/sendfile/share/man/man4/sfxge.4 projects/sendfile/share/man/man4/udplite.4 projects/sendfile/share/man/man4/urndis.4 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/man/man9/SDT.9 projects/sendfile/share/man/man9/altq.9 projects/sendfile/share/man/man9/sleepqueue.9 projects/sendfile/share/misc/committers-src.dot projects/sendfile/share/mk/bsd.dep.mk projects/sendfile/share/mk/bsd.endian.mk projects/sendfile/share/mk/bsd.port.mk projects/sendfile/share/mk/bsd.port.subdir.mk projects/sendfile/share/mk/bsd.progs.mk projects/sendfile/share/mk/src.opts.mk projects/sendfile/sys/Makefile projects/sendfile/sys/amd64/amd64/fpu.c projects/sendfile/sys/amd64/amd64/machdep.c projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/amd64/trap.c projects/sendfile/sys/amd64/conf/GENERIC projects/sendfile/sys/amd64/conf/NOTES projects/sendfile/sys/amd64/include/vmm.h (contents, props changed) projects/sendfile/sys/amd64/linux32/linux.h projects/sendfile/sys/amd64/linux32/linux32_dummy.c projects/sendfile/sys/amd64/linux32/linux32_proto.h projects/sendfile/sys/amd64/linux32/linux32_syscall.h projects/sendfile/sys/amd64/linux32/linux32_syscalls.c projects/sendfile/sys/amd64/linux32/linux32_sysent.c projects/sendfile/sys/amd64/linux32/linux32_systrace_args.c projects/sendfile/sys/amd64/linux32/syscalls.master projects/sendfile/sys/amd64/vmm/intel/ept.c projects/sendfile/sys/amd64/vmm/intel/vmcs.h projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/intel/vmx.h projects/sendfile/sys/amd64/vmm/intel/vmx_msr.c projects/sendfile/sys/amd64/vmm/intel/vmx_msr.h projects/sendfile/sys/amd64/vmm/io/vatpic.c projects/sendfile/sys/amd64/vmm/io/vlapic.c projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/arm/allwinner/a10_clk.c projects/sendfile/sys/arm/allwinner/if_emac.c projects/sendfile/sys/arm/allwinner/timer.c projects/sendfile/sys/arm/altera/socfpga/files.socfpga projects/sendfile/sys/arm/arm/cpufunc_asm_armv7.S projects/sendfile/sys/arm/arm/machdep.c projects/sendfile/sys/arm/arm/mpcore_timer.c projects/sendfile/sys/arm/arm/physmem.c projects/sendfile/sys/arm/arm/trap.c projects/sendfile/sys/arm/at91/at91rm9200.c projects/sendfile/sys/arm/at91/at91rm92reg.h projects/sendfile/sys/arm/at91/at91sam9260reg.h projects/sendfile/sys/arm/at91/at91sam9g20reg.h projects/sendfile/sys/arm/at91/at91sam9g45reg.h projects/sendfile/sys/arm/at91/at91sam9x5reg.h projects/sendfile/sys/arm/at91/if_ate.c projects/sendfile/sys/arm/at91/if_macb.c projects/sendfile/sys/arm/cavium/cns11xx/if_ece.c projects/sendfile/sys/arm/conf/LN2410SBC projects/sendfile/sys/arm/conf/NOTES projects/sendfile/sys/arm/conf/SOCKIT projects/sendfile/sys/arm/lpc/if_lpe.c projects/sendfile/sys/arm/ti/cpsw/if_cpsw.c projects/sendfile/sys/arm/xscale/ixp425/if_npe.c projects/sendfile/sys/boot/Makefile.pc98 projects/sendfile/sys/boot/amd64/boot1.efi/boot1.c projects/sendfile/sys/boot/amd64/efi/bootinfo.c projects/sendfile/sys/boot/arm/ixp425/boot2/Makefile projects/sendfile/sys/boot/efi/libefi/libefi.c projects/sendfile/sys/boot/fdt/dts/arm/socfpga-sockit.dts projects/sendfile/sys/boot/fdt/dts/arm/socfpga.dtsi projects/sendfile/sys/boot/i386/boot2/Makefile projects/sendfile/sys/boot/i386/libfirewire/fwohcireg.h projects/sendfile/sys/boot/libstand32/Makefile projects/sendfile/sys/boot/pc98/boot2/Makefile projects/sendfile/sys/boot/pc98/cdboot/cdboot.S projects/sendfile/sys/boot/pc98/libpc98/Makefile projects/sendfile/sys/boot/pc98/loader/Makefile projects/sendfile/sys/cam/cam_xpt.c projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/ctl/ctl.h projects/sendfile/sys/cam/ctl/ctl_backend_block.c projects/sendfile/sys/cam/ctl/ctl_cmd_table.c projects/sendfile/sys/cam/ctl/ctl_error.c projects/sendfile/sys/cam/ctl/ctl_error.h projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cam/ctl/ctl_private.h projects/sendfile/sys/cam/ctl/ctl_tpc.c projects/sendfile/sys/cam/scsi/scsi_all.h projects/sendfile/sys/cam/scsi/scsi_da.c projects/sendfile/sys/cddl/boot/zfs/lz4.c projects/sendfile/sys/cddl/compat/opensolaris/sys/sdt.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/sendfile/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/sendfile/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c projects/sendfile/sys/compat/linprocfs/linprocfs.c projects/sendfile/sys/compat/linux/linux_ioctl.c projects/sendfile/sys/compat/linux/linux_mib.c projects/sendfile/sys/conf/Makefile.arm projects/sendfile/sys/conf/NOTES projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.amd64 projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/files.i386 projects/sendfile/sys/conf/files.pc98 projects/sendfile/sys/conf/kern.opts.mk projects/sendfile/sys/conf/options projects/sendfile/sys/contrib/altq/altq/if_altq.h projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c projects/sendfile/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/sendfile/sys/contrib/ipfilter/netinet/ip_frag.c projects/sendfile/sys/ddb/db_main.c projects/sendfile/sys/ddb/ddb.h projects/sendfile/sys/dev/acpica/Osd/OsdSchedule.c projects/sendfile/sys/dev/acpica/acpi.c projects/sendfile/sys/dev/acpica/acpi_pci.c projects/sendfile/sys/dev/ae/if_ae.c projects/sendfile/sys/dev/age/if_age.c projects/sendfile/sys/dev/ahci/ahci.c projects/sendfile/sys/dev/alc/if_alc.c projects/sendfile/sys/dev/ale/if_ale.c projects/sendfile/sys/dev/altera/atse/a_api.h projects/sendfile/sys/dev/altera/atse/if_atse.c projects/sendfile/sys/dev/an/if_an.c projects/sendfile/sys/dev/asmc/asmc.c projects/sendfile/sys/dev/asmc/asmcvar.h projects/sendfile/sys/dev/ath/ath_hal/ah.c projects/sendfile/sys/dev/ath/ath_hal/ah.h projects/sendfile/sys/dev/ath/ath_hal/ah_internal.h projects/sendfile/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/sendfile/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/sendfile/sys/dev/ath/if_ath.c projects/sendfile/sys/dev/ath/if_ath_lna_div.c projects/sendfile/sys/dev/ath/if_ath_pci.c projects/sendfile/sys/dev/ath/if_ath_rx.c projects/sendfile/sys/dev/ath/if_ath_rx_edma.c projects/sendfile/sys/dev/ath/if_ath_tx.c projects/sendfile/sys/dev/ath/if_athvar.h projects/sendfile/sys/dev/atkbdc/atkbd.c projects/sendfile/sys/dev/bce/if_bce.c projects/sendfile/sys/dev/bce/if_bcereg.h projects/sendfile/sys/dev/bfe/if_bfe.c projects/sendfile/sys/dev/bge/if_bge.c projects/sendfile/sys/dev/bm/if_bm.c projects/sendfile/sys/dev/bwi/if_bwi.c projects/sendfile/sys/dev/bwn/if_bwn.c projects/sendfile/sys/dev/bxe/bxe.c projects/sendfile/sys/dev/bxe/bxe_stats.c projects/sendfile/sys/dev/bxe/bxe_stats.h projects/sendfile/sys/dev/bxe/ecore_sp.h projects/sendfile/sys/dev/cadence/if_cgem.c projects/sendfile/sys/dev/cas/if_cas.c projects/sendfile/sys/dev/ce/if_ce.c projects/sendfile/sys/dev/cm/smc90cx6.c projects/sendfile/sys/dev/cp/if_cp.c projects/sendfile/sys/dev/cs/if_cs.c projects/sendfile/sys/dev/ctau/if_ct.c projects/sendfile/sys/dev/cx/if_cx.c projects/sendfile/sys/dev/cxgb/cxgb_adapter.h projects/sendfile/sys/dev/cxgb/cxgb_main.c projects/sendfile/sys/dev/cxgb/cxgb_sge.c projects/sendfile/sys/dev/cxgbe/adapter.h projects/sendfile/sys/dev/cxgbe/t4_main.c projects/sendfile/sys/dev/cxgbe/tom/t4_listen.c projects/sendfile/sys/dev/dc/if_dc.c projects/sendfile/sys/dev/de/if_de.c projects/sendfile/sys/dev/drm2/drm_gem_names.c projects/sendfile/sys/dev/drm2/drm_gem_names.h projects/sendfile/sys/dev/drm2/i915/i915_dma.c projects/sendfile/sys/dev/drm2/i915/i915_drm.h projects/sendfile/sys/dev/drm2/i915/i915_drv.c projects/sendfile/sys/dev/drm2/i915/i915_drv.h projects/sendfile/sys/dev/drm2/i915/i915_gem.c projects/sendfile/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/sendfile/sys/dev/drm2/i915/i915_gem_gtt.c projects/sendfile/sys/dev/drm2/i915/i915_irq.c projects/sendfile/sys/dev/drm2/i915/i915_reg.h projects/sendfile/sys/dev/drm2/i915/intel_ringbuffer.c projects/sendfile/sys/dev/drm2/i915/intel_ringbuffer.h projects/sendfile/sys/dev/e1000/if_em.c projects/sendfile/sys/dev/e1000/if_igb.c projects/sendfile/sys/dev/e1000/if_igb.h projects/sendfile/sys/dev/e1000/if_lem.c projects/sendfile/sys/dev/ed/if_ed.c projects/sendfile/sys/dev/en/midway.c projects/sendfile/sys/dev/ep/if_ep.c projects/sendfile/sys/dev/et/if_et.c projects/sendfile/sys/dev/ex/if_ex.c projects/sendfile/sys/dev/fatm/if_fatm.c projects/sendfile/sys/dev/fdc/fdc.c projects/sendfile/sys/dev/fdc/fdcvar.h projects/sendfile/sys/dev/fdt/fdt_common.c projects/sendfile/sys/dev/fdt/fdt_common.h projects/sendfile/sys/dev/fdt/simplebus.c projects/sendfile/sys/dev/fe/if_fe.c projects/sendfile/sys/dev/ffec/if_ffec.c projects/sendfile/sys/dev/firewire/firewire.c projects/sendfile/sys/dev/firewire/firewire.h projects/sendfile/sys/dev/firewire/firewire_phy.h projects/sendfile/sys/dev/firewire/firewirereg.h projects/sendfile/sys/dev/firewire/fwcrom.c projects/sendfile/sys/dev/firewire/fwdev.c projects/sendfile/sys/dev/firewire/fwdma.c projects/sendfile/sys/dev/firewire/fwdma.h projects/sendfile/sys/dev/firewire/fwmem.c projects/sendfile/sys/dev/firewire/fwohci.c projects/sendfile/sys/dev/firewire/fwohci_pci.c projects/sendfile/sys/dev/firewire/fwohcireg.h projects/sendfile/sys/dev/firewire/fwohcivar.h projects/sendfile/sys/dev/firewire/iec68113.h projects/sendfile/sys/dev/firewire/if_fwe.c projects/sendfile/sys/dev/firewire/if_fwip.c projects/sendfile/sys/dev/firewire/sbp.c projects/sendfile/sys/dev/firewire/sbp.h projects/sendfile/sys/dev/firewire/sbp_targ.c projects/sendfile/sys/dev/fxp/if_fxp.c projects/sendfile/sys/dev/gem/if_gem.c projects/sendfile/sys/dev/gxemul/ether/if_gx.c projects/sendfile/sys/dev/hatm/if_hatm_rx.c projects/sendfile/sys/dev/hatm/if_hatm_tx.c projects/sendfile/sys/dev/hme/if_hme.c projects/sendfile/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/sendfile/sys/dev/ie/if_ie.c projects/sendfile/sys/dev/if_ndis/if_ndis.c projects/sendfile/sys/dev/iicbus/if_ic.c projects/sendfile/sys/dev/ipw/if_ipw.c projects/sendfile/sys/dev/iscsi/iscsi.c projects/sendfile/sys/dev/iscsi_initiator/isc_cam.c projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/isp/isp_freebsd.h projects/sendfile/sys/dev/iwi/if_iwi.c projects/sendfile/sys/dev/iwn/if_iwn.c projects/sendfile/sys/dev/ixgb/if_ixgb.c projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/ixgbe/ixgbe.h projects/sendfile/sys/dev/ixgbe/ixv.c projects/sendfile/sys/dev/ixl/i40e_alloc.h projects/sendfile/sys/dev/ixl/i40e_common.c projects/sendfile/sys/dev/ixl/i40e_osdep.c projects/sendfile/sys/dev/ixl/i40e_osdep.h projects/sendfile/sys/dev/ixl/if_ixl.c projects/sendfile/sys/dev/ixl/if_ixlv.c projects/sendfile/sys/dev/ixl/ixl.h projects/sendfile/sys/dev/ixl/ixl_txrx.c projects/sendfile/sys/dev/ixl/ixlvc.c projects/sendfile/sys/dev/jme/if_jme.c projects/sendfile/sys/dev/le/am7990.c projects/sendfile/sys/dev/le/am79900.c projects/sendfile/sys/dev/le/lance.c projects/sendfile/sys/dev/lge/if_lge.c projects/sendfile/sys/dev/lmc/if_lmc.c projects/sendfile/sys/dev/lmc/if_lmc.h projects/sendfile/sys/dev/malo/if_malo.c projects/sendfile/sys/dev/mge/if_mge.c projects/sendfile/sys/dev/mii/rgephy.c projects/sendfile/sys/dev/mii/rlphy.c projects/sendfile/sys/dev/mii/rlswitch.c projects/sendfile/sys/dev/msk/if_msk.c projects/sendfile/sys/dev/mwl/if_mwl.c projects/sendfile/sys/dev/mxge/if_mxge.c projects/sendfile/sys/dev/my/if_my.c projects/sendfile/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c projects/sendfile/sys/dev/netmap/if_lem_netmap.h projects/sendfile/sys/dev/netmap/if_re_netmap.h projects/sendfile/sys/dev/netmap/netmap.c projects/sendfile/sys/dev/netmap/netmap_kern.h projects/sendfile/sys/dev/nfe/if_nfe.c projects/sendfile/sys/dev/nge/if_nge.c projects/sendfile/sys/dev/oce/oce_if.c projects/sendfile/sys/dev/oce/oce_if.h projects/sendfile/sys/dev/ofw/ofw_bus_subr.c projects/sendfile/sys/dev/ofw/ofw_bus_subr.h projects/sendfile/sys/dev/ofw/ofwbus.c projects/sendfile/sys/dev/patm/if_patm_rx.c projects/sendfile/sys/dev/patm/if_patm_tx.c projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/dev/pci/pci_private.h projects/sendfile/sys/dev/pcn/if_pcn.c projects/sendfile/sys/dev/pdq/pdq_ifsubr.c projects/sendfile/sys/dev/ppbus/if_plip.c projects/sendfile/sys/dev/qlxgbe/ql_hw.c projects/sendfile/sys/dev/qlxgbe/ql_isr.c projects/sendfile/sys/dev/qlxge/qls_isr.c projects/sendfile/sys/dev/ral/rt2560.c projects/sendfile/sys/dev/ral/rt2661.c projects/sendfile/sys/dev/ral/rt2860.c projects/sendfile/sys/dev/re/if_re.c projects/sendfile/sys/dev/rt/if_rt.c projects/sendfile/sys/dev/sbni/if_sbni.c projects/sendfile/sys/dev/sf/if_sf.c projects/sendfile/sys/dev/sfxge/common/efsys.h projects/sendfile/sys/dev/sfxge/sfxge.c projects/sendfile/sys/dev/sfxge/sfxge.h projects/sendfile/sys/dev/sfxge/sfxge_dma.c projects/sendfile/sys/dev/sfxge/sfxge_ev.c projects/sendfile/sys/dev/sfxge/sfxge_intr.c projects/sendfile/sys/dev/sfxge/sfxge_port.c projects/sendfile/sys/dev/sfxge/sfxge_rx.c projects/sendfile/sys/dev/sfxge/sfxge_rx.h projects/sendfile/sys/dev/sfxge/sfxge_tx.c projects/sendfile/sys/dev/sfxge/sfxge_tx.h projects/sendfile/sys/dev/sge/if_sge.c projects/sendfile/sys/dev/sis/if_sis.c projects/sendfile/sys/dev/sk/if_sk.c projects/sendfile/sys/dev/smc/if_smc.c projects/sendfile/sys/dev/sn/if_sn.c projects/sendfile/sys/dev/snc/dp83932.c projects/sendfile/sys/dev/sound/usb/uaudio.c projects/sendfile/sys/dev/sound/usb/uaudioreg.h projects/sendfile/sys/dev/ste/if_ste.c projects/sendfile/sys/dev/stge/if_stge.c projects/sendfile/sys/dev/ti/if_ti.c projects/sendfile/sys/dev/tl/if_tl.c projects/sendfile/sys/dev/tsec/if_tsec.c projects/sendfile/sys/dev/tws/tws.c projects/sendfile/sys/dev/tws/tws.h projects/sendfile/sys/dev/tws/tws_cam.c projects/sendfile/sys/dev/tws/tws_hdm.c projects/sendfile/sys/dev/tws/tws_hdm.h projects/sendfile/sys/dev/tws/tws_services.c projects/sendfile/sys/dev/tx/if_tx.c projects/sendfile/sys/dev/txp/if_txp.c projects/sendfile/sys/dev/uart/uart.h projects/sendfile/sys/dev/uart/uart_bus_fdt.c projects/sendfile/sys/dev/uart/uart_dev_imx.c projects/sendfile/sys/dev/usb/controller/ohci_s3c24x0.c projects/sendfile/sys/dev/usb/controller/xhci.c projects/sendfile/sys/dev/usb/misc/uled.c projects/sendfile/sys/dev/usb/net/if_aue.c projects/sendfile/sys/dev/usb/net/if_axe.c projects/sendfile/sys/dev/usb/net/if_axge.c projects/sendfile/sys/dev/usb/net/if_cdce.c projects/sendfile/sys/dev/usb/net/if_cue.c projects/sendfile/sys/dev/usb/net/if_ipheth.c projects/sendfile/sys/dev/usb/net/if_kue.c projects/sendfile/sys/dev/usb/net/if_mos.c projects/sendfile/sys/dev/usb/net/if_rue.c projects/sendfile/sys/dev/usb/net/if_smsc.c projects/sendfile/sys/dev/usb/net/if_udav.c projects/sendfile/sys/dev/usb/net/if_urndis.c projects/sendfile/sys/dev/usb/net/if_usie.c projects/sendfile/sys/dev/usb/net/uhso.c projects/sendfile/sys/dev/usb/net/usb_ethernet.c projects/sendfile/sys/dev/usb/serial/u3g.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_rsu.c projects/sendfile/sys/dev/usb/wlan/if_rum.c projects/sendfile/sys/dev/usb/wlan/if_run.c projects/sendfile/sys/dev/usb/wlan/if_uath.c projects/sendfile/sys/dev/usb/wlan/if_upgt.c projects/sendfile/sys/dev/usb/wlan/if_ural.c projects/sendfile/sys/dev/usb/wlan/if_urtw.c projects/sendfile/sys/dev/usb/wlan/if_urtwn.c projects/sendfile/sys/dev/usb/wlan/if_zyd.c projects/sendfile/sys/dev/vge/if_vge.c projects/sendfile/sys/dev/virtio/network/if_vtnet.c projects/sendfile/sys/dev/vmware/vmxnet3/if_vmx.c projects/sendfile/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/sendfile/sys/dev/vr/if_vr.c projects/sendfile/sys/dev/vt/hw/efifb/efifb.c projects/sendfile/sys/dev/vt/hw/fb/vt_early_fb.c projects/sendfile/sys/dev/vt/hw/fb/vt_fb.c projects/sendfile/sys/dev/vt/hw/fb/vt_fb.h projects/sendfile/sys/dev/vt/vt.h projects/sendfile/sys/dev/vt/vt_buf.c projects/sendfile/sys/dev/vt/vt_core.c projects/sendfile/sys/dev/vte/if_vte.c projects/sendfile/sys/dev/vx/if_vx.c projects/sendfile/sys/dev/vxge/vxge.c projects/sendfile/sys/dev/wb/if_wb.c projects/sendfile/sys/dev/wi/if_wi.c projects/sendfile/sys/dev/wl/if_wl.c projects/sendfile/sys/dev/wpi/if_wpi.c projects/sendfile/sys/dev/wtap/if_wtap.c projects/sendfile/sys/dev/xe/if_xe.c projects/sendfile/sys/dev/xen/balloon/balloon.c projects/sendfile/sys/dev/xen/blkback/blkback.c projects/sendfile/sys/dev/xen/netback/netback.c projects/sendfile/sys/dev/xen/netfront/netfront.c projects/sendfile/sys/dev/xl/if_xl.c projects/sendfile/sys/fs/autofs/autofs.c projects/sendfile/sys/fs/autofs/autofs_vnops.c projects/sendfile/sys/fs/devfs/devfs_vnops.c projects/sendfile/sys/geom/eli/g_eli.c projects/sendfile/sys/geom/geom_dev.c projects/sendfile/sys/gnu/fs/reiserfs/reiserfs_fs_i.h projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/i386/i386/pmap.c projects/sendfile/sys/i386/linux/linux.h projects/sendfile/sys/i386/linux/linux_machdep.c projects/sendfile/sys/i386/linux/linux_proto.h projects/sendfile/sys/i386/linux/linux_syscall.h projects/sendfile/sys/i386/linux/linux_syscalls.c projects/sendfile/sys/i386/linux/linux_sysent.c projects/sendfile/sys/i386/linux/linux_systrace_args.c projects/sendfile/sys/i386/linux/syscalls.master projects/sendfile/sys/kern/bus_if.m projects/sendfile/sys/kern/kern_cons.c projects/sendfile/sys/kern/kern_cpuset.c projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/kern_event.c projects/sendfile/sys/kern/kern_exec.c projects/sendfile/sys/kern/kern_intr.c projects/sendfile/sys/kern/kern_malloc.c projects/sendfile/sys/kern/kern_mbuf.c projects/sendfile/sys/kern/kern_poll.c projects/sendfile/sys/kern/sched_ule.c projects/sendfile/sys/kern/subr_bus.c projects/sendfile/sys/kern/sys_pipe.c projects/sendfile/sys/kern/sys_procdesc.c projects/sendfile/sys/kern/sys_socket.c projects/sendfile/sys/kern/tty.c projects/sendfile/sys/kern/tty_pts.c projects/sendfile/sys/kern/uipc_mqueue.c projects/sendfile/sys/kern/uipc_sem.c projects/sendfile/sys/kern/uipc_shm.c projects/sendfile/sys/kern/uipc_sockbuf.c projects/sendfile/sys/kern/vfs_subr.c projects/sendfile/sys/kern/vfs_syscalls.c projects/sendfile/sys/kern/vfs_vnops.c projects/sendfile/sys/mips/adm5120/if_admsw.c projects/sendfile/sys/mips/atheros/ar724x_pci.c projects/sendfile/sys/mips/atheros/if_arge.c projects/sendfile/sys/mips/beri/beri_simplebus.c projects/sendfile/sys/mips/cavium/ciu.c projects/sendfile/sys/mips/cavium/if_octm.c projects/sendfile/sys/mips/cavium/octe/ethernet-rx.c projects/sendfile/sys/mips/cavium/octe/ethernet-tx.c projects/sendfile/sys/mips/idt/if_kr.c projects/sendfile/sys/mips/mips/machdep.c projects/sendfile/sys/mips/nlm/dev/net/xlpge.c projects/sendfile/sys/mips/rmi/dev/nlge/if_nlge.c projects/sendfile/sys/mips/rmi/dev/xlr/rge.c projects/sendfile/sys/modules/Makefile projects/sendfile/sys/modules/bce/Makefile projects/sendfile/sys/modules/bxe/Makefile projects/sendfile/sys/modules/drm2/i915kms/Makefile projects/sendfile/sys/modules/fdc/Makefile projects/sendfile/sys/modules/i2c/controllers/alpm/Makefile projects/sendfile/sys/modules/i2c/controllers/amdpm/Makefile projects/sendfile/sys/modules/i2c/controllers/amdsmb/Makefile projects/sendfile/sys/modules/i2c/controllers/intpm/Makefile projects/sendfile/sys/modules/i2c/controllers/nfsmb/Makefile projects/sendfile/sys/modules/i2c/controllers/viapm/Makefile projects/sendfile/sys/modules/ixgbe/Makefile projects/sendfile/sys/modules/linux/Makefile projects/sendfile/sys/modules/mlx4/Makefile projects/sendfile/sys/modules/mlxen/Makefile projects/sendfile/sys/modules/netmap/Makefile projects/sendfile/sys/modules/rl/Makefile projects/sendfile/sys/modules/vmm/Makefile projects/sendfile/sys/modules/zfs/Makefile projects/sendfile/sys/net/ieee8023ad_lacp.c projects/sendfile/sys/net/ieee8023ad_lacp.h projects/sendfile/sys/net/if.c projects/sendfile/sys/net/if_arcsubr.c projects/sendfile/sys/net/if_atmsubr.c projects/sendfile/sys/net/if_bridge.c projects/sendfile/sys/net/if_debug.c projects/sendfile/sys/net/if_disc.c projects/sendfile/sys/net/if_edsc.c projects/sendfile/sys/net/if_epair.c projects/sendfile/sys/net/if_ethersubr.c projects/sendfile/sys/net/if_faith.c projects/sendfile/sys/net/if_fddisubr.c projects/sendfile/sys/net/if_fwsubr.c projects/sendfile/sys/net/if_gif.c projects/sendfile/sys/net/if_gre.c projects/sendfile/sys/net/if_gre.h projects/sendfile/sys/net/if_iso88025subr.c projects/sendfile/sys/net/if_lagg.c projects/sendfile/sys/net/if_lagg.h projects/sendfile/sys/net/if_loop.c projects/sendfile/sys/net/if_mib.c projects/sendfile/sys/net/if_spppfr.c projects/sendfile/sys/net/if_spppsubr.c projects/sendfile/sys/net/if_stf.c projects/sendfile/sys/net/if_tap.c projects/sendfile/sys/net/if_tun.c projects/sendfile/sys/net/if_var.h projects/sendfile/sys/net/if_vlan.c projects/sendfile/sys/net/ifq.h projects/sendfile/sys/net/radix.c projects/sendfile/sys/net/route.c projects/sendfile/sys/net/route.h projects/sendfile/sys/net/rtsock.c projects/sendfile/sys/net80211/ieee80211.c projects/sendfile/sys/net80211/ieee80211_adhoc.c projects/sendfile/sys/net80211/ieee80211_hostap.c projects/sendfile/sys/net80211/ieee80211_input.c projects/sendfile/sys/net80211/ieee80211_mesh.c projects/sendfile/sys/net80211/ieee80211_monitor.c projects/sendfile/sys/net80211/ieee80211_output.c projects/sendfile/sys/net80211/ieee80211_sta.c projects/sendfile/sys/net80211/ieee80211_superg.c projects/sendfile/sys/net80211/ieee80211_wds.c projects/sendfile/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c projects/sendfile/sys/netgraph/bluetooth/drivers/h4/ng_h4.c projects/sendfile/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/sendfile/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/sendfile/sys/netgraph/ng_device.c projects/sendfile/sys/netgraph/ng_eiface.c projects/sendfile/sys/netgraph/ng_iface.c projects/sendfile/sys/netgraph/ng_ppp.c projects/sendfile/sys/netgraph/ng_sppp.c projects/sendfile/sys/netgraph/ng_tty.c projects/sendfile/sys/netinet/in.c projects/sendfile/sys/netinet/in_mcast.c projects/sendfile/sys/netinet/in_pcb.c projects/sendfile/sys/netinet/in_rmx.c projects/sendfile/sys/netinet/in_rss.c projects/sendfile/sys/netinet/ip_gre.c projects/sendfile/sys/netinet/ip_icmp.c projects/sendfile/sys/netinet/ip_input.c projects/sendfile/sys/netinet/ip_ipsec.c projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netinet/sctp_auth.c projects/sendfile/sys/netinet/sctp_auth.h projects/sendfile/sys/netinet/sctp_cc_functions.c projects/sendfile/sys/netinet/sctp_os_bsd.h projects/sendfile/sys/netinet/sctp_output.c projects/sendfile/sys/netinet/sctp_pcb.c projects/sendfile/sys/netinet/sctp_structs.h projects/sendfile/sys/netinet/sctp_usrreq.c projects/sendfile/sys/netinet/sctputil.c projects/sendfile/sys/netinet/tcp_input.c projects/sendfile/sys/netinet/tcp_output.c projects/sendfile/sys/netinet/tcp_subr.c projects/sendfile/sys/netinet/tcp_syncache.c projects/sendfile/sys/netinet/tcp_var.h projects/sendfile/sys/netinet/toecore.c projects/sendfile/sys/netinet/udp_usrreq.c projects/sendfile/sys/netinet6/in6_rmx.c projects/sendfile/sys/netinet6/ip6_forward.c projects/sendfile/sys/netinet6/ip6_output.c projects/sendfile/sys/netinet6/udp6_usrreq.c projects/sendfile/sys/netipsec/ipsec_input.c projects/sendfile/sys/netipsec/ipsec_output.c projects/sendfile/sys/netpfil/ipfw/ip_dn_io.c projects/sendfile/sys/netpfil/pf/if_pflog.c projects/sendfile/sys/netpfil/pf/if_pfsync.c projects/sendfile/sys/netpfil/pf/pf_table.c projects/sendfile/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/sendfile/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/sendfile/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/sendfile/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c projects/sendfile/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/sendfile/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/sendfile/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/sendfile/sys/ofed/drivers/net/mlx4/alloc.c projects/sendfile/sys/ofed/drivers/net/mlx4/catas.c projects/sendfile/sys/ofed/drivers/net/mlx4/cmd.c projects/sendfile/sys/ofed/drivers/net/mlx4/cq.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_cq.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_main.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_netdev.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_port.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_port.h projects/sendfile/sys/ofed/drivers/net/mlx4/en_resources.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_rx.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_selftest.c projects/sendfile/sys/ofed/drivers/net/mlx4/en_tx.c projects/sendfile/sys/ofed/drivers/net/mlx4/eq.c projects/sendfile/sys/ofed/drivers/net/mlx4/fw.c projects/sendfile/sys/ofed/drivers/net/mlx4/fw.h projects/sendfile/sys/ofed/drivers/net/mlx4/icm.c projects/sendfile/sys/ofed/drivers/net/mlx4/icm.h projects/sendfile/sys/ofed/drivers/net/mlx4/intf.c projects/sendfile/sys/ofed/drivers/net/mlx4/main.c projects/sendfile/sys/ofed/drivers/net/mlx4/mcg.c projects/sendfile/sys/ofed/drivers/net/mlx4/mlx4.h projects/sendfile/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/sendfile/sys/ofed/drivers/net/mlx4/mr.c projects/sendfile/sys/ofed/drivers/net/mlx4/pd.c projects/sendfile/sys/ofed/drivers/net/mlx4/port.c projects/sendfile/sys/ofed/drivers/net/mlx4/profile.c projects/sendfile/sys/ofed/drivers/net/mlx4/qp.c projects/sendfile/sys/ofed/drivers/net/mlx4/reset.c projects/sendfile/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/sendfile/sys/ofed/drivers/net/mlx4/sense.c projects/sendfile/sys/ofed/drivers/net/mlx4/srq.c projects/sendfile/sys/ofed/drivers/net/mlx4/sys_tune.c projects/sendfile/sys/ofed/include/linux/linux_compat.c projects/sendfile/sys/ofed/include/linux/mlx4/cmd.h projects/sendfile/sys/ofed/include/linux/mlx4/cq.h projects/sendfile/sys/ofed/include/linux/mlx4/device.h projects/sendfile/sys/ofed/include/linux/mlx4/driver.h projects/sendfile/sys/ofed/include/linux/mlx4/qp.h projects/sendfile/sys/ofed/include/linux/mlx4/srq.h projects/sendfile/sys/opencrypto/cryptodev.c projects/sendfile/sys/pc98/cbus/olpt.c projects/sendfile/sys/pc98/cbus/pckbd.c projects/sendfile/sys/pc98/conf/GENERIC projects/sendfile/sys/pc98/pc98/machdep.c projects/sendfile/sys/powerpc/aim/locore64.S projects/sendfile/sys/powerpc/aim/machdep.c projects/sendfile/sys/powerpc/booke/machdep.c projects/sendfile/sys/powerpc/ofw/ofw_pcibus.c projects/sendfile/sys/powerpc/powerpc/intr_machdep.c projects/sendfile/sys/powerpc/ps3/if_glc.c projects/sendfile/sys/powerpc/ps3/ps3_syscons.c projects/sendfile/sys/powerpc/pseries/phyp_llan.c projects/sendfile/sys/powerpc/pseries/vdevice.c projects/sendfile/sys/sparc64/pci/psycho.c projects/sendfile/sys/sparc64/sparc64/intr_machdep.c projects/sendfile/sys/sparc64/sparc64/machdep.c projects/sendfile/sys/sys/bus.h projects/sendfile/sys/sys/cpuset.h projects/sendfile/sys/sys/fdcio.h projects/sendfile/sys/sys/file.h projects/sendfile/sys/sys/filedesc.h projects/sendfile/sys/sys/interrupt.h projects/sendfile/sys/sys/ksem.h projects/sendfile/sys/sys/mman.h projects/sendfile/sys/sys/param.h projects/sendfile/sys/sys/sleepqueue.h projects/sendfile/sys/sys/sockbuf.h projects/sendfile/sys/sys/syscallsubr.h projects/sendfile/sys/sys/timex.h projects/sendfile/sys/sys/vnode.h projects/sendfile/sys/vm/vm_map.c projects/sendfile/sys/vm/vm_mmap.c projects/sendfile/sys/vm/vm_pageout.c projects/sendfile/sys/x86/include/init.h projects/sendfile/sys/x86/include/specialreg.h projects/sendfile/sys/x86/x86/intr_machdep.c projects/sendfile/sys/x86/x86/local_apic.c projects/sendfile/sys/x86/xen/pv.c projects/sendfile/sys/x86/xen/xen_intr.c projects/sendfile/sys/x86/xen/xen_nexus.c projects/sendfile/sys/xen/interface/physdev.h projects/sendfile/sys/xen/xen_intr.h projects/sendfile/sys/xen/xenstore/xenstore_internal.h projects/sendfile/tests/sys/netinet/fibs_test.sh projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/sched/schedgraph.py projects/sendfile/tools/test/dtrace/Makefile projects/sendfile/usr.bin/at/at.c projects/sendfile/usr.bin/calendar/calendars/calendar.freebsd projects/sendfile/usr.bin/elfdump/elfdump.1 projects/sendfile/usr.bin/grep/Makefile projects/sendfile/usr.bin/grep/regex/tre-fastmatch.c projects/sendfile/usr.bin/man/man.1 projects/sendfile/usr.bin/mkimg/Makefile projects/sendfile/usr.bin/mkimg/apm.c projects/sendfile/usr.bin/mkimg/bsd.c projects/sendfile/usr.bin/mkimg/ebr.c projects/sendfile/usr.bin/mkimg/gpt.c projects/sendfile/usr.bin/mkimg/image.c projects/sendfile/usr.bin/mkimg/mbr.c projects/sendfile/usr.bin/mkimg/mkimg.1 projects/sendfile/usr.bin/mkimg/mkimg.c projects/sendfile/usr.bin/mkimg/mkimg.h projects/sendfile/usr.bin/mkimg/pc98.c projects/sendfile/usr.bin/mkimg/scheme.c projects/sendfile/usr.bin/mkimg/scheme.h projects/sendfile/usr.bin/mkimg/vhd.c projects/sendfile/usr.bin/mkimg/vtoc8.c projects/sendfile/usr.bin/sort/sort.c projects/sendfile/usr.bin/systat/ifstat.c projects/sendfile/usr.bin/xinstall/xinstall.c projects/sendfile/usr.sbin/autofs/common.c projects/sendfile/usr.sbin/bhyve/bhyve.8 projects/sendfile/usr.sbin/bhyve/bhyverun.c projects/sendfile/usr.sbin/bhyve/smbiostbl.c projects/sendfile/usr.sbin/bhyve/xmsr.c projects/sendfile/usr.sbin/bhyve/xmsr.h projects/sendfile/usr.sbin/bhyvectl/bhyvectl.c projects/sendfile/usr.sbin/bsdinstall/distextract/distextract.c projects/sendfile/usr.sbin/bsdinstall/distfetch/distfetch.c projects/sendfile/usr.sbin/bsdinstall/scripts/services projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot projects/sendfile/usr.sbin/ctld/ctld.c projects/sendfile/usr.sbin/fdread/fdutil.c projects/sendfile/usr.sbin/lpr/lpd/printjob.c projects/sendfile/usr.sbin/makefs/ffs.c projects/sendfile/usr.sbin/mfiutil/mfi_properties.c projects/sendfile/usr.sbin/mtree/Makefile projects/sendfile/usr.sbin/newsyslog/newsyslog.8 Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/sendfile/contrib/apr-util/ (props changed) projects/sendfile/contrib/atf/ (props changed) projects/sendfile/contrib/ipfilter/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/one-true-awk/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/gnu/usr.bin/cc/cc_tools/ (props changed) projects/sendfile/include/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libc/stdtime/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/sys/contrib/ipfilter/ (props changed) projects/sendfile/sys/dev/hyperv/ (props changed) projects/sendfile/sys/modules/vmm/ (props changed) projects/sendfile/usr.bin/calendar/ (props changed) projects/sendfile/usr.bin/mkimg/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/bhyvectl/ (props changed) Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/Makefile.inc1 Thu Oct 2 08:57:11 2014 (r272400) @@ -336,11 +336,11 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX} .else XFLAGS+= -B${WORLDTMP}/usr/bin .endif -.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no" -.if ${TARGET_ARCH:M*eb*} == "" -TARGET_ABI= gnueabi -.elif ${TARGET_ARCH} == "armv6hf" +.if ${TARGET} == "arm" +.if ${TARGET_ARCH:M*hf*} != "" TARGET_ABI= gnueabihf +.else +TARGET_ABI= gnueabi .endif .endif TARGET_ABI?= unknown @@ -352,6 +352,7 @@ WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAG .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world +LIB32_OBJTREE= ${OBJTREE}${.CURDIR}/world32 LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 .if ${TARGET_ARCH} == "amd64" @@ -387,7 +388,7 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} .endif # Yes, the flags are redundant. -LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ @@ -611,7 +612,7 @@ build32: cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ + MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor @@ -910,7 +911,7 @@ packageworld: # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: +reinstall: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -925,7 +926,7 @@ reinstall: ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif -redistribute: +redistribute: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" @@ -935,7 +936,7 @@ redistribute: DISTRIBUTION=lib32 .endif -distrib-dirs distribution: +distrib-dirs distribution: .MAKE cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} @@ -1463,7 +1464,7 @@ native-xtools: .MAKE # # hierarchy - ensure that all the needed directories are present # -hierarchy hier: +hierarchy hier: .MAKE cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/ObsoleteFiles.inc Thu Oct 2 08:57:11 2014 (r272400) @@ -38,6 +38,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed +OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz +OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz +# 20140917: hv_kvpd rc.d script removed in favor of devd configuration +OLD_FILES+=etc/rc.d/hv_kvpd +# 20140917: libnv was accidentally being installed to /usr/lib instead of /lib +OLD_LIBS+=usr/lib/libnv.a +OLD_LIBS+=usr/lib/libnv.so.0 # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 Modified: projects/sendfile/UPDATING ============================================================================== --- projects/sendfile/UPDATING Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/UPDATING Thu Oct 2 08:57:11 2014 (r272400) @@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140923: + pjdfstest has been moved from tools/regression/pjdfstest to + contrib/pjdfstest . + +20140922: + At svn r271982, The default linux compat kernel ABI has been adjusted + to 2.6.18 in support of the linux-c6 compat ports infrastructure + update. If you wish to continue using the linux-f10 compat ports, + add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are + encouraged to update their linux-compat packages to linux-c6 during + their next update cycle. + 20140729: The ofwfb driver, used to provide a graphics console on PowerPC when using vt(4), no longer allows mmap() of all of physical memory. This Modified: projects/sendfile/bin/csh/Makefile ============================================================================== --- projects/sendfile/bin/csh/Makefile Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/bin/csh/Makefile Thu Oct 2 08:57:11 2014 (r272400) @@ -94,7 +94,7 @@ GENHDRS+= iconv.h SRCS+= iconv_stub.c iconv.h: ${.CURDIR}/iconv_stub.h - cp ${.CURDIR}/iconv_stub.h ${.TARGET} + cp -f ${.CURDIR}/iconv_stub.h ${.TARGET} .endif .endif Modified: projects/sendfile/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/sendfile/bin/pkill/tests/pgrep-j_test.sh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/bin/pkill/tests/pgrep-j_test.sh Thu Oct 2 08:57:11 2014 (r272400) @@ -1,7 +1,23 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` +jail_name_to_jid() +{ + local check_name="$1" + ( + line="$(jls -n 2> /dev/null | grep name=$check_name )" + for nv in $line; do + local name="${nv%=*}" + if [ "${name}" = "jid" ]; then + eval $nv + echo $jid + break + fi + done + ) +} + +base=pgrep_j_test echo "1..3" @@ -9,21 +25,25 @@ name="pgrep -j " if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! - $sleep 5 & - chpid3=$! - sleep 0.5 - jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"` - pid=`pgrep -f -j $jid $sleep` - if [ "$pid" = "$chpid" ]; then + jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & + + jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & + + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" + pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) + if [ "$pid1" = "$pid2" ]; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi - kill $chpid $chpid2 $chpid3 + [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) + [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) rm -f $sleep else echo "ok 1 - $name # skip Test needs uid 0." @@ -33,21 +53,23 @@ name="pgrep -j any" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! - $sleep 5 & - chpid3=$! - sleep 0.5 - pids=`pgrep -f -j any $sleep | sort` - refpids=`{ echo $chpid; echo $chpid2; } | sort` - if [ "$pids" = "$refpids" ]; then + jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & + + jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & + + sleep 2 + pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" + pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) + if [ "$pid1" = "$pid2" ]; then echo "ok 2 - $name" else echo "not ok 2 - $name" fi - kill $chpid $chpid2 $chpid3 + [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) + [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) rm -f $sleep else echo "ok 2 - $name # skip Test needs uid 0." @@ -57,19 +79,19 @@ name="pgrep -j none" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - $sleep 5 & - chpid=$! - jail / $base 127.0.0.1 $sleep 5 & - chpid2=$! - sleep 0.5 - pid=`pgrep -f -j none $sleep` - if [ "$pid" = "$chpid" ]; then + daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & + jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & + sleep 2 + pid="$(pgrep -f -x -j none "$sleep 5")" + if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then echo "ok 3 - $name" else echo "not ok 3 - $name" fi - kill $chpid $chpid2 rm -f $sleep + [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) + [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) else echo "ok 3 - $name # skip Test needs uid 0." fi Modified: projects/sendfile/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/sendfile/bin/pkill/tests/pkill-j_test.sh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/bin/pkill/tests/pkill-j_test.sh Thu Oct 2 08:57:11 2014 (r272400) @@ -1,7 +1,23 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` +jail_name_to_jid() +{ + local check_name="$1" + ( + line="$(jls -n 2> /dev/null | grep name=$check_name )" + for nv in $line; do + local name="${nv%=*}" + if [ "${name}" = "jid" ]; then + eval $nv + echo $jid + break + fi + done + ) +} + +base=pkill_j_test echo "1..3" @@ -9,21 +25,28 @@ name="pkill -j " if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! + jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & + + jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & + $sleep 5 & - chpid3=$! sleep 0.5 - jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"` - if pkill -f -j $jid $sleep && sleep 0.5 && - ! kill $chpid && kill $chpid2 $chpid3; then + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) + [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) + wait else echo "ok 1 - $name # skip Test needs uid 0." fi @@ -32,20 +55,26 @@ name="pkill -j any" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! + jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & + + jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & + $sleep 5 & - chpid3=$! sleep 0.5 + chpid3=$! if pkill -f -j any $sleep && sleep 0.5 && - ! kill $chpid && ! kill $chpid2 && kill $chpid3; then + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then echo "ok 2 - $name" else echo "not ok 2 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) + [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) + wait else echo "ok 2 - $name # skip Test needs uid 0." fi @@ -54,18 +83,20 @@ name="pkill -j none" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - $sleep 5 & - chpid=$! - jail / $base 127.0.0.1 $sleep 5 & - chpid2=$! - sleep 0.5 - if pkill -f -j none $sleep && sleep 0.5 && - ! kill $chpid && kill $chpid2; then + daemon -p ${PWD}/${base}_3_1.pid $sleep 5 + jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & + sleep 1 + if pkill -f -j none "$sleep 5" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then echo "ok 3 - $name" else + ls ${PWD}/*.pid echo "not ok 3 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) + [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) else echo "ok 3 - $name # skip Test needs uid 0." fi Modified: projects/sendfile/bin/sh/sh.1 ============================================================================== --- projects/sendfile/bin/sh/sh.1 Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/bin/sh/sh.1 Thu Oct 2 08:57:11 2014 (r272400) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd September 4, 2014 +.Dd September 21, 2014 .Dt SH 1 .Os .Sh NAME @@ -590,7 +590,8 @@ the following actions: Leading words of the form .Dq Li name=value are stripped off and assigned to the environment of -the simple command. +the simple command +(they do not affect expansions). Redirection operators and their arguments (as described below) are stripped off and saved for processing. Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Thu Oct 2 08:57:11 2014 (r272400) @@ -277,6 +277,19 @@ Generate a header file containing macros specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the +.Fl G +option. +If the +.Fl o +option is present, the header file is saved using the pathname specified as the +argument for that option. +If the +.Fl o +option is not present and the DTrace program is contained within a file whose +name is +.Ar filename.d , +then the header file is saved using the name +.Ar filename.h . .It Fl H Print the pathnames of included files when invoking .Xr cpp 1 @@ -289,20 +302,6 @@ option to each .Xr cpp 1 invocation, causing it to display the list of pathnames, one for each line, to standard error. -.Fl G -option. -If the -.Fl o -option -is present, the header file is saved using the pathname specified as the -argument for that option. -If the -.Fl o -option is not present and the DTrace program is contained with a file whose -name is -.Ar filename.d , -then the header file is saved using the name -.Ar filename.h . .It Fl i Ar probe-id Op Oo Ar predicate Oc Ar action Specify probe identifier .Ar ( probe-id ) Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Thu Oct 2 08:57:11 2014 (r272400) @@ -34,14 +34,14 @@ * leading underscores. */ -#pragma weak _go = go - static int go(int a) { return (a + 1); } +#pragma weak _go = go + static void handle(int sig) { Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -29,6 +29,7 @@ dtrace=$1 t="season_8_mountain_of_madness_t" pid=$$ -rc=`$dtrace -n "BEGIN{ trace(pid$pid`$t)0); }"` +$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" +rc=$? exit $rc Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -30,6 +30,7 @@ dtrace=$1 t="season_8_mountain_of_madness_t" pid=$$ -rc=`$dtrace -n "BEGIN{ trace(pid`$t)0); }"` -p $pid +$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" -p $pid +rc=$? exit $rc Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -31,7 +31,7 @@ dtrace=$1 t="zelda_info_t" exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -25,10 +25,10 @@ if [ $# != 1 ]; then fi dtrace=$1 -t="season_7_lisa_the_vegetrian_t *" +t="season_7_lisa_the_vegetarian_t *" exe="tst.aouttype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 @@ -37,7 +37,8 @@ fi ./$exe & pid=$! -rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"` +$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }" +rc=$? kill -9 $pid Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -29,7 +29,7 @@ dtrace=$1 t="zelda_info_t" exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -29,7 +29,7 @@ dtrace=$1 t="int" exe="tst.libtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -eq 0 ]]; then echo "CTF exists in $exe, that's a bug" >&2 exit 1 @@ -38,7 +38,8 @@ fi ./$exe & pid=$! -rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"` +$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }" +rc=$? kill -9 $pid Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -28,7 +28,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -29,7 +29,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -28,7 +28,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -29,7 +29,7 @@ dtrace=$1 t="final_fantasy_info_t" exe="tst.printtype.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -29,7 +29,7 @@ dtrace=$1 t="zelda_info_t" exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh Thu Oct 2 08:57:11 2014 (r272400) @@ -28,7 +28,7 @@ fi dtrace=$1 exe="tst.chasestrings.exe" -elfdump "./$exe" | grep -q '.SUNW_ctf' +elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' if [[ $? -ne 0 ]]; then echo "CTF does not exist in $exe, that's a bug" >&2 exit 1 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Oct 2 08:57:11 2014 (r272400) @@ -4524,7 +4524,8 @@ is_root_pool(zpool_handle_t *zhp) } static void -root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) { +root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) +{ if (poolname[0] == '\0' && is_root_pool(zhp)) (void) strlcpy(poolname, zpool_get_name(zhp), size); @@ -4623,7 +4624,7 @@ upgrade_cb(zpool_handle_t *zhp, void *ar #ifdef __FreeBSD__ root_pool_upgrade_check(zhp, cbp->cb_poolname, sizeof(cbp->cb_poolname)); -#endif /* ___FreeBSD__ */ +#endif /* __FreeBSD__ */ printnl = B_TRUE; #ifdef illumos @@ -4647,6 +4648,10 @@ upgrade_cb(zpool_handle_t *zhp, void *ar if (count > 0) { cbp->cb_first = B_FALSE; printnl = B_TRUE; +#ifdef __FreeBSD__ + root_pool_upgrade_check(zhp, cbp->cb_poolname, + sizeof(cbp->cb_poolname)); +#endif /* __FreeBSD__ */ /* * If they did "zpool upgrade -a", then we could * be doing ioctls to different pools. We need @@ -4788,7 +4793,7 @@ upgrade_one(zpool_handle_t *zhp, void *d #ifdef __FreeBSD__ root_pool_upgrade_check(zhp, cbp->cb_poolname, sizeof(cbp->cb_poolname)); -#endif /* ___FreeBSD__ */ +#endif /* __FreeBSD__ */ } if (cbp->cb_version >= SPA_VERSION_FEATURES) { Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Thu Oct 2 08:57:11 2014 (r272400) @@ -653,6 +653,7 @@ get_replication(nvlist_t *nvroot, boolea dontreport = 0; vdev_size = -1ULL; for (c = 0; c < children; c++) { + boolean_t is_replacing, is_spare; nvlist_t *cnv = child[c]; char *path; struct stat64 statbuf; @@ -669,16 +670,19 @@ get_replication(nvlist_t *nvroot, boolea * If this is a replacing or spare vdev, then * get the real first child of the vdev. */ - if (strcmp(childtype, - VDEV_TYPE_REPLACING) == 0 || - strcmp(childtype, VDEV_TYPE_SPARE) == 0) { + is_replacing = strcmp(childtype, + VDEV_TYPE_REPLACING) == 0; + is_spare = strcmp(childtype, + VDEV_TYPE_SPARE) == 0; + if (is_replacing || is_spare) { nvlist_t **rchild; uint_t rchildren; verify(nvlist_lookup_nvlist_array(cnv, ZPOOL_CONFIG_CHILDREN, &rchild, &rchildren) == 0); - assert(rchildren == 2); + assert((is_replacing && rchildren == 2) + || (is_spare && rchildren >= 2)); cnv = rchild[0]; verify(nvlist_lookup_string(cnv, Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c Thu Oct 2 08:57:11 2014 (r272400) @@ -274,7 +274,7 @@ ctf_fdopen(int fd, int *errp) */ if (nbytes >= (ssize_t) sizeof (Elf32_Ehdr) && bcmp(&hdr.e32.e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) { -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN uchar_t order = ELFDATA2MSB; #else uchar_t order = ELFDATA2LSB; Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Oct 2 08:57:11 2014 (r272400) @@ -121,12 +121,12 @@ dtrace_dof_init(void) #if !defined(sun) Elf *e; Elf_Scn *scn = NULL; - Elf_Data *symtabdata = NULL, *dynsymdata = NULL, *dofdata = NULL; + Elf_Data *dofdata = NULL; dof_hdr_t *dof_next = NULL; GElf_Shdr shdr; int efd; char *s; - size_t shstridx, symtabidx = 0, dynsymidx = 0; + size_t shstridx; #endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) @@ -166,15 +166,9 @@ dtrace_dof_init(void) dof = NULL; while ((scn = elf_nextscn(e, scn)) != NULL) { gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SYMTAB) { - symtabidx = shdr.sh_link; - symtabdata = elf_getdata(scn, NULL); - } else if (shdr.sh_type == SHT_DYNSYM) { - dynsymidx = shdr.sh_link; - dynsymdata = elf_getdata(scn, NULL); - } else if (shdr.sh_type == SHT_SUNW_dof) { + if (shdr.sh_type == SHT_SUNW_dof) { s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { + if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { dofdata = elf_getdata(scn, NULL); dof = dofdata->d_buf; } Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Oct 2 08:57:11 2014 (r272400) @@ -1819,7 +1819,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to write %s: %s", file, strerror(errno))); } #else - (void)close(fd); if (status != 0) return (dt_link_error(dtp, NULL, -1, NULL, "failed to write %s: %s", tfile, Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c Thu Oct 2 08:57:11 2014 (r272400) @@ -167,7 +167,7 @@ print_bitfield(dt_printarg_t *pap, ulong * to the lowest 'size' bytes in 'value', and we need to shift based on * the offset from the end of the data, not the offset of the start. */ -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN buf += sizeof (value) - size; off += ep->cte_bits; #endif @@ -178,7 +178,7 @@ print_bitfield(dt_printarg_t *pap, ulong * Offsets are counted from opposite ends on little- and * big-endian machines. */ -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN shift = NBBY - shift; #endif Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Oct 2 08:57:11 2014 (r272400) @@ -1457,6 +1457,12 @@ zfs_setprop_error(libzfs_handle_t *hdl, (void) zfs_error(hdl, EZFS_DSREADONLY, errbuf); break; + case E2BIG: + zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, + "property value too long")); + (void) zfs_error(hdl, EZFS_BADPROP, errbuf); + break; + case ENOTSUP: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "pool and or dataset must be upgraded to set this " Modified: projects/sendfile/cddl/usr.sbin/Makefile ============================================================================== --- projects/sendfile/cddl/usr.sbin/Makefile Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/cddl/usr.sbin/Makefile Thu Oct 2 08:57:11 2014 (r272400) @@ -5,6 +5,7 @@ SUBDIR= ${_dtrace} \ ${_dtruss} \ ${_lockstat} \ + ${_plockstat} \ ${_tests} \ ${_zdb} \ ${_zhack} @@ -24,6 +25,9 @@ _zhack= zhack _dtrace= dtrace _dtruss= dtruss _lockstat= lockstat +.if defined(WITH_PLOCKSTAT) +_plockstat= plockstat +.endif .endif .if ${MACHINE_CPUARCH} == "mips" Modified: projects/sendfile/contrib/apr-util/CHANGES ============================================================================== --- projects/sendfile/contrib/apr-util/CHANGES Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/contrib/apr-util/CHANGES Thu Oct 2 08:57:11 2014 (r272400) @@ -1,4 +1,30 @@ -*- coding: utf-8 -*- +Changes with APR-util 1.5.4 + + *) MySQL driver: Fix incorrect handling of bad parameter in the + driver support for apr_dbd_transaction_end(). PR 56330. + [Weiqiang Li ] + + *) apr_crypto_get_driver(): Fix invalid storage reference on error path. + [Philip Martin ] + + *) Fix compile failure for Android. PR 56627. [Fredrik Fornwall + , Jeff Trawick] + + *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t + [Tom Donovan] + + *) Windows cmake build: Fix incompatiblities with Visual Studio + generators with all cmake versions, and the NMake Makefile generator + with cmake 2.8.12 and later. PR 56616 and other bugs. [Jeff Trawick, + Bert Huijben] + + *) Fix detection of Berkeley DB 6.0. PR 55277. + [Lars Wendler ] + + *) Improve platform detection for bundled expat by updating + config.guess and config.sub. [Rainer Jung] + Changes with APR-util 1.5.3 *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587. Modified: projects/sendfile/contrib/apr-util/NOTICE ============================================================================== --- projects/sendfile/contrib/apr-util/NOTICE Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/contrib/apr-util/NOTICE Thu Oct 2 08:57:11 2014 (r272400) @@ -1,7 +1,7 @@ Apache Portable Runtime Utility Library -Copyright (c) 2011 The Apache Software Foundation. +Copyright (c) 2000-2014 The Apache Software Foundation. -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Portions of this software were developed at the National Center Modified: projects/sendfile/contrib/apr-util/apr-util.spec ============================================================================== --- projects/sendfile/contrib/apr-util/apr-util.spec Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/contrib/apr-util/apr-util.spec Thu Oct 2 08:57:11 2014 (r272400) @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.5.3 +Version: 1.5.4 Release: 1 License: Apache Software License Group: System Environment/Libraries Modified: projects/sendfile/contrib/apr-util/configure ============================================================================== --- projects/sendfile/contrib/apr-util/configure Thu Oct 2 08:12:42 2014 (r272399) +++ projects/sendfile/contrib/apr-util/configure Thu Oct 2 08:57:11 2014 (r272400) @@ -11608,19 +11608,34 @@ fi apu_db_version=0 # Maximum supported version announced in help string. - # Although we search for all versions up to 5.9, + # Although we search for all versions up to 6.9, # we should only include existing versions in our # help string. - db_max_version=53 - db_min_version=41 dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" + db_max_version=48 + db_min_version=41 + db_version="$db_min_version" + while [ $db_version -le $db_max_version ] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done + db_max_version=53 + db_min_version=50 + db_version="$db_min_version" + while [ $db_version -le $db_max_version ] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done + db_max_version=60 + db_min_version=60 db_version="$db_min_version" while [ $db_version -le $db_max_version ] do dbm_list="$dbm_list, db$db_version" db_version=`expr $db_version + 1` done - dbm_list="$dbm_list, db60" # Check whether --with-dbm was given. @@ -12093,8 +12108,8 @@ if test "${with_berkeley_db+set}" = set; all_places="$check_places" - # Start version search at version 5.9 - db_version=59 + # Start version search at version 6.9 + db_version=69 while [ $db_version -ge 40 ] do db_major=`echo $db_version | sed -e 's/.$//'` @@ -12178,7 +12193,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then + if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -12580,7 +12595,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "3" = "3" -o "3" = "4" -o "3" = "5"; then + if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -12978,7 +12993,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "2" = "3" -o "2" = "4" -o "2" = "5"; then + if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -13376,7 +13391,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -13774,7 +13789,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -14186,7 +14201,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -14587,7 +14602,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "1" = "3" -o "1" = "4" -o "1" = "5"; then + if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -14988,7 +15003,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "2" = "3" -o "2" = "4" -o "2" = "5"; then + if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -15389,7 +15404,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test "3" = "3" -o "3" = "4" -o "3" = "5"; then + if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -15794,7 +15809,7 @@ $as_echo "" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***