Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/file/dist import file-5.19



details:   https://anonhg.NetBSD.org/src/rev/162fe0eb7d7c
branches:  trunk
changeset: 329894:162fe0eb7d7c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jun 13 01:48:18 2014 +0000

description:
import file-5.19

2014-06-09   9:04  Christos Zoulas <christos%zoulas.com@localhost>

        * Misc buffer overruns and missing buffer size tests in cdf parsing
          (Francisco Alonso, Jan Kaluza)

2014-06-02  14:50  Christos Zoulas <christos%zoulas.com@localhost>

        * 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%zoulas.com@localhost>

        * Make the range operator limit the length of the
          regex search.

2014-05-14  19:23  Christos Zoulas <christos%zoulas.com@localhost>

        * 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%zoulas.com@localhost>

        * Fix uninitialized title in CDF files (Jan Kaluza)

2014-05-04  14:55  Christos Zoulas <christos%zoulas.com@localhost>

        * PR/351: Fix compilation of empty files

2014-04-30  17:39  Christos Zoulas <christos%zoulas.com@localhost>

        * 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%zoulas.com@localhost>

        * PR/341: Jan Kaluza, fix memory leak
        * PR/342: Jan Kaluza, fix out of bounds read

2014-03-28  15:25  Christos Zoulas <christos%zoulas.com@localhost>

        * Fix issue with long formats not matching fmtcheck

