svn commit: r195455 - in projects/libprocstat: lib lib/libc/gen lib/libc/include lib/libc/posix1e lib/libc/rpc lib/libc/stdtime lib/libc/sys lib/libjail lib/libthr/thread lib/libusb lib/libutil sys...

Wed Jul 8 14:17:04 UTC 2009

Author: stas
Date: Wed Jul  8 14:17:03 2009
New Revision: 195455
URL: http://svn.freebsd.org/changeset/base/195455

Log:
  - MFC.

Added:
  projects/libprocstat/lib/libc/include/compat.h
     - copied unchanged from r195447, head/lib/libc/include/compat.h
  projects/libprocstat/lib/libc/posix1e/acl_add_flag_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_add_flag_np.3
  projects/libprocstat/lib/libc/posix1e/acl_branding.c
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_branding.c
  projects/libprocstat/lib/libc/posix1e/acl_clear_flags_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_clear_flags_np.3
  projects/libprocstat/lib/libc/posix1e/acl_delete_flag_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_delete_flag_np.3
  projects/libprocstat/lib/libc/posix1e/acl_flag.c
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_flag.c
  projects/libprocstat/lib/libc/posix1e/acl_from_text_nfs4.c
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_from_text_nfs4.c
  projects/libprocstat/lib/libc/posix1e/acl_get_brand_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_get_brand_np.3
  projects/libprocstat/lib/libc/posix1e/acl_get_entry_type_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_get_entry_type_np.3
  projects/libprocstat/lib/libc/posix1e/acl_get_flag_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_get_flag_np.3
  projects/libprocstat/lib/libc/posix1e/acl_get_flagset_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_get_flagset_np.3
  projects/libprocstat/lib/libc/posix1e/acl_is_trivial_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_is_trivial_np.3
  projects/libprocstat/lib/libc/posix1e/acl_set_entry_type_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_set_entry_type_np.3
  projects/libprocstat/lib/libc/posix1e/acl_set_flagset_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_set_flagset_np.3
  projects/libprocstat/lib/libc/posix1e/acl_strip.c
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_strip.c
  projects/libprocstat/lib/libc/posix1e/acl_strip_np.3
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_strip_np.3
  projects/libprocstat/lib/libc/posix1e/acl_support_nfs4.c
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_support_nfs4.c
  projects/libprocstat/lib/libc/posix1e/acl_to_text_nfs4.c
     - copied unchanged from r195447, head/lib/libc/posix1e/acl_to_text_nfs4.c
  projects/libprocstat/lib/libjail/
     - copied from r195447, head/lib/libjail/
  projects/libprocstat/sys/amd64/include/vm.h
     - copied unchanged from r195447, head/sys/amd64/include/vm.h
  projects/libprocstat/sys/arm/include/vm.h
     - copied unchanged from r195447, head/sys/arm/include/vm.h
  projects/libprocstat/sys/i386/include/vm.h
     - copied unchanged from r195447, head/sys/i386/include/vm.h
  projects/libprocstat/sys/ia64/include/vm.h
     - copied unchanged from r195447, head/sys/ia64/include/vm.h
  projects/libprocstat/sys/mips/include/vm.h
     - copied unchanged from r195447, head/sys/mips/include/vm.h
  projects/libprocstat/sys/net/if_epair.c
     - copied unchanged from r195447, head/sys/net/if_epair.c
  projects/libprocstat/sys/net80211/ieee80211_action.c
     - copied unchanged from r195447, head/sys/net80211/ieee80211_action.c
  projects/libprocstat/sys/net80211/ieee80211_action.h
     - copied unchanged from r195447, head/sys/net80211/ieee80211_action.h
  projects/libprocstat/sys/net80211/ieee80211_ageq.c
     - copied unchanged from r195447, head/sys/net80211/ieee80211_ageq.c
  projects/libprocstat/sys/net80211/ieee80211_ageq.h
     - copied unchanged from r195447, head/sys/net80211/ieee80211_ageq.h
  projects/libprocstat/sys/pc98/include/vm.h
     - copied unchanged from r195447, head/sys/pc98/include/vm.h
  projects/libprocstat/sys/powerpc/include/vm.h
     - copied unchanged from r195447, head/sys/powerpc/include/vm.h
  projects/libprocstat/sys/sparc64/include/vm.h
     - copied unchanged from r195447, head/sys/sparc64/include/vm.h
  projects/libprocstat/sys/sun4v/include/vm.h
     - copied unchanged from r195447, head/sys/sun4v/include/vm.h
Deleted:
  projects/libprocstat/sys/nfs/rpcv2.h
  projects/libprocstat/sys/nfsclient/nfs_socket.c
  projects/libprocstat/sys/nfsserver/nfs_srvcache.c
  projects/libprocstat/sys/nfsserver/nfs_srvsock.c
  projects/libprocstat/sys/nfsserver/nfs_syscalls.c
