Date: Tue, 12 Mar 2013 22:18:32 +0000 (UTC) From: Benno Rice <benno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248218 - in projects/uefi: . bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/tools/ctf/cvt ... Message-ID: <201303122218.r2CMIWfs053920@svn.freebsd.org>
index | next in thread | raw e-mail
Author: benno Date: Tue Mar 12 22:18:31 2013 New Revision: 248218 URL: http://svnweb.freebsd.org/changeset/base/248218 Log: MFH Added: projects/uefi/contrib/libyaml/ - copied from r248217, head/contrib/libyaml/ projects/uefi/lib/libc/gen/cap_sandboxed.3 - copied unchanged from r248217, head/lib/libc/gen/cap_sandboxed.3 projects/uefi/lib/libc/gen/cap_sandboxed.c - copied unchanged from r248217, head/lib/libc/gen/cap_sandboxed.c projects/uefi/lib/libc/sys/bindat.2 - copied unchanged from r248217, head/lib/libc/sys/bindat.2 projects/uefi/lib/libc/sys/cap_fcntls_limit.2 - copied unchanged from r248217, head/lib/libc/sys/cap_fcntls_limit.2 projects/uefi/lib/libc/sys/cap_ioctls_limit.2 - copied unchanged from r248217, head/lib/libc/sys/cap_ioctls_limit.2 projects/uefi/lib/libc/sys/cap_rights_limit.2 - copied unchanged from r248217, head/lib/libc/sys/cap_rights_limit.2 projects/uefi/lib/libc/sys/connectat.2 - copied unchanged from r248217, head/lib/libc/sys/connectat.2 projects/uefi/lib/libyaml/ - copied from r248217, head/lib/libyaml/ projects/uefi/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c - copied unchanged from r248217, head/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c projects/uefi/sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h - copied unchanged from r248217, head/sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h projects/uefi/sys/cddl/compat/opensolaris/sys/vm.h - copied unchanged from r248217, head/sys/cddl/compat/opensolaris/sys/vm.h projects/uefi/sys/dev/drm2/drm_global.c - copied unchanged from r248217, head/sys/dev/drm2/drm_global.c projects/uefi/sys/dev/drm2/drm_global.h - copied unchanged from r248217, head/sys/dev/drm2/drm_global.h projects/uefi/sys/dev/drm2/ttm/ - copied from r248217, head/sys/dev/drm2/ttm/ projects/uefi/sys/libkern/arm/memcpy.S - copied unchanged from r248217, head/sys/libkern/arm/memcpy.S projects/uefi/tools/regression/bin/sh/builtins/trap12.0 - copied unchanged from r248217, head/tools/regression/bin/sh/builtins/trap12.0 projects/uefi/tools/regression/capsicum/ - copied from r248217, head/tools/regression/capsicum/ projects/uefi/usr.bin/truss/arm-fbsd.c - copied unchanged from r248217, head/usr.bin/truss/arm-fbsd.c projects/uefi/usr.sbin/pkg/config.c - copied unchanged from r248217, head/usr.sbin/pkg/config.c projects/uefi/usr.sbin/pkg/config.h - copied unchanged from r248217, head/usr.sbin/pkg/config.h Deleted: projects/uefi/games/fortune/datfiles/fortunes-o.fake projects/uefi/games/fortune/datfiles/fortunes-o.real projects/uefi/games/fortune/datfiles/fortunes-o.sp.ok projects/uefi/lib/libc/sys/cap_new.2 projects/uefi/lib/libncp/ projects/uefi/lib/libprocstat/ntfs.c projects/uefi/lib/libprocstat/nwfs.c projects/uefi/sbin/mount_ext2fs/ projects/uefi/sbin/mount_hpfs/ projects/uefi/sbin/mount_ntfs/ projects/uefi/sbin/mount_reiserfs/ projects/uefi/sbin/mount_std/ projects/uefi/share/examples/cvsup/ports-supfile projects/uefi/share/examples/cvsup/refuse projects/uefi/share/examples/cvsup/refuse.README projects/uefi/share/examples/nwclient/ projects/uefi/share/examples/portal/ projects/uefi/share/man/man4/coda.4 projects/uefi/share/man/man5/xfs.5 projects/uefi/sys/fs/coda/ projects/uefi/sys/fs/hpfs/ projects/uefi/sys/fs/ntfs/ projects/uefi/sys/fs/nwfs/ projects/uefi/sys/fs/portalfs/ projects/uefi/sys/gnu/fs/xfs/ projects/uefi/sys/modules/coda/ projects/uefi/sys/modules/coda5/ projects/uefi/sys/modules/hpfs/ projects/uefi/sys/modules/ncp/ projects/uefi/sys/modules/ntfs/ projects/uefi/sys/modules/ntfs_iconv/ projects/uefi/sys/modules/nwfs/ projects/uefi/sys/modules/portalfs/ projects/uefi/sys/modules/xfs/ projects/uefi/sys/netncp/ projects/uefi/usr.bin/ncplist/ projects/uefi/usr.bin/ncplogin/ projects/uefi/usr.sbin/mount_nwfs/ projects/uefi/usr.sbin/mount_portalfs/ Modified: projects/uefi/MAINTAINERS (contents, props changed) projects/uefi/ObsoleteFiles.inc projects/uefi/UPDATING projects/uefi/bin/sh/trap.c projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h projects/uefi/cddl/contrib/opensolaris/tools/ctf/cvt/output.c projects/uefi/contrib/openbsm/etc/audit_event projects/uefi/contrib/openpam/doc/man/openpam_straddch.3 projects/uefi/contrib/openpam/lib/openpam_readline.c projects/uefi/contrib/openpam/lib/openpam_readword.c projects/uefi/crypto/openssh/FREEBSD-upgrade projects/uefi/crypto/openssh/config.h projects/uefi/etc/devd.conf projects/uefi/etc/mtree/BSD.include.dist projects/uefi/etc/portsnap.conf projects/uefi/games/fortune/datfiles/Makefile projects/uefi/lib/Makefile projects/uefi/lib/libc/gen/Makefile.inc projects/uefi/lib/libc/include/compat.h projects/uefi/lib/libc/regex/regcomp.c projects/uefi/lib/libc/rpc/clnt_vc.c projects/uefi/lib/libc/string/Makefile.inc projects/uefi/lib/libc/sys/Makefile.inc projects/uefi/lib/libc/sys/Symbol.map projects/uefi/lib/libc/sys/cap_enter.2 projects/uefi/lib/libc/sys/dup.2 projects/uefi/lib/libnetgraph/msg.c projects/uefi/lib/libprocstat/libprocstat.c projects/uefi/lib/libprocstat/libprocstat.h projects/uefi/lib/libstand/Makefile projects/uefi/lib/libstand/nandfs.c projects/uefi/lib/libutil/gr_util.c projects/uefi/lib/libutil/kinfo_getproc.3 projects/uefi/lib/libutil/libutil.h projects/uefi/sbin/devd/devd.cc projects/uefi/sbin/devd/devd.hh projects/uefi/sbin/geom/class/raid/graid.8 projects/uefi/sbin/ipfw/ipfw2.c projects/uefi/sbin/ipfw/ipfw2.h projects/uefi/sbin/ipfw/ipv6.c projects/uefi/sbin/mount_cd9660/mount_cd9660.8 projects/uefi/sbin/mount_cd9660/mount_cd9660.c projects/uefi/sbin/mount_msdosfs/mount_msdosfs.c projects/uefi/sbin/mount_nfs/mount_nfs.c projects/uefi/sbin/mount_nullfs/mount_nullfs.c projects/uefi/sbin/mount_udf/Makefile projects/uefi/sbin/mount_udf/mount_udf.c projects/uefi/sbin/mount_unionfs/mount_unionfs.c projects/uefi/share/examples/Makefile projects/uefi/share/examples/cvsup/README projects/uefi/share/examples/cvsup/cvs-supfile projects/uefi/share/examples/cvsup/stable-supfile projects/uefi/share/man/man4/eventtimers.4 projects/uefi/share/man/man4/mvs.4 projects/uefi/share/man/man4/zyd.4 projects/uefi/share/man/man7/development.7 projects/uefi/share/man/man7/ports.7 projects/uefi/share/man/man9/Makefile projects/uefi/share/man/man9/condvar.9 projects/uefi/share/man/man9/sleep.9 projects/uefi/share/man/man9/sleepqueue.9 projects/uefi/share/man/man9/timeout.9 projects/uefi/share/misc/committers-ports.dot projects/uefi/share/misc/organization.dot projects/uefi/share/mk/bsd.compiler.mk projects/uefi/share/mk/bsd.libnames.mk projects/uefi/sys/Makefile projects/uefi/sys/amd64/amd64/machdep.c projects/uefi/sys/amd64/amd64/pmap.c projects/uefi/sys/amd64/conf/GENERIC projects/uefi/sys/amd64/conf/NOTES projects/uefi/sys/amd64/include/pmap.h projects/uefi/sys/arm/allwinner/files.a10 projects/uefi/sys/arm/arm/busdma_machdep-v6.c projects/uefi/sys/arm/arm/cpufunc_asm_arm11x6.S projects/uefi/sys/arm/arm/db_trace.c projects/uefi/sys/arm/arm/disassem.c projects/uefi/sys/arm/arm/exception.S projects/uefi/sys/arm/arm/locore.S projects/uefi/sys/arm/arm/machdep.c projects/uefi/sys/arm/arm/pmap-v6.c projects/uefi/sys/arm/arm/pmap.c projects/uefi/sys/arm/arm/swtch.S projects/uefi/sys/arm/arm/vm_machdep.c projects/uefi/sys/arm/at91/if_ate.c projects/uefi/sys/arm/broadcom/bcm2835/bcm2835_dma.c projects/uefi/sys/arm/conf/CUBIEBOARD projects/uefi/sys/arm/conf/RPI-B projects/uefi/sys/arm/econa/econa_machdep.c projects/uefi/sys/arm/include/frame.h projects/uefi/sys/arm/include/param.h projects/uefi/sys/arm/include/signal.h projects/uefi/sys/arm/include/vmparam.h projects/uefi/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/uefi/sys/arm/xscale/i80321/ep80219_machdep.c projects/uefi/sys/arm/xscale/i80321/iq31244_machdep.c projects/uefi/sys/arm/xscale/i8134x/crb_machdep.c projects/uefi/sys/arm/xscale/ixp425/avila_machdep.c projects/uefi/sys/arm/xscale/pxa/pxa_machdep.c projects/uefi/sys/boot/common/load_elf.c projects/uefi/sys/boot/fdt/dts/cubieboard.dts projects/uefi/sys/boot/fdt/fdt_loader_cmd.c projects/uefi/sys/bsm/audit_kevents.h projects/uefi/sys/cam/ctl/ctl.c projects/uefi/sys/cddl/compat/opensolaris/sys/file.h projects/uefi/sys/cddl/compat/opensolaris/sys/kcondvar.h projects/uefi/sys/cddl/compat/opensolaris/sys/vnode.h projects/uefi/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c projects/uefi/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h projects/uefi/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.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_dir.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/uefi/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/uefi/sys/compat/freebsd32/freebsd32_proto.h projects/uefi/sys/compat/freebsd32/freebsd32_syscall.h projects/uefi/sys/compat/freebsd32/freebsd32_syscalls.c projects/uefi/sys/compat/freebsd32/freebsd32_sysent.c projects/uefi/sys/compat/freebsd32/freebsd32_systrace_args.c projects/uefi/sys/compat/freebsd32/syscalls.master projects/uefi/sys/compat/linprocfs/linprocfs.c projects/uefi/sys/compat/linux/linux_file.c projects/uefi/sys/compat/linux/linux_socket.c projects/uefi/sys/compat/ndis/kern_ndis.c projects/uefi/sys/compat/svr4/svr4_fcntl.c projects/uefi/sys/compat/svr4/svr4_filio.c projects/uefi/sys/compat/svr4/svr4_misc.c projects/uefi/sys/compat/svr4/svr4_stream.c projects/uefi/sys/conf/Makefile.arm projects/uefi/sys/conf/NOTES projects/uefi/sys/conf/files projects/uefi/sys/conf/files.amd64 projects/uefi/sys/conf/files.arm projects/uefi/sys/conf/files.i386 projects/uefi/sys/conf/ldscript.arm projects/uefi/sys/conf/options projects/uefi/sys/conf/options.sparc64 projects/uefi/sys/contrib/altq/altq/altq_hfsc.c projects/uefi/sys/contrib/altq/altq/altq_hfsc.h projects/uefi/sys/dev/aac/aac.c projects/uefi/sys/dev/aac/aac_cam.c projects/uefi/sys/dev/aac/aac_disk.c projects/uefi/sys/dev/aac/aac_pci.c projects/uefi/sys/dev/aac/aac_tables.h projects/uefi/sys/dev/aac/aacvar.h projects/uefi/sys/dev/acpica/acpi_hpet.c projects/uefi/sys/dev/agp/agp.c projects/uefi/sys/dev/agp/agp_i810.c projects/uefi/sys/dev/ath/ath_hal/ah.h projects/uefi/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/uefi/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/uefi/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/uefi/sys/dev/ath/ath_hal/ar5416/ar5416reg.h projects/uefi/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c projects/uefi/sys/dev/ath/if_ath.c projects/uefi/sys/dev/ath/if_ath_rx.c projects/uefi/sys/dev/ath/if_ath_tx.c projects/uefi/sys/dev/ath/if_athioctl.h projects/uefi/sys/dev/ath/if_athvar.h projects/uefi/sys/dev/bce/if_bce.c projects/uefi/sys/dev/bce/if_bcereg.h projects/uefi/sys/dev/cas/if_cas.c projects/uefi/sys/dev/drm/drmP.h projects/uefi/sys/dev/drm2/drmP.h projects/uefi/sys/dev/drm2/drm_drv.c projects/uefi/sys/dev/drm2/drm_fb_helper.c projects/uefi/sys/dev/drm2/drm_gem.c projects/uefi/sys/dev/drm2/drm_mm.c projects/uefi/sys/dev/drm2/drm_mm.h projects/uefi/sys/dev/drm2/i915/i915_gem.c projects/uefi/sys/dev/hwpmc/hwpmc_mod.c projects/uefi/sys/dev/hwpmc/hwpmc_soft.c projects/uefi/sys/dev/ic/ns16550.h projects/uefi/sys/dev/ichwd/ichwd.c projects/uefi/sys/dev/iscsi/initiator/isc_soc.c projects/uefi/sys/dev/iscsi/initiator/iscsi.c projects/uefi/sys/dev/ixgbe/LICENSE projects/uefi/sys/dev/ixgbe/ixgbe.c projects/uefi/sys/dev/ixgbe/ixgbe_82598.c projects/uefi/sys/dev/ixgbe/ixgbe_82599.c projects/uefi/sys/dev/ixgbe/ixgbe_82599.h projects/uefi/sys/dev/ixgbe/ixgbe_api.c projects/uefi/sys/dev/ixgbe/ixgbe_api.h projects/uefi/sys/dev/ixgbe/ixgbe_common.c projects/uefi/sys/dev/ixgbe/ixgbe_common.h projects/uefi/sys/dev/ixgbe/ixgbe_mbx.h projects/uefi/sys/dev/ixgbe/ixgbe_osdep.h projects/uefi/sys/dev/ixgbe/ixgbe_phy.c projects/uefi/sys/dev/ixgbe/ixgbe_phy.h projects/uefi/sys/dev/ixgbe/ixgbe_type.h projects/uefi/sys/dev/ixgbe/ixgbe_vf.c projects/uefi/sys/dev/ixgbe/ixgbe_vf.h projects/uefi/sys/dev/ixgbe/ixgbe_x540.c projects/uefi/sys/dev/ixgbe/ixgbe_x540.h projects/uefi/sys/dev/ixgbe/ixv.c projects/uefi/sys/dev/md/md.c projects/uefi/sys/dev/mfi/mfi.c projects/uefi/sys/dev/mps/mps.c projects/uefi/sys/dev/netmap/netmap.c projects/uefi/sys/dev/nvme/nvme.c projects/uefi/sys/dev/nvme/nvme_ctrlr.c projects/uefi/sys/dev/oce/oce_hw.c projects/uefi/sys/dev/oce/oce_hw.h projects/uefi/sys/dev/oce/oce_if.c projects/uefi/sys/dev/oce/oce_if.h projects/uefi/sys/dev/oce/oce_mbox.c projects/uefi/sys/dev/oce/oce_queue.c projects/uefi/sys/dev/oce/oce_sysctl.c projects/uefi/sys/dev/oce/oce_util.c projects/uefi/sys/dev/pci/pci.c projects/uefi/sys/dev/puc/pucdata.c projects/uefi/sys/dev/random/randomdev_soft.c projects/uefi/sys/dev/sound/pci/hda/hdaa_patches.c projects/uefi/sys/dev/sound/pci/hda/hdac.h projects/uefi/sys/dev/sound/pci/hda/hdacc.c projects/uefi/sys/dev/sound/pcm/dsp.c projects/uefi/sys/dev/syscons/syscons.c projects/uefi/sys/dev/syscons/syscons.h projects/uefi/sys/dev/tws/tws_hdm.c projects/uefi/sys/dev/uart/uart_dev_ns8250.c projects/uefi/sys/dev/usb/serial/uftdi.c projects/uefi/sys/dev/usb/usbdevs projects/uefi/sys/dev/virtio/block/virtio_blk.c projects/uefi/sys/fs/fdescfs/fdesc_vfsops.c projects/uefi/sys/fs/fdescfs/fdesc_vnops.c projects/uefi/sys/fs/fuse/fuse_io.c projects/uefi/sys/fs/fuse/fuse_vnops.c projects/uefi/sys/fs/nfs/nfsdport.h projects/uefi/sys/fs/nfs/nfsport.h projects/uefi/sys/fs/nfsclient/nfs_clbio.c projects/uefi/sys/fs/nfsclient/nfs_clnode.c projects/uefi/sys/fs/nfsclient/nfs_clport.c projects/uefi/sys/fs/nfsclient/nfs_clvnops.c projects/uefi/sys/fs/nfsserver/nfs_nfsdport.c projects/uefi/sys/fs/nullfs/null_vfsops.c projects/uefi/sys/fs/procfs/procfs_map.c projects/uefi/sys/fs/smbfs/smbfs_smb.c projects/uefi/sys/fs/smbfs/smbfs_vnops.c projects/uefi/sys/fs/tmpfs/tmpfs_subr.c projects/uefi/sys/fs/tmpfs/tmpfs_vnops.c projects/uefi/sys/geom/label/g_label_ntfs.c projects/uefi/sys/geom/part/g_part.c projects/uefi/sys/geom/part/g_part.h projects/uefi/sys/geom/part/g_part_mbr.c projects/uefi/sys/geom/raid/g_raid.c projects/uefi/sys/geom/raid/md_ddf.c projects/uefi/sys/i386/conf/GENERIC projects/uefi/sys/i386/conf/NOTES projects/uefi/sys/i386/i386/machdep.c projects/uefi/sys/i386/i386/pmap.c projects/uefi/sys/i386/ibcs2/ibcs2_misc.c projects/uefi/sys/i386/include/pmap.h projects/uefi/sys/i386/xen/pmap.c projects/uefi/sys/ia64/ia64/machdep.c projects/uefi/sys/ia64/ia64/pmap.c projects/uefi/sys/kern/capabilities.conf projects/uefi/sys/kern/imgact_elf.c projects/uefi/sys/kern/init_sysent.c projects/uefi/sys/kern/kern_clock.c projects/uefi/sys/kern/kern_clocksource.c projects/uefi/sys/kern/kern_condvar.c projects/uefi/sys/kern/kern_descrip.c projects/uefi/sys/kern/kern_event.c projects/uefi/sys/kern/kern_exec.c projects/uefi/sys/kern/kern_exit.c projects/uefi/sys/kern/kern_fork.c projects/uefi/sys/kern/kern_intr.c projects/uefi/sys/kern/kern_proc.c projects/uefi/sys/kern/kern_resource.c projects/uefi/sys/kern/kern_sharedpage.c projects/uefi/sys/kern/kern_shutdown.c projects/uefi/sys/kern/kern_synch.c projects/uefi/sys/kern/kern_sysctl.c projects/uefi/sys/kern/kern_tc.c projects/uefi/sys/kern/kern_time.c projects/uefi/sys/kern/kern_timeout.c projects/uefi/sys/kern/kern_umtx.c projects/uefi/sys/kern/subr_log.c projects/uefi/sys/kern/subr_param.c projects/uefi/sys/kern/subr_sleepqueue.c projects/uefi/sys/kern/subr_trap.c projects/uefi/sys/kern/subr_uio.c projects/uefi/sys/kern/subr_witness.c projects/uefi/sys/kern/sys_capability.c projects/uefi/sys/kern/sys_generic.c projects/uefi/sys/kern/sys_process.c projects/uefi/sys/kern/syscalls.c projects/uefi/sys/kern/syscalls.master projects/uefi/sys/kern/systrace_args.c projects/uefi/sys/kern/sysv_shm.c projects/uefi/sys/kern/tty.c projects/uefi/sys/kern/uipc_domain.c projects/uefi/sys/kern/uipc_mbuf.c projects/uefi/sys/kern/uipc_mqueue.c projects/uefi/sys/kern/uipc_sem.c projects/uefi/sys/kern/uipc_shm.c projects/uefi/sys/kern/uipc_socket.c projects/uefi/sys/kern/uipc_syscalls.c projects/uefi/sys/kern/uipc_usrreq.c projects/uefi/sys/kern/vfs_aio.c projects/uefi/sys/kern/vfs_bio.c projects/uefi/sys/kern/vfs_cluster.c projects/uefi/sys/kern/vfs_default.c projects/uefi/sys/kern/vfs_lookup.c projects/uefi/sys/kern/vfs_subr.c projects/uefi/sys/kern/vfs_syscalls.c projects/uefi/sys/kern/vfs_vnops.c projects/uefi/sys/mips/mips/machdep.c projects/uefi/sys/mips/mips/pmap.c projects/uefi/sys/modules/ath/Makefile projects/uefi/sys/modules/drm2/drm2/Makefile projects/uefi/sys/modules/mqueue/Makefile projects/uefi/sys/modules/uart/Makefile projects/uefi/sys/modules/zfs/Makefile projects/uefi/sys/net/bpf.c projects/uefi/sys/net/if.c projects/uefi/sys/net/if_bridge.c projects/uefi/sys/net/route.c projects/uefi/sys/net/route.h projects/uefi/sys/net80211/ieee80211.c projects/uefi/sys/net80211/ieee80211_freebsd.c projects/uefi/sys/net80211/ieee80211_freebsd.h projects/uefi/sys/net80211/ieee80211_hostap.c projects/uefi/sys/net80211/ieee80211_ht.c projects/uefi/sys/net80211/ieee80211_hwmp.c projects/uefi/sys/net80211/ieee80211_mesh.c projects/uefi/sys/net80211/ieee80211_output.c projects/uefi/sys/net80211/ieee80211_power.c projects/uefi/sys/net80211/ieee80211_proto.h projects/uefi/sys/net80211/ieee80211_superg.c projects/uefi/sys/net80211/ieee80211_var.h projects/uefi/sys/net80211/ieee80211_wds.c projects/uefi/sys/netinet/libalias/alias.c projects/uefi/sys/netinet/libalias/alias_db.c projects/uefi/sys/netinet/siftr.c projects/uefi/sys/netinet/tcp_timer.c projects/uefi/sys/netinet6/raw_ip6.c projects/uefi/sys/netpfil/ipfw/ip_fw_dynamic.c projects/uefi/sys/netpfil/pf/if_pfsync.c projects/uefi/sys/netsmb/smb_dev.c projects/uefi/sys/nfs/krpc_subr.c projects/uefi/sys/nfsclient/nfs_bio.c projects/uefi/sys/nfsclient/nfs_subs.c projects/uefi/sys/nfsclient/nfs_vfsops.c projects/uefi/sys/nfsclient/nfs_vnops.c projects/uefi/sys/nfsclient/nfsm_subs.h projects/uefi/sys/nfsserver/nfs_serv.c projects/uefi/sys/nfsserver/nfs_srvkrpc.c projects/uefi/sys/ofed/drivers/infiniband/core/umem.c projects/uefi/sys/ofed/include/linux/file.h projects/uefi/sys/ofed/include/linux/linux_compat.c projects/uefi/sys/ofed/include/linux/timer.h projects/uefi/sys/pc98/pc98/machdep.c projects/uefi/sys/powerpc/aim/machdep.c projects/uefi/sys/powerpc/aim/mmu_oea.c projects/uefi/sys/powerpc/aim/mmu_oea64.c projects/uefi/sys/powerpc/booke/machdep.c projects/uefi/sys/powerpc/booke/pmap.c projects/uefi/sys/rpc/clnt_dg.c projects/uefi/sys/rpc/clnt_vc.c projects/uefi/sys/rpc/rpc_generic.c projects/uefi/sys/rpc/rpcm_subs.h projects/uefi/sys/rpc/svc.c projects/uefi/sys/rpc/svc_dg.c projects/uefi/sys/rpc/svc_vc.c projects/uefi/sys/security/audit/audit.h projects/uefi/sys/security/audit/audit_arg.c projects/uefi/sys/security/audit/audit_bsm.c projects/uefi/sys/security/audit/audit_private.h projects/uefi/sys/security/mac/mac_process.c projects/uefi/sys/sparc64/conf/GENERIC projects/uefi/sys/sparc64/pci/ofw_pcib.c projects/uefi/sys/sparc64/pci/psycho.c projects/uefi/sys/sparc64/pci/sbbc.c projects/uefi/sys/sparc64/sbus/sbus.c projects/uefi/sys/sparc64/sparc64/machdep.c projects/uefi/sys/sparc64/sparc64/pmap.c projects/uefi/sys/sys/_callout.h projects/uefi/sys/sys/callout.h projects/uefi/sys/sys/capability.h projects/uefi/sys/sys/condvar.h projects/uefi/sys/sys/diskmbr.h projects/uefi/sys/sys/file.h projects/uefi/sys/sys/filedesc.h projects/uefi/sys/sys/mbuf.h projects/uefi/sys/sys/mutex.h projects/uefi/sys/sys/namei.h projects/uefi/sys/sys/param.h projects/uefi/sys/sys/pmckern.h projects/uefi/sys/sys/proc.h projects/uefi/sys/sys/protosw.h projects/uefi/sys/sys/rmlock.h projects/uefi/sys/sys/rwlock.h projects/uefi/sys/sys/sleepqueue.h projects/uefi/sys/sys/socket.h projects/uefi/sys/sys/socketvar.h projects/uefi/sys/sys/sx.h projects/uefi/sys/sys/syscall.h projects/uefi/sys/sys/syscall.mk projects/uefi/sys/sys/sysproto.h projects/uefi/sys/sys/systm.h projects/uefi/sys/sys/time.h projects/uefi/sys/sys/user.h projects/uefi/sys/ufs/ffs/ffs_rawread.c projects/uefi/sys/ufs/ffs/ffs_vnops.c projects/uefi/sys/vm/default_pager.c projects/uefi/sys/vm/device_pager.c projects/uefi/sys/vm/phys_pager.c projects/uefi/sys/vm/sg_pager.c projects/uefi/sys/vm/swap_pager.c projects/uefi/sys/vm/uma_core.c projects/uefi/sys/vm/vm_fault.c projects/uefi/sys/vm/vm_glue.c projects/uefi/sys/vm/vm_init.c projects/uefi/sys/vm/vm_kern.c projects/uefi/sys/vm/vm_map.c projects/uefi/sys/vm/vm_meter.c projects/uefi/sys/vm/vm_mmap.c projects/uefi/sys/vm/vm_object.c projects/uefi/sys/vm/vm_object.h projects/uefi/sys/vm/vm_page.c projects/uefi/sys/vm/vm_pageout.c projects/uefi/sys/vm/vm_pager.c projects/uefi/sys/vm/vm_pager.h projects/uefi/sys/vm/vm_reserv.c projects/uefi/sys/vm/vnode_pager.c projects/uefi/sys/xdr/xdr_mbuf.c projects/uefi/tools/make_libdeps.sh projects/uefi/tools/regression/pjdfstest/Makefile projects/uefi/tools/regression/pjdfstest/pjdfstest.c projects/uefi/tools/regression/security/cap_test/cap_test_capabilities.c projects/uefi/tools/regression/security/cap_test/cap_test_relative.c projects/uefi/tools/tools/cxgbetool/cxgbetool.c projects/uefi/usr.bin/Makefile.arm projects/uefi/usr.bin/c89/c89.c projects/uefi/usr.bin/c99/c99.c projects/uefi/usr.bin/calendar/calendars/calendar.birthday projects/uefi/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg projects/uefi/usr.bin/find/extern.h projects/uefi/usr.bin/find/find.1 projects/uefi/usr.bin/find/function.c projects/uefi/usr.bin/find/option.c projects/uefi/usr.bin/grep/regex/tre-fastmatch.c projects/uefi/usr.bin/hexdump/conv.c projects/uefi/usr.bin/kdump/kdump.c projects/uefi/usr.bin/kdump/mksubr projects/uefi/usr.bin/netstat/netstat.1 projects/uefi/usr.bin/procstat/procstat_files.c projects/uefi/usr.bin/top/machine.c projects/uefi/usr.bin/truss/extern.h projects/uefi/usr.bin/truss/main.c projects/uefi/usr.sbin/bhyve/acpi.c projects/uefi/usr.sbin/bhyve/bhyverun.c projects/uefi/usr.sbin/bhyve/bhyverun.h projects/uefi/usr.sbin/bhyve/mptbl.c projects/uefi/usr.sbin/bhyve/pci_passthru.c projects/uefi/usr.sbin/bhyve/pci_virtio_block.c projects/uefi/usr.sbin/bhyve/pci_virtio_net.c projects/uefi/usr.sbin/bhyve/virtio.h projects/uefi/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-newfs.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-packages.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions-parse.sh projects/uefi/usr.sbin/pc-sysinstall/backend/functions.sh projects/uefi/usr.sbin/pc-sysinstall/backend/parseconfig.sh projects/uefi/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf projects/uefi/usr.sbin/pc-sysinstall/examples/README projects/uefi/usr.sbin/pkg/Makefile projects/uefi/usr.sbin/pkg/pkg.c projects/uefi/usr.sbin/rtadvd/rtadvd.c projects/uefi/usr.sbin/tzsetup/tzsetup.c Directory Properties: projects/uefi/ (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/openbsm/ (props changed) projects/uefi/contrib/openpam/ (props changed) projects/uefi/crypto/openssh/ (props changed) projects/uefi/lib/libc/ (props changed) projects/uefi/lib/libutil/ (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/boot/ (props changed) projects/uefi/sys/cddl/contrib/opensolaris/ (props changed) projects/uefi/sys/conf/ (props changed) projects/uefi/usr.bin/calendar/ (props changed) projects/uefi/usr.bin/procstat/ (props changed) projects/uefi/usr.sbin/bhyve/ (props changed) projects/uefi/usr.sbin/rtadvd/ (props changed) Modified: projects/uefi/MAINTAINERS ============================================================================== --- projects/uefi/MAINTAINERS Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/MAINTAINERS Tue Mar 12 22:18:31 2013 (r248218) @@ -124,3 +124,6 @@ isci(4) jimharris Pre-commit review req cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. Modified: projects/uefi/ObsoleteFiles.inc ============================================================================== --- projects/uefi/ObsoleteFiles.inc Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/ObsoleteFiles.inc Tue Mar 12 22:18:31 2013 (r248218) @@ -38,6 +38,80 @@ # xargs -n1 | sort | uniq -d; # done +# 20130311: Ports are no more available via cvsup +OLD_FILES+=usr/share/examples/cvsup/ports-supfile +OLD_FILES+=usr/share/examples/cvsup/refuse +OLD_FILES+=usr/share/examples/cvsup/refuse.README +# 20130309: NWFS and NCP supports removed +OLD_FILES+=usr/bin/ncplist +OLD_FILES+=usr/bin/ncplogin +OLD_FILES+=usr/bin/ncplogout +OLD_FILES+=usr/include/fs/nwfs/nwfs.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h +OLD_DIRS+=usr/include/fs/nwfs +OLD_FILES+=usr/include/netncp/ncp.h +OLD_FILES+=usr/include/netncp/ncp_cfg.h +OLD_FILES+=usr/include/netncp/ncp_conn.h +OLD_FILES+=usr/include/netncp/ncp_file.h +OLD_FILES+=usr/include/netncp/ncp_lib.h +OLD_FILES+=usr/include/netncp/ncp_ncp.h +OLD_FILES+=usr/include/netncp/ncp_nls.h +OLD_FILES+=usr/include/netncp/ncp_rcfile.h +OLD_FILES+=usr/include/netncp/ncp_rq.h +OLD_FILES+=usr/include/netncp/ncp_sock.h +OLD_FILES+=usr/include/netncp/ncp_subr.h +OLD_FILES+=usr/include/netncp/ncp_user.h +OLD_FILES+=usr/include/netncp/ncpio.h +OLD_FILES+=usr/include/netncp/nwerror.h +OLD_DIRS+=usr/include/netncp +OLD_FILES+=usr/lib/libncp.a +OLD_FILES+=usr/lib/libncp.so +OLD_LIBS+=usr/lib/libncp.so.4 +OLD_FILES+=usr/lib/libncp_p.a +OLD_FILES+=usr/lib32/libncp.a +OLD_FILES+=usr/lib32/libncp.so +OLD_LIBS+=usr/lib32/libncp.so.4 +OLD_FILES+=usr/lib32/libncp_p.a +OLD_FILES+=usr/sbin/mount_nwfs +OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc +OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample +OLD_DIRS+=usr/share/examples/nwclient +OLD_FILES+=usr/share/man/man1/ncplist.1.gz +OLD_FILES+=usr/share/man/man1/ncplogin.1.gz +OLD_FILES+=usr/share/man/man1/ncplogout.1.gz +OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz +# 20130302: NTFS support removed +OLD_FILES+=rescue/mount_ntfs +OLD_FILES+=sbin/mount_ntfs +OLD_FILES+=usr/include/fs/ntfs/ntfs.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h +OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h +OLD_DIRS+=usr/include/fs/ntfs +OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz +# 20130302: PORTALFS support removed +OLD_FILES+=usr/include/fs/portalfs/portal.h +OLD_DIRS+=usr/include/fs/portalfs +OLD_FILES+=usr/sbin/mount_portalfs +OLD_FILES+=usr/share/examples/portal/README +OLD_FILES+=usr/share/examples/portal/portal.conf +OLD_DIRS+=usr/share/examples/portal +OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz +# 20130302: CODAFS support removed +OLD_FILES+=usr/share/man/man4/coda.4.gz +# 20130302: XFS support removed +OLD_FILES+=usr/share/man/man5/xfs.5.gz +# 20130302: Capsicum overhaul +OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz +OLD_FILES+=usr/share/man/man2/cap_new.2.gz +# 20130213: OpenSSL 1.0.1e import +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz # 20130116: removed long unused directories for .1aout section manpages OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout OLD_FILES+=usr/share/man/en.UTF-8/man1aout @@ -58,9 +132,10 @@ OLD_DIRS+=var/remote # 20121114: zpool-features manual page moved from section 5 to 7 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz # 20121022: remove harp, hfa and idt man page -OLD_FILES+=share/man/man4/harp.4 -OLD_FILES+=share/man/man4/hfa.4 -OLD_FILES+=share/man/man4/idt.4 +OLD_FILES+=usr/share/man/man4/harp.4.gz +OLD_FILES+=usr/share/man/man4/hfa.4.gz +OLD_FILES+=usr/share/man/man4/idt.4.gz +OLD_FILES+=usr/share/man/man4/if_idt.4.gz # 20121022: VFS_LOCK_GIANT elimination OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz Modified: projects/uefi/UPDATING ============================================================================== --- projects/uefi/UPDATING Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/UPDATING Tue Mar 12 22:18:31 2013 (r248218) @@ -26,6 +26,30 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130308: + CTL_DISABLE has also been added to the sparc64 GENERIC (for further + information, see the respective 20130304 entry). + +20130304: + Recent commits to callout(9) changed the size of struct callout, + so the KBI is probably heavily disturbed. Also, some functions + in callout(9)/sleep(9)/sleepqueue(9)/condvar(9) KPIs were replaced + by macros. Every kernel module using it won't load, so rebuild + is requested. + + The ctl device has been re-enabled in GENERIC for i386 and amd64, + but does not initialize by default (because of the new CTL_DISABLE + option) to save memory. To re-enable it, remove the CTL_DISABLE + option from the kernel config file or set kern.cam.ctl.disable=0 + in /boot/loader.conf. + +20130301: + The ctl device has been disabled in GENERIC for i386 and amd64. + This was done due to the extra memory being allocated at system + initialisation time by the ctl driver which was only used if + a CAM target device was created. This makes a FreeBSD system + unusable on 128MB or less of RAM. + 20130208: A new compression method (lz4) has been merged to -HEAD. Please refer to zpool-features(7) for more information. Modified: projects/uefi/bin/sh/trap.c ============================================================================== --- projects/uefi/bin/sh/trap.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/bin/sh/trap.c Tue Mar 12 22:18:31 2013 (r248218) @@ -455,7 +455,6 @@ dotrap(void) last_trapsig = i; savestatus = exitstatus; evalstring(trap[i], 0); - exitstatus = savestatus; /* * If such a command was not @@ -464,9 +463,11 @@ dotrap(void) * trap action to have an effect * outside of it. */ - if (prev_evalskip != 0) { + if (evalskip == 0 || + prev_evalskip != 0) { evalskip = prev_evalskip; skipcount = prev_skipcount; + exitstatus = savestatus; } if (i == SIGCHLD) Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Mar 12 22:18:31 2013 (r248218) @@ -1189,7 +1189,7 @@ dump_bpobj_cb(void *arg, const blkptr_t } static void -dump_bpobj(bpobj_t *bpo, char *name) +dump_bpobj(bpobj_t *bpo, char *name, int indent) { char bytes[32]; char comp[32]; @@ -1199,31 +1199,56 @@ dump_bpobj(bpobj_t *bpo, char *name) return; zdb_nicenum(bpo->bpo_phys->bpo_bytes, bytes); - if (bpo->bpo_havesubobj) { + if (bpo->bpo_havesubobj && bpo->bpo_phys->bpo_subobjs != 0) { zdb_nicenum(bpo->bpo_phys->bpo_comp, comp); zdb_nicenum(bpo->bpo_phys->bpo_uncomp, uncomp); - (void) printf("\n %s: %llu local blkptrs, %llu subobjs, " - "%s (%s/%s comp)\n", - name, (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs, + (void) printf(" %*s: object %llu, %llu local blkptrs, " + "%llu subobjs, %s (%s/%s comp)\n", + indent * 8, name, + (u_longlong_t)bpo->bpo_object, + (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs, (u_longlong_t)bpo->bpo_phys->bpo_num_subobjs, bytes, comp, uncomp); + + for (uint64_t i = 0; i < bpo->bpo_phys->bpo_num_subobjs; i++) { + uint64_t subobj; + bpobj_t subbpo; + int error; + VERIFY0(dmu_read(bpo->bpo_os, + bpo->bpo_phys->bpo_subobjs, + i * sizeof (subobj), sizeof (subobj), &subobj, 0)); + error = bpobj_open(&subbpo, bpo->bpo_os, subobj); + if (error != 0) { + (void) printf("ERROR %u while trying to open " + "subobj id %llu\n", + error, (u_longlong_t)subobj); + continue; + } + dump_bpobj(&subbpo, "subobj", indent + 1); + } } else { - (void) printf("\n %s: %llu blkptrs, %s\n", - name, (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs, bytes); + (void) printf(" %*s: object %llu, %llu blkptrs, %s\n", + indent * 8, name, + (u_longlong_t)bpo->bpo_object, + (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs, + bytes); } if (dump_opt['d'] < 5) return; - (void) printf("\n"); - (void) bpobj_iterate_nofree(bpo, dump_bpobj_cb, NULL, NULL); + if (indent == 0) { + (void) bpobj_iterate_nofree(bpo, dump_bpobj_cb, NULL, NULL); + (void) printf("\n"); + } } static void dump_deadlist(dsl_deadlist_t *dl) { dsl_deadlist_entry_t *dle; + uint64_t unused; char bytes[32]; char comp[32]; char uncomp[32]; @@ -1242,14 +1267,24 @@ dump_deadlist(dsl_deadlist_t *dl) (void) printf("\n"); + /* force the tree to be loaded */ + dsl_deadlist_space_range(dl, 0, UINT64_MAX, &unused, &unused, &unused); + for (dle = avl_first(&dl->dl_tree); dle; dle = AVL_NEXT(&dl->dl_tree, dle)) { - (void) printf(" mintxg %llu -> obj %llu\n", - (longlong_t)dle->dle_mintxg, - (longlong_t)dle->dle_bpobj.bpo_object); + if (dump_opt['d'] >= 5) { + char buf[128]; + (void) snprintf(buf, sizeof (buf), "mintxg %llu -> ", + (longlong_t)dle->dle_mintxg, + (longlong_t)dle->dle_bpobj.bpo_object); - if (dump_opt['d'] >= 5) - dump_bpobj(&dle->dle_bpobj, ""); + dump_bpobj(&dle->dle_bpobj, buf, 0); + } else { + (void) printf("mintxg %llu -> obj %llu\n", + (longlong_t)dle->dle_mintxg, + (longlong_t)dle->dle_bpobj.bpo_object); + + } } } @@ -1272,7 +1307,7 @@ fuid_table_destroy() * print uid or gid information. * For normal POSIX id just the id is printed in decimal format. * For CIFS files with FUID the fuid is printed in hex followed by - * the doman-rid string. + * the domain-rid string. */ static void print_idstr(uint64_t id, const char *id_type) @@ -2529,10 +2564,11 @@ dump_zpool(spa_t *spa) if (dump_opt['d'] || dump_opt['i']) { dump_dir(dp->dp_meta_objset); if (dump_opt['d'] >= 3) { - dump_bpobj(&spa->spa_deferred_bpobj, "Deferred frees"); + dump_bpobj(&spa->spa_deferred_bpobj, + "Deferred frees", 0); if (spa_version(spa) >= SPA_VERSION_DEADLISTS) { dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj, - "Pool snapshot frees"); + "Pool snapshot frees", 0); } if (spa_feature_is_active(spa, Modified: projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Mar 12 22:18:31 2013 (r248218) @@ -526,6 +526,39 @@ if the snapshot has been marked for defe .Qq Nm Cm destroy -d command. Otherwise, the property is .Cm off . +.It Sy logicalreferenced +The amount of space that is +.Qq logically +accessible by this dataset. +See the +.Sy referenced +property. +The logical space ignores the effect of the +.Sy compression +and +.Sy copies +properties, giving a quantity closer to the amount of data that applications +see. +However, it does include space consumed by metadata. +.Pp +This property can also be referred to by its shortened column name, +.Sy lrefer . +.It Sy logicalused +The amount of space that is +.Qq logically +consumed by this dataset and all its descendents. +See the +.Sy used +property. +The logical space ignores the effect of the +.Sy compression +and +.Sy copies +properties, giving a quantity closer to the amount of data that applications +see. +.Pp +This property can also be referred to by its shortened column name, +.Sy lused . .It Sy mounted For file systems, indicates whether the file system is currently mounted. This property can be either Modified: projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h Tue Mar 12 22:18:31 2013 (r248218) @@ -24,6 +24,7 @@ * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved. */ #ifndef _LIBFS_IMPL_H @@ -216,6 +217,7 @@ extern void libzfs_fru_clear(libzfs_hand #ifndef sun static int zfs_kernel_version = 0; +static int zfs_ioctl_version = 0; /* * This is FreeBSD version of ioctl, because Solaris' ioctl() updates @@ -225,19 +227,34 @@ static int zfs_kernel_version = 0; static __inline int zcmd_ioctl(int fd, unsigned long cmd, zfs_cmd_t *zc) { - size_t oldsize, zfs_kernel_version_size; + size_t oldsize, zfs_kernel_version_size, zfs_ioctl_version_size; int version, ret, cflag = ZFS_CMD_COMPAT_NONE; - zfs_kernel_version_size = sizeof(zfs_kernel_version); - if (zfs_kernel_version == 0) { - sysctlbyname("vfs.zfs.version.spa", &zfs_kernel_version, - &zfs_kernel_version_size, NULL, 0); + zfs_ioctl_version_size = sizeof(zfs_ioctl_version); + if (zfs_ioctl_version == 0) { + sysctlbyname("vfs.zfs.version.ioctl", &zfs_ioctl_version, + &zfs_ioctl_version_size, NULL, 0); } - if (zfs_kernel_version == SPA_VERSION_15 || - zfs_kernel_version == SPA_VERSION_14 || - zfs_kernel_version == SPA_VERSION_13) - cflag = ZFS_CMD_COMPAT_V15; + /* + * If vfs.zfs.version.ioctl is not defined, assume we have v28 + * compatible binaries and use vfs.zfs.version.spa to test for v15 + */ + if (zfs_ioctl_version < ZFS_IOCVER_DEADMAN) { + cflag = ZFS_CMD_COMPAT_V28; + zfs_kernel_version_size = sizeof(zfs_kernel_version); + + if (zfs_kernel_version == 0) { + sysctlbyname("vfs.zfs.version.spa", + &zfs_kernel_version, + &zfs_kernel_version_size, NULL, 0); + } + + if (zfs_kernel_version == SPA_VERSION_15 || + zfs_kernel_version == SPA_VERSION_14 || + zfs_kernel_version == SPA_VERSION_13) + cflag = ZFS_CMD_COMPAT_V15; + } oldsize = zc->zc_nvlist_dst_size; ret = zcmd_ioctl_compat(fd, cmd, zc, cflag); Modified: projects/uefi/cddl/contrib/opensolaris/tools/ctf/cvt/output.c ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Tue Mar 12 22:18:31 2013 (r248218) @@ -363,6 +363,7 @@ sort_iidescs(Elf *elf, const char *file, for (i = 0; i < nent; i++) { GElf_Sym sym; + char *bname; iidesc_t **tolist; GElf_Sym ssym; iidesc_match_t smatch; @@ -377,7 +378,8 @@ sort_iidescs(Elf *elf, const char *file, switch (GELF_ST_TYPE(sym.st_info)) { case STT_FILE: - match.iim_file = match.iim_name; + bname = strrchr(match.iim_name, '/'); + match.iim_file = bname == NULL ? match.iim_name : bname + 1; continue; case STT_OBJECT: tolist = iiburst->iib_objts; Modified: projects/uefi/contrib/openbsm/etc/audit_event ============================================================================== --- projects/uefi/contrib/openbsm/etc/audit_event Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/contrib/openbsm/etc/audit_event Tue Mar 12 22:18:31 2013 (r248218) @@ -548,7 +548,7 @@ 43184:AUE_OPENAT:openat(2) - attr only:fa 43185:AUE_POSIX_OPENPT:posix_openpt(2):ip 43186:AUE_CAP_NEW:cap_new(2):fm -43187:AUE_CAP_GETRIGHTS:cap_getrights(2):fm +43187:AUE_CAP_RIGHTS_GET:cap_rights_get(2):fm 43188:AUE_CAP_ENTER:cap_enter(2):pc 43189:AUE_CAP_GETMODE:cap_getmode(2):pc 43190:AUE_POSIX_SPAWN:posix_spawn(2):pc @@ -563,6 +563,13 @@ 43199:AUE_PDGETPID:pdgetpid(2):pc 43200:AUE_PDWAIT:pdwait(2):pc 43201:AUE_WAIT6:wait6(2):pc +43202:AUE_CAP_RIGHTS_LIMIT:cap_rights_limit(2):fm +43203:AUE_CAP_IOCTLS_LIMIT:cap_ioctls_limit(2):fm +43204:AUE_CAP_IOCTLS_GET:cap_ioctls_get(2):fm +43205:AUE_CAP_FCNTLS_LIMIT:cap_fcntls_limit(2):fm +43206:AUE_CAP_FCNTLS_GET:cap_fcntls_get(2):fm +43207:AUE_BINDAT:bindat(2):nt +43208:AUE_CONNECTAT:connectat(2):nt # # Solaris userspace events. # Modified: projects/uefi/contrib/openpam/doc/man/openpam_straddch.3 ============================================================================== --- projects/uefi/contrib/openpam/doc/man/openpam_straddch.3 Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/contrib/openpam/doc/man/openpam_straddch.3 Tue Mar 12 22:18:31 2013 (r248218) @@ -34,7 +34,7 @@ .\" .\" $Id$ .\" -.Dd May 26, 2012 +.Dd March 3, 2013 .Dt OPENPAM_STRADDCH 3 .Os .Sh NAME @@ -73,6 +73,21 @@ and argument point to variables used to hold the size of the buffer and the length of the string it contains, respectively. .Pp +The final argument, +.Fa ch , +is the character that should be appended to +the string. If +.Fa ch +is 0, nothing is appended, but a new buffer is +still allocated if +.Fa str +is NULL. This can be used to +.Do +bootstrap +.Dc +the +string. +.Pp If a new buffer is allocated or an existing buffer is reallocated to make room for the additional character, .Fa str @@ -91,7 +106,9 @@ If the function is successful, it increments the integer variable pointed to by .Fa len -and returns 0. +(unless +.Fa ch +was 0) and returns 0. Otherwise, it leaves the variables pointed to by .Fa str , .Fa size Modified: projects/uefi/contrib/openpam/lib/openpam_readline.c ============================================================================== --- projects/uefi/contrib/openpam/lib/openpam_readline.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/contrib/openpam/lib/openpam_readline.c Tue Mar 12 22:18:31 2013 (r248218) @@ -62,11 +62,9 @@ openpam_readline(FILE *f, int *lineno, s size_t len, size; int ch; - if ((line = malloc(size = MIN_LINE_LENGTH)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); + line = NULL; + if (openpam_straddch(&line, &size, &len, 0) != 0) return (NULL); - } - len = 0; for (;;) { ch = fgetc(f); /* strip comment */ Modified: projects/uefi/contrib/openpam/lib/openpam_readword.c ============================================================================== --- projects/uefi/contrib/openpam/lib/openpam_readword.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/contrib/openpam/lib/openpam_readword.c Tue Mar 12 22:18:31 2013 (r248218) @@ -86,13 +86,8 @@ openpam_readword(FILE *f, int *lineno, s /* begin quote */ quote = ch; /* edge case: empty quoted string */ - if (word == NULL && (word = malloc(1)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); - errno = ENOMEM; + if (openpam_straddch(&word, &size, &len, 0) != 0) return (NULL); - } - *word = '\0'; - size = 1; } else if (ch == quote && !escape) { /* end quote */ quote = 0; Modified: projects/uefi/crypto/openssh/FREEBSD-upgrade ============================================================================== --- projects/uefi/crypto/openssh/FREEBSD-upgrade Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/crypto/openssh/FREEBSD-upgrade Tue Mar 12 22:18:31 2013 (r248218) @@ -43,6 +43,7 @@ 7) Run configure with the appropriate arguments: $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ + --disable-lastlog --disable-utmp --disable-wtmp \ --with-pam --with-tcp-wrappers --with-libedit \ --with-ssl-engine Modified: projects/uefi/crypto/openssh/config.h ============================================================================== --- projects/uefi/crypto/openssh/config.h Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/crypto/openssh/config.h Tue Mar 12 22:18:31 2013 (r248218) @@ -17,6 +17,9 @@ /* Define if your resolver libs need this for getrrsetbyname */ /* #undef BIND_8_COMPAT */ +/* The system has incomplete BSM API */ +/* #undef BROKEN_BSM_API */ + /* Define if cmsg_type is not passed correctly */ /* #undef BROKEN_CMSG_TYPE */ @@ -97,7 +100,7 @@ /* #undef DISABLE_FD_PASSING */ /* Define if you don't want to use lastlog */ -/* #undef DISABLE_LASTLOG */ +#define DISABLE_LASTLOG 1 /* Define if you don't want to use your system's login() call */ /* #undef DISABLE_LOGIN */ @@ -307,7 +310,7 @@ #define HAVE_DECL__GETSHORT 0 /* Define if you have /dev/ptmx */ -#define HAVE_DEV_PTMX 1 +/* #undef HAVE_DEV_PTMX */ /* Define if you have /dev/ptc */ /* #undef HAVE_DEV_PTS_AND_PTC */ @@ -316,7 +319,7 @@ #define HAVE_DIRENT_H 1 /* Define to 1 if you have the `dirfd' function. */ -/* #undef HAVE_DIRFD */ +#define HAVE_DIRFD 1 /* Define to 1 if you have the `dirname' function. */ #define HAVE_DIRNAME 1 @@ -501,6 +504,9 @@ /* Define if HEADER.ad exists in arpa/nameser.h */ #define HAVE_HEADER_AD 1 +/* Define to 1 if you have the `HMAC_CTX_init' function. */ +#define HAVE_HMAC_CTX_INIT 1 + /* Define if you have ut_host in utmp.h */ /* #undef HAVE_HOST_IN_UTMP */ @@ -552,6 +558,9 @@ /* Define to 1 if you have the <lastlog.h> header file. */ /* #undef HAVE_LASTLOG_H */ +/* Define if you want ldns support */ +/* #undef HAVE_LDNS */ + /* Define to 1 if you have the <libaudit.h> header file. */ /* #undef HAVE_LIBAUDIT_H */ @@ -594,10 +603,19 @@ /* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the <linux/audit.h> header file. */ +/* #undef HAVE_LINUX_AUDIT_H */ + +/* Define to 1 if you have the <linux/filter.h> header file. */ +/* #undef HAVE_LINUX_FILTER_H */ + /* Define to 1 if you have the <linux/if_tun.h> header file. */ /* #undef HAVE_LINUX_IF_TUN_H */ -/* Define if your libraries define login() */ +/* Define to 1 if you have the <linux/seccomp.h> header file. */ +/* #undef HAVE_LINUX_SECCOMP_H */ + +/* Define to 1 if you have the `login' function. */ /* #undef HAVE_LOGIN */ /* Define to 1 if you have the <login_cap.h> header file. */ @@ -805,6 +823,9 @@ /* Define to 1 if you have the `setgroups' function. */ #define HAVE_SETGROUPS 1 +/* Define to 1 if you have the `setlinebuf' function. */ +#define HAVE_SETLINEBUF 1 + /* Define to 1 if you have the `setlogin' function. */ #define HAVE_SETLOGIN 1 @@ -931,6 +952,9 @@ /* Define to 1 if you have the `strmode' function. */ #define HAVE_STRMODE 1 +/* Define to 1 if you have the `strnlen' function. */ +#define HAVE_STRNLEN 1 + /* Define to 1 if you have the `strnvis' function. */ /* #undef HAVE_STRNVIS */ @@ -1172,7 +1196,7 @@ /* #undef HAVE_VHANGUP */ /* Define to 1 if you have the <vis.h> header file. */ -#define HAVE_VIS_H 1 +/* #undef HAVE_VIS_H */ /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 @@ -1351,15 +1375,21 @@ /* Sandbox using setrlimit(2) */ #define SANDBOX_RLIMIT 1 +/* Sandbox using seccomp filter */ +/* #undef SANDBOX_SECCOMP_FILTER */ + +/* setrlimit RLIMIT_FSIZE works */ +/* #undef SANDBOX_SKIP_RLIMIT_FSIZE */ + /* Sandbox using systrace(4) */ /* #undef SANDBOX_SYSTRACE */ +/* Specify the system call convention in use */ +/* #undef SECCOMP_AUDIT_ARCH */ + /* Define if your platform breaks doing a seteuid before a setuid */ /* #undef SETEUID_BREAKS_SETUID */ -/* The size of `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -1500,6 +1530,11 @@ /* Define if xauth is found in your path */ /* #undef XAUTH_PATH */ +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ Modified: projects/uefi/etc/devd.conf ============================================================================== --- projects/uefi/etc/devd.conf Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/etc/devd.conf Tue Mar 12 22:18:31 2013 (r248218) @@ -34,7 +34,7 @@ options { # NB: DETACH events are ignored; the kernel should handle all cleanup # (routes, arp cache). Beware of races against immediate create # of a device with the same name; e.g. -# ifconfig bridge0 destroy; ifconfig bridge0 create +# ifconfig bridge0 destroy; ifconfig bridge0 create # notify 0 { match "system" "IFNET"; @@ -165,7 +165,7 @@ notify 100 { }; # -# Rescan scsi device-names on attach, but not detach. However, it is +# Rescan SCSI device-names on attach, but not detach. However, it is # disabled by default due to reports of problems. # attach 0 { @@ -305,13 +305,13 @@ detach 10 { # events. See the ACPI specification for more information about # notifies. Here is the information returned for each subsystem: # -# ACAD: AC line state (0 is offline, 1 is online) -# Button: Button pressed (0 for power, 1 for sleep) -# CMBAT: ACPI battery events -# Lid: Lid state (0 is closed, 1 is open) -# RCTL: Resource limits +# ACAD: AC line state (0 is offline, 1 is online) +# Button: Button pressed (0 for power, 1 for sleep) +# CMBAT: ACPI battery events +# Lid: Lid state (0 is closed, 1 is open) +# RCTL: Resource limits # Suspend, Resume: Suspend and resume notification -# Thermal: ACPI thermal zone events +# Thermal: ACPI thermal zone events # # This example calls a script when the AC state changes, passing the # notify value as the first argument. If the state is 0x00, it might Modified: projects/uefi/etc/mtree/BSD.include.dist ============================================================================== --- projects/uefi/etc/mtree/BSD.include.dist Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/etc/mtree/BSD.include.dist Tue Mar 12 22:18:31 2013 (r248218) @@ -174,8 +174,6 @@ .. nullfs .. - portalfs - .. procfs .. udf Modified: projects/uefi/etc/portsnap.conf ============================================================================== --- projects/uefi/etc/portsnap.conf Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/etc/portsnap.conf Tue Mar 12 22:18:31 2013 (r248218) @@ -30,6 +30,5 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddb # REFUSE korean polish portuguese russian ukrainian vietnamese # List of INDEX files to build and the DESCRIBE file to use for each -INDEX INDEX-7 DESCRIBE.7 INDEX INDEX-8 DESCRIBE.8 INDEX INDEX-9 DESCRIBE.9 Modified: projects/uefi/games/fortune/datfiles/Makefile ============================================================================== --- projects/uefi/games/fortune/datfiles/Makefile Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/games/fortune/datfiles/Makefile Tue Mar 12 22:18:31 2013 (r248218) @@ -1,37 +1,22 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 # $FreeBSD$ -FILES= fortunes freebsd-tips murphy startrek zippy -BLDS= fortunes.dat murphy.dat startrek.dat zippy.dat \ - fortunes-o fortunes-o.dat freebsd-tips.dat +DB= fortunes freebsd-tips murphy startrek zippy # TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, COMMENT OUT THE -# THREE LINES AND UNCOMMENT THE FOURTH LINE. +# NEXT LINE. +DB+= limerick murphy-o gerrold.limerick -# THE THREE LINES: -FILES+= limerick murphy-o gerrold.limerick -BLDS+= limerick.dat murphy-o.dat gerrold.limerick.dat -TYPE= real - -# THE FOURTH LINE: -#TYPE= fake - -FILES+= ${BLDS} +BLDS= ${DB:S/$/.dat/} +FILES= ${DB} ${BLDS} CLEANFILES+=${BLDS} FILESDIR= ${SHAREDIR}/games/fortune -.for f in fortunes freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy +.for f in ${DB} $f.dat: $f PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Cs ${.ALLSRC} ${.TARGET} .endfor -fortunes-o.dat: fortunes-o - PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ - strfile -Csx ${.ALLSRC} ${.TARGET} - -fortunes-o: fortunes-o.${TYPE} - LC_ALL=C tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET} - .include <bsd.prog.mk> Modified: projects/uefi/lib/Makefile ============================================================================== --- projects/uefi/lib/Makefile Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/Makefile Tue Mar 12 22:18:31 2013 (r248218) @@ -119,6 +119,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libvmmapi} \ libwrap \ liby \ + libyaml \ libz \ ${_atf} \ ${_bind} \ Modified: projects/uefi/lib/libc/gen/Makefile.inc ============================================================================== --- projects/uefi/lib/libc/gen/Makefile.inc Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/libc/gen/Makefile.inc Tue Mar 12 22:18:31 2013 (r248218) @@ -16,6 +16,7 @@ SRCS+= __getosreldate.c \ assert.c \ auxv.c \ basename.c \ + cap_sandboxed.c \ check_utility_compat.c \ clock.c \ clock_getcpuclockid.c \ @@ -168,6 +169,7 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map MAN+= alarm.3 \ arc4random.3 \ basename.3 \ + cap_sandboxed.3 \ check_utility_compat.3 \ clock.3 \ clock_getcpuclockid.3 \ Copied: projects/uefi/lib/libc/gen/cap_sandboxed.3 (from r248217, head/lib/libc/gen/cap_sandboxed.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/uefi/lib/libc/gen/cap_sandboxed.3 Tue Mar 12 22:18:31 2013 (r248218, copy of r248217, head/lib/libc/gen/cap_sandboxed.3) @@ -0,0 +1,70 @@ +.\" Copyright (c) 2012 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written by Pawel Jakub Dawidek under sponsorship +.\" from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd September 18, 2012 +.Dt CAP_SANDBOXED 3 +.Os +.Sh NAME +.Nm cap_sandboxed +.Nd Check if in a capability mode sandbox +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/capability.h +.In stdbool.h +.Ft bool +.Fn cap_sandboxed "void" +.Sh DESCRIPTION +.Fn cap_sandboxed +returns +.Va true +if the process is in a capability mode sandbox or +.Va false +if it is not. +This function is a more handy alternative to the +.Xr cap_getmode 2 +system call as it always succeeds, so there is no need for error checking. +If the support for capability mode is not compiled into the kernel, +.Fn cap_sandboxed +will always return +.Va false . +.Sh RETURN VALUES +Function +.Fn cap_sandboxed +is always successful and will return either +.Va true +or +.Va false . +.Sh SEE ALSO +.Xr cap_enter 2 , +.Xr capsicum 4 +.Sh AUTHORS +This function was implemented and manual page was written by +.An Pawel Jakub Dawidek Aq pawel@dawidek.net +under sponsorship of the FreeBSD Foundation. Copied: projects/uefi/lib/libc/gen/cap_sandboxed.c (from r248217, head/lib/libc/gen/cap_sandboxed.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/uefi/lib/libc/gen/cap_sandboxed.c Tue Mar 12 22:18:31 2013 (r248218, copy of r248217, head/lib/libc/gen/cap_sandboxed.c) @@ -0,0 +1,50 @@ +/*- + * Copyright (c) 2012 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Pawel Jakub Dawidek under sponsorship from + * the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/capability.h> + +#include <assert.h> +#include <errno.h> +#include <stdbool.h> + +bool +cap_sandboxed(void) +{ + u_int mode; + + if (cap_getmode(&mode) != 0) { + assert(errno == ENOSYS); + return (false); + } + assert(mode == 0 || mode == 1); + return (mode == 1); +} Modified: projects/uefi/lib/libc/include/compat.h ============================================================================== --- projects/uefi/lib/libc/include/compat.h Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/libc/include/compat.h Tue Mar 12 22:18:31 2013 (r248218) @@ -42,6 +42,8 @@ __sym_compat(__semctl, freebsd7___semctl __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0); __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0); +__sym_compat(cap_getrights, cap_rights_get, FBSD_1.2); + #undef __sym_compat #endif /* __LIBC_COMPAT_H__ */ Modified: projects/uefi/lib/libc/regex/regcomp.c ============================================================================== --- projects/uefi/lib/libc/regex/regcomp.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/libc/regex/regcomp.c Tue Mar 12 22:18:31 2013 (r248218) @@ -1212,7 +1212,7 @@ CHaddrange(struct parse *p, cset *cs, wi } cs->ranges = newranges; cs->ranges[cs->nranges].min = min; - cs->ranges[cs->nranges].min = max; + cs->ranges[cs->nranges].max = max; cs->nranges++; } Modified: projects/uefi/lib/libc/rpc/clnt_vc.c ============================================================================== --- projects/uefi/lib/libc/rpc/clnt_vc.c Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/libc/rpc/clnt_vc.c Tue Mar 12 22:18:31 2013 (r248218) @@ -260,7 +260,7 @@ clnt_vc_create(fd, raddr, prog, vers, se if (ct->ct_addr.buf == NULL) goto err; memcpy(ct->ct_addr.buf, raddr->buf, raddr->len); - ct->ct_addr.len = raddr->maxlen; + ct->ct_addr.len = raddr->len; ct->ct_addr.maxlen = raddr->maxlen; /* Modified: projects/uefi/lib/libc/string/Makefile.inc ============================================================================== --- projects/uefi/lib/libc/string/Makefile.inc Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/libc/string/Makefile.inc Tue Mar 12 22:18:31 2013 (r248218) @@ -46,7 +46,8 @@ MLINKS+=strcasecmp.3 strncasecmp.3 \ strcasecmp.3 strcasecmp_l.3 \ strcasecmp.3 strncasecmp_l.3 MLINKS+=strcat.3 strncat.3 -MLINKS+=strchr.3 strrchr.3 +MLINKS+=strchr.3 strrchr.3 \ + strchr.3 strchrnul.3 MLINKS+=strcmp.3 strncmp.3 MLINKS+=strcoll.3 strcoll_l.3 MLINKS+=strcpy.3 stpcpy.3 \ Modified: projects/uefi/lib/libc/sys/Makefile.inc ============================================================================== --- projects/uefi/lib/libc/sys/Makefile.inc Tue Mar 12 21:46:29 2013 (r248217) +++ projects/uefi/lib/libc/sys/Makefile.inc Tue Mar 12 22:18:31 2013 (r248218) @@ -91,9 +91,12 @@ MAN+= abort2.2 \ aio_waitcomplete.2 \ aio_write.2 \ bind.2 \ + bindat.2 \ brk.2 \ cap_enter.2 \ - cap_new.2 \ + cap_fcntls_limit.2 \ + cap_ioctls_limit.2 \ + cap_rights_limit.2 \ chdir.2 \ chflags.2 \ chmod.2 \ @@ -103,6 +106,7 @@ MAN+= abort2.2 \ close.2 \ closefrom.2 \ connect.2 \ + connectat.2 \ cpuset.2 \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303122218.r2CMIWfs053920>