Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Apr 2012 03:20:13 +0000 (UTC)
From:      "David E. O'Brien" <obrien@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r234449 - in head: contrib/file contrib/file/Magdir contrib/file/tests lib/libmagic usr.bin/file
Message-ID:  <201204190320.q3J3KD2h062891@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: obrien
Date: Thu Apr 19 03:20:13 2012
New Revision: 234449
URL: http://svn.freebsd.org/changeset/base/234449

Log:
  Update file(1) to version 5.11.

Added:
  head/contrib/file/Magdir/assembler
     - copied unchanged from r234250, vendor/file/dist/Magdir/assembler
  head/contrib/file/Magdir/blcr
     - copied unchanged from r234250, vendor/file/dist/Magdir/blcr
  head/contrib/file/Magdir/bsi
     - copied unchanged from r234250, vendor/file/dist/Magdir/bsi
  head/contrib/file/Magdir/cups
     - copied unchanged from r234250, vendor/file/dist/Magdir/cups
  head/contrib/file/Magdir/ebml
     - copied unchanged from r234250, vendor/file/dist/Magdir/ebml
  head/contrib/file/Magdir/fusecompress
     - copied unchanged from r234250, vendor/file/dist/Magdir/fusecompress
  head/contrib/file/Magdir/geo
     - copied unchanged from r234250, vendor/file/dist/Magdir/geo
  head/contrib/file/Magdir/guile
     - copied unchanged from r234250, vendor/file/dist/Magdir/guile
  head/contrib/file/Magdir/isz
     - copied unchanged from r234250, vendor/file/dist/Magdir/isz
  head/contrib/file/Magdir/m4
     - copied unchanged from r234250, vendor/file/dist/Magdir/m4
  head/contrib/file/Magdir/make
     - copied unchanged from r234250, vendor/file/dist/Magdir/make
  head/contrib/file/Magdir/marc21
     - copied unchanged from r234250, vendor/file/dist/Magdir/marc21
  head/contrib/file/Magdir/metastore
     - copied unchanged from r234250, vendor/file/dist/Magdir/metastore
  head/contrib/file/Magdir/msooxml
     - copied unchanged from r234250, vendor/file/dist/Magdir/msooxml
  head/contrib/file/Magdir/music
     - copied unchanged from r234250, vendor/file/dist/Magdir/music
  head/contrib/file/Magdir/oasis
     - copied unchanged from r234250, vendor/file/dist/Magdir/oasis
  head/contrib/file/Magdir/parrot
     - copied unchanged from r234250, vendor/file/dist/Magdir/parrot
  head/contrib/file/Magdir/pascal
     - copied unchanged from r234250, vendor/file/dist/Magdir/pascal
  head/contrib/file/Magdir/rinex
     - copied unchanged from r234250, vendor/file/dist/Magdir/rinex
  head/contrib/file/Magdir/selinux
     - copied unchanged from r234250, vendor/file/dist/Magdir/selinux
  head/contrib/file/Magdir/sisu
     - copied unchanged from r234250, vendor/file/dist/Magdir/sisu
  head/contrib/file/Magdir/smile
     - copied unchanged from r234250, vendor/file/dist/Magdir/smile
  head/contrib/file/Magdir/ssh
     - copied unchanged from r234250, vendor/file/dist/Magdir/ssh
  head/contrib/file/Magdir/ssl
     - copied unchanged from r234250, vendor/file/dist/Magdir/ssl
  head/contrib/file/Magdir/tcl
     - copied unchanged from r234250, vendor/file/dist/Magdir/tcl
  head/contrib/file/Magdir/virtual
     - copied unchanged from r234250, vendor/file/dist/Magdir/virtual
  head/contrib/file/Magdir/wsdl
     - copied unchanged from r234250, vendor/file/dist/Magdir/wsdl
  head/contrib/file/Magdir/zfs
     - copied unchanged from r234250, vendor/file/dist/Magdir/zfs
  head/contrib/file/getline.c
     - copied unchanged from r234250, vendor/file/dist/getline.c
Deleted:
  head/contrib/file/Magdir/alpha
  head/contrib/file/Magdir/psion
  head/contrib/file/patchlevel.h
