Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Mar 2013 00:03:08 +0000 (UTC)
From:      Attilio Rao <attilio@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r247985 - in user/attilio/vmobj-rwlock: . bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/tools/ctf/cvt contrib/libyaml contrib/openbsm/etc contrib/openpam/doc/man cont...
Message-ID:  <201303080003.r28038uo064797@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: attilio
Date: Fri Mar  8 00:03:07 2013
New Revision: 247985
URL: http://svnweb.freebsd.org/changeset/base/247985

Log:
  MFC

Added:
  user/attilio/vmobj-rwlock/contrib/libyaml/
     - copied from r247980, head/contrib/libyaml/
  user/attilio/vmobj-rwlock/lib/libc/sys/bindat.2
     - copied unchanged from r247980, head/lib/libc/sys/bindat.2
  user/attilio/vmobj-rwlock/lib/libc/sys/connectat.2
     - copied unchanged from r247980, head/lib/libc/sys/connectat.2
  user/attilio/vmobj-rwlock/lib/libyaml/
     - copied from r247980, head/lib/libyaml/
  user/attilio/vmobj-rwlock/sys/dev/drm2/drm_global.c
     - copied unchanged from r247980, head/sys/dev/drm2/drm_global.c
  user/attilio/vmobj-rwlock/sys/dev/drm2/drm_global.h
     - copied unchanged from r247980, head/sys/dev/drm2/drm_global.h
  user/attilio/vmobj-rwlock/sys/dev/drm2/ttm/
     - copied from r247980, head/sys/dev/drm2/ttm/
  user/attilio/vmobj-rwlock/tools/regression/bin/sh/builtins/trap12.0
     - copied unchanged from r247980, head/tools/regression/bin/sh/builtins/trap12.0
  user/attilio/vmobj-rwlock/usr.bin/truss/arm-fbsd.c
     - copied unchanged from r247980, head/usr.bin/truss/arm-fbsd.c
  user/attilio/vmobj-rwlock/usr.sbin/pkg/config.c
     - copied unchanged from r247980, head/usr.sbin/pkg/config.c
  user/attilio/vmobj-rwlock/usr.sbin/pkg/config.h
     - copied unchanged from r247980, head/usr.sbin/pkg/config.h
Deleted:
  user/attilio/vmobj-rwlock/lib/libprocstat/ntfs.c
  user/attilio/vmobj-rwlock/sbin/mount_ext2fs/
  user/attilio/vmobj-rwlock/sbin/mount_hpfs/
  user/attilio/vmobj-rwlock/sbin/mount_ntfs/
  user/attilio/vmobj-rwlock/sbin/mount_reiserfs/
  user/attilio/vmobj-rwlock/sbin/mount_std/
  user/attilio/vmobj-rwlock/share/examples/portal/
  user/attilio/vmobj-rwlock/share/man/man4/coda.4
  user/attilio/vmobj-rwlock/share/man/man5/xfs.5
  user/attilio/vmobj-rwlock/sys/fs/coda/
  user/attilio/vmobj-rwlock/sys/fs/hpfs/
  user/attilio/vmobj-rwlock/sys/fs/ntfs/
  user/attilio/vmobj-rwlock/sys/fs/portalfs/
  user/attilio/vmobj-rwlock/sys/gnu/fs/xfs/
  user/attilio/vmobj-rwlock/sys/modules/coda/
  user/attilio/vmobj-rwlock/sys/modules/coda5/
  user/attilio/vmobj-rwlock/sys/modules/hpfs/
  user/attilio/vmobj-rwlock/sys/modules/ntfs/
  user/attilio/vmobj-rwlock/sys/modules/ntfs_iconv/
  user/attilio/vmobj-rwlock/sys/modules/portalfs/
  user/attilio/vmobj-rwlock/sys/modules/xfs/
  user/attilio/vmobj-rwlock/usr.sbin/mount_portalfs/
