svn commit: r192403 - in projects/mesh11s: . bin/pkill bin/ps contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/file/Magdir contrib/file/tests contrib/gdb contrib/gdtoa contrib/less cont...

Tue May 19 18:48:13 UTC 2009

Author: rpaulo
Date: Tue May 19 18:48:10 2009
New Revision: 192403
URL: http://svn.freebsd.org/changeset/base/192403

Log:
  MFC 191961:192401

Added:
  projects/mesh11s/contrib/file/Magdir/kml
     - copied unchanged from r192401, head/contrib/file/Magdir/kml
  projects/mesh11s/contrib/file/strlcat.c
     - copied unchanged from r192401, head/contrib/file/strlcat.c
  projects/mesh11s/contrib/file/strlcpy.c
     - copied unchanged from r192401, head/contrib/file/strlcpy.c
  projects/mesh11s/share/man/man4/bwi.4
     - copied unchanged from r192401, head/share/man/man4/bwi.4
  projects/mesh11s/sys/amd64/amd64/mca.c
     - copied unchanged from r192401, head/sys/amd64/amd64/mca.c
  projects/mesh11s/sys/amd64/include/mca.h
     - copied unchanged from r192401, head/sys/amd64/include/mca.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c
     - copied unchanged from r192401, head/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c
     - copied unchanged from r192401, head/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c
     - copied unchanged from r192401, head/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c
  projects/mesh11s/sys/dev/usb/wlan/if_upgt.c
     - copied unchanged from r192401, head/sys/dev/usb/wlan/if_upgt.c
  projects/mesh11s/sys/dev/usb/wlan/if_upgtvar.h
     - copied unchanged from r192401, head/sys/dev/usb/wlan/if_upgtvar.h
  projects/mesh11s/sys/i386/i386/mca.c
     - copied unchanged from r192401, head/sys/i386/i386/mca.c
  projects/mesh11s/sys/i386/include/mca.h
     - copied unchanged from r192401, head/sys/i386/include/mca.h
  projects/mesh11s/sys/modules/usb/upgt/
     - copied from r192401, head/sys/modules/usb/upgt/
  projects/mesh11s/sys/pc98/include/mca.h
     - copied unchanged from r192401, head/sys/pc98/include/mca.h
  projects/mesh11s/sys/powerpc/aim/platform_chrp.c
     - copied unchanged from r192401, head/sys/powerpc/aim/platform_chrp.c
  projects/mesh11s/sys/powerpc/booke/platform_bare.c
     - copied unchanged from r192401, head/sys/powerpc/booke/platform_bare.c
  projects/mesh11s/sys/powerpc/include/platform.h
     - copied unchanged from r192401, head/sys/powerpc/include/platform.h
  projects/mesh11s/sys/powerpc/include/platformvar.h
     - copied unchanged from r192401, head/sys/powerpc/include/platformvar.h
  projects/mesh11s/sys/powerpc/powerpc/platform.c
     - copied unchanged from r192401, head/sys/powerpc/powerpc/platform.c
  projects/mesh11s/sys/powerpc/powerpc/platform_if.m
     - copied unchanged from r192401, head/sys/powerpc/powerpc/platform_if.m
  projects/mesh11s/usr.bin/perror/
     - copied from r192401, head/usr.bin/perror/
Deleted:
  projects/mesh11s/contrib/file/config.guess
  projects/mesh11s/contrib/file/config.sub
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c
  projects/mesh11s/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c
  projects/mesh11s/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c
  projects/mesh11s/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c
  projects/mesh11s/sys/legacy/dev/usb/if_upgt.c
  projects/mesh11s/sys/legacy/dev/usb/if_upgtvar.h
  projects/mesh11s/sys/legacy/dev/usb/usb_ethersubr.c
  projects/mesh11s/sys/legacy/dev/usb/usb_ethersubr.h
  projects/mesh11s/sys/powerpc/include/powerpc.h
