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 2018-10-18 19:32 Christos Zoulas <c...
details: https://anonhg.NetBSD.org/src/rev/e81949aac3f8
branches: trunk
changeset: 836461:e81949aac3f8
user: christos <christos%NetBSD.org@localhost>
date: Thu Oct 18 23:54:09 2018 +0000
description:
2018-10-18 19:32 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.35
2018-09-10 20:38 Christos Zoulas <christos%zoulas.com@localhost>
* Add FreeBSD ELF core file support (John Baldwin)
2018-08-20 18:40 Christos Zoulas <christos%zoulas.com@localhost>
* PR/30: Allow all parameter values to be set (don't treat 0 specially)
* handle default annotations on the softmagic match instead at the
end.
2018-07-25 10:17 Christos Zoulas <christos%zoulas.com@localhost>
* PR/23: Recognize JSON files
2018-07-25 10:17 Christos Zoulas <christos%zoulas.com@localhost>
* PR/18: file --mime-encoding should not print mime-type
2018-07-25 8:50 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.34
2018-06-22 16:38 Christos Zoulas <christos%zoulas.com@localhost>
* Add Quad indirect offsets
2018-05-24 14:10 Christos Zoulas <christos%zoulas.com@localhost>
* Enable parsing of ELF dynamic sections to handle PIE better
diffstat:
external/bsd/file/dist/AUTHORS | 2 +-
external/bsd/file/dist/COPYING | 4 +-
external/bsd/file/dist/NEWS | 2 +-
external/bsd/file/dist/README | 87 +-
external/bsd/file/dist/ltmain.sh | 24 +-
external/bsd/file/dist/magic/Header | 2 +-
external/bsd/file/dist/magic/magdir/amigaos | 21 +-
external/bsd/file/dist/magic/magdir/animation | 10 +-
external/bsd/file/dist/magic/magdir/audio | 48 +-
external/bsd/file/dist/magic/magdir/biosig | 154 ++++
external/bsd/file/dist/magic/magdir/cad | 33 +-
external/bsd/file/dist/magic/magdir/cafebabe | 12 +-
external/bsd/file/dist/magic/magdir/coff | 6 +-
external/bsd/file/dist/magic/magdir/compress | 4 +-
external/bsd/file/dist/magic/magdir/console | 86 +-
external/bsd/file/dist/magic/magdir/database | 14 +-
external/bsd/file/dist/magic/magdir/dataone | 47 +
external/bsd/file/dist/magic/magdir/dbpf | 8 +-
external/bsd/file/dist/magic/magdir/dump | 14 +-
external/bsd/file/dist/magic/magdir/fsav | 8 +-
external/bsd/file/dist/magic/magdir/glibc | 21 +
external/bsd/file/dist/magic/magdir/hardware | 12 +
external/bsd/file/dist/magic/magdir/hitachi-sh | 4 +-
external/bsd/file/dist/magic/magdir/images | 338 ++++++++-
external/bsd/file/dist/magic/magdir/intel | 6 +-
external/bsd/file/dist/magic/magdir/java | 8 +-
external/bsd/file/dist/magic/magdir/kicad | 69 +
external/bsd/file/dist/magic/magdir/linux | 12 +-
external/bsd/file/dist/magic/magdir/make | 13 +-
external/bsd/file/dist/magic/magdir/measure | 28 +-
external/bsd/file/dist/magic/magdir/msdos | 358 ++++++++-
external/bsd/file/dist/magic/magdir/msooxml | 10 +-
external/bsd/file/dist/magic/magdir/msvc | 4 +-
external/bsd/file/dist/magic/magdir/pdf | 6 +-
external/bsd/file/dist/magic/magdir/sgi | 6 +-
external/bsd/file/dist/magic/magdir/sniffer | 35 +-
external/bsd/file/dist/magic/magdir/wsdl | 4 +-
external/bsd/file/dist/python/CHANGELOG.md | 16 +
external/bsd/file/dist/python/LICENSE | 25 +
external/bsd/file/dist/python/Makefile.am | 3 +-
external/bsd/file/dist/python/README.md | 31 +
external/bsd/file/dist/python/magic.py | 5 +-
external/bsd/file/dist/python/setup.py | 7 +-
external/bsd/file/dist/python/tests.py | 32 +
external/bsd/file/dist/src/Makefile.am | 4 +-
external/bsd/file/dist/src/apptype.c | 16 +-
external/bsd/file/dist/src/ascmagic.c | 12 +-
external/bsd/file/dist/src/asprintf.c | 10 +-
external/bsd/file/dist/src/cdf.h | 4 +-
external/bsd/file/dist/src/dprintf.c | 10 +-
external/bsd/file/dist/src/elfclass.h | 6 +-
external/bsd/file/dist/src/fmtcheck.c | 4 +-
external/bsd/file/dist/src/getopt_long.c | 16 +-
external/bsd/file/dist/src/is_json.c | 461 ++++++++++++
external/bsd/file/dist/src/is_tar.c | 12 +-
external/bsd/file/dist/src/magic.h.in | 4 +-
external/bsd/file/dist/src/mygetopt.h | 4 +-
external/bsd/file/dist/src/readelf.h | 122 +++-
external/bsd/file/dist/src/seccomp.c | 33 +-
external/bsd/file/dist/src/vasprintf.c | 16 +-
external/bsd/file/dist/tests/CVE-2014-1943.result | 1 +
external/bsd/file/dist/tests/CVE-2014-1943.testfile | Bin
external/bsd/file/dist/tests/JW07022A.mp3.result | 1 +
external/bsd/file/dist/tests/JW07022A.mp3.testfile | Bin
external/bsd/file/dist/tests/Makefile.am | 80 +-
external/bsd/file/dist/tests/fit-map-data.result | 1 +
external/bsd/file/dist/tests/fit-map-data.testfile | Bin
external/bsd/file/dist/tests/issue359xlsx.result | 1 +
external/bsd/file/dist/tests/issue359xlsx.testfile | Bin
external/bsd/file/dist/tests/json1.result | 1 +
external/bsd/file/dist/tests/json1.testfile | 14 +
external/bsd/file/dist/tests/json2.result | 1 +
external/bsd/file/dist/tests/json2.testfile | 22 +
external/bsd/file/dist/tests/json3.result | 1 +
external/bsd/file/dist/tests/json3.testfile | 13 +
external/bsd/file/dist/tests/regex-eol.magic | 6 +
external/bsd/file/dist/tests/regex-eol.result | 1 +
external/bsd/file/dist/tests/regex-eol.testfile | 24 +
external/bsd/file/dist/tests/zstd-3-skippable-frames.result | 1 +
external/bsd/file/dist/tests/zstd-dictionary-0.result | 1 +
external/bsd/file/dist/tests/zstd-dictionary-1.result | 1 +
external/bsd/file/dist/tests/zstd-dictionary-2.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-0.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-4.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-8.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-C.result | 1 +
external/bsd/file/dist/tests/zstd-v0.2-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.2-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.3-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.3-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.4-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.4-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.5-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.5-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.6-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.6-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.7-00.result | 1 +
external/bsd/file/dist/tests/zstd-v0.7-21.result | 1 +
external/bsd/file/dist/tests/zstd-v0.7-21.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.7-22.result | 1 +
external/bsd/file/dist/tests/zstd-v0.7-22.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-00.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-01.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-01.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-02.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-02.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-03.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-03.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-16.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-16.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-20.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-20.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-21.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-21.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-22.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-22.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-23.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-23.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-F4.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-F4.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-FF.testfile | 1 +
122 files changed, 2314 insertions(+), 270 deletions(-)
diffs (truncated from 4596 to 300 lines):
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/AUTHORS
--- a/external/bsd/file/dist/AUTHORS Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/AUTHORS Thu Oct 18 23:54:09 2018 +0000
@@ -1,1 +1,1 @@
-See COPYING.
\ No newline at end of file
+See COPYING.
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/COPYING
--- a/external/bsd/file/dist/COPYING Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/COPYING Thu Oct 18 23:54:09 2018 +0000
@@ -1,4 +1,4 @@
-$File: COPYING,v 1.1 2008/02/05 19:08:11 christos Exp $
+$File: COPYING,v 1.2 2018/09/09 20:33:28 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.
@@ -15,7 +15,7 @@
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
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/NEWS
--- a/external/bsd/file/dist/NEWS Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/NEWS Thu Oct 18 23:54:09 2018 +0000
@@ -1,1 +1,1 @@
-See ChangeLog.
\ No newline at end of file
+See ChangeLog.
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/README
--- a/external/bsd/file/dist/README Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/README Thu Oct 18 23:54:09 2018 +0000
@@ -1,10 +1,10 @@
## README for file(1) Command ##
- @(#) $File: README,v 1.53 2018/03/11 13:06:47 glen Exp $
+ @(#) $File: README,v 1.56 2018/09/09 20:33:28 christos Exp $
-Mailing List: file%mx.gw.com@localhost [currently down]
-Mailing List archives: http://mx.gw.com/pipermail/file/ [currently down]
-Bug tracker: http://bugs.gw.com/ [currently down]
+Mailing List: file%astron.com@localhost
+Mailing List archives: http://mailman.astron.com/pipermail/file/
+Bug tracker: http://bugs.astron.com/
E-mail: christos%astron.com@localhost
Build Status: https://travis-ci.org/file/file
@@ -63,53 +63,54 @@
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/ascmagic.c - third & last set of tests, based on hardwired assumptions.
-src/asctime_r.c - replacement for OS's that don't have it.
-src/asprintf.c - replacement for OS's that don't have it.
-src/asctime_r.c - replacement for OS's that don't have it.
-src/asprintf.c - replacement for OS's that don't have it.
+src/apprentice.c - parses /etc/magic to learn magic
+src/apptype.c - used for OS/2 specific application type magic
+src/ascmagic.c - third & last set of tests, based on hardwired assumptions.
+src/asctime_r.c - replacement for OS's that don't have it.
+src/asprintf.c - replacement for OS's that don't have it.
+src/asctime_r.c - replacement for OS's that don't have it.
+src/asprintf.c - replacement for OS's that don't have it.
src/buffer.c - buffer handling functions.
-src/cdf.[ch] - 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 - replacement for OS's that don't have it.
+src/cdf.[ch] - 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 - replacement for OS's that don't have it.
src/der.[ch] - parser for Distinguished Encoding Rules
src/dprintf.c - replacement for OS's that don't have it.
src/elfclass.h - common code for elf 32/64.
-src/encoding.c - handles unicode encodings
-src/file.c - the main program
-src/file.h - header file
+src/encoding.c - handles unicode encodings
+src/file.c - the main program
+src/file.h - header file
src/file_opts.h - list of options
-src/fmtcheck.c - replacement for OS's that don't have it.
-src/fsmagic.c - first set of tests the program runs, based on filesystem info
-src/funcs.c - utilility functions
-src/getline.c - replacement for OS's that don't have it.
-src/getopt_long.c - replacement for OS's that don't have it.
-src/gmtime_r.c - replacement for OS's that don't have it.
-src/is_tar.c, tar.h - knows about Tape ARchive format (courtesy John Gilmore).
-src/localtime_r.c - replacement for OS's that don't have it.
+src/fmtcheck.c - replacement for OS's that don't have it.
+src/fsmagic.c - first set of tests the program runs, based on filesystem info
+src/funcs.c - utilility functions
+src/getline.c - replacement for OS's that don't have it.
+src/getopt_long.c - replacement for OS's that don't have it.
+src/gmtime_r.c - replacement for OS's that don't have it.
+src/is_json.c - knows about JavaScript Object Notation format (RFC 8259).
+src/is_tar.c, tar.h - knows about Tape ARchive format (courtesy John Gilmore).
+src/localtime_r.c - replacement for OS's that don't have it.
src/magic.h.in - source file for magic.h
-src/mygetopt.h - replacement for OS's that don't have it.
-src/magic.c - the libmagic api
-src/names.h - header file for ascmagic.c
-src/pread.c - replacement for OS's that don't have it.
-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/mygetopt.h - replacement for OS's that don't have it.
-src/strcasestr.c - replacement for OS's that don't have it.
-src/strlcat.c - replacement for OS's that don't have it.
-src/strlcpy.c - replacement for OS's that don't have it.
-src/strndup.c - replacement for OS's that don't have it.
+src/mygetopt.h - replacement for OS's that don't have it.
+src/magic.c - the libmagic api
+src/names.h - header file for ascmagic.c
+src/pread.c - replacement for OS's that don't have it.
+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/mygetopt.h - replacement for OS's that don't have it.
+src/strcasestr.c - replacement for OS's that don't have it.
+src/strlcat.c - replacement for OS's that don't have it.
+src/strlcpy.c - replacement for OS's that don't have it.
+src/strndup.c - replacement for OS's that don't have it.
src/tar.h - tar file definitions
-src/vasprintf.c - for systems that don't have it.
-doc/file.man - man page for the command
+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.
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/ltmain.sh
--- a/external/bsd/file/dist/ltmain.sh Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/ltmain.sh Thu Oct 18 23:54:09 2018 +0000
@@ -133,8 +133,9 @@
# function.
progpath="$0"
-
-
+unset CP
+unset MV
+unset RM
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${MAKE="make"}
@@ -6899,7 +6900,11 @@
# Finalize command for both is simple: just hardcode it.
if test "$hardcode_direct" = yes &&
test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
+ if test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+ fi
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
add="-l$name"
@@ -7391,6 +7396,7 @@
# Calculate the version variables.
major=
versuffix=
+ versuffix2=
verstring=
case $version_type in
none) ;;
@@ -7451,6 +7457,7 @@
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
+ versuffix2="$major.$age"
;;
osf)
@@ -7511,8 +7518,10 @@
esac
if test "$need_version" = no; then
versuffix=
+ versuffix2=
else
versuffix=".0.0"
+ versuffix2=".0.0"
fi
fi
@@ -7520,6 +7529,7 @@
if test "$avoid_version" = yes && test "$need_version" = no; then
major=
versuffix=
+ versuffix2=
verstring=""
fi
@@ -7630,7 +7640,7 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-mirbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -7653,12 +7663,14 @@
libname_save=$libname
release_save=$release
versuffix_save=$versuffix
+ versuffix2_save=$versuffix2
major_save=$major
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
release=""
versuffix=""
+ versuffix2=""
major=""
newdeplibs=
droppeddeps=no
@@ -7935,6 +7947,7 @@
;;
esac
versuffix=$versuffix_save
+ versuffix2=$versuffix2_save
major=$major_save
release=$release_save
libname=$libname_save
@@ -9419,7 +9432,8 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test "$installed" = no && test "$need_relink" = yes && \
+ test -n "$relink_command"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/magic/Header
--- a/external/bsd/file/dist/magic/Header Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/magic/Header Thu Oct 18 23:54:09 2018 +0000
@@ -2,4 +2,4 @@
# Format is described in magic(files), where:
# files is 5 on V7 and BSD, 4 on SV, and ?? on SVID.
# Don't edit this file, edit /etc/magic or send your magic improvements
-# to the maintainers, at file%mx.gw.com@localhost
+# to the maintainers, at file%astron.com@localhost
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/magic/magdir/amigaos
--- a/external/bsd/file/dist/magic/magdir/amigaos Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/magic/magdir/amigaos Thu Oct 18 23:54:09 2018 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: amigaos,v 1.16 2017/03/17 21:35:28 christos Exp $
+# $File: amigaos,v 1.17 2018/10/16 18:57:19 christos Exp $
# amigaos: file(1) magic for AmigaOS binary formats:
#
@@ -66,3 +66,22 @@
# From: Przemek Kramarczyk <pkramarczyk%gmail.com@localhost>
0 string .KEY AmigaDOS script
0 string .key AmigaDOS script
+
+# AMOS Basic file formats
+# https://www.exotica.org.uk/wiki/AMOS_file_formats
+0 string AMOS\040Basic\040 AMOS Basic source code
+>11 byte =0x56 \b, tested
+>11 byte =0x76 \b, untested
+0 string AMOS\040Pro AMOS Basic source code
+>11 byte =0x56 \b, tested
+>11 byte =0x76 \b, untested
+0 string AmSp AMOS Basic sprite bank
+>4 beshort x \b, %d sprites
+0 string AmIc AMOS Basic icon bank
+>4 beshort x \b, %d icons
+0 string AmBk AMOS Basic memory bank
+>4 beshort x \b, bank number %d
+>8 belong&0xFFFFFFF x \b, length %d
+>12 regex .{8} \b, type %s
+0 string AmBs AMOS Basic memory banks
+>4 beshort x \b, %d banks
diff -r 98c85cdbff0e -r e81949aac3f8 external/bsd/file/dist/magic/magdir/animation
--- a/external/bsd/file/dist/magic/magdir/animation Thu Oct 18 19:02:46 2018 +0000
+++ b/external/bsd/file/dist/magic/magdir/animation Thu Oct 18 23:54:09 2018 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: animation,v 1.66 2017/10/06 15:36:38 christos Exp $
+# $File: animation,v 1.69 2018/08/21 12:48:06 christos Exp $
Home |
Main Index |
Thread Index |
Old Index