Modified:
  user/attilio/vmobj-rwlock/MAINTAINERS   (contents, props changed)
  user/attilio/vmobj-rwlock/ObsoleteFiles.inc
  user/attilio/vmobj-rwlock/UPDATING
  user/attilio/vmobj-rwlock/bin/sh/trap.c
  user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
  user/attilio/vmobj-rwlock/contrib/openbsm/etc/audit_event
  user/attilio/vmobj-rwlock/contrib/openpam/doc/man/openpam_straddch.3
  user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readline.c
  user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readword.c
  user/attilio/vmobj-rwlock/crypto/openssh/FREEBSD-upgrade
  user/attilio/vmobj-rwlock/crypto/openssh/config.h
  user/attilio/vmobj-rwlock/etc/devd.conf
  user/attilio/vmobj-rwlock/etc/portsnap.conf
  user/attilio/vmobj-rwlock/lib/Makefile
  user/attilio/vmobj-rwlock/lib/libc/string/Makefile.inc
  user/attilio/vmobj-rwlock/lib/libc/sys/Makefile.inc
  user/attilio/vmobj-rwlock/lib/libc/sys/Symbol.map
  user/attilio/vmobj-rwlock/lib/libc/sys/cap_rights_limit.2
  user/attilio/vmobj-rwlock/lib/libstand/Makefile
  user/attilio/vmobj-rwlock/lib/libutil/gr_util.c
  user/attilio/vmobj-rwlock/lib/libutil/libutil.h
  user/attilio/vmobj-rwlock/sbin/devd/devd.cc
  user/attilio/vmobj-rwlock/sbin/devd/devd.hh
  user/attilio/vmobj-rwlock/sbin/ipfw/ipfw2.c
  user/attilio/vmobj-rwlock/sbin/ipfw/ipfw2.h
  user/attilio/vmobj-rwlock/sbin/ipfw/ipv6.c
  user/attilio/vmobj-rwlock/sbin/mount_cd9660/mount_cd9660.8
  user/attilio/vmobj-rwlock/sbin/mount_cd9660/mount_cd9660.c
  user/attilio/vmobj-rwlock/sbin/mount_msdosfs/mount_msdosfs.c
  user/attilio/vmobj-rwlock/sbin/mount_nfs/mount_nfs.c
  user/attilio/vmobj-rwlock/sbin/mount_nullfs/mount_nullfs.c
  user/attilio/vmobj-rwlock/sbin/mount_udf/Makefile
  user/attilio/vmobj-rwlock/sbin/mount_udf/mount_udf.c
  user/attilio/vmobj-rwlock/sbin/mount_unionfs/mount_unionfs.c
  user/attilio/vmobj-rwlock/share/man/man4/eventtimers.4
  user/attilio/vmobj-rwlock/share/man/man4/mvs.4
  user/attilio/vmobj-rwlock/share/man/man4/zyd.4
  user/attilio/vmobj-rwlock/share/man/man7/development.7
  user/attilio/vmobj-rwlock/share/man/man7/ports.7
  user/attilio/vmobj-rwlock/share/man/man9/Makefile
  user/attilio/vmobj-rwlock/share/man/man9/condvar.9
  user/attilio/vmobj-rwlock/share/man/man9/sleep.9
  user/attilio/vmobj-rwlock/share/man/man9/sleepqueue.9
  user/attilio/vmobj-rwlock/share/man/man9/timeout.9
  user/attilio/vmobj-rwlock/share/mk/bsd.libnames.mk
  user/attilio/vmobj-rwlock/sys/amd64/conf/GENERIC
  user/attilio/vmobj-rwlock/sys/amd64/conf/NOTES
  user/attilio/vmobj-rwlock/sys/arm/arm/busdma_machdep-v6.c
  user/attilio/vmobj-rwlock/sys/arm/arm/swtch.S
  user/attilio/vmobj-rwlock/sys/arm/arm/vm_machdep.c
  user/attilio/vmobj-rwlock/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  user/attilio/vmobj-rwlock/sys/arm/include/frame.h
  user/attilio/vmobj-rwlock/sys/bsm/audit_kevents.h
  user/attilio/vmobj-rwlock/sys/cam/ctl/ctl.c
  user/attilio/vmobj-rwlock/sys/cddl/compat/opensolaris/sys/kcondvar.h
  user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  user/attilio/vmobj-rwlock/sys/compat/freebsd32/freebsd32_proto.h
  user/attilio/vmobj-rwlock/sys/compat/freebsd32/freebsd32_syscall.h
  user/attilio/vmobj-rwlock/sys/compat/freebsd32/freebsd32_syscalls.c
  user/attilio/vmobj-rwlock/sys/compat/freebsd32/freebsd32_sysent.c
  user/attilio/vmobj-rwlock/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/attilio/vmobj-rwlock/sys/compat/freebsd32/syscalls.master
  user/attilio/vmobj-rwlock/sys/compat/linprocfs/linprocfs.c
  user/attilio/vmobj-rwlock/sys/compat/linux/linux_file.c
  user/attilio/vmobj-rwlock/sys/compat/linux/linux_socket.c
  user/attilio/vmobj-rwlock/sys/conf/NOTES
  user/attilio/vmobj-rwlock/sys/conf/files.amd64
  user/attilio/vmobj-rwlock/sys/conf/files.i386
  user/attilio/vmobj-rwlock/sys/conf/options
  user/attilio/vmobj-rwlock/sys/contrib/altq/altq/altq_hfsc.c
  user/attilio/vmobj-rwlock/sys/contrib/altq/altq/altq_hfsc.h
  user/attilio/vmobj-rwlock/sys/dev/ath/ath_hal/ah.h
  user/attilio/vmobj-rwlock/sys/dev/ath/ath_hal/ar5416/ar5416.h
  user/attilio/vmobj-rwlock/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  user/attilio/vmobj-rwlock/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
  user/attilio/vmobj-rwlock/sys/dev/ath/if_athvar.h
  user/attilio/vmobj-rwlock/sys/dev/drm2/drmP.h
  user/attilio/vmobj-rwlock/sys/dev/drm2/drm_drv.c
  user/attilio/vmobj-rwlock/sys/dev/drm2/drm_gem.c
  user/attilio/vmobj-rwlock/sys/dev/drm2/drm_mm.c
  user/attilio/vmobj-rwlock/sys/dev/drm2/drm_mm.h
  user/attilio/vmobj-rwlock/sys/dev/drm2/ttm/ttm_bo_vm.c
  user/attilio/vmobj-rwlock/sys/dev/drm2/ttm/ttm_tt.c
  user/attilio/vmobj-rwlock/sys/dev/hwpmc/hwpmc_soft.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/LICENSE
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_82598.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_82599.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_82599.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_api.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_api.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_common.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_common.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_mbx.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_osdep.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_phy.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_phy.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_type.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_vf.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_vf.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_x540.c
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixgbe_x540.h
  user/attilio/vmobj-rwlock/sys/dev/ixgbe/ixv.c
  user/attilio/vmobj-rwlock/sys/dev/nvme/nvme.c
  user/attilio/vmobj-rwlock/sys/dev/nvme/nvme_ctrlr.c
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_hw.c
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_hw.h
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_if.c
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_if.h
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_mbox.c
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_queue.c
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_sysctl.c
  user/attilio/vmobj-rwlock/sys/dev/oce/oce_util.c
  user/attilio/vmobj-rwlock/sys/dev/pci/pci.c
  user/attilio/vmobj-rwlock/sys/dev/random/randomdev_soft.c
  user/attilio/vmobj-rwlock/sys/dev/sound/pci/hda/hdaa_patches.c
  user/attilio/vmobj-rwlock/sys/dev/sound/pci/hda/hdac.h
  user/attilio/vmobj-rwlock/sys/dev/sound/pci/hda/hdacc.c
  user/attilio/vmobj-rwlock/sys/dev/syscons/syscons.c
  user/attilio/vmobj-rwlock/sys/dev/syscons/syscons.h
  user/attilio/vmobj-rwlock/sys/dev/virtio/block/virtio_blk.c
  user/attilio/vmobj-rwlock/sys/geom/label/g_label_ntfs.c
  user/attilio/vmobj-rwlock/sys/geom/part/g_part.c
  user/attilio/vmobj-rwlock/sys/geom/part/g_part.h
  user/attilio/vmobj-rwlock/sys/geom/part/g_part_mbr.c
  user/attilio/vmobj-rwlock/sys/geom/raid/md_ddf.c
  user/attilio/vmobj-rwlock/sys/i386/conf/GENERIC
  user/attilio/vmobj-rwlock/sys/i386/conf/NOTES
  user/attilio/vmobj-rwlock/sys/i386/xen/pmap.c
  user/attilio/vmobj-rwlock/sys/kern/capabilities.conf
  user/attilio/vmobj-rwlock/sys/kern/init_sysent.c
  user/attilio/vmobj-rwlock/sys/kern/kern_clock.c
  user/attilio/vmobj-rwlock/sys/kern/kern_clocksource.c
  user/attilio/vmobj-rwlock/sys/kern/kern_condvar.c
  user/attilio/vmobj-rwlock/sys/kern/kern_descrip.c
  user/attilio/vmobj-rwlock/sys/kern/kern_event.c
  user/attilio/vmobj-rwlock/sys/kern/kern_intr.c
  user/attilio/vmobj-rwlock/sys/kern/kern_resource.c
  user/attilio/vmobj-rwlock/sys/kern/kern_synch.c
  user/attilio/vmobj-rwlock/sys/kern/kern_tc.c
  user/attilio/vmobj-rwlock/sys/kern/kern_time.c
  user/attilio/vmobj-rwlock/sys/kern/kern_timeout.c
  user/attilio/vmobj-rwlock/sys/kern/subr_log.c
  user/attilio/vmobj-rwlock/sys/kern/subr_param.c
  user/attilio/vmobj-rwlock/sys/kern/subr_sleepqueue.c
  user/attilio/vmobj-rwlock/sys/kern/sys_generic.c
  user/attilio/vmobj-rwlock/sys/kern/syscalls.c
  user/attilio/vmobj-rwlock/sys/kern/syscalls.master
  user/attilio/vmobj-rwlock/sys/kern/systrace_args.c
  user/attilio/vmobj-rwlock/sys/kern/uipc_domain.c
  user/attilio/vmobj-rwlock/sys/kern/uipc_socket.c
  user/attilio/vmobj-rwlock/sys/kern/uipc_syscalls.c
  user/attilio/vmobj-rwlock/sys/kern/uipc_usrreq.c
  user/attilio/vmobj-rwlock/sys/modules/drm2/drm2/Makefile
  user/attilio/vmobj-rwlock/sys/modules/mqueue/Makefile
  user/attilio/vmobj-rwlock/sys/modules/uart/Makefile
  user/attilio/vmobj-rwlock/sys/net/route.c
  user/attilio/vmobj-rwlock/sys/netinet/siftr.c
  user/attilio/vmobj-rwlock/sys/netinet/tcp_timer.c
  user/attilio/vmobj-rwlock/sys/netpfil/ipfw/ip_fw_dynamic.c
  user/attilio/vmobj-rwlock/sys/ofed/include/linux/timer.h
  user/attilio/vmobj-rwlock/sys/security/audit/audit.h
  user/attilio/vmobj-rwlock/sys/security/audit/audit_arg.c
  user/attilio/vmobj-rwlock/sys/security/audit/audit_bsm.c
  user/attilio/vmobj-rwlock/sys/sparc64/pci/psycho.c
  user/attilio/vmobj-rwlock/sys/sys/_callout.h
  user/attilio/vmobj-rwlock/sys/sys/callout.h
  user/attilio/vmobj-rwlock/sys/sys/capability.h
  user/attilio/vmobj-rwlock/sys/sys/condvar.h
  user/attilio/vmobj-rwlock/sys/sys/diskmbr.h
  user/attilio/vmobj-rwlock/sys/sys/filedesc.h
  user/attilio/vmobj-rwlock/sys/sys/mutex.h
  user/attilio/vmobj-rwlock/sys/sys/param.h
  user/attilio/vmobj-rwlock/sys/sys/pmckern.h
  user/attilio/vmobj-rwlock/sys/sys/protosw.h
  user/attilio/vmobj-rwlock/sys/sys/rwlock.h
  user/attilio/vmobj-rwlock/sys/sys/sleepqueue.h
  user/attilio/vmobj-rwlock/sys/sys/socket.h
  user/attilio/vmobj-rwlock/sys/sys/socketvar.h
  user/attilio/vmobj-rwlock/sys/sys/sx.h
  user/attilio/vmobj-rwlock/sys/sys/syscall.h
  user/attilio/vmobj-rwlock/sys/sys/syscall.mk
  user/attilio/vmobj-rwlock/sys/sys/sysproto.h
  user/attilio/vmobj-rwlock/sys/sys/systm.h
  user/attilio/vmobj-rwlock/sys/sys/time.h
  user/attilio/vmobj-rwlock/sys/vm/vm_object.c
  user/attilio/vmobj-rwlock/tools/make_libdeps.sh
  user/attilio/vmobj-rwlock/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
  user/attilio/vmobj-rwlock/tools/regression/pjdfstest/Makefile
  user/attilio/vmobj-rwlock/tools/regression/pjdfstest/pjdfstest.c
  user/attilio/vmobj-rwlock/tools/tools/cxgbetool/cxgbetool.c
  user/attilio/vmobj-rwlock/usr.bin/Makefile.arm
  user/attilio/vmobj-rwlock/usr.bin/c89/c89.c
  user/attilio/vmobj-rwlock/usr.bin/c99/c99.c
  user/attilio/vmobj-rwlock/usr.bin/calendar/calendars/calendar.birthday
  user/attilio/vmobj-rwlock/usr.bin/find/extern.h
  user/attilio/vmobj-rwlock/usr.bin/find/find.1
  user/attilio/vmobj-rwlock/usr.bin/find/function.c
  user/attilio/vmobj-rwlock/usr.bin/find/option.c
  user/attilio/vmobj-rwlock/usr.bin/hexdump/conv.c
  user/attilio/vmobj-rwlock/usr.bin/procstat/procstat_files.c
  user/attilio/vmobj-rwlock/usr.bin/truss/extern.h
  user/attilio/vmobj-rwlock/usr.bin/truss/main.c
  user/attilio/vmobj-rwlock/usr.sbin/bhyve/acpi.c
  user/attilio/vmobj-rwlock/usr.sbin/bhyve/pci_virtio_block.c
  user/attilio/vmobj-rwlock/usr.sbin/bhyve/pci_virtio_net.c
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-packages.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions-parse.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/functions.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/backend/parseconfig.sh
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf
  user/attilio/vmobj-rwlock/usr.sbin/pc-sysinstall/examples/README
  user/attilio/vmobj-rwlock/usr.sbin/pkg/Makefile
  user/attilio/vmobj-rwlock/usr.sbin/pkg/pkg.c
  user/attilio/vmobj-rwlock/usr.sbin/rtadvd/rtadvd.c
  user/attilio/vmobj-rwlock/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  user/attilio/vmobj-rwlock/   (props changed)
  user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmobj-rwlock/contrib/openbsm/   (props changed)
  user/attilio/vmobj-rwlock/contrib/openpam/   (props changed)
  user/attilio/vmobj-rwlock/crypto/openssh/   (props changed)
  user/attilio/vmobj-rwlock/lib/libc/   (props changed)
  user/attilio/vmobj-rwlock/lib/libutil/   (props changed)
  user/attilio/vmobj-rwlock/sbin/   (props changed)
  user/attilio/vmobj-rwlock/sbin/ipfw/   (props changed)
  user/attilio/vmobj-rwlock/share/man/man4/   (props changed)
  user/attilio/vmobj-rwlock/sys/   (props changed)
  user/attilio/vmobj-rwlock/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmobj-rwlock/sys/conf/   (props changed)
  user/attilio/vmobj-rwlock/usr.bin/calendar/   (props changed)
  user/attilio/vmobj-rwlock/usr.bin/procstat/   (props changed)
  user/attilio/vmobj-rwlock/usr.sbin/bhyve/   (props changed)
  user/attilio/vmobj-rwlock/usr.sbin/rtadvd/   (props changed)