Modified:
  projects/mesh11s/   (props changed)
  projects/mesh11s/bin/pkill/pkill.1
  projects/mesh11s/bin/pkill/pkill.c
  projects/mesh11s/bin/ps/print.c
  projects/mesh11s/bin/ps/ps.1
  projects/mesh11s/bin/ps/ps.c
  projects/mesh11s/bin/ps/ps.h
  projects/mesh11s/contrib/bind9/   (props changed)
  projects/mesh11s/contrib/cpio/   (props changed)
  projects/mesh11s/contrib/csup/   (props changed)
  projects/mesh11s/contrib/file/   (props changed)
  projects/mesh11s/contrib/file/ChangeLog
  projects/mesh11s/contrib/file/Magdir/cafebabe
  projects/mesh11s/contrib/file/Magdir/compress
  projects/mesh11s/contrib/file/Magdir/database
  projects/mesh11s/contrib/file/Magdir/erlang
  projects/mesh11s/contrib/file/Magdir/filesystems
  projects/mesh11s/contrib/file/Magdir/fonts
  projects/mesh11s/contrib/file/Magdir/fortran
  projects/mesh11s/contrib/file/Magdir/linux
  projects/mesh11s/contrib/file/Magdir/lisp
  projects/mesh11s/contrib/file/Magdir/python
  projects/mesh11s/contrib/file/Magdir/troff
  projects/mesh11s/contrib/file/Magdir/windows
  projects/mesh11s/contrib/file/Makefile.am
  projects/mesh11s/contrib/file/Makefile.in
  projects/mesh11s/contrib/file/README
  projects/mesh11s/contrib/file/acinclude.m4
  projects/mesh11s/contrib/file/aclocal.m4
  projects/mesh11s/contrib/file/apprentice.c
  projects/mesh11s/contrib/file/apptype.c
  projects/mesh11s/contrib/file/cdf.c
  projects/mesh11s/contrib/file/cdf.h
  projects/mesh11s/contrib/file/cdf_time.c
  projects/mesh11s/contrib/file/compress.c
  projects/mesh11s/contrib/file/config.h.in
  projects/mesh11s/contrib/file/configure
  projects/mesh11s/contrib/file/configure.ac
  projects/mesh11s/contrib/file/file.c
  projects/mesh11s/contrib/file/file.h
  projects/mesh11s/contrib/file/funcs.c
  projects/mesh11s/contrib/file/getopt_long.c
  projects/mesh11s/contrib/file/magic.c
  projects/mesh11s/contrib/file/patchlevel.h
  projects/mesh11s/contrib/file/readcdf.c
  projects/mesh11s/contrib/file/softmagic.c
  projects/mesh11s/contrib/file/tests/Makefile.in
  projects/mesh11s/contrib/gdb/   (props changed)
  projects/mesh11s/contrib/gdtoa/   (props changed)
  projects/mesh11s/contrib/less/   (props changed)
  projects/mesh11s/contrib/libpcap/   (props changed)
  projects/mesh11s/contrib/ncurses/   (props changed)
  projects/mesh11s/contrib/netcat/   (props changed)
  projects/mesh11s/contrib/ntp/   (props changed)
  projects/mesh11s/contrib/openbsm/   (props changed)
  projects/mesh11s/contrib/openpam/   (props changed)
  projects/mesh11s/contrib/pf/   (props changed)
  projects/mesh11s/contrib/sendmail/   (props changed)
  projects/mesh11s/contrib/tcpdump/   (props changed)
  projects/mesh11s/contrib/top/   (props changed)
  projects/mesh11s/contrib/top/install-sh   (props changed)
  projects/mesh11s/contrib/wpa/   (props changed)
  projects/mesh11s/crypto/openssh/   (props changed)
  projects/mesh11s/crypto/openssl/   (props changed)
  projects/mesh11s/etc/defaults/rc.conf
  projects/mesh11s/etc/devd.conf
  projects/mesh11s/etc/namedb/named.conf
  projects/mesh11s/etc/rc.d/named
  projects/mesh11s/etc/rc.d/tmp
  projects/mesh11s/lib/libarchive/archive_read_disk_entry_from_file.c
  projects/mesh11s/lib/libbluetooth/hci.c
  projects/mesh11s/lib/libc/   (props changed)
  projects/mesh11s/lib/libc/gen/getcap.c
  projects/mesh11s/lib/libc/stdio/asprintf.c   (props changed)
  projects/mesh11s/lib/libc/stdtime/   (props changed)
  projects/mesh11s/lib/libc/string/ffsll.c   (props changed)
  projects/mesh11s/lib/libc/string/flsll.c   (props changed)
  projects/mesh11s/lib/libc/string/wcpcpy.c   (props changed)
  projects/mesh11s/lib/libc/string/wcpncpy.c   (props changed)
  projects/mesh11s/lib/libgeom/Makefile
  projects/mesh11s/lib/libmemstat/memstat_malloc.c
  projects/mesh11s/lib/libthr/thread/thr_fork.c
  projects/mesh11s/lib/libusb/   (props changed)
  projects/mesh11s/lib/libusb/libusb.3   (props changed)
  projects/mesh11s/lib/libusb/usb.h   (props changed)
  projects/mesh11s/lib/libutil/   (props changed)
  projects/mesh11s/release/doc/en_US.ISO8859-1/hardware/article.sgml
  projects/mesh11s/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  projects/mesh11s/sbin/   (props changed)
  projects/mesh11s/sbin/geom/core/geom.8
  projects/mesh11s/sbin/ipfw/   (props changed)
  projects/mesh11s/share/man/man4/Makefile
  projects/mesh11s/share/man/man4/ath.4
  projects/mesh11s/share/man/man4/bge.4
  projects/mesh11s/share/man/man4/geom.4
  projects/mesh11s/share/man/man4/hifn.4
  projects/mesh11s/share/man/man4/md.4
  projects/mesh11s/share/man/man4/ubsec.4
  projects/mesh11s/share/man/man4/uchcom.4
  projects/mesh11s/share/man/man4/urtw.4
  projects/mesh11s/share/man/man4/wlan.4
  projects/mesh11s/share/man/man5/fstab.5
  projects/mesh11s/share/man/man5/rc.conf.5
  projects/mesh11s/share/man/man9/bus_dma.9
  projects/mesh11s/share/man/man9/sbuf.9
  projects/mesh11s/share/zoneinfo/   (props changed)
  projects/mesh11s/sys/   (props changed)
  projects/mesh11s/sys/amd64/amd64/machdep.c
  projects/mesh11s/sys/amd64/amd64/mp_machdep.c
  projects/mesh11s/sys/amd64/amd64/pmap.c
  projects/mesh11s/sys/amd64/amd64/trap.c
  projects/mesh11s/sys/amd64/conf/GENERIC.hints
  projects/mesh11s/sys/amd64/include/param.h
  projects/mesh11s/sys/amd64/include/smp.h
  projects/mesh11s/sys/amd64/include/specialreg.h
  projects/mesh11s/sys/amd64/include/vmparam.h
  projects/mesh11s/sys/amd64/include/xen/   (props changed)
  projects/mesh11s/sys/amd64/linux32/linux.h
  projects/mesh11s/sys/amd64/linux32/linux32_sysvec.c
  projects/mesh11s/sys/amd64/pci/pci_cfgreg.c
  projects/mesh11s/sys/arm/arm/machdep.c
  projects/mesh11s/sys/arm/at91/at91.c
  projects/mesh11s/sys/arm/at91/at91_spi.c
  projects/mesh11s/sys/arm/at91/if_ate.c
  projects/mesh11s/sys/boot/forth/loader.conf
  projects/mesh11s/sys/boot/i386/zfsboot/zfsboot.c
  projects/mesh11s/sys/boot/zfs/zfsimpl.c
  projects/mesh11s/sys/cam/cam_periph.c
  projects/mesh11s/sys/cam/scsi/scsi_pass.c
  projects/mesh11s/sys/cam/scsi/scsi_sg.c
  projects/mesh11s/sys/cddl/boot/zfs/README
  projects/mesh11s/sys/cddl/boot/zfs/zfsimpl.h
  projects/mesh11s/sys/cddl/boot/zfs/zfssubr.c
  projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
  projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  projects/mesh11s/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/mesh11s/sys/cddl/compat/opensolaris/sys/rwlock.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c   (props changed)
  projects/mesh11s/sys/compat/linux/linux_mib.c
  projects/mesh11s/sys/compat/linux/linux_mib.h
  projects/mesh11s/sys/compat/linux/linux_misc.c
  projects/mesh11s/sys/compat/linux/linux_misc.h
  projects/mesh11s/sys/compat/linux/linux_socket.c
  projects/mesh11s/sys/compat/linux/linux_socket.h
  projects/mesh11s/sys/compat/ndis/kern_windrv.c
  projects/mesh11s/sys/compat/ndis/subr_ndis.c
  projects/mesh11s/sys/conf/files
  projects/mesh11s/sys/conf/files.amd64
  projects/mesh11s/sys/conf/files.i386
  projects/mesh11s/sys/conf/files.pc98
  projects/mesh11s/sys/conf/files.powerpc
  projects/mesh11s/sys/contrib/altq/altq/altq_subr.c
  projects/mesh11s/sys/contrib/dev/acpica/   (props changed)
  projects/mesh11s/sys/contrib/pf/   (props changed)
  projects/mesh11s/sys/dev/acpi_support/acpi_ibm.c
  projects/mesh11s/sys/dev/acpi_support/acpi_sony.c
  projects/mesh11s/sys/dev/aic/aic.c
  projects/mesh11s/sys/dev/ata/ata-pci.h
  projects/mesh11s/sys/dev/ata/ata-usb.c   (props changed)
  projects/mesh11s/sys/dev/ata/atapi-cam.c
  projects/mesh11s/sys/dev/ata/chipsets/ata-acard.c
  projects/mesh11s/sys/dev/ata/chipsets/ata-promise.c
  projects/mesh11s/sys/dev/ath/ath_hal/ah.c
  projects/mesh11s/sys/dev/ath/ath_hal/ah.h
  projects/mesh11s/sys/dev/ath/ath_hal/ah_internal.h
  projects/mesh11s/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5212/ar5212reg.h
  projects/mesh11s/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/mesh11s/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  projects/mesh11s/sys/dev/ath/if_ath_pci.c
  projects/mesh11s/sys/dev/bce/if_bce.c
  projects/mesh11s/sys/dev/bge/if_bge.c
  projects/mesh11s/sys/dev/bwi/bwimac.c
  projects/mesh11s/sys/dev/bwi/bwiphy.c
  projects/mesh11s/sys/dev/bwi/if_bwi_pci.c
  projects/mesh11s/sys/dev/bwi/if_bwireg.h
  projects/mesh11s/sys/dev/ciss/ciss.c
  projects/mesh11s/sys/dev/cxgb/   (props changed)
  projects/mesh11s/sys/dev/cxgb/cxgb_multiq.c
  projects/mesh11s/sys/dev/e1000/if_em.c
  projects/mesh11s/sys/dev/ed/if_ed.c
  projects/mesh11s/sys/dev/ep/if_ep.c
  projects/mesh11s/sys/dev/flash/at45d.c
  projects/mesh11s/sys/dev/iir/iir_pci.c
  projects/mesh11s/sys/dev/isp/isp_freebsd.c
  projects/mesh11s/sys/dev/ixgb/if_ixgb.c
  projects/mesh11s/sys/dev/lge/if_lge.c
  projects/mesh11s/sys/dev/lmc/if_lmc.c
  projects/mesh11s/sys/dev/malo/if_malo_pci.c
  projects/mesh11s/sys/dev/md/md.c
  projects/mesh11s/sys/dev/nge/if_nge.c
  projects/mesh11s/sys/dev/nge/if_ngereg.h
  projects/mesh11s/sys/dev/snp/snp.c
  projects/mesh11s/sys/dev/sound/usb/uaudio.c   (props changed)
  projects/mesh11s/sys/dev/sound/usb/uaudio.h   (props changed)
  projects/mesh11s/sys/dev/sound/usb/uaudio_pcm.c   (props changed)
  projects/mesh11s/sys/dev/sound/usb/uaudioreg.h   (props changed)
  projects/mesh11s/sys/dev/spibus/spibus.c
  projects/mesh11s/sys/dev/syscons/syscons.c
  projects/mesh11s/sys/dev/usb/README.TXT   (props changed)
  projects/mesh11s/sys/dev/usb/bluetooth/TODO.TXT   (props changed)
  projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt.c   (props changed)
  projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt_var.h   (props changed)
  projects/mesh11s/sys/dev/usb/bluetooth/ubtbcmfw.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/at91dci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/at91dci.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/at91dci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/atmegadci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/atmegadci.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/atmegadci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci_ixp4xx.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci_pci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/musb_otg.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/musb_otg.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci_pci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uhci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uhci.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uhci_pci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/usb_controller.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uss820dci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uss820dci.h   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uss820dci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/input/uhid.c   (props changed)
  projects/mesh11s/sys/dev/usb/input/ukbd.c   (props changed)
  projects/mesh11s/sys/dev/usb/input/ums.c   (props changed)
  projects/mesh11s/sys/dev/usb/input/usb_rdesc.h   (props changed)
  projects/mesh11s/sys/dev/usb/misc/udbp.c   (props changed)
  projects/mesh11s/sys/dev/usb/misc/udbp.h   (props changed)
  projects/mesh11s/sys/dev/usb/misc/ufm.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_aue.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_auereg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_axe.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_axereg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_cdce.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_cdcereg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_cue.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_cuereg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_kue.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_kuefw.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_kuereg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_rue.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_ruereg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_udav.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_udavreg.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/usb_ethernet.c   (props changed)
  projects/mesh11s/sys/dev/usb/net/usb_ethernet.h   (props changed)
  projects/mesh11s/sys/dev/usb/quirk/usb_quirk.c   (props changed)
  projects/mesh11s/sys/dev/usb/quirk/usb_quirk.h   (props changed)
  projects/mesh11s/sys/dev/usb/serial/u3g.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uark.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ubsa.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ubser.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uchcom.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ucycom.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ufoma.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uftdi.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uftdi_reg.h   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ugensa.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uipaq.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ulpt.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/umct.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/umodem.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/umoscom.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uplcom.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/usb_serial.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/usb_serial.h   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uslcom.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uvisor.c   (props changed)
  projects/mesh11s/sys/dev/usb/serial/uvscom.c   (props changed)
  projects/mesh11s/sys/dev/usb/storage/rio500_usb.h   (props changed)
  projects/mesh11s/sys/dev/usb/storage/umass.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/storage/urio.c   (props changed)
  projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template.c   (props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template.h   (props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template_cdce.c   (props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template_msc.c   (props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template_mtp.c   (props changed)
  projects/mesh11s/sys/dev/usb/ufm_ioctl.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_bus.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_busdma.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_busdma.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_cdc.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_compat_linux.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_compat_linux.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_controller.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_core.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_core.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_debug.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_debug.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_defs.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_dev.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_dev.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_device.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_device.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_dynamic.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_dynamic.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_endian.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_error.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_error.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_generic.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_generic.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_handle_request.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_handle_request.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_hid.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_hid.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_hub.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_hub.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_if.m   (props changed)
  projects/mesh11s/sys/dev/usb/usb_ioctl.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_lookup.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_lookup.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_mbuf.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_mbuf.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_mfunc.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_msctest.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_msctest.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_parse.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_parse.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_pci.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_process.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_process.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_request.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_request.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_revision.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_transfer.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_transfer.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_util.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_util.h   (props changed)
  projects/mesh11s/sys/dev/usb/usbdevs   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usbhid.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rum.c   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rumfw.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rumreg.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rumvar.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uath.c
  projects/mesh11s/sys/dev/usb/wlan/if_ural.c   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zyd.c   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h   (props changed)
  projects/mesh11s/sys/dev/vge/if_vge.c
  projects/mesh11s/sys/dev/xen/console/console.c
  projects/mesh11s/sys/dev/xen/console/xencons_ring.c
  projects/mesh11s/sys/dev/xen/console/xencons_ring.h
  projects/mesh11s/sys/dev/xen/netfront/   (props changed)
  projects/mesh11s/sys/dev/xen/netfront/netfront.c
  projects/mesh11s/sys/dev/xen/xenpci/   (props changed)
  projects/mesh11s/sys/fs/cd9660/cd9660_vfsops.c
  projects/mesh11s/sys/fs/coda/coda_vfsops.c
  projects/mesh11s/sys/fs/devfs/devfs.h
  projects/mesh11s/sys/fs/devfs/devfs_vfsops.c
  projects/mesh11s/sys/fs/devfs/devfs_vnops.c
  projects/mesh11s/sys/fs/fdescfs/fdesc.h
  projects/mesh11s/sys/fs/fdescfs/fdesc_vfsops.c
  projects/mesh11s/sys/fs/fdescfs/fdesc_vnops.c
  projects/mesh11s/sys/fs/hpfs/hpfs_vfsops.c
  projects/mesh11s/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/mesh11s/sys/fs/nfs/nfs.h
  projects/mesh11s/sys/fs/nfs/nfs_commonkrpc.c
  projects/mesh11s/sys/fs/nfs/nfs_commonsubs.c
  projects/mesh11s/sys/fs/nfs/nfs_var.h
  projects/mesh11s/sys/fs/nfs/nfsdport.h
  projects/mesh11s/sys/fs/nfs/nfsport.h
  projects/mesh11s/sys/fs/nfs/nfsproto.h
  projects/mesh11s/sys/fs/nfsclient/nfs.h
  projects/mesh11s/sys/fs/nfsclient/nfs_clbio.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clkrpc.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clnode.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clrpcops.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clstate.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clvfsops.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clvnops.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdport.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdsocket.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdsubs.c
  projects/mesh11s/sys/fs/ntfs/ntfs_vfsops.c
  projects/mesh11s/sys/fs/nullfs/null_vfsops.c
  projects/mesh11s/sys/fs/nwfs/nwfs_vfsops.c
  projects/mesh11s/sys/fs/portalfs/portal_vfsops.c
  projects/mesh11s/sys/fs/pseudofs/pseudofs.c
  projects/mesh11s/sys/fs/pseudofs/pseudofs.h
  projects/mesh11s/sys/fs/smbfs/smbfs_io.c
  projects/mesh11s/sys/fs/smbfs/smbfs_vfsops.c
  projects/mesh11s/sys/fs/tmpfs/tmpfs.h
  projects/mesh11s/sys/fs/tmpfs/tmpfs_subr.c
  projects/mesh11s/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/mesh11s/sys/fs/tmpfs/tmpfs_vnops.c
  projects/mesh11s/sys/fs/udf/udf_vfsops.c
  projects/mesh11s/sys/fs/unionfs/union_vfsops.c
  projects/mesh11s/sys/geom/concat/g_concat.c
  projects/mesh11s/sys/geom/journal/g_journal.c
  projects/mesh11s/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/mesh11s/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
  projects/mesh11s/sys/gnu/fs/xfs/FreeBSD/support/debug.h
  projects/mesh11s/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
  projects/mesh11s/sys/i386/conf/GENERIC.hints
  projects/mesh11s/sys/i386/cpufreq/hwpstate.c
  projects/mesh11s/sys/i386/i386/machdep.c
  projects/mesh11s/sys/i386/i386/mp_machdep.c
  projects/mesh11s/sys/i386/i386/pmap.c
  projects/mesh11s/sys/i386/i386/trap.c
  projects/mesh11s/sys/i386/include/param.h
  projects/mesh11s/sys/i386/include/smp.h
  projects/mesh11s/sys/i386/include/specialreg.h
  projects/mesh11s/sys/i386/linux/linux.h
  projects/mesh11s/sys/i386/linux/linux_sysvec.c
  projects/mesh11s/sys/i386/pci/pci_cfgreg.c
  projects/mesh11s/sys/i386/xen/mp_machdep.c
  projects/mesh11s/sys/ia64/ia64/elf_machdep.c
  projects/mesh11s/sys/ia64/ia64/machdep.c
  projects/mesh11s/sys/ia64/ia64/pmap.c
  projects/mesh11s/sys/ia64/include/md_var.h
  projects/mesh11s/sys/kern/kern_acct.c
  projects/mesh11s/sys/kern/kern_clock.c
  projects/mesh11s/sys/kern/kern_descrip.c
  projects/mesh11s/sys/kern/kern_intr.c
  projects/mesh11s/sys/kern/kern_lock.c
  projects/mesh11s/sys/kern/kern_sysctl.c
  projects/mesh11s/sys/kern/subr_rman.c
  projects/mesh11s/sys/kern/sys_generic.c
  projects/mesh11s/sys/kern/tty.c
  projects/mesh11s/sys/kern/tty_info.c
  projects/mesh11s/sys/kern/uipc_mqueue.c
  projects/mesh11s/sys/kern/uipc_syscalls.c
  projects/mesh11s/sys/kern/vfs_bio.c
  projects/mesh11s/sys/kern/vfs_default.c
  projects/mesh11s/sys/kern/vfs_export.c
  projects/mesh11s/sys/kern/vfs_extattr.c
  projects/mesh11s/sys/kern/vfs_lookup.c
  projects/mesh11s/sys/kern/vfs_mount.c
  projects/mesh11s/sys/kern/vfs_subr.c
  projects/mesh11s/sys/kern/vfs_syscalls.c
  projects/mesh11s/sys/kern/vfs_vnops.c
  projects/mesh11s/sys/legacy/dev/ata/ata-usb.c   (props changed)
  projects/mesh11s/sys/legacy/dev/sound/usb/uaudio.c   (props changed)
  projects/mesh11s/sys/legacy/dev/sound/usb/uaudio.h   (props changed)
  projects/mesh11s/sys/legacy/dev/sound/usb/uaudio_pcm.c   (props changed)
  projects/mesh11s/sys/legacy/dev/sound/usb/uaudioreg.h   (props changed)
  projects/mesh11s/sys/legacy/dev/usb/   (props changed)
  projects/mesh11s/sys/legacy/dev/usb/ehci_ixp4xx.c   (props changed)
  projects/mesh11s/sys/mips/mips/machdep.c
  projects/mesh11s/sys/mips/mips/pm_machdep.c
  projects/mesh11s/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/mesh11s/sys/modules/ip6_mroute_mod/   (props changed)
  projects/mesh11s/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/mesh11s/sys/modules/sound/sound/Makefile
  projects/mesh11s/sys/modules/usb/Makefile
  projects/mesh11s/sys/modules/xfs/Makefile
  projects/mesh11s/sys/modules/zfs/Makefile
  projects/mesh11s/sys/net/bpf.c
  projects/mesh11s/sys/net/netisr.c
  projects/mesh11s/sys/net/netisr.h
  projects/mesh11s/sys/net80211/ieee80211.h
  projects/mesh11s/sys/net80211/ieee80211_freebsd.c
  projects/mesh11s/sys/net80211/ieee80211_node.c
  projects/mesh11s/sys/netgraph/netflow/ng_netflow.c
  projects/mesh11s/sys/netinet/in.c
  projects/mesh11s/sys/netinet/in_pcb.c
  projects/mesh11s/sys/netinet/in_pcb.h
  projects/mesh11s/sys/netinet/ip_fw2.c
  projects/mesh11s/sys/netinet6/in6.c
  projects/mesh11s/sys/netinet6/ip6_mroute.c
  projects/mesh11s/sys/nfs/nfs_common.c
  projects/mesh11s/sys/nfs4client/nfs4_vfsops.c
  projects/mesh11s/sys/nfsclient/nfs.h
  projects/mesh11s/sys/nfsclient/nfs_bio.c
  projects/mesh11s/sys/nfsclient/nfs_vfsops.c
  projects/mesh11s/sys/nfsserver/nfs_serv.c
  projects/mesh11s/sys/pc98/pc98/machdep.c
  projects/mesh11s/sys/powerpc/aim/clock.c
  projects/mesh11s/sys/powerpc/aim/machdep.c
  projects/mesh11s/sys/powerpc/aim/mmu_oea.c
  projects/mesh11s/sys/powerpc/aim/mmu_oea64.c
  projects/mesh11s/sys/powerpc/aim/mp_cpudep.c
  projects/mesh11s/sys/powerpc/aim/ofw_machdep.c
  projects/mesh11s/sys/powerpc/aim/vm_machdep.c
  projects/mesh11s/sys/powerpc/booke/clock.c
  projects/mesh11s/sys/powerpc/booke/machdep.c
  projects/mesh11s/sys/powerpc/booke/pmap.c
  projects/mesh11s/sys/powerpc/booke/vm_machdep.c
  projects/mesh11s/sys/powerpc/include/cpufunc.h
  projects/mesh11s/sys/powerpc/include/md_var.h
  projects/mesh11s/sys/powerpc/include/ofw_machdep.h
  projects/mesh11s/sys/powerpc/include/pmap.h
  projects/mesh11s/sys/powerpc/include/smp.h
  projects/mesh11s/sys/powerpc/include/spr.h
  projects/mesh11s/sys/powerpc/powerpc/mp_machdep.c
  projects/mesh11s/sys/powerpc/powerpc/pmap_dispatch.c
  projects/mesh11s/sys/security/audit/audit_worker.c
  projects/mesh11s/sys/sparc64/sparc64/machdep.c
  projects/mesh11s/sys/sparc64/sparc64/vm_machdep.c
  projects/mesh11s/sys/sun4v/sun4v/machdep.c
  projects/mesh11s/sys/sys/_null.h
  projects/mesh11s/sys/sys/buf.h
  projects/mesh11s/sys/sys/eventhandler.h
  projects/mesh11s/sys/sys/filedesc.h
  projects/mesh11s/sys/sys/mount.h
  projects/mesh11s/sys/sys/param.h
  projects/mesh11s/sys/sys/systm.h
  projects/mesh11s/sys/sys/vimage.h
  projects/mesh11s/sys/ufs/ffs/ffs_alloc.c
  projects/mesh11s/sys/ufs/ffs/ffs_vfsops.c
  projects/mesh11s/sys/ufs/ufs/extattr.h
  projects/mesh11s/sys/ufs/ufs/ufs_extattr.c
  projects/mesh11s/sys/ufs/ufs/ufs_vfsops.c
  projects/mesh11s/sys/vm/vm_page.c
  projects/mesh11s/sys/vm/vm_page.h
  projects/mesh11s/sys/vm/vm_pageout.c
  projects/mesh11s/sys/vm/vnode_pager.c
  projects/mesh11s/sys/xen/evtchn.h   (props changed)
  projects/mesh11s/sys/xen/hypervisor.h   (props changed)
  projects/mesh11s/sys/xen/xen_intr.h   (props changed)
  projects/mesh11s/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_g.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_s.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/pkill/pkill-_g.t   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/mesh11s/tools/tools/net80211/scripts/setup.tdma-slave
  projects/mesh11s/usr.bin/Makefile
  projects/mesh11s/usr.bin/csup/   (props changed)
  projects/mesh11s/usr.bin/find/function.c
  projects/mesh11s/usr.bin/procstat/   (props changed)
  projects/mesh11s/usr.bin/truss/amd64-fbsd.c
  projects/mesh11s/usr.bin/truss/amd64-fbsd32.c
  projects/mesh11s/usr.bin/truss/amd64-linux32.c
  projects/mesh11s/usr.bin/truss/i386-fbsd.c
  projects/mesh11s/usr.bin/truss/i386-linux.c
  projects/mesh11s/usr.bin/truss/ia64-fbsd.c
  projects/mesh11s/usr.bin/truss/main.c
  projects/mesh11s/usr.bin/truss/mips-fbsd.c
  projects/mesh11s/usr.bin/truss/powerpc-fbsd.c
  projects/mesh11s/usr.bin/truss/sparc64-fbsd.c
  projects/mesh11s/usr.bin/truss/syscall.h
  projects/mesh11s/usr.bin/truss/syscalls.c
  projects/mesh11s/usr.bin/truss/truss.1
  projects/mesh11s/usr.bin/truss/truss.h
  projects/mesh11s/usr.sbin/bluetooth/btpand/btpand.c
  projects/mesh11s/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c
  projects/mesh11s/usr.sbin/dumpcis/cardinfo.h   (props changed)
  projects/mesh11s/usr.sbin/dumpcis/cis.h   (props changed)
  projects/mesh11s/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/mesh11s/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/mesh11s/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/mesh11s/usr.sbin/makefs/getid.c   (props changed)
  projects/mesh11s/usr.sbin/mergemaster/mergemaster.sh
  projects/mesh11s/usr.sbin/pkg_install/lib/lib.h
  projects/mesh11s/usr.sbin/pkg_install/lib/plist.c
  projects/mesh11s/usr.sbin/sysinstall/tcpip.c
  projects/mesh11s/usr.sbin/zic/   (props changed)

Modified: projects/mesh11s/bin/pkill/pkill.1
==============================================================================

--- projects/mesh11s/bin/pkill/pkill.1	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/bin/pkill/pkill.1	Tue May 19 18:48:10 2009	(r192403)
@@ -36,7 +36,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 23, 2006
+.Dd May 16, 2009
 .Dt PKILL 1
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Nd find or signal processes by name
 .Sh SYNOPSIS
 .Nm pgrep
-.Op Fl LSfilnovx
+.Op Fl LSafilnovx
 .Op Fl F Ar pidfile
 .Op Fl G Ar gid
 .Op Fl M Ar core
@@ -60,7 +60,7 @@
 .Ar pattern ...
 .Nm pkill
 .Op Fl Ar signal
-.Op Fl ILfinovx
+.Op Fl ILafinovx
 .Op Fl F Ar pidfile
 .Op Fl G Ar gid
 .Op Fl M Ar core
@@ -128,6 +128,15 @@ The default is a newline.
 This option can only be used with the
 .Nm pgrep
 command.
+.It Fl a
+Include process ancestors in the match list.
+By default, the current
+.Nm pgrep
+or
+.Nm pkill
+process and all of its ancestors are excluded (unless
+.Fl v
+is used).
 .It Fl f
 Match against full argument lists.
 The default is to match against process names.

Modified: projects/mesh11s/bin/pkill/pkill.c
==============================================================================
--- projects/mesh11s/bin/pkill/pkill.c	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/bin/pkill/pkill.c	Tue May 19 18:48:10 2009	(r192403)
@@ -133,7 +133,7 @@ main(int argc, char **argv)
 {
 	char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile;
 	const char *execf, *coref;
-	int debug_opt;
+	int ancestors, debug_opt;
 	int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock;
 	size_t jsz;
 	int (*action)(const struct kinfo_proc *);
@@ -142,6 +142,7 @@ main(int argc, char **argv)
 	struct timeval best_tval;
 	regex_t reg;
 	regmatch_t regmatch;
+	pid_t pid;
 
 	setlocale(LC_ALL, "");
 
@@ -174,13 +175,14 @@ main(int argc, char **argv)
 		}
 	}
 
+	ancestors = 0;
 	criteria = 0;
 	debug_opt = 0;
 	pidfile = NULL;
 	pidfilelock = 0;
 	execf = coref = _PATH_DEVNULL;
 
-	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:d:fg:ij:lnos:t:u:vx")) != -1)
+	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1)
 		switch (ch) {
 		case 'D':
 			debug_opt++;
@@ -220,6 +222,9 @@ main(int argc, char **argv)
 			makelist(&ruidlist, LT_USER, optarg);
 			criteria = 1;
 			break;
+		case 'a':
+			ancestors++;
+			break;
 		case 'd':
 			if (!pgrep)
 				usage();
@@ -468,6 +473,27 @@ main(int argc, char **argv)
 			selected[i] = 1;
 	}
 
+	if (!ancestors) {
+		pid = mypid;
+		while (pid) {
+			for (i = 0, kp = plist; i < nproc; i++, kp++) {
+				if (PSKIP(kp))
+					continue;
+				if (kp->ki_pid == pid) {
+					selected[i] = 0;
+					pid = kp->ki_ppid;
+					break;
+				}
+			}
+			if (i == nproc) {
+				if (pid == mypid)
+					pid = getppid();
+				else
+					break;	/* Maybe we're in a jail ? */
+			}
+		}
+	}
+
 	if (newest || oldest) {
 		best_tval.tv_sec = 0;
 		best_tval.tv_usec = 0;

Modified: projects/mesh11s/bin/ps/print.c
==============================================================================
--- projects/mesh11s/bin/ps/print.c	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/bin/ps/print.c	Tue May 19 18:48:10 2009	(r192403)
@@ -130,9 +130,11 @@ command(KINFO *k, VARENT *ve)
 	if (cflag) {
 		/* If it is the last field, then don't pad */
 		if (STAILQ_NEXT(ve, next_ve) == NULL) {
+			if (k->ki_d.prefix)
+				(void)printf("%s", k->ki_d.prefix);
 			(void)printf("%s", k->ki_p->ki_comm);
 			if (showthreads && k->ki_p->ki_numthreads > 1)
-				printf("/%s", k->ki_p->ki_ocomm);
+				(void)printf("/%s", k->ki_p->ki_ocomm);
 		} else
 			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 		return;
@@ -140,16 +142,22 @@ command(KINFO *k, VARENT *ve)
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
-	if (k->ki_env) {
-		if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1)) == NULL)
-			errx(1, "malloc failed");
-		strvis(vis_env, k->ki_env, VIS_TAB | VIS_NL | VIS_NOSLASH);
-	} else
-		vis_env = NULL;
 
 	if (STAILQ_NEXT(ve, next_ve) == NULL) {
 		/* last field */
+
+		if (k->ki_env) {
+			if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1))
+			    == NULL)
+				errx(1, "malloc failed");
+			strvis(vis_env, k->ki_env,
+			    VIS_TAB | VIS_NL | VIS_NOSLASH);
+		} else
+			vis_env = NULL;
+
 		if (termwidth == UNLIMITED) {
+			if (k->ki_d.prefix)
+				(void)printf("%s", k->ki_d.prefix);
 			if (vis_env)
 				(void)printf("%s ", vis_env);
 			(void)printf("%s", vis_args);
@@ -157,6 +165,9 @@ command(KINFO *k, VARENT *ve)
 			left = termwidth - (totwidth - v->width);
 			if (left < 1) /* already wrapped, just use std width */
 				left = v->width;
+			if ((cp = k->ki_d.prefix) != NULL)
+				while (--left >= 0 && *cp)
+					(void)putchar(*cp++);
 			if ((cp = vis_env) != NULL) {
 				while (--left >= 0 && *cp)
 					(void)putchar(*cp++);
@@ -166,12 +177,12 @@ command(KINFO *k, VARENT *ve)
 			for (cp = vis_args; --left >= 0 && *cp != '\0';)
 				(void)putchar(*cp++);
 		}
+		if (vis_env != NULL)
+			free(vis_env);
 	} else