Modified:
  projects/libprocstat/lib/   (props changed)
  projects/libprocstat/lib/Makefile
  projects/libprocstat/lib/libc/gen/Symbol.map
  projects/libprocstat/lib/libc/gen/msgctl.3
  projects/libprocstat/lib/libc/gen/semctl.c
  projects/libprocstat/lib/libc/posix1e/Makefile.inc
  projects/libprocstat/lib/libc/posix1e/Symbol.map
  projects/libprocstat/lib/libc/posix1e/acl.3
  projects/libprocstat/lib/libc/posix1e/acl_add_perm.3
  projects/libprocstat/lib/libc/posix1e/acl_calc_mask.c
  projects/libprocstat/lib/libc/posix1e/acl_copy.c
  projects/libprocstat/lib/libc/posix1e/acl_create_entry.3
  projects/libprocstat/lib/libc/posix1e/acl_delete_entry.3
  projects/libprocstat/lib/libc/posix1e/acl_delete_entry.c
  projects/libprocstat/lib/libc/posix1e/acl_entry.c
  projects/libprocstat/lib/libc/posix1e/acl_from_text.c
  projects/libprocstat/lib/libc/posix1e/acl_get.3
  projects/libprocstat/lib/libc/posix1e/acl_get.c
  projects/libprocstat/lib/libc/posix1e/acl_init.c
  projects/libprocstat/lib/libc/posix1e/acl_set.3
  projects/libprocstat/lib/libc/posix1e/acl_set.c
  projects/libprocstat/lib/libc/posix1e/acl_set_tag_type.3
  projects/libprocstat/lib/libc/posix1e/acl_support.c
  projects/libprocstat/lib/libc/posix1e/acl_support.h
  projects/libprocstat/lib/libc/posix1e/acl_to_text.3
  projects/libprocstat/lib/libc/posix1e/acl_to_text.c
  projects/libprocstat/lib/libc/posix1e/acl_valid.c
  projects/libprocstat/lib/libc/rpc/getnetconfig.c
  projects/libprocstat/lib/libc/stdtime/strptime.c
  projects/libprocstat/lib/libc/sys/Makefile.inc
  projects/libprocstat/lib/libc/sys/Symbol.map
  projects/libprocstat/lib/libc/sys/execve.2
  projects/libprocstat/lib/libc/sys/getsockopt.2
  projects/libprocstat/lib/libc/sys/pathconf.2
  projects/libprocstat/lib/libc/sys/semctl.2
  projects/libprocstat/lib/libc/sys/shmctl.2
  projects/libprocstat/lib/libthr/thread/thr_rtld.c
  projects/libprocstat/lib/libthr/thread/thr_rwlock.c
  projects/libprocstat/lib/libusb/   (props changed)
  projects/libprocstat/lib/libusb/libusb20.3   (props changed)
  projects/libprocstat/lib/libutil/kinfo_getvmmap.3
  projects/libprocstat/sys/   (props changed)
  projects/libprocstat/sys/amd64/amd64/genassym.c
  projects/libprocstat/sys/amd64/amd64/identcpu.c
  projects/libprocstat/sys/amd64/amd64/intr_machdep.c
  projects/libprocstat/sys/amd64/amd64/io_apic.c
  projects/libprocstat/sys/amd64/amd64/local_apic.c
  projects/libprocstat/sys/amd64/amd64/machdep.c
  projects/libprocstat/sys/amd64/amd64/msi.c
  projects/libprocstat/sys/amd64/amd64/pmap.c
  projects/libprocstat/sys/amd64/amd64/sys_machdep.c
  projects/libprocstat/sys/amd64/conf/GENERIC
  projects/libprocstat/sys/amd64/include/intr_machdep.h
  projects/libprocstat/sys/amd64/include/param.h
  projects/libprocstat/sys/amd64/isa/atpic.c
  projects/libprocstat/sys/arm/arm/pmap.c
  projects/libprocstat/sys/arm/arm/vm_machdep.c
  projects/libprocstat/sys/arm/at91/at91_machdep.c
  projects/libprocstat/sys/arm/at91/if_ate.c
  projects/libprocstat/sys/arm/conf/CAMBRIA.hints
  projects/libprocstat/sys/arm/include/param.h
  projects/libprocstat/sys/arm/mv/discovery/discovery.c
  projects/libprocstat/sys/arm/mv/kirkwood/kirkwood.c
  projects/libprocstat/sys/arm/mv/mv_machdep.c
  projects/libprocstat/sys/arm/mv/mvwin.h
  projects/libprocstat/sys/arm/mv/orion/orion.c
  projects/libprocstat/sys/arm/sa11x0/assabet_machdep.c
  projects/libprocstat/sys/arm/xscale/ixp425/if_npe.c
  projects/libprocstat/sys/boot/i386/libi386/biosdisk.c
  projects/libprocstat/sys/cam/scsi/scsi_target.c
  projects/libprocstat/sys/compat/freebsd32/freebsd32_ipc.h
  projects/libprocstat/sys/compat/freebsd32/freebsd32_misc.c
  projects/libprocstat/sys/compat/freebsd32/freebsd32_proto.h
  projects/libprocstat/sys/compat/freebsd32/freebsd32_syscall.h
  projects/libprocstat/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/libprocstat/sys/compat/freebsd32/freebsd32_sysent.c
  projects/libprocstat/sys/compat/freebsd32/syscalls.master
  projects/libprocstat/sys/compat/linux/linux_ipc.c
  projects/libprocstat/sys/compat/linux/linux_signal.c
  projects/libprocstat/sys/compat/ndis/subr_usbd.c
  projects/libprocstat/sys/compat/svr4/svr4_ipc.c
  projects/libprocstat/sys/conf/NOTES
  projects/libprocstat/sys/conf/files
  projects/libprocstat/sys/conf/newvers.sh
  projects/libprocstat/sys/conf/options
  projects/libprocstat/sys/contrib/dev/mwl/mw88W8363.fw.uu
  projects/libprocstat/sys/dev/acpi_support/acpi_hp.c
  projects/libprocstat/sys/dev/acpi_support/acpi_wmi.c
  projects/libprocstat/sys/dev/acpi_support/acpi_wmi_if.m
  projects/libprocstat/sys/dev/ae/if_ae.c
  projects/libprocstat/sys/dev/age/if_age.c
  projects/libprocstat/sys/dev/alc/if_alc.c
  projects/libprocstat/sys/dev/ale/if_ale.c
  projects/libprocstat/sys/dev/asmc/asmc.c
  projects/libprocstat/sys/dev/asmc/asmcvar.h
  projects/libprocstat/sys/dev/ata/atapi-cd.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-acard.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-adaptec.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-ahci.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-amd.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-ati.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-cenatek.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-cypress.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-cyrix.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-highpoint.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-intel.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-ite.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-jmicron.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-marvell.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-micron.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-national.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-netcell.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-nvidia.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-promise.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-serverworks.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-siliconimage.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-sis.c
  projects/libprocstat/sys/dev/ata/chipsets/ata-via.c
  projects/libprocstat/sys/dev/ath/ah_osdep.c
  projects/libprocstat/sys/dev/ath/ah_osdep.h
  projects/libprocstat/sys/dev/ath/ath_hal/ah.c
  projects/libprocstat/sys/dev/ath/ath_hal/ah.h
  projects/libprocstat/sys/dev/ath/ath_hal/ah_internal.h
  projects/libprocstat/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  projects/libprocstat/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c
  projects/libprocstat/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/libprocstat/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  projects/libprocstat/sys/dev/ath/if_ath.c
  projects/libprocstat/sys/dev/ath/if_athvar.h
  projects/libprocstat/sys/dev/bce/if_bce.c
  projects/libprocstat/sys/dev/bfe/if_bfe.c
  projects/libprocstat/sys/dev/bge/if_bge.c
  projects/libprocstat/sys/dev/bm/if_bm.c
  projects/libprocstat/sys/dev/cas/if_cas.c
  projects/libprocstat/sys/dev/cas/if_casvar.h
  projects/libprocstat/sys/dev/cpuctl/cpuctl.c
  projects/libprocstat/sys/dev/cs/if_cs.c
  projects/libprocstat/sys/dev/cxgb/cxgb_adapter.h
  projects/libprocstat/sys/dev/cxgb/cxgb_main.c
  projects/libprocstat/sys/dev/cxgb/cxgb_sge.c
  projects/libprocstat/sys/dev/cxgb/sys/mvec.h
  projects/libprocstat/sys/dev/cxgb/sys/uipc_mvec.c
  projects/libprocstat/sys/dev/dc/if_dc.c
  projects/libprocstat/sys/dev/de/if_de.c
  projects/libprocstat/sys/dev/drm/drm_irq.c
  projects/libprocstat/sys/dev/drm/i915_dma.c
  projects/libprocstat/sys/dev/drm/i915_drv.h
  projects/libprocstat/sys/dev/drm/i915_irq.c
  projects/libprocstat/sys/dev/drm/radeon_cp.c
  projects/libprocstat/sys/dev/drm/radeon_irq.c
  projects/libprocstat/sys/dev/e1000/e1000_82542.c
  projects/libprocstat/sys/dev/e1000/if_em.c
  projects/libprocstat/sys/dev/e1000/if_igb.c
  projects/libprocstat/sys/dev/ed/if_ed.c
  projects/libprocstat/sys/dev/et/if_et.c
  projects/libprocstat/sys/dev/ex/if_ex.c
  projects/libprocstat/sys/dev/fdc/fdc.c
  projects/libprocstat/sys/dev/fe/if_fe.c
  projects/libprocstat/sys/dev/fxp/if_fxp.c
  projects/libprocstat/sys/dev/gem/if_gem.c
  projects/libprocstat/sys/dev/gem/if_gemvar.h
  projects/libprocstat/sys/dev/hme/if_hme.c
  projects/libprocstat/sys/dev/hptmv/atapi.h
  projects/libprocstat/sys/dev/hwpmc/hwpmc_logging.c
  projects/libprocstat/sys/dev/hwpmc/hwpmc_mod.c
  projects/libprocstat/sys/dev/ie/if_ie.c
  projects/libprocstat/sys/dev/if_ndis/if_ndis.c
  projects/libprocstat/sys/dev/iscsi/initiator/isc_soc.c
  projects/libprocstat/sys/dev/ixgb/if_ixgb.c
  projects/libprocstat/sys/dev/ixgbe/ixgbe.c
  projects/libprocstat/sys/dev/jme/if_jme.c
  projects/libprocstat/sys/dev/le/lance.c
  projects/libprocstat/sys/dev/lge/if_lge.c
  projects/libprocstat/sys/dev/malo/if_malo.c
  projects/libprocstat/sys/dev/mge/if_mge.c
  projects/libprocstat/sys/dev/mpt/mpt_cam.c
  projects/libprocstat/sys/dev/msk/if_msk.c
  projects/libprocstat/sys/dev/mwl/if_mwl.c
  projects/libprocstat/sys/dev/mwl/if_mwlvar.h
  projects/libprocstat/sys/dev/mwl/mwlhal.c
  projects/libprocstat/sys/dev/mwl/mwlhal.h
  projects/libprocstat/sys/dev/mwl/mwlreg.h
  projects/libprocstat/sys/dev/mxge/if_mxge.c
  projects/libprocstat/sys/dev/mxge/if_mxge_var.h
  projects/libprocstat/sys/dev/my/if_my.c
  projects/libprocstat/sys/dev/nfe/if_nfe.c
  projects/libprocstat/sys/dev/nge/if_nge.c
  projects/libprocstat/sys/dev/nve/if_nve.c
  projects/libprocstat/sys/dev/nxge/if_nxge.c
  projects/libprocstat/sys/dev/pcn/if_pcn.c
  projects/libprocstat/sys/dev/pdq/pdq_ifsubr.c
  projects/libprocstat/sys/dev/re/if_re.c
  projects/libprocstat/sys/dev/sf/if_sf.c
  projects/libprocstat/sys/dev/sis/if_sis.c
  projects/libprocstat/sys/dev/sk/if_sk.c
  projects/libprocstat/sys/dev/sn/if_sn.c
  projects/libprocstat/sys/dev/snc/dp83932.c
  projects/libprocstat/sys/dev/sound/midi/midi.c
  projects/libprocstat/sys/dev/sound/midi/sequencer.c
  projects/libprocstat/sys/dev/sound/pcm/feeder_rate.c
  projects/libprocstat/sys/dev/sound/usb/uaudio.c
  projects/libprocstat/sys/dev/speaker/spkr.c
  projects/libprocstat/sys/dev/ste/if_ste.c
  projects/libprocstat/sys/dev/stge/if_stge.c
  projects/libprocstat/sys/dev/ti/if_ti.c
  projects/libprocstat/sys/dev/tl/if_tl.c
  projects/libprocstat/sys/dev/tsec/if_tsec.c
  projects/libprocstat/sys/dev/tx/if_tx.c
  projects/libprocstat/sys/dev/txp/if_txp.c
  projects/libprocstat/sys/dev/usb/controller/at91dci.c
  projects/libprocstat/sys/dev/usb/controller/atmegadci.c
  projects/libprocstat/sys/dev/usb/controller/avr32dci.c
  projects/libprocstat/sys/dev/usb/controller/musb_otg.c
  projects/libprocstat/sys/dev/usb/controller/uss820dci.c
  projects/libprocstat/sys/dev/usb/net/if_aue.c
  projects/libprocstat/sys/dev/usb/net/if_axe.c
  projects/libprocstat/sys/dev/usb/net/if_cdce.c
  projects/libprocstat/sys/dev/usb/net/if_cue.c
  projects/libprocstat/sys/dev/usb/net/if_kue.c
  projects/libprocstat/sys/dev/usb/net/if_rue.c
  projects/libprocstat/sys/dev/usb/net/if_udav.c
  projects/libprocstat/sys/dev/usb/serial/usb_serial.c
  projects/libprocstat/sys/dev/usb/storage/umass.c
  projects/libprocstat/sys/dev/usb/storage/ustorage_fs.c
  projects/libprocstat/sys/dev/usb/usb_controller.h
  projects/libprocstat/sys/dev/usb/usb_device.c
  projects/libprocstat/sys/dev/usb/usb_handle_request.c
  projects/libprocstat/sys/dev/usb/usb_if.m
  projects/libprocstat/sys/dev/usb/usb_transfer.c
  projects/libprocstat/sys/dev/usb/usbdevs
  projects/libprocstat/sys/dev/usb/usbdi.h
  projects/libprocstat/sys/dev/usb/wlan/if_upgt.c
  projects/libprocstat/sys/dev/usb/wlan/if_urtw.c
  projects/libprocstat/sys/dev/usb/wlan/if_zyd.c
  projects/libprocstat/sys/dev/vge/if_vge.c
  projects/libprocstat/sys/dev/vr/if_vr.c
  projects/libprocstat/sys/dev/wb/if_wb.c
  projects/libprocstat/sys/dev/wi/if_wi.c
  projects/libprocstat/sys/dev/wl/if_wl.c
  projects/libprocstat/sys/dev/xe/if_xe.c
  projects/libprocstat/sys/dev/xen/netfront/   (props changed)
  projects/libprocstat/sys/dev/xen/xenpci/   (props changed)
  projects/libprocstat/sys/dev/xl/if_xl.c
  projects/libprocstat/sys/fs/cd9660/cd9660_lookup.c
  projects/libprocstat/sys/fs/coda/coda_psdev.c
  projects/libprocstat/sys/fs/coda/coda_vnops.c
  projects/libprocstat/sys/fs/fifofs/fifo_vnops.c
  projects/libprocstat/sys/fs/nfsclient/nfs_clvnops.c
  projects/libprocstat/sys/fs/pseudofs/pseudofs_vnops.c
  projects/libprocstat/sys/geom/geom.h
  projects/libprocstat/sys/geom/geom_dev.c
  projects/libprocstat/sys/geom/geom_io.c
  projects/libprocstat/sys/geom/geom_subr.c
  projects/libprocstat/sys/geom/geom_vfs.c
  projects/libprocstat/sys/geom/journal/g_journal.c
  projects/libprocstat/sys/geom/linux_lvm/g_linux_lvm.c
  projects/libprocstat/sys/geom/part/g_part.c
  projects/libprocstat/sys/geom/part/g_part_if.m
  projects/libprocstat/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
  projects/libprocstat/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h
  projects/libprocstat/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
  projects/libprocstat/sys/gnu/fs/xfs/xfs_rw.h
  projects/libprocstat/sys/gnu/fs/xfs/xfs_vnodeops.c
  projects/libprocstat/sys/i386/conf/GENERIC
  projects/libprocstat/sys/i386/i386/genassym.c
  projects/libprocstat/sys/i386/i386/intr_machdep.c
  projects/libprocstat/sys/i386/i386/io_apic.c
  projects/libprocstat/sys/i386/i386/local_apic.c
  projects/libprocstat/sys/i386/i386/msi.c
  projects/libprocstat/sys/i386/i386/pmap.c
  projects/libprocstat/sys/i386/i386/sys_machdep.c
  projects/libprocstat/sys/i386/ibcs2/ibcs2_ipc.c
  projects/libprocstat/sys/i386/include/intr_machdep.h
  projects/libprocstat/sys/i386/include/param.h
  projects/libprocstat/sys/i386/isa/atpic.c
  projects/libprocstat/sys/i386/linux/linux_machdep.c
  projects/libprocstat/sys/i386/xen/pmap.c
  projects/libprocstat/sys/ia64/conf/GENERIC
  projects/libprocstat/sys/ia64/include/param.h
  projects/libprocstat/sys/kern/init_sysent.c
  projects/libprocstat/sys/kern/kern_descrip.c
  projects/libprocstat/sys/kern/kern_event.c
  projects/libprocstat/sys/kern/kern_exec.c
  projects/libprocstat/sys/kern/kern_exit.c
  projects/libprocstat/sys/kern/kern_fork.c
  projects/libprocstat/sys/kern/kern_intr.c
  projects/libprocstat/sys/kern/kern_jail.c
  projects/libprocstat/sys/kern/kern_linker.c
  projects/libprocstat/sys/kern/kern_lockf.c
  projects/libprocstat/sys/kern/kern_mbuf.c
  projects/libprocstat/sys/kern/kern_prot.c
  projects/libprocstat/sys/kern/kern_sig.c
  projects/libprocstat/sys/kern/kern_switch.c
  projects/libprocstat/sys/kern/kern_thr.c
  projects/libprocstat/sys/kern/subr_param.c
  projects/libprocstat/sys/kern/subr_pcpu.c
  projects/libprocstat/sys/kern/sys_generic.c
  projects/libprocstat/sys/kern/sys_pipe.c
  projects/libprocstat/sys/kern/sys_process.c
  projects/libprocstat/sys/kern/sys_socket.c
  projects/libprocstat/sys/kern/syscalls.c
  projects/libprocstat/sys/kern/syscalls.master
  projects/libprocstat/sys/kern/systrace_args.c
  projects/libprocstat/sys/kern/sysv_ipc.c
  projects/libprocstat/sys/kern/sysv_msg.c
  projects/libprocstat/sys/kern/sysv_sem.c
  projects/libprocstat/sys/kern/sysv_shm.c
  projects/libprocstat/sys/kern/tty.c
  projects/libprocstat/sys/kern/tty_pts.c
  projects/libprocstat/sys/kern/uipc_socket.c
  projects/libprocstat/sys/kern/uipc_syscalls.c
  projects/libprocstat/sys/kern/vfs_cluster.c
  projects/libprocstat/sys/kern/vfs_export.c
  projects/libprocstat/sys/kern/vfs_extattr.c
  projects/libprocstat/sys/kern/vfs_lookup.c
  projects/libprocstat/sys/kern/vfs_mount.c
  projects/libprocstat/sys/kern/vfs_subr.c
  projects/libprocstat/sys/kern/vfs_syscalls.c
  projects/libprocstat/sys/kern/vfs_vnops.c
  projects/libprocstat/sys/mips/adm5120/if_admsw.c
  projects/libprocstat/sys/mips/include/param.h
  projects/libprocstat/sys/mips/malta/yamon.c
  projects/libprocstat/sys/mips/mips/busdma_machdep.c
  projects/libprocstat/sys/mips/mips/dump_machdep.c
  projects/libprocstat/sys/mips/mips/intr_machdep.c
  projects/libprocstat/sys/modules/Makefile
  projects/libprocstat/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/libprocstat/sys/modules/geom/geom_label/Makefile
  projects/libprocstat/sys/modules/ip6_mroute_mod/   (props changed)
  projects/libprocstat/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/libprocstat/sys/modules/nfsclient/Makefile
  projects/libprocstat/sys/modules/nfsserver/Makefile
  projects/libprocstat/sys/modules/wlan/Makefile
  projects/libprocstat/sys/net/if.c
  projects/libprocstat/sys/net/if_media.h
  projects/libprocstat/sys/net/if_spppsubr.c
  projects/libprocstat/sys/net/if_stf.c
  projects/libprocstat/sys/net/if_tap.c
  projects/libprocstat/sys/net/if_tun.c
  projects/libprocstat/sys/net/if_var.h
  projects/libprocstat/sys/net/netisr.c
  projects/libprocstat/sys/net/vnet.h
  projects/libprocstat/sys/net80211/ieee80211.c
  projects/libprocstat/sys/net80211/ieee80211_adhoc.c
  projects/libprocstat/sys/net80211/ieee80211_freebsd.h
  projects/libprocstat/sys/net80211/ieee80211_hostap.c
  projects/libprocstat/sys/net80211/ieee80211_ht.c
  projects/libprocstat/sys/net80211/ieee80211_ht.h
  projects/libprocstat/sys/net80211/ieee80211_node.c
  projects/libprocstat/sys/net80211/ieee80211_node.h
  projects/libprocstat/sys/net80211/ieee80211_sta.c
  projects/libprocstat/sys/net80211/ieee80211_var.h
  projects/libprocstat/sys/net80211/ieee80211_wds.c
  projects/libprocstat/sys/netatalk/aarp.c
  projects/libprocstat/sys/netatalk/at_control.c
  projects/libprocstat/sys/netatalk/at_var.h
  projects/libprocstat/sys/netatalk/ddp_input.c
  projects/libprocstat/sys/netatalk/ddp_output.c
  projects/libprocstat/sys/netatalk/ddp_pcb.c
  projects/libprocstat/sys/netatalk/ddp_usrreq.c
  projects/libprocstat/sys/netgraph/ng_eiface.c
  projects/libprocstat/sys/netgraph/ng_ether.c
  projects/libprocstat/sys/netgraph/ng_iface.c
  projects/libprocstat/sys/netgraph/ng_ksocket.c
  projects/libprocstat/sys/netinet/if_ether.c
  projects/libprocstat/sys/netinet/in.c
  projects/libprocstat/sys/netinet/in_gif.c
  projects/libprocstat/sys/netinet/in_mcast.c
  projects/libprocstat/sys/netinet/in_pcb.c
  projects/libprocstat/sys/netinet/in_var.h
  projects/libprocstat/sys/netinet/ip_carp.c
  projects/libprocstat/sys/netinet/ip_divert.c
  projects/libprocstat/sys/netinet/ip_dummynet.h
  projects/libprocstat/sys/netinet/ip_icmp.c
  projects/libprocstat/sys/netinet/ip_input.c
  projects/libprocstat/sys/netinet/ipfw/ip_dummynet.c   (contents, props changed)
  projects/libprocstat/sys/netinet/ipfw/ip_fw2.c   (contents, props changed)
  projects/libprocstat/sys/netinet/ipfw/ip_fw_nat.c
  projects/libprocstat/sys/netinet/ipfw/ip_fw_pfil.c   (props changed)
  projects/libprocstat/sys/netinet/raw_ip.c
  projects/libprocstat/sys/netinet6/in6.c
  projects/libprocstat/sys/netinet6/in6_ifattach.c
  projects/libprocstat/sys/netinet6/in6_pcb.c
  projects/libprocstat/sys/netinet6/in6_src.c
  projects/libprocstat/sys/netinet6/in6_var.h
  projects/libprocstat/sys/netinet6/ip6_input.c
  projects/libprocstat/sys/netinet6/nd6.c
  projects/libprocstat/sys/netinet6/nd6_rtr.c
  projects/libprocstat/sys/netinet6/vinet6.h
  projects/libprocstat/sys/netipsec/key.c
  projects/libprocstat/sys/netipx/ipx.c
  projects/libprocstat/sys/netipx/ipx_if.h
  projects/libprocstat/sys/netipx/ipx_input.c
  projects/libprocstat/sys/netipx/ipx_outputfl.c
  projects/libprocstat/sys/netipx/ipx_pcb.c
  projects/libprocstat/sys/nfs/nfs_common.c
  projects/libprocstat/sys/nfs/nfs_nfssvc.c
  projects/libprocstat/sys/nfsclient/bootp_subr.c
  projects/libprocstat/sys/nfsclient/krpc_subr.c
  projects/libprocstat/sys/nfsclient/nfs.h
  projects/libprocstat/sys/nfsclient/nfs_bio.c
  projects/libprocstat/sys/nfsclient/nfs_diskless.c
  projects/libprocstat/sys/nfsclient/nfs_krpc.c
  projects/libprocstat/sys/nfsclient/nfs_lock.c
  projects/libprocstat/sys/nfsclient/nfs_nfsiod.c
  projects/libprocstat/sys/nfsclient/nfs_node.c
  projects/libprocstat/sys/nfsclient/nfs_subs.c
  projects/libprocstat/sys/nfsclient/nfs_vfsops.c
  projects/libprocstat/sys/nfsclient/nfs_vnops.c
  projects/libprocstat/sys/nfsclient/nfsm_subs.h
  projects/libprocstat/sys/nfsclient/nfsmount.h
  projects/libprocstat/sys/nfsserver/nfs.h
  projects/libprocstat/sys/nfsserver/nfs_fha.c
  projects/libprocstat/sys/nfsserver/nfs_serv.c
  projects/libprocstat/sys/nfsserver/nfs_srvkrpc.c
  projects/libprocstat/sys/nfsserver/nfs_srvsubs.c
  projects/libprocstat/sys/nfsserver/nfsrvcache.h
  projects/libprocstat/sys/pc98/conf/GENERIC
  projects/libprocstat/sys/pci/if_rl.c
  projects/libprocstat/sys/powerpc/conf/GENERIC
  projects/libprocstat/sys/powerpc/conf/MPC85XX
  projects/libprocstat/sys/powerpc/include/param.h
  projects/libprocstat/sys/powerpc/powerpc/mp_machdep.c
  projects/libprocstat/sys/rpc/clnt_dg.c
  projects/libprocstat/sys/rpc/clnt_rc.c
  projects/libprocstat/sys/rpc/rpcsec_gss/rpcsec_gss.c
  projects/libprocstat/sys/security/audit/audit.c
  projects/libprocstat/sys/security/audit/audit.h
  projects/libprocstat/sys/security/audit/audit_arg.c
  projects/libprocstat/sys/security/audit/audit_bsm.c
  projects/libprocstat/sys/security/audit/audit_private.h
  projects/libprocstat/sys/security/audit/audit_syscalls.c
  projects/libprocstat/sys/sparc64/conf/GENERIC
  projects/libprocstat/sys/sparc64/include/param.h
  projects/libprocstat/sys/sparc64/include/pmap.h
  projects/libprocstat/sys/sparc64/sparc64/machdep.c
  projects/libprocstat/sys/sparc64/sparc64/pmap.c
  projects/libprocstat/sys/sun4v/conf/GENERIC
  projects/libprocstat/sys/sun4v/include/param.h
  projects/libprocstat/sys/sun4v/sun4v/pmap.c
  projects/libprocstat/sys/sys/acl.h
  projects/libprocstat/sys/sys/ata.h
  projects/libprocstat/sys/sys/conf.h
  projects/libprocstat/sys/sys/cpuctl.h
  projects/libprocstat/sys/sys/disk.h
  projects/libprocstat/sys/sys/event.h
  projects/libprocstat/sys/sys/filio.h
  projects/libprocstat/sys/sys/ipc.h
  projects/libprocstat/sys/sys/mount.h
  projects/libprocstat/sys/sys/msg.h
  projects/libprocstat/sys/sys/param.h
  projects/libprocstat/sys/sys/priv.h
  projects/libprocstat/sys/sys/sched.h
  projects/libprocstat/sys/sys/sem.h
  projects/libprocstat/sys/sys/shm.h
  projects/libprocstat/sys/sys/socketvar.h
  projects/libprocstat/sys/sys/syscall.h
  projects/libprocstat/sys/sys/syscall.mk
  projects/libprocstat/sys/sys/sysctl.h
  projects/libprocstat/sys/sys/sysproto.h
  projects/libprocstat/sys/sys/uio.h
  projects/libprocstat/sys/sys/unistd.h
  projects/libprocstat/sys/sys/vnode.h
  projects/libprocstat/sys/tools/sound/feeder_rate_mkfilter.awk
  projects/libprocstat/sys/ufs/ffs/ffs_softdep.c
  projects/libprocstat/sys/ufs/ffs/ffs_vnops.c
  projects/libprocstat/sys/ufs/ufs/ufs_dirhash.c
  projects/libprocstat/sys/ufs/ufs/ufs_vnops.c
  projects/libprocstat/sys/vm/vm.h
  projects/libprocstat/sys/vm/vm_contig.c
  projects/libprocstat/sys/vm/vm_extern.h
  projects/libprocstat/sys/vm/vm_fault.c
  projects/libprocstat/sys/vm/vm_map.c
  projects/libprocstat/sys/vm/vm_object.c
  projects/libprocstat/sys/vm/vm_phys.c
  projects/libprocstat/sys/vm/vm_phys.h
  projects/libprocstat/sys/vm/vnode_pager.c
  projects/libprocstat/usr.bin/fstat/   (props changed)
  projects/libprocstat/usr.bin/fstat/fstat.c