Modified: user/attilio/vmobj-rwlock/MAINTAINERS
==============================================================================
--- user/attilio/vmobj-rwlock/MAINTAINERS	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/MAINTAINERS	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/ObsoleteFiles.inc
==============================================================================
--- user/attilio/vmobj-rwlock/ObsoleteFiles.inc	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/ObsoleteFiles.inc	Fri Mar  8 00:03:07 2013	(r247985)
@@ -38,6 +38,30 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 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
 # 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 +82,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: user/attilio/vmobj-rwlock/UPDATING
==============================================================================
--- user/attilio/vmobj-rwlock/UPDATING	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/UPDATING	Fri Mar  8 00:03:07 2013	(r247985)
@@ -26,6 +26,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+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

Modified: user/attilio/vmobj-rwlock/bin/sh/trap.c
==============================================================================
--- user/attilio/vmobj-rwlock/bin/sh/trap.c	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/bin/sh/trap.c	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
==============================================================================
--- user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/contrib/openbsm/etc/audit_event
==============================================================================
--- user/attilio/vmobj-rwlock/contrib/openbsm/etc/audit_event	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/contrib/openbsm/etc/audit_event	Fri Mar  8 00:03:07 2013	(r247985)
@@ -568,6 +568,8 @@
 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: user/attilio/vmobj-rwlock/contrib/openpam/doc/man/openpam_straddch.3