-		/* XXX env? */
+		/* ki_d.prefix & ki_env aren't shown for interim fields */
 		(void)printf("%-*.*s", v->width, v->width, vis_args);
 	free(vis_args);
-	if (vis_env != NULL)
-		free(vis_env);
 }
 
 void
@@ -182,6 +193,8 @@ ucomm(KINFO *k, VARENT *ve)
 
 	v = ve->var;
 	if (STAILQ_NEXT(ve, next_ve) == NULL) {	/* last field, don't pad */
+		if (k->ki_d.prefix)
+			(void)printf("%s", k->ki_d.prefix);
 		(void)printf("%s", k->ki_p->ki_comm);
 		if (showthreads && k->ki_p->ki_numthreads > 1)
 			printf("/%s", k->ki_p->ki_ocomm);

Modified: projects/mesh11s/bin/ps/ps.1
==============================================================================
--- projects/mesh11s/bin/ps/ps.1	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/bin/ps/ps.1	Tue May 19 18:48:10 2009	(r192403)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd August 21, 2006
+.Dd May 16, 2009
 .Dt PS 1
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nd process status
 .Sh SYNOPSIS
 .Nm
-.Op Fl aCcefHhjlmrSTuvwXxZ
+.Op Fl aCcdefHhjlmrSTuvwXxZ
 .Op Fl O Ar fmt | Fl o Ar fmt
 .Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ...
 .Op Fl M Ar core
@@ -122,6 +122,15 @@ CPU calculation that ignores
 .Dq resident
 time (this normally has
 no effect).
+.It Fl d
+Arrange processes into descendancy order and prefix each command with
+indentation text showing sibling and parent/child relationships.
+If either of the
+.Fl m
+and
+.Fl r
+options are also used, they control how sibling processes are sorted
+relative to eachother.
 .It Fl e
 Display the environment as well.
 .It Fl f

Modified: projects/mesh11s/bin/ps/ps.c
==============================================================================
--- projects/mesh11s/bin/ps/ps.c	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/bin/ps/ps.c	Tue May 19 18:48:10 2009	(r192403)
@@ -138,6 +138,7 @@ static int	 addelem_pid(struct listinfo 
 static int	 addelem_tty(struct listinfo *, const char *);
 static int	 addelem_uid(struct listinfo *, const char *);
 static void	 add_list(struct listinfo *, const char *);
+static void	 descendant_sort(KINFO *, int);
 static void	 dynsizevars(KINFO *);
 static void	*expand_list(struct listinfo *);
 static const char *
@@ -163,7 +164,7 @@ static char vfmt[] = "pid,state,time,sl,
 			"%cpu,%mem,command";
 static char Zfmt[] = "label";
 
-#define	PS_ARGS	"AaCce" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ"
+#define	PS_ARGS	"AaCcde" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ"
 
 int
 main(int argc, char *argv[])
@@ -177,7 +178,7 @@ main(int argc, char *argv[])
 	const char *nlistf, *memf;
 	char *cols;
 	int all, ch, elem, flag, _fmt, i, lineno;
-	int nentries, nkept, nselectors;
+	int descendancy, nentries, nkept, nselectors;
 	int prtheader, wflag, what, xkeep, xkeep_implied;
 	char errbuf[_POSIX2_LINE_MAX];
 
@@ -201,7 +202,7 @@ main(int argc, char *argv[])
 	if (argc > 1)
 		argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]);
 