Modified: projects/libprocstat/lib/Makefile
==============================================================================

--- projects/libprocstat/lib/Makefile	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/Makefile	Wed Jul  8 14:17:03 2009	(r195455)
@@ -35,8 +35,8 @@ SUBDIR=	${_csu} libc libbsm libauditd li
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
 	${_libgssapi} ${_librpcsec_gss} libipsec \
-	${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
-	${_libncp} ${_libngatm} libopie libpam libpcap \
+	${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
+	${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
 	${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
 	${_libsmdb} \
 	${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \

Modified: projects/libprocstat/lib/libc/gen/Symbol.map
==============================================================================
--- projects/libprocstat/lib/libc/gen/Symbol.map	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/gen/Symbol.map	Wed Jul  8 14:17:03 2009	(r195455)
@@ -247,7 +247,6 @@ FBSD_1.0 {
 	sem_timedwait;
 	sem_post;
 	sem_getvalue;
-	semctl;
 	setdomainname;
 	sethostname;
 	longjmperror;
@@ -362,6 +361,7 @@ FBSD_1.1 {
 	posix_spawnattr_setsigdefault;
 	posix_spawnattr_setsigmask;
 	posix_spawnp;
+	semctl;
 	tcgetsid;
 	tcsetsid;
 };

Modified: projects/libprocstat/lib/libc/gen/msgctl.3
==============================================================================
--- projects/libprocstat/lib/libc/gen/msgctl.3	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/gen/msgctl.3	Wed Jul  8 14:17:03 2009	(r195455)
@@ -71,12 +71,8 @@ struct msqid_ds {
 	pid_t	msg_lspid;	/* pid of last msgsnd() */
 	pid_t	msg_lrpid;	/* pid of last msgrcv() */
 	time_t	msg_stime;	/* time of last msgsnd() */
-	long	msg_pad1;
 	time_t	msg_rtime;	/* time of last msgrcv() */
-	long	msg_pad2;
 	time_t	msg_ctime;	/* time of last msgctl() */
-	long	msg_pad3;
-	long	msg_pad4[4];
 };
 .Ed
 .Pp
@@ -89,11 +85,11 @@ structure is defined in
 and looks like this:
 .Bd -literal
 struct ipc_perm {
-	unsigned short	cuid;	/* creator user id */
-	unsigned short	cgid;	/* creator group id */
-	unsigned short	uid;	/* user id */
-	unsigned short	gid;	/* group id */
-	unsigned short	mode;	/* r/w permission */
+	uid_t		cuid;	/* creator user id */
+	gid_t		cgid;	/* creator group id */
+	uid_t		uid;	/* user id */
+	gid_t		gid;	/* group id */
+	mode_t		mode;	/* r/w permission */
 	unsigned short	seq;	/* sequence # (to generate unique ipcid) */
 	key_t		key;	/* user specified msg/sem/shm key */
 };

Modified: projects/libprocstat/lib/libc/gen/semctl.c
==============================================================================
--- projects/libprocstat/lib/libc/gen/semctl.c	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/gen/semctl.c	Wed Jul  8 14:17:03 2009	(r195455)
@@ -29,15 +29,19 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#define _WANT_SEMUN_OLD
+
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
-extern int __semctl(int semid, int semnum, int cmd, union semun *arg);
+int	__semctl(int semid, int semnum, int cmd, union semun *arg);
+int	freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg);
 
-int semctl(int semid, int semnum, int cmd, ...)
+int
+semctl(int semid, int semnum, int cmd, ...)
 {
 	va_list ap;
 	union semun semun;
@@ -55,3 +59,25 @@ int semctl(int semid, int semnum, int cm
 
 	return (__semctl(semid, semnum, cmd, semun_ptr));
 }
+
+int
+freebsd7_semctl(int semid, int semnum, int cmd, ...)
+{
+	va_list ap;
+	union semun_old semun;
+	union semun_old *semun_ptr;
+
+	va_start(ap, cmd);
+	if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL
+	    || cmd == SETVAL || cmd == SETALL) {
+		semun = va_arg(ap, union semun_old);
+		semun_ptr = &semun;
+	} else {
+		semun_ptr = NULL;
+	}
+	va_end(ap);
+
+	return (freebsd7___semctl(semid, semnum, cmd, semun_ptr));
+}
+
+__sym_compat(semctl, freebsd7_semctl, FBSD_1.0);

Copied: projects/libprocstat/lib/libc/include/compat.h (from r195447, head/lib/libc/include/compat.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/libprocstat/lib/libc/include/compat.h	Wed Jul  8 14:17:03 2009	(r195455, copy of r195447, head/lib/libc/include/compat.h)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2009 Advanced Computing Technologies LLC
+ * Written by: John H. Baldwin <jhb at FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE 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$
+ */
+
+/*
+ * This file defines compatiblity symbol versions for old system calls.  It
+ * is included in all generated system call files.
+ */
+
+#ifndef __LIBC_COMPAT_H__
+#define	__LIBC_COMPAT_H__
+
+#define	__sym_compat(sym,impl,verid)	\
+	.symver impl , sym @ verid
+
+__sym_compat(__semctl, freebsd7___semctl, FBSD_1.0);
+__sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0);
+__sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0);
+
+#undef __sym_compat
+
+#endif	/* __LIBC_COMPAT_H__ */
+

Modified: projects/libprocstat/lib/libc/posix1e/Makefile.inc
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/Makefile.inc	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/Makefile.inc	Wed Jul  8 14:17:03 2009	(r195455)
@@ -4,52 +4,74 @@
 
 CFLAGS+=-D_ACL_PRIVATE
 
-SRCS+=	acl_calc_mask.c			\
+# Copy kern/subr_acl_nfs4.c to the libc object directory.
+subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c
+	cat ${.ALLSRC} > ${.TARGET}
+
+SRCS+=	acl_branding.c			\
+	acl_calc_mask.c			\
 	acl_copy.c			\
 	acl_compat.c			\
 	acl_delete.c			\
 	acl_delete_entry.c		\
 	acl_entry.c			\
+	acl_flag.c			\
 	acl_free.c			\
 	acl_from_text.c			\
+	acl_from_text_nfs4.c		\
 	acl_get.c			\
 	acl_init.c			\
 	acl_perm.c			\
 	acl_set.c			\
+	acl_strip.c			\
 	acl_support.c			\
+	acl_support_nfs4.c		\
 	acl_to_text.c			\
+	acl_to_text_nfs4.c		\
 	acl_valid.c			\
 	extattr.c			\
 	mac.c				\
 	mac_exec.c			\
 	mac_get.c			\
-	mac_set.c
+	mac_set.c			\
+	subr_acl_nfs4.c
 
 SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
 
 MAN+=	acl.3				\
+	acl_add_flag_np.3		\
 	acl_add_perm.3			\
 	acl_calc_mask.3			\
+	acl_clear_flags_np.3		\
 	acl_clear_perms.3		\
 	acl_copy_entry.3		\
 	acl_create_entry.3		\
 	acl_delete.3			\
 	acl_delete_entry.3		\
+	acl_delete_flag_np.3		\
 	acl_delete_perm.3		\
 	acl_dup.3			\
 	acl_free.3			\
 	acl_from_text.3			\
 	acl_get.3			\
+	acl_get_brand_np.3		\
 	acl_get_entry.3			\
+	acl_get_entry_type_np.3		\
+	acl_get_flagset_np.3		\
+	acl_get_flag_np.3		\
 	acl_get_permset.3		\
 	acl_get_perm_np.3		\
 	acl_get_qualifier.3		\
 	acl_get_tag_type.3		\
 	acl_init.3			\
+	acl_is_trivial_np.3		\
 	acl_set.3			\
+	acl_set_entry_type_np.3		\
+	acl_set_flagset_np.3		\
 	acl_set_permset.3		\
 	acl_set_qualifier.3		\
 	acl_set_tag_type.3		\
+	acl_strip_np.3			\
 	acl_to_text.3			\
 	acl_valid.3			\
 	extattr.3			\
@@ -63,15 +85,18 @@ MAN+=	acl.3				\
 	mac_text.3			\
 	posix1e.3
 
-MLINKS+=acl_delete.3 acl_delete_def_file.3	\
+MLINKS+=acl_create_entry.3 acl_create_entry_np.3\
+	acl_delete.3 acl_delete_def_file.3	\
 	acl_delete.3 acl_delete_file_np.3	\
 	acl_delete.3 acl_delete_fd_np.3		\
+	acl_delete_entry.3 acl_delete_entry_np.3\
 	acl_get.3 acl_get_file.3		\
 	acl_get.3 acl_get_fd.3			\
 	acl_get.3 acl_get_fd_np.3		\
 	acl_set.3 acl_set_file.3		\
 	acl_set.3 acl_set_fd.3			\
 	acl_set.3 acl_set_fd_np.3		\
+	acl_to_text.3 acl_to_text_np.3		\
 	acl_valid.3 acl_valid_file_np.3		\
 	acl_valid.3 acl_valid_fd_np.3		\
 	extattr.3 extattr_namespace_to_string.3	\

Modified: projects/libprocstat/lib/libc/posix1e/Symbol.map
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/Symbol.map	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/Symbol.map	Wed Jul  8 14:17:03 2009	(r195455)
@@ -66,7 +66,21 @@ FBSD_1.0 {
 };
 
 FBSD_1.1 {
+	acl_add_flag_np;
 	acl_add_perm;
+	acl_clear_flags_np;
+	acl_create_entry_np;
+	acl_delete_entry_np;
+	acl_delete_flag_np;
 	acl_delete_perm;
+	acl_get_brand_np;
+	acl_get_entry_type_np;
+	acl_get_flag_np;
+	acl_get_flagset_np;
 	acl_get_perm_np;
+	acl_is_trivial_np;
+	acl_set_entry_type_np;
+	acl_set_flagset_np;
+	acl_strip_np;
+	acl_to_text_np;
 };

Modified: projects/libprocstat/lib/libc/posix1e/acl.3
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/acl.3	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/acl.3	Wed Jul  8 14:17:03 2009	(r195455)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 18, 2002
+.Dd June 25, 2009
 .Dt ACL 3
 .Os
 .Sh NAME
@@ -59,6 +59,10 @@ all of these support routines are implem
 .Pp
 Available functions, sorted by behavior, include:
 .Bl -tag -width indent
+.It Fn acl_add_flag_np
+This function is described in
+.Xr acl_add_flag_np 3 ,
+and may be used to add flags to a flagset.
 .It Fn acl_add_perm
 This function is described in
 .Xr acl_add_perm 3 ,
@@ -70,6 +74,10 @@ and may be used to calculate and set the
 the
 .Dv ACL_MASK
 entry.
+.It Fn acl_clear_flags_np
+This function is described in
+.Xr acl_clear_flags_np 3 ,
+and may be used to clear all flags from a flagset.
 .It Fn acl_clear_perms
 This function is described in
 .Xr acl_clear_perms 3 ,
@@ -78,8 +86,11 @@ and may be used to clear all permissions
 This function is described in
 .Xr acl_copy_entry 3 ,
 and may be used to copy the contents of an ACL entry.
-.It Fn acl_create_entry
-This function is described in
+.It Xo
+.Fn acl_create_entry ,
+.Fn acl_create_entry_np
+.Xc
+These functions are described in
 .Xr acl_create_entry 3 ,
 and may be used to create an empty entry in an ACL.
 .It Xo
@@ -92,10 +103,17 @@ and may be used to create an empty entry
 These functions are described in
 .Xr acl_delete 3 ,
 and may be used to delete ACLs from file system objects.
-.It Fn acl_delete_entry
-This function is described in
+.It Xo
+.Fn acl_delete_entry ,
+.Fn acl_delete_entry_np ,
+.Xc
+This functions are described in
 .Xr acl_delete_entry 3 ,
 and may be used to delete an entry from an ACL.
+.It Fn acl_delete_flag_np
+This function is described in
+.Xr acl_delete_flag_np 3 ,
+and may be used to delete flags from a flagset.
 .It Fn acl_delete_perm
 This function is described in
 .Xr acl_delete_perm 3 ,
@@ -112,7 +130,7 @@ and may be used to free userland working
 This function is described in
 .Xr acl_from_text 3 ,
 and may be used to convert a text-form ACL into working ACL state, if
-the ACL has POSIX.1e semantics.
+the ACL has POSIX.1e or NFSv4 semantics.
 .It Fn acl_get_entry
 This function is described in
 .Xr acl_get_entry 3 ,
@@ -126,6 +144,14 @@ and may be used to retrieve a designated
 These functions are described in
 .Xr acl_get 3 ,
 and may be used to retrieve ACLs from file system objects.
+.It Fn acl_get_entry_type_np
+This function is described in
+.Xr acl_get_entry_type_np 3 ,
+and may be used to retrieve an ACL type from an ACL entry.
+.It Fn acl_get_flagset_np
+This function is described in
+.Xr acl_get_flagset_np 3 ,
+and may be used to retrieve a flagset from an ACL entry.
 .It Fn acl_get_permset
 This function is described in
 .Xr acl_get_permset 3 ,
@@ -142,6 +168,10 @@ and may be used to retrieve the tag type
 This function is described in
 .Xr acl_init 3 ,
 and may be used to allocate a fresh (empty) ACL structure.
+.It Fn acl_is_trivial_np
+This function is described in
+.Xr acl_is_trivial_np 3 ,
+and may be used to find out whether ACL is trivial.
 .It Xo
 .Fn acl_set_fd ,
 .Fn acl_set_fd_np ,
@@ -151,6 +181,14 @@ and may be used to allocate a fresh (emp
 These functions are described in
 .Xr acl_set 3 ,
 and may be used to assign an ACL to a file system object.
+.It Fn acl_set_entry_type_np
+This function is described in
+.Xr acl_set_entry_type_np 3 ,
+and may be used to set the ACL type of an ACL entry.
+.It Fn acl_set_flagset_np
+This function is described in
+.Xr acl_set_flagset_np 3 ,
+and may be used to set the flags of an ACL entry from a flagset.
 .It Fn acl_set_permset
 This function is described in
 .Xr acl_set_permset 3 ,
@@ -163,10 +201,17 @@ and may be used to set the qualifier of 
 This function is described in
 .Xr acl_set_tag_type 3 ,
 and may be used to set the tag type of an ACL.
-.It Fn acl_to_text
-This function is described in
+.It Fn acl_strip_np
+This function is describe din
+.Xr acl-strip_np 3 ,
+and may be used to remove extended entries from an ACL.
+.It Xo
+.Fn acl_to_text ,
+.Fn acl_to_text_np
+.Xc
+These functions are described in
 .Xr acl_to_text 3 ,
-and may be used to generate a text-form of a POSIX.1e semantics ACL.
+and may be used to generate a text-form of a POSIX.1e or NFSv4 semantics ACL.
 .It Xo
 .Fn acl_valid ,
 .Fn acl_valid_fd_np ,
@@ -189,25 +234,34 @@ library.
 .Sh SEE ALSO
 .Xr getfacl 1 ,
 .Xr setfacl 1 ,
+.Xr acl_add_flag_np 3 ,
 .Xr acl_add_perm 3 ,
 .Xr acl_calc_mask 3 ,
+.Xr acl_clear_flags_np 3 ,
 .Xr acl_clear_perms 3 ,
 .Xr acl_copy_entry 3 ,
 .Xr acl_create_entry 3 ,
 .Xr acl_delete_entry 3 ,
+.Xr acl_delete_flag_np 3 ,
 .Xr acl_delete_perm 3 ,
 .Xr acl_dup 3 ,
 .Xr acl_free 3 ,
 .Xr acl_from_text 3 ,
 .Xr acl_get 3 ,
+.Xr acl_get_entry_type_np 3 ,
+.Xr acl_get_flagset_np 3 ,
 .Xr acl_get_permset 3 ,
 .Xr acl_get_qualifier 3 ,
 .Xr acl_get_tag_type 3 ,
 .Xr acl_init 3 ,
+.Xr acl_is_trivial_np 3 ,
 .Xr acl_set 3 ,
+.Xr acl_set_entry_type_np 3 ,
+.Xr acl_set_flagset_np 3 ,
 .Xr acl_set_permset 3 ,
 .Xr acl_set_qualifier 3 ,
 .Xr acl_set_tag_type 3 ,
+.Xr acl_strip_np 3 ,
 .Xr acl_to_text 3 ,
 .Xr acl_valid 3 ,
 .Xr posix1e 3 ,

Copied: projects/libprocstat/lib/libc/posix1e/acl_add_flag_np.3 (from r195447, head/lib/libc/posix1e/acl_add_flag_np.3)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/libprocstat/lib/libc/posix1e/acl_add_flag_np.3	Wed Jul  8 14:17:03 2009	(r195455, copy of r195447, head/lib/libc/posix1e/acl_add_flag_np.3)
@@ -0,0 +1,98 @@
+.\"-
+.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE 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 THE VOICES IN HIS HEAD 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 June 25, 2009
+.Dt ACL_ADD_FLAG_NP 3
+.Os
+.Sh NAME
+.Nm acl_add_flag_np
+.Nd add flags to a flagset 
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/types.h
+.In sys/acl.h
+.Ft int
+.Fn acl_add_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
+.Sh DESCRIPTION
+The
+.Fn acl_add_flag_np
+function
+is a non-portable call that adds the flags contained in
+.Fa flags
+to the flagset
+.Fa flagset_d .
+.Pp
+Note: it is not considered an error to attempt to add flags
+that already exist in the flagset.
+.Pp
+Valid values are:
+.Pp
+.Bl -column -offset 3n "ACL_ENTRY_NO_PROPAGATE_INHERIT"
+.It ACL_ENTRY_FILE_INHERIT		Will be inherited by files.
+.It ACL_ENTRY_DIRECTORY_INHERIT	Will be inherited by directories.
+.It ACL_ENTRY_NO_PROPAGATE_INHERIT	Will not propagate.
+.It ACL_ENTRY_INHERIT_ONLY		Inherit-only.
+.El
+.Sh RETURN VALUES
+.Rv -std acl_add_flag_np
+.Sh ERRORS
+The
+.Fn acl_add_flag_np
+function fails if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+Argument
+.Fa flagset_d
+is not a valid descriptor for a flagset within an ACL entry.
+Argument
+.Fa flag
+does not contain a valid
+.Vt acl_flag_t
+value.
+.El
+.Sh SEE ALSO
+.Xr acl 3 ,
+.Xr acl_clear_flags_np 3 ,
+.Xr acl_delete_flag_np 3 ,
+.Xr acl_get_flagset_np 3 ,
+.Xr acl_set_flagset_np 3 ,
+.Xr posix1e 3
+.Sh STANDARDS
+POSIX.1e is described in IEEE POSIX.1e draft 17.
+.Sh HISTORY
+POSIX.1e support was introduced in
+.Fx 4.0 .
+The
+.Fn acl_add_flag_np
+function was added in
+.Fx 8.0 .
+.Sh AUTHORS
+The
+.Fn acl_add_flag_np
+function was written by
+.An Edward Tomasz Napierala Aq trasz at FreeBSD.org .

Modified: projects/libprocstat/lib/libc/posix1e/acl_add_perm.3
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/acl_add_perm.3	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/acl_add_perm.3	Wed Jul  8 14:17:03 2009	(r195455)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 10, 2001
+.Dd June 25, 2009
 .Dt ACL_ADD_PERM 3
 .Os
 .Sh NAME
@@ -52,11 +52,43 @@ that already exist in the permission set
 .Pp
 For POSIX.1e ACLs, valid values are:
 .Pp
-.Bl -column -offset 3n "ACL_EXECUTE"
+.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
 .It ACL_EXECUTE	Execute permission
 .It ACL_WRITE	Write permission
 .It ACL_READ	Read permission
 .El
+.Pp
+For NFSv4 ACLs, valid values are:
+.Pp
+.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
+.It ACL_READ_DATA		Read permission
+.It ACL_LIST_DIRECTORY		Same as ACL_READ_DATA
+.It ACL_WRITE_DATA		Write permission, or permission to create files
+.It ACL_ADD_FILE		Same as ACL_READ_DATA
+.It ACL_APPEND_DATA		Permission to create directories.  Ignored for files
+.It ACL_ADD_SUBDIRECTORY	Same as ACL_APPEND_DATA
+.It ACL_READ_NAMED_ATTRS	Ignored
+.It ACL_WRITE_NAMED_ATTRS	Ignored
+.It ACL_EXECUTE			Execute permission
+.It ACL_DELETE_CHILD		Permission to delete files and subdirectories
+.It ACL_READ_ATTRIBUTES		Permission to read basic attributes
+.It ACL_WRITE_ATTRIBUTES	Permission to change basic attributes
+.It ACL_DELETE			Permission to delete the object this ACL is placed on
+.It ACL_READ_ACL		Permission to read ACL
+.It ACL_WRITE_ACL		Permission to change the ACL and file mode
+.It ACL_SYNCHRONIZE		Ignored
+.El
+.Pp
+Calling
+.Fn acl_add_perm
+with
+.Fa perm
+equal to ACL_WRITE or ACL_READ brands the ACL as POSIX.
+Calling it with ACL_READ_DATA, ACL_LIST_DIRECTORY, ACL_WRITE_DATA,
+ACL_ADD_FILE, ACL_APPEND_DATA, ACL_ADD_SUBDIRECTORY, ACL_READ_NAMED_ATTRS,
+ACL_WRITE_NAMED_ATTRS, ACL_DELETE_CHILD, ACL_READ_ATTRIBUTES,
+ACL_WRITE_ATTRIBUTES, ACL_DELETE, ACL_READ_ACL, ACL_WRITE_ACL
+or ACL_SYNCHRONIZE brands the ACL as NFSv4.
 .Sh RETURN VALUES
 .Rv -std acl_add_perm
 .Sh ERRORS
@@ -73,11 +105,13 @@ Argument
 does not contain a valid
 .Vt acl_perm_t
 value.
+ACL is already branded differently.
 .El
 .Sh SEE ALSO
 .Xr acl 3 ,
 .Xr acl_clear_perms 3 ,
 .Xr acl_delete_perm 3 ,
+.Xr acl_get_brand_np 3 ,
 .Xr acl_get_permset 3 ,
 .Xr acl_set_permset 3 ,
 .Xr posix1e 3

Copied: projects/libprocstat/lib/libc/posix1e/acl_branding.c (from r195447, head/lib/libc/posix1e/acl_branding.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/libprocstat/lib/libc/posix1e/acl_branding.c	Wed Jul  8 14:17:03 2009	(r195455, copy of r195447, head/lib/libc/posix1e/acl_branding.c)
@@ -0,0 +1,166 @@
+/*-
+ * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz at FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <errno.h>
+#include <sys/acl.h>
+
+#include "acl_support.h"
+
+/*
+ * An ugly detail of the implementation - fortunately not visible
+ * to the API users - is the "branding": libc needs to keep track
+ * of what "brand" ACL is: NFSv4, POSIX.1e or unknown.  It happens
+ * automatically - for example, during acl_get_file(3) ACL gets
+ * branded according to the "type" argument; during acl_set_permset
+ * ACL, if its brand is unknown it gets branded as NFSv4 if any of the
+ * NFSv4 permissions that are not valid for POSIX.1e ACL are set etc.
+ * Branding information is used for printing out the ACL (acl_to_text(3)),
+ * veryfying acl_set_whatever arguments (checking against setting
+ * bits that are valid only for NFSv4 in ACL branded as POSIX.1e) etc.
+ */
+
+static acl_t
+entry2acl(acl_entry_t entry)
+{
+	acl_t aclp;
+
+	aclp = (acl_t)(((long)entry >> _ACL_T_ALIGNMENT_BITS) << _ACL_T_ALIGNMENT_BITS);
+
+	return (aclp);
+}
+
+/*
+ * Return brand of an ACL.
+ */
+int
+_acl_brand(const acl_t acl)
+{
+
+	return (acl->ats_brand);
+}
+
+int
+_entry_brand(const acl_entry_t entry)
+{
+
+	return (_acl_brand(entry2acl(entry)));
+}
+
+/*
+ * Return 1, iff branding ACL as "brand" is ok.
+ */
+int
+_acl_brand_may_be(const acl_t acl, int brand)
+{
+
+	if (_acl_brand(acl) == ACL_BRAND_UNKNOWN)
+		return (1);
+
+	if (_acl_brand(acl) == brand)
+		return (1);
+
+	return (0);
+}
+
+int
+_entry_brand_may_be(const acl_entry_t entry, int brand)
+{
+
+	return (_acl_brand_may_be(entry2acl(entry), brand));
+}
+
+/*
+ * Brand ACL as "brand".
+ */
+void
+_acl_brand_as(acl_t acl, int brand)
+{
+
+	assert(_acl_brand_may_be(acl, brand));
+
+	acl->ats_brand = brand;
+}
+
+void
+_entry_brand_as(const acl_entry_t entry, int brand)
+{
+
+	_acl_brand_as(entry2acl(entry), brand);
+}
+
+int
+_acl_type_not_valid_for_acl(const acl_t acl, acl_type_t type)
+{
+
+	switch (_acl_brand(acl)) {
+	case ACL_BRAND_NFS4:
+		if (type == ACL_TYPE_NFS4)
+			return (0);
+		break;
+
+	case ACL_BRAND_POSIX:
+		if (type == ACL_TYPE_ACCESS || type == ACL_TYPE_DEFAULT)
+			return (0);
+		break;
+	}
+
+	return (-1);
+}
+
+void
+_acl_brand_from_type(acl_t acl, acl_type_t type)
+{
+
+	switch (type) {
+	case ACL_TYPE_NFS4:
+		_acl_brand_as(acl, ACL_BRAND_NFS4);
+		break;
+	case ACL_TYPE_ACCESS:
+	case ACL_TYPE_DEFAULT:
+		_acl_brand_as(acl, ACL_BRAND_POSIX);
+		break;
+	default:
+		/* XXX: What to do here? */
+		break;
+	}
+}
+
+int
+acl_get_brand_np(acl_t acl, int *brand_p)
+{
+
+	if (acl == NULL || brand_p == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+	*brand_p = _acl_brand(acl);
+
+	return (0);
+}

Modified: projects/libprocstat/lib/libc/posix1e/acl_calc_mask.c
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/acl_calc_mask.c	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/acl_calc_mask.c	Wed Jul  8 14:17:03 2009	(r195455)
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <stdio.h>
 
+#include "acl_support.h"
+
 /*
  * acl_calc_mask() (23.4.2): calculate and set the permissions
  * associated with the ACL_MASK ACL entry.  If the ACL already
@@ -48,6 +50,12 @@ acl_calc_mask(acl_t *acl_p)
 	acl_t		acl_new;
 	int		i, mask_mode, mask_num;
 
+	if (!_acl_brand_may_be(*acl_p, ACL_BRAND_POSIX)) {
+		errno = EINVAL;
+		return (-1);
+	}
+	_acl_brand_as(*acl_p, ACL_BRAND_POSIX);
+
 	/*
 	 * (23.4.2.4) requires acl_p to point to a pointer to a valid ACL.
 	 * Since one of the primary reasons to use this function would be

Copied: projects/libprocstat/lib/libc/posix1e/acl_clear_flags_np.3 (from r195447, head/lib/libc/posix1e/acl_clear_flags_np.3)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/libprocstat/lib/libc/posix1e/acl_clear_flags_np.3	Wed Jul  8 14:17:03 2009	(r195455, copy of r195447, head/lib/libc/posix1e/acl_clear_flags_np.3)
@@ -0,0 +1,79 @@
+.\"-
+.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE 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 THE VOICES IN HIS HEAD 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 June 25, 2009
+.Dt ACL_CLEAR_FLAGS_NP 3
+.Os
+.Sh NAME
+.Nm acl_clear_flags_np
+.Nd clear flags from a flagset
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/types.h
+.In sys/acl.h
+.Ft int
+.Fn acl_clear_flags_np "acl_flagset_t flagset_d"
+.Sh DESCRIPTION
+The
+.Fn acl_clear_flags_np
+function
+is a non-portable call that clears all flags from flagset
+.Fa flagset_d .
+.Sh RETURN VALUES
+.Rv -std acl_clear_flags_np
+.Sh ERRORS
+The
+.Fn acl_clear_flags_np
+function fails if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+Argument
+.Fa flagset_d
+is not a valid descriptor for a flagset.
+.El
+.Sh SEE ALSO
+.Xr acl 3 ,
+.Xr acl_add_flag_np 3 ,
+.Xr acl_delete_flag_np 3 ,
+.Xr acl_get_flagset_np 3 ,
+.Xr acl_set_flagset_np 3 ,
+.Xr posix1e 3
+.Sh STANDARDS
+POSIX.1e is described in IEEE POSIX.1e draft 17.
+.Sh HISTORY
+POSIX.1e support was introduced in
+.Fx 4.0 .
+The
+.Fn acl_clear_flags_np
+function was added in
+.Fx 5.0 .
+.Sh AUTHORS
+The
+.Fn acl_clear_flags_np
+function was written by
+.An Edward Tomasz Napierala Aq trasz at FreeBSD.org .

Modified: projects/libprocstat/lib/libc/posix1e/acl_copy.c
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/acl_copy.c	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/acl_copy.c	Wed Jul  8 14:17:03 2009	(r195455)
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <string.h>
 
+#include "acl_support.h"
+
 /*
  * acl_copy_entry() (23.4.4): copy the contents of ACL entry src_d to
  * ACL entry dest_d
@@ -48,9 +50,21 @@ acl_copy_entry(acl_entry_t dest_d, acl_e
 		return (-1);
 	}
 
-	dest_d->ae_tag  = src_d->ae_tag;
-	dest_d->ae_id   = src_d->ae_id;
+	/*
+	 * Can we brand the new entry the same as the source entry?
+	 */
+	if (!_entry_brand_may_be(dest_d, _entry_brand(src_d))) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	_entry_brand_as(dest_d, _entry_brand(src_d));
+
+	dest_d->ae_tag = src_d->ae_tag;
+	dest_d->ae_id = src_d->ae_id;
 	dest_d->ae_perm = src_d->ae_perm;
+	dest_d->ae_entry_type = src_d->ae_entry_type;
+	dest_d->ae_flags = src_d->ae_flags;
 
 	return (0);
 }

Modified: projects/libprocstat/lib/libc/posix1e/acl_create_entry.3
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/acl_create_entry.3	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/acl_create_entry.3	Wed Jul  8 14:17:03 2009	(r195455)
@@ -25,11 +25,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 16, 2001
+.Dd June 25, 2009
 .Dt ACL_CREATE_ENTRY 3
 .Os
 .Sh NAME
 .Nm acl_create_entry
+.Nm acl_create_entry_np
 .Nd create a new ACL entry
 .Sh LIBRARY
 .Lb libc
@@ -38,6 +39,8 @@
 .In sys/acl.h
 .Ft int
 .Fn acl_create_entry "acl_t *acl_p" "acl_entry_t *entry_p"
+.Ft int 
+.Fn acl_create_entry_np "acl_t *acl_p" "acl_entry_t *entry_p" "int index"
 .Sh DESCRIPTION
 The
 .Fn acl_create_entry
@@ -45,6 +48,16 @@ function
 is a POSIX.1e call that creates a new ACL entry in the ACL
 pointed to by
 .Fa acl_p .
+The
+.Fn acl_create_entry_np
+function is a non-portable version that creates the ACL entry
+at position
+.Fa index .
+Positions are numbered starting from zero, i.e. calling
+.Fn acl_create_entry_np
+with
+.Fa index
+argument equal to zero will prepend the entry to the ACL.
 .Sh RETURN VALUES
 .Rv -std acl_create_entry
 .Sh ERRORS
@@ -56,6 +69,9 @@ function fails if:
 Argument
 .Fa acl_p
 does not point to a pointer to a valid ACL.
+Argument
+.Fa index
+is out of bounds.
 .It Bq Er ENOMEM
 The ACL working storage requires more memory than is
 allowed by the hardware or system-imposed memory

Modified: projects/libprocstat/lib/libc/posix1e/acl_delete_entry.3
==============================================================================
--- projects/libprocstat/lib/libc/posix1e/acl_delete_entry.3	Wed Jul  8 13:58:35 2009	(r195454)
+++ projects/libprocstat/lib/libc/posix1e/acl_delete_entry.3	Wed Jul  8 14:17:03 2009	(r195455)
@@ -25,11 +25,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 10, 2001

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