svn commit: r194045 - in projects/ngroups: . bin/df bin/sh contrib/ee contrib/less contrib/ntp/ntpd etc etc/defaults etc/mtree etc/rc.d lib/libc/rpc lib/libc/stdtime lib/libpmc lib/libthread_db lib...

Brooks Davis brooks at FreeBSD.org
Fri Jun 12 06:13:57 UTC 2009 

Author: brooks
Date: Fri Jun 12 06:13:53 2009
New Revision: 194045
URL: http://svn.freebsd.org/changeset/base/194045

Log:
  MFH @ r194044

Added:
  projects/ngroups/etc/ntp.conf
     - copied unchanged from r194044, head/etc/ntp.conf
  projects/ngroups/sbin/ifconfig/ifgif.c
     - copied unchanged from r194044, head/sbin/ifconfig/ifgif.c
  projects/ngroups/share/colldef/hr_HR.ISO8859-2.src
     - copied unchanged from r194044, head/share/colldef/hr_HR.ISO8859-2.src
  projects/ngroups/share/man/man4/alc.4
     - copied unchanged from r194044, head/share/man/man4/alc.4
  projects/ngroups/share/man/man4/mwl.4
     - copied unchanged from r194044, head/share/man/man4/mwl.4
  projects/ngroups/share/man/man4/mwlfw.4
     - copied unchanged from r194044, head/share/man/man4/mwlfw.4
  projects/ngroups/share/man/man9/BUS_NEW_PASS.9
     - copied unchanged from r194044, head/share/man/man9/BUS_NEW_PASS.9
  projects/ngroups/share/man/man9/bus_generic_new_pass.9
     - copied unchanged from r194044, head/share/man/man9/bus_generic_new_pass.9
  projects/ngroups/share/man/man9/bus_set_pass.9
     - copied unchanged from r194044, head/share/man/man9/bus_set_pass.9
  projects/ngroups/share/man/man9/netisr.9
     - copied unchanged from r194044, head/share/man/man9/netisr.9
  projects/ngroups/share/monetdef/pt_PT.ISO8859-15.src
     - copied unchanged from r194044, head/share/monetdef/pt_PT.ISO8859-15.src
  projects/ngroups/share/monetdef/pt_PT.UTF-8.src
     - copied unchanged from r194044, head/share/monetdef/pt_PT.UTF-8.src
  projects/ngroups/share/numericdef/de_CH.ISO8859-1.src
     - copied unchanged from r194044, head/share/numericdef/de_CH.ISO8859-1.src
  projects/ngroups/sys/dev/alc/
     - copied from r194044, head/sys/dev/alc/
  projects/ngroups/sys/dev/sec/
     - copied from r194044, head/sys/dev/sec/
  projects/ngroups/sys/dev/sound/pcm/feeder_chain.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_chain.c
  projects/ngroups/sys/dev/sound/pcm/feeder_eq.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_eq.c
  projects/ngroups/sys/dev/sound/pcm/feeder_format.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_format.c
  projects/ngroups/sys/dev/sound/pcm/feeder_matrix.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_matrix.c
  projects/ngroups/sys/dev/sound/pcm/feeder_mixer.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_mixer.c
  projects/ngroups/sys/dev/sound/pcm/g711.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/g711.h
  projects/ngroups/sys/dev/sound/pcm/intpcm.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/intpcm.h
  projects/ngroups/sys/dev/sound/pcm/matrix.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/matrix.h
  projects/ngroups/sys/dev/sound/pcm/matrix_map.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/matrix_map.h
  projects/ngroups/sys/dev/sound/pcm/pcm.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/pcm.h
  projects/ngroups/sys/dev/sound/pcm/sndstat.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/sndstat.h
  projects/ngroups/sys/kern/subr_acl_nfs4.c
     - copied unchanged from r194044, head/sys/kern/subr_acl_nfs4.c
  projects/ngroups/sys/libkern/jenkins.h
     - copied unchanged from r194044, head/sys/libkern/jenkins.h
  projects/ngroups/sys/modules/alc/
     - copied from r194044, head/sys/modules/alc/
  projects/ngroups/sys/tools/sound/
     - copied from r194044, head/sys/tools/sound/
  projects/ngroups/tools/tools/vimage/
     - copied from r194044, head/tools/tools/vimage/
Deleted:
  projects/ngroups/share/man/man9/devclass_add_driver.9
  projects/ngroups/sys/dev/sound/pcm/fake.c
  projects/ngroups/sys/dev/sound/pcm/feeder_fmt.c
  projects/ngroups/sys/tools/emu10k1-mkalsa.sh
