svn commit: r186690 - in vendor/file/dist: . Magdir tests

David E. O'Brien obrien at FreeBSD.org
Fri Jan 2 02:57:18 UTC 2009


Author: obrien
Date: Fri Jan  2 02:57:16 2009
New Revision: 186690
URL: http://svn.freebsd.org/changeset/base/186690

Log:
  Virgin import of Christos Zoulas's FILE 4.26.

Added:
  vendor/file/dist/AUTHORS
  vendor/file/dist/COPYING
  vendor/file/dist/INSTALL
  vendor/file/dist/Magdir/clarion
  vendor/file/dist/Magdir/erlang
  vendor/file/dist/Magdir/gnome-keyring
  vendor/file/dist/Magdir/gnumeric
  vendor/file/dist/Magdir/graphviz
  vendor/file/dist/Magdir/inform
  vendor/file/dist/Magdir/kde
  vendor/file/dist/Magdir/llvm
  vendor/file/dist/Magdir/lua
  vendor/file/dist/Magdir/luks
  vendor/file/dist/Magdir/mathcad
  vendor/file/dist/Magdir/mercurial
  vendor/file/dist/Magdir/mozilla
  vendor/file/dist/Magdir/netware
  vendor/file/dist/Magdir/ole2compounddocs
  vendor/file/dist/Magdir/ruby
  vendor/file/dist/Magdir/securitycerts
  vendor/file/dist/Magdir/warc
  vendor/file/dist/Magdir/weak
  vendor/file/dist/Magdir/windows
  vendor/file/dist/Magdir/xilinx
  vendor/file/dist/NEWS
  vendor/file/dist/TODO
  vendor/file/dist/asprintf.c   (contents, props changed)
  vendor/file/dist/compile   (contents, props changed)
  vendor/file/dist/config.guess   (contents, props changed)
  vendor/file/dist/config.sub   (contents, props changed)
  vendor/file/dist/configure.ac
  vendor/file/dist/elfclass.h   (contents, props changed)
  vendor/file/dist/getopt_long.c   (contents, props changed)
  vendor/file/dist/mygetopt.h   (contents, props changed)
  vendor/file/dist/tests/
  vendor/file/dist/tests/Makefile.am   (contents, props changed)
  vendor/file/dist/tests/Makefile.in   (contents, props changed)
  vendor/file/dist/tests/README
  vendor/file/dist/tests/gedcom.magic
  vendor/file/dist/tests/gedcom.result
  vendor/file/dist/tests/gedcom.testfile
  vendor/file/dist/tests/test.c   (contents, props changed)
  vendor/file/dist/vasprintf.c   (contents, props changed)
Replaced:
  vendor/file/dist/FREEBSD-upgrade
Deleted:
  vendor/file/dist/LEGAL.NOTICE
  vendor/file/dist/Makefile.std
  vendor/file/dist/PORTING
  vendor/file/dist/configure.in
  vendor/file/dist/magic.mime
  vendor/file/dist/magic2mime
  vendor/file/dist/mkinstalldirs
  vendor/file/dist/test.c