Modified:
  head/contrib/file/ChangeLog
  head/contrib/file/Header
  head/contrib/file/INSTALL
  head/contrib/file/Magdir/acorn
  head/contrib/file/Magdir/adi
  head/contrib/file/Magdir/adventure
  head/contrib/file/Magdir/allegro
  head/contrib/file/Magdir/alliant
  head/contrib/file/Magdir/amanda
  head/contrib/file/Magdir/amigaos
  head/contrib/file/Magdir/animation
  head/contrib/file/Magdir/apl
  head/contrib/file/Magdir/apple
  head/contrib/file/Magdir/applix
  head/contrib/file/Magdir/archive
  head/contrib/file/Magdir/asterix
  head/contrib/file/Magdir/att3b
  head/contrib/file/Magdir/audio
  head/contrib/file/Magdir/basis
  head/contrib/file/Magdir/bflt
  head/contrib/file/Magdir/blender
  head/contrib/file/Magdir/blit
  head/contrib/file/Magdir/bout
  head/contrib/file/Magdir/bsdi
  head/contrib/file/Magdir/btsnoop
  head/contrib/file/Magdir/c-lang
  head/contrib/file/Magdir/c64
  head/contrib/file/Magdir/cad
  head/contrib/file/Magdir/cafebabe
  head/contrib/file/Magdir/cddb
  head/contrib/file/Magdir/chord
  head/contrib/file/Magdir/cisco
  head/contrib/file/Magdir/citrus
  head/contrib/file/Magdir/clarion
  head/contrib/file/Magdir/claris
  head/contrib/file/Magdir/clipper
  head/contrib/file/Magdir/commands
  head/contrib/file/Magdir/communications
  head/contrib/file/Magdir/compress
  head/contrib/file/Magdir/console
  head/contrib/file/Magdir/convex
  head/contrib/file/Magdir/cracklib
  head/contrib/file/Magdir/ctags
  head/contrib/file/Magdir/dact
  head/contrib/file/Magdir/database
  head/contrib/file/Magdir/diamond
  head/contrib/file/Magdir/diff
  head/contrib/file/Magdir/digital
  head/contrib/file/Magdir/dolby
  head/contrib/file/Magdir/dump
  head/contrib/file/Magdir/dyadic
  head/contrib/file/Magdir/editors
  head/contrib/file/Magdir/efi
  head/contrib/file/Magdir/elf
  head/contrib/file/Magdir/encore
  head/contrib/file/Magdir/epoc
  head/contrib/file/Magdir/erlang
  head/contrib/file/Magdir/esri
  head/contrib/file/Magdir/fcs
  head/contrib/file/Magdir/filesystems
  head/contrib/file/Magdir/flash
  head/contrib/file/Magdir/fonts
  head/contrib/file/Magdir/fortran
  head/contrib/file/Magdir/frame
  head/contrib/file/Magdir/freebsd
  head/contrib/file/Magdir/fsav
  head/contrib/file/Magdir/games
  head/contrib/file/Magdir/gcc
  head/contrib/file/Magdir/geos
  head/contrib/file/Magdir/gimp
  head/contrib/file/Magdir/gnome-keyring
  head/contrib/file/Magdir/gnu
  head/contrib/file/Magdir/gnumeric
  head/contrib/file/Magdir/grace
  head/contrib/file/Magdir/graphviz
  head/contrib/file/Magdir/gringotts
  head/contrib/file/Magdir/hitachi-sh
  head/contrib/file/Magdir/hp
  head/contrib/file/Magdir/human68k
  head/contrib/file/Magdir/ibm370
  head/contrib/file/Magdir/ibm6000
  head/contrib/file/Magdir/iff
  head/contrib/file/Magdir/images
  head/contrib/file/Magdir/inform
  head/contrib/file/Magdir/intel
  head/contrib/file/Magdir/interleaf
  head/contrib/file/Magdir/island
  head/contrib/file/Magdir/ispell
  head/contrib/file/Magdir/java
  head/contrib/file/Magdir/jpeg
  head/contrib/file/Magdir/karma
  head/contrib/file/Magdir/kde
  head/contrib/file/Magdir/kml
  head/contrib/file/Magdir/lecter
  head/contrib/file/Magdir/lex
  head/contrib/file/Magdir/lif
  head/contrib/file/Magdir/linux
  head/contrib/file/Magdir/lisp
  head/contrib/file/Magdir/llvm
  head/contrib/file/Magdir/lua
  head/contrib/file/Magdir/luks
  head/contrib/file/Magdir/mach
  head/contrib/file/Magdir/macintosh
  head/contrib/file/Magdir/magic
  head/contrib/file/Magdir/mail.news
  head/contrib/file/Magdir/maple
  head/contrib/file/Magdir/mathcad
  head/contrib/file/Magdir/mathematica
  head/contrib/file/Magdir/matroska
  head/contrib/file/Magdir/mcrypt
  head/contrib/file/Magdir/mercurial
  head/contrib/file/Magdir/mime
  head/contrib/file/Magdir/mips
  head/contrib/file/Magdir/mirage
  head/contrib/file/Magdir/misctools
  head/contrib/file/Magdir/mkid
  head/contrib/file/Magdir/mlssa
  head/contrib/file/Magdir/mmdf
  head/contrib/file/Magdir/modem
  head/contrib/file/Magdir/motorola
  head/contrib/file/Magdir/mozilla
  head/contrib/file/Magdir/msdos
  head/contrib/file/Magdir/msvc
  head/contrib/file/Magdir/mup
  head/contrib/file/Magdir/natinst
  head/contrib/file/Magdir/ncr
  head/contrib/file/Magdir/netbsd
  head/contrib/file/Magdir/netscape
  head/contrib/file/Magdir/netware
  head/contrib/file/Magdir/news
  head/contrib/file/Magdir/nitpicker
  head/contrib/file/Magdir/ocaml
  head/contrib/file/Magdir/octave
  head/contrib/file/Magdir/ole2compounddocs
  head/contrib/file/Magdir/olf
  head/contrib/file/Magdir/os2
  head/contrib/file/Magdir/os400
  head/contrib/file/Magdir/os9
  head/contrib/file/Magdir/osf1
  head/contrib/file/Magdir/palm
  head/contrib/file/Magdir/parix
  head/contrib/file/Magdir/pbm
  head/contrib/file/Magdir/pdf
  head/contrib/file/Magdir/pdp
  head/contrib/file/Magdir/perl
  head/contrib/file/Magdir/pgp
  head/contrib/file/Magdir/pkgadd
  head/contrib/file/Magdir/plan9
  head/contrib/file/Magdir/plus5
  head/contrib/file/Magdir/printer
  head/contrib/file/Magdir/project
  head/contrib/file/Magdir/psdbms
  head/contrib/file/Magdir/pulsar
  head/contrib/file/Magdir/pyramid
  head/contrib/file/Magdir/python
  head/contrib/file/Magdir/revision
  head/contrib/file/Magdir/riff
  head/contrib/file/Magdir/rpm
  head/contrib/file/Magdir/rtf
  head/contrib/file/Magdir/ruby
  head/contrib/file/Magdir/sc
  head/contrib/file/Magdir/sccs
  head/contrib/file/Magdir/scientific
  head/contrib/file/Magdir/securitycerts
  head/contrib/file/Magdir/sendmail
  head/contrib/file/Magdir/sequent
  head/contrib/file/Magdir/sgi
  head/contrib/file/Magdir/sgml
  head/contrib/file/Magdir/sharc
  head/contrib/file/Magdir/sinclair
  head/contrib/file/Magdir/sketch
  head/contrib/file/Magdir/smalltalk
  head/contrib/file/Magdir/sniffer
  head/contrib/file/Magdir/softquad
  head/contrib/file/Magdir/spec
  head/contrib/file/Magdir/spectrum
  head/contrib/file/Magdir/sql
  head/contrib/file/Magdir/sun
  head/contrib/file/Magdir/sysex
  head/contrib/file/Magdir/teapot
  head/contrib/file/Magdir/terminfo
  head/contrib/file/Magdir/tex
  head/contrib/file/Magdir/tgif
  head/contrib/file/Magdir/ti-8x
  head/contrib/file/Magdir/timezone
  head/contrib/file/Magdir/troff
  head/contrib/file/Magdir/tuxedo
  head/contrib/file/Magdir/typeset
  head/contrib/file/Magdir/unicode
  head/contrib/file/Magdir/unknown
  head/contrib/file/Magdir/uuencode
  head/contrib/file/Magdir/varied.out
  head/contrib/file/Magdir/varied.script
  head/contrib/file/Magdir/vax
  head/contrib/file/Magdir/vicar
  head/contrib/file/Magdir/virtutech
  head/contrib/file/Magdir/visx
  head/contrib/file/Magdir/vms
  head/contrib/file/Magdir/vmware
  head/contrib/file/Magdir/vorbis
  head/contrib/file/Magdir/vxl
  head/contrib/file/Magdir/warc
  head/contrib/file/Magdir/weak
  head/contrib/file/Magdir/windows
  head/contrib/file/Magdir/wireless
  head/contrib/file/Magdir/wordprocessors
  head/contrib/file/Magdir/xdelta
  head/contrib/file/Magdir/xenix
  head/contrib/file/Magdir/xilinx
  head/contrib/file/Magdir/xo65
  head/contrib/file/Magdir/xwindows
  head/contrib/file/Magdir/zilog
  head/contrib/file/Magdir/zyxel
  head/contrib/file/Makefile.am
  head/contrib/file/Makefile.am-src
  head/contrib/file/Makefile.in
  head/contrib/file/README
  head/contrib/file/TODO
  head/contrib/file/acinclude.m4
  head/contrib/file/aclocal.m4
  head/contrib/file/apprentice.c
  head/contrib/file/apptype.c
  head/contrib/file/ascmagic.c
  head/contrib/file/asprintf.c
  head/contrib/file/cdf.c
  head/contrib/file/cdf.h
  head/contrib/file/cdf_time.c
  head/contrib/file/compile
  head/contrib/file/compress.c
  head/contrib/file/config.h.in
  head/contrib/file/configure
  head/contrib/file/configure.ac
  head/contrib/file/elfclass.h
  head/contrib/file/encoding.c
  head/contrib/file/file.c
  head/contrib/file/file.h
  head/contrib/file/file.man
  head/contrib/file/file_opts.h
  head/contrib/file/fsmagic.c
  head/contrib/file/funcs.c
  head/contrib/file/install-sh
  head/contrib/file/is_tar.c
  head/contrib/file/libmagic.man
  head/contrib/file/magic.c
  head/contrib/file/magic.h
  head/contrib/file/magic.man
  head/contrib/file/print.c
  head/contrib/file/readcdf.c
  head/contrib/file/readelf.c
  head/contrib/file/readelf.h
  head/contrib/file/softmagic.c
  head/contrib/file/tar.h
  head/contrib/file/tests/Makefile.am
  head/contrib/file/tests/Makefile.in
  head/contrib/file/vasprintf.c
  head/lib/libmagic/Makefile
  head/lib/libmagic/config.h
  head/usr.bin/file/Makefile