-	all = _fmt = nselectors = optfatal = 0;
+	all = descendancy = _fmt = nselectors = optfatal = 0;
 	prtheader = showthreads = wflag = xkeep_implied = 0;
 	xkeep = -1;			/* Neither -x nor -X. */
 	init_list(&gidlist, addelem_gid, sizeof(gid_t), "group");
@@ -233,6 +234,9 @@ main(int argc, char *argv[])
 		case 'c':
 			cflag = 1;
 			break;
+		case 'd':
+			descendancy = 1;
+			break;
 		case 'e':			/* XXX set ufmt */
 			needenv = 1;
 			break;
@@ -575,6 +579,8 @@ main(int argc, char *argv[])
 		keepit:
 			next_KINFO = &kinfo[nkept];
 			next_KINFO->ki_p = kp;
+			next_KINFO->ki_d.level = 0;
+			next_KINFO->ki_d.prefix = NULL;
 			next_KINFO->ki_pcpu = getpcpu(next_KINFO);
 			if (sortby == SORTMEM)
 				next_KINFO->ki_memsize = kp->ki_tsize +
@@ -599,6 +605,13 @@ main(int argc, char *argv[])
 	 * sort proc list
 	 */
 	qsort(kinfo, nkept, sizeof(KINFO), pscomp);