Modified:
  vendor/file/dist/ChangeLog
  vendor/file/dist/MAINT
  vendor/file/dist/Magdir/adventure
  vendor/file/dist/Magdir/animation
  vendor/file/dist/Magdir/apple
  vendor/file/dist/Magdir/archive
  vendor/file/dist/Magdir/audio
  vendor/file/dist/Magdir/c-lang
  vendor/file/dist/Magdir/c64
  vendor/file/dist/Magdir/cafebabe
  vendor/file/dist/Magdir/cddb
  vendor/file/dist/Magdir/commands
  vendor/file/dist/Magdir/compress
  vendor/file/dist/Magdir/console
  vendor/file/dist/Magdir/cracklib
  vendor/file/dist/Magdir/ctags
  vendor/file/dist/Magdir/database
  vendor/file/dist/Magdir/diff
  vendor/file/dist/Magdir/dump
  vendor/file/dist/Magdir/elf
  vendor/file/dist/Magdir/filesystems
  vendor/file/dist/Magdir/flash
  vendor/file/dist/Magdir/fonts
  vendor/file/dist/Magdir/fortran
  vendor/file/dist/Magdir/frame
  vendor/file/dist/Magdir/freebsd
  vendor/file/dist/Magdir/fsav
  vendor/file/dist/Magdir/games
  vendor/file/dist/Magdir/gimp
  vendor/file/dist/Magdir/gnu
  vendor/file/dist/Magdir/hp
  vendor/file/dist/Magdir/iff
  vendor/file/dist/Magdir/images
  vendor/file/dist/Magdir/java
  vendor/file/dist/Magdir/jpeg
  vendor/file/dist/Magdir/lex
  vendor/file/dist/Magdir/linux
  vendor/file/dist/Magdir/lisp
  vendor/file/dist/Magdir/macintosh
  vendor/file/dist/Magdir/mail.news
  vendor/file/dist/Magdir/mathematica
  vendor/file/dist/Magdir/misctools
  vendor/file/dist/Magdir/msdos
  vendor/file/dist/Magdir/mup
  vendor/file/dist/Magdir/os2
  vendor/file/dist/Magdir/palm
  vendor/file/dist/Magdir/pdf
  vendor/file/dist/Magdir/perl
  vendor/file/dist/Magdir/pgp
  vendor/file/dist/Magdir/pkgadd
  vendor/file/dist/Magdir/printer
  vendor/file/dist/Magdir/psion
  vendor/file/dist/Magdir/revision
  vendor/file/dist/Magdir/riff
  vendor/file/dist/Magdir/rpm
  vendor/file/dist/Magdir/rtf
  vendor/file/dist/Magdir/sc
  vendor/file/dist/Magdir/scientific
  vendor/file/dist/Magdir/sgi
  vendor/file/dist/Magdir/sgml
  vendor/file/dist/Magdir/sharc
  vendor/file/dist/Magdir/sketch
  vendor/file/dist/Magdir/softquad
  vendor/file/dist/Magdir/spectrum
  vendor/file/dist/Magdir/tex
  vendor/file/dist/Magdir/troff
  vendor/file/dist/Magdir/unicode
  vendor/file/dist/Magdir/uuencode
  vendor/file/dist/Magdir/varied.script
  vendor/file/dist/Magdir/vorbis
  vendor/file/dist/Magdir/wordprocessors
  vendor/file/dist/Makefile.am
  vendor/file/dist/Makefile.in
  vendor/file/dist/README
  vendor/file/dist/acinclude.m4
  vendor/file/dist/aclocal.m4
  vendor/file/dist/apprentice.c
  vendor/file/dist/ascmagic.c
  vendor/file/dist/compress.c
  vendor/file/dist/config.h.in
  vendor/file/dist/configure
  vendor/file/dist/file.c
  vendor/file/dist/file.h
  vendor/file/dist/file.man
  vendor/file/dist/fsmagic.c
  vendor/file/dist/funcs.c
  vendor/file/dist/is_tar.c
  vendor/file/dist/libmagic.man
  vendor/file/dist/magic.c
  vendor/file/dist/magic.h
  vendor/file/dist/magic.man
  vendor/file/dist/names.h
  vendor/file/dist/patchlevel.h
  vendor/file/dist/print.c
  vendor/file/dist/readelf.c
  vendor/file/dist/readelf.h
  vendor/file/dist/softmagic.c
  vendor/file/dist/tar.h

Added: vendor/file/dist/AUTHORS
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/file/dist/AUTHORS	Fri Jan  2 02:57:16 2009	(r186690)
@@ -0,0 +1 @@
+See COPYING.
\ No newline at end of file

Added: vendor/file/dist/COPYING
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/file/dist/COPYING	Fri Jan  2 02:57:16 2009	(r186690)
@@ -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.

Modified: vendor/file/dist/ChangeLog
==============================================================================
--- vendor/file/dist/ChangeLog	Fri Jan  2 00:37:59 2009	(r186689)
+++ vendor/file/dist/ChangeLog	Fri Jan  2 02:57:16 2009	(r186690)
@@ -1,4 +1,135 @@
-2007-12-28 15:06 Christos Zoulas <christos at zoulas.com>
+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-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
 
@@ -6,7 +137,7 @@
 
 	* better mismatch version message
 