Directory Properties:
  head/contrib/file/   (props changed)

Modified: head/contrib/file/ChangeLog
==============================================================================
--- head/contrib/file/ChangeLog	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/ChangeLog	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,3 +1,309 @@
+2012-02-20  17:33  Christos Zoulas <christos@zoulas.com>
+
+	* Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
+
+2011-12-15  12:17  Chris Metcalf <cmetcalf@tilera.com>
+
+	* Support Tilera architectures (tile64, tilepro, tilegx).
+
+2011-12-16  16:33  Reuben Thomas <rrt@sc3d.org>
+
+	* Add magic for /usr/bin/env Perl scripts
+	* Weaken generic script magic to avoid clashing with
+	language-specific magic.
+
+2011-12-08  13:37  Reuben Thomas <rrt@sc3d.org>
+
+	* Simplify if (p) free(p) to free(p).
+
+2011-12-08  13:07  Reuben Thomas <rrt@sc3d.org>
+
+	* Remove hardwired token finding (names.h), turning it into soft
+	magic. Patterns are either anchored regexs or search/8192. English
+	language detection and PL/1 detection have been removed as they
+	were too fragile. -e tokens is still accepted for backwards
+	compatibility.
+	* Move 3ds patterns (which are commented out anyway) into autodesk
+	(they were, oddly, in c-lang).
+
+2011-12-06  00:16  Reuben Thomas <rrt@sc3d.org>
+
+	* Tweak strength of generic hash-bang detectors to be less than
+	specific ones.
+	* Make an inconsistent description of Python scripts consistent.
+
+2011-12-05  23:58  Reuben Thomas <rrt@sc3d.org>
+
+	* Fix minor error in file(1).
+
+2011-11-05  00:00  Reuben Thomas <rrt@sc3d.org>
+
+	* Fix issue #150 (I hope).
+
+2011-09-22  12:57  Christos Zoulas <christos@zoulas.com>
+
+	* Python3 binding fixes from Kelly Anderson
+
+2011-09-20  11:32  Christos Zoulas <christos@zoulas.com>
+
+	* If a string type magic entry is marked as text or binary
+	  only match text files against text entries and binary
+	  files against binary entries.
+
+2011-09-01  12:12  Christos Zoulas <christos@zoulas.com>
+
+	* Don't wait for any subprocess, just the one we forked.
+
+2011-08-26  16:40  Christos Zoulas <christos@zoulas.com>
+
+	* If the application name is not set in a cdf file, try to see
+	  if it has a directory with the application name on it.
+
+2011-08-17  14:32  Christos Zoulas <christos@zoulas.com>
+
+	* Fix ELF lseek(2) madness. Inspired by PR/134 by Jan Kaluza
+
+2011-08-14  09:03  Christos Zoulas <christos@zoulas.com>
+
+	* Don't use variable string formats.
+
+2011-07-12  12:32  Reuben Thomas <rrt@sc3d.org>
+
+	* Fix detection of Zip files (Mantis #128).
+	* Make some minor improvements to file(1).
+	* Rename MIME types for filesystem objects for consistency with
+	  xdg-utils. Typically this means that application/x-foo becomes
+	  inode/foo, but some names also change slightly, e.g.
+	  application/x-character-device becomes inode/chardevice.
+
+2011-05-10  20:57  Christos Zoulas <christos@zoulas.com>
+
+	* fix mingw compilation (Abradoks)
+
+2011-05-10  20:57  Christos Zoulas <christos@zoulas.com>
+
+	* remove patchlevel.h
+	* Fix read past allocated memory caused by double-incrementing
+	  a pointer in a loop (reported by Roberto Maar)
+
+2011-03-30  15:45  Christos Zoulas <christos@zoulas.com>
+
+	* Fix cdf string buffer setting (Sven Anders)
+
+2011-03-20  16:35  Christos Zoulas <christos@zoulas.com>
+
+	* Eliminate MAXPATHLEN and use dynamic allocation for
+	  path and file buffers.
+
+2011-03-15  18:15  Christos Zoulas <christos@zoulas.com>
+
+	* binary tests on magic entries with masks could spuriously
+	  get converted to ascii.
+
+2011-03-12  18:06  Reuben Thomas <rrt@sc3d.org>
+
+	* Improve file.man (remove BUGS, present email addresses consistently).
+
+2011-03-07  19:38  Christos Zoulas <christos@zoulas.com>
+
+	* add lrzip support (from Ville Skytta)
+
+2011-02-10  16:36  Christos Zoulas <christos@zoulas.com>
+
+	* fix CDF bounds checking (Guy Helmer)
+
+2011-02-10  12:03  Christos Zoulas <christos@zoulas.com>
+
+	* add cdf_ctime() that prints a meaningful error when time cannot
+	  be converted.
+
+2011-02-02  20:40  Christos Zoulas <christos@zoulas.com>
+
+	* help and version output to stdout.
+
+	* When matching softmagic for ascii files, don't just print
+	  the softmagic classification, keep going and print the
+	  text classification too. This fixes broken troff files when
+	  we moved them from keyword recognition to softmagic
+	  (they stopped printing "with CRLF" etc.)
+	  Reported by Doug McIlroy.
+
+2011-01-16  19:31  Reuben Thomas <rrt@sc3d.org>
+
+	* Fix two potential buffer overruns in apprentice_list.
+
+2011-01-14  22:33  Reuben Thomas <rrt@sc3d.org>
+
+	* New Python binding in pure Python.
+	* Update libmagic(3).
+
+2011-01-06  21:40  Reuben Thomas <rrt@sc3d.org>
+
+	* Fix Python bindings (including recent Python 3 compatibility
+	  update).
+
+2011-01-04  18:43  Reuben Thomas <rrt@sc3d.org>
+
+	* magic/Makefile.am: make it easier to recover from magic build failures.
+	* Fix pstring length specifier parsing to avoid generating invalid
+	  magic files.
+	* Add pstring length "J" (for "JPEG") to specify that the length
+	  include itself.
+	* Fix JPEG comment parsing at last using pstring/HJ!
+	* Ignore section 5 man pages in doc/.cvsignore.
+
+2010-12-22  13:12  Christos Zoulas <christos@zoulas.com>
+
+	* Add pstring/BHhLl to specify the type of the length of pascal
+	  strings.
+
+2010-11-26  18:39  Reuben Thomas <rrt@sc3d.org>
+
+	* Fix "-e soft": it was ignored when softmagic was called
+	  during asciimagic.
+	* Improve comments and use "unsigned char" in tar.h/is_tar.c.
+
+2010-11-05  17:26  Reuben Thomas <rrt@sc3d.org>
+
+	* Make bug reporting addresses more visible.
+
+2010-11-01  18:35  Reuben Thomas <rrt@sc3d.org>
+
+	* Add tcl magic from Gustaf Neumann
+
+2010-10-24  10:42  Christos Zoulas <christos@zoulas.com>
+
+	* Fix the whitespace comparing code (Christopher Chittleborough)
+
+2010-10-06  21:05  Christos Zoulas <christos@zoulas.com>
+
+	* allow string/t to work (Jan Kaluza)
+
+2010-09-20  22:11  Reuben Thomas <rrt@sc3d.org>
+
+	* Apply some patches from Ubuntu and Fedora.
+
+2010-09-20  21:16  Reuben Thomas <rrt@sc3d.org>
+
+	* Apply all patches from Debian package 5.04-6 which have not
+	  already been applied and are not Debian-specific.
+
+2010-09-20  15:24  Reuben Thomas <rrt@sc3d.org>
+
+	* Minor security fix to softmagic.c (don't use untrusted
+	  string as printf format).
+
+2010-07-21  12:20  Christos Zoulas <christos@zoulas.com>
+
+	* MINGW32 portability from LRN
+
+	* Don't warn about escaping magic regex chars when we are in a regex.
+
+2010-07-19  10:55  Christos Zoulas <christos@zoulas.com>
+
+	* Only try to print prpsinfo for core files. (Jan Kaluza)
+
+2010-04-22  12:55  Christos Zoulas <christos@zoulas.com>
+
+	* Try more elf offsets for Debian core files.  (Arnaud Giersch)
+
+2010-02-20  15:18  Reuben Thomas <rrt@sc3d.org>
+
+	* Clarify which sort of CDF we mean.
+
+2010-02-14  22:58  Reuben Thomas <rrt@sc3d.org>
+
+	* Re-jig Zip file type magic so that unsupported special
+	  Zip types (those with "mimetype" at offset 30) can be
+	  recognized.
+
+2010-02-02  21:50  Reuben Thomas <rrt@sc3d.org>
+
+	* Add support for OCF (EPUB) files (application/epub+zip)
+
+2010-01-28  18:25  Christos Zoulas <christos@zoulas.com>
+
+	* Fix core-dump from unbound loop:
+	  https://bugzilla.redhat.com/show_bug.cgi?id=533245
+
+2010-01-22  15:45  Christos Zoulas <christos@zoulas.com>
+
+	* print proper mime for crystal reports file
+
+	* print the last summary information of a cdf document, not the
+	  first so that nested documents print the right info
+
+2010-01-16  18:42  Charles Longeau <chl@tuxfamily.org>
+
+	* bring back some fixes from OpenBSD:
+		- make gcc2 builds file
+		- fix typos in a magic file comment
+
+2009-11-17  18:35  Christos Zoulas <christos@zoulas.com>
+
+	* ctime/asctime can return NULL on some OS's although
+	  they should not (Toshit Antani)
+
+2009-09-14  13:49  Christos Zoulas <christos@zoulas.com>
+
+	* Centralize magic path handling routines and remove the
+	  special-casing from file.c so that the python module for
+	  example comes up with the same magic path (Fixes ~/.magic
+	  handling) (from Gab)
+
+2009-09-11  23:38  Reuben Thomas <rrt@sc3d.org>
+
+	* When magic argument is a directory, read the files in
+	  strcmp-sorted order (fixes Debian bug #488562 and our own FIXME).
+
+2009-09-11  13:11  Reuben Thomas <rrt@sc3d.org>
+
+	* Combine overlapping epoc and psion magic files into one (epoc).
+
+	* Add some more EPOC MIME types.
+
+2009-08-19  15:55  Christos Zoulas <christos@zoulas.com>
+
+	* Fix 3 bugs (From Ian Darwin):
+	    - file_showstr could move one past the end of the array
+	    - parse_apple did not nul terminate the string in the overflow case
+	    - parse_mime truncated the wrong string in the overflow case
+
+2009-08-12  12:28  Robert Byrnes  <byrnes@wildpumpkin.net>
+
+	* Include Localstuff when compiling magic.
+
+2009-07-15  10:05  Christos Zoulas <christos@zoulas.com>
+
+	* Fix logic for including mygetopts.h
+
+	* Make cdf.c compile again with debugging
+
+	* Add the necessary field handling for crystal reports files to work
+
+2009-06-23 01:34  Reuben Thomas <rrt@sc3d.org>
+
+	* Stop "(if" identifying Lisp files, that's plain dumb!
+
+2009-06-09 22:13  Reuben Thomas <rrt@sc3d.org>
+
+	* Add a couple of missing MP3 MIME types.
+
+2009-05-27 23:00  Reuben Thomas <rrt@sc3d.org>
+
+	* Add full range of hash-bang tests for Python and Ruby.
+
+	* Add MIME types for Python and Ruby scripts.
+
+2009-05-13  10:44  Christos Zoulas <christos@zoulas.com>
+
+	* off by one in parsing hw capabilities in elf
+	  (Cheng Renquan)
+
+2009-05-08  13:40  Christos Zoulas <christos@zoulas.com>
+	
+	* lint fixes and more from NetBSD
+
 2009-05-06  10:25  Christos Zoulas <christos@zoulas.com>
 
 	* Avoid null dereference in cdf code (Drew Yao)

Modified: head/contrib/file/Header
==============================================================================
--- head/contrib/file/Header	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Header	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,5 +1,5 @@
-# Magic
 # Magic data for file(1) command.
-# Machine-generated from src/cmd/file/magdir/*; edit there only!
 # Format is described in magic(files), where:
-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
+# files is 5 on V7 and BSD, 4 on SV, and ?? on SVID.
+# Don't edit this file, edit /etc/magic or send your magic improvements
+# to the maintainers, at file@mx.gw.com

Modified: head/contrib/file/INSTALL
==============================================================================
--- head/contrib/file/INSTALL	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/INSTALL	Thu Apr 19 03:20:13 2012	(r234449)
@@ -2,18 +2,24 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-Briefly, the shell commands `./configure; make; make install' should
+   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,12 +83,22 @@ The simplest way to compile this package
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -85,25 +111,41 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -114,16 +156,47 @@ Documentation and other data files still
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -135,14 +208,53 @@ find the X include and library files aut
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -150,7 +262,8 @@ type, such as `sun4', or a canonical nam
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -168,9 +281,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -179,7 +292,7 @@ A warning: not all `configure' scripts l
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -198,11 +311,19 @@ an Autoconf bug.  Until the bug is fixed
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -229,6 +350,16 @@ an Autoconf bug.  Until the bug is fixed
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 

Modified: head/contrib/file/Magdir/acorn
==============================================================================
--- head/contrib/file/Magdir/acorn	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/acorn	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: acorn,v 1.5 2009/09/19 16:28:07 christos Exp $
 # acorn:  file(1) magic for files found on Acorn systems
 #
 

Modified: head/contrib/file/Magdir/adi
==============================================================================
--- head/contrib/file/Magdir/adi	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/adi	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: adi,v 1.4 2009/09/19 16:28:07 christos Exp $
 # adi: file(1) magic for ADi's objects
 # From Gregory McGarry <g.mcgarry@ieee.org>
 #

Modified: head/contrib/file/Magdir/adventure
==============================================================================
--- head/contrib/file/Magdir/adventure	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/adventure	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: adventure,v 1.13 2010/12/31 16:32:54 christos Exp $
 # adventure: file(1) magic for Adventure game files
 #
 # from Allen Garvin <earendil@faeryland.tamu-commerce.edu>
@@ -16,18 +17,26 @@
 # Infocom (see z-machine)
 #------------------------------------------------------------------------------
 # Z-machine:  file(1) magic for Z-machine binaries.
+# Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
 #
-# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which
-# appears to be a version-0 Z-machine binary.
-#
-# The (false match) message is to correct that behavior.  Perhaps it is
-# not needed.
-#
-16	belong&0xfe00f0f0	0x3030	Infocom game data
->0	ubyte			0	(false match)
->0	ubyte			>0	(Z-machine %d,
->>2	ubeshort		x	Release %d /
->>18	string			>\0	Serial %.6s)
+#http://www.gnelson.demon.co.uk/zspec/sect11.html
+#http://www.jczorkmid.net/~jpenney/ZSpec11-latest.txt
+#http://en.wikipedia.org/wiki/Z-machine
+# The first byte is the Z-machine revision; it is always between 1 and 8. We
+# had false matches (for instance, inbig5.ocp from the Omega TeX extension as
+# well as an occasional MP3 file), so we sanity-check the version number.
+#
+# It might be possible to sanity-check the release number as well, as it seems
+# (at least in classic Infocom games) to always be a relatively small number,
+# always under 150 or so, but as this isn't rigorous, we'll wait on that until
+# it becomes clear that it's needed.
+#
+0	ubyte			>0
+>0	ubyte			<9
+>>16	belong&0xfe00f0f0	0x3030	Infocom game data
+>>>0	ubyte			x	(Z-machine %d,
+>>>>2	ubeshort		x	Release %d /
+>>>>18	string			>\0	Serial %.6s)
 
 #------------------------------------------------------------------------------
 # Glulx:  file(1) magic for Glulx binaries.
@@ -45,10 +54,9 @@
 # For Quetzal and blorb magic see iff
 
 
-# TADS (Text Adventure Development System)
+# TADS (Text Adventure Development System) version 2
 #  All files are machine-independent (games compile to byte-code) and are tagged
-#  with a version string of the form "V2.<digit>.<digit>\0" (but TADS 3 is
-#  on the way).
+#  with a version string of the form "V2.<digit>.<digit>\0".
 #  Game files start with "TADS2 bin\n\r\032\0" then the compiler version.
 0	string	TADS2\ bin	TADS
 >9	belong  !0x0A0D1A00	game data, CORRUPTED
@@ -73,6 +81,19 @@
 >10	belong	 0x0A0D1A00
 >>14	string	>\0		%s saved game data
 
+# TADS (Text Adventure Development System) version 3
+#  Game files start with "T3-image\015\012\032"
+0	string	T3-image\015\012\032
+>11	leshort	x		TADS 3 game data (format version %d)
+#  Saved game files start with "T3-state-v####\015\012\032"
+#  where #### is a format version number
+0	string	T3-state-v
+>14	string	\015\012\032	TADS 3 saved game data (format version
+>>10	byte	x		%c
+>>11	byte	x		\b%c
+>>12	byte	x		\b%c
+>>13	byte	x		\b%c)
+
 # Danny Milosavljevic <danny.milo@gmx.net>
 # this are adrift (adventure game standard) game files, extension .taf
 # depending on version magic continues with 0x93453E6139FA (V 4.0)

Modified: head/contrib/file/Magdir/allegro
==============================================================================
--- head/contrib/file/Magdir/allegro	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/allegro	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: allegro,v 1.4 2009/09/19 16:28:07 christos Exp $
 # allegro:  file(1) magic for Allegro datafiles
 # Toby Deshane <hac@shoelace.digivill.net>
 #

Modified: head/contrib/file/Magdir/alliant
==============================================================================
--- head/contrib/file/Magdir/alliant	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/alliant	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: alliant,v 1.7 2009/09/19 16:28:07 christos Exp $
 # alliant:  file(1) magic for Alliant FX series a.out files
 #
 # If the FX series is the one that had a processor with a 68K-derived

Modified: head/contrib/file/Magdir/amanda
==============================================================================
--- head/contrib/file/Magdir/amanda	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/amanda	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: amanda,v 1.5 2009/09/19 16:28:07 christos Exp $
 # amanda:  file(1) magic for amanda file format
 #
 0	string	AMANDA:\ 		AMANDA 

Modified: head/contrib/file/Magdir/amigaos
==============================================================================
--- head/contrib/file/Magdir/amigaos	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/amigaos	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: amigaos,v 1.14 2009/09/19 16:28:07 christos Exp $
 # amigaos:  file(1) magic for AmigaOS binary formats:
 
 #

Modified: head/contrib/file/Magdir/animation
==============================================================================
--- head/contrib/file/Magdir/animation	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/animation	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: animation,v 1.45 2011/09/06 11:00:06 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -29,7 +30,7 @@
 #!:mime	image/x-quicktime
 4       string          pckg            Apple QuickTime compressed archive
 !:mime	application/x-quicktime-player
-4	string/B	jP		JPEG 2000 image
+4	string/W	jP		JPEG 2000 image
 !:mime	image/jp2
 4	string		ftyp		ISO Media
 >8	string		isom		\b, MPEG v4 system, version 1
@@ -41,10 +42,18 @@
 !:mime	video/mp4
 >8	string		mp7t		\b, MPEG v4 system, MPEG v7 XML
 >8	string		mp7b		\b, MPEG v4 system, MPEG v7 binary XML
->8	string/B	jp2		\b, JPEG 2000
+>8	string/W	jp2		\b, JPEG 2000
 !:mime	image/jp2
+>8	string		3ge		\b, MPEG v4 system, 3GPP
+!:mime	video/3gpp
+>8	string		3gg		\b, MPEG v4 system, 3GPP
+!:mime	video/3gpp
 >8	string		3gp		\b, MPEG v4 system, 3GPP
 !:mime	video/3gpp
+>8	string		3gs		\b, MPEG v4 system, 3GPP
+!:mime	video/3gpp
+>8	string		3g2		\b, MPEG v4 system, 3GPP2
+!:mime	video/3gpp2
 >>11	byte		4		\b v4 (H.263/AMR GSM 6.10)
 >>11	byte		5		\b v5 (H.263/AMR GSM 6.10)
 >>11	byte		6		\b v6 (ITU H.264/AMR GSM 6.10)
@@ -52,13 +61,13 @@
 !:mime	video/mp4
 >8	string		avc1		\b, MPEG v4 system, 3GPP JVT AVC
 !:mime	video/3gpp
->8	string/B	M4A		\b, MPEG v4 system, iTunes AAC-LC
+>8	string/W	M4A		\b, MPEG v4 system, iTunes AAC-LC
 !:mime	audio/mp4
->8	string/B	M4V		\b, MPEG v4 system, iTunes AVC-LC
+>8	string/W	M4V		\b, MPEG v4 system, iTunes AVC-LC
 !:mime	video/mp4
->8	string/B	M4P		\b, MPEG v4 system, iTunes AES encrypted
->8	string/B	M4B		\b, MPEG v4 system, iTunes bookmarked
->8	string/B	qt		\b, Apple QuickTime movie
+>8	string/W	M4P		\b, MPEG v4 system, iTunes AES encrypted
+>8	string/W	M4B		\b, MPEG v4 system, iTunes bookmarked
+>8	string/W	qt		\b, Apple QuickTime movie
 !:mime	video/quicktime
 
 # MPEG sequences
@@ -71,6 +80,7 @@
 >>7      byte               x              \b @ L %u
 0        belong&0xFFFFFF00  0x00000100     
 >3       byte               0xBA           MPEG sequence
+!:mime  video/mpeg
 >>4      byte               &0x40          \b, v2, program multiplex
 >>4      byte               ^0x40          \b, v1, system multiplex
 >3       byte               0xBB           MPEG sequence, v1/2, multiplex (missing pack header)
@@ -80,6 +90,7 @@
 >>4      byte               88             \b, extended
 >>6      byte               x              \b @ L %u
 >3       byte               0xB0           MPEG sequence, v4
+!:mime  video/mpeg4-generic
 >>5      belong             0x000001B5
 >>>9     byte               &0x80
 >>>>10   byte&0xF0          16             \b, video
@@ -149,6 +160,7 @@
 >>4      byte               252            \b, FGS @ L4
 >>4      byte               253            \b, FGS @ L5
 >3       byte               0xB5           MPEG sequence, v4
+!:mime  video/mpeg4-generic
 >>4      byte               &0x80
 >>>5     byte&0xF0          16             \b, video (missing profile header)
 >>>5     byte&0xF0          32             \b, still texture (missing profile header)
@@ -159,6 +171,7 @@
 >>4      byte&0xF8          24             \b, mesh (missing profile header)
 >>4      byte&0xF8          32             \b, face (missing profile header)
 >3       byte               0xB3           MPEG sequence
+!:mime  video/mpeg
 >>12     belong             0x000001B8     \b, v1, progressive Y'CbCr 4:2:0 video
 >>12     belong             0x000001B2     \b, v1, progressive Y'CbCr 4:2:0 video
 >>12     belong             0x000001B5     \b, v2,
@@ -469,6 +482,7 @@
 
 # MPA, M2A
 0       beshort&0xFFFE  0xFFF6         MPEG ADTS, layer I, v2
+!:mime	audio/mpeg
 # rate
 >2      byte&0xF0       0x10           \b,  32 kbps
 >2      byte&0xF0       0x20           \b,  48 kbps
@@ -503,6 +517,7 @@
 
 # MP3, M25A
 0       beshort&0xFFFE  0xFFE2         MPEG ADTS, layer III,  v2.5
+!:mime	audio/mpeg
 # rate  
 >2      byte&0xF0       0x10           \b,   8 kbps
 >2      byte&0xF0       0x20           \b,  16 kbps
@@ -697,6 +712,7 @@
 
 # Microsoft Advanced Streaming Format (ASF) <mpruett@sgi.com>
 0	belong			0x3026b275	Microsoft ASF
+!:mime  video/x-ms-asf
 
 # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>;
 0	string			\x8aMNG		MNG video data,
@@ -718,16 +734,16 @@
 3	string		\x0D\x0AVersion:Vivo	Vivo video data
 
 # VRML (Virtual Reality Modelling Language)
-0       string/b        #VRML\ V1.0\ ascii	VRML 1 file
+0       string/w        #VRML\ V1.0\ ascii	VRML 1 file
 !:mime	model/vrml
-0	string/b	#VRML\ V2.0\ utf8	ISO/IEC 14772 VRML 97 file
+0	string/w	#VRML\ V2.0\ utf8	ISO/IEC 14772 VRML 97 file
 !:mime	model/vrml
 
 # X3D (Extensible 3D) [http://www.web3d.org/specifications/x3d-3.0.dtd]
 # From Michel Briand <michelbriand@free.fr>
-0	string		\<?xml\ version="
+0	string/t		\<?xml\ version="
 !:strength +1
->20	search/1000/cb  \<!DOCTYPE\ X3D		X3D (Extensible 3D) model xml text
+>20	search/1000/cw  \<!DOCTYPE\ X3D		X3D (Extensible 3D) model xml text
 !:mime model/x3d
 
 #---------------------------------------------------------------------------
@@ -794,7 +810,8 @@
 !:mime	video/h264
 
 # Type: Bink Video
-# URL:  http://wiki.multimedia.cx/index.php?title=3DBink_Container
+# Extension: .bik
+# URL:  http://wiki.multimedia.cx/index.php?title=Bink_Container
 # From: <hoehle@users.sourceforge.net>  2008-07-18
 0	string		BIK	Bink Video
 >3	regex		=[a-z]	rev.%s
@@ -813,3 +830,66 @@
 >>51	byte&0x20	!0	stereo
 #>>51	byte&0x10	0	FFT
 #>>51	byte&0x10	!0	DCT
+
+# Type:	NUT Container
+# URL:	http://wiki.multimedia.cx/index.php?title=NUT
+# From:	Adam Buchbinder <adam.buchbinder@gmail.com>
+0	string	nut/multimedia\ container\0	NUT multimedia container
+
+# Type: Nullsoft Video (NSV)
+# URL:  http://wiki.multimedia.cx/index.php?title=Nullsoft_Video
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	NSVf	Nullsoft Video
+
+# Type: REDCode Video
+# URL:  http://www.red.com/ ; http://wiki.multimedia.cx/index.php?title=REDCode
+# From: Mike Melanson <mike@multimedia.cx>
+4	string	RED1	REDCode Video
+
+# Type: MTV Multimedia File
+# URL:  http://wiki.multimedia.cx/index.php?title=MTV
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	AMVS	MTV Multimedia File
+
+# Type: ARMovie
+# URL:  http://wiki.multimedia.cx/index.php?title=ARMovie
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	ARMovie\012	ARMovie
+
+# Type: Interplay MVE Movie
+# URL:  http://wiki.multimedia.cx/index.php?title=Interplay_MVE
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	Interplay\040MVE\040File\032	Interplay MVE Movie
+
+# Type: Windows Television DVR File
+# URL:  http://wiki.multimedia.cx/index.php?title=WTV
+# From: Mike Melanson <mike@mutlimedia.cx>
+# This takes the form of a Windows-style GUID
+0	bequad	0xB7D800203749DA11
+>8	bequad	0xA64E0007E95EAD8D	Windows Television DVR Media
+
+# Type: Sega FILM/CPK Multimedia
+# URL:  http://wiki.multimedia.cx/index.php?title=Sega_FILM
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	FILM	Sega FILM/CPK Multimedia,
+>32	belong	x	%d x
+>28	belong	x	%d
+
+# Type: Nintendo THP Multimedia
+# URL:  http://wiki.multimedia.cx/index.php?title=THP
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	THP\0	Nintendo THP Multimedia
+
+# Type: BBC Dirac Video
+# URL:  http://wiki.multimedia.cx/index.php?title=Dirac
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	BBCD	BBC Dirac Video
+
+# Type: RAD Game Tools Smacker Multimedia
+# URL:  http://wiki.multimedia.cx/index.php?title=Smacker
+# From: Mike Melanson <mike@multimedia.cx>
+0	string	SMK	RAD Game Tools Smacker Multimedia
+>3	byte	x	version %c,
+>4	lelong	x	%d x
+>8	lelong	x	%d,
+>12	lelong	x	%d frames

Modified: head/contrib/file/Magdir/apl
==============================================================================
--- head/contrib/file/Magdir/apl	Thu Apr 19 02:55:13 2012	(r234448)
+++ head/contrib/file/Magdir/apl	Thu Apr 19 03:20:13 2012	(r234449)
@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: apl,v 1.6 2009/09/19 16:28:07 christos Exp $
 # apl:  file(1) magic for APL (see also "pdp" and "vax" for other APL
 #       workspaces)
 #

Modified: head/contrib/file/Magdir/apple
==============================================================================
--- head/contrib/file/Magdir/apple	Thu Apr 19 02:55:13 2012	(r234448)

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



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