+
+	/*
+	 * We want things in descendant order
+	 */
+	if (descendancy)
+		descendant_sort(kinfo, nkept);
+
 	/*
 	 * For each process, call each variable output function.
 	 */
@@ -622,6 +635,9 @@ main(int argc, char *argv[])
 	free_list(&sesslist);
 	free_list(&ttylist);
 	free_list(&uidlist);
+	for (i = 0; i < nkept; i++)
+		free(kinfo[i].ki_d.prefix);
+	free(kinfo);
 
 	exit(eval);
 }
@@ -748,7 +764,7 @@ addelem_tty(struct listinfo *inf, const 
 		strlcat(pathbuf2, elem, sizeof(pathbuf2));
 		if (stat(pathbuf2, &sb) == 0 && S_ISCHR(sb.st_mode)) {
 			/* No need to repeat stat() && S_ISCHR() checks */
-			ttypath = NULL;	
+			ttypath = NULL;
 			break;
 		}
 		/* Check to see if /dev/pts/${elem} exists */
@@ -756,7 +772,7 @@ addelem_tty(struct listinfo *inf, const 
 		strlcat(pathbuf3, elem, sizeof(pathbuf3));
 		if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) {
 			/* No need to repeat stat() && S_ISCHR() checks */
-			ttypath = NULL;	
+			ttypath = NULL;
 			break;
 		}
 		break;
@@ -890,6 +906,115 @@ add_list(struct listinfo *inf, const cha
 	}
 }
 