-2007-12-27 11:35 Christos Zoulas <christos at zoulas.com>
+2007-12-27 11:35 Christos Zoulas <christos at astron.com>
 
 	* bring back some fixes from OpenBSD
 
@@ -14,46 +145,46 @@
 
 	* fix gcc warnings
 
-2007-12-01 19:55 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2007-09-26  4:45 Christos Zoulas <christos at astron.com>
 
 	* Add magic_descriptor() function.
 
@@ -62,7 +193,7 @@
 
 	* Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson)
 
-2007-08-19  6:30 Christos Zoulas <christos at zoulas.com>
+2007-08-19  6:30 Christos Zoulas <christos at astron.com>
 
 	* Make mime format consistent so that it can
 	  be easily parsed:
@@ -79,38 +210,38 @@
 
 	  This work was done by Reuben Thomas
 
-2007-05-24 10:00 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2007-01-25 16:01 Christos Zoulas <christos at astron.com>
 
 	* Centralize all the tests in file_buffer.
 
@@ -184,7 +315,7 @@
 
 	* make file.c compile with gcc warnings and pass lint
 
-2006-12-11 16:49 Christos Zoulas <christos at zoulas.com>
+2006-12-11 16:49 Christos Zoulas <christos at astron.com>
 
 	* fix byteswapping issue
 
@@ -193,7 +324,7 @@
 
 	* add a few missed cases in the strength routine
 
-2006-12-08 16:32 Christos Zoulas <christos at zoulas.com>
+2006-12-08 16:32 Christos Zoulas <christos at astron.com>
 
 	* store and print the line number of the magic
 	  entry for debugging.         
@@ -210,7 +341,7 @@
 	* propagate the error return from match to
 	  file_softmagic.
 
-2006-11-25 13:35 Christos Zoulas <christos at zoulas.com>
+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
@@ -221,12 +352,12 @@
 	  print it as an additional separator; print
 	  it as the only separator.
 
-2006-11-17 10:51 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+2006-10-31 15:14 Christos Zoulas <christos at astron.com>
 
 	* Check offset before copying (Mike Frysinger)
 
@@ -242,7 +373,7 @@
 
 	* use calloc to initialize the ascii buffers (Jos van den Oever)
 
-2006-06-08 11:11 Christos Zoulas <christos at zoulas.com>
+2006-06-08 11:11 Christos Zoulas <christos at astron.com>
 
 	* QNX fixes (Mike Gorchak)
 
@@ -256,7 +387,7 @@
 
 	* Magic format function improvent (Karl Chen)
 
-2006-05-03 11:11 Christos Zoulas <christos at zoulas.com>
+2006-05-03 11:11 Christos Zoulas <christos at astron.com>
 
 	* Pick up some elf changes and some constant fixes from SUSE
 
@@ -264,13 +395,13 @@
 
 	* When keep going, don't print spurious newlines (Radek Vokál)
 
-2006-04-01 12:02 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+2006-03-02 16:06 Christos Zoulas <christos at astron.com>
 
 	* Print empty if the file is (Mike Frysinger)
 
@@ -278,21 +409,21 @@
 
 	* Sort magic entries by strength [experimental]
 
-2005-11-29 13:26 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+2005-10-31 8:54 Christos Zoulas <christos at astron.com>
 
 	* Fix regression where the core info was not completely processed
 	    (Radek Vokál)
 
-2005-10-20 11:15 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+2005-10-17 11:15 Christos Zoulas <christos at astron.com>
 
 	* Open with O_BINARY for CYGWIN (Corinna Vinschen)
 
@@ -300,39 +431,39 @@
 
 	* Look for note sections in non executables.
 
-2005-09-20 13:33 Christos Zoulas <christos at zoulas.com>
+2005-09-20 13:33 Christos Zoulas <christos at astron.com>
 	
 	* Don't print SVR4 Style in core files multiple times
 	    (Radek Vokál)
 
-2005-08-27 04:09 Christos Zoulas <christos at zoulas.com>
+2005-08-27 04:09 Christos Zoulas <christos at astron.com>
 
 	* Cygwin changes Corinna Vinschen
 
-2005-08-18 09:53 Christos Zoulas <christos at zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2005-06-25 11:48 Christos Zoulas <christos at astron.com>
 
 	* Dynamically allocate the string buffers and make the
 	  default read size 256K.
