Date: Thu, 6 Feb 2014 15:46:35 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r261554 - in projects/uefi: . bin bin/date bin/date/tests bin/mv bin/mv/tests bin/pax bin/pax/tests bin/sh bin/sh/tests bin/test bin/test/tests bin/tests cddl/contrib/opensolaris/cmd/zd... Message-ID: <201402061546.s16FkZVF098871@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Feb 6 15:46:33 2014 New Revision: 261554 URL: http://svnweb.freebsd.org/changeset/base/261554 Log: Merge ^/head@259912 Sponsored by: The FreeBSD Foundation Added: projects/uefi/bin/date/tests/ - copied from r259912, head/bin/date/tests/ projects/uefi/bin/mv/tests/ - copied from r259912, head/bin/mv/tests/ projects/uefi/bin/pax/tests/ - copied from r259912, head/bin/pax/tests/ projects/uefi/bin/sh/tests/ - copied from r259912, head/bin/sh/tests/ projects/uefi/bin/test/tests/ - copied from r259912, head/bin/test/tests/ projects/uefi/bin/tests/ - copied from r259912, head/bin/tests/ projects/uefi/contrib/gcclibs/libcpp/ChangeLog.apple - copied unchanged from r259912, head/contrib/gcclibs/libcpp/ChangeLog.apple projects/uefi/etc/rc.d/casperd - copied unchanged from r259912, head/etc/rc.d/casperd projects/uefi/lib/clang/include/PPCGenAsmMatcher.inc - copied unchanged from r259912, head/lib/clang/include/PPCGenAsmMatcher.inc projects/uefi/lib/clang/libllvmpowerpcasmparser/ - copied from r259912, head/lib/clang/libllvmpowerpcasmparser/ projects/uefi/release/scripts/FreeBSD_install_cdrom.conf - copied unchanged from r259912, head/release/scripts/FreeBSD_install_cdrom.conf projects/uefi/share/mk/tap.test.mk - copied unchanged from r259912, head/share/mk/tap.test.mk projects/uefi/sys/amd64/vmm/io/vlapic_priv.h - copied unchanged from r259912, head/sys/amd64/vmm/io/vlapic_priv.h projects/uefi/sys/arm/broadcom/bcm2835/bcm2835_fbd.c - copied unchanged from r259912, head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/uefi/sys/arm/freescale/imx/imx51_ipuv3_fbd.c - copied unchanged from r259912, head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/uefi/sys/boot/fdt/dts/beri-netfpga.dts - copied unchanged from r259912, head/sys/boot/fdt/dts/beri-netfpga.dts projects/uefi/sys/dev/netmap/netmap_freebsd.c - copied unchanged from r259912, head/sys/dev/netmap/netmap_freebsd.c projects/uefi/sys/dev/netmap/netmap_generic.c - copied unchanged from r259912, head/sys/dev/netmap/netmap_generic.c projects/uefi/sys/dev/netmap/netmap_mbq.c - copied unchanged from r259912, head/sys/dev/netmap/netmap_mbq.c projects/uefi/sys/dev/netmap/netmap_mbq.h - copied unchanged from r259912, head/sys/dev/netmap/netmap_mbq.h projects/uefi/sys/dev/netmap/netmap_vale.c - copied unchanged from r259912, head/sys/dev/netmap/netmap_vale.c projects/uefi/sys/mips/conf/BERI_NETFPGA_MDROOT - copied unchanged from r259912, head/sys/mips/conf/BERI_NETFPGA_MDROOT projects/uefi/sys/opencrypto/cryptodeflate.c - copied unchanged from r259912, head/sys/opencrypto/cryptodeflate.c projects/uefi/sys/powerpc/cpufreq/pmufreq.c - copied unchanged from r259912, head/sys/powerpc/cpufreq/pmufreq.c projects/uefi/tools/regression/usr.bin/sed/regress.icase4.out - copied unchanged from r259912, head/tools/regression/usr.bin/sed/regress.icase4.out projects/uefi/tools/regression/usr.sbin/etcupdate/tzsetup.sh - copied unchanged from r259912, head/tools/regression/usr.sbin/etcupdate/tzsetup.sh projects/uefi/usr.sbin/bhyve/bhyve.8 - copied unchanged from r259912, head/usr.sbin/bhyve/bhyve.8 projects/uefi/usr.sbin/bhyve/pm.c - copied unchanged from r259912, head/usr.sbin/bhyve/pm.c Deleted: projects/uefi/sys/i386/i386/symbols.raw projects/uefi/sys/opencrypto/deflate.c projects/uefi/tools/regression/bin/ Modified: projects/uefi/ObsoleteFiles.inc projects/uefi/UPDATING projects/uefi/bin/Makefile projects/uefi/bin/date/Makefile projects/uefi/bin/mv/Makefile projects/uefi/bin/pax/Makefile projects/uefi/bin/pax/pax.1 projects/uefi/bin/sh/Makefile projects/uefi/bin/sh/eval.c projects/uefi/bin/sh/var.c projects/uefi/bin/sh/var.h projects/uefi/bin/test/Makefile projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/uefi/cddl/contrib/opensolaris/cmd/zhack/zhack.c projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/uefi/contrib/file/compress.c projects/uefi/contrib/gcc/ChangeLog.gcc43 projects/uefi/contrib/gcc/c-common.c projects/uefi/contrib/gcc/c-common.h projects/uefi/contrib/gcc/c-convert.c projects/uefi/contrib/gcc/c-incpath.c projects/uefi/contrib/gcc/c-opts.c projects/uefi/contrib/gcc/c-typeck.c projects/uefi/contrib/gcc/c.opt projects/uefi/contrib/gcc/calls.c projects/uefi/contrib/gcc/cfg.c projects/uefi/contrib/gcc/collect2.c projects/uefi/contrib/gcc/config/arm/arm.c projects/uefi/contrib/gcc/config/arm/arm.md projects/uefi/contrib/gcc/config/darwin.c projects/uefi/contrib/gcc/config/darwin.h projects/uefi/contrib/gcc/config/i386/emmintrin.h projects/uefi/contrib/gcc/config/rs6000/rs6000.c projects/uefi/contrib/gcc/cp/ChangeLog.gcc43 projects/uefi/contrib/gcc/cp/Make-lang.in projects/uefi/contrib/gcc/cp/cvt.c projects/uefi/contrib/gcc/cp/decl.c projects/uefi/contrib/gcc/cp/decl2.c projects/uefi/contrib/gcc/cp/mangle.c projects/uefi/contrib/gcc/cp/method.c projects/uefi/contrib/gcc/cp/parser.c projects/uefi/contrib/gcc/cp/pt.c projects/uefi/contrib/gcc/cp/rtti.c projects/uefi/contrib/gcc/cp/typeck.c projects/uefi/contrib/gcc/doc/cppopts.texi projects/uefi/contrib/gcc/doc/invoke.texi projects/uefi/contrib/gcc/doc/tm.texi projects/uefi/contrib/gcc/dwarf2out.c projects/uefi/contrib/gcc/fold-const.c projects/uefi/contrib/gcc/gcc.c projects/uefi/contrib/gcc/gcov.c projects/uefi/contrib/gcc/sched-vis.c projects/uefi/contrib/gcc/target-def.h projects/uefi/contrib/gcc/target.h projects/uefi/contrib/gcc/tlink.c projects/uefi/contrib/gcc/tree-dump.c projects/uefi/contrib/gcc/version.c projects/uefi/contrib/gcclibs/libcpp/charset.c projects/uefi/contrib/gcclibs/libcpp/include/cpplib.h projects/uefi/contrib/gcclibs/libcpp/init.c projects/uefi/contrib/gcclibs/libcpp/lex.c projects/uefi/contrib/gperf/lib/getline.cc projects/uefi/contrib/llvm/lib/Target/X86/X86InstrMMX.td projects/uefi/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp projects/uefi/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/uefi/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/uefi/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/uefi/contrib/nvi/cl/cl_term.c projects/uefi/contrib/nvi/common/key.c projects/uefi/contrib/nvi/common/key.h projects/uefi/contrib/tcpdump/addrtoname.c projects/uefi/contrib/tcpdump/tcpdump.c projects/uefi/contrib/tzcode/stdtime/tzfile.5 projects/uefi/contrib/tzdata/asia projects/uefi/contrib/tzdata/northamerica projects/uefi/crypto/heimdal/lib/gssapi/krb5/prf.c projects/uefi/etc/defaults/rc.conf projects/uefi/etc/devd/usb.conf projects/uefi/etc/mtree/BSD.tests.dist projects/uefi/etc/rc.d/Makefile projects/uefi/etc/rc.d/jail projects/uefi/etc/syslog.conf projects/uefi/games/fortune/datfiles/fortunes projects/uefi/games/fortune/fortune/fortune.c projects/uefi/gnu/lib/csu/Makefile projects/uefi/gnu/lib/libgcc/Makefile projects/uefi/gnu/lib/libstdc++/Makefile projects/uefi/gnu/lib/libsupc++/Makefile projects/uefi/include/rpcsvc/bootparam_prot.x projects/uefi/include/rpcsvc/key_prot.x projects/uefi/include/rpcsvc/klm_prot.x projects/uefi/include/rpcsvc/mount.x projects/uefi/include/rpcsvc/nfs_prot.x projects/uefi/include/rpcsvc/nis.x projects/uefi/include/rpcsvc/nis_callback.x projects/uefi/include/rpcsvc/nis_object.x projects/uefi/include/rpcsvc/nis_tags.h projects/uefi/include/rpcsvc/rex.x projects/uefi/include/rpcsvc/rnusers.x projects/uefi/include/rpcsvc/rstat.x projects/uefi/include/rpcsvc/sm_inter.x projects/uefi/include/rpcsvc/spray.x projects/uefi/include/rpcsvc/yp.x projects/uefi/include/rpcsvc/yppasswd.x projects/uefi/kerberos5/lib/Makefile projects/uefi/kerberos5/lib/libkafs5/Makefile projects/uefi/lib/atf/libatf-c/tests/Makefile projects/uefi/lib/clang/Makefile projects/uefi/lib/clang/include/llvm/Config/AsmParsers.def projects/uefi/lib/libc/stdlib/atexit.c projects/uefi/lib/libc/stdlib/getopt_long.3 projects/uefi/lib/libc/sys/shm_open.2 projects/uefi/lib/libc/sys/swapon.2 projects/uefi/lib/libc/sys/wait.2 projects/uefi/lib/libc/xdr/xdr.c projects/uefi/lib/libc/xdr/xdr_array.c projects/uefi/lib/libc/xdr/xdr_float.c projects/uefi/lib/libc/xdr/xdr_mem.c projects/uefi/lib/libc/xdr/xdr_rec.c projects/uefi/lib/libc/xdr/xdr_reference.c projects/uefi/lib/libc/xdr/xdr_sizeof.c projects/uefi/lib/libc/xdr/xdr_stdio.c projects/uefi/lib/libcam/Makefile projects/uefi/lib/libdevstat/devstat.c projects/uefi/lib/libkvm/kvm_ia64.c projects/uefi/lib/libnv/msgio.c projects/uefi/lib/libnv/msgio.h projects/uefi/lib/libnv/nvlist.c projects/uefi/lib/libstand/close.c projects/uefi/lib/libstand/dosfs.c projects/uefi/lib/libstand/dosfs.h projects/uefi/lib/libstand/environment.c projects/uefi/lib/libvmmapi/vmmapi.c projects/uefi/lib/libvmmapi/vmmapi.h projects/uefi/libexec/rtld-elf/rtld.c projects/uefi/libexec/rtld-elf/rtld.h projects/uefi/libexec/rtld-elf/xmalloc.c projects/uefi/release/Makefile projects/uefi/release/doc/Makefile projects/uefi/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/uefi/release/doc/share/xml/release.ent projects/uefi/release/picobsd/build/picobsd projects/uefi/release/rc.local projects/uefi/release/release.conf.sample projects/uefi/release/release.sh projects/uefi/release/scripts/pkg-stage.sh projects/uefi/sbin/casperd/casperd.8 projects/uefi/sbin/casperd/zygote.c projects/uefi/sbin/devd/devd.cc projects/uefi/sbin/growfs/growfs.8 projects/uefi/sbin/hastd/hastd.c projects/uefi/sbin/hastd/nv.c projects/uefi/sbin/hastd/primary.c projects/uefi/sbin/hastd/proto.c projects/uefi/sbin/hastd/secondary.c projects/uefi/sbin/ipfw/ipfw.8 projects/uefi/sbin/iscontrol/iscsi.conf.5 projects/uefi/sbin/mount_nfs/mount_nfs.8 projects/uefi/sbin/swapon/swapon.c projects/uefi/share/man/man4/arcmsr.4 projects/uefi/share/man/man4/cxgbe.4 projects/uefi/share/man/man4/netmap.4 projects/uefi/share/man/man4/run.4 projects/uefi/share/man/man5/hosts.5 projects/uefi/share/man/man5/hosts.equiv.5 projects/uefi/share/man/man5/nsswitch.conf.5 projects/uefi/share/man/man5/periodic.conf.5 projects/uefi/share/man/man5/rc.conf.5 projects/uefi/share/man/man5/resolver.5 projects/uefi/share/man/man7/hier.7 projects/uefi/share/man/man7/hostname.7 projects/uefi/share/man/man7/security.7 projects/uefi/share/man/man8/rc.8 projects/uefi/share/man/man9/Makefile projects/uefi/share/man/man9/mbuf.9 projects/uefi/share/misc/committers-ports.dot projects/uefi/share/misc/committers-src.dot projects/uefi/share/mk/Makefile projects/uefi/share/mk/bsd.own.mk projects/uefi/share/mk/bsd.progs.mk projects/uefi/share/mk/bsd.sys.mk projects/uefi/sys/amd64/amd64/machdep.c projects/uefi/sys/amd64/amd64/mp_machdep.c projects/uefi/sys/amd64/amd64/pmap.c projects/uefi/sys/amd64/include/apicvar.h projects/uefi/sys/amd64/include/cpu.h projects/uefi/sys/amd64/include/pmap.h projects/uefi/sys/amd64/include/vmm.h (contents, props changed) projects/uefi/sys/amd64/include/vmm_dev.h (contents, props changed) projects/uefi/sys/amd64/vmm/amd/amdv.c projects/uefi/sys/amd64/vmm/intel/ept.c projects/uefi/sys/amd64/vmm/intel/vmcs.c projects/uefi/sys/amd64/vmm/intel/vmcs.h projects/uefi/sys/amd64/vmm/intel/vmx.c projects/uefi/sys/amd64/vmm/intel/vmx.h projects/uefi/sys/amd64/vmm/intel/vmx_genassym.c projects/uefi/sys/amd64/vmm/io/ppt.c projects/uefi/sys/amd64/vmm/io/ppt.h projects/uefi/sys/amd64/vmm/io/vhpet.c projects/uefi/sys/amd64/vmm/io/vioapic.c projects/uefi/sys/amd64/vmm/io/vlapic.c projects/uefi/sys/amd64/vmm/io/vlapic.h projects/uefi/sys/amd64/vmm/vmm.c projects/uefi/sys/amd64/vmm/vmm_dev.c projects/uefi/sys/amd64/vmm/vmm_lapic.c projects/uefi/sys/amd64/vmm/vmm_lapic.h projects/uefi/sys/amd64/vmm/vmm_msr.c projects/uefi/sys/amd64/vmm/vmm_msr.h projects/uefi/sys/arm/arm/bus_space-v6.c projects/uefi/sys/arm/arm/cpufunc.c projects/uefi/sys/arm/arm/elf_trampoline.c projects/uefi/sys/arm/arm/identcpu.c projects/uefi/sys/arm/arm/locore.S projects/uefi/sys/arm/arm/swtch.S projects/uefi/sys/arm/at91/at91_machdep.c projects/uefi/sys/arm/at91/if_ate.c projects/uefi/sys/arm/at91/uart_dev_at91usart.c projects/uefi/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/uefi/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/uefi/sys/arm/broadcom/bcm2835/files.bcm2835 projects/uefi/sys/arm/conf/RPI-B projects/uefi/sys/arm/freescale/imx/files.imx51 projects/uefi/sys/arm/freescale/imx/files.imx53 projects/uefi/sys/arm/freescale/imx/files.imx6 projects/uefi/sys/arm/include/armreg.h projects/uefi/sys/arm/include/cpuconf.h projects/uefi/sys/arm/include/cpufunc.h projects/uefi/sys/arm/include/intr.h projects/uefi/sys/arm/include/md_var.h projects/uefi/sys/arm/mv/mv_pci.c projects/uefi/sys/arm/rockchip/rk30xx_gpio.c projects/uefi/sys/arm/ti/am335x/am335x_dmtimer.c projects/uefi/sys/arm/ti/am335x/am335x_scm_padconf.c projects/uefi/sys/arm/ti/files.ti projects/uefi/sys/arm/ti/ti_gpio.c projects/uefi/sys/arm/ti/ti_i2c.c projects/uefi/sys/arm/versatile/bus_space.c projects/uefi/sys/arm/xilinx/zy7_bus_space.c projects/uefi/sys/boot/fdt/dts/rk3188.dtsi projects/uefi/sys/boot/ia64/efi/version projects/uefi/sys/cam/cam.h projects/uefi/sys/cam/cam_ccb.h projects/uefi/sys/cam/cam_compat.c projects/uefi/sys/cam/cam_compat.h projects/uefi/sys/cam/scsi/scsi_all.c projects/uefi/sys/cam/scsi/scsi_xpt.c projects/uefi/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/uefi/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/uefi/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/uefi/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/uefi/sys/cddl/dev/fbt/fbt_powerpc.c projects/uefi/sys/conf/Makefile.arm projects/uefi/sys/conf/files projects/uefi/sys/conf/files.arm projects/uefi/sys/conf/files.powerpc projects/uefi/sys/conf/options projects/uefi/sys/conf/options.arm projects/uefi/sys/dev/advansys/adwcam.c projects/uefi/sys/dev/ae/if_ae.c projects/uefi/sys/dev/ahci/ahciem.c projects/uefi/sys/dev/aic7xxx/aic79xx.c projects/uefi/sys/dev/aic7xxx/aic7xxx.c projects/uefi/sys/dev/an/if_an.c projects/uefi/sys/dev/an/if_an_pccard.c projects/uefi/sys/dev/arcmsr/arcmsr.c projects/uefi/sys/dev/arcmsr/arcmsr.h projects/uefi/sys/dev/cxgb/common/cxgb_mc5.c projects/uefi/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/uefi/sys/dev/cxgbe/adapter.h projects/uefi/sys/dev/cxgbe/common/common.h projects/uefi/sys/dev/cxgbe/offload.h projects/uefi/sys/dev/cxgbe/t4_main.c projects/uefi/sys/dev/cxgbe/t4_sge.c projects/uefi/sys/dev/cxgbe/tom/t4_cpl_io.c projects/uefi/sys/dev/cxgbe/tom/t4_listen.c projects/uefi/sys/dev/cxgbe/tom/t4_tom.h projects/uefi/sys/dev/drm/mach64_dma.c projects/uefi/sys/dev/drm2/drmP.h projects/uefi/sys/dev/drm2/drm_edid.c projects/uefi/sys/dev/drm2/drm_fb_helper.c projects/uefi/sys/dev/drm2/radeon/atombios_dp.c projects/uefi/sys/dev/drm2/radeon/radeon_agp.c projects/uefi/sys/dev/drm2/radeon/radeon_fence.c projects/uefi/sys/dev/drm2/radeon/radeon_sa.c projects/uefi/sys/dev/drm2/ttm/ttm_bo.c projects/uefi/sys/dev/drm2/ttm/ttm_bo_vm.c projects/uefi/sys/dev/drm2/ttm/ttm_lock.c projects/uefi/sys/dev/e1000/if_lem.c projects/uefi/sys/dev/fb/fbd.c projects/uefi/sys/dev/fdt/fdt_common.h projects/uefi/sys/dev/fdt/fdt_pci.c projects/uefi/sys/dev/gpio/gpioiic.c projects/uefi/sys/dev/gpio/gpioled.c projects/uefi/sys/dev/hwpmc/hwpmc_core.c projects/uefi/sys/dev/hwpmc/hwpmc_core.h projects/uefi/sys/dev/hwpmc/hwpmc_intel.c projects/uefi/sys/dev/hwpmc/hwpmc_powerpc.c projects/uefi/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/uefi/sys/dev/ie/if_ie.c projects/uefi/sys/dev/iicbus/ds1631.c projects/uefi/sys/dev/iicbus/ds1775.c projects/uefi/sys/dev/iicbus/max6690.c projects/uefi/sys/dev/iscsi/iscsi.c projects/uefi/sys/dev/isp/isp.c projects/uefi/sys/dev/isp/isp_freebsd.c projects/uefi/sys/dev/iwn/if_iwn.c projects/uefi/sys/dev/iwn/if_iwn_chip_cfg.h projects/uefi/sys/dev/iwn/if_iwnreg.h projects/uefi/sys/dev/iwn/if_iwnvar.h projects/uefi/sys/dev/ixgbe/ixgbe.c projects/uefi/sys/dev/md/md.c projects/uefi/sys/dev/mwl/if_mwl.c projects/uefi/sys/dev/netmap/if_em_netmap.h projects/uefi/sys/dev/netmap/if_igb_netmap.h projects/uefi/sys/dev/netmap/if_lem_netmap.h projects/uefi/sys/dev/netmap/if_re_netmap.h projects/uefi/sys/dev/netmap/ixgbe_netmap.h projects/uefi/sys/dev/netmap/netmap.c projects/uefi/sys/dev/netmap/netmap_kern.h projects/uefi/sys/dev/netmap/netmap_mem2.c projects/uefi/sys/dev/netmap/netmap_mem2.h projects/uefi/sys/dev/nmdm/nmdm.c projects/uefi/sys/dev/ofw/ofw_bus_subr.c projects/uefi/sys/dev/ofw/ofw_bus_subr.h projects/uefi/sys/dev/ofw/ofw_console.c projects/uefi/sys/dev/ofw/ofw_fdt.c projects/uefi/sys/dev/pci/vga_pci.c projects/uefi/sys/dev/sym/sym_hipd.c projects/uefi/sys/dev/syscons/scterm-teken.c projects/uefi/sys/dev/uart/uart_bus_pci.c projects/uefi/sys/dev/uart/uart_cpu.h projects/uefi/sys/dev/uart/uart_tty.c projects/uefi/sys/dev/usb/controller/at91dci.c projects/uefi/sys/dev/usb/controller/atmegadci.c projects/uefi/sys/dev/usb/controller/avr32dci.c projects/uefi/sys/dev/usb/controller/dwc_otg.c projects/uefi/sys/dev/usb/controller/ehci.c projects/uefi/sys/dev/usb/controller/musb_otg.c projects/uefi/sys/dev/usb/controller/ohci.c projects/uefi/sys/dev/usb/controller/uhci.c projects/uefi/sys/dev/usb/controller/usb_controller.c projects/uefi/sys/dev/usb/controller/uss820dci.c projects/uefi/sys/dev/usb/controller/xhci.c projects/uefi/sys/dev/usb/quirk/usb_quirk.c projects/uefi/sys/dev/usb/template/usb_template.c projects/uefi/sys/dev/usb/usb_bus.h projects/uefi/sys/dev/usb/usb_controller.h projects/uefi/sys/dev/usb/usb_device.c projects/uefi/sys/dev/usb/usb_device.h projects/uefi/sys/dev/usb/usb_hub.c projects/uefi/sys/dev/usb/usb_transfer.c projects/uefi/sys/dev/usb/usbdevs projects/uefi/sys/dev/usb/usbdi.h projects/uefi/sys/dev/usb/wlan/if_run.c projects/uefi/sys/dev/usb/wlan/if_runreg.h projects/uefi/sys/dev/usb/wlan/if_runvar.h projects/uefi/sys/dev/vt/font/vt_font_default.c projects/uefi/sys/dev/vt/font/vt_mouse_cursor.c projects/uefi/sys/dev/vt/hw/fb/vt_fb.c projects/uefi/sys/dev/vt/vt.h projects/uefi/sys/dev/vt/vt_buf.c projects/uefi/sys/dev/vt/vt_consolectl.c projects/uefi/sys/dev/vt/vt_core.c projects/uefi/sys/dev/vt/vt_font.c projects/uefi/sys/dev/vt/vt_sysmouse.c projects/uefi/sys/fs/devfs/devfs_devs.c projects/uefi/sys/fs/ext2fs/ext2_hash.c projects/uefi/sys/fs/fifofs/fifo_vnops.c projects/uefi/sys/fs/nfs/nfs_commonsubs.c projects/uefi/sys/fs/nfs/nfs_var.h projects/uefi/sys/fs/nfsclient/nfs_clbio.c projects/uefi/sys/fs/nfsclient/nfs_clstate.c projects/uefi/sys/fs/nfsclient/nfs_clvfsops.c projects/uefi/sys/fs/nfsclient/nfs_clvnops.c projects/uefi/sys/fs/nfsclient/nfsnode.h projects/uefi/sys/fs/nfsserver/nfs_fha_new.c projects/uefi/sys/fs/nfsserver/nfs_nfsdcache.c projects/uefi/sys/fs/nfsserver/nfs_nfsdport.c projects/uefi/sys/fs/nfsserver/nfs_nfsdstate.c projects/uefi/sys/geom/eli/g_eli.c projects/uefi/sys/geom/eli/g_eli_crypto.c projects/uefi/sys/geom/geom_dev.c projects/uefi/sys/geom/mirror/g_mirror_ctl.c projects/uefi/sys/i386/include/apicvar.h projects/uefi/sys/ia64/ia64/pmap.c projects/uefi/sys/kern/capabilities.conf projects/uefi/sys/kern/init_sysent.c projects/uefi/sys/kern/kern_clocksource.c projects/uefi/sys/kern/kern_event.c projects/uefi/sys/kern/kern_exit.c projects/uefi/sys/kern/kern_fork.c projects/uefi/sys/kern/kern_jail.c projects/uefi/sys/kern/kern_linker.c projects/uefi/sys/kern/kern_resource.c projects/uefi/sys/kern/kern_rwlock.c projects/uefi/sys/kern/makesyscalls.sh projects/uefi/sys/kern/sched_ule.c projects/uefi/sys/kern/subr_terminal.c projects/uefi/sys/kern/subr_trap.c projects/uefi/sys/kern/subr_vmem.c projects/uefi/sys/kern/subr_witness.c projects/uefi/sys/kern/tty.c projects/uefi/sys/kern/uipc_syscalls.c projects/uefi/sys/kern/vfs_bio.c projects/uefi/sys/kern/vfs_mountroot.c projects/uefi/sys/kern/vfs_vnops.c projects/uefi/sys/mips/beri/beri_machdep.c projects/uefi/sys/mips/cavium/octe/cavium-ethernet.h projects/uefi/sys/mips/cavium/octe/ethernet-mv88e61xx.c projects/uefi/sys/modules/crypto/Makefile projects/uefi/sys/modules/drm2/drm2/Makefile projects/uefi/sys/modules/drm2/i915kms/Makefile projects/uefi/sys/modules/drm2/radeonkms/Makefile projects/uefi/sys/modules/iwnfw/iwn6000g2b/Makefile projects/uefi/sys/modules/netmap/Makefile projects/uefi/sys/modules/usb/Makefile projects/uefi/sys/net/netmap.h projects/uefi/sys/net/netmap_user.h projects/uefi/sys/net/radix.c projects/uefi/sys/netgraph/ng_ksocket.c projects/uefi/sys/netinet/in.h projects/uefi/sys/netinet/in_mcast.c projects/uefi/sys/netinet/ip_output.c projects/uefi/sys/netinet/libalias/alias.c projects/uefi/sys/netinet/libalias/alias_cuseeme.c projects/uefi/sys/netinet/libalias/alias_db.c projects/uefi/sys/netinet/libalias/alias_dummy.c projects/uefi/sys/netinet/libalias/alias_irc.c projects/uefi/sys/netinet/libalias/alias_mod.c projects/uefi/sys/netinet/libalias/alias_mod.h projects/uefi/sys/netinet/libalias/alias_nbt.c projects/uefi/sys/netinet/libalias/alias_pptp.c projects/uefi/sys/netinet/libalias/alias_skinny.c projects/uefi/sys/netinet/libalias/alias_smedia.c projects/uefi/sys/netinet/libalias/libalias.3 projects/uefi/sys/netinet/tcp_input.c projects/uefi/sys/netinet6/in6_mcast.c projects/uefi/sys/netinet6/send.c projects/uefi/sys/netpfil/ipfw/ip_fw_dynamic.c projects/uefi/sys/netpfil/pf/pf.c projects/uefi/sys/netpfil/pf/pf.h projects/uefi/sys/nfs/nfs_fha.c projects/uefi/sys/nfs/nfs_fha.h projects/uefi/sys/nfsclient/nfsargs.h projects/uefi/sys/nfsserver/nfs_fha_old.c projects/uefi/sys/ofed/drivers/net/mlx4/en_netdev.c projects/uefi/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/uefi/sys/powerpc/aim/mp_cpudep.c projects/uefi/sys/powerpc/aim/trap.c projects/uefi/sys/powerpc/aim/trap_subr32.S projects/uefi/sys/powerpc/aim/trap_subr64.S projects/uefi/sys/powerpc/include/cpu.h projects/uefi/sys/powerpc/include/dbdma.h projects/uefi/sys/powerpc/include/openpicreg.h projects/uefi/sys/powerpc/include/openpicvar.h projects/uefi/sys/powerpc/include/pcpu.h projects/uefi/sys/powerpc/include/pmc_mdep.h projects/uefi/sys/powerpc/include/spr.h projects/uefi/sys/powerpc/ofw/ofw_pci.c projects/uefi/sys/powerpc/ofw/ofw_pcib_pci.c projects/uefi/sys/powerpc/ofw/openpic_ofw.c projects/uefi/sys/powerpc/powermac/ata_macio.c projects/uefi/sys/powerpc/powermac/atibl.c projects/uefi/sys/powerpc/powermac/cpcht.c projects/uefi/sys/powerpc/powermac/dbdma.c projects/uefi/sys/powerpc/powermac/dbdmavar.h projects/uefi/sys/powerpc/powermac/platform_powermac.c projects/uefi/sys/powerpc/powermac/pmu.c projects/uefi/sys/powerpc/powermac/pmuvar.h projects/uefi/sys/powerpc/powermac/uninorth.c projects/uefi/sys/powerpc/powermac/uninorthvar.h projects/uefi/sys/powerpc/powermac/viareg.h projects/uefi/sys/powerpc/powerpc/mp_machdep.c projects/uefi/sys/powerpc/powerpc/openpic.c projects/uefi/sys/powerpc/pseries/phyp_vscsi.c projects/uefi/sys/powerpc/psim/openpic_iobus.c projects/uefi/sys/rpc/clnt_dg.c projects/uefi/sys/rpc/clnt_vc.c projects/uefi/sys/rpc/rpcb_clnt.c projects/uefi/sys/rpc/svc.c projects/uefi/sys/rpc/svc.h projects/uefi/sys/rpc/svc_vc.c projects/uefi/sys/security/mac/mac_framework.c projects/uefi/sys/sparc64/ebus/ebus.c projects/uefi/sys/sparc64/isa/ofw_isa.c projects/uefi/sys/sparc64/pci/fire.c projects/uefi/sys/sparc64/pci/ofw_pcib_subr.c projects/uefi/sys/sparc64/pci/psycho.c projects/uefi/sys/sparc64/pci/schizo.c projects/uefi/sys/sparc64/sparc64/machdep.c projects/uefi/sys/sys/consio.h projects/uefi/sys/sys/dtrace_bsd.h projects/uefi/sys/sys/fbio.h projects/uefi/sys/sys/param.h projects/uefi/sys/sys/terminal.h projects/uefi/sys/sys/tty.h projects/uefi/sys/teken/demo/teken_demo.c projects/uefi/sys/teken/teken.h projects/uefi/sys/teken/teken_subr.h projects/uefi/sys/vm/vm_page.c projects/uefi/sys/vm/vm_pageout.c projects/uefi/sys/vm/vm_radix.c projects/uefi/sys/vm/vm_radix.h projects/uefi/sys/x86/acpica/acpi_wakeup.c projects/uefi/sys/x86/acpica/madt.c projects/uefi/sys/x86/cpufreq/est.c projects/uefi/sys/x86/include/apicreg.h projects/uefi/sys/x86/include/mptable.h projects/uefi/sys/x86/x86/local_apic.c projects/uefi/sys/x86/x86/mptable.c projects/uefi/tools/build/mk/OptionalObsoleteFiles.inc projects/uefi/tools/regression/usr.bin/sed/regress.sh projects/uefi/tools/regression/usr.sbin/etcupdate/preworld.sh projects/uefi/tools/regression/usr.sbin/etcupdate/tests.sh projects/uefi/tools/tools/ath/athstats/Makefile projects/uefi/tools/tools/cxgbetool/cxgbetool.c projects/uefi/tools/tools/net80211/wlanstats/Makefile projects/uefi/tools/tools/vt/fontcvt/fontcvt.c projects/uefi/tools/tools/vt/mkkfont/mkkfont.c projects/uefi/tools/tools/vt/setfont/setfont.c projects/uefi/usr.bin/bc/bc.1 projects/uefi/usr.bin/bc/bc.y projects/uefi/usr.bin/calendar/calcpp.c projects/uefi/usr.bin/clang/clang/Makefile projects/uefi/usr.bin/clang/llc/Makefile projects/uefi/usr.bin/clang/lldb/Makefile projects/uefi/usr.bin/clang/llvm-mc/Makefile projects/uefi/usr.bin/clang/llvm-objdump/Makefile projects/uefi/usr.bin/clang/llvm-rtdyld/Makefile projects/uefi/usr.bin/clang/opt/Makefile projects/uefi/usr.bin/dtc/fdt.cc projects/uefi/usr.bin/kdump/Makefile projects/uefi/usr.bin/kdump/kdump.c projects/uefi/usr.bin/mkcsmapper/Makefile.inc projects/uefi/usr.bin/netstat/if.c projects/uefi/usr.bin/netstat/main.c projects/uefi/usr.bin/netstat/mroute.c projects/uefi/usr.bin/netstat/mroute6.c projects/uefi/usr.bin/netstat/netgraph.c projects/uefi/usr.bin/netstat/netstat.h projects/uefi/usr.bin/netstat/route.c projects/uefi/usr.bin/sed/compile.c projects/uefi/usr.bin/sed/sed.1 projects/uefi/usr.bin/sort/radixsort.c projects/uefi/usr.sbin/bhyve/Makefile projects/uefi/usr.sbin/bhyve/acpi.c projects/uefi/usr.sbin/bhyve/bhyverun.c projects/uefi/usr.sbin/bhyve/inout.h projects/uefi/usr.sbin/bhyve/mptbl.c projects/uefi/usr.sbin/bhyve/pci_emul.c projects/uefi/usr.sbin/bhyve/pci_emul.h projects/uefi/usr.sbin/bhyve/pci_passthru.c projects/uefi/usr.sbin/bhyve/xmsr.c projects/uefi/usr.sbin/bhyve/xmsr.h projects/uefi/usr.sbin/bhyvectl/bhyvectl.c projects/uefi/usr.sbin/bsdconfig/console/console projects/uefi/usr.sbin/bsdconfig/console/font projects/uefi/usr.sbin/bsdconfig/console/keymap projects/uefi/usr.sbin/bsdconfig/console/repeat projects/uefi/usr.sbin/bsdconfig/console/saver projects/uefi/usr.sbin/bsdconfig/console/screenmap projects/uefi/usr.sbin/bsdconfig/console/ttys projects/uefi/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/uefi/usr.sbin/bsdconfig/docsinstall/docsinstall projects/uefi/usr.sbin/bsdconfig/dot/dot projects/uefi/usr.sbin/bsdconfig/includes/includes projects/uefi/usr.sbin/bsdconfig/mouse/disable projects/uefi/usr.sbin/bsdconfig/mouse/enable projects/uefi/usr.sbin/bsdconfig/mouse/flags projects/uefi/usr.sbin/bsdconfig/mouse/mouse projects/uefi/usr.sbin/bsdconfig/mouse/port projects/uefi/usr.sbin/bsdconfig/mouse/type projects/uefi/usr.sbin/bsdconfig/networking/defaultrouter projects/uefi/usr.sbin/bsdconfig/networking/devices projects/uefi/usr.sbin/bsdconfig/networking/hostname projects/uefi/usr.sbin/bsdconfig/networking/nameservers projects/uefi/usr.sbin/bsdconfig/networking/networking projects/uefi/usr.sbin/bsdconfig/networking/share/device.subr projects/uefi/usr.sbin/bsdconfig/networking/share/hostname.subr projects/uefi/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/uefi/usr.sbin/bsdconfig/networking/share/media.subr projects/uefi/usr.sbin/bsdconfig/networking/share/netmask.subr projects/uefi/usr.sbin/bsdconfig/networking/share/resolv.subr projects/uefi/usr.sbin/bsdconfig/networking/share/routing.subr projects/uefi/usr.sbin/bsdconfig/networking/share/services.subr projects/uefi/usr.sbin/bsdconfig/packages/packages projects/uefi/usr.sbin/bsdconfig/password/password projects/uefi/usr.sbin/bsdconfig/security/kern_securelevel projects/uefi/usr.sbin/bsdconfig/security/security projects/uefi/usr.sbin/bsdconfig/share/common.subr projects/uefi/usr.sbin/bsdconfig/share/device.subr projects/uefi/usr.sbin/bsdconfig/share/dialog.subr projects/uefi/usr.sbin/bsdconfig/share/keymap.subr projects/uefi/usr.sbin/bsdconfig/share/media/cdrom.subr projects/uefi/usr.sbin/bsdconfig/share/media/common.subr projects/uefi/usr.sbin/bsdconfig/share/media/dos.subr projects/uefi/usr.sbin/bsdconfig/share/media/floppy.subr projects/uefi/usr.sbin/bsdconfig/share/media/ftp.subr projects/uefi/usr.sbin/bsdconfig/share/media/nfs.subr projects/uefi/usr.sbin/bsdconfig/share/media/tcpip.subr projects/uefi/usr.sbin/bsdconfig/share/media/ufs.subr projects/uefi/usr.sbin/bsdconfig/share/media/usb.subr projects/uefi/usr.sbin/bsdconfig/share/mustberoot.subr projects/uefi/usr.sbin/bsdconfig/share/packages/categories.subr projects/uefi/usr.sbin/bsdconfig/share/packages/index.subr projects/uefi/usr.sbin/bsdconfig/share/packages/packages.subr projects/uefi/usr.sbin/bsdconfig/share/strings.subr projects/uefi/usr.sbin/bsdconfig/share/sysrc.subr projects/uefi/usr.sbin/bsdconfig/startup/misc projects/uefi/usr.sbin/bsdconfig/startup/rcadd projects/uefi/usr.sbin/bsdconfig/startup/rcconf projects/uefi/usr.sbin/bsdconfig/startup/rcdelete projects/uefi/usr.sbin/bsdconfig/startup/rcedit projects/uefi/usr.sbin/bsdconfig/startup/rcvar projects/uefi/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/uefi/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/uefi/usr.sbin/bsdconfig/startup/share/rcvar.subr projects/uefi/usr.sbin/bsdconfig/startup/startup projects/uefi/usr.sbin/bsdconfig/timezone/share/zones.subr projects/uefi/usr.sbin/bsdconfig/timezone/timezone projects/uefi/usr.sbin/bsdconfig/ttys/ttys projects/uefi/usr.sbin/bsdconfig/usermgmt/groupadd projects/uefi/usr.sbin/bsdconfig/usermgmt/groupdel projects/uefi/usr.sbin/bsdconfig/usermgmt/groupedit projects/uefi/usr.sbin/bsdconfig/usermgmt/groupinput projects/uefi/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/uefi/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/uefi/usr.sbin/bsdconfig/usermgmt/useradd projects/uefi/usr.sbin/bsdconfig/usermgmt/userdel projects/uefi/usr.sbin/bsdconfig/usermgmt/useredit projects/uefi/usr.sbin/bsdconfig/usermgmt/userinput projects/uefi/usr.sbin/bsdconfig/usermgmt/usermgmt projects/uefi/usr.sbin/bsdinstall/bsdinstall projects/uefi/usr.sbin/bsdinstall/scripts/auto projects/uefi/usr.sbin/bsdinstall/scripts/config projects/uefi/usr.sbin/bsdinstall/scripts/services projects/uefi/usr.sbin/bsdinstall/scripts/zfsboot projects/uefi/usr.sbin/crashinfo/crashinfo.sh projects/uefi/usr.sbin/ctld/login.c projects/uefi/usr.sbin/etcupdate/etcupdate.8 projects/uefi/usr.sbin/etcupdate/etcupdate.sh projects/uefi/usr.sbin/mptable/mptable.c projects/uefi/usr.sbin/mtest/mtest.8 projects/uefi/usr.sbin/ndiscvt/ndisgen.sh projects/uefi/usr.sbin/ndp/ndp.c projects/uefi/usr.sbin/pkg/config.c projects/uefi/usr.sbin/pkg/config.h projects/uefi/usr.sbin/pkg/pkg.7 projects/uefi/usr.sbin/pkg/pkg.c projects/uefi/usr.sbin/tcpdump/tcpdump/Makefile projects/uefi/usr.sbin/ypbind/yp_ping.c Directory Properties: projects/uefi/ (props changed) projects/uefi/cddl/ (props changed) projects/uefi/cddl/contrib/opensolaris/ (props changed) projects/uefi/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/uefi/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/uefi/contrib/file/ (props changed) projects/uefi/contrib/gcc/ (props changed) projects/uefi/contrib/llvm/ (props changed) projects/uefi/contrib/llvm/tools/clang/ (props changed) projects/uefi/contrib/nvi/ (props changed) projects/uefi/contrib/tcpdump/ (props changed) projects/uefi/contrib/tzcode/stdtime/ (props changed) projects/uefi/contrib/tzdata/ (props changed) projects/uefi/crypto/heimdal/ (props changed) projects/uefi/etc/ (props changed) projects/uefi/gnu/lib/ (props changed) projects/uefi/include/ (props changed) projects/uefi/lib/libc/ (props changed) projects/uefi/lib/libvmmapi/ (props changed) projects/uefi/sbin/ (props changed) projects/uefi/sbin/ipfw/ (props changed) projects/uefi/share/man/man4/ (props changed) projects/uefi/sys/ (props changed) projects/uefi/sys/amd64/vmm/ (props changed) projects/uefi/sys/boot/ (props changed) projects/uefi/sys/boot/ia64/efi/ (props changed) projects/uefi/sys/cddl/contrib/opensolaris/ (props changed) projects/uefi/sys/conf/ (props changed) projects/uefi/sys/dev/hyperv/ (props changed) projects/uefi/usr.bin/calendar/ (props changed) projects/uefi/usr.sbin/bhyve/ (props changed) projects/uefi/usr.sbin/bhyvectl/ (props changed) projects/uefi/usr.sbin/ndiscvt/ (props changed) Modified: projects/uefi/ObsoleteFiles.inc ============================================================================== --- projects/uefi/ObsoleteFiles.inc Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/ObsoleteFiles.inc Thu Feb 6 15:46:33 2014 (r261554) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131215: libcam version bumped +OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6 # 20131202: libcapsicum and libcasper moved to /lib/ OLD_LIBS+=usr/lib/libcapsicum.so.0 OLD_LIBS+=usr/lib/libcasper.so.0 Modified: projects/uefi/UPDATING ============================================================================== --- projects/uefi/UPDATING Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/UPDATING Thu Feb 6 15:46:33 2014 (r261554) @@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131213: + The behavior of gss_pseudo_random() for the krb5 mechanism + has changed, for applications requesting a longer random string + than produced by the underlying enctype's pseudo-random() function. + In particular, the random string produced from a session key of + enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will + be different at the 17th octet and later, after this change. + The counter used in the PRF+ construction is now encoded as a + big-endian integer in accordance with RFC 4402. + __FreeBSD_version is bumped to 1100004. + 20131108: The WITHOUT_ATF build knob has been removed and its functionality has been subsumed into the more generic WITHOUT_TESTS. If you were @@ -1932,7 +1943,7 @@ COMMON ITEMS: make buildkernel KERNCONF=YOUR_KERNEL_HERE <maybe newfs current's root partition> <mount current's root partition on directory ${CURRENT_ROOT}> - make installworld DESTDIR=${CURRENT_ROOT} + make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd Modified: projects/uefi/bin/Makefile ============================================================================== --- projects/uefi/bin/Makefile Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/Makefile Thu Feb 6 15:46:33 2014 (r261554) @@ -52,6 +52,10 @@ SUBDIR+= rmail SUBDIR+= csh .endif +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.arch.inc.mk> SUBDIR:= ${SUBDIR:O} Modified: projects/uefi/bin/date/Makefile ============================================================================== --- projects/uefi/bin/date/Makefile Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/date/Makefile Thu Feb 6 15:46:33 2014 (r261554) @@ -1,7 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + PROG= date SRCS= date.c netdate.c vary.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: projects/uefi/bin/mv/Makefile ============================================================================== --- projects/uefi/bin/mv/Makefile Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/mv/Makefile Thu Feb 6 15:46:33 2014 (r261554) @@ -1,6 +1,12 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ +.include <bsd.own.mk> + PROG= mv +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: projects/uefi/bin/pax/Makefile ============================================================================== --- projects/uefi/bin/pax/Makefile Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/pax/Makefile Thu Feb 6 15:46:33 2014 (r261554) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += # @@ -30,4 +32,8 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: projects/uefi/bin/pax/pax.1 ============================================================================== --- projects/uefi/bin/pax/pax.1 Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/pax/pax.1 Thu Feb 6 15:46:33 2014 (r261554) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 29, 2010 +.Dd December 21, 2013 .Dt PAX 1 .Os .Sh NAME @@ -587,6 +587,16 @@ precedence. For example, if .Dl Fl p Ar eme is specified, file modification times are still preserved. +.Pp +File flags set by +.Xr chflags 1 +are not understood by +.Nm , +however +.Xr tar 1 +and +.Xr dump 1 +will preserve these. .It Fl s Ar replstr Modify the file or archive member names specified by the .Ar pattern @@ -1195,3 +1205,11 @@ at the University of California, San Die The .Nm utility does not recognize multibyte characters. +.Pp +File flags set by +.Xr chflags 1 +are not preserved by +.Nm . +The BUGS section of +.Xr chflags 1 +has a list of utilities that are unaware of flags. Modified: projects/uefi/bin/sh/Makefile ============================================================================== --- projects/uefi/bin/sh/Makefile Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/sh/Makefile Thu Feb 6 15:46:33 2014 (r261554) @@ -1,6 +1,8 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ +.include <bsd.own.mk> + PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ @@ -59,7 +61,8 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -regress: - cd ${.CURDIR}/../../tools/regression/bin/sh && ${MAKE} SH=${.OBJDIR}/sh +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include <bsd.prog.mk> Modified: projects/uefi/bin/sh/eval.c ============================================================================== --- projects/uefi/bin/sh/eval.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/sh/eval.c Thu Feb 6 15:46:33 2014 (r261554) @@ -750,6 +750,45 @@ isdeclarationcmd(struct narg *arg) (have_command || !isfunc("local")))); } +static void +xtracecommand(struct arglist *varlist, struct arglist *arglist) +{ + struct strlist *sp; + char sep = 0; + const char *p, *ps4; + + ps4 = expandstr(ps4val()); + out2str(ps4 != NULL ? ps4 : ps4val()); + for (sp = varlist->list ; sp ; sp = sp->next) { + if (sep != 0) + out2c(' '); + p = strchr(sp->text, '='); + if (p != NULL) { + p++; + outbin(sp->text, p - sp->text, out2); + out2qstr(p); + } else + out2qstr(sp->text); + sep = ' '; + } + for (sp = arglist->list ; sp ; sp = sp->next) { + if (sep != 0) + out2c(' '); + /* Disambiguate command looking like assignment. */ + if (sp == arglist->list && + strchr(sp->text, '=') != NULL && + strchr(sp->text, '\'') == NULL) { + out2c('\''); + out2str(sp->text); + out2c('\''); + } else + out2qstr(sp->text); + sep = ' '; + } + out2c('\n'); + flushout(&errout); +} + /* * Check if a builtin can safely be executed in the same process, * even though it should be in a subshell (command substitution). @@ -847,40 +886,8 @@ evalcommand(union node *cmd, int flags, argv -= argc; /* Print the command if xflag is set. */ - if (xflag) { - char sep = 0; - const char *p, *ps4; - ps4 = expandstr(ps4val()); - out2str(ps4 != NULL ? ps4 : ps4val()); - for (sp = varlist.list ; sp ; sp = sp->next) { - if (sep != 0) - out2c(' '); - p = strchr(sp->text, '='); - if (p != NULL) { - p++; - outbin(sp->text, p - sp->text, out2); - out2qstr(p); - } else - out2qstr(sp->text); - sep = ' '; - } - for (sp = arglist.list ; sp ; sp = sp->next) { - if (sep != 0) - out2c(' '); - /* Disambiguate command looking like assignment. */ - if (sp == arglist.list && - strchr(sp->text, '=') != NULL && - strchr(sp->text, '\'') == NULL) { - out2c('\''); - out2str(sp->text); - out2c('\''); - } else - out2qstr(sp->text); - sep = ' '; - } - out2c('\n'); - flushout(&errout); - } + if (xflag) + xtracecommand(&varlist, &arglist); /* Now locate the command. */ if (argc == 0) { Modified: projects/uefi/bin/sh/var.c ============================================================================== --- projects/uefi/bin/sh/var.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/sh/var.c Thu Feb 6 15:46:33 2014 (r261554) @@ -88,11 +88,9 @@ struct var vifs; struct var vmail; struct var vmpath; struct var vpath; -struct var vppid; struct var vps1; struct var vps2; struct var vps4; -struct var vvers; static struct var voptind; struct var vdisvfork; @@ -111,8 +109,6 @@ static const struct varinit varinit[] = NULL }, { &vpath, 0, "PATH=" _PATH_DEFPATH, changepath }, - { &vppid, VUNSET, "PPID=", - NULL }, /* * vps1 depends on uid */ @@ -180,15 +176,14 @@ initvar(void) vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } - if ((vppid.flags & VEXPORT) == 0) { - fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); - setvarsafe("PPID", ppid, 0); - } + fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); + setvarsafe("PPID", ppid, 0); for (envp = environ ; *envp ; envp++) { if (strchr(*envp, '=')) { setvareq(*envp, VEXPORT|VTEXTFIXED); } } + setvareq("OPTIND=1", VTEXTFIXED); } /* Modified: projects/uefi/bin/sh/var.h ============================================================================== --- projects/uefi/bin/sh/var.h Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/sh/var.h Thu Feb 6 15:46:33 2014 (r261554) @@ -75,7 +75,6 @@ extern struct var vifs; extern struct var vmail; extern struct var vmpath; extern struct var vpath; -extern struct var vppid; extern struct var vps1; extern struct var vps2; extern struct var vps4; Modified: projects/uefi/bin/test/Makefile ============================================================================== --- projects/uefi/bin/test/Makefile Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/bin/test/Makefile Thu Feb 6 15:46:33 2014 (r261554) @@ -1,8 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Feb 6 15:46:33 2014 (r261554) @@ -559,16 +559,20 @@ get_metaslab_refcount(vdev_t *vd) static int verify_spacemap_refcounts(spa_t *spa) { - int expected_refcount, actual_refcount; + uint64_t expected_refcount = 0; + uint64_t actual_refcount; - expected_refcount = spa_feature_get_refcount(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM]); + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM], + &expected_refcount); actual_refcount = get_dtl_refcount(spa->spa_root_vdev); actual_refcount += get_metaslab_refcount(spa->spa_root_vdev); if (expected_refcount != actual_refcount) { - (void) printf("space map refcount mismatch: expected %d != " - "actual %d\n", expected_refcount, actual_refcount); + (void) printf("space map refcount mismatch: expected %lld != " + "actual %lld\n", + (longlong_t)expected_refcount, + (longlong_t)actual_refcount); return (2); } return (0); @@ -670,8 +674,7 @@ dump_metaslab(metaslab_t *msp) } if (dump_opt['m'] > 1 && sm != NULL && - spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM])) { + spa_feature_is_active(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM)) { /* * The space map histogram represents free space in chunks * of sm_shift (i.e. bucket 0 refers to 2^sm_shift). @@ -2417,8 +2420,7 @@ dump_block_stats(spa_t *spa) (void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj, count_block_cb, &zcb, NULL); } - if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + if (spa_feature_is_active(spa, SPA_FEATURE_ASYNC_DESTROY)) { VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb, &zcb, NULL)); @@ -2719,7 +2721,7 @@ dump_zpool(spa_t *spa) } if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + SPA_FEATURE_ASYNC_DESTROY)) { dump_bptree(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, "Pool dataset frees"); Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu Feb 6 15:46:33 2014 (r261554) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 23, 2013 +.Dd December 24, 2013 .Dt ZFS 8 .Os .Sh NAME @@ -102,7 +102,7 @@ .Nm .Cm list .Op Fl r Ns | Ns Fl d Ar depth -.Op Fl H +.Op Fl Hp .Op Fl o Ar property Ns Oo , Ns property Ns Oc Ns ... .Op Fl t Ar type Ns Oo , Ns type Ns Oc Ns ... .Oo Fl s Ar property Oc Ns ... @@ -1807,7 +1807,7 @@ only dataset that can be renamed recursi .Nm .Cm list .Op Fl r Ns | Ns Fl d Ar depth -.Op Fl H +.Op Fl Hp .Op Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... .Op Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... .Oo Fl s Ar property Oc Ns ... @@ -1838,6 +1838,8 @@ will display only the dataset and its di .It Fl H Used for scripting mode. Do not print headers and separate fields by a single tab instead of arbitrary white space. +.It Fl p +Display numbers in parsable (exact) values. .It Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... A comma-separated list of properties to display. The property must be: .Bl -bullet -offset 2n @@ -1978,7 +1980,7 @@ Display output in a form more easily par omitted, and fields are explicitly separated by a single tab instead of an arbitrary amount of space. .It Fl p -Display numbers in parseable (exact) values. +Display numbers in parsable (exact) values. .It Fl o Cm all | Ar field Ns Oo , Ns Ar field Oc Ns ... A comma-separated list of columns to display. Supported values are .Sy name,property,value,received,source . @@ -2820,7 +2822,7 @@ option of .It \&P Ta event port (not supported on Fx ) .El .It Fl H -Give more parseable tab-separated output, without header lines and without +Give more parsable tab-separated output, without header lines and without arrows. .It Fl t Display the path's inode change time as the first column of output. Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Thu Feb 6 15:46:33 2014 (r261554) @@ -18,10 +18,12 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <libintl.h> @@ -109,7 +111,8 @@ zfs_callback(zfs_handle_t *zhp, void *da cb->cb_props_table); if (zfs_expand_proplist(zhp, cb->cb_proplist, - (cb->cb_flags & ZFS_ITER_RECVD_PROPS)) + (cb->cb_flags & ZFS_ITER_RECVD_PROPS), + (cb->cb_flags & ZFS_ITER_LITERAL_PROPS)) != 0) { free(node); return (-1); Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Thu Feb 6 15:46:33 2014 (r261554) @@ -18,9 +18,11 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #ifndef ZFS_ITER_H @@ -44,6 +46,7 @@ typedef struct zfs_sort_column { #define ZFS_ITER_DEPTH_LIMIT (1 << 3) #define ZFS_ITER_RECVD_PROPS (1 << 4) #define ZFS_ITER_SIMPLE (1 << 5) +#define ZFS_ITER_LITERAL_PROPS (1 << 6) int zfs_for_each(int, char **, int options, zfs_type_t, zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *); Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu Feb 6 15:46:33 2014 (r261554) @@ -21,7 +21,6 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. @@ -29,6 +28,7 @@ * All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <assert.h> @@ -249,9 +249,8 @@ get_usage(zfs_help_t idx) case HELP_UNJAIL: return (gettext("\tunjail <jailid|jailname> <filesystem>\n")); case HELP_LIST: - return (gettext("\tlist [-rH][-d max] " - "[-o property[,...]] [-t type[,...]] [-s property] ...\n" - "\t [-S property] ... " + return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] " + "[-s property]...\n\t [-S property]... [-t type[,...]] " "[filesystem|volume|snapshot] ...\n")); case HELP_MOUNT: return (gettext("\tmount\n" @@ -310,12 +309,12 @@ get_usage(zfs_help_t idx) "<filesystem|volume>\n")); case HELP_USERSPACE: return (gettext("\tuserspace [-Hinp] [-o field[,...]] " - "[-s field] ...\n\t[-S field] ... " - "[-t type[,...]] <filesystem|snapshot>\n")); + "[-s field]...\n\t [-S field]... [-t type[,...]] " + "<filesystem|snapshot>\n")); case HELP_GROUPSPACE: return (gettext("\tgroupspace [-Hinp] [-o field[,...]] " - "[-s field] ...\n\t[-S field] ... " - "[-t type[,...]] <filesystem|snapshot>\n")); + "[-s field]...\n\t [-S field]... [-t type[,...]] " + "<filesystem|snapshot>\n")); case HELP_HOLD: return (gettext("\thold [-r] <tag> <snapshot> ...\n")); case HELP_HOLDS: @@ -2124,7 +2123,7 @@ zfs_do_upgrade(int argc, char **argv) * -i Translate SID to POSIX ID. * -n Print numeric ID instead of user/group name. * -o Control which fields to display. - * -p Use exact (parseable) numeric output. + * -p Use exact (parsable) numeric output. * -s Specify sort columns, descending order. * -S Specify sort columns, ascending order. * -t Control which object types to display. @@ -2811,24 +2810,25 @@ zfs_do_userspace(int argc, char **argv) } /* - * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...] - * [-s property [-s property]...] [-S property [-S property]...] - * <dataset> ... + * list [-Hp][-r|-d max] [-o property[,...]] [-s property] ... [-S property] ... + * [-t type[,...]] [filesystem|volume|snapshot] ... * - * -r Recurse over all children + * -H Scripted mode; elide headers and separate columns by tabs. + * -p Display values in parsable (literal) format. + * -r Recurse over all children. * -d Limit recursion by depth. - * -H Scripted mode; elide headers and separate columns by tabs * -o Control which fields to display. - * -t Control which object types to display. * -s Specify sort columns, descending order. * -S Specify sort columns, ascending order. + * -t Control which object types to display. * - * When given no arguments, lists all filesystems in the system. + * When given no arguments, list all filesystems in the system. * Otherwise, list the specified datasets, optionally recursing down them if * '-r' is specified. */ typedef struct list_cbdata { boolean_t cb_first; + boolean_t cb_literal; boolean_t cb_scripted; zprop_list_t *cb_proplist; } list_cbdata_t; @@ -2837,8 +2837,9 @@ typedef struct list_cbdata { * Given a list of columns to display, output appropriate headers for each one. */ static void -print_header(zprop_list_t *pl) +print_header(list_cbdata_t *cb) { + zprop_list_t *pl = cb->cb_proplist; char headerbuf[ZFS_MAXPROPLEN]; const char *header; int i; @@ -2879,19 +2880,19 @@ print_header(zprop_list_t *pl) * to the described layout. */ static void -print_dataset(zfs_handle_t *zhp, zprop_list_t *pl, boolean_t scripted) +print_dataset(zfs_handle_t *zhp, list_cbdata_t *cb) { + zprop_list_t *pl = cb->cb_proplist; boolean_t first = B_TRUE; char property[ZFS_MAXPROPLEN]; nvlist_t *userprops = zfs_get_user_props(zhp); nvlist_t *propval; char *propstr; boolean_t right_justify; - int width; for (; pl != NULL; pl = pl->pl_next) { if (!first) { - if (scripted) + if (cb->cb_scripted) (void) printf("\t"); else (void) printf(" "); @@ -2906,22 +2907,22 @@ print_dataset(zfs_handle_t *zhp, zprop_l right_justify = zfs_prop_align_right(pl->pl_prop); } else if (pl->pl_prop != ZPROP_INVAL) { if (zfs_prop_get(zhp, pl->pl_prop, property, - sizeof (property), NULL, NULL, 0, B_FALSE) != 0) + sizeof (property), NULL, NULL, 0, + cb->cb_literal) != 0) propstr = "-"; else propstr = property; - right_justify = zfs_prop_align_right(pl->pl_prop); } else if (zfs_prop_userquota(pl->pl_user_prop)) { if (zfs_prop_get_userquota(zhp, pl->pl_user_prop, - property, sizeof (property), B_FALSE) != 0) + property, sizeof (property), cb->cb_literal) != 0) propstr = "-"; else propstr = property; right_justify = B_TRUE; } else if (zfs_prop_written(pl->pl_user_prop)) { if (zfs_prop_get_written(zhp, pl->pl_user_prop, - property, sizeof (property), B_FALSE) != 0) + property, sizeof (property), cb->cb_literal) != 0) propstr = "-"; else propstr = property; @@ -2936,19 +2937,17 @@ print_dataset(zfs_handle_t *zhp, zprop_l right_justify = B_FALSE; } - width = pl->pl_width; - /* * If this is being called in scripted mode, or if this is the * last column and it is left-justified, don't include a width * format specifier. */ - if (scripted || (pl->pl_next == NULL && !right_justify)) + if (cb->cb_scripted || (pl->pl_next == NULL && !right_justify)) (void) printf("%s", propstr); else if (right_justify) - (void) printf("%*s", width, propstr); + (void) printf("%*s", pl->pl_width, propstr); else - (void) printf("%-*s", width, propstr); + (void) printf("%-*s", pl->pl_width, propstr); } (void) printf("\n"); @@ -2964,11 +2963,11 @@ list_callback(zfs_handle_t *zhp, void *d if (cbp->cb_first) { if (!cbp->cb_scripted) - print_header(cbp->cb_proplist); + print_header(cbp); cbp->cb_first = B_FALSE; } - print_dataset(zhp, cbp->cb_proplist, cbp->cb_scripted); + print_dataset(zhp, cbp); return (0); } @@ -2977,7 +2976,6 @@ static int zfs_do_list(int argc, char **argv) { int c; - boolean_t scripted = B_FALSE; static char default_fields[] = "name,used,available,referenced,mountpoint"; int types = ZFS_TYPE_DATASET; @@ -2991,11 +2989,15 @@ zfs_do_list(int argc, char **argv) int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS; /* check options */ - while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) { + while ((c = getopt(argc, argv, "HS:d:o:prs:t:")) != -1) { switch (c) { case 'o': fields = optarg; break; + case 'p': + cb.cb_literal = B_TRUE; + flags |= ZFS_ITER_LITERAL_PROPS; + break; case 'd': limit = parse_depth(optarg, &flags); break; @@ -3003,7 +3005,7 @@ zfs_do_list(int argc, char **argv) flags |= ZFS_ITER_RECURSE; break; case 'H': - scripted = B_TRUE; + cb.cb_scripted = B_TRUE; break; case 's': if (zfs_add_sort_column(&sortcol, optarg, @@ -3093,7 +3095,6 @@ zfs_do_list(int argc, char **argv) != 0) usage(B_FALSE); - cb.cb_scripted = scripted; cb.cb_first = B_TRUE; ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist, Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zhack/zhack.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zhack/zhack.c Thu Feb 6 15:46:33 2014 (r261554) @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ @@ -85,10 +85,15 @@ usage(void) static void -fatal(const char *fmt, ...) +fatal(spa_t *spa, void *tag, const char *fmt, ...) { va_list ap; + if (spa != NULL) { + spa_close(spa, tag); + (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE); + } + va_start(ap, fmt); (void) fprintf(stderr, "%s: ", cmdname); (void) vfprintf(stderr, fmt, ap); @@ -159,13 +164,14 @@ import_pool(const char *target, boolean_ g_importargs.can_be_active = B_TRUE; if (zpool_search_import(g_zfs, &g_importargs) != NULL || spa_open(target, &spa, FTAG) == 0) { - fatal("cannot import '%s': pool is active; run " - "\"zpool export %s\" first\n", - g_pool, g_pool); + fatal(spa, FTAG, "cannot import '%s': pool is " + "active; run " "\"zpool export %s\" " + "first\n", g_pool, g_pool); } } - fatal("cannot import '%s': no such pool available\n", g_pool); + fatal(NULL, FTAG, "cannot import '%s': no such pool " + "available\n", g_pool); } elem = nvlist_next_nvpair(pools, NULL); @@ -186,7 +192,8 @@ import_pool(const char *target, boolean_ error = 0; if (error) - fatal("can't import '%s': %s", name, strerror(error)); + fatal(NULL, FTAG, "can't import '%s': %s", name, + strerror(error)); } static void @@ -201,10 +208,11 @@ zhack_spa_open(const char *target, boole zfeature_checks_disable = B_FALSE; if (err != 0) - fatal("cannot open '%s': %s", target, strerror(err)); + fatal(*spa, FTAG, "cannot open '%s': %s", target, + strerror(err)); if (spa_version(*spa) < SPA_VERSION_FEATURES) { - fatal("'%s' has version %d, features not enabled", target, - (int)spa_version(*spa)); + fatal(*spa, FTAG, "'%s' has version %d, features not enabled", + target, (int)spa_version(*spa)); } } @@ -275,12 +283,13 @@ zhack_do_feature_stat(int argc, char **a } static void -feature_enable_sync(void *arg, dmu_tx_t *tx) +zhack_feature_enable_sync(void *arg, dmu_tx_t *tx) { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; - spa_feature_enable(spa, feature, tx); + feature_enable_sync(spa, feature, tx); + spa_history_log_internal(spa, "zhack enable feature", tx, "name=%s can_readonly=%u", feature->fi_guid, feature->fi_can_readonly); @@ -294,7 +303,7 @@ zhack_do_feature_enable(int argc, char * spa_t *spa; objset_t *mos; zfeature_info_t feature; - zfeature_info_t *nodeps[] = { NULL }; + spa_feature_t nodeps[] = { SPA_FEATURE_NONE }; /* * Features are not added to the pool's label until their refcounts @@ -336,18 +345,19 @@ zhack_do_feature_enable(int argc, char * feature.fi_guid = argv[1]; if (!zfeature_is_valid_guid(feature.fi_guid)) - fatal("invalid feature guid: %s", feature.fi_guid); + fatal(NULL, FTAG, "invalid feature guid: %s", feature.fi_guid); zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (0 == zfeature_lookup_guid(feature.fi_guid, NULL)) - fatal("'%s' is a real feature, will not enable"); + if (zfeature_is_supported(feature.fi_guid)) + fatal(spa, FTAG, "'%s' is a real feature, will not enable"); if (0 == zap_contains(mos, spa->spa_feat_desc_obj, feature.fi_guid)) - fatal("feature already enabled: %s", feature.fi_guid); + fatal(spa, FTAG, "feature already enabled: %s", + feature.fi_guid); VERIFY0(dsl_sync_task(spa_name(spa), NULL, - feature_enable_sync, &feature, 5)); + zhack_feature_enable_sync, &feature, 5)); spa_close(spa, FTAG); @@ -359,8 +369,10 @@ feature_incr_sync(void *arg, dmu_tx_t *t { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; + uint64_t refcount; - spa_feature_incr(spa, feature, tx); + VERIFY0(feature_get_refcount(spa, feature, &refcount)); + feature_sync(spa, feature, refcount + 1, tx); spa_history_log_internal(spa, "zhack feature incr", tx, "name=%s", feature->fi_guid); } @@ -370,8 +382,10 @@ feature_decr_sync(void *arg, dmu_tx_t *t { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; + uint64_t refcount; - spa_feature_decr(spa, feature, tx); + VERIFY0(feature_get_refcount(spa, feature, &refcount)); + feature_sync(spa, feature, refcount - 1, tx); spa_history_log_internal(spa, "zhack feature decr", tx, "name=%s", feature->fi_guid); } @@ -385,7 +399,7 @@ zhack_do_feature_ref(int argc, char **ar spa_t *spa; objset_t *mos; zfeature_info_t feature; - zfeature_info_t *nodeps[] = { NULL }; + spa_feature_t nodeps[] = { SPA_FEATURE_NONE }; /* * fi_desc does not matter here because it was written to disk @@ -423,13 +437,15 @@ zhack_do_feature_ref(int argc, char **ar feature.fi_guid = argv[1]; if (!zfeature_is_valid_guid(feature.fi_guid)) - fatal("invalid feature guid: %s", feature.fi_guid); + fatal(NULL, FTAG, "invalid feature guid: %s", feature.fi_guid); zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (0 == zfeature_lookup_guid(feature.fi_guid, NULL)) - fatal("'%s' is a real feature, will not change refcount"); + if (zfeature_is_supported(feature.fi_guid)) { + fatal(spa, FTAG, + "'%s' is a real feature, will not change refcount"); + } if (0 == zap_contains(mos, spa->spa_feat_for_read_obj, feature.fi_guid)) { @@ -438,11 +454,17 @@ zhack_do_feature_ref(int argc, char **ar feature.fi_guid)) { feature.fi_can_readonly = B_TRUE; } else { - fatal("feature is not enabled: %s", feature.fi_guid); + fatal(spa, FTAG, "feature is not enabled: %s", feature.fi_guid); } - if (decr && !spa_feature_is_active(spa, &feature)) - fatal("feature refcount already 0: %s", feature.fi_guid); + if (decr) { + uint64_t count; + if (feature_get_refcount(spa, &feature, &count) == 0 && + count != 0) { + fatal(spa, FTAG, "feature refcount already 0: %s", + feature.fi_guid); + } + } VERIFY0(dsl_sync_task(spa_name(spa), NULL, decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); @@ -530,8 +552,8 @@ main(int argc, char **argv) usage(); } - if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_TRUE) != 0) { - fatal("pool export failed; " + if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_FALSE) != 0) { + fatal(NULL, FTAG, "pool export failed; " "changes may not be committed to disk\n"); } Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Thu Feb 6 15:46:33 2014 (r261554) @@ -259,7 +259,7 @@ configuration. .El .Pp This features allows ZFS to maintain more information about how free space -is organized within the pool. If this feature is +is organized within the pool. If this feature is .Sy enabled , ZFS will set this feature to @@ -269,6 +269,23 @@ an existing space map is upgraded to the Once the feature is .Sy active , it will remain in that state until the pool is destroyed. +.It Sy extensible_dataset +.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:extensible_dataset" +.It GUID Ta com.delphix:extensible_dataset +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta none +.El +.Pp +This feature allows more flexible use of internal ZFS data structures, +and exists for other features to depend on. +.Pp +This feature will be +.Sy active +when the first dependent feature uses it, +and will be returned to the +.Sy enabled +state when all datasets that use +this feature are destroyed. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Feb 6 15:46:33 2014 (r261554) @@ -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 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. @@ -1004,7 +1004,7 @@ zpool_do_create(int argc, char **argv) * Hand off to libzfs. */ if (enable_all_pool_feat) { - int i; + spa_feature_t i; for (i = 0; i < SPA_FEATURES; i++) { char propname[MAXPATHLEN]; zfeature_info_t *feat = &spa_feature_table[i]; @@ -1702,6 +1702,12 @@ show_import(nvlist_t *config) "resilvered.\n")); break; + case ZPOOL_STATUS_NON_NATIVE_ASHIFT: + (void) printf(gettext("status: One or more devices were " + "configured to use a non-native block size.\n" + "\tExpect reduced performance.\n")); + break; + default: /* * No other status can be seen when importing pools. Modified: projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Thu Feb 6 15:16:38 2014 (r261553) +++ projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Thu Feb 6 15:46:33 2014 (r261554) @@ -21,13 +21,13 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402061546.s16FkZVF098871>