+static void
+descendant_sort(KINFO *ki, int items)
+{
+	int dst, lvl, maxlvl, n, ndst, nsrc, siblings, src;
+	unsigned char *path;
+	KINFO kn;
+
+	/*
+	 * First, sort the entries by descendancy, tracking the descendancy
+	 * depth in the ki_d.level field.
+	 */
+	src = 0;
+	maxlvl = 0;
+	while (src < items) {
+		if (ki[src].ki_d.level) {
+			src++;
+			continue;
+		}
+		for (nsrc = 1; src + nsrc < items; nsrc++)
+			if (!ki[src + nsrc].ki_d.level)
+				break;
+
+		for (dst = 0; dst < items; dst++) {
+			if (ki[dst].ki_p->ki_pid == ki[src].ki_p->ki_pid)
+				continue;
+			if (ki[dst].ki_p->ki_pid == ki[src].ki_p->ki_ppid)
+				break;
+		}
+
+		if (dst == items) {
+			src += nsrc;
+			continue;
+		}
+
+		for (ndst = 1; dst + ndst < items; ndst++)
+			if (ki[dst + ndst].ki_d.level <= ki[dst].ki_d.level)
+				break;
+
+		for (n = src; n < src + nsrc; n++) {
+			ki[n].ki_d.level += ki[dst].ki_d.level + 1;
+			if (maxlvl < ki[n].ki_d.level)
+				maxlvl = ki[n].ki_d.level;
+		}
+
+		while (nsrc) {
+			if (src < dst) {
+				kn = ki[src];
+				memmove(ki + src, ki + src + 1,
+				    (dst - src + ndst - 1) * sizeof *ki);
+				ki[dst + ndst - 1] = kn;
+				nsrc--;
+				dst--;
+				ndst++;
+			} else if (src != dst + ndst) {
+				kn = ki[src];
+				memmove(ki + dst + ndst + 1, ki + dst + ndst,
+				    (src - dst - ndst) * sizeof *ki);
+				ki[dst + ndst] = kn;
+				ndst++;
+				nsrc--;
+				src++;
+			} else {
+				ndst += nsrc;
+				src += nsrc;
+				nsrc = 0;
+			}
+		}
+	}
+
+	/*
+	 * Now populate ki_d.prefix (instead of ki_d.level) with the command
+	 * prefix used to show descendancies.
+	 */
+	path = malloc((maxlvl + 7) / 8);
+	memset(path, '\0', (maxlvl + 7) / 8);
+	for (src = 0; src < items; src++) {
+		if ((lvl = ki[src].ki_d.level) == 0) {
+			ki[src].ki_d.prefix = NULL;
+			continue;
+		}
+		if ((ki[src].ki_d.prefix = malloc(lvl * 2 + 1)) == NULL)
+			errx(1, "malloc failed");
+		for (n = 0; n < lvl - 2; n++) {
+			ki[src].ki_d.prefix[n * 2] =
+			    path[n / 8] & 1 << (n % 8) ? '|' : ' ';
+			ki[src].ki_d.prefix[n * 2 + 1] = ' ';
+		}
+		if (n == lvl - 2) {
+			/* Have I any more siblings? */
+			for (siblings = 0, dst = src + 1; dst < items; dst++) {
+				if (ki[dst].ki_d.level > lvl)
+					continue;
+				if (ki[dst].ki_d.level == lvl)
+					siblings = 1;
+				break;
+			}
+			if (siblings)
+				path[n / 8] |= 1 << (n % 8);
+			else
+				path[n / 8] &= ~(1 << (n % 8));
+			ki[src].ki_d.prefix[n * 2] = siblings ? '|' : '`';
+			ki[src].ki_d.prefix[n * 2 + 1] = '-';
+			n++;
+		}
+		strcpy(ki[src].ki_d.prefix + n * 2, "- ");
+	}
+	free(path);
+}
+
 static void *
 expand_list(struct listinfo *inf)
 {

Modified: projects/mesh11s/bin/ps/ps.h
==============================================================================
--- projects/mesh11s/bin/ps/ps.h	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/bin/ps/ps.h	Tue May 19 18:48:10 2009	(r192403)
@@ -42,6 +42,10 @@ typedef struct kinfo {
 	int ki_valid;		/* 1 => uarea stuff valid */
 	double	 ki_pcpu;	/* calculated in main() */
 	segsz_t	 ki_memsize;	/* calculated in main() */
+	union {
+		int level;	/* used in decendant_sort() */
+		char *prefix;	/* calculated in decendant_sort() */
+	} ki_d;
 } KINFO;
 
 /* Variables. */

Modified: projects/mesh11s/contrib/file/ChangeLog
==============================================================================
--- projects/mesh11s/contrib/file/ChangeLog	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/ChangeLog	Tue May 19 18:48:10 2009	(r192403)
@@ -1,3 +1,59 @@
+2009-05-06  10:25  Christos Zoulas <christos at zoulas.com>
+
+	* Avoid null dereference in cdf code (Drew Yao)
+
+	* More cdf bounds checks and overflow checks
+
+2009-05-01  18:37  Christos Zoulas <christos at zoulas.com>
+
+	* Buffer overflow fixes from Drew Yao
+
+2009-04-30  17:10  Christos Zoulas <christos at zoulas.com>
+
+	* Fix more cdf lossage. All the documents I have
+	  right now print the correct information.
+
+2009-03-27  18:43  Christos Zoulas <christos at zoulas.com>
+
+	* don't print \012- separators in the same magic entry 
+	  if it consists of multiple magic printing lines.
+
+2009-03-23  10:20  Christos Zoulas <christos at zoulas.com>
+
+	* Avoid file descriptor leak in compress code from
+	  (Daniel Novotny)
+
+2009-03-18  16:50  Christos Zoulas <christos at zoulas.com>
+
+	* Allow escaping of relation characters, so that we can say \^[A-Z]
+	  and the ^ is not eaten as a relation char.
+
+	* Fix troff and fortran to their previous glory using
+	  regex. This was broken since their removel from ascmagic.
+
+2009-03-10  16:50  Christos Zoulas <christos at zoulas.com>
+
+	* don't use strlen in strndup() (Toby Peterson)
+
+2009-03-10  7:45  Christos Zoulas <christos at zoulas.com>
+
+	* avoid c99 syntax.
+
+2009-02-23 15:45  Christos Zoulas <christos at zoulas.com>
+
+	* make the cdf code use the buffer first if available,
+	  and then the fd code.
+
+2009-02-13 13:45  Christos Zoulas <christos at zoulas.com>
+
+	* look for struct option to determine if getopt.h is usable for IRIX.
+
+	* sanitize cdf document strings
+
+2009-02-04 13:25  Christos Zoulas <christos at zoulas.com>
+
+	* fix OS/2 warnings.
+
 2008-12-12 15:50  Christos Zoulas <christos at zoulas.com>
 
 	* fix initial offset calculation for non 4K sector files

Modified: projects/mesh11s/contrib/file/Magdir/cafebabe
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/cafebabe	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/cafebabe	Tue May 19 18:48:10 2009	(r192403)
@@ -17,6 +17,15 @@
 >4	belong		>30		compiled Java class data,
 >>6	beshort		x	        version %d.
 >>4	beshort		x       	\b%d
+# Which is which?
+#>>4	belong		0x032d		(Java 1.0)
+#>>4	belong		0x032d		(Java 1.1)
+>>4	belong		0x002e		(Java 1.2)
+>>4	belong		0x002f		(Java 1.3)
+>>4	belong		0x0030		(Java 1.4)
+>>4	belong		0x0031		(Java 1.5)
+>>4	belong		0x0032		(Java 1.6)
+
 
 0	belong		0xcafebabe
 >4	belong		1		Mach-O fat file with 1 architecture

Modified: projects/mesh11s/contrib/file/Magdir/compress
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/compress	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/compress	Tue May 19 18:48:10 2009	(r192403)
@@ -195,6 +195,10 @@
 # bug #364260)
 #0	string		]\000\000\200\000	LZMA compressed data
 
+# http://tukaani.org/xz/xz-file-format.txt
+0	ustring		\xFD7zXZ\x00		xz compressed data
+!:mime	application/x-xz
+
 # AFX compressed files (Wolfram Kleff)
 2	string		-afx-		AFX compressed file data
 
@@ -208,3 +212,8 @@
 >4	byte		x		- version %d
 >5	byte		x		\b.%d
 >6	belong		x		(%d bytes)
+
+# Type: XZ
+# URL: http://tukaani.org/xz/
+0	string		\xfd\x37\x7a\x58\x5a\x00	XZ compressed data
+!:mime application/x-xz

Modified: projects/mesh11s/contrib/file/Magdir/database
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/database	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/database	Tue May 19 18:48:10 2009	(r192403)
@@ -242,3 +242,28 @@
 # URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
 # From: Nicolas Chauvat <nicolas.chauvat at logilab.fr>
 0	string	@(#)ADF\ Database	CGNS Advanced Data Format
+
+# Tokyo Cabinet magic data
+# http://tokyocabinet.sourceforge.net/index.html
+0	string		ToKyO\ CaBiNeT\n	Tokyo Cabinet
+>14	string		x			\b (%s)
+>32	byte		0			\b, Hash
+!:mime	application/x-tokyocabinet-hash
+>32	byte		1			\b, B+ tree
+!:mime	application/x-tokyocabinet-btree
+>32	byte		2			\b, Fixed-length
+!:mime	application/x-tokyocabinet-fixed
+>32	byte		3			\b, Table
+!:mime	application/x-tokyocabinet-table
+>33	byte		&1			\b, [open]
+>33	byte		&2			\b, [fatal]
+>34	byte		x			\b, apow=%d
+>35	byte		x			\b, fpow=%d
+>36	byte		&0x01			\b, [large]
+>36	byte		&0x02			\b, [deflate]
+>36	byte		&0x04			\b, [bzip]
+>36	byte		&0x08			\b, [tcbs]
+>36	byte		&0x10			\b, [excodec]
+>40	lequad		x			\b, bnum=%lld
+>48	lequad		x			\b, rnum=%lld
+>56	lequad		x			\b, fsiz=%lld

Modified: projects/mesh11s/contrib/file/Magdir/erlang
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/erlang	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/erlang	Tue May 19 18:48:10 2009	(r192403)
@@ -12,7 +12,7 @@
 >8	string	BEAM		Erlang BEAM file
 
 # 4.2 version may have a copyright notice!
-4	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
-79	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
+4	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
+79	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
 
-4	string	1.0 Fri Feb 3 09:55:56 MET 1995	Erlang JAM file - version 4.3
+4	string	1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995	Erlang JAM file - version 4.3

Modified: projects/mesh11s/contrib/file/Magdir/filesystems
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/filesystems	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/filesystems	Tue May 19 18:48:10 2009	(r192403)
@@ -891,7 +891,7 @@
 0x410	leshort		0x2478		Minix filesystem, version 2, 30 char names
 
 # romfs filesystems - Juan Cespedes <cespedes at debian.org>
-0	string		-rom1fs-\0	romfs filesystem, version 1
+0	string		-rom1fs-	romfs filesystem, version 1
 >8	belong	x			%d bytes,
 >16	string	x			named %s.
 

Modified: projects/mesh11s/contrib/file/Magdir/fonts
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/fonts	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/fonts	Tue May 19 18:48:10 2009	(r192403)
@@ -6,8 +6,8 @@
 0	short		017001		byte-swapped Berkeley vfont data
 
 # PostScript fonts (must precede "printer" entries), quinlan at yggdrasil.com
-0	search/1	%!PS-AdobeFont-1.	PostScript Type 1 font text
->20	search/1	>\0			(%s)
+0	string		%!PS-AdobeFont-1.	PostScript Type 1 font text
+>20	string		>\0			(%s)
 6	string		%!PS-AdobeFont-1.	PostScript Type 1 font program data
 
 # X11 font files in SNF (Server Natural Format) format
@@ -55,6 +55,8 @@
 0	string		\007\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
 0	string		\012\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
 
+0	string		ttcf		TrueType font collection data
+
 # Opentype font data from Avi Bercovich
 0	string		OTTO		OpenType font data 
 

Modified: projects/mesh11s/contrib/file/Magdir/fortran
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/fortran	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/fortran	Tue May 19 18:48:10 2009	(r192403)
@@ -1,3 +1,3 @@
 # FORTRAN source
-0	string/c	c\ 		FORTRAN program
+0	regex/100	\^[Cc][\ \t]	FORTRAN program
 !:mime	text/x-fortran

Copied: projects/mesh11s/contrib/file/Magdir/kml (from r192401, head/contrib/file/Magdir/kml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/mesh11s/contrib/file/Magdir/kml	Tue May 19 18:48:10 2009	(r192403, copy of r192401, head/contrib/file/Magdir/kml)
@@ -0,0 +1,32 @@
+#------------------------------------------------------------------------------
+# Type: Google KML, formerly Keyhole Markup Language
+# Future development of this format has been handed
+# over to the Open Geospatial Consortium.
+# http://www.opengeospatial.org/standards/kml/
+# From: Asbjoern Sloth Toennesen <asbjorn at lila.io>
+0 string    \<?xml
+>20  search/400 \ xmlns= 
+>>&0 regex ['"]http://earth.google.com/kml Google KML document
+!:mime application/vnd.google-earth.kml+xml
+>>>&1 string 2.0' \b, version 2.0
+>>>&1 string 2.1' \b, version 2.1
+>>>&1 string 2.2' \b, version 2.2
+
+#------------------------------------------------------------------------------
+# Type: OpenGIS KML, formerly Keyhole Markup Language
+# This standard is maintained by the
+# Open Geospatial Consortium.
+# http://www.opengeospatial.org/standards/kml/
+# From: Asbjoern Sloth Toennesen <asbjorn at lila.io>
+>>&0 regex ['"]http://www.opengis.net/kml OpenGIS KML document
+!:mime application/vnd.google-earth.kml+xml
+>>>&1 string 2.2 \b, version 2.2
+
+#------------------------------------------------------------------------------
+# Type: Google KML Archive (ZIP based) 
+# http://code.google.com/apis/kml/documentation/kml_tut.html
+# From: Asbjoern Sloth Toennesen <asbjorn at lila.io>
+0 string    PK\003\004
+>4  byte    0x14
+>>30  string doc.kml Compressed Google KML Document, including resources.
+!:mime application/vnd.google-earth.kmz

Modified: projects/mesh11s/contrib/file/Magdir/linux
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/linux	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/linux	Tue May 19 18:48:10 2009	(r192403)
@@ -84,7 +84,7 @@
 514	string		HdrS		Linux kernel
 >510	leshort		0xAA55		x86 boot executable
 >>518	leshort		>0x1ff
->>529	byte		0		zImage,
+>>>529	byte		0		zImage,
 >>>529	byte		1		bzImage,
 >>>(526.s+0x200) string	>\0		version %s,
 >>498	leshort		1		RO-rootFS,

Modified: projects/mesh11s/contrib/file/Magdir/lisp
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/lisp	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/lisp	Tue May 19 18:48:10 2009	(r192403)
@@ -8,22 +8,22 @@
 #0	string	;;			
 # windows INF files often begin with semicolon and use CRLF as line end
 # lisp files are mainly created on unix system with LF as line end
-#>2	search/2048	!\r		Lisp/Scheme program text
-#>2	search/2048	\r		Windows INF file
+#>2	search/4096	!\r		Lisp/Scheme program text
+#>2	search/4096	\r		Windows INF file
 
-0	search/256	(if\ 			Lisp/Scheme program text
+0	search/4096	(if\ 			Lisp/Scheme program text
 !:mime	text/x-lisp
-0	search/256	(setq\ 			Lisp/Scheme program text
+0	search/4096	(setq\ 			Lisp/Scheme program text
 !:mime	text/x-lisp
-0	search/256	(defvar\ 		Lisp/Scheme program text
+0	search/4096	(defvar\ 		Lisp/Scheme program text
 !:mime	text/x-lisp
-0	search/256	(defparam\ 		Lisp/Scheme program text
+0	search/4096	(defparam\ 		Lisp/Scheme program text
 !:mime	text/x-lisp
-0	search/256	(defun\  		Lisp/Scheme program text
+0	search/4096	(defun\  		Lisp/Scheme program text
 !:mime	text/x-lisp
-0	search/256	(autoload\ 		Lisp/Scheme program text
+0	search/4096	(autoload\ 		Lisp/Scheme program text
 !:mime	text/x-lisp
-0	search/256	(custom-set-variables\ 	Lisp/Scheme program text
+0	search/4096	(custom-set-variables\ 	Lisp/Scheme program text
 !:mime	text/x-lisp
 
 # Emacs 18 - this is always correct, but not very magical.

Modified: projects/mesh11s/contrib/file/Magdir/python
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/python	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/python	Tue May 19 18:48:10 2009	(r192403)
@@ -14,6 +14,8 @@
 0	belong		0x3bf20d0a	python 2.3 byte-compiled
 0	belong		0x6df20d0a	python 2.4 byte-compiled
 0	belong		0xb3f20d0a	python 2.5 byte-compiled
+0	belong		0xd1f20d0a	python 2.6 byte-compiled
+
 
 0	string/b  #!\ /usr/bin/python	python script text executable
 

Modified: projects/mesh11s/contrib/file/Magdir/troff
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/troff	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/troff	Tue May 19 18:48:10 2009	(r192403)
@@ -14,6 +14,10 @@
 !:mime	text/troff
 0	search/1	'''		troff or preprocessor input text
 !:mime	text/troff
+0	regex/20	\^\\.[A-Za-z0-9][A-Za-z0-9][\ \t]	troff or preprocessor input text
+!:mime	text/troff
+0	regex/20	\^\\.[A-Za-z0-9][A-Za-z0-9]$	troff or preprocessor input text
+!:mime	text/troff
 
 # ditroff intermediate output text
 0	search/1	x\ T		ditroff output text

Modified: projects/mesh11s/contrib/file/Magdir/windows
==============================================================================
--- projects/mesh11s/contrib/file/Magdir/windows	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Magdir/windows	Tue May 19 18:48:10 2009	(r192403)
@@ -113,3 +113,9 @@
 0	string		REGEDIT4\r\n\r\n	Windows Registry text (Win95 or above)
 0	string		Windows\ Registry\ Editor\ 
 >&0	string		Version\ 5.00\r\n\r\n	Windows Registry text (Win2K or above)
+
+
+# From: Pal Tamas <folti at balabit.hu>
+# Autorun File
+0       string/c          [autorun]\r\n   Microsoft Windows Autorun file.
+!:mime	application/x-setupscript. 

Modified: projects/mesh11s/contrib/file/Makefile.am
==============================================================================
--- projects/mesh11s/contrib/file/Makefile.am	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Makefile.am	Tue May 19 18:48:10 2009	(r192403)
@@ -1,5 +1,5 @@
 #
-# $File: Makefile.am,v 1.44 2009/01/28 02:11:20 christos Exp $
+# $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $
 #
 MAGIC_FRAGMENT_BASE = Magdir
 MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
@@ -97,6 +97,7 @@ $(MAGIC_FRAGMENT_DIR)/java \
 $(MAGIC_FRAGMENT_DIR)/jpeg \
 $(MAGIC_FRAGMENT_DIR)/karma \
 $(MAGIC_FRAGMENT_DIR)/kde \
+$(MAGIC_FRAGMENT_DIR)/kml \
 $(MAGIC_FRAGMENT_DIR)/lecter \
 $(MAGIC_FRAGMENT_DIR)/lex \
 $(MAGIC_FRAGMENT_DIR)/lif \

Modified: projects/mesh11s/contrib/file/Makefile.in
==============================================================================
--- projects/mesh11s/contrib/file/Makefile.in	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/Makefile.in	Tue May 19 18:48:10 2009	(r192403)
@@ -15,7 +15,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -54,6 +53,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -73,6 +73,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -95,6 +96,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -104,6 +106,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -163,7 +166,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 #
-# $File: Makefile.am,v 1.44 2009/01/28 02:11:20 christos Exp $
+# $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $
 #
 MAGIC_FRAGMENT_BASE = Magdir
 MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
@@ -259,6 +262,7 @@ $(MAGIC_FRAGMENT_DIR)/java \
 $(MAGIC_FRAGMENT_DIR)/jpeg \
 $(MAGIC_FRAGMENT_DIR)/karma \
 $(MAGIC_FRAGMENT_DIR)/kde \
+$(MAGIC_FRAGMENT_DIR)/kml \
 $(MAGIC_FRAGMENT_DIR)/lecter \
 $(MAGIC_FRAGMENT_DIR)/lex \
 $(MAGIC_FRAGMENT_DIR)/lif \

Modified: projects/mesh11s/contrib/file/README
==============================================================================
--- projects/mesh11s/contrib/file/README	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/README	Tue May 19 18:48:10 2009	(r192403)
@@ -1,15 +1,18 @@
 ** README for file(1) Command **
-@(#) $File: README,v 1.41 2008/12/02 16:34:46 christos Exp $
+@(#) $File: README,v 1.42 2009/02/14 15:16:24 christos Exp $
 
 E-mail: christos at astron.com
 Mailing List: file at mx.gw.com
 
 Phone: Do not even think of telephoning me about this program. Send cash first!
 
-This is Release 4.x of Ian Darwin's (copyright but distributable)
+This is Release 5.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
 *BSD, and other systems. (See "patchlevel.h" for the exact release number).
 
+The major changes for 5.x are CDF file parsing, indirect magic, and
+overhaul in mime and ascii encoding handling.
+
 The major feature of 4.x is the refactoring of the code into a library,
 and the re-write of the file command in terms of that library. The library
 itself, libmagic can be used by 3rd party programs that wish to identify

Modified: projects/mesh11s/contrib/file/acinclude.m4
==============================================================================
--- projects/mesh11s/contrib/file/acinclude.m4	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/acinclude.m4	Tue May 19 18:48:10 2009	(r192403)
@@ -9,6 +9,7 @@ AC_CACHE_CHECK([for tm_zone in struct tm
 if test "$ac_cv_struct_tm_zone" = yes; then
   AC_DEFINE(HAVE_TM_ZONE,1,[HAVE_TM_ZONE])
 fi
+
 AC_CACHE_CHECK(for tzname, ac_cv_var_tzname,
 [AC_TRY_LINK(
 changequote(<<, >>)dnl
@@ -29,6 +30,7 @@ AC_CACHE_CHECK([for tm_isdst in struct t
 if test "$ac_cv_struct_tm_isdst" = yes; then
   AC_DEFINE(HAVE_TM_ISDST,1,[HAVE_TM_ISDST])
 fi
+
 AC_CACHE_CHECK(for daylight, ac_cv_var_daylight,
 [AC_TRY_LINK(
 changequote(<<, >>)dnl
@@ -42,3 +44,12 @@ changequote([, ])dnl
     AC_DEFINE(HAVE_DAYLIGHT,1,[HAVE_DAYLIGHT])
   fi
 ])
+
+AC_DEFUN([AC_STRUCT_OPTION_GETOPT_H],
+[AC_CACHE_CHECK([for struct option in getopt], ac_cv_struct_option_getopt_h,
+[AC_TRY_COMPILE([#include <getopt.h>], [struct option op; op.name;],
+  ac_cv_struct_option_getopt_h=yes, ac_cv_struct_option_getopt_h=no)])
+if test "$ac_cv_struct_option_getopt_h" = yes; then
+  AC_DEFINE(HAVE_STRUCT_OPTION,1,[HAVE_STRUCT_OPTION])
+fi
+])

Modified: projects/mesh11s/contrib/file/aclocal.m4
==============================================================================
--- projects/mesh11s/contrib/file/aclocal.m4	Tue May 19 18:14:04 2009	(r192402)
+++ projects/mesh11s/contrib/file/aclocal.m4	Tue May 19 18:48:10 2009	(r192403)
@@ -18,7 +18,7 @@ you should regenerate the build system e
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +106,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -148,7 +147,7 @@ rm="rm -f"
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -168,6 +167,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -180,17 +180,17 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -207,6 +207,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -238,6 +240,9 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
@@ -264,9 +269,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 ])# _LT_COMPILER_BOILERPLATE
@@ -277,13 +283,85 @@ $rm conftest*
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------

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