@@ -361,43 +492,43 @@
           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 zoulas.com>
+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 zoulas.com>
+	  have access to it. <christos at astron.com>
 
-2004-11-24 12:39  Christos Zoulas  <christos at zoulas.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 zoulas.com>
+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 zoulas.com>
+	* Hackish support for ucs16 strings <christos at astron.com>
 
-2004-11-13 03:07  Christos Zoulas  <christos at zoulas.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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2004-07-24 16:33  Christos Zoulas  <christos at astron.com>
 
 	* magic.mime update Danny Milosavljevic <danny.milo at gmx.net> 
 
@@ -407,19 +538,19 @@
 
   	* errors reading elf magic Jakub Bogusz <qboosh at pld-linux.org>
 
-2004-04-12 10:55  Christos Zoulas  <christos at zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2004-03-22 15:25  Christos Zoulas  <christos at astron.com>
 
 	* Lots of mime fixes
 	  (Joerg Ostertag) <ostertag at rechengilde.de>
@@ -428,7 +559,7 @@
 	  (Edwin Groothuis) <edwin at mavetju.org>
 
 	* correct cleanup in all cases; don't just close the file.
-	  (Christos Zoulas) <christos at zoulas.com>
+	  (Christos Zoulas) <christos at astron.com>
 
 	* add gettext message catalogue support
 	  (Michael Piefel) <piefel at debian.org>
@@ -446,37 +577,37 @@
 	  or name and description note sizes. Reported by
 	  (Mikael Magnusson) <mmikael at comhem.se>
 
-2004-03-09 13:55  Christos Zoulas  <christos at zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.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 zoulas.com>
+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 zoulas.com>
+2003-10-08 12:40  Christos Zoulas  <christos at astron.com>
 
 	* handle error conditions from compile as fatal
 	  (Antti Kantee) <pooka at netbsd.org>
@@ -486,32 +617,32 @@
 	* describe magic file handling
 	  (Bryan Henderson) <bryanh at giraffe-data.com>
 
-2003-09-12 15:09  Christos Zoulas  <christos at zoulas.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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2003-05-23 17:03  Christos Zoulas  <christos at astron.com>
 
 	* documentation fixes from Michael Piefel <piefel at debian.org>
 	* magic fixes (various)
@@ -521,30 +652,30 @@
 	  close files
 	  Maciej W. Rozycki <macro at ds2.pg.gda.pl
 
-2003-04-21 20:12  Christos Zoulas  <christos at zoulas.com>
+2003-04-21 20:12  Christos Zoulas  <christos at astron.com>
 
 	* fix zsh magic
 
-2003-04-04 16:59  Christos Zoulas  <christos at zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+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 zoulas.com>
+2003-03-27 13:10  Christos Zoulas  <christos at astron.com>
 
 	* separate tar detection and run it before softmagic.
 	* fix reversed symlink test.
@@ -552,7 +683,7 @@
 	* make separator a string instead of a char.
 	* update manual page and sort options.
 
-2003-03-26 11:00  Christos Zoulas  <christos at zoulas.com>
+2003-03-26 11:00  Christos Zoulas  <christos at astron.com>
 
 	* Pass lint
 	* make NULL in magic_file mean stdin

Added: vendor/file/dist/FREEBSD-upgrade
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/file/dist/FREEBSD-upgrade	Fri Jan  2 02:57:16 2009	(r186690)
@@ -0,0 +1,30 @@
+# ex:ts=8
+$FreeBSD: vendor/file/dist/contrib/file/FREEBSD-upgrade 169962 2007-05-24 21:59:38Z obrien $
+
+Christos Zoulas `file'
+	originals can be found at: ftp://ftp.astron.com/pub/file/
+
+Imported by:
+
+	mv magic/* .
+	rmdir magic
+	mv -i src/* .
+	rm -rf src
+	mv -i doc/* .
+	rm -rf doc
+	rm -rf python
+	rm -f lt*
+	rm -f missing depcomp
+	rm -f config.{guess,sub}
+
+	cvs import -m "Virgin import of Christos Zoulas's FILE 4.21." \
+		src/contrib/file ZOULAS file_4_21
+
+
+Never make local changes to ZOULAS `file'.  Christos is very willing to
+work with us to meet our FreeBSD needs.  Thus submit any desired changes
+to him <christos at zoulas.com> and wait for the next release and vendor
+import to get them.
+        
+obrien at NUXI.com
+15-Sept-2002

