From owner-svn-src-projects@FreeBSD.ORG Sun May 10 15:37:50 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B892106566B; Sun, 10 May 2009 15:37:50 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 154EC8FC0C; Sun, 10 May 2009 15:37:50 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4AFbnlS061332; Sun, 10 May 2009 15:37:49 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4AFbnlv061315; Sun, 10 May 2009 15:37:49 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200905101537.n4AFbnlv061315@svn.freebsd.org> From: Rui Paulo Date: Sun, 10 May 2009 15:37:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191962 - in projects/mesh11s: . cddl/contrib/opensolaris/lib/libzpool/common/sys cddl/lib/libzpool contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/file/Magdir contrib/file... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 May 2009 15:37:50 -0000 Author: rpaulo Date: Sun May 10 15:37:48 2009 New Revision: 191962 URL: http://svn.freebsd.org/changeset/base/191962 Log: MFC 191746:191961 Added: projects/mesh11s/contrib/file/Magdir/wireless - copied unchanged from r191961, head/contrib/file/Magdir/wireless projects/mesh11s/contrib/file/Makefile.am-src - copied unchanged from r191961, head/contrib/file/Makefile.am-src projects/mesh11s/contrib/file/cdf.c - copied unchanged from r191961, head/contrib/file/cdf.c projects/mesh11s/contrib/file/cdf.h - copied unchanged from r191961, head/contrib/file/cdf.h projects/mesh11s/contrib/file/cdf_time.c - copied unchanged from r191961, head/contrib/file/cdf_time.c projects/mesh11s/contrib/file/encoding.c - copied unchanged from r191961, head/contrib/file/encoding.c projects/mesh11s/contrib/file/readcdf.c - copied unchanged from r191961, head/contrib/file/readcdf.c projects/mesh11s/lib/libc/gen/tcsetsid.3 - copied unchanged from r191961, head/lib/libc/gen/tcsetsid.3 projects/mesh11s/share/man/man4/iwnfw.4 - copied unchanged from r191961, head/share/man/man4/iwnfw.4 projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S - copied unchanged from r191961, head/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S - copied unchanged from r191961, head/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S - copied unchanged from r191961, head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S - copied unchanged from r191961, head/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c - copied unchanged from r191961, head/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c projects/mesh11s/sys/contrib/dev/iwi/Makefile - copied unchanged from r191961, head/sys/contrib/dev/iwi/Makefile projects/mesh11s/sys/dev/bwi/ - copied from r191961, head/sys/dev/bwi/ projects/mesh11s/sys/fs/nfs/ - copied from r191961, head/sys/fs/nfs/ projects/mesh11s/sys/fs/nfsclient/ - copied from r191961, head/sys/fs/nfsclient/ projects/mesh11s/sys/fs/nfsserver/ - copied from r191961, head/sys/fs/nfsserver/ projects/mesh11s/sys/modules/bwi/ - copied from r191961, head/sys/modules/bwi/ Deleted: projects/mesh11s/contrib/file/.cvsignore projects/mesh11s/contrib/file/FREEBSD-upgrade projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c projects/mesh11s/sys/compat/svr4/svr4_ttold.c projects/mesh11s/sys/compat/svr4/svr4_ttold.h projects/mesh11s/usr.bin/file/config.h Modified: projects/mesh11s/ (props changed) projects/mesh11s/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/mesh11s/cddl/lib/libzpool/Makefile 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/animation projects/mesh11s/contrib/file/Magdir/audio projects/mesh11s/contrib/file/Magdir/cafebabe projects/mesh11s/contrib/file/Magdir/compress projects/mesh11s/contrib/file/Magdir/elf projects/mesh11s/contrib/file/Magdir/epoc projects/mesh11s/contrib/file/Magdir/filesystems projects/mesh11s/contrib/file/Magdir/graphviz projects/mesh11s/contrib/file/Magdir/images projects/mesh11s/contrib/file/Magdir/jpeg projects/mesh11s/contrib/file/Magdir/mach projects/mesh11s/contrib/file/Magdir/macintosh projects/mesh11s/contrib/file/Magdir/msdos projects/mesh11s/contrib/file/Magdir/perl projects/mesh11s/contrib/file/Magdir/printer projects/mesh11s/contrib/file/Magdir/timezone projects/mesh11s/contrib/file/Magdir/xwindows projects/mesh11s/contrib/file/Makefile.am projects/mesh11s/contrib/file/Makefile.in projects/mesh11s/contrib/file/README projects/mesh11s/contrib/file/TODO projects/mesh11s/contrib/file/apprentice.c projects/mesh11s/contrib/file/apptype.c projects/mesh11s/contrib/file/ascmagic.c projects/mesh11s/contrib/file/asprintf.c (contents, props changed) 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/elfclass.h (props changed) projects/mesh11s/contrib/file/file.c projects/mesh11s/contrib/file/file.h projects/mesh11s/contrib/file/file.man projects/mesh11s/contrib/file/file_opts.h projects/mesh11s/contrib/file/fsmagic.c projects/mesh11s/contrib/file/funcs.c projects/mesh11s/contrib/file/getopt_long.c (contents, props changed) projects/mesh11s/contrib/file/is_tar.c projects/mesh11s/contrib/file/libmagic.man projects/mesh11s/contrib/file/magic.c projects/mesh11s/contrib/file/magic.h projects/mesh11s/contrib/file/magic.man projects/mesh11s/contrib/file/mygetopt.h (props changed) projects/mesh11s/contrib/file/patchlevel.h projects/mesh11s/contrib/file/print.c projects/mesh11s/contrib/file/readelf.c projects/mesh11s/contrib/file/softmagic.c projects/mesh11s/contrib/file/tests/Makefile.am (props changed) projects/mesh11s/contrib/file/tests/Makefile.in (props changed) projects/mesh11s/contrib/file/tests/test.c (props changed) projects/mesh11s/contrib/file/vasprintf.c (contents, props changed) projects/mesh11s/contrib/gdb/ (props changed) projects/mesh11s/contrib/gdtoa/ (props changed) projects/mesh11s/contrib/less/ (props changed) projects/mesh11s/contrib/less/COPYING projects/mesh11s/contrib/less/FREEBSD-upgrade projects/mesh11s/contrib/less/LICENSE projects/mesh11s/contrib/less/Makefile.in projects/mesh11s/contrib/less/NEWS projects/mesh11s/contrib/less/README projects/mesh11s/contrib/less/brac.c projects/mesh11s/contrib/less/ch.c projects/mesh11s/contrib/less/charset.c projects/mesh11s/contrib/less/charset.h projects/mesh11s/contrib/less/cmd.h projects/mesh11s/contrib/less/cmdbuf.c projects/mesh11s/contrib/less/command.c projects/mesh11s/contrib/less/configure projects/mesh11s/contrib/less/configure.ac projects/mesh11s/contrib/less/decode.c projects/mesh11s/contrib/less/defines.ds projects/mesh11s/contrib/less/defines.o2 projects/mesh11s/contrib/less/defines.o9 projects/mesh11s/contrib/less/defines.wn projects/mesh11s/contrib/less/edit.c projects/mesh11s/contrib/less/filename.c projects/mesh11s/contrib/less/forwback.c projects/mesh11s/contrib/less/funcs.h projects/mesh11s/contrib/less/help.c projects/mesh11s/contrib/less/ifile.c projects/mesh11s/contrib/less/input.c projects/mesh11s/contrib/less/install.sh projects/mesh11s/contrib/less/jump.c projects/mesh11s/contrib/less/less.h projects/mesh11s/contrib/less/less.hlp projects/mesh11s/contrib/less/less.man projects/mesh11s/contrib/less/less.nro projects/mesh11s/contrib/less/lessecho.c projects/mesh11s/contrib/less/lessecho.man projects/mesh11s/contrib/less/lessecho.nro projects/mesh11s/contrib/less/lesskey.c projects/mesh11s/contrib/less/lesskey.h projects/mesh11s/contrib/less/lesskey.man projects/mesh11s/contrib/less/lesskey.nro projects/mesh11s/contrib/less/lglob.h projects/mesh11s/contrib/less/line.c projects/mesh11s/contrib/less/linenum.c projects/mesh11s/contrib/less/lsystem.c projects/mesh11s/contrib/less/main.c projects/mesh11s/contrib/less/mark.c projects/mesh11s/contrib/less/mkhelp.c projects/mesh11s/contrib/less/optfunc.c projects/mesh11s/contrib/less/option.c projects/mesh11s/contrib/less/option.h projects/mesh11s/contrib/less/opttbl.c projects/mesh11s/contrib/less/os.c projects/mesh11s/contrib/less/output.c projects/mesh11s/contrib/less/pckeys.h projects/mesh11s/contrib/less/position.c projects/mesh11s/contrib/less/position.h projects/mesh11s/contrib/less/prompt.c projects/mesh11s/contrib/less/screen.c projects/mesh11s/contrib/less/scrsize.c projects/mesh11s/contrib/less/search.c projects/mesh11s/contrib/less/signal.c projects/mesh11s/contrib/less/tags.c projects/mesh11s/contrib/less/ttyin.c projects/mesh11s/contrib/less/version.c 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/gnu/usr.bin/patch/common.h projects/mesh11s/gnu/usr.bin/patch/inp.c projects/mesh11s/gnu/usr.bin/patch/patch.c projects/mesh11s/gnu/usr.bin/patch/pch.c projects/mesh11s/gnu/usr.bin/patch/pch.h projects/mesh11s/gnu/usr.bin/patch/util.c projects/mesh11s/lib/libarchive/archive_read_open_filename.c projects/mesh11s/lib/libc/ (props changed) projects/mesh11s/lib/libc/gen/Makefile.inc projects/mesh11s/lib/libc/gen/Symbol.map projects/mesh11s/lib/libc/gen/tcgetsid.3 projects/mesh11s/lib/libc/gen/termios.c projects/mesh11s/lib/libc/gen/ttyname.3 projects/mesh11s/lib/libc/stdio/asprintf.c (props changed) projects/mesh11s/lib/libc/stdlib/ptsname.3 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/libmagic/Makefile projects/mesh11s/lib/libmagic/config.h 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/lib/libutil/login_tty.c projects/mesh11s/sbin/ (props changed) projects/mesh11s/sbin/ipfw/ (props changed) projects/mesh11s/share/man/man4/Makefile projects/mesh11s/share/man/man4/geom_fox.4 projects/mesh11s/share/man/man4/if_bridge.4 projects/mesh11s/share/man/man4/isp.4 projects/mesh11s/share/man/man4/mpt.4 projects/mesh11s/share/man/man4/smp.4 projects/mesh11s/share/man/man4/ubsec.4 projects/mesh11s/share/misc/bsd-family-tree projects/mesh11s/share/misc/committers-ports.dot projects/mesh11s/share/misc/committers-src.dot projects/mesh11s/share/zoneinfo/ (props changed) projects/mesh11s/sys/ (props changed) projects/mesh11s/sys/amd64/amd64/identcpu.c projects/mesh11s/sys/amd64/amd64/local_apic.c projects/mesh11s/sys/amd64/conf/DEFAULTS projects/mesh11s/sys/amd64/conf/GENERIC projects/mesh11s/sys/amd64/conf/NOTES projects/mesh11s/sys/amd64/conf/XENHVM projects/mesh11s/sys/amd64/include/clock.h projects/mesh11s/sys/amd64/include/pcpu.h projects/mesh11s/sys/amd64/include/xen/ (props changed) projects/mesh11s/sys/amd64/isa/clock.c projects/mesh11s/sys/amd64/linux32/linux.h projects/mesh11s/sys/amd64/linux32/linux32_sysvec.c projects/mesh11s/sys/arm/arm/cpufunc.c projects/mesh11s/sys/arm/arm/pmap.c projects/mesh11s/sys/arm/at91/at91_cfata.c projects/mesh11s/sys/arm/at91/if_ate.c projects/mesh11s/sys/arm/conf/AVILA projects/mesh11s/sys/arm/conf/BWCT projects/mesh11s/sys/arm/conf/CAMBRIA projects/mesh11s/sys/arm/conf/CRB projects/mesh11s/sys/arm/conf/DB-78XXX projects/mesh11s/sys/arm/conf/DB-88F5XXX projects/mesh11s/sys/arm/conf/DB-88F6XXX projects/mesh11s/sys/arm/conf/EP80219 projects/mesh11s/sys/arm/conf/GUMSTIX projects/mesh11s/sys/arm/conf/HL200 projects/mesh11s/sys/arm/conf/IQ31244 projects/mesh11s/sys/arm/conf/KB920X projects/mesh11s/sys/arm/conf/NSLU projects/mesh11s/sys/arm/conf/NSLU.hints projects/mesh11s/sys/arm/conf/SIMICS projects/mesh11s/sys/arm/conf/SKYEYE projects/mesh11s/sys/arm/include/pmap.h projects/mesh11s/sys/boot/uboot/lib/devicename.c projects/mesh11s/sys/boot/uboot/lib/disk.c projects/mesh11s/sys/boot/uboot/lib/libuboot.h projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris.c projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c projects/mesh11s/sys/cddl/compat/opensolaris/sys/vnode.h projects/mesh11s/sys/cddl/contrib/opensolaris/common/acl/acl_common.c projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h projects/mesh11s/sys/compat/linux/linux_futex.c projects/mesh11s/sys/compat/linux/linux_ioctl.c 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_socket.c projects/mesh11s/sys/compat/linux/linux_socket.h projects/mesh11s/sys/compat/linux/linux_stats.c projects/mesh11s/sys/compat/linux/linux_util.h projects/mesh11s/sys/compat/svr4/svr4_ioctl.c projects/mesh11s/sys/compat/svr4/svr4_ioctl.h projects/mesh11s/sys/compat/svr4/svr4_proto.h projects/mesh11s/sys/compat/svr4/svr4_stat.c projects/mesh11s/sys/compat/svr4/svr4_syscall.h projects/mesh11s/sys/compat/svr4/svr4_syscallnames.c projects/mesh11s/sys/compat/svr4/svr4_sysent.c projects/mesh11s/sys/conf/NOTES projects/mesh11s/sys/conf/files projects/mesh11s/sys/conf/files.i386 projects/mesh11s/sys/conf/files.pc98 projects/mesh11s/sys/conf/kern.post.mk projects/mesh11s/sys/conf/newvers.sh projects/mesh11s/sys/conf/options projects/mesh11s/sys/contrib/dev/iwi/ipw2200-bss.fw.uu projects/mesh11s/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu projects/mesh11s/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu projects/mesh11s/sys/contrib/pf/ (props changed) projects/mesh11s/sys/dev/acpica/acpi_cpu.c projects/mesh11s/sys/dev/asr/asr.c projects/mesh11s/sys/dev/ata/ata-pci.h projects/mesh11s/sys/dev/ata/ata-usb.c (props changed) projects/mesh11s/sys/dev/ata/chipsets/ata-siliconimage.c projects/mesh11s/sys/dev/ath/ah_osdep.c projects/mesh11s/sys/dev/ath/ah_osdep.h projects/mesh11s/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c projects/mesh11s/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c projects/mesh11s/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c projects/mesh11s/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/mesh11s/sys/dev/ath/if_ath.c projects/mesh11s/sys/dev/bce/if_bce.c projects/mesh11s/sys/dev/bce/if_bcereg.h projects/mesh11s/sys/dev/cxgb/ (props changed) projects/mesh11s/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/mesh11s/sys/dev/ipw/if_ipw.c projects/mesh11s/sys/dev/iwi/if_iwi.c projects/mesh11s/sys/dev/iwi/if_iwivar.h projects/mesh11s/sys/dev/iwn/if_iwn.c projects/mesh11s/sys/dev/sound/pci/ich.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/ubsec/ubsec.c projects/mesh11s/sys/dev/ubsec/ubsecreg.h 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 (contents, 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 (contents, 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 (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_auereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_axe.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_axereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_cdce.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_cdcereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_cue.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_cuereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_kue.c (contents, 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 (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_ruereg.h (props changed) projects/mesh11s/sys/dev/usb/net/if_udav.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/if_udavreg.h (props changed) projects/mesh11s/sys/dev/usb/net/usb_ethernet.c (contents, props changed) projects/mesh11s/sys/dev/usb/net/usb_ethernet.h (contents, 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 (contents, 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 (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 (contents, 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 (props changed) projects/mesh11s/sys/dev/usb/usb_dev.h (props changed) projects/mesh11s/sys/dev/usb/usb_device.c (contents, props changed) projects/mesh11s/sys/dev/usb/usb_device.h (contents, 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 (contents, 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 (props changed) projects/mesh11s/sys/dev/usb/usb_hid.h (props changed) projects/mesh11s/sys/dev/usb/usb_hub.c (contents, 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 (contents, 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 (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_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/wpi/if_wpi.c projects/mesh11s/sys/dev/xen/netfront/ (props changed) projects/mesh11s/sys/dev/xen/xenpci/ (props changed) projects/mesh11s/sys/geom/vinum/geom_vinum.c projects/mesh11s/sys/geom/vinum/geom_vinum.h projects/mesh11s/sys/geom/vinum/geom_vinum_events.c projects/mesh11s/sys/geom/vinum/geom_vinum_plex.c projects/mesh11s/sys/geom/vinum/geom_vinum_raid5.c projects/mesh11s/sys/geom/vinum/geom_vinum_rm.c projects/mesh11s/sys/geom/vinum/geom_vinum_subr.c projects/mesh11s/sys/geom/vinum/geom_vinum_var.h projects/mesh11s/sys/i386/bios/apm.c projects/mesh11s/sys/i386/conf/DEFAULTS projects/mesh11s/sys/i386/conf/GENERIC projects/mesh11s/sys/i386/conf/NOTES projects/mesh11s/sys/i386/conf/PAE projects/mesh11s/sys/i386/conf/XBOX projects/mesh11s/sys/i386/conf/XEN projects/mesh11s/sys/i386/i386/identcpu.c projects/mesh11s/sys/i386/i386/local_apic.c projects/mesh11s/sys/i386/ibcs2/ibcs2_ioctl.c projects/mesh11s/sys/i386/ibcs2/ibcs2_isc_syscall.h projects/mesh11s/sys/i386/ibcs2/ibcs2_isc_sysent.c projects/mesh11s/sys/i386/ibcs2/ibcs2_proto.h projects/mesh11s/sys/i386/ibcs2/ibcs2_socksys.c projects/mesh11s/sys/i386/ibcs2/ibcs2_syscall.h projects/mesh11s/sys/i386/ibcs2/ibcs2_sysent.c projects/mesh11s/sys/i386/ibcs2/ibcs2_xenix.h projects/mesh11s/sys/i386/ibcs2/ibcs2_xenix_syscall.h projects/mesh11s/sys/i386/ibcs2/ibcs2_xenix_sysent.c projects/mesh11s/sys/i386/ibcs2/syscalls.master projects/mesh11s/sys/i386/include/clock.h projects/mesh11s/sys/i386/isa/clock.c projects/mesh11s/sys/i386/linux/linux.h projects/mesh11s/sys/i386/linux/linux_sysvec.c projects/mesh11s/sys/i386/xen/clock.c projects/mesh11s/sys/i386/xen/mp_machdep.c projects/mesh11s/sys/ia64/conf/DEFAULTS projects/mesh11s/sys/ia64/conf/NOTES projects/mesh11s/sys/isa/atrtc.c projects/mesh11s/sys/isa/rtc.h projects/mesh11s/sys/kern/init_main.c projects/mesh11s/sys/kern/kern_exit.c projects/mesh11s/sys/kern/kern_fork.c projects/mesh11s/sys/kern/kern_jail.c projects/mesh11s/sys/kern/kern_linker.c projects/mesh11s/sys/kern/kern_malloc.c projects/mesh11s/sys/kern/kern_mib.c projects/mesh11s/sys/kern/kern_osd.c projects/mesh11s/sys/kern/kern_prot.c projects/mesh11s/sys/kern/kern_vimage.c projects/mesh11s/sys/kern/subr_kdb.c projects/mesh11s/sys/kern/subr_pcpu.c projects/mesh11s/sys/kern/sys_socket.c projects/mesh11s/sys/kern/tty.c projects/mesh11s/sys/kern/tty_ttydisc.c projects/mesh11s/sys/kern/uipc_socket.c projects/mesh11s/sys/kern/uipc_syscalls.c projects/mesh11s/sys/kern/uipc_usrreq.c projects/mesh11s/sys/kern/vfs_export.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/conf/ADM5120 projects/mesh11s/sys/mips/conf/IDT projects/mesh11s/sys/mips/conf/MALTA projects/mesh11s/sys/mips/conf/QEMU projects/mesh11s/sys/mips/conf/SENTRY5 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/linux/Makefile projects/mesh11s/sys/modules/opensolaris/Makefile projects/mesh11s/sys/modules/svr4/Makefile projects/mesh11s/sys/modules/zfs/Makefile projects/mesh11s/sys/net/bpf.c projects/mesh11s/sys/net/if.c projects/mesh11s/sys/net/if_clone.c projects/mesh11s/sys/net/if_ethersubr.c projects/mesh11s/sys/net/if_var.h projects/mesh11s/sys/net/netisr.c projects/mesh11s/sys/net/rtsock.c projects/mesh11s/sys/net80211/ieee80211.h projects/mesh11s/sys/net80211/ieee80211_adhoc.c projects/mesh11s/sys/net80211/ieee80211_ddb.c projects/mesh11s/sys/net80211/ieee80211_freebsd.c projects/mesh11s/sys/net80211/ieee80211_ht.h projects/mesh11s/sys/net80211/ieee80211_node.h projects/mesh11s/sys/net80211/ieee80211_proto.c projects/mesh11s/sys/net80211/ieee80211_superg.c projects/mesh11s/sys/net80211/ieee80211_superg.h projects/mesh11s/sys/net80211/ieee80211_var.h projects/mesh11s/sys/netgraph/netgraph.h projects/mesh11s/sys/netgraph/ng_base.c projects/mesh11s/sys/netinet/if_ether.c projects/mesh11s/sys/netinet/igmp.c projects/mesh11s/sys/netinet/in_rmx.c projects/mesh11s/sys/netinet/in_var.h projects/mesh11s/sys/netinet/ip_fw2.c projects/mesh11s/sys/netinet/ip_input.c projects/mesh11s/sys/netinet/sctp_crc32.c projects/mesh11s/sys/netinet/sctp_os_bsd.h projects/mesh11s/sys/netinet/sctp_uio.h projects/mesh11s/sys/netinet/tcp_hostcache.c projects/mesh11s/sys/netinet6/in6_mcast.c projects/mesh11s/sys/netinet6/in6_rmx.c projects/mesh11s/sys/netinet6/ip6_mroute.c projects/mesh11s/sys/netinet6/ip6_output.c projects/mesh11s/sys/netinet6/mld6.c projects/mesh11s/sys/netinet6/nd6.c projects/mesh11s/sys/netinet6/nd6_nbr.c projects/mesh11s/sys/netinet6/route6.c projects/mesh11s/sys/netipsec/xform_tcp.c projects/mesh11s/sys/nfsclient/nfs_kdtrace.c projects/mesh11s/sys/nfsclient/nfs_krpc.c projects/mesh11s/sys/nfsclient/nfs_vnops.c projects/mesh11s/sys/nfsserver/nfs_srvsubs.c projects/mesh11s/sys/nlm/nlm_advlock.c projects/mesh11s/sys/nlm/nlm_prot_impl.c projects/mesh11s/sys/pc98/cbus/clock.c projects/mesh11s/sys/pc98/conf/DEFAULTS projects/mesh11s/sys/pc98/conf/NOTES projects/mesh11s/sys/powerpc/conf/GENERIC projects/mesh11s/sys/powerpc/conf/MPC85XX projects/mesh11s/sys/powerpc/conf/NOTES projects/mesh11s/sys/sparc64/conf/GENERIC projects/mesh11s/sys/sys/buf_ring.h projects/mesh11s/sys/sys/ioctl.h projects/mesh11s/sys/sys/ioctl_compat.h projects/mesh11s/sys/sys/jail.h projects/mesh11s/sys/sys/kernel.h projects/mesh11s/sys/sys/param.h projects/mesh11s/sys/sys/proc.h projects/mesh11s/sys/sys/sysctl.h projects/mesh11s/sys/sys/termios.h projects/mesh11s/sys/sys/ucred.h projects/mesh11s/sys/sys/vimage.h projects/mesh11s/sys/ufs/ufs/ufs_extern.h projects/mesh11s/sys/vm/vm_fault.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/usr.bin/calendar/calendars/calendar.freebsd projects/mesh11s/usr.bin/csup/ (props changed) projects/mesh11s/usr.bin/file/Makefile projects/mesh11s/usr.bin/kdump/mkioctls projects/mesh11s/usr.bin/procstat/ (props changed) projects/mesh11s/usr.sbin/dumpcis/cardinfo.h (props changed) projects/mesh11s/usr.sbin/dumpcis/cis.h (props changed) projects/mesh11s/usr.sbin/freebsd-update/freebsd-update.8 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/zic/ (props changed) Modified: projects/mesh11s/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/mesh11s/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sun May 10 15:37:48 2009 (r191962) @@ -418,6 +418,7 @@ typedef struct vsecattr { #define VOP_FSYNC(vp, f, cr, ct) fsync((vp)->v_fd) #define VN_RELE(vp) vn_close(vp, 0, NULL, NULL) +#define VN_RELE_ASYNC(vp, taskq) vn_close(vp, 0, NULL, NULL) #define vn_lock(vp, type) #define VOP_UNLOCK(vp, type) Modified: projects/mesh11s/cddl/lib/libzpool/Makefile ============================================================================== --- projects/mesh11s/cddl/lib/libzpool/Makefile Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/cddl/lib/libzpool/Makefile Sun May 10 15:37:48 2009 (r191962) @@ -13,7 +13,7 @@ # ATOMIC_SRCS .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -ATOMIC_SRCS= atomic.S +ATOMIC_SRCS= opensolaris_atomic.S .else .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c Modified: projects/mesh11s/contrib/file/ChangeLog ============================================================================== --- projects/mesh11s/contrib/file/ChangeLog Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/ChangeLog Sun May 10 15:37:48 2009 (r191962) @@ -1,9 +1,105 @@ +2008-12-12 15:50 Christos Zoulas + + * fix initial offset calculation for non 4K sector files + + * add loop limits to avoid DoS attacks by constructing + looping sector references. + +2008-12-03 13:05 Christos Zoulas + + * fix memory botches on cdf file parsing. + + * exit with non-zero value for any error, not just for the last + file processed. + +2008-11-09 20:42 Charles Longeau + + * Replace all str{cpy,cat} functions with strl{cpy,cat} + * Ensure that strl{cpy,cat} are included in libmagic, + as needed. + +2008-11-06 18:18 Christos Zoulas + + * Handle ID3 format files. + +2008-11-06 23:00 Reuben Thomas + + * Fix --mime, --mime-type and --mime-encoding under new scheme. + + * Rename "ascii" to "text" and add "encoding" test. + + * Return a precise ("utf-16le" or "utf-16be") MIME charset for + UTF-16. + + * Fix error in comment caused by automatic indentation adding + words! + +2008-11-06 10:35 Christos Zoulas + + * use memchr instead of strchr because the string + might not be NUL terminated (Scott MacVicar) + +2008-11-03 07:31 Reuben Thomas + + * Fix a printf with a non-literal format string. + + * Fix formatting and punctuation of help for "--apple". + +2008-10-30 11:00 Reuben Thomas + + * Correct words counts in comments of struct magic. + + * Fix handle_annotation to allow both Apple and MIME types to be + printed, and to return correct code if MIME type is + printed (1, not 0) or if there's an error (-1 not 1). + + * Fix output of charset for MIME type (precede with semi-colon; + fixes Debian bug #501460). + + * Fix potential attacks via conversion specifications in magic + strings. + + * Add a FIXME for Debian bug #488562 (magic files should be + read in a defined order, by sorting the names). + +2008-10-18 16:45 Christos Zoulas + + * Added APPLE file creator/type + +2008-10-12 10:20 Christos Zoulas + + * Added CDF parsing + +2008-10-09 16:40 Christos Zoulas + + * filesystem and msdos patches (Joerg Jenderek) + +2008-10-09 13:20 Christos Zoulas + + * correct --exclude documentation issues: remove troff and fortran + and rename "token" to "tokens". (Randy McMurchy) + +2008-10-01 10:30 Christos Zoulas + + * Read ~/.magic in addition to the default magic file not instead + of, as documented in the man page. + +2008-09-10 21:30 Reuben Thomas + + * Comment out graphviz patterns, as they match too many files. + 2008-08-30 12:54 Christos Zoulas * Don't eat trailing \n in magic enties. * Cast defines to allow compilation using a c++ compiler. +2008-08-25 23:56 Reuben Thomas + + * Add text/x-lua MIME type for Lua scripts. + + * Escape { in regex in graphviz patterns. + 2008-07-26 00:59 Reuben Thomas * Add MIME types for special files. @@ -55,22 +151,22 @@ 2008-05-06 00:13 Robert Byrnes - * src/Makefile.am: + * src/Makefile.am: Ensure that getopt_long and [v]asprintf are included in libmagic, as needed. Remove unnecessary EXTRA_DIST. - * src/Makefile.in: + * src/Makefile.in: Rerun automake. - * src/vasprintf.c (dispatch): + * src/vasprintf.c (dispatch): Fix variable precision bug: be sure to step past '*'. - * src/vasprintf.c (core): + * src/vasprintf.c (core): Remove unreachable code. - * src/apprentice.c (set_test_type): + * src/apprentice.c (set_test_type): Add cast to avoid compiler warning. 2008-04-22 23:45 Christos Zoulas @@ -81,12 +177,12 @@ 2008-04-04 11:00 Christos Zoulas - * >= <= is not supported, so fix the magic and warn about it. + * >= <= is not supported, so fix the magic and warn about it. reported by: Thien-Thi Nguyen 2008-03-27 16:16 Robert Byrnes - * src/readelf.c (donote): + * src/readelf.c (donote): ELF core file command name/line bug fixes and enhancements: Try larger offsets first to avoid false matches @@ -112,7 +208,7 @@ * Clarify UTF-8 BOM message (Reuben Thomas) * Add HTML comment to token list in names.h - + 2007-02-04 15:50 Christos Zoulas * Debian fixes (Reuben Thomas) @@ -152,7 +248,7 @@ 2007-10-28 20:48 Christos Zoulas - * float and double magic support (Behan Webster) + * float and double magic support (Behan Webster) 2007-10-28 20:48 Christos Zoulas @@ -199,7 +295,7 @@ be easily parsed: mimetype [charset=character-set] [encoding=encoding-mime-type] - Remove spurious extra text from some MIME type printouts + Remove spurious extra text from some MIME type printouts (mostly in is_tar). Fix one case where -i produced nothing at all (for a 1-byte file, @@ -229,7 +325,7 @@ 2007-03-15 10:51 Christos Zoulas * fix fortran and nroff reversed tests (Dmitry V. Levin) - + * fix exclude option (Dmitry V. Levin) 2007-02-08 17:30 Christos Zoulas @@ -248,7 +344,7 @@ * Add exclude flag. 2007-01-18 05:29 Anon Ymous - + * Move the "type" detection code from parse() into its own table driven routine. This avoids maintaining multiple lists in file.h. @@ -256,7 +352,7 @@ * Add an optional conditional field (ust before the type field). This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is likely to go away. - + 2007-01-16 23:24 Anon Ymous * Fix an initialization bug in check_mem(). @@ -327,7 +423,7 @@ 2006-12-08 16:32 Christos Zoulas * store and print the line number of the magic - entry for debugging. + entry for debugging. * if the magic entry did not print anything, don't treat it as a match @@ -342,7 +438,7 @@ file_softmagic. 2006-11-25 13:35 Christos Zoulas - + * Don't store the current offset in the magic struct, because it needs to be restored and it was not done properly all the time. Bug @@ -432,7 +528,7 @@ * Look for note sections in non executables. 2005-09-20 13:33 Christos Zoulas - + * Don't print SVR4 Style in core files multiple times (Radek Vokál) @@ -443,9 +539,9 @@ 2005-08-18 09:53 Christos Zoulas * Remove erroreous mention of /etc/magic in the file man page - This is gentoo bug 101639. (Mike Frysinger) + This is gentoo bug 101639. (Mike Frysinger) - * Cross-compile support and detection (Mike Frysinger) + * Cross-compile support and detection (Mike Frysinger) 2005-08-12 10:17 Christos Zoulas @@ -477,20 +573,20 @@ * Avoid NULL pointer dereference in time conversion. 2005-03-06 00:00 Joerg Walter - + * Add indirect magic offset support, and search mode. 2005-01-12 00:00 Stepan Kasal - * src/ascmagic.c (file_ascmagic): Fix three bugs about text files: - If a CRLF text file happens to have CR at offset HOWMANY - 1 - (currently 0xffff), it should not be counted as CR line - terminator. - If a line has length exactly MAXLINELEN, it should not yet be - treated as a ``very long line'', as MAXLINELEN is ``longest sane - line length''. - With CRLF, the line length was not computed correctly, and even - lines of length MAXLINELEN - 1 were treated as ``very long''. + * src/ascmagic.c (file_ascmagic): Fix three bugs about text files: + If a CRLF text file happens to have CR at offset HOWMANY - 1 + (currently 0xffff), it should not be counted as CR line + terminator. + If a line has length exactly MAXLINELEN, it should not yet be + treated as a ``very long line'', as MAXLINELEN is ``longest sane + line length''. + With CRLF, the line length was not computed correctly, and even + lines of length MAXLINELEN - 1 were treated as ``very long''. 2004-12-07 14:15 Christos Zoulas @@ -525,12 +621,12 @@ * Remove 3rd and 4th copyright clause; approved by Ian Darwin. - * Fix small memory leaks; caught by: Tamas Sarlos + * Fix small memory leaks; caught by: Tamas Sarlos 2004-07-24 16:33 Christos Zoulas - * magic.mime update Danny Milosavljevic + * magic.mime update Danny Milosavljevic * FreeBSD version update Oliver Eikemeier Modified: projects/mesh11s/contrib/file/Magdir/animation ============================================================================== --- projects/mesh11s/contrib/file/Magdir/animation Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/animation Sun May 10 15:37:48 2009 (r191962) @@ -325,6 +325,7 @@ # MP2, M1A 0 beshort&0xFFFE 0xFFFC MPEG ADTS, layer II, v1 +!:mime audio/mpeg # rates >2 byte&0xF0 0x10 \b, 32 kbps >2 byte&0xF0 0x20 \b, 48 kbps @@ -399,6 +400,7 @@ # MP3, M2A 0 beshort&0xFFFE 0xFFF2 MPEG ADTS, layer III, v2 +!:mime audio/mpeg # rate >2 byte&0xF0 0x10 \b, 8 kbps >2 byte&0xF0 0x20 \b, 16 kbps @@ -790,3 +792,24 @@ 0 belong 0x00000001 >4 byte&0x1F 0x07 !:mime video/h264 + +# Type: Bink Video +# URL: http://wiki.multimedia.cx/index.php?title=3DBink_Container +# From: 2008-07-18 +0 string BIK Bink Video +>3 regex =[a-z] rev.%s +#>4 ulelong x size %d +>20 ulelong x \b, %d +>24 ulelong x \bx%d +>8 ulelong x \b, %d frames +>32 ulelong x at rate %d/ +>28 ulelong >1 \b%d +>40 ulelong =0 \b, no audio +>40 ulelong !0 \b, %d audio track +>>40 ulelong !1 \bs +# follow properties of the first audio track only +>>48 uleshort x %dHz +>>51 byte&0x20 0 mono +>>51 byte&0x20 !0 stereo +#>>51 byte&0x10 0 FFT +#>>51 byte&0x10 !0 DCT Modified: projects/mesh11s/contrib/file/Magdir/audio ============================================================================== --- projects/mesh11s/contrib/file/Magdir/audio Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/audio Sun May 10 15:37:48 2009 (r191962) @@ -286,43 +286,14 @@ # SGI SoundTrack 0 string _SGI_SoundTrack SGI SoundTrack project file # ID3 version 2 tags -0 string ID3 Audio file with ID3 version 2. -# ??? Normally such a file is an MP3 file, but this will give false positives -!:mime audio/mpeg ->3 ubyte <0xff \b%d -#>4 ubyte <0xff \b%d tag ->2584 string fLaC \b, FLAC encoding ->>2588 byte&0x7f >0 \b, unknown version ->>2588 byte&0x7f 0 \b -# some common bits/sample values ->>>2600 beshort&0x1f0 0x030 \b, 4 bit ->>>2600 beshort&0x1f0 0x050 \b, 6 bit ->>>2600 beshort&0x1f0 0x070 \b, 8 bit ->>>2600 beshort&0x1f0 0x0b0 \b, 12 bit ->>>2600 beshort&0x1f0 0x0f0 \b, 16 bit ->>>2600 beshort&0x1f0 0x170 \b, 24 bit ->>>2600 byte&0xe 0x0 \b, mono ->>>2600 byte&0xe 0x2 \b, stereo ->>>2600 byte&0xe 0x4 \b, 3 channels ->>>2600 byte&0xe 0x6 \b, 4 channels ->>>2600 byte&0xe 0x8 \b, 5 channels ->>>2600 byte&0xe 0xa \b, 6 channels ->>>2600 byte&0xe 0xc \b, 7 channels ->>>2600 byte&0xe 0xe \b, 8 channels -# some common sample rates ->>>2597 belong&0xfffff0 0x0ac440 \b, 44.1 kHz ->>>2597 belong&0xfffff0 0x0bb800 \b, 48 kHz ->>>2597 belong&0xfffff0 0x07d000 \b, 32 kHz ->>>2597 belong&0xfffff0 0x056220 \b, 22.05 kHz ->>>2597 belong&0xfffff0 0x05dc00 \b, 24 kHz ->>>2597 belong&0xfffff0 0x03e800 \b, 16 kHz ->>>2597 belong&0xfffff0 0x02b110 \b, 11.025 kHz ->>>2597 belong&0xfffff0 0x02ee00 \b, 12 kHz ->>>2597 belong&0xfffff0 0x01f400 \b, 8 kHz ->>>2597 belong&0xfffff0 0x177000 \b, 96 kHz ->>>2597 belong&0xfffff0 0x0fa000 \b, 64 kHz ->>>2601 byte&0xf >0 \b, >4G samples ->2584 string !fLaC \b, MP3 encoding +0 string ID3 Audio file with ID3 version 2 +>3 byte x \b.%d +>4 byte x \b.%d +>>5 byte &0x80 \b, unsynchronized frames +>>5 byte &0x40 \b, extended header +>>5 byte &0x20 \b, experimental +>>5 byte &0x10 \b, footer present +>(6.I) indirect x \b, contains: # NSF (NES sound file) magic 0 string NESM\x1a NES Sound File Modified: projects/mesh11s/contrib/file/Magdir/cafebabe ============================================================================== --- projects/mesh11s/contrib/file/Magdir/cafebabe Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/cafebabe Sun May 10 15:37:48 2009 (r191962) @@ -12,16 +12,18 @@ # (and use as a hack). Let's not use 18, because the Mach-O people # might add another one or two as time goes by... # -0 beshort 0xcafe ->2 beshort 0xbabe +0 belong 0xcafebabe !:mime application/x-java-applet ->>2 belong >30 compiled Java class data, ->>>6 beshort x version %d. ->>>4 beshort x \b%d ->>4 belong 1 Mach-O fat file with 1 architecture ->>4 belong >1 ->>>4 belong <20 Mach-O fat file with %ld architectures ->2 beshort 0xd00d JAR compressed with pack200, +>4 belong >30 compiled Java class data, +>>6 beshort x version %d. +>>4 beshort x \b%d + +0 belong 0xcafebabe +>4 belong 1 Mach-O fat file with 1 architecture +>4 belong >1 +>>4 belong <20 Mach-O fat file with %ld architectures + +0 belong 0xcafed00d JAR compressed with pack200, >>5 byte x version %d. >>4 byte x \b%d !:mime application/x-java-pack200 Modified: projects/mesh11s/contrib/file/Magdir/compress ============================================================================== --- projects/mesh11s/contrib/file/Magdir/compress Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/compress Sun May 10 15:37:48 2009 (r191962) @@ -11,6 +11,7 @@ # standard unix compress 0 string \037\235 compress'd data !:mime application/x-compress +!:apple LZIVZIVU >2 byte&0x80 >0 block compressed >2 byte&0x1f x %d bits @@ -76,6 +77,11 @@ !:mime application/x-bzip2 >3 byte >47 \b, block size = %c00k +# lzip +0 string LZIP lzip compressed data +!:mime application/x-lzip +>4 byte x \b, version: %d + # squeeze and crunch # Michael Haardt 0 beshort 0x76FF squeezed data, Modified: projects/mesh11s/contrib/file/Magdir/elf ============================================================================== --- projects/mesh11s/contrib/file/Magdir/elf Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/elf Sun May 10 15:37:48 2009 (r191962) @@ -143,11 +143,13 @@ >>18 leshort 91 picoJava, >>18 leshort 92 OpenRISC, >>18 leshort 93 ARC Cores Tangent-A5, ->>18 leshort 0x3426 OpenRISC (obsolete), ->>18 leshort 0x8472 OpenRISC (obsolete), >>18 leshort 94 Tensilica Xtensa, >>18 leshort 97 NatSemi 32k, >>18 leshort 106 Analog Devices Blackfin, +>>18 leshort 113 Altera Nios II, +>>18 leshort 0xae META, +>>18 leshort 0x3426 OpenRISC (obsolete), +>>18 leshort 0x8472 OpenRISC (obsolete), >>18 leshort 0x9026 Alpha (unofficial), >>20 lelong 0 invalid version >>20 lelong 1 version 1 Modified: projects/mesh11s/contrib/file/Magdir/epoc ============================================================================== --- projects/mesh11s/contrib/file/Magdir/epoc Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/epoc Sun May 10 15:37:48 2009 (r191962) @@ -1,10 +1,11 @@ - #------------------------------------------------------------------------------ -# Epoc 32 : file(1) magic for Epoc Documents [psion/osaris +# EPOC : file(1) magic for EPOC documents [Psion Series 5/Osaris/Geofox 1] # Stefan Praszalowicz (hpicollo@worldnet.fr) -#0 lelong 0x10000037 Epoc32 +# Useful information for improving this file can be found at: +# http://software.frodo.looijaard.name/psiconv/formats/Index.html +0 lelong 0x10000037 >4 lelong 0x1000006D ->>8 lelong 0x1000007F Word ->>8 lelong 0x10000088 Sheet ->>8 lelong 0x1000007D Sketch ->>8 lelong 0x10000085 TextEd +>>8 lelong 0x1000007F Psion Word +>>8 lelong 0x10000088 Psion Sheet +>>8 lelong 0x1000007D Psion Sketch +>>8 lelong 0x10000085 Psion TextEd Modified: projects/mesh11s/contrib/file/Magdir/filesystems ============================================================================== --- projects/mesh11s/contrib/file/Magdir/filesystems Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/filesystems Sun May 10 15:37:48 2009 (r191962) @@ -104,9 +104,32 @@ >>>346 string des\ Betriebssystems >>>>366 string Betriebssystem\ nicht\ vorhanden \b, Microsoft Windows XP MBR (german) >>>>>0x1B8 ulelong >0 \b, Serial 0x%-.4x ->0x145 string Default:\ F \b, FREE-DOS MBR +#>0x145 string Default:\ F \b, FREE-DOS MBR +#>0x14B string Default:\ F \b, FREE-DOS 1.0 MBR +>0x145 search/7 Default:\ F \b, FREE-DOS MBR +#>>313 string F0\ .\ .\ . +#>>>322 string disk\ 1 +#>>>>382 string FAT3 >64 string no\ active\ partition\ found >>96 string read\ error\ while\ reading\ drive \b, FREE-DOS Beta 0.9 MBR +# Ranish Partition Manager http://www.ranish.com/part/ +>387 search/4 \0\ Error!\r +>>378 search/7 Virus! +>>>397 search/4 Booting\ +>>>>408 search/4 HD1/\0 \b, Ranish MBR ( +>>>>>416 string Writing\ changes... \b2.37 +>>>>>>438 ubyte x \b,0x%x dots +>>>>>>440 ubyte >0 \b,virus check +>>>>>>441 ubyte >0 \b,partition %c +#2.38,2.42,2.44 +>>>>>416 string !Writing\ changes... \b +>>>>>>418 ubyte 1 \bvirus check, +>>>>>>419 ubyte x \b0x%x seconds +>>>>>>420 ubyte&0x0F >0 \b,partition +>>>>>>>420 ubyte&0x0F <5 \b %x +>>>>>>>420 ubyte&0x0F 0Xf \b ask +>>>>>420 ubyte x \b) +# >271 string Operating\ system\ loading >>296 string error\r \b, SYSLINUX MBR (2.10) # http://www.acronis.de/ @@ -124,18 +147,20 @@ >0x40 string SBML # label with 11 characters of FAT 12 bit filesystem >>43 string SMART\ BTMGR ->>>430 string SBMK\ Bad!\r ->>>>3 string SBM \b, Smart Boot Manager ->>>>>6 string >\0 \b, version %s +>>>430 string SBMK\ Bad!\r \b, Smart Boot Manager +# OEM-ID not always "SBM" +#>>>>3 strings SBM +>>>>6 string >\0 \b, version %s >382 string XOSLLOADXCF \b, eXtended Operating System Loader >6 string LILO \b, LInux i386 boot LOader >>120 string LILO \b, version 22.3.4 SuSe >>172 string LILO \b, version 22.5.8 Debian -# updated by Joerg Jenderek +# updated by Joerg Jenderek at Oct 2008 # variables according to grub-0.97/stage1/stage1.S or # http://www.gnu.org/software/grub/manual/grub.html#Embedded-data # usual values are marked with comments to get only informations of strange GRUB loaders ->0 ulelong 0x009048EB +>342 search/60 \0Geom\0 +#>0 ulelong x %x=0x009048EB , 0x2a9048EB 0 >>0x41 ubyte <2 >>>0x3E ubyte >2 \b; GRand Unified Bootloader # 0x3 for 0.5.95,0.93,0.94,0.96 0x4 for 1.90 @@ -178,15 +203,14 @@ >3 string BCDL >>498 string BCDL\ \ \ \ BIN \b, Bootable CD Loader (1.50Z) # mbr partion table entries -# OEM-ID not Microsoft,SYSLINUX,or MTOOLs +# OEM-ID does not contain MicroSoft,NEWLDR,DOS,SYSLINUX,or MTOOLs >3 string !MS >>3 string !SYSLINUX >>>3 string !MTOOL +>>>>3 string !NEWLDR +>>>>>5 string !DOS # not FAT (32 bit) ->>>>82 string !FAT32 -#not IO.SYS ->>>>>472 string !IO\ \ \ \ \ \ SYS ->>>>>>480 string !IO\ \ \ \ \ \ SYS +>>>>>>82 string !FAT32 #not Linux kernel >>>>>>>514 string !HdrS #not BeOS @@ -272,6 +296,11 @@ >>>>>>>>>(1.b+11) ubyte 0xb >>>>>>>>>>(1.b+12) ubyte 0x56 >>>>>>>>>>(1.b+13) ubyte 0xb4 \b, mkdosfs boot message display +>214 string Please\ try\ to\ install\ FreeDOS\ \b, DOS Emulator boot message display +#>>244 string from\ dosemu-freedos-*-bin.tgz\r +#>>>170 string Sorry,\ could\ not\ load\ an\ +#>>>>195 string operating\ system.\r\n +# >103 string This\ is\ not\ a\ bootable\ disk.\ >>132 string Please\ insert\ a\ bootable\ >>>157 string floppy\ and\r\n @@ -374,12 +403,22 @@ >430 string Datentr\204ger\ entfernen\xFF\r\n >>454 string Medienfehler\xFF\r\n >>>469 string Neustart:\ Taste\ dr\201cken\r \b, Microsoft Windows XP Bootloader (4.german) ->>>>368 ubyte&0xDF >0 ->>>>>368 string x %-.5s ->>>>>>373 ubyte&0xDF >0 ->>>>>>>373 string x \b%-.3s ->>>>>376 ubyte&0xDF >0 ->>>>>>376 string x \b.%-.3s +>>>>379 string \0 +>>>>>368 ubyte&0xDF >0 +>>>>>>368 string x %-.5s +>>>>>>>373 ubyte&0xDF >0 +>>>>>>>>373 string x \b%-.3s +>>>>>>376 ubyte&0xDF >0 +>>>>>>>376 string x \b.%-.3s +# variant +>>>>417 ubyte&0xDF >0 +>>>>>417 string x %-.5s +>>>>>>422 ubyte&0xDF >0 +>>>>>>>422 string x \b%-.3s +>>>>>425 ubyte&0xDF >0 +>>>>>>425 string >\ \b.%-.3s +# + #>3 string NTFS\ \ \ \ >389 string Fehler\ beim\ Lesen\ >>407 string des\ Datentr\204gers @@ -567,12 +606,27 @@ >>>489 string Any\ key\ to\ retry \b, DR-DOS Bootloader >>471 string Cannot\ load\ DOS\ >>487 string press\ key\ to\ retry \b, Open-DOS Bootloader +#?? >444 string KERNEL\ \ SYS >>314 string BOOT\ error! \b, FREE-DOS Bootloader >499 string KERNEL\ \ SYS >>305 string BOOT\ err!\0 \b, Free-DOS Bootloader >449 string KERNEL\ \ SYS >>319 string BOOT\ error! \b, FREE-DOS 0.5 Bootloader +# +>449 string Loading\ FreeDOS +>>0x1AF ulelong >0 \b, FREE-DOS 0.95,1.0 Bootloader +>>>497 ubyte&0xDF >0 +>>>>497 string x \b %-.6s +>>>>>503 ubyte&0xDF >0 +>>>>>>503 string x \b%-.1s +>>>>>>>504 ubyte&0xDF >0 +>>>>>>>>504 string x \b%-.1s +>>>>505 ubyte&0xDF >0 +>>>>>505 string x \b.%-.3s +# +>331 string Error!.0 \b, FREE-DOS 1.0 bootloader +# >125 string Loading\ FreeDOS...\r >>311 string BOOT\ error!\r \b, FREE-DOS bootloader >>>441 ubyte&0xDF >0 @@ -706,13 +760,7 @@ #it also hangs with another message ("NF"). >>>>>492 string RENF \b, FAT (12 bit) >>>>>495 string RENF \b, FAT (16 bit) -# added by Joerg Jenderek -# http://syslinux.zytor.com/iso.php -0 ulelong 0x7c40eafa isolinux Loader -# http://syslinux.zytor.com/pxe.php -0 ulelong 0x007c05ea pxelinux Loader -0 ulelong 0x60669c66 pxelinux Loader -# loader end +# x86 bootloader end # updated by Joerg Jenderek at Sep 2007 >3 ubyte 0 #no active flag @@ -732,6 +780,7 @@ # older drives may use Near JuMP instruction E9 xx xx >0 lelong&0x009000EB 0x009000EB >0 lelong&0x000000E9 0x000000E9 +# minimal short forward jump found 03cx?? # maximal short forward jump is 07fx >1 ubyte <0xff \b, code offset 0x%x # mtools-3.9.8/msdos.h @@ -740,91 +789,92 @@ >>11 uleshort&0x000f x >>>11 uleshort <32769 >>>>11 uleshort >31 ->>>>>3 string >\0 \b, OEM-ID "%8.8s" +>>>>>21 ubyte&0xf0 0xF0 +>>>>>>3 string >\0 \b, OEM-ID "%8.8s" #http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC ->>>>>>8 string IHC \b cached by Windows 9M ->>>>>11 uleshort >512 \b, Bytes/sector %u -#>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual) ->>>>>11 uleshort <512 \b, Bytes/sector %u ->>>>>13 ubyte >1 \b, sectors/cluster %u -#>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies) ->>>>>14 uleshort >32 \b, reserved sectors %u -#>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32) -#>>>>>14 uleshort >1 \b, reserved sectors %u -#>>>>>14 uleshort =1 \b, reserved sectors %u (usual FAT12,FAT16) ->>>>>14 uleshort <1 \b, reserved sectors %u ->>>>>16 ubyte >2 \b, FATs %u -#>>>>>16 ubyte =2 \b, FATs %u (usual) ->>>>>16 ubyte =1 \b, FAT %u ->>>>>16 ubyte >0 ->>>>>17 uleshort >0 \b, root entries %u -#>>>>>17 uleshort =0 \b, root entries %u=0 (usual Fat32) ->>>>>19 uleshort >0 \b, sectors %u (volumes <=32 MB) -#>>>>>19 uleshort =0 \b, sectors %u=0 (usual Fat32) ->>>>>21 ubyte >0xF0 \b, Media descriptor 0x%x -#>>>>>21 ubyte =0xF0 \b, Media descriptor 0x%x (usual floppy) ->>>>>21 ubyte <0xF0 \b, Media descriptor 0x%x ->>>>>22 uleshort >0 \b, sectors/FAT %u -#>>>>>22 uleshort =0 \b, sectors/FAT %u=0 (usual Fat32) ->>>>>26 ubyte >2 \b, heads %u -#>>>>>26 ubyte =2 \b, heads %u (usual floppy) ->>>>>26 ubyte =1 \b, heads %u +>>>>>>>8 string IHC \b cached by Windows 9M +>>>>>>11 uleshort >512 \b, Bytes/sector %u +#>>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual) +>>>>>>11 uleshort <512 \b, Bytes/sector %u +>>>>>>13 ubyte >1 \b, sectors/cluster %u +#>>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies) +>>>>>>14 uleshort >32 \b, reserved sectors %u +#>>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32) +#>>>>>>14 uleshort >1 \b, reserved sectors %u +#>>>>>>14 uleshort =1 \b, reserved sectors %u (usual FAT12,FAT16) +>>>>>>14 uleshort <1 \b, reserved sectors %u +>>>>>>16 ubyte >2 \b, FATs %u +#>>>>>>16 ubyte =2 \b, FATs %u (usual) +>>>>>>16 ubyte =1 \b, FAT %u +>>>>>>16 ubyte >0 +>>>>>>17 uleshort >0 \b, root entries %u +#>>>>>>17 uleshort =0 \b, root entries %u=0 (usual Fat32) +>>>>>>19 uleshort >0 \b, sectors %u (volumes <=32 MB) +#>>>>>>19 uleshort =0 \b, sectors %u=0 (usual Fat32) +>>>>>>21 ubyte >0xF0 \b, Media descriptor 0x%x +#>>>>>>21 ubyte =0xF0 \b, Media descriptor 0x%x (usual floppy) +>>>>>>21 ubyte <0xF0 \b, Media descriptor 0x%x +>>>>>>22 uleshort >0 \b, sectors/FAT %u +#>>>>>>22 uleshort =0 \b, sectors/FAT %u=0 (usual Fat32) +>>>>>>26 ubyte >2 \b, heads %u +#>>>>>>26 ubyte =2 \b, heads %u (usual floppy) +>>>>>>26 ubyte =1 \b, heads %u #skip for Digital Research DOS (version 3.41) 1440 kB Bootdisk ->>>>>38 ubyte !0x70 ->>>>>>28 ulelong >0 \b, hidden sectors %u -#>>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy) ->>>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB) -#>>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB) +>>>>>>38 ubyte !0x70 +>>>>>>>28 ulelong >0 \b, hidden sectors %u +#>>>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy) +>>>>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB) +#>>>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB) # FAT<32 specific ->>>>>82 string !FAT32 -#>>>>>>36 ubyte 0x80 \b, physical drive 0x%x=0x80 (usual harddisk) -#>>>>>>36 ubyte 0 \b, physical drive 0x%x=0 (usual floppy) ->>>>>>36 ubyte !0x80 ->>>>>>>36 ubyte !0 \b, physical drive 0x%x ->>>>>>37 ubyte >0 \b, reserved 0x%x -#>>>>>>37 ubyte =0 \b, reserved 0x%x ->>>>>>38 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) ->>>>>>38 ubyte <0x29 \b, dos < 4.0 BootSector (0x%x) ->>>>>>38 ubyte =0x29 ->>>>>>>39 ulelong x \b, serial number 0x%x ->>>>>>>43 string >>>>>>43 string >NO\ NAME \b, label: "%11.11s" ->>>>>>>43 string =NO\ NAME \b, unlabeled ->>>>>>54 string FAT \b, FAT ->>>>>>>54 string FAT12 \b (12 bit) ->>>>>>>54 string FAT16 \b (16 bit) +>>>>>>82 string !FAT32 +#>>>>>>>36 ubyte 0x80 \b, physical drive 0x%x=0x80 (usual harddisk) +#>>>>>>>36 ubyte 0 \b, physical drive 0x%x=0 (usual floppy) +>>>>>>>36 ubyte !0x80 +>>>>>>>>36 ubyte !0 \b, physical drive 0x%x +>>>>>>>37 ubyte >0 \b, reserved 0x%x +#>>>>>>>37 ubyte =0 \b, reserved 0x%x +>>>>>>>38 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>>38 ubyte <0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>>38 ubyte =0x29 +>>>>>>>>39 ulelong x \b, serial number 0x%x +>>>>>>>>43 string >>>>>>>43 string >NO\ NAME \b, label: "%11.11s" +>>>>>>>>43 string =NO\ NAME \b, unlabeled +>>>>>>>54 string FAT \b, FAT +>>>>>>>>54 string FAT12 \b (12 bit) +>>>>>>>>54 string FAT16 \b (16 bit) # FAT32 specific ->>>>>82 string FAT32 \b, FAT (32 bit) ->>>>>>36 ulelong x \b, sectors/FAT %u ->>>>>>40 uleshort >0 \b, extension flags %u -#>>>>>>40 uleshort =0 \b, extension flags %u ->>>>>>42 uleshort >0 \b, fsVersion %u -#>>>>>>42 uleshort =0 \b, fsVersion %u (usual) ->>>>>>44 ulelong >2 \b, rootdir cluster %u -#>>>>>>44 ulelong =2 \b, rootdir cluster %u -#>>>>>>44 ulelong =1 \b, rootdir cluster %u ->>>>>>48 uleshort >1 \b, infoSector %u -#>>>>>>48 uleshort =1 \b, infoSector %u (usual) ->>>>>>48 uleshort <1 \b, infoSector %u ->>>>>>50 uleshort >6 \b, Backup boot sector %u -#>>>>>>50 uleshort =6 \b, Backup boot sector %u (usual) ->>>>>>50 uleshort <6 \b, Backup boot sector %u ->>>>>>54 ulelong >0 \b, reserved1 0x%x ->>>>>>58 ulelong >0 \b, reserved2 0x%x ->>>>>>62 ulelong >0 \b, reserved3 0x%x +>>>>>>82 string FAT32 \b, FAT (32 bit) +>>>>>>>36 ulelong x \b, sectors/FAT %u +>>>>>>>40 uleshort >0 \b, extension flags %u +#>>>>>>>40 uleshort =0 \b, extension flags %u +>>>>>>>42 uleshort >0 \b, fsVersion %u +#>>>>>>>42 uleshort =0 \b, fsVersion %u (usual) +>>>>>>>44 ulelong >2 \b, rootdir cluster %u +#>>>>>>>44 ulelong =2 \b, rootdir cluster %u +#>>>>>>>44 ulelong =1 \b, rootdir cluster %u +>>>>>>>48 uleshort >1 \b, infoSector %u +#>>>>>>>48 uleshort =1 \b, infoSector %u (usual) +>>>>>>>48 uleshort <1 \b, infoSector %u +>>>>>>>50 uleshort >6 \b, Backup boot sector %u +#>>>>>>>50 uleshort =6 \b, Backup boot sector %u (usual) +>>>>>>>50 uleshort <6 \b, Backup boot sector %u +>>>>>>>54 ulelong >0 \b, reserved1 0x%x +>>>>>>>58 ulelong >0 \b, reserved2 0x%x +>>>>>>>62 ulelong >0 \b, reserved3 0x%x # same structure as FAT1X ->>>>>>64 ubyte >0x80 \b, physical drive 0x%x -#>>>>>>64 ubyte =0x80 \b, physical drive 0x%x=80 (usual harddisk) ->>>>>>64 ubyte&0x7F >0 \b, physical drive 0x%x -#>>>>>>64 ubyte =0 \b, physical drive 0x%x=0 (usual floppy) ->>>>>>65 ubyte >0 \b, reserved 0x%x ->>>>>>66 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) ->>>>>>66 ubyte <0x29 \b, dos < 4.0 BootSector (0x%x) ->>>>>>66 ubyte =0x29 ->>>>>>>67 ulelong x \b, serial number 0x%x ->>>>>>>71 string >>>>>71 string >NO\ NAME \b, label: "%11.11s" ->>>>>>71 string =NO\ NAME \b, unlabeled +>>>>>>>64 ubyte >0x80 \b, physical drive 0x%x +#>>>>>>>64 ubyte =0x80 \b, physical drive 0x%x=80 (usual harddisk) +>>>>>>>64 ubyte&0x7F >0 \b, physical drive 0x%x +#>>>>>>>64 ubyte =0 \b, physical drive 0x%x=0 (usual floppy) +>>>>>>>65 ubyte >0 \b, reserved 0x%x +>>>>>>>66 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>>66 ubyte <0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>>66 ubyte =0x29 +>>>>>>>>67 ulelong x \b, serial number 0x%x +>>>>>>>>71 string >>>>>>71 string >NO\ NAME \b, label: "%11.11s" +>>>>>>>71 string =NO\ NAME \b, unlabeled ### FATs end >0x200 lelong 0x82564557 \b, BSD disklabel # FATX @@ -854,6 +904,13 @@ 0x18b string OS/2 OS/2 Boot Manager +# updated by Joerg Jenderek at Oct 2008!! +# http://syslinux.zytor.com/iso.php +0 ulelong 0x7c40eafa isolinux Loader +# http://syslinux.zytor.com/pxe.php +0 ulelong 0x007c05ea pxelinux Loader +0 ulelong 0x60669c66 pxelinux Loader + # added by Joerg Jenderek # In the second sector (+0x200) are variables according to grub-0.97/stage2/asm.S or # grub-1.94/kern/i386/pc/startup.S @@ -1324,6 +1381,14 @@ >0x10024 belong x (blocksize %d, >0x10060 string >\0 lockproto %s) +# BTRFS +0x10040 string _BHRfS_M BTRFS Filesystem +>0x1012b string >\0 (label "%s", +>0x10090 lelong x sectorsize %d, +>0x10094 lelong x nodesize %d, +>0x10098 lelong x leafsize %d) + + # dvdisaster's .ecc # From: "Nelson A. de Oliveira" 0 string *dvdisaster* dvdisaster error correction file Modified: projects/mesh11s/contrib/file/Magdir/graphviz ============================================================================== --- projects/mesh11s/contrib/file/Magdir/graphviz Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/graphviz Sun May 10 15:37:48 2009 (r191962) @@ -1,7 +1,10 @@ - #------------------------------------------------------------------------------ # graphviz: file(1) magic for http://www.graphviz.org/ -0 regex/100 [\r\n\t\ ]*graph[\r\n\t\ ]*.*\\{ graphviz graph text -!:mime text/vnd.graphviz -0 regex/100 [\r\n\t\ ]*digraph[\r\n\t\ ]*.*\\{ graphviz digraph text -!:mime text/vnd.graphviz + +# FIXME: These patterns match too generally. For example, the first +# line matches a LaTeX file containing the word "graph" (with a { +# following later) and the second line matches this file. +#0 regex/100 [\r\n\t\ ]*graph[\r\n\t\ ]+.*\\{ graphviz graph text +#!:mime text/vnd.graphviz +#0 regex/100 [\r\n\t\ ]*digraph[\r\n\t\ ]+.*\\{ graphviz digraph text +#!:mime text/vnd.graphviz Modified: projects/mesh11s/contrib/file/Magdir/images ============================================================================== --- projects/mesh11s/contrib/file/Magdir/images Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/images Sun May 10 15:37:48 2009 (r191962) @@ -110,6 +110,7 @@ # GIF 0 string GIF8 GIF image data !:mime image/gif +!:apple 8BIMGIFf >4 string 7a \b, version 8%s, >4 string 9a \b, version 8%s, >6 leshort >0 %hd x @@ -600,3 +601,7 @@ # Wavelet Scalar Quantization format used in gray-scale fingerprint images # From Tano M Fotang 0 string \xff\xa0\xff\xa8\x00 Wavelet Scalar Quantization image data + +# JPEG 2000 Code Stream Bitmap +# From Petr Splichal +0 string \xFF\x4F\xFF\x51\x00 JPEG-2000 Code Stream Bitmap data Modified: projects/mesh11s/contrib/file/Magdir/jpeg ============================================================================== --- projects/mesh11s/contrib/file/Magdir/jpeg Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/jpeg Sun May 10 15:37:48 2009 (r191962) @@ -10,6 +10,7 @@ # 0 beshort 0xffd8 JPEG image data !:mime image/jpeg +!:apple 8BIMJPEG !:strength +1 >6 string JFIF \b, JFIF standard # The following added by Erik Rossen 1999-09-06 Modified: projects/mesh11s/contrib/file/Magdir/mach ============================================================================== --- projects/mesh11s/contrib/file/Magdir/mach Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/mach Sun May 10 15:37:48 2009 (r191962) @@ -4,7 +4,7 @@ # Java ByteCode, so they are both handled in the file "cafebabe". # The "feedface" ones are handled herein. #------------------------------------------------------------ -0 lelong&0xfeffffff 0xfeedface Mach-O +0 lelong&0xfffffffe 0xfeedface Mach-O >0 byte 0xcf 64-bit >12 lelong 1 object >12 lelong 2 executable Modified: projects/mesh11s/contrib/file/Magdir/macintosh ============================================================================== --- projects/mesh11s/contrib/file/Magdir/macintosh Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/macintosh Sun May 10 15:37:48 2009 (r191962) @@ -11,6 +11,8 @@ # Stuffit archives are the de facto standard of compression for Macintosh # files obtained from most archives. (franklsm@tuns.ca) 0 string SIT! StuffIt Archive (data) +!:mime application/x-stuffit +!:apple SIT!SIT! >2 string x : %s 0 string SITD StuffIt Deluxe (data) >2 string x : %s @@ -20,6 +22,7 @@ # Newer StuffIt archives (grant@netbsd.org) 0 string StuffIt StuffIt Archive !:mime application/x-stuffit +!:apple SIT!SIT! #>162 string >0 : %s # Macintosh Applications and Installation binaries (franklsm@tuns.ca) Modified: projects/mesh11s/contrib/file/Magdir/msdos ============================================================================== --- projects/mesh11s/contrib/file/Magdir/msdos Sun May 10 11:05:22 2009 (r191961) +++ projects/mesh11s/contrib/file/Magdir/msdos Sun May 10 15:37:48 2009 (r191962) @@ -4,15 +4,15 @@ # # .BAT files (Daniel Quinlan, quinlan@yggdrasil.com) -# updated by Joerg Jenderek +# updated by Joerg Jenderek at Oct 2008 0 string @ ->1 string/cB \ echo\ off MS-DOS batch file text +>1 string/cB \ echo\ off DOS batch file text !:mime text/x-msdos-batch ->1 string/cB echo\ off MS-DOS batch file text +>1 string/cB echo\ off DOS batch file text !:mime text/x-msdos-batch ->1 string/cB rem\ MS-DOS batch file text +>1 string/cB rem\ DOS batch file text !:mime text/x-msdos-batch ->1 string/cB set\ MS-DOS batch file text +>1 string/cB set\ DOS batch file text !:mime text/x-msdos-batch @@ -285,8 +285,9 @@ # Uncommenting only the first two lines will cover about 2/3 of COM files, # but it isn't feasible to match all COM files since there must be at least # two dozen different one-byte "magics". -#0 byte 0xe9 DOS executable (COM) -#>0x1FE leshort 0xAA55 \b, boot code +# test too generic ? +0 byte 0xe9 DOS executable (COM) +>0x1FE leshort 0xAA55 \b, boot code >6 string SFX\ of\ LHarc (%s) 0 belong 0xffffffff DOS executable (device driver) #CMD640X2.SYS @@ -309,25 +310,38 @@ >>77 string >\x40 >>>77 string <\x5B >>>>77 string x \b, name: %.8s -#0 byte 0x8c DOS executable (COM) -# 0xeb conflicts with "sequent" magic -#0 byte 0xeb DOS executable (COM) -#>0x1FE leshort 0xAA55 \b, boot code -#>85 string UPX \b, UPX compressed -#>4 string \ $ARX \b, ARX self-extracting archive -#>4 string \ $LHarc \b, LHarc self-extracting archive -#>0x20e string SFX\ by\ LARC \b, LARC self-extracting archive +# test too generic ? +0 byte 0x8c DOS executable (COM) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***