diffstat:

 external/bsd/file/dist/ChangeLog                   |   119 +-
 external/bsd/file/dist/README                      |    76 +-
 external/bsd/file/dist/ltmain.sh                   |  4072 +++++++++++++------
 external/bsd/file/dist/m4/libtool.m4               |  2277 +++++++----
 external/bsd/file/dist/m4/ltoptions.m4             |    32 +-
 external/bsd/file/dist/m4/ltversion.m4             |    12 +-
 external/bsd/file/dist/m4/lt~obsolete.m4           |    12 +-
 external/bsd/file/dist/magic/magdir/android        |    14 +-
 external/bsd/file/dist/magic/magdir/animation      |    52 +-
 external/bsd/file/dist/magic/magdir/att3b          |    10 +-
 external/bsd/file/dist/magic/magdir/audio          |    16 +-
 external/bsd/file/dist/magic/magdir/bflt           |     4 +-
 external/bsd/file/dist/magic/magdir/blackberry     |     8 +
 external/bsd/file/dist/magic/magdir/bsdi           |     8 +-
 external/bsd/file/dist/magic/magdir/c-lang         |     4 +-
 external/bsd/file/dist/magic/magdir/cad            |     7 +-
 external/bsd/file/dist/magic/magdir/cafebabe       |     6 +-
 external/bsd/file/dist/magic/magdir/clarion        |     4 +-
 external/bsd/file/dist/magic/magdir/claris         |     4 +-
 external/bsd/file/dist/magic/magdir/clipper        |     6 +-
 external/bsd/file/dist/magic/magdir/commands       |    19 +-
 external/bsd/file/dist/magic/magdir/compress       |    27 +-
 external/bsd/file/dist/magic/magdir/cups           |     8 +-
 external/bsd/file/dist/magic/magdir/database       |    69 +-
 external/bsd/file/dist/magic/magdir/dolby          |   102 +-
 external/bsd/file/dist/magic/magdir/dump           |    10 +-
 external/bsd/file/dist/magic/magdir/dyadic         |    90 +-
 external/bsd/file/dist/magic/magdir/efi            |     4 +-
 external/bsd/file/dist/magic/magdir/encore         |     6 +-
 external/bsd/file/dist/magic/magdir/epoc           |     6 +-
 external/bsd/file/dist/magic/magdir/flash          |    29 +-
 external/bsd/file/dist/magic/magdir/fonts          |     6 +-
 external/bsd/file/dist/magic/magdir/fortran        |     4 +-
 external/bsd/file/dist/magic/magdir/games          |    20 +-
 external/bsd/file/dist/magic/magdir/gimp           |    20 +-
 external/bsd/file/dist/magic/magdir/gnome          |     6 +-
 external/bsd/file/dist/magic/magdir/gnu            |    13 +-
 external/bsd/file/dist/magic/magdir/gpt            |     3 +-
 external/bsd/file/dist/magic/magdir/graphviz       |     6 +-
 external/bsd/file/dist/magic/magdir/hp             |    30 +-
 external/bsd/file/dist/magic/magdir/ibm370         |    10 +-
 external/bsd/file/dist/magic/magdir/images         |    77 +-
 external/bsd/file/dist/magic/magdir/intel          |    12 +-
 external/bsd/file/dist/magic/magdir/isz            |     2 +-
 external/bsd/file/dist/magic/magdir/karma          |     4 +-
 external/bsd/file/dist/magic/magdir/linux          |    25 +-
 external/bsd/file/dist/magic/magdir/mach           |   106 +-
 external/bsd/file/dist/magic/magdir/map            |    25 +
 external/bsd/file/dist/magic/magdir/marc21         |    12 +-
 external/bsd/file/dist/magic/magdir/mips           |    46 +-
 external/bsd/file/dist/magic/magdir/misctools      |     7 +-
 external/bsd/file/dist/magic/magdir/motorola       |    30 +-
 external/bsd/file/dist/magic/magdir/msdos          |   174 +-
 external/bsd/file/dist/magic/magdir/msooxml        |    21 +-
 external/bsd/file/dist/magic/magdir/msx            |     2 +-
 external/bsd/file/dist/magic/magdir/natinst        |     4 +-
 external/bsd/file/dist/magic/magdir/ncr            |    16 +-
 external/bsd/file/dist/magic/magdir/neko           |    12 +
 external/bsd/file/dist/magic/magdir/netbsd         |    14 +-
 external/bsd/file/dist/magic/magdir/nitpicker      |     2 +-
 external/bsd/file/dist/magic/magdir/oasis          |     4 +-
 external/bsd/file/dist/magic/magdir/palm           |    82 +-
 external/bsd/file/dist/magic/magdir/pbf            |    11 +
 external/bsd/file/dist/magic/magdir/pdp            |     8 +-
 external/bsd/file/dist/magic/magdir/perl           |    42 +-
 external/bsd/file/dist/magic/magdir/pgf            |    52 +
 external/bsd/file/dist/magic/magdir/printer        |    22 +-
 external/bsd/file/dist/magic/magdir/python         |    18 +-
 external/bsd/file/dist/magic/magdir/riff           |    66 +-
 external/bsd/file/dist/magic/magdir/scientific     |    14 +-
 external/bsd/file/dist/magic/magdir/sequent        |    28 +-
 external/bsd/file/dist/magic/magdir/sereal         |    24 +
 external/bsd/file/dist/magic/magdir/sgi            |    20 +-
 external/bsd/file/dist/magic/magdir/sgml           |     9 +-
 external/bsd/file/dist/magic/magdir/sharc          |     4 +-
 external/bsd/file/dist/magic/magdir/sql            |     4 +-
 external/bsd/file/dist/magic/magdir/sun            |    38 +-
 external/bsd/file/dist/magic/magdir/symbos         |     2 +-
 external/bsd/file/dist/magic/magdir/sysex          |     4 +-
 external/bsd/file/dist/magic/magdir/tcl            |     2 +-
 external/bsd/file/dist/magic/magdir/tex            |    33 +-
 external/bsd/file/dist/magic/magdir/ti-8x          |     4 +-
 external/bsd/file/dist/magic/magdir/troff          |     6 +-
 external/bsd/file/dist/magic/magdir/uterus         |     2 +-
 external/bsd/file/dist/magic/magdir/varied.out     |     4 +-
 external/bsd/file/dist/magic/magdir/varied.script  |    30 +-
 external/bsd/file/dist/magic/magdir/vax            |     6 +-
 external/bsd/file/dist/magic/magdir/virtual        |   108 +-
 external/bsd/file/dist/magic/magdir/vorbis         |    12 +-
 external/bsd/file/dist/magic/magdir/windows        |     4 +-
 external/bsd/file/dist/magic/magdir/xilinx         |     4 +-
 external/bsd/file/dist/magic/magdir/xwindows       |    14 +-
 external/bsd/file/dist/magic/magdir/zfs            |     8 +-
 external/bsd/file/dist/python/magic.py             |    37 +-
 external/bsd/file/dist/src/apptype.c               |     5 +-
 external/bsd/file/dist/src/ascmagic.c              |     9 +-
 external/bsd/file/dist/src/asctime_r.c             |     5 +-
 external/bsd/file/dist/src/asprintf.c              |     5 +-
 external/bsd/file/dist/src/cdf.h                   |     9 +-
 external/bsd/file/dist/src/ctime_r.c               |     5 +-
 external/bsd/file/dist/src/elfclass.h              |     3 +-
 external/bsd/file/dist/src/encoding.c              |     5 +-
 external/bsd/file/dist/src/file_opts.h             |     3 +-
 external/bsd/file/dist/src/fmtcheck.c              |   235 +
 external/bsd/file/dist/src/getline.c               |     3 +-
 external/bsd/file/dist/src/getopt_long.c           |     5 +-
 external/bsd/file/dist/src/is_tar.c                |     5 +-
 external/bsd/file/dist/src/mygetopt.h              |     3 +-
 external/bsd/file/dist/src/pread.c                 |     5 +-
 external/bsd/file/dist/src/readelf.h               |     3 +-
 external/bsd/file/dist/src/strcasestr.c            |    85 +
 external/bsd/file/dist/src/strlcat.c               |     3 +-
 external/bsd/file/dist/src/strlcpy.c               |     3 +-
 external/bsd/file/dist/src/tar.h                   |     3 +-
 external/bsd/file/dist/src/vasprintf.c             |    18 +-
 external/bsd/file/dist/tests/Makefile.am           |     9 +-
 external/bsd/file/dist/tests/README                |    11 +-
 external/bsd/file/dist/tests/escapevel.result      |     1 +
 external/bsd/file/dist/tests/escapevel.testfile    |   Bin 
 external/bsd/file/dist/tests/gedcom.result         |     2 +-
 external/bsd/file/dist/tests/issue311docx.result   |     1 +
 external/bsd/file/dist/tests/issue311docx.testfile |   Bin 
 external/bsd/file/dist/tests/test.c                |     3 +-
 123 files changed, 5951 insertions(+), 3044 deletions(-)