Added: vendor/file/dist/INSTALL
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/file/dist/INSTALL	Fri Jan  2 02:57:16 2009	(r186690)
@@ -0,0 +1,234 @@
+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.
+

Modified: vendor/file/dist/MAINT
==============================================================================
--- vendor/file/dist/MAINT	Fri Jan  2 00:37:59 2009	(r186689)
+++ vendor/file/dist/MAINT	Fri Jan  2 02:57:16 2009	(r186690)
@@ -1,4 +1,4 @@
-$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $
+$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $
 
 Maintenance notes:
 
@@ -41,5 +41,4 @@ ascmagic.c			file_ascmagic()
 readelf.c		file_tryelf()
 				"unknown"
 
-Christos Zoulas
-christos at astron.com
+Christos Zoulas (see README for email address)

Modified: vendor/file/dist/Magdir/adventure
==============================================================================
--- vendor/file/dist/Magdir/adventure	Fri Jan  2 00:37:59 2009	(r186689)
+++ vendor/file/dist/Magdir/adventure	Fri Jan  2 02:57:16 2009	(r186690)
@@ -73,3 +73,13 @@
 >10	belong	 0x0A0D1A00
 >>14	string	>\0		%s saved game data
 
+# Danny Milosavljevic <danny.milo at gmx.net>
+# this are adrift (adventure game standard) game files, extension .taf
+# depending on version magic continues with 0x93453E6139FA (V 4.0)
+# 0x9445376139FA (V 3.90)
+# 0x9445366139FA (V 3.80)
+# this is from source (http://www.adrift.org.uk/) and I have some taf
+# files, and checked them.
+#0	belong	0x3C423FC9
+#>4	belong	0x6A87C2CF	Adrift game file
+#!:mime	application/x-adrift

Modified: vendor/file/dist/Magdir/animation
==============================================================================
--- vendor/file/dist/Magdir/animation	Fri Jan  2 00:37:59 2009	(r186689)
+++ vendor/file/dist/Magdir/animation	Fri Jan  2 02:57:16 2009	(r186690)
@@ -8,57 +8,78 @@
 
 # SGI and Apple formats
 0	string		MOVI		Silicon Graphics movie file
+!:mime	video/x-sgi-movie
 4       string          moov            Apple QuickTime
+!:mime	video/quicktime
 >12     string          mvhd            \b movie (fast start)
 >12     string          mdra            \b URL
 >12     string          cmov            \b movie (fast start, compressed header)
 >12     string          rmra            \b multiple URLs
 4       string          mdat            Apple QuickTime movie (unoptimized)
-4       string          wide            Apple QuickTime movie (unoptimized)
-4       string          skip            Apple QuickTime movie (modified)
-4       string          free            Apple QuickTime movie (modified)
+!:mime	video/quicktime
+#4       string          wide            Apple QuickTime movie (unoptimized)
+#!:mime	video/quicktime
+#4       string          skip            Apple QuickTime movie (modified)
+#!:mime	video/quicktime
+#4       string          free            Apple QuickTime movie (modified)
+#!:mime	video/quicktime
 4       string          idsc            Apple QuickTime image (fast start)
-4       string          idat            Apple QuickTime image (unoptimized)
+!:mime	image/x-quicktime
+#4       string          idat            Apple QuickTime image (unoptimized)
+#!:mime	image/x-quicktime
 4       string          pckg            Apple QuickTime compressed archive
+!:mime	application/x-quicktime-player
 4	string/B	jP		JPEG 2000 image
+!:mime	image/jp2
 4	string		ftyp		ISO Media
 >8	string		isom		\b, MPEG v4 system, version 1
+!:mime	video/mp4
 >8	string		iso2		\b, MPEG v4 system, part 12 revision
 >8	string		mp41		\b, MPEG v4 system, version 1
+!:mime	video/mp4
 >8	string		mp42		\b, MPEG v4 system, version 2

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


More information about the svn-src-vendor mailing list