==============================================================================
--- user/attilio/vmobj-rwlock/contrib/openpam/doc/man/openpam_straddch.3	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/contrib/openpam/doc/man/openpam_straddch.3	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readline.c
==============================================================================
--- user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readline.c	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readline.c	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readword.c
==============================================================================
--- user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readword.c	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/contrib/openpam/lib/openpam_readword.c	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/crypto/openssh/FREEBSD-upgrade
==============================================================================
--- user/attilio/vmobj-rwlock/crypto/openssh/FREEBSD-upgrade	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/crypto/openssh/FREEBSD-upgrade	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/crypto/openssh/config.h
==============================================================================
--- user/attilio/vmobj-rwlock/crypto/openssh/config.h	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/crypto/openssh/config.h	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/etc/devd.conf
==============================================================================
--- user/attilio/vmobj-rwlock/etc/devd.conf	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/etc/devd.conf	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/etc/portsnap.conf
==============================================================================
--- user/attilio/vmobj-rwlock/etc/portsnap.conf	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/etc/portsnap.conf	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/lib/Makefile
==============================================================================
--- user/attilio/vmobj-rwlock/lib/Makefile	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/Makefile	Fri Mar  8 00:03:07 2013	(r247985)
@@ -119,6 +119,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libvmmapi} \
 	libwrap \
 	liby \