Modified:
  projects/ngroups/   (props changed)
  projects/ngroups/UPDATING
  projects/ngroups/bin/df/df.1
  projects/ngroups/bin/df/df.c
  projects/ngroups/bin/sh/sh.1
  projects/ngroups/contrib/ee/   (props changed)
  projects/ngroups/contrib/less/   (props changed)
  projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c
  projects/ngroups/etc/Makefile
  projects/ngroups/etc/defaults/rc.conf
  projects/ngroups/etc/mtree/BSD.local.dist
  projects/ngroups/etc/mtree/BSD.usr.dist
  projects/ngroups/etc/rc.d/fsck
  projects/ngroups/etc/rc.d/jail
  projects/ngroups/etc/syslog.conf
  projects/ngroups/lib/libc/rpc/svc_dg.c
  projects/ngroups/lib/libc/stdtime/strftime.c
  projects/ngroups/lib/libpmc/libpmc.c
  projects/ngroups/lib/libpmc/pmc.core2.3
  projects/ngroups/lib/libthread_db/libthr_db.c
  projects/ngroups/lib/libthread_db/thread_db.h
  projects/ngroups/lib/libufs/type.c
  projects/ngroups/lib/libufs/ufs_disk_close.3
  projects/ngroups/lib/libusb/   (props changed)
  projects/ngroups/lib/libutil/flopen.3
  projects/ngroups/lib/libutil/flopen.c
  projects/ngroups/lib/libutil/pidfile.3
  projects/ngroups/lib/msun/src/math_private.h
  projects/ngroups/sbin/dhclient/dhclient.c
  projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8
  projects/ngroups/sbin/fsck_msdosfs/main.c
  projects/ngroups/sbin/geom/class/part/geom_part.c
  projects/ngroups/sbin/geom/core/geom.c
  projects/ngroups/sbin/geom/core/geom.h
  projects/ngroups/sbin/ifconfig/Makefile
  projects/ngroups/sbin/ipfw/dummynet.c
  projects/ngroups/sbin/ipfw/ipfw.8
  projects/ngroups/sbin/ipfw/ipfw2.c
  projects/ngroups/share/colldef/Makefile
  projects/ngroups/share/man/man4/Makefile
  projects/ngroups/share/man/man4/acpi.4
  projects/ngroups/share/man/man4/altq.4
  projects/ngroups/share/man/man4/gif.4
  projects/ngroups/share/man/man4/if_bridge.4
  projects/ngroups/share/man/man4/iwn.4
  projects/ngroups/share/man/man4/miibus.4
  projects/ngroups/share/man/man4/ng_ipfw.4
  projects/ngroups/share/man/man4/vlan.4
  projects/ngroups/share/man/man5/fstab.5
  projects/ngroups/share/man/man9/Makefile
  projects/ngroups/share/misc/committers-src.dot
  projects/ngroups/share/misc/pci_vendors
  projects/ngroups/share/mklocale/Makefile
  projects/ngroups/share/monetdef/Makefile
  projects/ngroups/share/monetdef/de_CH.ISO8859-1.src
  projects/ngroups/share/msgdef/Makefile
  projects/ngroups/share/numericdef/Makefile
  projects/ngroups/share/timedef/Makefile
  projects/ngroups/share/timedef/de_DE.ISO8859-1.src
  projects/ngroups/share/timedef/de_DE.UTF-8.src
  projects/ngroups/share/timedef/ja_JP.SJIS.src
  projects/ngroups/share/timedef/ja_JP.eucJP.src
  projects/ngroups/share/timedef/ko_KR.UTF-8.src
  projects/ngroups/share/timedef/ko_KR.eucKR.src
  projects/ngroups/share/timedef/pl_PL.ISO8859-2.src
  projects/ngroups/share/timedef/pl_PL.UTF-8.src
  projects/ngroups/share/zoneinfo/   (props changed)
  projects/ngroups/share/zoneinfo/asia
  projects/ngroups/sys/amd64/amd64/local_apic.c
  projects/ngroups/sys/amd64/amd64/machdep.c
  projects/ngroups/sys/amd64/conf/DEFAULTS
  projects/ngroups/sys/amd64/conf/GENERIC
  projects/ngroups/sys/amd64/conf/NOTES
  projects/ngroups/sys/amd64/include/param.h
  projects/ngroups/sys/amd64/isa/clock.c
  projects/ngroups/sys/arm/arm/intr.c
  projects/ngroups/sys/arm/arm/locore.S
  projects/ngroups/sys/arm/arm/pmap.c
  projects/ngroups/sys/arm/at91/at91.c
  projects/ngroups/sys/arm/at91/at91_cfata.c
  projects/ngroups/sys/arm/at91/at91_mci.c
  projects/ngroups/sys/arm/at91/at91_twi.c
  projects/ngroups/sys/arm/at91/if_ate.c
  projects/ngroups/sys/arm/include/intr.h
  projects/ngroups/sys/arm/mv/ic.c
  projects/ngroups/sys/arm/mv/twsi.c
  projects/ngroups/sys/arm/sa11x0/sa11x0_irqhandler.c
  projects/ngroups/sys/arm/xscale/i80321/i80321.c
  projects/ngroups/sys/arm/xscale/i80321/i80321_pci.c
  projects/ngroups/sys/arm/xscale/i8134x/i81342.c
  projects/ngroups/sys/arm/xscale/ixp425/avila_ata.c
  projects/ngroups/sys/arm/xscale/ixp425/avila_led.c
  projects/ngroups/sys/arm/xscale/ixp425/cambria_led.c
  projects/ngroups/sys/arm/xscale/ixp425/if_npe.c
  projects/ngroups/sys/arm/xscale/ixp425/ixp425.c
  projects/ngroups/sys/arm/xscale/ixp425/ixp425_iic.c
  projects/ngroups/sys/arm/xscale/pxa/pxa_icu.c
  projects/ngroups/sys/boot/forth/loader.conf
  projects/ngroups/sys/boot/i386/libi386/biosdisk.c
  projects/ngroups/sys/boot/i386/libi386/biospnp.c
  projects/ngroups/sys/cam/scsi/scsi_target.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/ngroups/sys/compat/freebsd32/freebsd32_proto.h
  projects/ngroups/sys/compat/freebsd32/freebsd32_syscall.h
  projects/ngroups/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/ngroups/sys/compat/freebsd32/freebsd32_sysent.c
  projects/ngroups/sys/compat/freebsd32/syscalls.master
  projects/ngroups/sys/compat/linprocfs/linprocfs.c
  projects/ngroups/sys/compat/linux/linux_ioctl.c
  projects/ngroups/sys/compat/ndis/subr_usbd.c
  projects/ngroups/sys/compat/svr4/svr4_sockio.c
  projects/ngroups/sys/conf/NOTES
  projects/ngroups/sys/conf/files
  projects/ngroups/sys/conf/files.powerpc
  projects/ngroups/sys/conf/options
  projects/ngroups/sys/contrib/altq/altq/altq_subr.c
  projects/ngroups/sys/contrib/dev/acpica/   (props changed)
  projects/ngroups/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/ngroups/sys/contrib/pf/net/if_pflog.c
  projects/ngroups/sys/contrib/pf/net/pf_if.c
  projects/ngroups/sys/contrib/pf/net/pf_ioctl.c
  projects/ngroups/sys/dev/acpica/Osd/OsdSchedule.c
  projects/ngroups/sys/dev/acpica/Osd/OsdSynch.c
  projects/ngroups/sys/dev/acpica/acpi_pcib_acpi.c
  projects/ngroups/sys/dev/acpica/acpivar.h
  projects/ngroups/sys/dev/agp/agp_ali.c
  projects/ngroups/sys/dev/agp/agp_amd.c
  projects/ngroups/sys/dev/agp/agp_ati.c
  projects/ngroups/sys/dev/agp/agp_nvidia.c
  projects/ngroups/sys/dev/agp/agp_sis.c
  projects/ngroups/sys/dev/ata/   (props changed)
  projects/ngroups/sys/dev/ata/ata-pci.h
  projects/ngroups/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/ngroups/sys/dev/ata/chipsets/ata-nvidia.c
  projects/ngroups/sys/dev/ce/if_ce.c
  projects/ngroups/sys/dev/cfi/cfi_core.c
  projects/ngroups/sys/dev/cp/if_cp.c
  projects/ngroups/sys/dev/ctau/if_ct.c
  projects/ngroups/sys/dev/cx/if_cx.c
  projects/ngroups/sys/dev/cxgb/cxgb_main.c
  projects/ngroups/sys/dev/cxgb/cxgb_multiq.c
  projects/ngroups/sys/dev/cxgb/cxgb_sge.c
  projects/ngroups/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/ngroups/sys/dev/e1000/if_igb.c
  projects/ngroups/sys/dev/eisa/eisaconf.c
  projects/ngroups/sys/dev/fxp/if_fxp.c
  projects/ngroups/sys/dev/if_ndis/if_ndis.c
  projects/ngroups/sys/dev/if_ndis/if_ndis_usb.c
  projects/ngroups/sys/dev/kbdmux/kbdmux.c
  projects/ngroups/sys/dev/ksyms/ksyms.c
  projects/ngroups/sys/dev/mca/mca_bus.c
  projects/ngroups/sys/dev/mge/if_mge.c
  projects/ngroups/sys/dev/mwl/if_mwl.c
  projects/ngroups/sys/dev/ncv/ncr53c500_pccard.c
  projects/ngroups/sys/dev/nmdm/nmdm.c
  projects/ngroups/sys/dev/nsp/nsp_pccard.c
  projects/ngroups/sys/dev/ofw/ofw_standard.c
  projects/ngroups/sys/dev/pcf/pcf.c
  projects/ngroups/sys/dev/pcf/pcfvar.h
  projects/ngroups/sys/dev/pdq/if_fpa.c
  projects/ngroups/sys/dev/smc/if_smc.c
  projects/ngroups/sys/dev/smc/if_smcvar.h
  projects/ngroups/sys/dev/snc/if_snc.c
  projects/ngroups/sys/dev/snc/if_sncvar.h
  projects/ngroups/sys/dev/sound/clone.c
  projects/ngroups/sys/dev/sound/driver.c
  projects/ngroups/sys/dev/sound/isa/ad1816.c
  projects/ngroups/sys/dev/sound/isa/ess.c
  projects/ngroups/sys/dev/sound/isa/gusc.c
  projects/ngroups/sys/dev/sound/isa/mss.c
  projects/ngroups/sys/dev/sound/isa/sb16.c
  projects/ngroups/sys/dev/sound/isa/sb8.c
  projects/ngroups/sys/dev/sound/isa/sbc.c
  projects/ngroups/sys/dev/sound/isa/sndbuf_dma.c
  projects/ngroups/sys/dev/sound/macio/aoa.c
  projects/ngroups/sys/dev/sound/macio/davbus.c
  projects/ngroups/sys/dev/sound/macio/i2s.c
  projects/ngroups/sys/dev/sound/macio/snapper.c
  projects/ngroups/sys/dev/sound/macio/tumbler.c
  projects/ngroups/sys/dev/sound/midi/midi.c
  projects/ngroups/sys/dev/sound/midi/mpu401.c
  projects/ngroups/sys/dev/sound/midi/sequencer.c
  projects/ngroups/sys/dev/sound/midi/sequencer.h
  projects/ngroups/sys/dev/sound/pci/als4000.c
  projects/ngroups/sys/dev/sound/pci/atiixp.c
  projects/ngroups/sys/dev/sound/pci/aureal.c
  projects/ngroups/sys/dev/sound/pci/cmi.c
  projects/ngroups/sys/dev/sound/pci/cs4281.c
  projects/ngroups/sys/dev/sound/pci/csa.c
  projects/ngroups/sys/dev/sound/pci/csapcm.c
  projects/ngroups/sys/dev/sound/pci/ds1.c
  projects/ngroups/sys/dev/sound/pci/emu10k1.c
  projects/ngroups/sys/dev/sound/pci/emu10kx-midi.c
  projects/ngroups/sys/dev/sound/pci/emu10kx-pcm.c
  projects/ngroups/sys/dev/sound/pci/emu10kx.c
  projects/ngroups/sys/dev/sound/pci/envy24.c
  projects/ngroups/sys/dev/sound/pci/envy24ht.c
  projects/ngroups/sys/dev/sound/pci/es137x.c
  projects/ngroups/sys/dev/sound/pci/fm801.c
  projects/ngroups/sys/dev/sound/pci/hda/hdac.c
  projects/ngroups/sys/dev/sound/pci/ich.c
  projects/ngroups/sys/dev/sound/pci/maestro.c
  projects/ngroups/sys/dev/sound/pci/maestro3.c
  projects/ngroups/sys/dev/sound/pci/neomagic.c
  projects/ngroups/sys/dev/sound/pci/solo.c
  projects/ngroups/sys/dev/sound/pci/spicds.c
  projects/ngroups/sys/dev/sound/pci/t4dwave.c
  projects/ngroups/sys/dev/sound/pci/via8233.c
  projects/ngroups/sys/dev/sound/pci/via82c686.c
  projects/ngroups/sys/dev/sound/pci/vibes.c
  projects/ngroups/sys/dev/sound/pcm/ac97.c
  projects/ngroups/sys/dev/sound/pcm/ac97_patch.c
  projects/ngroups/sys/dev/sound/pcm/buffer.c
  projects/ngroups/sys/dev/sound/pcm/buffer.h
  projects/ngroups/sys/dev/sound/pcm/channel.c
  projects/ngroups/sys/dev/sound/pcm/channel.h
  projects/ngroups/sys/dev/sound/pcm/channel_if.m
  projects/ngroups/sys/dev/sound/pcm/dsp.c
  projects/ngroups/sys/dev/sound/pcm/dsp.h
  projects/ngroups/sys/dev/sound/pcm/feeder.c
  projects/ngroups/sys/dev/sound/pcm/feeder.h
  projects/ngroups/sys/dev/sound/pcm/feeder_rate.c
  projects/ngroups/sys/dev/sound/pcm/feeder_volume.c
  projects/ngroups/sys/dev/sound/pcm/mixer.c
  projects/ngroups/sys/dev/sound/pcm/mixer.h
  projects/ngroups/sys/dev/sound/pcm/sndstat.c
  projects/ngroups/sys/dev/sound/pcm/sound.c
  projects/ngroups/sys/dev/sound/pcm/sound.h
  projects/ngroups/sys/dev/sound/pcm/vchan.c
  projects/ngroups/sys/dev/sound/pcm/vchan.h
  projects/ngroups/sys/dev/sound/sbus/cs4231.c
  projects/ngroups/sys/dev/sound/unit.c
  projects/ngroups/sys/dev/sound/usb/uaudio.c
  projects/ngroups/sys/dev/sound/usb/uaudio.h
  projects/ngroups/sys/dev/sound/usb/uaudio_pcm.c
  projects/ngroups/sys/dev/sound/version.h
  projects/ngroups/sys/dev/spibus/spibus.c
  projects/ngroups/sys/dev/stg/tmc18c30.h
  projects/ngroups/sys/dev/stg/tmc18c30_subr.c
  projects/ngroups/sys/dev/syscons/teken/teken_demo.c
  projects/ngroups/sys/dev/syscons/teken/teken_stress.c
  projects/ngroups/sys/dev/ubsec/ubsec.c
  projects/ngroups/sys/dev/usb/controller/at91dci.c
  projects/ngroups/sys/dev/usb/controller/atmegadci.c
  projects/ngroups/sys/dev/usb/controller/avr32dci.c
  projects/ngroups/sys/dev/usb/controller/ehci.c
  projects/ngroups/sys/dev/usb/controller/musb_otg.c
  projects/ngroups/sys/dev/usb/controller/ohci.c
  projects/ngroups/sys/dev/usb/controller/uhci.c
  projects/ngroups/sys/dev/usb/controller/uss820dci.c
  projects/ngroups/sys/dev/usb/serial/ugensa.c
  projects/ngroups/sys/dev/usb/serial/umct.c
  projects/ngroups/sys/dev/usb/storage/ustorage_fs.c
  projects/ngroups/sys/dev/usb/usb.h
  projects/ngroups/sys/dev/usb/usb_compat_linux.c
  projects/ngroups/sys/dev/usb/usb_compat_linux.h
  projects/ngroups/sys/dev/usb/usb_controller.h
  projects/ngroups/sys/dev/usb/usb_core.h
  projects/ngroups/sys/dev/usb/usb_debug.c
  projects/ngroups/sys/dev/usb/usb_debug.h
  projects/ngroups/sys/dev/usb/usb_dev.c
  projects/ngroups/sys/dev/usb/usb_device.c
  projects/ngroups/sys/dev/usb/usb_device.h
  projects/ngroups/sys/dev/usb/usb_generic.c
  projects/ngroups/sys/dev/usb/usb_handle_request.c
  projects/ngroups/sys/dev/usb/usb_hub.c
  projects/ngroups/sys/dev/usb/usb_lookup.h
  projects/ngroups/sys/dev/usb/usb_request.c
  projects/ngroups/sys/dev/usb/usb_transfer.c
  projects/ngroups/sys/dev/usb/usb_transfer.h
  projects/ngroups/sys/dev/usb/wlan/if_zyd.c
  projects/ngroups/sys/dev/usb/wlan/if_zydreg.h
  projects/ngroups/sys/dev/wb/if_wb.c
  projects/ngroups/sys/dev/wi/if_wi.c
  projects/ngroups/sys/dev/wi/if_wivar.h
  projects/ngroups/sys/dev/xen/netfront/   (props changed)
  projects/ngroups/sys/dev/xen/netfront/netfront.c
  projects/ngroups/sys/dev/xen/xenpci/   (props changed)
  projects/ngroups/sys/fs/cd9660/cd9660_vnops.c
  projects/ngroups/sys/fs/devfs/devfs_vnops.c
  projects/ngroups/sys/fs/fifofs/fifo_vnops.c
  projects/ngroups/sys/fs/msdosfs/msdosfs_vnops.c
  projects/ngroups/sys/fs/nfsclient/nfs_clbio.c
  projects/ngroups/sys/fs/nfsclient/nfs_clstate.c
  projects/ngroups/sys/fs/nfsclient/nfs_clvnops.c
  projects/ngroups/sys/fs/pseudofs/pseudofs_vncache.c
  projects/ngroups/sys/fs/pseudofs/pseudofs_vnops.c
  projects/ngroups/sys/fs/udf/osta.c
  projects/ngroups/sys/geom/geom.h
  projects/ngroups/sys/geom/geom_io.c
  projects/ngroups/sys/geom/geom_subr.c
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  projects/ngroups/sys/i386/acpica/acpi_machdep.c
  projects/ngroups/sys/i386/conf/DEFAULTS
  projects/ngroups/sys/i386/conf/GENERIC
  projects/ngroups/sys/i386/conf/NOTES
  projects/ngroups/sys/i386/i386/local_apic.c
  projects/ngroups/sys/i386/i386/machdep.c
  projects/ngroups/sys/i386/include/apicvar.h
  projects/ngroups/sys/i386/include/legacyvar.h
  projects/ngroups/sys/i386/isa/clock.c
  projects/ngroups/sys/i386/isa/vesa.c
  projects/ngroups/sys/i386/pci/pci_bus.c
  projects/ngroups/sys/kern/bus_if.m
  projects/ngroups/sys/kern/init_main.c
  projects/ngroups/sys/kern/kern_event.c
  projects/ngroups/sys/kern/kern_exec.c
  projects/ngroups/sys/kern/kern_exit.c
  projects/ngroups/sys/kern/kern_fork.c
  projects/ngroups/sys/kern/kern_jail.c
  projects/ngroups/sys/kern/kern_lockf.c
  projects/ngroups/sys/kern/kern_poll.c
  projects/ngroups/sys/kern/kern_uuid.c
  projects/ngroups/sys/kern/kern_vimage.c
  projects/ngroups/sys/kern/link_elf_obj.c
  projects/ngroups/sys/kern/linker_if.m
  projects/ngroups/sys/kern/subr_bus.c
  projects/ngroups/sys/kern/sys_pipe.c
  projects/ngroups/sys/kern/sysv_shm.c
  projects/ngroups/sys/kern/tty.c
  projects/ngroups/sys/kern/tty_pts.c
  projects/ngroups/sys/kern/uipc_domain.c
  projects/ngroups/sys/kern/uipc_mqueue.c
  projects/ngroups/sys/kern/uipc_socket.c
  projects/ngroups/sys/kern/uipc_syscalls.c
  projects/ngroups/sys/kern/vfs_aio.c
  projects/ngroups/sys/kern/vfs_bio.c
  projects/ngroups/sys/kern/vfs_cluster.c
  projects/ngroups/sys/kern/vfs_lookup.c
  projects/ngroups/sys/kern/vfs_subr.c
  projects/ngroups/sys/kern/vfs_syscalls.c
  projects/ngroups/sys/kern/vfs_vnops.c
  projects/ngroups/sys/kern/vnode_if.src
  projects/ngroups/sys/modules/Makefile
  projects/ngroups/sys/modules/bridgestp/Makefile
  projects/ngroups/sys/modules/cxgb/iw_cxgb/Makefile
  projects/ngroups/sys/modules/cxgb/tom/Makefile
  projects/ngroups/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/ngroups/sys/modules/firewire/fwip/Makefile
  projects/ngroups/sys/modules/ibcs2/Makefile
  projects/ngroups/sys/modules/if_ef/Makefile
  projects/ngroups/sys/modules/if_gif/Makefile
  projects/ngroups/sys/modules/if_ppp/Makefile
  projects/ngroups/sys/modules/if_stf/Makefile
  projects/ngroups/sys/modules/if_tun/Makefile
  projects/ngroups/sys/modules/if_vlan/Makefile
  projects/ngroups/sys/modules/ip6_mroute_mod/   (props changed)
  projects/ngroups/sys/modules/ip6_mroute_mod/Makefile
  projects/ngroups/sys/modules/ip_mroute_mod/Makefile
  projects/ngroups/sys/modules/ipfw/Makefile
  projects/ngroups/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/ngroups/sys/modules/linprocfs/Makefile
  projects/ngroups/sys/modules/linux/Makefile
  projects/ngroups/sys/modules/mac_lomac/Makefile
  projects/ngroups/sys/modules/netgraph/atm/atm/Makefile
  projects/ngroups/sys/modules/netgraph/ether/Makefile
  projects/ngroups/sys/modules/netgraph/gif/Makefile
  projects/ngroups/sys/modules/nfsclient/Makefile
  projects/ngroups/sys/modules/nfsserver/Makefile
  projects/ngroups/sys/modules/pf/Makefile
  projects/ngroups/sys/modules/pseudofs/Makefile
  projects/ngroups/sys/modules/sem/Makefile
  projects/ngroups/sys/modules/sound/sound/Makefile
  projects/ngroups/sys/modules/svr4/Makefile
  projects/ngroups/sys/modules/sysvipc/sysvmsg/Makefile
  projects/ngroups/sys/modules/sysvipc/sysvsem/Makefile
  projects/ngroups/sys/modules/sysvipc/sysvshm/Makefile
  projects/ngroups/sys/modules/ufs/Makefile
  projects/ngroups/sys/modules/wlan/Makefile
  projects/ngroups/sys/net/bpf.c
  projects/ngroups/sys/net/bridgestp.c
  projects/ngroups/sys/net/flowtable.c
  projects/ngroups/sys/net/flowtable.h
  projects/ngroups/sys/net/if.c
  projects/ngroups/sys/net/if_arcsubr.c
  projects/ngroups/sys/net/if_bridge.c
  projects/ngroups/sys/net/if_ef.c
  projects/ngroups/sys/net/if_ethersubr.c
  projects/ngroups/sys/net/if_fddisubr.c
  projects/ngroups/sys/net/if_fwsubr.c
  projects/ngroups/sys/net/if_gif.c
  projects/ngroups/sys/net/if_gif.h
  projects/ngroups/sys/net/if_iso88025subr.c
  projects/ngroups/sys/net/if_loop.c
  projects/ngroups/sys/net/if_mib.c
  projects/ngroups/sys/net/if_tap.c
  projects/ngroups/sys/net/if_tun.c
  projects/ngroups/sys/net/if_var.h
  projects/ngroups/sys/net/if_vlan.c
  projects/ngroups/sys/net/raw_cb.c
  projects/ngroups/sys/net/raw_usrreq.c
  projects/ngroups/sys/net/route.c
  projects/ngroups/sys/net/rtsock.c
  projects/ngroups/sys/net/vnet.h
  projects/ngroups/sys/net80211/_ieee80211.h
  projects/ngroups/sys/net80211/ieee80211.c
  projects/ngroups/sys/net80211/ieee80211.h
  projects/ngroups/sys/net80211/ieee80211_crypto.c
  projects/ngroups/sys/net80211/ieee80211_crypto.h
  projects/ngroups/sys/net80211/ieee80211_crypto_ccmp.c
  projects/ngroups/sys/net80211/ieee80211_crypto_tkip.c
  projects/ngroups/sys/net80211/ieee80211_ddb.c
  projects/ngroups/sys/net80211/ieee80211_dfs.c
  projects/ngroups/sys/net80211/ieee80211_freebsd.c
  projects/ngroups/sys/net80211/ieee80211_hostap.c
  projects/ngroups/sys/net80211/ieee80211_ht.c
  projects/ngroups/sys/net80211/ieee80211_input.c
  projects/ngroups/sys/net80211/ieee80211_ioctl.c
  projects/ngroups/sys/net80211/ieee80211_ioctl.h
  projects/ngroups/sys/net80211/ieee80211_node.c
  projects/ngroups/sys/net80211/ieee80211_node.h
  projects/ngroups/sys/net80211/ieee80211_output.c
  projects/ngroups/sys/net80211/ieee80211_proto.h
  projects/ngroups/sys/net80211/ieee80211_radiotap.c
  projects/ngroups/sys/net80211/ieee80211_scan_sta.c
  projects/ngroups/sys/net80211/ieee80211_sta.c
  projects/ngroups/sys/net80211/ieee80211_var.h
  projects/ngroups/sys/netgraph/atm/ng_atm.c
  projects/ngroups/sys/netgraph/netgraph.h
  projects/ngroups/sys/netgraph/ng_base.c
  projects/ngroups/sys/netgraph/ng_eiface.c
  projects/ngroups/sys/netgraph/ng_ether.c
  projects/ngroups/sys/netgraph/ng_gif.c
  projects/ngroups/sys/netgraph/ng_iface.c
  projects/ngroups/sys/netgraph/ng_ip_input.c
  projects/ngroups/sys/netgraph/ng_ipfw.c
  projects/ngroups/sys/netgraph/ng_ipfw.h
  projects/ngroups/sys/netgraph/ng_message.h
  projects/ngroups/sys/netinet/if_ether.c
  projects/ngroups/sys/netinet/igmp.c
  projects/ngroups/sys/netinet/igmp.h
  projects/ngroups/sys/netinet/in.c
  projects/ngroups/sys/netinet/in_gif.c
  projects/ngroups/sys/netinet/in_mcast.c
  projects/ngroups/sys/netinet/in_proto.c
  projects/ngroups/sys/netinet/in_rmx.c
  projects/ngroups/sys/netinet/ip_dummynet.h
  projects/ngroups/sys/netinet/ip_fw.h
  projects/ngroups/sys/netinet/ip_ipsec.c
  projects/ngroups/sys/netinet/ip_ipsec.h
  projects/ngroups/sys/netinet/ip_output.c
  projects/ngroups/sys/netinet/ip_var.h
  projects/ngroups/sys/netinet/ipfw/ip_dummynet.c   (contents, props changed)
  projects/ngroups/sys/netinet/ipfw/ip_fw2.c   (contents, props changed)
  projects/ngroups/sys/netinet/ipfw/ip_fw_pfil.c   (contents, props changed)
  projects/ngroups/sys/netinet/raw_ip.c
  projects/ngroups/sys/netinet/sctp_os_bsd.h
  projects/ngroups/sys/netinet/tcp_debug.c
  projects/ngroups/sys/netinet/tcp_hostcache.c
  projects/ngroups/sys/netinet/tcp_input.c
  projects/ngroups/sys/netinet/tcp_subr.c
  projects/ngroups/sys/netinet/tcp_syncache.c
  projects/ngroups/sys/netinet/tcp_syncache.h
  projects/ngroups/sys/netinet/tcp_timewait.c
  projects/ngroups/sys/netinet/tcp_usrreq.c
  projects/ngroups/sys/netinet/tcp_var.h
  projects/ngroups/sys/netinet/udp_usrreq.c
  projects/ngroups/sys/netinet/udp_var.h
  projects/ngroups/sys/netinet6/icmp6.c
  projects/ngroups/sys/netinet6/in6.c
  projects/ngroups/sys/netinet6/in6_gif.c
  projects/ngroups/sys/netinet6/in6_ifattach.c
  projects/ngroups/sys/netinet6/in6_mcast.c
  projects/ngroups/sys/netinet6/in6_proto.c
  projects/ngroups/sys/netinet6/in6_rmx.c
  projects/ngroups/sys/netinet6/ip6_input.c
  projects/ngroups/sys/netinet6/ip6_mroute.c
  projects/ngroups/sys/netinet6/ip6_output.c
  projects/ngroups/sys/netinet6/ip6_var.h
  projects/ngroups/sys/netinet6/ip6protosw.h
  projects/ngroups/sys/netinet6/nd6.c
  projects/ngroups/sys/netinet6/nd6.h
  projects/ngroups/sys/netinet6/nd6_rtr.c
  projects/ngroups/sys/netinet6/raw_ip6.c
  projects/ngroups/sys/netinet6/scope6.c
  projects/ngroups/sys/netipsec/ipsec.c
  projects/ngroups/sys/netipsec/ipsec_input.c
  projects/ngroups/sys/netipsec/key.c
  projects/ngroups/sys/netipsec/key.h
  projects/ngroups/sys/netipsec/keysock.c
  projects/ngroups/sys/netipsec/xform_ipip.c
  projects/ngroups/sys/netipx/spx_debug.c
  projects/ngroups/sys/nfsclient/bootp_subr.c
  projects/ngroups/sys/nfsclient/nfs_bio.c
  projects/ngroups/sys/nfsclient/nfs_diskless.c
  projects/ngroups/sys/powerpc/aim/machdep.c
  projects/ngroups/sys/powerpc/aim/platform_chrp.c
  projects/ngroups/sys/powerpc/conf/MPC85XX
  projects/ngroups/sys/powerpc/include/ocpbus.h
  projects/ngroups/sys/powerpc/include/pio.h
  projects/ngroups/sys/powerpc/mpc85xx/ocpbus.c
  projects/ngroups/sys/powerpc/mpc85xx/ocpbus.h
  projects/ngroups/sys/powerpc/ofw/ofw_real.c
  projects/ngroups/sys/powerpc/powermac/cuda.c
  projects/ngroups/sys/powerpc/powermac/pmu.c
  projects/ngroups/sys/powerpc/powerpc/bus_machdep.c
  projects/ngroups/sys/powerpc/powerpc/openpic.c
  projects/ngroups/sys/powerpc/psim/ata_iobus.c
  projects/ngroups/sys/rpc/clnt_rc.c
  projects/ngroups/sys/rpc/svc.c
  projects/ngroups/sys/rpc/svc_auth.c
  projects/ngroups/sys/security/audit/audit_pipe.c
  projects/ngroups/sys/sys/bio.h
  projects/ngroups/sys/sys/buf_ring.h
  projects/ngroups/sys/sys/bus.h
  projects/ngroups/sys/sys/domain.h
  projects/ngroups/sys/sys/event.h
  projects/ngroups/sys/sys/kobj.h
  projects/ngroups/sys/sys/mount.h
  projects/ngroups/sys/sys/param.h
  projects/ngroups/sys/sys/priv.h
  projects/ngroups/sys/sys/proc.h
  projects/ngroups/sys/sys/protosw.h
  projects/ngroups/sys/sys/soundcard.h
  projects/ngroups/sys/sys/vimage.h
  projects/ngroups/sys/vm/vm_fault.c
  projects/ngroups/sys/vm/vm_glue.c
  projects/ngroups/sys/vm/vm_map.c
  projects/ngroups/sys/vm/vm_pager.h
  projects/ngroups/tools/regression/lib/libutil/test-flopen.c
  projects/ngroups/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/ngroups/tools/tools/README
  projects/ngroups/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/ngroups/tools/tools/pciid/mk_pci_vendors.pl
  projects/ngroups/usr.bin/fstat/zfs.c
  projects/ngroups/usr.sbin/arp/Makefile
  projects/ngroups/usr.sbin/arp/arp.c
  projects/ngroups/usr.sbin/flowctl/flowctl.c
  projects/ngroups/usr.sbin/jail/jail.8
  projects/ngroups/usr.sbin/jail/jail.c
  projects/ngroups/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/ngroups/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/ngroups/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/ngroups/usr.sbin/makefs/getid.c   (props changed)
  projects/ngroups/usr.sbin/mergemaster/mergemaster.sh
  projects/ngroups/usr.sbin/mountd/mountd.c
  projects/ngroups/usr.sbin/pstat/Makefile
  projects/ngroups/usr.sbin/pstat/pstat.c
  projects/ngroups/usr.sbin/sysinstall/devices.c
  projects/ngroups/usr.sbin/syslogd/syslog.conf.5

