[Midnightbsd-cvs] src [6697] trunk/contrib/file: Merge file 5.19

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 30 07:58:30 EDT 2014


Revision: 6697
          http://svnweb.midnightbsd.org/src/?rev=6697
Author:   laffer1
Date:     2014-06-30 07:58:30 -0400 (Mon, 30 Jun 2014)
Log Message:
-----------
Merge file 5.19

Added Paths:
-----------
    trunk/contrib/file/AUTHORS
    trunk/contrib/file/COPYING
    trunk/contrib/file/ChangeLog
    trunk/contrib/file/INSTALL
    trunk/contrib/file/MAINT
    trunk/contrib/file/NEWS
    trunk/contrib/file/README
    trunk/contrib/file/TODO

Removed Paths:
-------------
    trunk/contrib/file/AUTHORS
    trunk/contrib/file/COPYING
    trunk/contrib/file/ChangeLog
    trunk/contrib/file/INSTALL
    trunk/contrib/file/MAINT
    trunk/contrib/file/NEWS
    trunk/contrib/file/README
    trunk/contrib/file/TODO

Deleted: trunk/contrib/file/AUTHORS
===================================================================
--- trunk/contrib/file/AUTHORS	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/AUTHORS	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1 +0,0 @@
-See COPYING.
\ No newline at end of file

Copied: trunk/contrib/file/AUTHORS (from rev 6687, vendor/file/5.19/AUTHORS)
===================================================================
--- trunk/contrib/file/AUTHORS	                        (rev 0)
+++ trunk/contrib/file/AUTHORS	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1 @@
+See COPYING.
\ No newline at end of file

Deleted: trunk/contrib/file/COPYING
===================================================================
--- trunk/contrib/file/COPYING	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/COPYING	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1,29 +0,0 @@
-$File: COPYING,v 1.1 2008/02/05 19:08:11 christos Exp $
-Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
-Software written by Ian F. Darwin and others;
-maintained 1994- Christos Zoulas.
-
-This software is not subject to any export provision of the United States
-Department of Commerce, and may be exported to any country or planet.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice immediately at the beginning of the file, without modification,
-   this list of conditions, and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.

Copied: trunk/contrib/file/COPYING (from rev 6687, vendor/file/5.19/COPYING)
===================================================================
--- trunk/contrib/file/COPYING	                        (rev 0)
+++ trunk/contrib/file/COPYING	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1,29 @@
+$File: COPYING,v 1.1 2008/02/05 19:08:11 christos Exp $
+Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
+Software written by Ian F. Darwin and others;
+maintained 1994- Christos Zoulas.
+
+This software is not subject to any export provision of the United States
+Department of Commerce, and may be exported to any country or planet.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice immediately at the beginning of the file, without modification,
+   this list of conditions, and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