+	libyaml \
 	libz \
 	${_atf} \
 	${_bind} \

Modified: user/attilio/vmobj-rwlock/lib/libc/string/Makefile.inc
==============================================================================
--- user/attilio/vmobj-rwlock/lib/libc/string/Makefile.inc	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/libc/string/Makefile.inc	Fri Mar  8 00:03:07 2013	(r247985)
@@ -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: user/attilio/vmobj-rwlock/lib/libc/sys/Makefile.inc
==============================================================================
--- user/attilio/vmobj-rwlock/lib/libc/sys/Makefile.inc	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/libc/sys/Makefile.inc	Fri Mar  8 00:03:07 2013	(r247985)
@@ -91,6 +91,7 @@ MAN+=	abort2.2 \
 	aio_waitcomplete.2 \
 	aio_write.2 \
 	bind.2 \
+	bindat.2 \
 	brk.2 \
 	cap_enter.2 \
 	cap_fcntls_limit.2 \
@@ -105,6 +106,7 @@ MAN+=	abort2.2 \
 	close.2 \
 	closefrom.2 \
 	connect.2 \
+	connectat.2 \
 	cpuset.2 \
 	cpuset_getaffinity.2 \
 	dup.2 \

Modified: user/attilio/vmobj-rwlock/lib/libc/sys/Symbol.map
==============================================================================
--- user/attilio/vmobj-rwlock/lib/libc/sys/Symbol.map	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/libc/sys/Symbol.map	Fri Mar  8 00:03:07 2013	(r247985)
@@ -378,6 +378,7 @@ FBSD_1.2 {
 };
 
 FBSD_1.3 {
+	bindat;
 	cap_fcntls_get;
 	cap_fcntls_limit;
 	cap_ioctls_get;
@@ -386,6 +387,7 @@ FBSD_1.3 {
 	cap_rights_limit;
 	cap_sandboxed;
 	clock_getcpuclockid2;
+	connectat;
 	ffclock_getcounter;
 	ffclock_getestimate;
 	ffclock_setestimate;

Copied: user/attilio/vmobj-rwlock/lib/libc/sys/bindat.2 (from r247980, head/lib/libc/sys/bindat.2)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmobj-rwlock/lib/libc/sys/bindat.2	Fri Mar  8 00:03:07 2013	(r247985, copy of r247980, head/lib/libc/sys/bindat.2)
@@ -0,0 +1,109 @@
+.\" Copyright (c) 2013 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 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 13, 2013
+.Dt BINDAT 2
+.Os
+.Sh NAME
+.Nm bindat
+.Nd assign a local protocol address to a socket
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/types.h
+.In sys/socket.h
+.Pp
+.In fcntl.h
+.Ft int
+.Fn bindat "int fd" "int s" "const struct sockaddr *addr" "socklen_t addrlen"
+.Sh DESCRIPTION
+The
+.Fn bindat
+system call assigns the local protocol address to a socket.
+It works just like the
+.Xr bind 2
+system call with two exceptions:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+It is limited to sockets in the PF_LOCAL domain.
+.Pp
+.It
+If the file path stored in the
+.Fa sun_path
+field of the sockaddr_un structure is a relative path, it is located relative
+to the directory associated with the file descriptor
+.Fa fd .
+If
+.Fn bindat
+is passed the special value
+.Dv AT_FDCWD
+in the
+.Fa fd
+parameter, the current working directory is used and the behavior is identical
+to a call to
+.Xr bind 2 .
+.El
+.Sh RETURN VALUES
+.Rv -std bindat
+.Sh ERRORS
+The
+.Fn bindat
+system call may fail with the same errors as the
+.Xr bind 2
+system call for a UNIX domain socket or with the following errors:
+.Bl -tag -width Er
+.It Bq Er EBADF
+The
+.Fa sun_path
+field does not specify an absolute path and the
+.Fa fd
+argument is neither
+.Dv AT_FDCWD
+nor a valid file descriptor.
+.It Bq Er ENOTDIR
+The
+.Fa sun_path
+field is not an absolute path and
+.Fa fd
+is neither
+.Dv AT_FDCWD
+nor a file descriptor associated with a directory.
+.El
+.Sh SEE ALSO
+.Xr bind 2 ,
+.Xr connectat 2 ,
+.Xr socket 2 ,
+.Xr unix 4
+.Sh AUTHORS
+The
+.Nm
+was developed by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation.

Modified: user/attilio/vmobj-rwlock/lib/libc/sys/cap_rights_limit.2
==============================================================================
--- user/attilio/vmobj-rwlock/lib/libc/sys/cap_rights_limit.2	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/libc/sys/cap_rights_limit.2	Fri Mar  8 00:03:07 2013	(r247985)
@@ -104,12 +104,20 @@ or
 and that socket options set with
 .Xr setsockopt 2
 may also affect binding behavior.
+.It Dv CAP_BINDAT
+Permit
+.Xr bindat 2 .
+This right has to be present on the directory descriptor.
 .It Dv CAP_CONNECT
 Permit
 .Xr connect 2 ;
 also required for
 .Xr sendto 2
 with a non-NULL destination address.
+.It Dv CAP_CONNECTAT
+Permit
+.Xr connectat 2 .
+This right has to be present on the directory descriptor.
 .It Dv CAP_CREATE
 Permit
 .Xr openat 2
@@ -511,11 +519,13 @@ argument points at an invalid address.
 .Xr aio_read 2 ,
 .Xr aio_write 2 ,
 .Xr bind 2 ,
+.Xr bindat 2 ,
 .Xr cap_enter 2 ,
 .Xr cap_fcntls_limit 2 ,
 .Xr cap_ioctls_limit 2 ,
 .Xr cap_rights_limit 2 ,
 .Xr connect 2 ,
+.Xr connectat 2 ,
 .Xr dup 2 ,
 .Xr dup2 2 ,
 .Xr extattr_delete_fd 2 ,

Copied: user/attilio/vmobj-rwlock/lib/libc/sys/connectat.2 (from r247980, head/lib/libc/sys/connectat.2)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmobj-rwlock/lib/libc/sys/connectat.2	Fri Mar  8 00:03:07 2013	(r247985, copy of r247980, head/lib/libc/sys/connectat.2)
@@ -0,0 +1,109 @@
+.\" Copyright (c) 2013 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 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 13, 2013
+.Dt CONNECTAT 2
+.Os
+.Sh NAME
+.Nm connectat
+.Nd initiate a connection on a socket
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/types.h
+.In sys/socket.h
+.Pp
+.In fcntl.h
+.Ft int
+.Fn connectat "int fd" "int s" "const struct sockaddr *name" "socklen_t namelen"
+.Sh DESCRIPTION
+The
+.Fn connectat
+system call initiates a connection on a socket.
+It works just like the
+.Xr connect 2
+system call with two exceptions:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+It is limited to sockets in the PF_LOCAL domain.
+.Pp
+.It
+If the file path stored in the
+.Fa sun_path
+field of the sockaddr_un structure is a relative path, it is located relative
+to the directory associated with the file descriptor
+.Fa fd .
+If
+.Fn connectat
+is passed the special value
+.Dv AT_FDCWD
+in the
+.Fa fd
+parameter, the current working directory is used and the behavior is identical
+to a call to
+.Xr connect 2 .
+.El
+.Sh RETURN VALUES
+.Rv -std connectat
+.Sh ERRORS
+The
+.Fn connectat
+system call may fail with the same errors as the
+.Xr connect 2
+system call for a UNIX domain socket or with the following errors:
+.Bl -tag -width Er
+.It Bq Er EBADF
+The
+.Fa sun_path
+field does not specify an absolute path and the
+.Fa fd
+argument is neither
+.Dv AT_FDCWD
+nor a valid file descriptor.
+.It Bq Er ENOTDIR
+The
+.Fa sun_path
+field is not an absolute path and
+.Fa fd
+is neither
+.Dv AT_FDCWD
+nor a file descriptor associated with a directory.
+.El
+.Sh SEE ALSO
+.Xr bindat 2 ,
+.Xr connect 2 ,
+.Xr socket 2 ,
+.Xr unix 4
+.Sh AUTHORS
+The
+.Nm
+was developed by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation.

Modified: user/attilio/vmobj-rwlock/lib/libstand/Makefile
==============================================================================
--- user/attilio/vmobj-rwlock/lib/libstand/Makefile	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/libstand/Makefile	Fri Mar  8 00:03:07 2013	(r247985)
@@ -67,6 +67,9 @@ SRCS+= divsi3.S
 .else
 # Compiler support functions
 .PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/
+# __clzsi2 and ctzsi2 for various builtin functions
+SRCS+=	clzsi2.c ctzsi2.c
+# Divide and modulus functions called by the compiler
 SRCS+=	 divmoddi4.c  divmodsi4.c  divdi3.c  divsi3.c  moddi3.c  modsi3.c
 SRCS+=	udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
 

Modified: user/attilio/vmobj-rwlock/lib/libutil/gr_util.c
==============================================================================
--- user/attilio/vmobj-rwlock/lib/libutil/gr_util.c	Fri Mar  8 00:01:38 2013	(r247984)
+++ user/attilio/vmobj-rwlock/lib/libutil/gr_util.c	Fri Mar  8 00:03:07 2013	(r247985)
@@ -49,6 +49,8 @@ static char group_dir[PATH_MAX];
 static char group_file[PATH_MAX];
 static char tempname[PATH_MAX];
 static int initialized;
+static size_t grmemlen(const struct group *, const char *, int *);
+static struct group *grcopy(const struct group *gr, struct group *newgr, const char *, int ndx);
 
 /*
  * Initialize statics
@@ -429,90 +431,121 @@ gr_make(const struct group *gr)
 struct group *
 gr_dup(const struct group *gr)
 {
+	return (gr_add(gr, NULL));
+}
+/*
+ * Add a new member name to a struct group.
+ */
+struct group *
+gr_add(const struct group *gr, const char *newmember)
+{
 	struct group *newgr;
-	char *dst;
 	size_t len;
-	int ndx;
 	int num_mem;
 
-	/* Calculate size of the group. */
-	len = sizeof(*newgr);
-	if (gr->gr_name != NULL)
-		len += strlen(gr->gr_name) + 1;
-	if (gr->gr_passwd != NULL)
-		len += strlen(gr->gr_passwd) + 1;
-	if (gr->gr_mem != NULL) {
-		for (num_mem = 0; gr->gr_mem[num_mem] != NULL; num_mem++)
-			len += strlen(gr->gr_mem[num_mem]) + 1;
-		len += (num_mem + 1) * sizeof(*gr->gr_mem);
-	} else
-		num_mem = -1;
+	num_mem = 0;
+	len = grmemlen(gr, newmember, &num_mem);
 	/* Create new group and copy old group into it. */
 	if ((newgr = malloc(len)) == NULL)
 		return (NULL);
-	/* point new gr_mem to end of struct + 1 */
-	if (gr->gr_mem != NULL)
+	return (grcopy(gr, newgr, newmember, num_mem));
+}
+
+/* It is safer to walk the pointers given at gr_mem since there is no
+ * guarantee the gr_mem + strings are continguous in the given struct group
+ * but compact the new group into the following form.
+ *
+ * The new struct is laid out like this in memory. The example given is
+ * for a group with two members only.
+ *
+ * {
+ * (char *name)
+ * (char *passwd)
+ * (int gid)
+ * (gr_mem * newgrp + sizeof(struct group) + sizeof(**)) points to gr_mem area
+ * gr_mem area
+ * (member1 *) 
+ * (member2 *)
+ * (NULL)
+ * (name string)
+ * (passwd string)
+ * (member1 string)
+ * (member2 string)
+ * }
+ */
+/*
+ * Copy the guts of a group plus given name to a preallocated group struct
+ */
+static struct group *
+grcopy(const struct group *gr, struct group *newgr, const char *name, int ndx)
+{
+	char *dst;
+	int i;
+
+	if (name != NULL)
+		ndx++;
+	/* point new gr_mem to end of struct + 1 if there are names */
+	if (ndx != 0)
 		newgr->gr_mem = (char **)(newgr + 1);
 	else
 		newgr->gr_mem = NULL;
 	/* point dst after the end of all the gr_mem pointers in newgr */
-	dst = (char *)&newgr->gr_mem[num_mem + 1];
+	dst = (char *)&newgr->gr_mem[ndx + 1];
 	if (gr->gr_name != NULL) {
 		newgr->gr_name = dst;
 		dst = stpcpy(dst, gr->gr_name) + 1;
-	} else {
+	} else
 		newgr->gr_name = NULL;
-	}
 	if (gr->gr_passwd != NULL) {
 		newgr->gr_passwd = dst;
 		dst = stpcpy(dst, gr->gr_passwd) + 1;
-	} else {
+	} else
 		newgr->gr_passwd = NULL;
-	}
 	newgr->gr_gid = gr->gr_gid;
-	if (gr->gr_mem != NULL) {
-		for (ndx = 0; ndx < num_mem; ndx++) {
-			newgr->gr_mem[ndx] = dst;
-			dst = stpcpy(dst, gr->gr_mem[ndx]) + 1;
+	if (ndx != 0) {
+		for (i = 0; gr->gr_mem[i] != NULL; i++) {
+			newgr->gr_mem[i] = dst;
+			dst = stpcpy(dst, gr->gr_mem[i]) + 1;
+		}
+		if (name != NULL) {
+			newgr->gr_mem[i++] = dst;
+			dst = stpcpy(dst, name) + 1;
 		}
-		newgr->gr_mem[ndx] = NULL;
+		newgr->gr_mem[i] = NULL;
 	}
 	return (newgr);
 }
 

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303080003.r28038uo064797>