diffs (truncated from 16075 to 300 lines):

diff -r 01058386b9da -r 162fe0eb7d7c external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog  Fri Jun 13 01:17:45 2014 +0000
+++ b/external/bsd/file/dist/ChangeLog  Fri Jun 13 01:48:18 2014 +0000
@@ -1,3 +1,116 @@
+2014-06-12  12:28  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.19
+
+2014-06-09   9:04  Christos Zoulas <christos%zoulas.com@localhost>
+       
+       * Misc buffer overruns and missing buffer size tests in cdf parsing
+         (Francisco Alonso, Jan Kaluza)
+
+2014-06-02  14:50  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
+
+       * Make the range operator limit the length of the
+         regex search.
+
+2014-05-14  19:23  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
+
+       * Fix uninitialized title in CDF files (Jan Kaluza)
+
+2014-05-04  14:55  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/351: Fix compilation of empty files 
+
+2014-04-30  17:39  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
+
+       * PR/341: Jan Kaluza, fix memory leak
+       * PR/342: Jan Kaluza, fix out of bounds read
+
+2014-03-28  15:25  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix issue with long formats not matching fmtcheck
+
+2014-03-26  11:25  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.18
+
+2014-03-15  17:45  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * add fmtcheck(3) for those who don't have it
+
+2014-03-14  15:12  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
+
+       * experimental support for matching with CFD CLSID
+
+2014-02-18  13:04  Kimmo Suominen (kimmo%suominen.com@localhost)
+
+       * 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%zoulas.com@localhost>
+
+       * Count recursion levels through indirect magic
+
+2014-02-11  10:40  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Prevent infinite recursion on files with indirect offsets of 0
+
+2014-01-30  21:00  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add -E flag that makes file print filesystem errors to stderr
+         and exit.
+
+2014-01-08  17:20  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
+
+       * 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%zoulas.com@localhost>
 
        * always leave magic file loaded, don't unload for magic_check, etc.
@@ -980,7 +1093,7 @@
 
        * Identify gnu tar vs. posix tar
 
-       * When keep going, don't print spurious newlines (Radek Vokál)
+       * When keep going, don't print spurious newlines (Radek Vokal)
 
 2006-04-01 12:02 Christos Zoulas <christos%astron.com@localhost>
 
@@ -1004,7 +1117,7 @@
 2005-10-31 8:54 Christos Zoulas <christos%astron.com@localhost>
 
        * Fix regression where the core info was not completely processed
-           (Radek Vokál)
+           (Radek Vokal)
 
 2005-10-20 11:15 Christos Zoulas <christos%astron.com@localhost>
 
@@ -1021,7 +1134,7 @@
 2005-09-20 13:33 Christos Zoulas <christos%astron.com@localhost>
 
        * Don't print SVR4 Style in core files multiple times
-           (Radek Vokál)
+           (Radek Vokal)
 
 2005-08-27 04:09 Christos Zoulas <christos%astron.com@localhost>
 
diff -r 01058386b9da -r 162fe0eb7d7c external/bsd/file/dist/README
--- a/external/bsd/file/dist/README     Fri Jun 13 01:17:45 2014 +0000
+++ b/external/bsd/file/dist/README     Fri Jun 13 01:48:18 2014 +0000
@@ -1,11 +1,14 @@
-** README for file(1) Command **
-@(#) $File: README,v 1.47 2013/06/04 23:15:02 ian Exp $
+## README for file(1) Command ##
+
+    @(#) $File: README,v 1.48 2014/03/07 13:55:30 christos Exp $
 
-Mailing List: file%mx.gw.com@localhost
-Mailing List archives: http://mx.gw.com/pipermail/file/
-Bug tracker: http://bugs.gw.com/
+Mailing List: file%mx.gw.com@localhost  
+Mailing List archives: http://mx.gw.com/pipermail/file/  
+Bug tracker: http://bugs.gw.com/  
 E-mail: christos%astron.com@localhost
 
+[![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)
@@ -20,7 +23,7 @@
 
 A public read-only git repository of the same sources is available at:
 
-       https://github.com/glensc/file
+       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.
@@ -61,40 +64,41 @@
 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).
+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
+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
 ------------------------------------------------------------------------------
 
diff -r 01058386b9da -r 162fe0eb7d7c external/bsd/file/dist/ltmain.sh
--- a/external/bsd/file/dist/ltmain.sh  Fri Jun 13 01:17:45 2014 +0000
+++ b/external/bsd/file/dist/ltmain.sh  Fri Jun 13 01:48:18 2014 +0000
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
-
-# ltmain.sh (GNU libtool) 2.2.6b
+
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord%gnu.ai.mit.edu@localhost>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -32,50 +32,57 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:



Home | Main Index | Thread Index | Old Index