Modified: projects/ngroups/UPDATING
==============================================================================
--- projects/ngroups/UPDATING	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/UPDATING	Fri Jun 12 06:13:53 2009	(r194045)
@@ -22,6 +22,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090611:
+	The layout of struct thread has changed.  Kernel and modules
+	need to be rebuilt.
+
+20090608:
+	The layout of structs ifnet, domain, protosw and vnet_net has
+	changed.  Kernel modules need to be rebuilt.
+	Bump __FreeBSD_version to 800097.
+
 20090602:
 	window(1) has been removed from the base system. It can now be
 	installed from ports. The port is called misc/window.

Modified: projects/ngroups/bin/df/df.1
==============================================================================
--- projects/ngroups/bin/df/df.1	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/bin/df/df.1	Fri Jun 12 06:13:53 2009	(r194045)
@@ -78,15 +78,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl H
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 10 for sizes.
 .It Fl h
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 2 for sizes.
+Inodes statistics, if enabled with
+.Fl i ,
+are always printed in base 10.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k

Modified: projects/ngroups/bin/df/df.c
==============================================================================
--- projects/ngroups/bin/df/df.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/bin/df/df.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -369,6 +369,23 @@ prthumanval(int64_t bytes)
 }
 
 /*
+ * Print an inode count in "human-readable" format.
+ */
+static void
+prthumanvalinode(int64_t bytes)
+{
+	char buf[6];
+	int flags;
+
+	flags = HN_NOSPACE | HN_DECIMAL | HN_DIVISOR_1000;
+
+	humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1),
+	    bytes, "", HN_AUTOSCALE, flags);
+
+	(void)printf(" %5s", buf);
+}
+
+/*
  * Convert statfs returned file system size into BLOCKSIZE units.
  * Attempts to avoid overflow for large file systems.
  */