Deleted: trunk/contrib/file/ChangeLog
===================================================================
--- trunk/contrib/file/ChangeLog	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/ChangeLog	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1,1023 +0,0 @@
-2011-01-16  19:31  Reuben Thomas <rrt at sc3d.org>
-
-	* Fix two potential buffer overruns in apprentice_list.
-
-2011-01-14  22:33  Reuben Thomas <rrt at sc3d.org>
-
-	* New Python binding in pure Python.
-	* Update libmagic(3).
-
-2011-01-06  21:40  Reuben Thomas <rrt at sc3d.org>
-
-	* Fix Python bindings (including recent Python 3 compatibility
-	  update).
-
-2011-01-04  18:43  Reuben Thomas <rrt at 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 at zoulas.com>
-
-	* Add pstring/BHhLl to specify the type of the length of pascal
-	  strings.
-
-2010-11-26  18:39  Reuben Thomas <rrt at 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 at sc3d.org>
-
-	* Make bug reporting addresses more visible.
-
-2010-11-01  18:35  Reuben Thomas <rrt at sc3d.org>
-
-	* Add tcl magic from Gustaf Neumann
-
-2010-10-24  10:42  Christos Zoulas <christos at zoulas.com>
-
-	* Fix the whitespace comparing code (Christopher Chittleborough)
-
-2010-10-06  21:05  Christos Zoulas <christos at zoulas.com>
-
-	* allow string/t to work (Jan Kaluza)
-
-2010-09-20  22:11  Reuben Thomas <rrt at sc3d.org>
-
-	* Apply some patches from Ubuntu and Fedora.
-
-2010-09-20  21:16  Reuben Thomas <rrt at 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 at sc3d.org>
-
-	* Minor security fix to softmagic.c (don't use untrusted
-	  string as printf format).
-
-2010-07-21  12:20  Christos Zoulas <christos at 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 at zoulas.com>
-
-	* Only try to print prpsinfo for core files. (Jan Kaluza)
-
-2010-04-22  12:55  Christos Zoulas <christos at zoulas.com>
-
-	* Try more elf offsets for Debian core files.  (Arnaud Giersch)
-
-2010-02-20  15:18  Reuben Thomas <rrt at sc3d.org>
-
-	* Clarify which sort of CDF we mean.
-
-2010-02-14  22:58  Reuben Thomas <rrt at 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 at sc3d.org>
-
-	* Add support for OCF (EPUB) files (application/epub+zip)
-
-2010-01-28  18:25  Christos Zoulas <christos at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at wildpumpkin.net>
-
-	* Include Localstuff when compiling magic.
-
-2009-07-15  10:05  Christos Zoulas <christos at 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 at sc3d.org>
-
-	* Stop "(if" identifying Lisp files, that's plain dumb!
-
-2009-06-09 22:13  Reuben Thomas <rrt at sc3d.org>
-
-	* Add a couple of missing MP3 MIME types.
-
-2009-05-27 23:00  Reuben Thomas <rrt at 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 at zoulas.com>
-
-	* off by one in parsing hw capabilities in elf
-	  (Cheng Renquan)
-
-2009-05-08  13:40  Christos Zoulas <christos at zoulas.com>
-	
-	* lint fixes and more from NetBSD
-
-2009-05-06  10:25  Christos Zoulas <christos at zoulas.com>
-
-	* Avoid null dereference in cdf code (Drew Yao)
-
-	* More cdf bounds checks and overflow checks
-
-2009-05-01  18:37  Christos Zoulas <christos at zoulas.com>
-
-	* Buffer overflow fixes from Drew Yao
-
-2009-04-30  17:10  Christos Zoulas <christos at zoulas.com>
-
-	* Fix more cdf lossage. All the documents I have
-	  right now print the correct information.
-
-2009-03-27  18:43  Christos Zoulas <christos at zoulas.com>
-
-	* don't print \012- separators in the same magic entry 
-	  if it consists of multiple magic printing lines.
-
-2009-03-23  10:20  Christos Zoulas <christos at zoulas.com>
-
-	* Avoid file descriptor leak in compress code from
-	  (Daniel Novotny)
-
-2009-03-18  16:50  Christos Zoulas <christos at zoulas.com>
-
-	* Allow escaping of relation characters, so that we can say \^[A-Z]
-	  and the ^ is not eaten as a relation char.
-
-	* Fix troff and fortran to their previous glory using
-	  regex. This was broken since their removel from ascmagic.
-
-2009-03-10  16:50  Christos Zoulas <christos at zoulas.com>
-
-	* don't use strlen in strndup() (Toby Peterson)
-
-2009-03-10  7:45  Christos Zoulas <christos at zoulas.com>
-
-	* avoid c99 syntax.
-
-2009-02-23 15:45  Christos Zoulas <christos at zoulas.com>
-
-	* make the cdf code use the buffer first if available,
-	  and then the fd code.
-
-2009-02-13 13:45  Christos Zoulas <christos at zoulas.com>
-
-	* look for struct option to determine if getopt.h is usable for IRIX.
-
-	* sanitize cdf document strings
-
-2009-02-04 13:25  Christos Zoulas <christos at zoulas.com>
-
-	* fix OS/2 warnings.
-
-2008-12-12 15:50  Christos Zoulas <christos at zoulas.com>
-
-	* fix initial offset calculation for non 4K sector files
-
-	* add loop limits to avoid DoS attacks by constructing
-	  looping sector references.
-
-2008-12-03 13:05  Christos Zoulas <christos at zoulas.com>
-
-	* 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 <chl at tuxfamily.org>
-
-	* 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 <christos at zoulas.com>
-
-	* Handle ID3 format files.
-
-2008-11-06 23:00  Reuben Thomas <rrt at sc3d.org>
-
-	* 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 <christos at astron.com>
-
-	* use memchr instead of strchr because the string
-	  might not be NUL terminated (Scott MacVicar)
-
-2008-11-03 07:31  Reuben Thomas <rrt at sc3d.org>
-
-	* Fix a printf with a non-literal format string.
-
-	* Fix formatting and punctuation of help for "--apple".
-
-2008-10-30 11:00  Reuben Thomas <rrt at sc3d.org>
-
-	* 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 <christos at astron.com>
-
-	* Added APPLE file creator/type
-
-2008-10-12 10:20  Christos Zoulas <christos at astron.com>
-
-	* Added CDF parsing
-
-2008-10-09 16:40  Christos Zoulas <christos at astron.com>
-
-	* filesystem and msdos patches (Joerg Jenderek)
-
-2008-10-09 13:20  Christos Zoulas <christos at astron.com>
-
-	* correct --exclude documentation issues: remove troff and fortran
-	  and rename "token" to "tokens". (Randy McMurchy)
-
-2008-10-01 10:30  Christos Zoulas <christos at astron.com>
-
-	* 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  <rrt at sc3d.org>
-
-	* Comment out graphviz patterns, as they match too many files.
-
-2008-08-30 12:54  Christos Zoulas <christos at astron.com>
-
-	* Don't eat trailing \n in magic enties.
-
-	* Cast defines to allow compilation using a c++ compiler.
-
-2008-08-25 23:56  Reuben Thomas  <rrt at sc3d.org>
-
-	* Add text/x-lua MIME type for Lua scripts.
-
-	* Escape { in regex in graphviz patterns.
-
-2008-07-26 00:59  Reuben Thomas  <rrt at sc3d.org>
-
-	* Add MIME types for special files.
-
-	* Use access to give more accurate information for files that
-	  can't be opened.
-
-	* Add a TODO list.
-
-2008-07-02 11:15  Christos Zoulas  <christos at astron.com>
-
-	* add !:strength op to adjust magic strength (experimental)
-
-2008-06-16 21:41  Reuben Thomas  <rrt at sc3d.org>
-
-	* Fix automake error in configure.ac.
-
-	* Add MIME type for Psion Sketch files.
-
-2008-06-05 08:59  Christos Zoulas  <christos at astron.com>
-
-	* Don't print warnings about bad namesize in stripped
-	  binaries with PT_NOTE is still there, and the actual
-	  note is gone (Jakub Jelinek)
-
-2008-05-28 15:12  Robert Byrnes  <byrnes at wildpumpkin.net>
-
-	* magic/Magdir/elf:
-	  Note invalid byte order for little-endian SPARC32PLUS.
-	  Add SPARC V9 vendor extensions and memory model.
-
-	* src/elfclass.h:
-	  Pass target machine to doshn (for Solaris hardware capabilities).
-
-	* src/readelf.c (doshn):
-	  Add support for Solaris hardware/software capabilities.
-
-	* src/readelf.h:
-	  Ditto.
-
-	* src/vasprintf.c (dispatch):
-	  Add support for ll modifier.
-
-2008-05-16 10:25  Christos Zoulas  <christos at astron.com>
-
-	* Fix compiler warnings.
-
-	* remove stray printf, and fix a vprintf bug. (Martin Dorey)
-
-2008-05-06 00:13  Robert Byrnes  <byrnes at wildpumpkin.net>
-
-	* src/Makefile.am:
-	  Ensure that getopt_long and [v]asprintf are included in libmagic,
-	  as needed.
-
-	  Remove unnecessary EXTRA_DIST.
-
-	* src/Makefile.in:
-	  Rerun automake.
-
-	* src/vasprintf.c (dispatch):
-	  Fix variable precision bug: be sure to step past '*'.
-
-	* src/vasprintf.c (core):
-	  Remove unreachable code.
-
-	* src/apprentice.c (set_test_type):
-	  Add cast to avoid compiler warning.
-
-2008-04-22 23:45  Christos Zoulas  <christos at astron.com>
-
-	* Add magic submission guidelines (Abel Cheung)
-
-	* split msdos and windows magic (Abel Cheung)
-
-2008-04-04 11:00  Christos Zoulas  <christos at astron.com>
-
-	* >= <= is not supported, so fix the magic and warn about it.
-	  reported by: Thien-Thi Nguyen <ttn at gnuvola.org>
-
-2008-03-27 16:16  Robert Byrnes  <byrnes at wildpumpkin.net>
-
-	* src/readelf.c (donote):
-	  ELF core file command name/line bug fixes and enhancements:
-
-	  Try larger offsets first to avoid false matches
-	  from earlier data that happen to look like strings;
-	  this primarily affected SunOS 5.x 32-bit Intel core files.
-
-	  Add support for command line (instead of just short name)
-	  for SunOS 5.x.
-
-	  Add information about NT_PSINFO for SunOS 5.x.
-
-	  Only trim whitespace from end of command line.
-
-2007-02-11 01:36 Reuben Thomas <rrt at sc3d.org>
-
-	* Change strength of ! from MULT to 0, as it matches almost
-		  anything (Reuben Thomas)
-
-	* Debian fixes (Reuben Thomas)
-
-2007-02-11 00:17 Reuben Thomas <rrt at sc3d.org>
-
-	* Clarify UTF-8 BOM message (Reuben Thomas)
-
-	* Add HTML comment to token list in names.h
-
-2007-02-04 15:50 Christos Zoulas <christos at astron.com>
-
-	* Debian fixes (Reuben Thomas)
-
-2007-02-04 11:31 Christos Zoulas <christos at astron.com>
-
-	* !:mime annotations in magic files (Reuben Thomas)
-
-2007-01-29 15:35 Christos Zoulas <christos at astron.com>
-
-	* zero out utime/utimes structs (Gavin Atkinson)
-
-2007-01-26 13:45 Christos Zoulas <christos at astron.com>
-
-	* reduce writable data from Diego "Flameeyes" Petten
-
-2007-12-28 15:06 Christos Zoulas <christos at astron.com>
-
-	* strtof detection
-
-	* remove bogus regex magic that could cause a DoS
-
-	* better mismatch version message
-
-2007-12-27 11:35 Christos Zoulas <christos at astron.com>
-
-	* bring back some fixes from OpenBSD
-
-	* treat ELF dynamic objects as executables
-
-	* fix gcc warnings
-
-2007-12-01 19:55 Christos Zoulas <christos at astron.com>
-
-	* make sure we have zlib.h and libz to compile the builtin
-	  decompress code
-
-2007-10-28 20:48 Christos Zoulas <christos at astron.com>
-
- 	* float and double magic support (Behan Webster)
-
-2007-10-28 20:48 Christos Zoulas <christos at astron.com>
-
-	* Convert fortran to a soft test (Reuben Thomas)
-
-2007-10-23  5:25 Christos Zoulas <christos at astron.com>
-
-	* Add --with-filename, and --no-filename (Reuben Thomas)
-
-2007-10-23  3:59 Christos Zoulas <christos at astron.com>
-
-	* Rest of the mime split (Reuben Thomas)
-
-	* Make usage message generated from the flags so that
-	  they stay consistent (Reuben Thomas)
-
-2007-10-20  3:06 Christos Zoulas <christos at astron.com>
-
-	* typo in comment, missing ifdef QUICK, remove unneeded code
-		(Charles Longeau)
-
-2007-10-17  3:33 Christos Zoulas <christos at astron.com>
-
-	* Fix problem printing -\012 in some entries
-
-	* Separate magic type and encoding flags (Reuben Thomas)
-
-2007-10-09  3:55 Christos Zoulas <christos at astron.com>
-
-	* configure fix for int64 and strndup (Reuben Thomas)
-
-2007-09-26  4:45 Christos Zoulas <christos at astron.com>
-
-	* Add magic_descriptor() function.
-
-	* Fix regression in elf reading code where the core name was
-	  not being printed.
-
-	* Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson)
-
-2007-08-19  6:30 Christos Zoulas <christos at astron.com>
-
-	* Make mime format consistent so that it can
-	  be easily parsed:
-	      mimetype [charset=character-set] [encoding=encoding-mime-type]
-
-	  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,
-	  which is now classed as application/octet-stream).
-
-	  Remove 7/8bit classifications, since they were arbitrary
-	  and not based on the file data.
-
-	  This work was done by Reuben Thomas
-
-2007-05-24 10:00 Christos Zoulas <christos at astron.com>
-
-	* Fix another integer overflow (Colin Percival)
-
-2007-03-26 13:58 Christos Zoulas <christos at astron.com>
-
-	* make sure that all of struct magic_set is initialized appropriately
-	  (Brett)
-
-2007-03-25 17:44 Christos Zoulas <christos at astron.com>
-
-	* reset left bytes in the buffer (Dmitry V. Levin)
-
-	* compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS
-	  (Peter Avalos)
-
-2007-03-15 10:51 Christos Zoulas <christos at astron.com>
-
-	* fix fortran and nroff reversed tests (Dmitry V. Levin)
-
-	* fix exclude option (Dmitry V. Levin)
-
-2007-02-08 17:30 Christos Zoulas <christos at astron.com>
-
-	* fix integer underflow in file_printf which can lead to
-	  to exploitable heap overflow (Jean-Sebastien Guay-Lero)
-
-2007-02-05 11:35 Christos Zoulas <christos at astron.com>
-
-	* make socket/pipe reading more robust
-
-2007-01-25 16:01 Christos Zoulas <christos at astron.com>
-
-	* Centralize all the tests in file_buffer.
-
-	* Add exclude flag.
-
-2007-01-18 05:29 Anon Ymous <do at not.spam.me>
-
-	* Move the "type" detection code from parse() into its own table
-	  driven routine.  This avoids maintaining multiple lists in
-	  file.h.
-
-	* 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 <do at not.spam.me>
-
-	* Fix an initialization bug in check_mem().
-
-2007-01-16 14:58 Anon Ymous <do at not.spam.me>
-
-	* Add a "default" type to print a message if nothing previously
-	  matched at that level or since the last default at that
-	  level.  This is useful for setting up switch-like statements.
-	  It can also be used to do if/else constructions without a
-	  redundant second test.
-
-	* Fix the "x" special case test so that one can test for that
-	  string with "=x".
-
-	* Allow "search" to search the entire buffer if the "/N"
-	  search count is missing.
-
-	* Make "regex" work!  It now starts its search at the
-	  specified offset and takes an (optional) "/N" line count to
-	  specify the search range; otherwise it searches to the end
-	  of the file.  The match is now grabbed correctly for format
-	  strings and the offset set to the end of the match.
-
-	* Add a "/s" flag to "regex" and "search" to set the offset to
-	  the start of the match.  By default the offset is set to the
-	  end of the match, as it is with other tests.  This is mostly
-	  useful for "regex".
-
-	* Make "search", "string" and "pstring" use the same
-	  file_strncmp() routine so that they support the same flags;
-	  "bestring16" and "lestring16" call the same routine, but
-	  with flags = 0.  Also add a "/C" flag (in analogy to "/c")
-	  to ignore the case on uppercase (lowercase) characters in
-	  the test string.
-
-	* Strict adherence to C style string escapes.  A warnings are
-	  printed when compiling.  Note: previously "\a" was
-	  incorrectly translated to 'a' instead of an <alert> (i.e.,
-	  BELL, typically 0x07).
-
-	* Make this compile with "-Wall -Wextra" and all the warning
-	  flags used with WARNS=4 in the NetBSD source.  Also make it
-	  pass lint.
-
-	* Many "cleanups" and hopefully not too many new bugs!
-
-2007-01-16 14:56 Anon Ymous <do at not.spam.me>
-
-	* make several more files compile with gcc warnings
-	  on and also make them pass lint.
-
-2007-01-16 14:54 Anon Ymous <do at not.spam.me>
-
-	* fix a puts()/putc() usage goof in file.c
-
-	* make file.c compile with gcc warnings and pass lint
-
-2006-12-11 16:49 Christos Zoulas <christos at astron.com>
-
-	* fix byteswapping issue
-
-	* report the number of bytes we tried to
-	  allocate when allocation fails
-
-	* add a few missed cases in the strength routine
-
-2006-12-08 16:32 Christos Zoulas <christos at astron.com>
-
-	* store and print the line number of the magic
-	  entry for debugging.
-
-	* if the magic entry did not print anything,
-	  don't treat it as a match
-
-	* change the magic strength algorithm to take
-	  into account the relationship op.
-
-	* fix a bug in search where we could accidentally
-	  return a match.
-
-	* propagate the error return from match to
-	  file_softmagic.
-
-2006-11-25 13:35 Christos Zoulas <christos at astron.com>
-
-	* 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
-	  found by: Arkadiusz Miskiewicz
-
-	* Fix problem in the '\0' separator; and don't
-	  print it as an additional separator; print
-	  it as the only separator.
-
-2006-11-17 10:51 Christos Zoulas <christos at astron.com>
-
-	* Added a -0 option to print a '\0' separator
-	  Etienne Buira <etienne.buira at free.fr>
-
-2006-10-31 15:14 Christos Zoulas <christos at astron.com>
-
-	* Check offset before copying (Mike Frysinger)
-
-	* merge duplicated code
-
-	* add quad date support
-
-	* make sure that we nul terminate desc (Ryoji Kanai)
-
-	* don't process elf notes multiple times
-
-	* allow -z to report empty compressed files
-
-	* use calloc to initialize the ascii buffers (Jos van den Oever)
-
-2006-06-08 11:11 Christos Zoulas <christos at astron.com>
-
-	* QNX fixes (Mike Gorchak)
-
-	* Add quad support.
-
-	* FIFO checks (Dr. Werner Fink)
-
-	* Linux ELF fixes (Dr. Werner Fink)
-
-	* Magic format checks (Dr. Werner Fink)
-
-	* Magic format function improvent (Karl Chen)
-
-2006-05-03 11:11 Christos Zoulas <christos at astron.com>
-
-	* Pick up some elf changes and some constant fixes from SUSE
-
-	* Identify gnu tar vs. posix tar
-
-	* When keep going, don't print spurious newlines (Radek Vok\xE1l)
-
-2006-04-01 12:02 Christos Zoulas <christos at astron.com>
-
-	* Use calloc instead of malloc (Mike Frysinger)
-
-	* Fix configure script to detect wctypes.h (Mike Frysinger)
-
-2006-03-02 16:06 Christos Zoulas <christos at astron.com>
-
-	* Print empty if the file is (Mike Frysinger)
-
-	* Don't try to read past the end of the buffer (Mike Frysinger)
-
-	* Sort magic entries by strength [experimental]
-
-2005-11-29 13:26 Christos Zoulas <christos at astron.com>
-
-	* Use iswprint() to convert the output string.
-	    (Bastien Nocera)
-
-2005-10-31 8:54 Christos Zoulas <christos at astron.com>
-
-	* Fix regression where the core info was not completely processed
-	    (Radek Vok\xE1l)
-
-2005-10-20 11:15 Christos Zoulas <christos at astron.com>
-
-	* Middle Endian magic (Diomidis Spinellis)
-
-2005-10-17 11:15 Christos Zoulas <christos at astron.com>
-
-	* Open with O_BINARY for CYGWIN (Corinna Vinschen)
-
-	* Don't close stdin (Arkadiusz Miskiewicz)
-
-	* Look for note sections in non executables.
-
-2005-09-20 13:33 Christos Zoulas <christos at astron.com>
-
-	* Don't print SVR4 Style in core files multiple times
-	    (Radek Vok\xE1l)
-
-2005-08-27 04:09 Christos Zoulas <christos at astron.com>
-
-	* Cygwin changes Corinna Vinschen
-
-2005-08-18 09:53 Christos Zoulas <christos at astron.com>
-
-	* Remove erroreous mention of /etc/magic in the file man page
-	  This is gentoo bug 101639. (Mike Frysinger)
-
-	* Cross-compile support and detection (Mike Frysinger)
-
-2005-08-12 10:17 Christos Zoulas <christos at astron.com>
-
-	* Add -h flag and dereference symlinks if POSIXLY_CORRECT
-	  is set.
-
-2005-07-29 13:57 Christos Zoulas <christos at astron.com>
-
-	* Avoid search and regex buffer overflows (Kelledin)
-
-2005-07-12 11:48 Christos Zoulas <christos at astron.com>
-
-	* Provide stub implementations for {v,}nsprintf() for older
-	  OS's that don't have them.
-	* Change mbstate_t autoconf detection macro from AC_MBSTATE_T
-	  to AC_TYPE_MBSTATE_T.
-
-2005-06-25 11:48 Christos Zoulas <christos at astron.com>
-
-	* Dynamically allocate the string buffers and make the
-	  default read size 256K.
-
-2005-06-01 00:00 Joerg Sonnenberger <joerg at britannica.bec.de>
-
-	* Dragonfly ELF note support
-
-2005-03-14 00:00 Giuliano Bertoletti <gb at symbolic.it>
-
-	* Avoid NULL pointer dereference in time conversion.
-
-2005-03-06 00:00  Joerg Walter <jwalt at mail.garni.ch>
-
-	* Add indirect magic offset support, and search mode.
-
-2005-01-12 00:00  Stepan Kasal  <kasal at ucw.cz>
-
-	* 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  <christos at astron.com>
-
-	* bzip2 needs a lot of input buffer space on some files
-	  before it can begin uncompressing. This makes file -z
-	  fail on some bz2 files. Fix it by giving it a copy of
-	  the file descriptor to read as much as it wants if we
-	  have access to it. <christos at astron.com>
-
-2004-11-24 12:39  Christos Zoulas  <christos at astron.com>
-
-	* Stack smash fix, and ELF more conservative reading.
-	  Jakub Bogusz <qboosh at pld-linux.org>
-
-2004-11-20 18:50  Christos Zoulas  <christos at astron.com>
-
-	* New FreeBSD version parsing code:
-	  Jon Noack <noackjr at alumni.rice.edu>
-
-	* Hackish support for ucs16 strings <christos at astron.com>
-
-2004-11-13 03:07  Christos Zoulas  <christos at astron.com>
-
-	* print the file name and line number in syntax errors.
-
-2004 10-12 10:50  Christos Zoulas  <christos at astron.com>
-
-	* Fix stack overwriting on 0 length strings: Tim Waugh
-	    <twaugh at redhat.com> Ned Ludd <solar at gentoo.org>
-
-2004-09-27 11:30  Christos Zoulas  <christos at astron.com>
-
-	* Remove 3rd and 4th copyright clause; approved by Ian Darwin.
-
-	* Fix small memory leaks; caught by: Tamas Sarlos
-	    <stamas at csillag.ilab.sztaki.hu>
-
-2004-07-24 16:33  Christos Zoulas  <christos at astron.com>
-
-	* magic.mime update Danny Milosavljevic <danny.milo at gmx.net>
-
-	* FreeBSD version update Oliver Eikemeier <eikemeier at fillmore-labs.com>
-
-	* utime/utimes detection Ian Lance Taylor <ian at wasabisystems.com>
-
-  	* errors reading elf magic Jakub Bogusz <qboosh at pld-linux.org>
-
-2004-04-12 10:55  Christos Zoulas  <christos at astron.com>
-
-	* make sure that magic formats match magic types during compilation
-
-	* fix broken sgi magic file
-
-2004-04-06 20:36  Christos Zoulas  <christos at astron.com>
-
-	* detect present of mbstate_t Petter Reinholdtsen <pere at hungry.com>
-
-	* magic fixes
-
-2004-03-22 15:25  Christos Zoulas  <christos at astron.com>
-
-	* Lots of mime fixes
-	  (Joerg Ostertag) <ostertag at rechengilde.de>
-
-	* FreeBSD ELF version handling
-	  (Edwin Groothuis) <edwin at mavetju.org>
-
-	* correct cleanup in all cases; don't just close the file.
-	  (Christos Zoulas) <christos at astron.com>
-
-	* add gettext message catalogue support
-	  (Michael Piefel) <piefel at debian.org>
-
-	* better printout for unreadable files
-	  (Michael Piefel) <piefel at debian.org>
-
-	* compensate for missing MAXPATHLEN
-	  (Michael Piefel) <piefel at debian.org>
-
-	* add wide character string length computation
-	  (Michael Piefel) <piefel at debian.org>
-
-	* Avoid infinite loops caused by bad elf alignments
-	  or name and description note sizes. Reported by
-	  (Mikael Magnusson) <mmikael at comhem.se>
-
-2004-03-09 13:55  Christos Zoulas  <christos at astron.com>
-
-	* Fix possible memory leak on error and add missing regfree
-	  (Dmitry V. Levin) <ldv at altlinux.org>
-
-2003-12-23 12:12  Christos Zoulas  <christos at astron.com>
-
-	* fix -k flag (Maciej W. Rozycki)
-
-2003-11-18 14:10  Christos Zoulas  <christos at astron.com>
-
-	* Try to give us much info as possible on corrupt elf files.
-	  (Willy Tarreau) <willy at w.ods.org>
-	* Updated python bindings (Brett Funderburg)
-	   <brettf at deepfile.com>
-
-2003-11-11 15:03  Christos Zoulas  <christos at astron.com>
-
-	* Include file.h first, because it includes config.h
-	  breaks largefile test macros otherwise.
-	  (Paul Eggert <eggert at CS.UCLA.EDU> via
-	   Lars Hecking <lhecking at nmrc.ie>)
-
-2003-10-14 21:39  Christos Zoulas  <christos at astron.com>
-
-	* Python bindings (Brett Funderburg) <brettf at deepfile.com>
-	* Don't lookup past the end of the buffer
-	  (Chad Hanson) <chanson at tcs-sec.com>
-	* Add MAGIC_ERROR and api on magic_errno()
-
-2003-10-08 12:40  Christos Zoulas  <christos at astron.com>
-
-	* handle error conditions from compile as fatal
-	  (Antti Kantee) <pooka at netbsd.org>
-	* handle magic filename parsing sanely
-	* more magic fixes.
-	* fix a memory leak (Illes Marton) <illes.marton at balabit.hu>
-	* describe magic file handling
-	  (Bryan Henderson) <bryanh at giraffe-data.com>
-
-2003-09-12 15:09  Christos Zoulas  <christos at astron.com>
-
-	* update magic files.
-	* remove largefile support from file.h; it breaks things on most OS's
-
-2003-08-10 10:25  Christos Zoulas  <christos at astron.com>
-
-	* fix unmapping'ing of mmaped files.
-
-2003-07-10 12:03  Christos Zoulas  <christos at astron.com>
-
-	* don't exit with -1 on error; always exit 1 (Marty Leisner)
-	* restore utimes code.
-
-2003-06-10 17:03  Christos Zoulas  <christos at astron.com>
-
-	* make sure we don't access uninitialized memory.
-	* pass lint
-	* #ifdef __cplusplus in magic.h
-
-2003-05-25 19:23  Christos Zoulas  <christos at astron.com>
-
-	* rename cvs magic file to revision to deal with
-	  case insensitive filesystems.
-
-2003-05-23 17:03  Christos Zoulas  <christos at astron.com>
-
-	* documentation fixes from Michael Piefel <piefel at debian.org>
-	* magic fixes (various)
-	* revert basename magic in .mgc name determination
-	* buffer protection in uncompress,
-	  signness issues,
-	  close files
-	  Maciej W. Rozycki <macro at ds2.pg.gda.pl
-
-2003-04-21 20:12  Christos Zoulas  <christos at astron.com>
-
-	* fix zsh magic
-
-2003-04-04 16:59  Christos Zoulas  <christos at astron.com>
-
-	* fix operand sort order in string.
-
-2003-04-02 17:30  Christos Zoulas  <christos at astron.com>
-
-	* cleanup namespace in magic.h
-
-2003-04-02 13:50  Christos Zoulas  <christos at astron.com>
-
-	* Magic additions (Alex Ott)
-	* Fix bug that broke VPATH compilation (Peter Breitenlohner)
-
-2003-03-28 16:03  Christos Zoulas  <christos at astron.com>
-
-	* remove packed attribute from magic struct.
-	* make the magic struct properly aligned.
-	* bump version number of compiled files to 2.
-
-2003-03-27 13:10  Christos Zoulas  <christos at astron.com>
-
-	* separate tar detection and run it before softmagic.
-	* fix reversed symlink test.
-	* fix version printing.
-	* make separator a string instead of a char.
-	* update manual page and sort options.
-
-2003-03-26 11:00  Christos Zoulas  <christos at astron.com>
-
-	* Pass lint
-	* make NULL in magic_file mean stdin
-	* Fix "-" argument to file to pass NULL to magic_file
-	* avoid pointer casts by using memcpy
-	* rename magic_buf -> magic_buffer
-	* keep only the first error
-	* manual page: new sentence, new line
-	* fix typo in api function (magic_buf -> magic_buffer)