@@ -413,8 +430,10 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
-			mwp->iused = imax(mwp->iused, (int)strlen("  iused"));
-			mwp->ifree = imax(mwp->ifree, (int)strlen("ifree"));
+			mwp->iused = imax(hflag ? 0 : mwp->iused,
+			    (int)strlen("  iused"));
+			mwp->ifree = imax(hflag ? 0 : mwp->ifree,
+			    (int)strlen("ifree"));
 			(void)printf(" %*s %*s %%iused",
 			    mwp->iused - 2, "iused", mwp->ifree, "ifree");
 		}
@@ -440,8 +459,15 @@ prtstat(struct statfs *sfsp, struct maxw
 	if (iflag) {
 		inodes = sfsp->f_files;
 		used = inodes - sfsp->f_ffree;
-		(void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used,
-		    mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 :
+		if (hflag) {
+			(void)printf("  ");
+			prthumanvalinode(used);
+			prthumanvalinode(sfsp->f_ffree);
+		} else {
+			(void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used,
+			    mwp->ifree, (intmax_t)sfsp->f_ffree);
+		}
+		(void)printf(" %4.0f%% ", inodes == 0 ? 100.0 :
 		    (double)used / (double)inodes * 100.0);
 	} else
 		(void)printf("  ");

Modified: projects/ngroups/bin/sh/sh.1
==============================================================================
--- projects/ngroups/bin/sh/sh.1	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/bin/sh/sh.1	Fri Jun 12 06:13:53 2009	(r194045)
@@ -1682,6 +1682,7 @@ If
 is given
 it is used as the exit status of the shell;
 otherwise the exit status of the preceding command is used.
+The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p
 The specified names are exported so that they will

Modified: projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c
==============================================================================
--- projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -570,7 +570,7 @@ crypto_recv(
 			peer->issuer = emalloc(vallen + 1);
 			strcpy(peer->issuer, peer->subject);
 			temp32 = (fstamp >> 16) & 0xffff;
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "flags 0x%x host %s signature %s", fstamp,
 			    peer->subject, OBJ_nid2ln(temp32));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -636,7 +636,8 @@ crypto_recv(
 			}
 			peer->flash &= ~TEST8;
 			temp32 = cinfo->nid;
-			sprintf(statstr, "cert %s 0x%x %s (%u) fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "cert %s 0x%x %s (%u) fs %u",
 			    cinfo->subject, cinfo->flags,
 			    OBJ_nid2ln(temp32), temp32,
 			    ntohl(ep->fstamp));
@@ -685,7 +686,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "iff fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "iff fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -733,7 +734,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "gq fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "gq fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -774,7 +775,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "mv fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "mv fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -828,7 +829,7 @@ crypto_recv(
 			peer->crypto &= ~CRYPTO_FLAG_AUTO;
 			peer->crypto |= CRYPTO_FLAG_AGREE;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "cook %x ts %u fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u",
 			    peer->pcookie, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -893,7 +894,7 @@ crypto_recv(
 				peer->crypto &= ~CRYPTO_FLAG_AUTO;
 			peer->crypto |= CRYPTO_FLAG_AGREE;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "cook %x ts %u fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u",
 			    peer->pcookie, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -944,7 +945,7 @@ crypto_recv(
 			peer->pkeyid = bp->key;
 			peer->crypto |= CRYPTO_FLAG_AUTO;
 			peer->flash &= ~TEST8;
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "auto seq %d key %x ts %u fs %u", bp->seq,
 			    bp->key, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
@@ -987,7 +988,8 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_SIGN;
 			peer->flash &= ~TEST8;
 			temp32 = cinfo->nid;
-			sprintf(statstr, "sign %s 0x%x %s (%u) fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "sign %s 0x%x %s (%u) fs %u",
 			    cinfo->issuer, cinfo->flags,
 			    OBJ_nid2ln(temp32), temp32,
 			    ntohl(ep->fstamp));
@@ -1071,7 +1073,8 @@ crypto_recv(
 			crypto_flags |= CRYPTO_FLAG_TAI;
 			peer->crypto |= CRYPTO_FLAG_LEAP;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "leap %u ts %u fs %u", vallen,
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "leap %u ts %u fs %u", vallen,
 			    ntohl(ep->tstamp), ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -1127,7 +1130,7 @@ crypto_recv(
 		 * cheerfully ignored, as the message is not sent.
 		 */
 		if (rval > XEVNT_TSP) {
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "error %x opcode %x ts %u fs %u", rval,
 			    code, tstamp, fstamp);
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -1453,7 +1456,8 @@ crypto_xmit(
 	 */
 	if (rval != XEVNT_OK) {
 		opcode |= CRYPTO_ERROR;
-		sprintf(statstr, "error %x opcode %x", rval, opcode);
+		snprintf(statstr, NTP_MAXSTRLEN,
+		    "error %x opcode %x", rval, opcode);
 		record_crypto_stats(srcadr_sin, statstr);
 		report_event(rval, NULL);
 #ifdef DEBUG
@@ -1952,7 +1956,8 @@ crypto_update(void)
 		if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey))
 			tai_leap.siglen = htonl(len);
 	}
-	sprintf(statstr, "update ts %u", ntohl(hostval.tstamp)); 
+	snprintf(statstr, NTP_MAXSTRLEN,
+	    "update ts %u", ntohl(hostval.tstamp)); 
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
 	if (debug)
@@ -3606,7 +3611,7 @@ crypto_key(
 	 */
 	if ((ptr = strrchr(linkname, '\n')) != NULL)
 		*ptr = '\0'; 
-	sprintf(statstr, "%s mod %d", &linkname[2],
+	snprintf(statstr, NTP_MAXSTRLEN, "%s mod %d", &linkname[2],
 	    EVP_PKEY_size(pkey) * 8);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
@@ -3715,8 +3720,8 @@ crypto_cert(
 
 	if ((ptr = strrchr(linkname, '\n')) != NULL)
 		*ptr = '\0'; 
-	sprintf(statstr, "%s 0x%x len %lu", &linkname[2], ret->flags,
-	    len);
+	snprintf(statstr, NTP_MAXSTRLEN,
+	    "%s 0x%x len %lu", &linkname[2], ret->flags, len);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
 	if (debug)
@@ -3832,7 +3837,7 @@ crypto_tai(
 	for (j = 0; j < i; j++)
 		*ptr++ = htonl(leapsec[j]);
 	crypto_flags |= CRYPTO_FLAG_TAI;
-	sprintf(statstr, "%s fs %u leap %u len %u", cp, fstamp,
+	snprintf(statstr, NTP_MAXSTRLEN, "%s fs %u leap %u len %u", cp, fstamp,
 	   leapsec[--j], len);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG

Modified: projects/ngroups/etc/Makefile
==============================================================================
--- projects/ngroups/etc/Makefile	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/Makefile	Fri Jun 12 06:13:53 2009	(r194045)
@@ -63,6 +63,10 @@ BIN1+=	${.CURDIR}/../usr.bin/mail/misc/m
 BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
+.if ${MK_NTP} != "no"
+BIN1+=	ntp.conf
+.endif
+
 .if ${MK_OPENSSH} != "no"
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \

Modified: projects/ngroups/etc/defaults/rc.conf
==============================================================================
--- projects/ngroups/etc/defaults/rc.conf	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/defaults/rc.conf	Fri Jun 12 06:13:53 2009	(r194045)
@@ -83,6 +83,7 @@ geli_swap_flags="-e aes -l 256 -s 4096 -
 
 root_rw_mount="YES"	# Set to NO to inhibit remounting root read-write.
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
+fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
 netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.

Modified: projects/ngroups/etc/mtree/BSD.local.dist
==============================================================================
--- projects/ngroups/etc/mtree/BSD.local.dist	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/mtree/BSD.local.dist	Fri Jun 12 06:13:53 2009	(r194045)
@@ -541,12 +541,30 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_ES.ISO8859-1
             ..
+            ca_FR.ISO8859-1
+            ..
+            ca_IT.ISO8859-1
+            ..
+            ca_AD.ISO8859-15
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-15
+            ..
+            ca_IT.ISO8859-15
+            ..
+            ca_AD.UTF-8
+            ..
             ca_ES.UTF-8
             ..
+            ca_FR.UTF-8
+            ..
+            ca_IT.UTF-8
+            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8

Modified: projects/ngroups/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/ngroups/etc/mtree/BSD.usr.dist	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/mtree/BSD.usr.dist	Fri Jun 12 06:13:53 2009	(r194045)
@@ -357,12 +357,30 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_ES.ISO8859-1
             ..
+            ca_FR.ISO8859-1
+            ..
+            ca_IT.ISO8859-1
+            ..
+            ca_AD.ISO8859-15
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-15
+            ..
+            ca_IT.ISO8859-15
+            ..
+            ca_AD.UTF-8
+            ..
             ca_ES.UTF-8
             ..
+            ca_FR.UTF-8
+            ..
+            ca_IT.UTF-8
+            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8

Copied: projects/ngroups/etc/ntp.conf (from r194044, head/etc/ntp.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ngroups/etc/ntp.conf	Fri Jun 12 06:13:53 2009	(r194045, copy of r194044, head/etc/ntp.conf)
@@ -0,0 +1,59 @@
+#
+# $FreeBSD$
+#
+# Default NTP servers for the FreeBSD operating system.
+#
+# Don't forget to enable ntpd in /etc/rc.conf with:
+# ntpd_enable="YES"
+#
+# The driftfile is by default /var/db/ntpd.drift, check
+# /etc/defaults/rc.conf on how to change the location.
+#
+
+#
+# The following three servers will give you a random set of three
+# NTP servers geographically close to you.
+# See http://en.wikipedia.org/wiki/NTP_pool for details.
+#
+# The option `iburst' is used for faster initial synchronisation.
+# The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD.
+#
+server 0.pool.ntp.org iburst maxpoll 9
+server 1.pool.ntp.org iburst maxpoll 9
+server 2.pool.ntp.org iburst maxpoll 9
+
+#
+# If you want to pick yourself which country's public NTP server
+# you want sync against, comment out the above servers, uncomment
+# the next ones and replace CC with the country's abbrevation.
+# Make sure that the hostnames resolve to a proper IP address!
+#
+# server 0.CC.pool.ntp.org iburst maxpoll 9
+# server 1.CC.pool.ntp.org iburst maxpoll 9
+# server 2.CC.pool.ntp.org iburst maxpoll 9
+
+#
+# Security: Only accept NTP traffic from the following hosts.
+# The following configuration example only accepts traffic from the
+# above defined servers.
+#
+# Please note that this example doesn't work for the servers in
+# the pool.ntp.org domain since they return multiple A records.
+# (This is the reason that by default they are commented out)
+#
+#restrict default ignore
+#restrict 0.pool.ntp.org nomodify nopeer noquery notrap
+#restrict 1.pool.ntp.org nomodify nopeer noquery notrap
+#restrict 2.pool.ntp.org nomodify nopeer noquery notrap
+#restrict 127.0.0.1
+#restrict -6 ::1
+#restrict 127.127.1.0
+
+#
+# If we lose sync against all configured servers, the NTP clients
+# syncing against this server will lose sync too. To overcome this,
+# we will act as a stratum 10 server with our own internal clock
+# so that everybody at least will have the same time as we have.
+#
+server 127.127.1.0
+fudge 127.127.1.0 stratum 10

Modified: projects/ngroups/etc/rc.d/fsck
==============================================================================
--- projects/ngroups/etc/rc.d/fsck	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/rc.d/fsck	Fri Jun 12 06:13:53 2009	(r194045)
@@ -44,8 +44,8 @@ fsck_start()
 			;;
 		8)
 			if checkyesno fsck_y_enable; then
-				echo "File system preen failed, trying fsck -y."
-				fsck -y
+				echo "File system preen failed, trying fsck -y ${fsck_y_flags}"
+				fsck -y ${fsck_y_flags}
 				case $? in
 				0)
 					;;

Modified: projects/ngroups/etc/rc.d/jail
==============================================================================
--- projects/ngroups/etc/rc.d/jail	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/rc.d/jail	Fri Jun 12 06:13:53 2009	(r194045)
@@ -52,7 +52,7 @@ init_variables()
 	eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\"
 
 	i=1
-	while [ true ]; do
+	while : ; do
 		eval _exec_afterstart${i}=\"\${jail_${_j}_exec_afterstart${i}:-\${jail_exec_afterstart${i}}}\"
 		[ -z "$(eval echo \"\$_exec_afterstart${i}\")" ] &&  break
 		i=$((i + 1))
@@ -132,7 +132,6 @@ init_variables()
 	debug "$_j procdir: $_procdir"
 	debug "$_j ruleset: $_ruleset"
 	debug "$_j fstab: $_fstab"
-	debug "$_j consolelog: $_consolelog"
 
 	i=0
 	while : ; do
@@ -147,7 +146,7 @@ init_variables()
 	debug "$_j exec start: $_exec_start"
 
 	i=1
-	while [ true ]; do
+	while : ; do
 		eval out=\"\${_exec_afterstart${i}:-''}\"
 
 		if [ -z "$out" ]; then
@@ -642,7 +641,7 @@ jail_start()
 		if [ "$?" -eq 0 ] ; then
 			_jail_id=$(head -1 ${_tmp_jail})
 			i=1
-			while [ true ]; do
+			while : ; do
 				eval out=\"\${_exec_afterstart${i}:-''}\"
 
 				if [ -z "$out" ]; then

Modified: projects/ngroups/etc/syslog.conf
==============================================================================
--- projects/ngroups/etc/syslog.conf	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/syslog.conf	Fri Jun 12 06:13:53 2009	(r194045)
@@ -28,3 +28,4 @@ cron.*						/var/log/cron
 # news.notice					/var/log/news/news.notice
 !ppp
 *.*						/var/log/ppp.log
+!*

Modified: projects/ngroups/lib/libc/rpc/svc_dg.c
==============================================================================
--- projects/ngroups/lib/libc/rpc/svc_dg.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libc/rpc/svc_dg.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -209,7 +209,7 @@ svc_dg_recvfrom(int fd, char *buf, int b
 		return rlen;
 
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
-	     cmsg = CMSG_NXTHDR(&msg, cmsg)){
+	     cmsg = CMSG_NXTHDR(&msg, cmsg)) {
 		if (cmsg->cmsg_level == IPPROTO_IP &&
 		    cmsg->cmsg_type == IP_RECVDSTADDR) {
 			have_lin = TRUE;
@@ -300,7 +300,7 @@ svc_dg_sendto(int fd, char *buf, int buf
 	msg.msg_namelen = raddrlen;
 	msg.msg_name = (char *)raddr;
 
-	if (laddr->sa_family == AF_INET) {
+	if (laddr->sa_family == AF_INET && lin->s_addr != INADDR_ANY) {
 		msg.msg_control = (caddr_t)tmp;
 		msg.msg_controllen = CMSG_LEN(sizeof(*lin));
 		cmsg = CMSG_FIRSTHDR(&msg);

Modified: projects/ngroups/lib/libc/stdtime/strftime.c
==============================================================================
--- projects/ngroups/lib/libc/stdtime/strftime.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libc/stdtime/strftime.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -57,7 +57,7 @@ extern char *	tzname[];
 #define IN_THIS	2
 #define IN_ALL	3
 
-#define PAD_DEFAULT 0
+#define PAD_DEFAULT	0
 #define PAD_LESS	1
 #define PAD_SPACE	2
 #define PAD_ZERO	3
@@ -65,7 +65,7 @@ extern char *	tzname[];
 static const char* fmt_padding[][4] = {
 	/* DEFAULT,	LESS,	SPACE,	ZERO */
 #define PAD_FMT_MONTHDAY	0
-#define PAD_FMT_HMS			0
+#define PAD_FMT_HMS		0
 #define PAD_FMT_CENTURY		0
 #define PAD_FMT_SHORTYEAR	0
 #define PAD_FMT_MONTH		0

Modified: projects/ngroups/lib/libpmc/libpmc.c
==============================================================================
--- projects/ngroups/lib/libpmc/libpmc.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libpmc/libpmc.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -591,22 +591,22 @@ iap_allocate_pmc(enum pmc_event pe, char
 			pmc_config->pm_caps |= PMC_CAP_USER;
 		} else if (KWMATCH(p, IAP_KW_ANYTHREAD)) {
 			pmc_config->pm_md.pm_iap.pm_iap_config |= IAP_ANY;
-		} else if (KWMATCH(p, IAP_KW_CORE)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_CORE "=")) {
 			n = pmc_parse_mask(iap_core_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_AGENT)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_AGENT "=")) {
 			n = pmc_parse_mask(iap_agent_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_PREFETCH)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_PREFETCH "=")) {
 			n = pmc_parse_mask(iap_prefetch_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_CACHESTATE)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_CACHESTATE "=")) {
 			n = pmc_parse_mask(iap_cachestate_mask, p, &cachestate);
 		} else if (cpu_info.pm_cputype == PMC_CPU_INTEL_CORE &&
-		    KWMATCH(p, IAP_KW_TRANSITION)) {
+		    KWPREFIXMATCH(p, IAP_KW_TRANSITION "=")) {
 			n = pmc_parse_mask(iap_transition_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
@@ -614,10 +614,10 @@ iap_allocate_pmc(enum pmc_event pe, char
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 ||
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME ||
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) {
-			if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) {
+			if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) {
 				n = pmc_parse_mask(iap_snoopresponse_mask, p,
 				    &evmask);
-			} else if (KWMATCH(p, IAP_KW_SNOOPTYPE)) {
+			} else if (KWPREFIXMATCH(p, IAP_KW_SNOOPTYPE "=")) {
 				n = pmc_parse_mask(iap_snooptype_mask, p,
 				    &evmask);
 			} else

Modified: projects/ngroups/lib/libpmc/pmc.core2.3
==============================================================================
--- projects/ngroups/lib/libpmc/pmc.core2.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libpmc/pmc.core2.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2008,2009 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 12, 2008
+.Dd June 8, 2009
 .Os
 .Dt PMC.CORE2 3
 .Sh NAME
@@ -42,7 +42,7 @@ family CPUs
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
-These CPUs contains two classes of PMCs:
+These CPUs may contain upto two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
@@ -66,6 +66,7 @@ Intel Core2 PMCs are documented in
 .Ss CORE2 FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
+Not all CPUs in this family implement fixed-function counters.
 .Ss CORE2 PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"

Modified: projects/ngroups/lib/libthread_db/libthr_db.c
==============================================================================
--- projects/ngroups/lib/libthread_db/libthr_db.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libthread_db/libthr_db.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -457,6 +457,7 @@ pt_thr_get_info(const td_thrhandle_t *th
 {
 	const td_thragent_t *ta = th->th_ta;
 	struct ptrace_lwpinfo linfo;
+	int traceme;
 	int state;
 	int ret;
 
@@ -470,7 +471,8 @@ pt_thr_get_info(const td_thrhandle_t *th
 	if (ret != 0)
 		return (TD_ERR);
 	ret = thr_pread_int(ta, th->th_thread + ta->thread_off_report_events,
-	    &info->ti_traceme);
+	    &traceme);
+	info->ti_traceme = traceme;
 	if (ret != 0)
 		return (TD_ERR);
 	ret = ps_pread(ta->ph, th->th_thread + ta->thread_off_event_mask,

Modified: projects/ngroups/lib/libthread_db/thread_db.h
==============================================================================
--- projects/ngroups/lib/libthread_db/thread_db.h	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libthread_db/thread_db.h	Fri Jun 12 06:13:53 2009	(r194045)
@@ -184,7 +184,7 @@ typedef struct {
 	int		ti_pri;
 	lwpid_t		ti_lid;
 	char		ti_db_suspended;
-	int		ti_traceme;
+	char		ti_traceme;
 	sigset_t	ti_sigmask;
 	sigset_t	ti_pending;
 	psaddr_t	ti_tls;

Modified: projects/ngroups/lib/libufs/type.c
==============================================================================
--- projects/ngroups/lib/libufs/type.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libufs/type.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -108,7 +108,10 @@ again:	if ((ret = stat(name, &st)) < 0) 
 		 */
 		name = oname;
 	}
-	if (ret >= 0 && S_ISCHR(st.st_mode)) {
+	if (ret >= 0 && S_ISREG(st.st_mode)) {
+		/* Possibly a disk image, give it a try.  */
+		;
+	} else if (ret >= 0 && S_ISCHR(st.st_mode)) {
 		/* This is what we need, do nothing. */
 		;
 	} else if ((fs = getfsfile(name)) != NULL) {

Modified: projects/ngroups/lib/libufs/ufs_disk_close.3
==============================================================================
--- projects/ngroups/lib/libufs/ufs_disk_close.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libufs/ufs_disk_close.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -53,7 +53,7 @@ and populate the structure pointed to by
 The disk is opened read-only.
 The specified
 .Fa name
-may be either a mountpoint, or a device name.
+may be either a mountpoint, a device name or a filesystem image.
 The
 .Fn ufs_disk_fillout
 function assumes there is a valid superblock and will fail if not,

Modified: projects/ngroups/lib/libutil/flopen.3
==============================================================================
--- projects/ngroups/lib/libutil/flopen.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libutil/flopen.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 10, 2007
+.Dd June 6, 2009
 .Dt FLOPEN 3
 .Os
 .Sh NAME
@@ -46,13 +46,12 @@ The
 function opens or creates a file and acquires an exclusive lock on it.
 It is essentially equivalent with calling
 .Fn open
-with the same parameters followed by an
-.Fn fcntl
-.Dv F_SETLK
-or
-.Dv F_SETLKW
-operation with lock type
-.Dv F_WRLCK ,
+with the same parameters followed by
+.Fn flock
+with an
+.Va operation
+argument of
+.Dv LOCK_EX ,
 except that
 .Fn flopen
 will attempt to detect and handle races that may occur between opening
@@ -87,18 +86,13 @@ returns a valid file descriptor.
 Otherwise, it returns -1, and sets
 .Va errno
 as described in
-.Xr fcntl 2
+.Xr flock 2
 and
 .Xr open 2 .
 .Sh SEE ALSO
 .Xr errno 2 ,
-.Xr fcntl 2 ,
+.Xr flock 2 ,
 .Xr open 2
-.Sh HISTORY
-The
-.Fn flopen
-function first appeared in
-.Fx 6.3 .
 .Sh AUTHORS
 .An -nosplit
 The

Modified: projects/ngroups/lib/libutil/flopen.c
==============================================================================
--- projects/ngroups/lib/libutil/flopen.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libutil/flopen.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -28,12 +28,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/file.h>
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
 #include <stdarg.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <libutil.h>
@@ -42,7 +41,6 @@ int
 flopen(const char *path, int flags, ...)
 {
 	int fd, operation, serrno, trunc;
-	struct flock lock;
 	struct stat sb, fsb;
 	mode_t mode;
 
@@ -59,10 +57,9 @@ flopen(const char *path, int flags, ...)
 		va_end(ap);
 	}
 
-	memset(&lock, 0, sizeof lock);
-	lock.l_type = ((flags & O_ACCMODE) == O_RDONLY) ? F_RDLCK : F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW;
+        operation = LOCK_EX;
+        if (flags & O_NONBLOCK)
+                operation |= LOCK_NB;
 
 	trunc = (flags & O_TRUNC);
 	flags &= ~O_TRUNC;
@@ -71,7 +68,7 @@ flopen(const char *path, int flags, ...)
 		if ((fd = open(path, flags, mode)) == -1)
 			/* non-existent or no access */
 			return (-1);
-		if (fcntl(fd, operation, &lock) == -1) {
+		if (flock(fd, operation) == -1) {
 			/* unsupported or interrupted */
 			serrno = errno;
 			(void)close(fd);

Modified: projects/ngroups/lib/libutil/pidfile.3
==============================================================================
--- projects/ngroups/lib/libutil/pidfile.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libutil/pidfile.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -100,6 +100,7 @@ if an error occurs.
 If an error occurs,
 .Va errno
 will be set.
+.Pp
 .Rv -std pidfile_write pidfile_close pidfile_remove
 .Sh EXAMPLES
 The following example shows in which order these functions should be used.

Modified: projects/ngroups/lib/msun/src/math_private.h
==============================================================================
--- projects/ngroups/lib/msun/src/math_private.h	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/msun/src/math_private.h	Fri Jun 12 06:13:53 2009	(r194045)
@@ -262,7 +262,7 @@ irint(double x)
 {
 	int n;
 
-	asm("cvtsd2si %1,%0" : "=r" (n) : "Y" (x));
+	asm("cvtsd2si %1,%0" : "=r" (n) : "x" (x));
 	return (n);
 }
 #define	HAVE_EFFICIENT_IRINT

Modified: projects/ngroups/sbin/dhclient/dhclient.c
==============================================================================
--- projects/ngroups/sbin/dhclient/dhclient.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/dhclient/dhclient.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -1977,7 +1977,7 @@ supersede:
 					len = ip->client->
 					    config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "prepend option",
 						    dhcp_options[i].name);
@@ -1996,24 +1996,34 @@ supersede:
 					dp[len] = '\0';
 					break;
 				case ACTION_APPEND:
+					/*
+					 * When we append, we assume that we're
+					 * appending to text.  Some MS servers
+					 * include a NUL byte at the end of
+					 * the search string provided.
+					 */
 					len = ip->client->
 					    config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "append option",
 						    dhcp_options[i].name);
 						goto supersede;
 					}
-					dp = dbuf;
-					memcpy(dp,
+					memcpy(dbuf,
 						lease->options[i].data,
 						lease->options[i].len);
-					memcpy(dp + lease->options[i].len,
+					for (dp = dbuf + lease->options[i].len;
+					    dp > dbuf; dp--, len--)
+						if (dp[-1] != '\0')
+							break;
+					memcpy(dp,
 						ip->client->
 						config->defaults[i].data,
 						ip->client->
 						config->defaults[i].len);
+					dp = dbuf;
 					dp[len] = '\0';
 				}
 			} else {

Modified: projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8
==============================================================================
--- projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8	Fri Jun 12 06:13:53 2009	(r194045)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 13, 1995
+.Dd June 4, 2009
 .Dt FSCK_MSDOSFS 8
 .Os
 .Sh NAME
@@ -41,10 +41,10 @@
 .Sh SYNOPSIS
 .Nm
 .Fl p
-.Op Fl f
+.Op Fl Cf
 .Ar filesystem ...
 .Nm
-.Op Fl ny
+.Op Fl Cny
 .Ar filesystem ...
 .Sh DESCRIPTION
 The
@@ -80,6 +80,10 @@ making any changes.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl C
+Compatibility with the corresponding
+.Xr fsck 8
+option (skip check if clean), defined to no-op.
 .It Fl F
 Compatibility with the wrapper
 .Xr fsck 8

Modified: projects/ngroups/sbin/fsck_msdosfs/main.c
==============================================================================
--- projects/ngroups/sbin/fsck_msdosfs/main.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/fsck_msdosfs/main.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -74,8 +74,10 @@ main(int argc, char **argv)
 	int ch;
 
 	skipclean = 1;
-	while ((ch = getopt(argc, argv, "fFnpy")) != -1) {
+	while ((ch = getopt(argc, argv, "CfFnpy")) != -1) {
 		switch (ch) {
+		case 'C': /* for fsck_ffs compatibility */
+			break;
 		case 'f':
 			skipclean = 0;
 			break;

Modified: projects/ngroups/sbin/geom/class/part/geom_part.c
==============================================================================
--- projects/ngroups/sbin/geom/class/part/geom_part.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/geom/class/part/geom_part.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 uint32_t PUBSYM(lib_version) = G_LIB_VERSION;
 uint32_t PUBSYM(version) = 0;
 
+static char autofill[] = "*";
 static char optional[] = "";
 static char flags[] = "C";
 
@@ -68,10 +69,10 @@ static void gpart_show(struct gctl_req *
 
 struct g_command PUBSYM(class_commands)[] = {
 	{ "add", 0, gpart_issue, {
-		{ 'b', "start", NULL, G_TYPE_STRING },
-		{ 's', "size", NULL, G_TYPE_STRING },
+		{ 'b', "start", autofill, G_TYPE_ASCLBA },
+		{ 's', "size", autofill, G_TYPE_ASCLBA },
 		{ 't', "type", NULL, G_TYPE_STRING },
-		{ 'i', index_param, optional, G_TYPE_STRING },
+		{ 'i', index_param, optional, G_TYPE_ASCNUM },
 		{ 'l', "label", optional, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
@@ -80,7 +81,7 @@ struct g_command PUBSYM(class_commands)[
 	{ "bootcode", 0, gpart_bootcode, {
 		{ 'b', bootcode_param, optional, G_TYPE_STRING },
 		{ 'p', partcode_param, optional, G_TYPE_STRING },
-		{ 'i', index_param, optional, G_TYPE_STRING },
+		{ 'i', index_param, optional, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -88,13 +89,13 @@ struct g_command PUBSYM(class_commands)[
 	{ "commit", 0, gpart_issue, G_NULL_OPTS, "geom", NULL },
 	{ "create", 0, gpart_issue, {
 		{ 's', "scheme", NULL, G_TYPE_STRING },
-		{ 'n', "entries", optional, G_TYPE_STRING },
+		{ 'n', "entries", optional, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "provider", NULL
 	},
 	{ "delete", 0, gpart_issue, {
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -104,7 +105,7 @@ struct g_command PUBSYM(class_commands)[
 		G_OPT_SENTINEL },
 	  "geom", NULL },
 	{ "modify", 0, gpart_issue, {
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'l', "label", optional, G_TYPE_STRING },
 		{ 't', "type", optional, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
@@ -113,7 +114,7 @@ struct g_command PUBSYM(class_commands)[
 	},
 	{ "set", 0, gpart_issue, {
 		{ 'a', "attrib", NULL, G_TYPE_STRING },
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -127,7 +128,7 @@ struct g_command PUBSYM(class_commands)[
 	{ "undo", 0, gpart_issue, G_NULL_OPTS, "geom", NULL },
 	{ "unset", 0, gpart_issue, {
 		{ 'a', "attrib", NULL, G_TYPE_STRING },
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -240,6 +241,121 @@ fmtattrib(struct gprovider *pp)
 	return (buf);
 }
 
+static int
+gpart_autofill(struct gctl_req *req)
+{
+	struct gmesh mesh;
+	struct gclass *cp;
+	struct ggeom *gp;
+	struct gprovider *pp;
+	unsigned long long first, last;
+	unsigned long long size, start;
+	unsigned long long lba, len, grade;
+	const char *s;
+	char *val;
+	int error, has_size, has_start;
+
+	s = gctl_get_ascii(req, "verb");
+	if (strcmp(s, "add") != 0)
+		return (0);
+
+	s = gctl_get_ascii(req, "size");
+	has_size = (*s == '*') ? 0 : 1;
+	size = (has_size) ? (unsigned long long)atoll(s) : 0ULL;
+
+	s = gctl_get_ascii(req, "start");
+	has_start = (*s == '*') ? 0 : 1;
+	start = (has_start) ? (unsigned long long)atoll(s) : ~0ULL;
+
+	/* No autofill necessary. */
+	if (has_size && has_start)
+		return (0);
+
+	error = geom_gettree(&mesh);
+	if (error)
+		return (error);
+	cp = find_class(&mesh, gctl_get_ascii(req, "class"));
+	gp = find_geom(cp, gctl_get_ascii(req, "geom"));
+	first = atoll(find_geomcfg(gp, "first"));
+	last = atoll(find_geomcfg(gp, "last"));
+	grade = ~0ULL;
+	while ((pp = find_provider(gp, first)) != NULL) {
+		s = find_provcfg(pp, "start");
+		if (s == NULL) {
+			s = find_provcfg(pp, "offset");
+			lba = atoll(s) / pp->lg_sectorsize;
+		} else
+			lba = atoll(s);
+
+		if (first < lba) {
+			/* Free space [first, lba> */
+			len = lba - first;
+			if (has_size) {
+				if (len >= size && len - size < grade) {
+					start = first;
+					grade = len - size;
+				}
+			} else if (has_start) {
+				if (start >= first && start < lba) {
+					size = lba - start;

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

More information about the svn-src-projects mailing list