Copied: trunk/contrib/file/ChangeLog (from rev 6687, vendor/file/5.19/ChangeLog)
===================================================================
--- trunk/contrib/file/ChangeLog	                        (rev 0)
+++ trunk/contrib/file/ChangeLog	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1,1395 @@
+2014-06-12  12:28  Christos Zoulas <christos at zoulas.com>
+
+	* release 5.19
+
+2014-06-09   9:04  Christos Zoulas <christos at zoulas.com>
+	
+	* Misc buffer overruns and missing buffer size tests in cdf parsing
+	  (Francisco Alonso, Jan Kaluza)
+
+2014-06-02  14:50  Christos Zoulas <christos at zoulas.com>
+
+	* Enforce limit of 8K on regex searches that have no limits
+	* Allow the l modifier for regex to mean line count. Default
+	  to byte count. If line count is specified, assume a max
+	  of 80 characters per line to limit the byte count.
+	* Don't allow conversions to be used for dates, allowing
+	  the mask field to be used as an offset.
+
+2014-05-30  12:51  Christos Zoulas <christos at zoulas.com>
+
+	* Make the range operator limit the length of the
+	  regex search.
+
+2014-05-14  19:23  Christos Zoulas <christos at zoulas.com>
+
+	* PR/347: Windows fixes
+	* PR/352: Hangul word processor recognition
+	* PR/354: Encoding irregularities in text files
+
+2014-05-06  6:12  Christos Zoulas <christos at zoulas.com>
+
+	* Fix uninitialized title in CDF files (Jan Kaluza)
+
+2014-05-04  14:55  Christos Zoulas <christos at zoulas.com>
+
+	* PR/351: Fix compilation of empty files 
+
+2014-04-30  17:39  Christos Zoulas <christos at zoulas.com>
+
+	* Fix integer formats: We don't specify 'l' or
+	  'h' and 'hh' specifiers anymore, only 'll' for
+	  quads and nothing for the rest. This is so that
+	  magic writing is simpler.
+
+2014-04-01  15:25  Christos Zoulas <christos at zoulas.com>
+
+	* PR/341: Jan Kaluza, fix memory leak
+	* PR/342: Jan Kaluza, fix out of bounds read
+
+2014-03-28  15:25  Christos Zoulas <christos at zoulas.com>
+
+	* Fix issue with long formats not matching fmtcheck
+
+2014-03-26  11:25  Christos Zoulas <christos at zoulas.com>
+
+	* release 5.18
+
+2014-03-15  17:45  Christos Zoulas <christos at zoulas.com>
+
+	* add fmtcheck(3) for those who don't have it
+
+2014-03-14  15:12  Christos Zoulas <christos at zoulas.com>
+
+	* prevent mime entries from being attached to magic
+	  entries with no descriptions
+
+	* adjust magic strength for regex type
+
+	* remove superfluous ascmagic with encoding test
+
+2014-03-06  12:01  Christos Zoulas <christos at zoulas.com>
+
+	* fix regression fix echo -ne "\012\013\014" | file -i -
+	  which printed "binary" instead of "application/octet-stream"
+
+	* add size_t overflow check for magic file size
+
+2014-02-27  16:01  Christos Zoulas <christos at zoulas.com>
+
+	* experimental support for matching with CFD CLSID
+
+2014-02-18  13:04  Kimmo Suominen (kimmo at suominen.com)
+
+	* Cache old LC_CTYPE locale before setting it to "C", so
+	  we can use it to restore LC_CTYPE instead of asking
+	  setlocale() to scan the environment variables.
+
+2014-02-12  18:21  Christos Zoulas <christos at zoulas.com>
+
+	* Count recursion levels through indirect magic
+
+2014-02-11  10:40  Christos Zoulas <christos at zoulas.com>
+
+	* Prevent infinite recursion on files with indirect offsets of 0
+
+2014-01-30  21:00  Christos Zoulas <christos at zoulas.com>
+
+	* Add -E flag that makes file print filesystem errors to stderr
+	  and exit.
+
+2014-01-08  17:20  Christos Zoulas <christos at zoulas.com>
+
+	* mime printing could print results from multiple magic entries
+	  if there were multiple matches.
+	* in some cases overflow was not detected when computing offsets
+	  in softmagic.
+
+2013-12-05  12:00  Christos Zoulas <christos at zoulas.com>
+
+	* use strcasestr() to for cdf strings
+	* reset to the "C" locale while doing regex operations, or case
+	  insensitive comparisons; this is provisional
+
+2013-11-19  20:10  Christos Zoulas <christos at zoulas.com>
+
+	* always leave magic file loaded, don't unload for magic_check, etc.
+	* fix default encoding to binary instead of unknown which broke recently
+	* handle empty and one byte files, less specially so that
+	  --mime-encoding does not break completely.
+		`
+2013-11-06  14:40  Christos Zoulas <christos at zoulas.com>
+
+	* fix erroneous non-zero exit code from non-existant file and message
+
+2013-10-29  14:25  Christos Zoulas <christos at zoulas.com>
+
+	* add CDF MSI file detection (Guy Helmer)
+
+2013-09-03  11:56  Christos Zoulas <christos at zoulas.com>
+
+	* Don't mix errors and regular output if there was an error
+	* in magic_descriptor() don't close the file and try to restore
+	  its position
+
+2013-05-30  17:25  Christos Zoulas <christos at zoulas.com>
+
+	* Don't treat magic as an error if offset was past EOF (Christoph Biedl)
+
+2013-05-28  17:25  Christos Zoulas <christos at zoulas.com>
+	
+	* Fix spacing issues in softmagic and elf (Jan Kaluza)
+
+2013-05-02  18:00  Christos Zoulas <christos at zoulas.com>
+
+	* Fix segmentation fault with multiple magic_load commands.
+
+2013-04-22  11:20  Christos Zoulas <christos at zoulas.com>
+
+	* The way "default" was implemented was not very useful
+	  because the "if something was printed at that level"
+	  was not easily controlled by the user, and the format
+	  was bound to a string which is too restrictive. Add
+	  a "clear" for that level keyword and make "default"
+	  void. This way one can do:
+
+		>>13	clear	x
+		>>13	lelong	1	foo
+		>>13	lelong	2	bar
+		>>13	default	x
+		>>>13	lelong	x	unknown %x
+
+2013-03-25  13:20  Christos Zoulas <christos at zoulas.com>
+
+	* disallow strength setting in "name" entries
+
+2013-03-06  21:24  Christos Zoulas <christos at zoulas.com>
+
+	* fix recursive magic separator printing
+
+2013-02-26  19:28  Christos Zoulas <christos at zoulas.com>
+
+	* limit recursion level for mget
+	* fix pread() related breakage in cdf
+	* handle offsets properly in recursive "use"
+
+2013-02-18  10:39  Christos Zoulas <christos at zoulas.com>
+
+	* add elf reading of debug info to determine if file is stripped
+	  (Jan Kaluza)
+	* use pread()
+
+2013-01-25  18:05  Christos Zoulas <christos at zoulas.com>
+
+	* change mime description size from 64 to 80 to accommodate OOXML.
+
+2013-01-11  14:50  Christos Zoulas <christos at zoulas.com>
+
+	* Warn about inconsistent continuation levels.
+	* Change fsmagic to add a space after it prints.
+
+2013-01-10  21:00  Christos Zoulas <christos at zoulas.com>
+
+	* Make getline public so that file can link against it.
+	  Perhaps it is better to rename it, or hide it differently.
+	  Fixes builds on platforms that do not provide it.
+	  
+2013-01-07  16:30  Christos Zoulas <christos at zoulas.com>
+
+	* Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
+	  what long, int, short, etc is (Guy Harris)
+
+2013-01-06  11:20  Christos Zoulas <christos at zoulas.com>
+
+	* add magic_version function and constant
+	* Redo memory allocation and de-allocation.
+	  (prevents double frees on non mmap platforms)
+	* Fix bug with name/use having to do with passing
+	  found state from the parent to the child and back.
+
+2012-12-19   8:47  Christos Zoulas <christos at zoulas.com>
+
+	* Only print elf capabilities for archs we know (Jan Kaluza)
+
+2012-10-30  19:14  Christos Zoulas <christos at zoulas.com>
+
+	* Add "name" and "use" file types in order to look
+	  inside mach-o files.
+
+2012-09-06  10:40  Christos Zoulas <christos at zoulas.com>
+
+	* make --version exit 0 (Matthew Schultz)
+	* add string/T (Jan Kaluza)
+
+2012-08-09  2:15  Christos Zoulas <christos at zoulas.com>
+
+	* add z and t modifiers for our own vasprintf
+	* search for $HOME/.magic.mgc if it is there first
+	* fix reads from a pipe, and preserve errno
+
+2012-05-15  13:12  Christos Zoulas <christos at zoulas.com>
+
+	* use ctime_r, asctime_r
+
+2012-04-06  17:18  Christos Zoulas <christos at zoulas.com>
+
+	* Fixes for indirect offsets to handle apple disk formats
+
+2012-04-03  18:26  Christos Zoulas <christos at zoulas.com>
+
+	* Add windows date field types
+	* More info for windows shortcuts (incomplete)
+
+2012-02-20  17:33  Christos Zoulas <christos at zoulas.com>
+
+	* Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
+
+2011-12-15  12:17  Chris Metcalf <cmetcalf at tilera.com>
+
+	* Support Tilera architectures (tile64, tilepro, tilegx).
+
+2011-12-16  16:33  Reuben Thomas <rrt at 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 at sc3d.org>
+
+	* Simplify if (p) free(p) to free(p).
+
+2011-12-08  13:07  Reuben Thomas <rrt at 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 at 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 at sc3d.org>
+
+	* Fix minor error in file(1).
+
+2011-11-05  00:00  Reuben Thomas <rrt at sc3d.org>
+
+	* Fix issue #150 (I hope).
+
+2011-09-22  12:57  Christos Zoulas <christos at zoulas.com>
+
+	* Python3 binding fixes from Kelly Anderson
+
+2011-09-20  11:32  Christos Zoulas <christos at 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 at zoulas.com>
+
+	* Don't wait for any subprocess, just the one we forked.
+
+2011-08-26  16:40  Christos Zoulas <christos at 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 at zoulas.com>
+
+	* Fix ELF lseek(2) madness. Inspired by PR/134 by Jan Kaluza
+
+2011-08-14  09:03  Christos Zoulas <christos at zoulas.com>
+
+	* Don't use variable string formats.
+
+2011-07-12  12:32  Reuben Thomas <rrt at 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 at zoulas.com>
+
+	* fix mingw compilation (Abradoks)
+
+2011-05-10  20:57  Christos Zoulas <christos at 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 at zoulas.com>
+
+	* Fix cdf string buffer setting (Sven Anders)
+
+2011-03-20  16:35  Christos Zoulas <christos at zoulas.com>
+
+	* Eliminate MAXPATHLEN and use dynamic allocation for
+	  path and file buffers.
+
+2011-03-15  18:15  Christos Zoulas <christos at zoulas.com>
+
+	* binary tests on magic entries with masks could spuriously
+	  get converted to ascii.
+
+2011-03-12  18:06  Reuben Thomas <rrt at sc3d.org>
+
+	* Improve file.man (remove BUGS, present email addresses consistently).
+
+2011-03-07  19:38  Christos Zoulas <christos at zoulas.com>
+
+	* add lrzip support (from Ville Skytta)
+
+2011-02-10  16:36  Christos Zoulas <christos at zoulas.com>
+
+	* fix CDF bounds checking (Guy Helmer)
+
+2011-02-10  12:03  Christos Zoulas <christos at zoulas.com>
+
+	* add cdf_ctime() that prints a meaningful error when time cannot
+	  be converted.
+
+2011-02-02  20:40  Christos Zoulas <christos at 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 at sc3d.org>
+
+	* Fix two potential buffer overruns in apprentice_list.
+
+2011-01-14  22:33  Reuben Thomas <rrt at sc3d.org>
+
+	* New Python binding in pure Python.
+	* Update libmagic(3).
+
+2011-01-06  21:40  Reuben Thomas <rrt at sc3d.org>
+
+	* Fix Python bindings (including recent Python 3 compatibility
+	  update).
+
+2011-01-04  18:43  Reuben Thomas <rrt at 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 at zoulas.com>
+
+	* Add pstring/BHhLl to specify the type of the length of pascal
+	  strings.
+
+2010-11-26  18:39  Reuben Thomas <rrt at 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 at sc3d.org>
+
+	* Make bug reporting addresses more visible.
+
+2010-11-01  18:35  Reuben Thomas <rrt at sc3d.org>
+
+	* Add tcl magic from Gustaf Neumann
+
+2010-10-24  10:42  Christos Zoulas <christos at zoulas.com>
+
+	* Fix the whitespace comparing code (Christopher Chittleborough)
+
+2010-10-06  21:05  Christos Zoulas <christos at zoulas.com>
+
+	* allow string/t to work (Jan Kaluza)
+
+2010-09-20  22:11  Reuben Thomas <rrt at sc3d.org>
+
+	* Apply some patches from Ubuntu and Fedora.
+
+2010-09-20  21:16  Reuben Thomas <rrt at 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 at sc3d.org>
+
+	* Minor security fix to softmagic.c (don't use untrusted
+	  string as printf format).
+
+2010-07-21  12:20  Christos Zoulas <christos at 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 at zoulas.com>
+
+	* Only try to print prpsinfo for core files. (Jan Kaluza)
+
+2010-04-22  12:55  Christos Zoulas <christos at zoulas.com>
+
+	* Try more elf offsets for Debian core files.  (Arnaud Giersch)
+
+2010-02-20  15:18  Reuben Thomas <rrt at sc3d.org>
+
+	* Clarify which sort of CDF we mean.
+
+2010-02-14  22:58  Reuben Thomas <rrt at 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 at sc3d.org>
+
+	* Add support for OCF (EPUB) files (application/epub+zip)
+
+2010-01-28  18:25  Christos Zoulas <christos at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at wildpumpkin.net>
+
+	* Include Localstuff when compiling magic.
+
+2009-07-15  10:05  Christos Zoulas <christos at 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 at sc3d.org>
+
+	* Stop "(if" identifying Lisp files, that's plain dumb!
+
+2009-06-09 22:13  Reuben Thomas <rrt at sc3d.org>
+
+	* Add a couple of missing MP3 MIME types.
+
+2009-05-27 23:00  Reuben Thomas <rrt at 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 at zoulas.com>
+
+	* off by one in parsing hw capabilities in elf
+	  (Cheng Renquan)
+
+2009-05-08  13:40  Christos Zoulas <christos at zoulas.com>
+	
+	* lint fixes and more from NetBSD
+
+2009-05-06  10:25  Christos Zoulas <christos at zoulas.com>
+
+	* Avoid null dereference in cdf code (Drew Yao)
+
+	* More cdf bounds checks and overflow checks
+
+2009-05-01  18:37  Christos Zoulas <christos at zoulas.com>
+
+	* Buffer overflow fixes from Drew Yao
+
+2009-04-30  17:10  Christos Zoulas <christos at zoulas.com>
+
+	* Fix more cdf lossage. All the documents I have
+	  right now print the correct information.
+
+2009-03-27  18:43  Christos Zoulas <christos at zoulas.com>
+
+	* don't print \012- separators in the same magic entry 
+	  if it consists of multiple magic printing lines.
+
+2009-03-23  10:20  Christos Zoulas <christos at zoulas.com>
+
+	* Avoid file descriptor leak in compress code from
+	  (Daniel Novotny)
+
+2009-03-18  16:50  Christos Zoulas <christos at zoulas.com>
+
+	* Allow escaping of relation characters, so that we can say \^[A-Z]
+	  and the ^ is not eaten as a relation char.
+
+	* Fix troff and fortran to their previous glory using
+	  regex. This was broken since their removel from ascmagic.
+
+2009-03-10  16:50  Christos Zoulas <christos at zoulas.com>
+
+	* don't use strlen in strndup() (Toby Peterson)
+
+2009-03-10  7:45  Christos Zoulas <christos at zoulas.com>
+
+	* avoid c99 syntax.
+
+2009-02-23 15:45  Christos Zoulas <christos at zoulas.com>
+
+	* make the cdf code use the buffer first if available,
+	  and then the fd code.
+
+2009-02-13 13:45  Christos Zoulas <christos at zoulas.com>
+
+	* look for struct option to determine if getopt.h is usable for IRIX.
+
+	* sanitize cdf document strings
+
+2009-02-04 13:25  Christos Zoulas <christos at zoulas.com>
+
+	* fix OS/2 warnings.
+
+2008-12-12 15:50  Christos Zoulas <christos at zoulas.com>
+
+	* fix initial offset calculation for non 4K sector files
+
+	* add loop limits to avoid DoS attacks by constructing
+	  looping sector references.
+
+2008-12-03 13:05  Christos Zoulas <christos at zoulas.com>
+
+	* 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 <chl at tuxfamily.org>
+
+	* 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 <christos at zoulas.com>
+
+	* Handle ID3 format files.
+
+2008-11-06 23:00  Reuben Thomas <rrt at sc3d.org>
+
+	* 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 <christos at astron.com>
+
+	* use memchr instead of strchr because the string
+	  might not be NUL terminated (Scott MacVicar)
+
+2008-11-03 07:31  Reuben Thomas <rrt at sc3d.org>
+
+	* Fix a printf with a non-literal format string.
+
+	* Fix formatting and punctuation of help for "--apple".
+
+2008-10-30 11:00  Reuben Thomas <rrt at sc3d.org>
+
+	* 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 <christos at astron.com>
+
+	* Added APPLE file creator/type
+
+2008-10-12 10:20  Christos Zoulas <christos at astron.com>
+
+	* Added CDF parsing
+
+2008-10-09 16:40  Christos Zoulas <christos at astron.com>
+
+	* filesystem and msdos patches (Joerg Jenderek)
+
+2008-10-09 13:20  Christos Zoulas <christos at astron.com>
+
+	* correct --exclude documentation issues: remove troff and fortran
+	  and rename "token" to "tokens". (Randy McMurchy)
+
+2008-10-01 10:30  Christos Zoulas <christos at astron.com>
+
+	* 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  <rrt at sc3d.org>
+
+	* Comment out graphviz patterns, as they match too many files.
+
+2008-08-30 12:54  Christos Zoulas <christos at astron.com>
+
+	* Don't eat trailing \n in magic enties.
+
+	* Cast defines to allow compilation using a c++ compiler.
+
+2008-08-25 23:56  Reuben Thomas  <rrt at sc3d.org>
+
+	* Add text/x-lua MIME type for Lua scripts.
+
+	* Escape { in regex in graphviz patterns.
+
+2008-07-26 00:59  Reuben Thomas  <rrt at sc3d.org>
+
+	* Add MIME types for special files.
+
+	* Use access to give more accurate information for files that
+	  can't be opened.
+
+	* Add a TODO list.
+
+2008-07-02 11:15  Christos Zoulas  <christos at astron.com>
+
+	* add !:strength op to adjust magic strength (experimental)
+
+2008-06-16 21:41  Reuben Thomas  <rrt at sc3d.org>
+
+	* Fix automake error in configure.ac.
+
+	* Add MIME type for Psion Sketch files.
+
+2008-06-05 08:59  Christos Zoulas  <christos at astron.com>
+
+	* Don't print warnings about bad namesize in stripped
+	  binaries with PT_NOTE is still there, and the actual
+	  note is gone (Jakub Jelinek)
+
+2008-05-28 15:12  Robert Byrnes  <byrnes at wildpumpkin.net>
+
+	* magic/Magdir/elf:
+	  Note invalid byte order for little-endian SPARC32PLUS.
+	  Add SPARC V9 vendor extensions and memory model.
+
+	* src/elfclass.h:
+	  Pass target machine to doshn (for Solaris hardware capabilities).
+
+	* src/readelf.c (doshn):
+	  Add support for Solaris hardware/software capabilities.
+
+	* src/readelf.h:
+	  Ditto.
+
+	* src/vasprintf.c (dispatch):
+	  Add support for ll modifier.
+
+2008-05-16 10:25  Christos Zoulas  <christos at astron.com>
+
+	* Fix compiler warnings.
+
+	* remove stray printf, and fix a vprintf bug. (Martin Dorey)
+
+2008-05-06 00:13  Robert Byrnes  <byrnes at wildpumpkin.net>
+
+	* src/Makefile.am:
+	  Ensure that getopt_long and [v]asprintf are included in libmagic,
+	  as needed.
+
+	  Remove unnecessary EXTRA_DIST.
+
+	* src/Makefile.in:
+	  Rerun automake.
+
+	* src/vasprintf.c (dispatch):
+	  Fix variable precision bug: be sure to step past '*'.
+
+	* src/vasprintf.c (core):
+	  Remove unreachable code.
+
+	* src/apprentice.c (set_test_type):
+	  Add cast to avoid compiler warning.
+
+2008-04-22 23:45  Christos Zoulas  <christos at astron.com>
+
+	* Add magic submission guidelines (Abel Cheung)
+
+	* split msdos and windows magic (Abel Cheung)
+
+2008-04-04 11:00  Christos Zoulas  <christos at astron.com>
+
+	* >= <= is not supported, so fix the magic and warn about it.
+	  reported by: Thien-Thi Nguyen <ttn at gnuvola.org>
+
+2008-03-27 16:16  Robert Byrnes  <byrnes at wildpumpkin.net>
+
+	* src/readelf.c (donote):
+	  ELF core file command name/line bug fixes and enhancements:
+
+	  Try larger offsets first to avoid false matches
+	  from earlier data that happen to look like strings;
+	  this primarily affected SunOS 5.x 32-bit Intel core files.
+
+	  Add support for command line (instead of just short name)
+	  for SunOS 5.x.
+
+	  Add information about NT_PSINFO for SunOS 5.x.
+
+	  Only trim whitespace from end of command line.
+
+2007-02-11 01:36 Reuben Thomas <rrt at sc3d.org>
+
+	* Change strength of ! from MULT to 0, as it matches almost
+		  anything (Reuben Thomas)
+
+	* Debian fixes (Reuben Thomas)
+
+2007-02-11 00:17 Reuben Thomas <rrt at sc3d.org>
+
+	* Clarify UTF-8 BOM message (Reuben Thomas)
+
+	* Add HTML comment to token list in names.h
+
+2007-02-04 15:50 Christos Zoulas <christos at astron.com>
+
+	* Debian fixes (Reuben Thomas)
+
+2007-02-04 11:31 Christos Zoulas <christos at astron.com>
+
+	* !:mime annotations in magic files (Reuben Thomas)
+
+2007-01-29 15:35 Christos Zoulas <christos at astron.com>
+
+	* zero out utime/utimes structs (Gavin Atkinson)
+
+2007-01-26 13:45 Christos Zoulas <christos at astron.com>
+
+	* reduce writable data from Diego "Flameeyes" Petten
+
+2007-12-28 15:06 Christos Zoulas <christos at astron.com>
+
+	* strtof detection
+
+	* remove bogus regex magic that could cause a DoS
+
+	* better mismatch version message
+
+2007-12-27 11:35 Christos Zoulas <christos at astron.com>
+
+	* bring back some fixes from OpenBSD
+
+	* treat ELF dynamic objects as executables
+
+	* fix gcc warnings
+
+2007-12-01 19:55 Christos Zoulas <christos at astron.com>
+
+	* make sure we have zlib.h and libz to compile the builtin
+	  decompress code
+
+2007-10-28 20:48 Christos Zoulas <christos at astron.com>
+
+ 	* float and double magic support (Behan Webster)
+
+2007-10-28 20:48 Christos Zoulas <christos at astron.com>
+
+	* Convert fortran to a soft test (Reuben Thomas)
+
+2007-10-23  5:25 Christos Zoulas <christos at astron.com>
+
+	* Add --with-filename, and --no-filename (Reuben Thomas)
+
+2007-10-23  3:59 Christos Zoulas <christos at astron.com>
+
+	* Rest of the mime split (Reuben Thomas)
+
+	* Make usage message generated from the flags so that
+	  they stay consistent (Reuben Thomas)
+
+2007-10-20  3:06 Christos Zoulas <christos at astron.com>
+
+	* typo in comment, missing ifdef QUICK, remove unneeded code
+		(Charles Longeau)
+
+2007-10-17  3:33 Christos Zoulas <christos at astron.com>
+
+	* Fix problem printing -\012 in some entries
+
+	* Separate magic type and encoding flags (Reuben Thomas)
+
+2007-10-09  3:55 Christos Zoulas <christos at astron.com>
+
+	* configure fix for int64 and strndup (Reuben Thomas)
+
+2007-09-26  4:45 Christos Zoulas <christos at astron.com>
+
+	* Add magic_descriptor() function.
+
+	* Fix regression in elf reading code where the core name was
+	  not being printed.
+
+	* Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson)
+
+2007-08-19  6:30 Christos Zoulas <christos at astron.com>
+
+	* Make mime format consistent so that it can
+	  be easily parsed:
+	      mimetype [charset=character-set] [encoding=encoding-mime-type]
+
+	  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,
+	  which is now classed as application/octet-stream).
+
+	  Remove 7/8bit classifications, since they were arbitrary
+	  and not based on the file data.
+
+	  This work was done by Reuben Thomas
+
+2007-05-24 10:00 Christos Zoulas <christos at astron.com>
+
+	* Fix another integer overflow (Colin Percival)
+
+2007-03-26 13:58 Christos Zoulas <christos at astron.com>
+
+	* make sure that all of struct magic_set is initialized appropriately
+	  (Brett)
+
+2007-03-25 17:44 Christos Zoulas <christos at astron.com>
+
+	* reset left bytes in the buffer (Dmitry V. Levin)
+
+	* compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS
+	  (Peter Avalos)
+
+2007-03-15 10:51 Christos Zoulas <christos at astron.com>
+
+	* fix fortran and nroff reversed tests (Dmitry V. Levin)
+
+	* fix exclude option (Dmitry V. Levin)
+
+2007-02-08 17:30 Christos Zoulas <christos at astron.com>
+
+	* fix integer underflow in file_printf which can lead to
+	  to exploitable heap overflow (Jean-Sebastien Guay-Lero)
+
+2007-02-05 11:35 Christos Zoulas <christos at astron.com>
+
+	* make socket/pipe reading more robust
+
+2007-01-25 16:01 Christos Zoulas <christos at astron.com>
+
+	* Centralize all the tests in file_buffer.
+
+	* Add exclude flag.
+
+2007-01-18 05:29 Anon Ymous <do at not.spam.me>
+
+	* Move the "type" detection code from parse() into its own table
+	  driven routine.  This avoids maintaining multiple lists in
+	  file.h.
+
+	* 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 <do at not.spam.me>
+
+	* Fix an initialization bug in check_mem().
+
+2007-01-16 14:58 Anon Ymous <do at not.spam.me>
+
+	* Add a "default" type to print a message if nothing previously
+	  matched at that level or since the last default at that
+	  level.  This is useful for setting up switch-like statements.
+	  It can also be used to do if/else constructions without a
+	  redundant second test.
+
+	* Fix the "x" special case test so that one can test for that
+	  string with "=x".
+
+	* Allow "search" to search the entire buffer if the "/N"
+	  search count is missing.
+
+	* Make "regex" work!  It now starts its search at the
+	  specified offset and takes an (optional) "/N" line count to
+	  specify the search range; otherwise it searches to the end
+	  of the file.  The match is now grabbed correctly for format
+	  strings and the offset set to the end of the match.
+
+	* Add a "/s" flag to "regex" and "search" to set the offset to
+	  the start of the match.  By default the offset is set to the
+	  end of the match, as it is with other tests.  This is mostly
+	  useful for "regex".
+
+	* Make "search", "string" and "pstring" use the same
+	  file_strncmp() routine so that they support the same flags;
+	  "bestring16" and "lestring16" call the same routine, but
+	  with flags = 0.  Also add a "/C" flag (in analogy to "/c")
+	  to ignore the case on uppercase (lowercase) characters in
+	  the test string.
+
+	* Strict adherence to C style string escapes.  A warnings are
+	  printed when compiling.  Note: previously "\a" was
+	  incorrectly translated to 'a' instead of an <alert> (i.e.,
+	  BELL, typically 0x07).
+
+	* Make this compile with "-Wall -Wextra" and all the warning
+	  flags used with WARNS=4 in the NetBSD source.  Also make it
+	  pass lint.
+
+	* Many "cleanups" and hopefully not too many new bugs!
+
+2007-01-16 14:56 Anon Ymous <do at not.spam.me>
+
+	* make several more files compile with gcc warnings
+	  on and also make them pass lint.
+
+2007-01-16 14:54 Anon Ymous <do at not.spam.me>
+
+	* fix a puts()/putc() usage goof in file.c
+
+	* make file.c compile with gcc warnings and pass lint
+
+2006-12-11 16:49 Christos Zoulas <christos at astron.com>
+
+	* fix byteswapping issue
+
+	* report the number of bytes we tried to
+	  allocate when allocation fails
+
+	* add a few missed cases in the strength routine
+
+2006-12-08 16:32 Christos Zoulas <christos at astron.com>
+
+	* store and print the line number of the magic
+	  entry for debugging.
+
+	* if the magic entry did not print anything,
+	  don't treat it as a match
+
+	* change the magic strength algorithm to take
+	  into account the relationship op.
+
+	* fix a bug in search where we could accidentally
+	  return a match.
+
+	* propagate the error return from match to
+	  file_softmagic.
+
+2006-11-25 13:35 Christos Zoulas <christos at astron.com>
+
+	* 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
+	  found by: Arkadiusz Miskiewicz
+
+	* Fix problem in the '\0' separator; and don't
+	  print it as an additional separator; print
+	  it as the only separator.
+
+2006-11-17 10:51 Christos Zoulas <christos at astron.com>
+
+	* Added a -0 option to print a '\0' separator
+	  Etienne Buira <etienne.buira at free.fr>
+
+2006-10-31 15:14 Christos Zoulas <christos at astron.com>
+
+	* Check offset before copying (Mike Frysinger)
+
+	* merge duplicated code
+
+	* add quad date support
+
+	* make sure that we nul terminate desc (Ryoji Kanai)
+
+	* don't process elf notes multiple times
+
+	* allow -z to report empty compressed files
+
+	* use calloc to initialize the ascii buffers (Jos van den Oever)
+
+2006-06-08 11:11 Christos Zoulas <christos at astron.com>
+
+	* QNX fixes (Mike Gorchak)
+
+	* Add quad support.
+
+	* FIFO checks (Dr. Werner Fink)
+
+	* Linux ELF fixes (Dr. Werner Fink)
+
+	* Magic format checks (Dr. Werner Fink)
+
+	* Magic format function improvent (Karl Chen)
+
+2006-05-03 11:11 Christos Zoulas <christos at astron.com>
+
+	* Pick up some elf changes and some constant fixes from SUSE
+
+	* Identify gnu tar vs. posix tar
+
+	* When keep going, don't print spurious newlines (Radek Vokal)
+
+2006-04-01 12:02 Christos Zoulas <christos at astron.com>
+
+	* Use calloc instead of malloc (Mike Frysinger)
+
+	* Fix configure script to detect wctypes.h (Mike Frysinger)
+
+2006-03-02 16:06 Christos Zoulas <christos at astron.com>
+
+	* Print empty if the file is (Mike Frysinger)
+
+	* Don't try to read past the end of the buffer (Mike Frysinger)
+
+	* Sort magic entries by strength [experimental]
+
+2005-11-29 13:26 Christos Zoulas <christos at astron.com>
+
+	* Use iswprint() to convert the output string.
+	    (Bastien Nocera)
+
+2005-10-31 8:54 Christos Zoulas <christos at astron.com>
+
+	* Fix regression where the core info was not completely processed
+	    (Radek Vokal)
+
+2005-10-20 11:15 Christos Zoulas <christos at astron.com>
+
+	* Middle Endian magic (Diomidis Spinellis)
+
+2005-10-17 11:15 Christos Zoulas <christos at astron.com>
+
+	* Open with O_BINARY for CYGWIN (Corinna Vinschen)
+
+	* Don't close stdin (Arkadiusz Miskiewicz)
+
+	* Look for note sections in non executables.
+
+2005-09-20 13:33 Christos Zoulas <christos at astron.com>
+
+	* Don't print SVR4 Style in core files multiple times
+	    (Radek Vokal)
+
+2005-08-27 04:09 Christos Zoulas <christos at astron.com>
+
+	* Cygwin changes Corinna Vinschen
+
+2005-08-18 09:53 Christos Zoulas <christos at astron.com>
+
+	* Remove erroreous mention of /etc/magic in the file man page
+	  This is gentoo bug 101639. (Mike Frysinger)
+
+	* Cross-compile support and detection (Mike Frysinger)
+
+2005-08-12 10:17 Christos Zoulas <christos at astron.com>
+
+	* Add -h flag and dereference symlinks if POSIXLY_CORRECT
+	  is set.
+
+2005-07-29 13:57 Christos Zoulas <christos at astron.com>
+
+	* Avoid search and regex buffer overflows (Kelledin)
+
+2005-07-12 11:48 Christos Zoulas <christos at astron.com>
+
+	* Provide stub implementations for {v,}nsprintf() for older
+	  OS's that don't have them.
+	* Change mbstate_t autoconf detection macro from AC_MBSTATE_T
+	  to AC_TYPE_MBSTATE_T.
+
+2005-06-25 11:48 Christos Zoulas <christos at astron.com>
+
+	* Dynamically allocate the string buffers and make the
+	  default read size 256K.
+
+2005-06-01 00:00 Joerg Sonnenberger <joerg at britannica.bec.de>
+
+	* Dragonfly ELF note support
+
+2005-03-14 00:00 Giuliano Bertoletti <gb at symbolic.it>
+
+	* Avoid NULL pointer dereference in time conversion.
+
+2005-03-06 00:00  Joerg Walter <jwalt at mail.garni.ch>
+
+	* Add indirect magic offset support, and search mode.
+
+2005-01-12 00:00  Stepan Kasal  <kasal at ucw.cz>
+
+	* 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  <christos at astron.com>
+
+	* bzip2 needs a lot of input buffer space on some files
+	  before it can begin uncompressing. This makes file -z
+	  fail on some bz2 files. Fix it by giving it a copy of
+	  the file descriptor to read as much as it wants if we
+	  have access to it. <christos at astron.com>
+
+2004-11-24 12:39  Christos Zoulas  <christos at astron.com>
+
+	* Stack smash fix, and ELF more conservative reading.
+	  Jakub Bogusz <qboosh at pld-linux.org>
+
+2004-11-20 18:50  Christos Zoulas  <christos at astron.com>
+
+	* New FreeBSD version parsing code:
+	  Jon Noack <noackjr at alumni.rice.edu>
+
+	* Hackish support for ucs16 strings <christos at astron.com>
+
+2004-11-13 03:07  Christos Zoulas  <christos at astron.com>
+
+	* print the file name and line number in syntax errors.
+
+2004 10-12 10:50  Christos Zoulas  <christos at astron.com>
+
+	* Fix stack overwriting on 0 length strings: Tim Waugh
+	    <twaugh at redhat.com> Ned Ludd <solar at gentoo.org>
+
+2004-09-27 11:30  Christos Zoulas  <christos at astron.com>
+
+	* Remove 3rd and 4th copyright clause; approved by Ian Darwin.
+
+	* Fix small memory leaks; caught by: Tamas Sarlos
+	    <stamas at csillag.ilab.sztaki.hu>
+
+2004-07-24 16:33  Christos Zoulas  <christos at astron.com>
+
+	* magic.mime update Danny Milosavljevic <danny.milo at gmx.net>
+
+	* FreeBSD version update Oliver Eikemeier <eikemeier at fillmore-labs.com>
+
+	* utime/utimes detection Ian Lance Taylor <ian at wasabisystems.com>
+
+  	* errors reading elf magic Jakub Bogusz <qboosh at pld-linux.org>
+
+2004-04-12 10:55  Christos Zoulas  <christos at astron.com>
+
+	* make sure that magic formats match magic types during compilation
+
+	* fix broken sgi magic file
+
+2004-04-06 20:36  Christos Zoulas  <christos at astron.com>
+
+	* detect present of mbstate_t Petter Reinholdtsen <pere at hungry.com>
+
+	* magic fixes
+
+2004-03-22 15:25  Christos Zoulas  <christos at astron.com>
+
+	* Lots of mime fixes
+	  (Joerg Ostertag) <ostertag at rechengilde.de>
+
+	* FreeBSD ELF version handling
+	  (Edwin Groothuis) <edwin at mavetju.org>
+
+	* correct cleanup in all cases; don't just close the file.
+	  (Christos Zoulas) <christos at astron.com>
+
+	* add gettext message catalogue support
+	  (Michael Piefel) <piefel at debian.org>
+
+	* better printout for unreadable files
+	  (Michael Piefel) <piefel at debian.org>
+
+	* compensate for missing MAXPATHLEN
+	  (Michael Piefel) <piefel at debian.org>
+
+	* add wide character string length computation
+	  (Michael Piefel) <piefel at debian.org>
+
+	* Avoid infinite loops caused by bad elf alignments
+	  or name and description note sizes. Reported by
+	  (Mikael Magnusson) <mmikael at comhem.se>
+
+2004-03-09 13:55  Christos Zoulas  <christos at astron.com>
+
+	* Fix possible memory leak on error and add missing regfree
+	  (Dmitry V. Levin) <ldv at altlinux.org>
+
+2003-12-23 12:12  Christos Zoulas  <christos at astron.com>
+
+	* fix -k flag (Maciej W. Rozycki)
+
+2003-11-18 14:10  Christos Zoulas  <christos at astron.com>
+
+	* Try to give us much info as possible on corrupt elf files.
+	  (Willy Tarreau) <willy at w.ods.org>
+	* Updated python bindings (Brett Funderburg)
+	   <brettf at deepfile.com>
+
+2003-11-11 15:03  Christos Zoulas  <christos at astron.com>
+
+	* Include file.h first, because it includes config.h
+	  breaks largefile test macros otherwise.
+	  (Paul Eggert <eggert at CS.UCLA.EDU> via
+	   Lars Hecking <lhecking at nmrc.ie>)
+
+2003-10-14 21:39  Christos Zoulas  <christos at astron.com>
+
+	* Python bindings (Brett Funderburg) <brettf at deepfile.com>
+	* Don't lookup past the end of the buffer
+	  (Chad Hanson) <chanson at tcs-sec.com>
+	* Add MAGIC_ERROR and api on magic_errno()
+
+2003-10-08 12:40  Christos Zoulas  <christos at astron.com>
+
+	* handle error conditions from compile as fatal
+	  (Antti Kantee) <pooka at netbsd.org>
+	* handle magic filename parsing sanely
+	* more magic fixes.
+	* fix a memory leak (Illes Marton) <illes.marton at balabit.hu>
+	* describe magic file handling
+	  (Bryan Henderson) <bryanh at giraffe-data.com>
+
+2003-09-12 15:09  Christos Zoulas  <christos at astron.com>
+
+	* update magic files.
+	* remove largefile support from file.h; it breaks things on most OS's
+
+2003-08-10 10:25  Christos Zoulas  <christos at astron.com>
+
+	* fix unmapping'ing of mmaped files.
+
+2003-07-10 12:03  Christos Zoulas  <christos at astron.com>
+
+	* don't exit with -1 on error; always exit 1 (Marty Leisner)
+	* restore utimes code.
+
+2003-06-10 17:03  Christos Zoulas  <christos at astron.com>
+
+	* make sure we don't access uninitialized memory.
+	* pass lint
+	* #ifdef __cplusplus in magic.h
+
+2003-05-25 19:23  Christos Zoulas  <christos at astron.com>
+
+	* rename cvs magic file to revision to deal with
+	  case insensitive filesystems.
+
+2003-05-23 17:03  Christos Zoulas  <christos at astron.com>
+
+	* documentation fixes from Michael Piefel <piefel at debian.org>
+	* magic fixes (various)
+	* revert basename magic in .mgc name determination
+	* buffer protection in uncompress,
+	  signness issues,
+	  close files
+	  Maciej W. Rozycki <macro at ds2.pg.gda.pl
+
+2003-04-21 20:12  Christos Zoulas  <christos at astron.com>
+
+	* fix zsh magic
+
+2003-04-04 16:59  Christos Zoulas  <christos at astron.com>
+
+	* fix operand sort order in string.
+
+2003-04-02 17:30  Christos Zoulas  <christos at astron.com>
+
+	* cleanup namespace in magic.h
+
+2003-04-02 13:50  Christos Zoulas  <christos at astron.com>
+
+	* Magic additions (Alex Ott)
+	* Fix bug that broke VPATH compilation (Peter Breitenlohner)
+
+2003-03-28 16:03  Christos Zoulas  <christos at astron.com>
+
+	* remove packed attribute from magic struct.
+	* make the magic struct properly aligned.
+	* bump version number of compiled files to 2.
+
+2003-03-27 13:10  Christos Zoulas  <christos at astron.com>
+
+	* separate tar detection and run it before softmagic.
+	* fix reversed symlink test.
+	* fix version printing.
+	* make separator a string instead of a char.
+	* update manual page and sort options.
+
+2003-03-26 11:00  Christos Zoulas  <christos at astron.com>
+
+	* Pass lint
+	* make NULL in magic_file mean stdin
+	* Fix "-" argument to file to pass NULL to magic_file
+	* avoid pointer casts by using memcpy
+	* rename magic_buf -> magic_buffer
+	* keep only the first error
+	* manual page: new sentence, new line
+	* fix typo in api function (magic_buf -> magic_buffer)

Deleted: trunk/contrib/file/INSTALL
===================================================================
--- trunk/contrib/file/INSTALL	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/INSTALL	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1,234 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-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.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-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.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. 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
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-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.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-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 `..'.
-
-   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.
-
-Installation Names
-==================
-
-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'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   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.
-
-   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
-`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
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-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
-`--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:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     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
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-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'.
-`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.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-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
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

Copied: trunk/contrib/file/INSTALL (from rev 6687, vendor/file/5.19/INSTALL)
===================================================================
--- trunk/contrib/file/INSTALL	                        (rev 0)
+++ trunk/contrib/file/INSTALL	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1,365 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   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
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+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
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   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.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     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.
+
+  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
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     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.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   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 `..'.  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
+`/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', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   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.  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'.
+
+   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
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+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
+`--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:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     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
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+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'.
+`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.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   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
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     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'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     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.
+

Deleted: trunk/contrib/file/MAINT
===================================================================
--- trunk/contrib/file/MAINT	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/MAINT	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1,44 +0,0 @@
-$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $
-
-Maintenance notes:
-
-I am continuing to maintain the file command. I welcome your help,
-but to make my life easier I'd like to request the following:
-
-- Do not distribute changed versions.
-
-People trying to be helpful occasionally put up their hacked versions
-of the file command for anonymous FTP, and people all over the
-world get copies of the hacked versions.  Within a day or two I am
-getting email from around the world asking me why "my" file command
-won't compile!!! Needless to say this detracts from the limited
-time I have available to work on the actual software. Therefore I
-ask you again to please NOT distribute your changed version. If
-you need to make changes, please add a patch file next to the
-distribution tar, and a README file that clearly explains what you
-are trying to fix.
-
-Thank you for your assistance and cooperation.
-
-Code Overview
-
-This is a rough idea of the control flow from the main program:
-
-file.c	main()
-file.c	process (called for each file)
-		printf file name
-magic.c		magic_file()
-fsmagic.c		file_fsmagic()
-				(handles statbuf modes for DEV)
-			(handles statbuf modes for executable &c.
-			reads data from file.
-funcs.c:		file_buffer()
-compress.c			file_zmagic()
-is_tar.c			file_is_tar()
-softmagic.c			file_softmagic()
-						match() - looks for match against main magic database
-ascmagic.c			file_ascmagic()
-readelf.c		file_tryelf()
-				"unknown"
-
-Christos Zoulas (see README for email address)

Copied: trunk/contrib/file/MAINT (from rev 6687, vendor/file/5.19/MAINT)
===================================================================
--- trunk/contrib/file/MAINT	                        (rev 0)
+++ trunk/contrib/file/MAINT	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1,44 @@
+$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $
+
+Maintenance notes:
+
+I am continuing to maintain the file command. I welcome your help,
+but to make my life easier I'd like to request the following:
+
+- Do not distribute changed versions.
+
+People trying to be helpful occasionally put up their hacked versions
+of the file command for anonymous FTP, and people all over the
+world get copies of the hacked versions.  Within a day or two I am
+getting email from around the world asking me why "my" file command
+won't compile!!! Needless to say this detracts from the limited
+time I have available to work on the actual software. Therefore I
+ask you again to please NOT distribute your changed version. If
+you need to make changes, please add a patch file next to the
+distribution tar, and a README file that clearly explains what you
+are trying to fix.
+
+Thank you for your assistance and cooperation.
+
+Code Overview
+
+This is a rough idea of the control flow from the main program:
+
+file.c	main()
+file.c	process (called for each file)
+		printf file name
+magic.c		magic_file()
+fsmagic.c		file_fsmagic()
+				(handles statbuf modes for DEV)
+			(handles statbuf modes for executable &c.
+			reads data from file.
+funcs.c:		file_buffer()
+compress.c			file_zmagic()
+is_tar.c			file_is_tar()
+softmagic.c			file_softmagic()
+						match() - looks for match against main magic database
+ascmagic.c			file_ascmagic()
+readelf.c		file_tryelf()
+				"unknown"
+
+Christos Zoulas (see README for email address)

Deleted: trunk/contrib/file/NEWS
===================================================================
--- trunk/contrib/file/NEWS	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/NEWS	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1 +0,0 @@
-See ChangeLog.
\ No newline at end of file

Copied: trunk/contrib/file/NEWS (from rev 6687, vendor/file/5.19/NEWS)
===================================================================
--- trunk/contrib/file/NEWS	                        (rev 0)
+++ trunk/contrib/file/NEWS	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1 @@
+See ChangeLog.
\ No newline at end of file

Deleted: trunk/contrib/file/README
===================================================================
--- trunk/contrib/file/README	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/README	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1,114 +0,0 @@
-** README for file(1) Command **
-@(#) $File: README,v 1.43 2010/11/05 17:25:55 rrt Exp $
-
-Mailing List: file at mx.gw.com
-Bug tracker: http://bugs.gw.com/
-E-mail: christos at astron.com
-
-Phone: Do not even think of telephoning me about this program. Send cash first!
-
-This is Release 5.x of Ian Darwin's (copyright but distributable)
-file(1) command, an implementation of the Unix File(1) command.
-It knows the 'magic number' of several thousands of file types.
-This version is the standard "file" command for Linux,
-*BSD, and other systems. (See "patchlevel.h" for the exact release number).
-
-You can download the latest version of file from:
-
-	ftp://ftp.astron.com/pub/file/
-
-The major changes for 5.x are CDF file parsing, indirect magic, and
-overhaul in mime and ascii encoding handling.
-
-The major feature of 4.x is the refactoring of the code into a library,
-and the re-write of the file command in terms of that library. The library
-itself, libmagic can be used by 3rd party programs that wish to identify
-file types without having to fork() and exec() file. The prime contributor
-for 4.0 was M\xe5ns Rullg\xe5rd.
-
-UNIX is a trademark of UNIX System Laboratories.
-
-The prime contributor to Release 3.8 was Guy Harris, who put in megachanges
-including byte-order independence.
-
-The prime contributor to Release 3.0 was Christos Zoulas, who put
-in hundreds of lines of source code changes, including his own
-ANSIfication of the code (I liked my own ANSIfication better, but
-his (__P()) is the "Berkeley standard" way of doing it, and I wanted UCB
-to include the code...), his HP-like "indirection" (a feature of
-the HP file command, I think), and his mods that finally got the
-uncompress (-z) mode finished and working.
-
-This release has compiled in numerous environments; see PORTING
-for a list and problems.
-
-This fine freeware file(1) follows the USG (System V) model of the file
-command, rather than the Research (V7) version or the V7-derived 4.[23]
-Berkeley one. That is, the file /etc/magic contains much of the ritual
-information that is the source of this program's power. My version
-knows a little more magic (including tar archives) than System V; the
-/etc/magic parsing seems to be compatible with the (poorly documented)
-System V /etc/magic format (with one exception; see the man page).
-
-In addition, the /etc/magic file is built from a subdirectory
-for easier(?) maintenance.  I will act as a clearinghouse for
-magic numbers assigned to all sorts of data files that
-are in reasonable circulation. Send your magic numbers,
-in magic(5) format please, to the maintainer, Christos Zoulas.
-
-COPYING - read this first.
-README - read this second (you are currently reading this file).
-INSTALL - read on how to install
-
-src/apprentice.c - parses /etc/magic to learn magic
-src/apptype.c - used for OS/2 specific application type magic
-src/asprintf.c - replacement for OS's that don't have it.
-src/ascmagic.c - third & last set of tests, based on hardwired assumptions.
-src/cdf.c - parser for Microsoft Compound Document Files
-src/cdf_time.c - time converter for CDF.
-src/compress.c - handles decompressing files to look inside.
-src/encoding.c - handles unicode encodings
-src/file.c - the main program
-src/file.h - header file
-src/fsmagic.c - first set of tests the program runs, based on filesystem info
-src/funcs.c - utilility functions
-src/getopt_long.c - used for OS/2 specific application type magic
-src/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).
-src/names.h - header file for ascmagic.c
-src/magic.c - the libmagic api
-src/print.c - print results, errors, warnings.
-src/readcdf.c - CDF wrapper.
-src/readelf.[ch] - Stand-alone elf parsing code.
-src/softmagic.c - 2nd set of tests, based on /etc/magic
-src/strlcat.c - used for OS/2 specific application type magic
-src/strlcpy.c - used for OS/2 specific application type magic
-src/vasprintf.c - used for OS/2 specific application type magic
-doc/file.1 - man page for the command
-doc/magic.4 - man page for the magic file, courtesy Guy Harris.
-	Install as magic.4 on USG and magic.5 on V7 or Berkeley; cf Makefile.
-Magdir - directory of /etc/magic pieces
-
-------------------------------------------------------------------------------
-
-If you submit a new magic entry please make sure you read the following
-guidelines:
-
-- Initial match is preferably at least 32 bits long, and is a _unique_ match
-- If this is not feasible, use additional check
-- Match of <= 16 bits are not accepted
-- Delay printing string as much as possible, don't print output too early
-- Avoid printf arbitrary byte as string, which can be a source of
-  crash and buffer overflow
-
-- Provide complete information with entry:
-  * One line short summary
-  * Optional long description
-  * File extension, if applicable
-  * Full name and contact method (for discussion when entry has problem)
-  * Further reference, such as documentation of format
-
-------------------------------------------------------------------------------
-
-Parts of this software were developed at SoftQuad Inc., developers
-of SGML/HTML/XML publishing software, in Toronto, Canada.
-SoftQuad was swallowed up by Corel in 2002 and does not exist any longer.

Copied: trunk/contrib/file/README (from rev 6687, vendor/file/5.19/README)
===================================================================
--- trunk/contrib/file/README	                        (rev 0)
+++ trunk/contrib/file/README	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1,126 @@
+## README for file(1) Command ##
+
+    @(#) $File: README,v 1.48 2014/03/07 13:55:30 christos Exp $
+
+Mailing List: file at mx.gw.com  
+Mailing List archives: http://mx.gw.com/pipermail/file/  
+Bug tracker: http://bugs.gw.com/  
+E-mail: christos at astron.com
+
+[![Build Status](https://travis-ci.org/file/file.png?branch=master)](https://travis-ci.org/file/file)
+
+Phone: Do not even think of telephoning me about this program. Send cash first!
+
+This is Release 5.x of Ian Darwin's (copyright but distributable)
+file(1) command, an implementation of the Unix File(1) command.
+It knows the 'magic number' of several thousands of file types.
+This version is the standard "file" command for Linux,
+*BSD, and other systems. (See "patchlevel.h" for the exact release number).
+
+You can download the latest version of the original sources for file from:
+
+	ftp://ftp.astron.com/pub/file/
+
+A public read-only git repository of the same sources is available at:
+
+	https://github.com/file/file
+
+The major changes for 5.x are CDF file parsing, indirect magic, and
+overhaul in mime and ascii encoding handling.
+
+The major feature of 4.x is the refactoring of the code into a library,
+and the re-write of the file command in terms of that library. The library
+itself, libmagic can be used by 3rd party programs that wish to identify
+file types without having to fork() and exec() file. The prime contributor
+for 4.0 was Mans Rullgard.
+
+UNIX is a trademark of UNIX System Laboratories.
+
+The prime contributor to Release 3.8 was Guy Harris, who put in megachanges
+including byte-order independence.
+
+The prime contributor to Release 3.0 was Christos Zoulas, who put
+in hundreds of lines of source code changes, including his own
+ANSIfication of the code (I liked my own ANSIfication better, but
+his (__P()) is the "Berkeley standard" way of doing it, and I wanted UCB
+to include the code...), his HP-like "indirection" (a feature of
+the HP file command, I think), and his mods that finally got the
+uncompress (-z) mode finished and working.
+
+This release has compiled in numerous environments; see PORTING
+for a list and problems.
+
+This fine freeware file(1) follows the USG (System V) model of the file
+command, rather than the Research (V7) version or the V7-derived 4.[23]
+Berkeley one. That is, the file /etc/magic contains much of the ritual
+information that is the source of this program's power. My version
+knows a little more magic (including tar archives) than System V; the
+/etc/magic parsing seems to be compatible with the (poorly documented)
+System V /etc/magic format (with one exception; see the man page).
+
+In addition, the /etc/magic file is built from a subdirectory
+for easier(?) maintenance.  I will act as a clearinghouse for
+magic numbers assigned to all sorts of data files that
+are in reasonable circulation. Send your magic numbers,
+in magic(5) format please, to the maintainer, Christos Zoulas.
+
+COPYING - read this first.  
+README - read this second (you are currently reading this file).  
+INSTALL - read on how to install
+
+src/apprentice.c - parses /etc/magic to learn magic  
+src/apptype.c - used for OS/2 specific application type magic  
+src/asprintf.c - replacement for OS's that don't have it.  
+src/ascmagic.c - third & last set of tests, based on hardwired assumptions.  
+src/asctime_r.c - for systems that don't have it.  
+src/asprintf.c - for systems that don't have it.  
+src/cdf.c - parser for Microsoft Compound Document Files  
+src/cdf_time.c - time converter for CDF.  
+src/compress.c - handles decompressing files to look inside.  
+src/ctime_r.c - for systems that don't have it.  
+src/encoding.c - handles unicode encodings  
+src/file.c - the main program  
+src/file.h - header file  
+src/fsmagic.c - first set of tests the program runs, based on filesystem info  
+src/funcs.c - utilility functions  
+src/getopt_long.c - for systems that don't have it.  
+src/getline.c - for systems that don't have it.  
+src/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).  
+src/names.h - header file for ascmagic.c  
+src/magic.c - the libmagic api  
+src/print.c - print results, errors, warnings.  
+src/readcdf.c - CDF wrapper.  
+src/readelf.[ch] - Stand-alone elf parsing code.  
+src/softmagic.c - 2nd set of tests, based on /etc/magic  
+src/strlcat.c - for systems that don't have it.  
+src/strlcpy.c - for systems that don't have it.  
+src/vasprintf.c - for systems that don't have it.  
+doc/file.man - man page for the command  
+doc/magic.man - man page for the magic file, courtesy Guy Harris.
+	Install as magic.4 on USG and magic.5 on V7 or Berkeley; cf Makefile.
+
+Magdir - directory of /etc/magic pieces
+------------------------------------------------------------------------------
+
+If you submit a new magic entry please make sure you read the following
+guidelines:
+
+- Initial match is preferably at least 32 bits long, and is a _unique_ match
+- If this is not feasible, use additional check
+- Match of <= 16 bits are not accepted
+- Delay printing string as much as possible, don't print output too early
+- Avoid printf arbitrary byte as string, which can be a source of
+  crash and buffer overflow
+
+- Provide complete information with entry:
+  * One line short summary
+  * Optional long description
+  * File extension, if applicable
+  * Full name and contact method (for discussion when entry has problem)
+  * Further reference, such as documentation of format
+
+------------------------------------------------------------------------------
+
+Parts of this software were developed at SoftQuad Inc., developers
+of SGML/HTML/XML publishing software, in Toronto, Canada.
+SoftQuad was swallowed up by Corel in 2002 and does not exist any longer.

Deleted: trunk/contrib/file/TODO
===================================================================
--- trunk/contrib/file/TODO	2014-06-30 11:58:02 UTC (rev 6696)
+++ trunk/contrib/file/TODO	2014-06-30 11:58:30 UTC (rev 6697)
@@ -1,22 +0,0 @@
-- Fix output so that tests for MIME and APPLE flags are not needed all
-  over the place, and actual output is only done in one place. This
-  needs a design. Suggestion: push possible outputs on to a list, then
-  pick the last-pushed (most specific, one hopes) value at the end, or
-  use a default if the list is empty. This should not slow down evaluation.
-
-- Continue to squash all magic bugs. See Debian BTS for a good source.
-
-- Store arbitrarily long strings, for example for %s patterns, so that
-  they can be printed out. Fixes Debian bug #271672. Would require more
-  complex store/load code in apprentice.
-
-- Add syntax for relative offsets after current level (Debian bug #466037).
-
-- Make file -ki work, i.e. give multiple MIME types.
-
-- Add a zip library so we can peek inside Office2007 documents to
-  figure out what they are.
-
-- Don't complain when ~/.magic is not compiled.
-
-- Add a separate option to print URL's for the sources of the file descriptions.

Copied: trunk/contrib/file/TODO (from rev 6687, vendor/file/5.19/TODO)
===================================================================
--- trunk/contrib/file/TODO	                        (rev 0)
+++ trunk/contrib/file/TODO	2014-06-30 11:58:30 UTC (rev 6697)
@@ -0,0 +1,17 @@
+Most TODOs live in the TODO section of doc/file.man (i.e. file(1)).
+They are more visible there, so please add any further TODOs to that
+file, not here. More speculative material can live here.
+
+(This change was made when Reuben Thomas noticed that all the bugs
+listed in the BUGS section of the man page had been fixed!)
+
+---
+
+It would be nice to simplify file considerably. For example,
+reimplement the apprentice and non-pattern magic methods in Python,
+and compile the magic patterns to a giant regex (or something similar;
+maybe using Ragel (http://www.complang.org/ragel/)) so that only a
+small amount of C is needed (because fast execution is typically only
+required for soft magic, not the more detailed information given by
+hard-wired routines). In this regard, note that hplip, which is
+BSD-licensed, has a magic reimplementation in Python.



More information about the Midnightbsd-cvs mailing list