Author: delphij
Date: Wed Jun 17 01:11:26 2020
New Revision: 362254
URL: https://svnweb.freebsd.org/changeset/base/362254
Log:
Vendor import of file 5.39.
Added:
vendor/file/dist/libmagic.pc.in (contents, props changed)
vendor/file/dist/magic/Magdir/asf
vendor/file/dist/magic/Magdir/dif
vendor/file/dist/magic/Magdir/sylk
vendor/file/dist/magic/Magdir/unisig
vendor/file/dist/magic/Magdir/usd
vendor/file/dist/magic/Magdir/web
Modified:
vendor/file/dist/ChangeLog
vendor/file/dist/Makefile.am
vendor/file/dist/Makefile.in
vendor/file/dist/configure
vendor/file/dist/configure.ac
vendor/file/dist/doc/file.man
vendor/file/dist/doc/magic.man
vendor/file/dist/magic/Magdir/animation
vendor/file/dist/magic/Magdir/archive
vendor/file/dist/magic/Magdir/cad
vendor/file/dist/magic/Magdir/commands
vendor/file/dist/magic/Magdir/compress
vendor/file/dist/magic/Magdir/console
vendor/file/dist/magic/Magdir/database
vendor/file/dist/magic/Magdir/der
vendor/file/dist/magic/Magdir/elf
vendor/file/dist/magic/Magdir/filesystems
vendor/file/dist/magic/Magdir/games
vendor/file/dist/magic/Magdir/gnu
vendor/file/dist/magic/Magdir/images
vendor/file/dist/magic/Magdir/intel
vendor/file/dist/magic/Magdir/kicad
vendor/file/dist/magic/Magdir/linux
vendor/file/dist/magic/Magdir/msdos
vendor/file/dist/magic/Magdir/ole2compounddocs
vendor/file/dist/magic/Magdir/parix
vendor/file/dist/magic/Magdir/pascal
vendor/file/dist/magic/Magdir/pdf
vendor/file/dist/magic/Magdir/pgp
vendor/file/dist/magic/Magdir/python
vendor/file/dist/magic/Magdir/riff
vendor/file/dist/magic/Magdir/rst
vendor/file/dist/magic/Magdir/rtf
vendor/file/dist/magic/Magdir/sgml
vendor/file/dist/magic/Magdir/sniffer
vendor/file/dist/magic/Magdir/ssh
vendor/file/dist/magic/Magdir/ti-8x
vendor/file/dist/magic/Magdir/tplink
vendor/file/dist/magic/Magdir/troff
vendor/file/dist/magic/Magdir/virtual
vendor/file/dist/magic/Magdir/windows
vendor/file/dist/magic/Magdir/wordprocessors
vendor/file/dist/magic/Magdir/zip
vendor/file/dist/magic/Makefile.am
vendor/file/dist/magic/Makefile.in
vendor/file/dist/src/apprentice.c
vendor/file/dist/src/ascmagic.c
vendor/file/dist/src/buffer.c
vendor/file/dist/src/compress.c
vendor/file/dist/src/der.c
vendor/file/dist/src/file.c
vendor/file/dist/src/file.h
vendor/file/dist/src/file_opts.h
vendor/file/dist/src/funcs.c
vendor/file/dist/src/is_json.c
vendor/file/dist/src/magic.c
vendor/file/dist/src/print.c
vendor/file/dist/src/readelf.c
vendor/file/dist/src/seccomp.c
vendor/file/dist/src/softmagic.c
Modified: vendor/file/dist/ChangeLog
==============================================================================
--- vendor/file/dist/ChangeLog Tue Jun 16 22:53:56 2020 (r362253)
+++ vendor/file/dist/ChangeLog Wed Jun 17 01:11:26 2020 (r362254)
@@ -1,3 +1,83 @@
+2020-06-14 20:02 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.39
+
+2020-06-07 20:00 Christos Zoulas <chris...@zoulas.com>
+
+ * Remove unused subtype_mime (Steve Grubb)
+ * Remove unused check in okstat (Steve Grubb)
+ * Fix mime-type in elf binaries by making sure $x is set
+ * Fix indirect negative offsets broken by OFFNEGATIVE
+ * Fix GUID equality check
+ * PR/165: Handle empty array and strings in JSON
+ * PR/162: Add --exclude-quiet
+
+2020-06-06 15:33 Christos Zoulas <chris...@zoulas.com>
+
+ * Fix memory leak in ascmagic (Steve Grubb)
+
+2020-06-04 00:21 Christos Zoulas <chris...@zoulas.com>
+
+ * Fix string comparison length with ignore whitespace
+
+2020-05-31 00:11 Christos Zoulas <chris...@zoulas.com>
+
+ * Fix mingwin 64 compilation
+
+2020-05-30 23:56 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/159: whitelist getpid needed for file_pipe2file()
+
+2020-05-09 18:57 Christos Zoulas <chris...@zoulas.com>
+
+ * Indicate negative offsets with a flag OFFNEGATIVE
+ so that -0 works.
+ * Introduce "offset" magic type that can be used to
+ detect the file size, and bail on short files.
+ * document DER better in the magic man page.
+
+2020-03-11 21:53 Christos Zoulas <chris...@zoulas.com>
+
+ * fix memory leaks (SonarQube)
+
+2020-03-08 21:33 Christos Zoulas <chris...@zoulas.com>
+
+ * fix memory leaks (SonarQube)
+ * rewrite confusing loops (SonarQube)
+ * fix bogus test (SonarQube)
+ * pass a sized buffer to file_fmttime() (SonarQube)
+
+ * fix memory leaks (SonarQube)
+
+2020-02-20 15:50 Christos Zoulas <chris...@zoulas.com>
+
+ * Don't allow * in printf formats, or the code itself (Christoph Biedl)
+ * Introduce a printf output size checker to avoid DoS attacks
+
+2020-02-17 17:22 Christos Zoulas <chris...@zoulas.com>
+
+ * Avoid memory leak on error (oss-fuzz)
+ * Check length of string on DER before derefercing and add new types
+ * Add missing DER string (oss-fuzz)
+
+2020-02-16 20:45 Christos Zoulas <chris...@zoulas.com>
+
+ * Add missing DER types, and debugging
+
+2020-02-13 13:10 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/140: Avoid abort with hand-crafted magic file (gockelhahn)
+ * PR/139 Avoid DoS in printf with hand-crafted magic file (gockelhahn)
+ * PR/138: Avoid crash with hand-crafted magic file (gockelhahn)
+
+2020-02-12 17:30 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/136: Fix static build by adding a libmagic.pc (Fabrice Fontaine)
+
+2019-12-24 14:16 Christos Zoulas <chris...@zoulas.com>
+
+ * add guid support
+
2019-12-16 21:11 Christos Zoulas <chris...@zoulas.com>
* release 5.38
Modified: vendor/file/dist/Makefile.am
==============================================================================
--- vendor/file/dist/Makefile.am Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/Makefile.am Wed Jun 17 01:11:26 2020
(r362254)
@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = MAINT
SUBDIRS = src magic tests doc python
+
+# This variable must have 'exec' in its name, in order to be installed
+# by 'install-exec' target (instead of default 'install-data')
+pkgconfigexecdir = $(libdir)/pkgconfig
+pkgconfigexec_DATA = libmagic.pc
Modified: vendor/file/dist/Makefile.in
==============================================================================
--- vendor/file/dist/Makefile.in Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/Makefile.in Wed Jun 17 01:11:26 2020
(r362254)
@@ -13,6 +13,7 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -100,7 +101,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cach
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = libmagic.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -129,6 +130,35 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkgconfigexecdir)"
+DATA = $(pkgconfigexec_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -159,9 +189,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
- COPYING ChangeLog INSTALL NEWS README TODO compile \
- config.guess config.sub install-sh ltmain.sh missing
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/libmagic.pc.in AUTHORS COPYING ChangeLog INSTALL \
+ NEWS README TODO compile config.guess config.sub install-sh \
+ ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -328,6 +359,11 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = MAINT
SUBDIRS = src magic tests doc python
+
+# This variable must have 'exec' in its name, in order to be installed
+# by 'install-exec' target (instead of default 'install-data')
+pkgconfigexecdir = $(libdir)/pkgconfig
+pkgconfigexec_DATA = libmagic.pc
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -380,6 +416,8 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
+libmagic.pc: $(top_builddir)/config.status $(srcdir)/libmagic.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -389,7 +427,28 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
+install-pkgconfigexecDATA: $(pkgconfigexec_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgconfigexec_DATA)'; test -n "$(pkgconfigexecdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigexecdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigexecdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigexecdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigexecdir)" || exit $$?; \
+ done
+uninstall-pkgconfigexecDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfigexec_DATA)'; test -n "$(pkgconfigexecdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgconfigexecdir)'; $(am__uninstall_files_from_dir)
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
# To change the values of 'make' variables: instead of editing Makefiles,
@@ -689,9 +748,12 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
+ for dir in "$(DESTDIR)$(pkgconfigexecdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -750,7 +812,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am:
+install-exec-am: install-pkgconfigexecDATA
install-html: install-html-recursive
@@ -790,7 +852,7 @@ ps: ps-recursive
ps-am:
-uninstall-am:
+uninstall-am: uninstall-pkgconfigexecDATA
.MAKE: $(am__recursive_targets) all install-am install-strip
@@ -804,12 +866,13 @@ uninstall-am:
info-am install install-am install-data install-data-am \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am
+ install-man install-pdf install-pdf-am \
+ install-pkgconfigexecDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkgconfigexecDATA
.PRECIOUS: Makefile
Modified: vendor/file/dist/configure
==============================================================================
--- vendor/file/dist/configure Tue Jun 16 22:53:56 2020 (r362253)
+++ vendor/file/dist/configure Wed Jun 17 01:11:26 2020 (r362254)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.38.
+# Generated by GNU Autoconf 2.69 for file 5.39.
#
# Report bugs to <chris...@astron.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.38'
-PACKAGE_STRING='file 5.38'
+PACKAGE_VERSION='5.39'
+PACKAGE_STRING='file 5.39'
PACKAGE_BUGREPORT='chris...@astron.com'
PACKAGE_URL=''
@@ -1334,7 +1334,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures file 5.38 to adapt to many kinds of systems.
+\`configure' configures file 5.39 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1404,7 +1404,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.38:";;
+ short | recursive ) echo "Configuration of file 5.39:";;
esac
cat <<\_ACEOF
@@ -1524,7 +1524,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.38
+file configure 5.39
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2180,7 +2180,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by file $as_me 5.38, which was
+It was created by file $as_me 5.39, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3046,7 +3046,7 @@ fi
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.38'
+ VERSION='5.39'
cat >>confdefs.h <<_ACEOF
@@ -15167,7 +15167,7 @@ $as_echo "#define XZLIBSUPPORT 1" >>confdefs.h
fi
-ac_config_files="$ac_config_files Makefile src/Makefile magic/Makefile
tests/Makefile doc/Makefile python/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile magic/Makefile
tests/Makefile doc/Makefile python/Makefile libmagic.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -15712,7 +15712,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by file $as_me 5.38, which was
+This file was extended by file $as_me 5.39, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15778,7 +15778,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file config.status 5.38
+file config.status 5.39
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -16199,6 +16199,7 @@ do
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
+ "libmagic.pc") CONFIG_FILES="$CONFIG_FILES libmagic.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Modified: vendor/file/dist/configure.ac
==============================================================================
--- vendor/file/dist/configure.ac Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/configure.ac Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.38],[chris...@astron.com])
+AC_INIT([file],[5.39],[chris...@astron.com])
AM_INIT_AUTOMAKE([subdir-objects foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_str
AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support])
fi
-AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile
doc/Makefile python/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile
doc/Makefile python/Makefile libmagic.pc])
AC_OUTPUT
Modified: vendor/file/dist/doc/file.man
==============================================================================
--- vendor/file/dist/doc/file.man Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/doc/file.man Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,5 +1,5 @@
-.\" $File: file.man,v 1.138 2019/10/15 18:00:40 christos Exp $
-.Dd July 13, 2019
+.\" $File: file.man,v 1.140 2020/06/07 17:41:07 christos Exp $
+.Dd June 7, 2020
.Dt FILE __CSECTION__
.Os
.Sh NAME
@@ -10,6 +10,7 @@
.Bk -words
.Op Fl bcdEhiklLNnprsSvzZ0
.Op Fl Fl apple
+.Op Fl Fl exclude-quiet
.Op Fl Fl extension
.Op Fl Fl mime-encoding
.Op Fl Fl mime-type
@@ -229,6 +230,14 @@ the soft magic method.
A synonym for
.Sq ascii .
.El
+.It Fl Fl exclude-quiet
+Like
+.Fl Fl exclude
+but ignore tests that
+.Nm
+does not know about.
+This is intended for compatilibity with older versions of
+.Nm .
.It Fl Fl extension
Print a slash-separated list of valid extensions for the file type found.
.It Fl F , Fl Fl separator Ar separator
@@ -326,13 +335,13 @@ never read them.
Set various parameter limits.
.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
.It Sy "Name" Ta Sy "Default" Ta Sy "Explanation"
-.It Li indir Ta 15 Ta recursion limit for indirect magic
-.It Li name Ta 30 Ta use count limit for name/use magic
+.It Li bytes Ta 1048576 Ta max number of bytes to read from file
.It Li elf_notes Ta 256 Ta max ELF notes processed
-.It Li elf_phnum Ta 128 Ta max ELF program sections processed
+.It Li elf_phnum Ta 2048 Ta max ELF program sections processed
.It Li elf_shnum Ta 32768 Ta max ELF sections processed
+.It Li indir Ta 50 Ta recursion limit for indirect magic
+.It Li name Ta 50 Ta use count limit for name/use magic
.It Li regex Ta 8192 Ta length limit for regex searches
-.It Li bytes Ta 1048576 Ta max number of bytes to read from file
.El
.It Fl r , Fl Fl raw
Don't translate unprintable characters to \eooo.
Modified: vendor/file/dist/doc/magic.man
==============================================================================
--- vendor/file/dist/doc/magic.man Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/doc/magic.man Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,5 +1,5 @@
-.\" $File: magic.man,v 1.97 2019/11/15 21:03:14 christos Exp $
-.Dd January 21, 2019
+.\" $File: magic.man,v 1.98 2020/05/09 18:55:23 christos Exp $
+.Dd May 9, 2020
.Dt MAGIC __FSECTION__
.Os
.\" install as magic.4 on USG, magic.5 on V7, Berkeley and Linux systems.
@@ -300,6 +300,62 @@ This test is always true and clears the match flag for
It is intended to be used with the
.Dv default
test.
+.It Dv der
+Parse the file as a DER Certificate file.
+The test field is used as a der type that needs to be matched.
+The DER types are:
+.Dv eoc ,
+.Dv bool ,
+.Dv int ,
+.Dv bit_str ,
+.Dv octet_str ,
+.Dv null ,
+.Dv obj_id ,
+.Dv obj_desc ,
+.Dv ext ,
+.Dv real ,
+.Dv enum ,
+.Dv embed ,
+.Dv utf8_str ,
+.Dv rel_oid ,
+.Dv time ,
+.Dv res2 ,
+.Dv seq ,
+.Dv set ,
+.Dv num_str ,
+.Dv prt_str ,
+.Dv t61_str ,
+.Dv vid_str ,
+.Dv ia5_str ,
+.Dv utc_time ,
+.Dv gen_time ,
+.Dv gr_str ,
+.Dv vis_str ,
+.Dv gen_str ,
+.Dv univ_str ,
+.Dv char_str ,
+.Dv bmp_str ,
+.Dv date ,
+.Dv tod ,
+.Dv datetime ,
+.Dv duration ,
+.Dv oid-iri ,
+.Dv rel-oid-iri .
+These types can be followed by an optional numeric size, which indicates
+the field width in bytes.
+.It Dv guid
+A Globally Unique Identifier, parsed and printed as
+XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.
+It's format is a string.
+.It Dv offset
+This is a quad value indicating the current offset of the file.
+It can be used to determine the size of the file or the magic buffer.
+For example the magic entries:
+.Bd -literal -offset indent
+-0 offset x this file is %lld bytes
+-0 offset <=100 must be more than 100 \e
+ bytes and is only %lld
+.Ed
.El
.Pp
For compatibility with the Single
Added: vendor/file/dist/libmagic.pc.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/file/dist/libmagic.pc.in Wed Jun 17 01:11:26 2020
(r362254)
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmagic
+Description: Magic number recognition library
+Version: @VERSION@
+Libs: -L${libdir} -lmagic
+Libs.private: @LIBS@
Modified: vendor/file/dist/magic/Magdir/animation
==============================================================================
--- vendor/file/dist/magic/Magdir/animation Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/magic/Magdir/animation Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: animation,v 1.74 2019/10/29 01:06:20 christos Exp $
+# $File: animation,v 1.77 2020/04/26 15:23:43 christos Exp $
# animation: file(1) magic for animation/movie formats
#
# animation formats
@@ -159,7 +159,7 @@
>8 string mqt \b, Sony / Mobile QuickTime (.MQV) US
>Pat 7,477,830
!:mime video/quicktime
>8 string MSNV \b, MPEG-4 (.MP4) for SonyPSP
-!:mime audio/mp4
+!:mime video/mp4
>8 string NDAS \b, MP4 v2 [ISO 14496-14] Nero Digital
>AAC Audio
!:mime audio/mp4
>8 string NDSC \b, MPEG-4 (.MP4) Nero Cinema Profile
@@ -854,10 +854,6 @@
>4 byte ^0x01 (DV) movie file
>3 byte &0x80 (PAL)
>3 byte ^0x80 (NTSC)
-
-# Microsoft Advanced Streaming Format (ASF) <mpru...@sgi.com>
-0 belong 0x3026b275 Microsoft ASF
-!:mime video/x-ms-asf
# MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
0 string \x8aMNG MNG video data,
Modified: vendor/file/dist/magic/Magdir/archive
==============================================================================
--- vendor/file/dist/magic/Magdir/archive Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/magic/Magdir/archive Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-# $File: archive,v 1.133 2019/11/15 21:03:14 christos Exp $
+# $File: archive,v 1.138 2020/06/07 23:29:26 christos Exp $
# archive: file(1) magic for archive formats (see also "msdos" for self-
# extracting compressed archives)
#
@@ -236,7 +236,8 @@
!:ext deb/udeb
>14 string -binary Debian binary package
!:mime application/vnd.debian.binary-package
-!:ext deb/udeb
+# For ipk packager see also https://en.wikipedia.org/wiki/Opkg
+!:ext deb/udeb/ipk
# This should not happen
>14 default x Unknown Debian package
# NL terminated version; for most Debian cases this is 2.0 or 2.1 for splitted
@@ -250,7 +251,16 @@
>>0 search/0x93e4f data.tar. \b, data compression
# the above line only works if FILE_BYTES_MAX in ../../src/file.h is raised
# for example like libreoffice-dev-doc_1%3a5.2.7-1+rpi1+deb9u3_all.deb
->>>&0 string x %.4s
+>>>&0 string x %.2s
+# skip space (0x20 BSD) and slash (0x2f System V) character marking end of name
+>>>&2 ubyte !0x20
+>>>>&-1 ubyte !0x2f
+# display 3rd character of file name extension like 2 of bz2 or m of lzma
+>>>>>&-1 ubyte x \b%c
+>>>>>>&0 ubyte !0x20
+>>>>>>>&-1 ubyte !0x2f
+# display 4th character of file name extension like a of lzma
+>>>>>>>>&-1 ubyte x \b%c
# splitted debian package case
>68 string =2.1\n
# dpkg-1.18.25/dpkg-split/info.c
@@ -1124,71 +1134,120 @@
# OpenOffice formats (for OpenOffice 1.x / StarOffice 6/7)
# (mimetype contains "application/vnd.sun.xml.<SUBTYPE>")
+# URL: https://en.wikipedia.org/wiki/OpenOffice.org_XML
+# reference: http://fileformats.archiveteam.org/wiki/OpenOffice.org_XML
>>50 string vnd.sun.xml. OpenOffice.org 1.x
>>>62 string writer Writer
>>>>68 byte !0x2e document
+!:mime application/vnd.sun.xml.writer
+!:ext sxw
>>>>68 string .template template
+!:mime application/vnd.sun.xml.writer.template
+!:ext stw
+>>>>68 string .web Web template
+!:mime application/vnd.sun.xml.writer.web
+!:ext stw
>>>>68 string .global global document
+!:mime application/vnd.sun.xml.writer.global
+!:ext sxg
>>>62 string calc Calc
>>>>66 byte !0x2e spreadsheet
+!:mime application/vnd.sun.xml.calc
+!:ext sxc
>>>>66 string .template template
+!:mime application/vnd.sun.xml.calc.template
+!:ext stc
>>>62 string draw Draw
>>>>66 byte !0x2e document
+!:mime application/vnd.sun.xml.draw
+!:ext sxd
>>>>66 string .template template
+!:mime application/vnd.sun.xml.draw.template
+!:ext std
>>>62 string impress Impress
>>>>69 byte !0x2e presentation
+!:mime application/vnd.sun.xml.impress
+!:ext sxi
>>>>69 string .template template
+!:mime application/vnd.sun.xml.impress.template
+!:ext sti
>>>62 string math Math document
+!:mime application/vnd.sun.xml.math
+!:ext sxm
>>>62 string base Database file
+!:mime application/vnd.sun.xml.base
+!:ext sdb
# OpenDocument formats (for OpenOffice 2.x / StarOffice >= 8)
+# URL: http://fileformats.archiveteam.org/wiki/OpenDocument
# https://lists.oasis-open.org/archives/office/200505/msg00006.html
# (mimetype contains "application/vnd.oasis.opendocument.<SUBTYPE>")
>>50 string vnd.oasis.opendocument. OpenDocument
>>>73 string text
>>>>77 byte !0x2d Text
!:mime application/vnd.oasis.opendocument.text
+!:ext odt
>>>>77 string -template Text Template
!:mime application/vnd.oasis.opendocument.text-template
+!:ext ott
>>>>77 string -web HTML Document Template
!:mime application/vnd.oasis.opendocument.text-web
+!:ext oth
>>>>77 string -master Master Document
!:mime application/vnd.oasis.opendocument.text-master
+!:ext odm
>>>73 string graphics
>>>>81 byte !0x2d Drawing
!:mime application/vnd.oasis.opendocument.graphics
->>>>81 string -template Template
+!:ext odg
+>>>>81 string -template Drawing Template
!:mime application/vnd.oasis.opendocument.graphics-template
+!:ext otg
>>>73 string presentation
>>>>85 byte !0x2d Presentation
!:mime application/vnd.oasis.opendocument.presentation
->>>>85 string -template Template
+!:ext odp
+>>>>85 string -template Presentation Template
!:mime application/vnd.oasis.opendocument.presentation-template
+!:ext otp
>>>73 string spreadsheet
>>>>84 byte !0x2d Spreadsheet
!:mime application/vnd.oasis.opendocument.spreadsheet
->>>>84 string -template Template
+!:ext ods
+>>>>84 string -template Spreadsheet Template
!:mime application/vnd.oasis.opendocument.spreadsheet-template
+!:ext ots
>>>73 string chart
>>>>78 byte !0x2d Chart
!:mime application/vnd.oasis.opendocument.chart
->>>>78 string -template Template
+!:ext odc
+>>>>78 string -template Chart Template
!:mime application/vnd.oasis.opendocument.chart-template
+!:ext otc
>>>73 string formula
>>>>80 byte !0x2d Formula
!:mime application/vnd.oasis.opendocument.formula
->>>>80 string -template Template
+!:ext odf
+>>>>80 string -template Formula Template
!:mime application/vnd.oasis.opendocument.formula-template
+!:ext otf
+# https://www.loc.gov/preservation/digital/formats/fdd/fdd000441.shtml
>>>73 string database Database
!:mime application/vnd.oasis.opendocument.database
+!:ext odb
# Valid for LibreOffice Base 6.0.1.1 at least
>>>73 string base Database
-!:mime application/vnd.oasis.opendocument.base
+# https://bugs.documentfoundation.org/show_bug.cgi?id=45854
+!:mime application/vnd.oasis.opendocument.database
+#!:mime application/vnd.oasis.opendocument.base
+!:ext odb
>>>73 string image
>>>>78 byte !0x2d Image
!:mime application/vnd.oasis.opendocument.image
->>>>78 string -template Template
+!:ext odi
+>>>>78 string -template Image Template
!:mime application/vnd.oasis.opendocument.image-template
+!:ext oti
# EPUB (OEBPS) books using OCF (OEBPS Container Format)
# https://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
@@ -1206,12 +1265,33 @@
>>>62 string draw.template+zip Draw template, version 14-16
!:mime application/x-vnd.corel.draw.template+zip
!:ext cdrt
->>>62 string zcf.draw.document+zip Draw drawing, version 17-21
+>>>62 string zcf.draw.document+zip Draw drawing, version 17-22
!:mime application/x-vnd.corel.zcf.draw.document+zip
!:ext cdr
->>>62 string zcf.draw.template+zip Draw template, version 17-21
+>>>62 string zcf.draw.template+zip Draw template, version 17-22
!:mime application/x-vnd.corel.zcf.draw.template+zip
!:ext cdt/cdrt
+# URL:
http://product.corel.com/help/CorelDRAW/540240626/Main/EN/Doc/CorelDRAW-Other-file-formats.html
+>>>62 string zcf.pattern+zip Draw pattern, version 22
+!:mime application/x-vnd.corel.zcf.pattern+zip
+!:ext pat
+# URL: https://en.wikipedia.org/wiki/Corel_Designer
+# Reference: http://fileformats.archiveteam.org/wiki/Corel_Designer
+# Note: called by TrID "Corel DESIGN graphics"
+>>>62 string designer.document+zip DESIGNER graphics, version 14-16
+!:mime application/x-vnd.corel.designer.document+zip
+!:ext des
+>>>62 string zcf.designer.document+zip DESIGNER graphics, version 17-21
+!:mime application/x-vnd.corel.zcf.designer.document+zip
+!:ext des
+# URL: http://product.corel.com/help/CorelDRAW/540223850/Main/EN/Documentation/
+# CorelDRAW-Corel-Symbol-Library-CSL.html
+>>>62 string symbol.library+zip Symbol Library, version 6-16.3
+!:mime application/x-vnd.corel.symbol.library+zip
+!:ext csl
+>>>62 string zcf.symbol.library+zip Symbol Library, version 17-22
+!:mime application/x-vnd.corel.zcf.symbol.library+zip
+!:ext csl
# Catch other ZIP-with-mimetype formats
# In a ZIP file, the bytes immediately after a member's contents are
@@ -1239,16 +1319,19 @@
>>>>38 search/64 .app/ iOS App
!:mime application/x-ios-app
+>30 search/100/b application/epub+zip EPUB document
+!:mime application/epub+zip
# Generic zip archives (Greg Roelofs, c/o zip-b...@wkuvx1.wku.edu)
# Next line excludes specialized formats:
>(26.s+30) leshort !0xcafe
->>26 string !\x8\0\0\0mimetype Zip archive data
+>>30 search/100/b !application/epub+zip
+>>>26 string !\x8\0\0\0mimetype Zip archive data
!:mime application/zip
->>>4 beshort x \b, at least
->>>4 use zipversion
->>>4 beshort x to extract
->>>0x161 string WINZIP \b, WinZIP self-extracting
+>>>>4 beshort x \b, at least
+>>>>4 use zipversion
+>>>>4 beshort x to extract
+>>>>0x161 string WINZIP \b, WinZIP self-extracting
# StarView Metafile
# From Pierre Ducroquet <pina...@pinaraf.info>
Added: vendor/file/dist/magic/Magdir/asf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/file/dist/magic/Magdir/asf Wed Jun 17 01:11:26 2020
(r362254)
@@ -0,0 +1,132 @@
+
+#------------------------------------------------------------------------------
+# $File: asf,v 1.1 2019/12/26 02:07:53 christos Exp $
+# asf: file(1) magic for Microsoft Advanced Systems Format (ASF) files
+# http://www.staroceans.org/e-book/ASF_Specification.pdf
+
+0 name asf-name
+# ASF_Data_Object
+#>0 guid 75B22636-668E-11CF-A6D9-00AA0062CE6C
+#>16 lequad >0
+#>>(16.q) use asf-object
+# ASF_Simple_Index_Object
+>0 guid 33000890-E5B1-11CF-89F4-00A0C90349CB
+>0 guid D6E229D3-35DA-11D1-9034-00A0C90349BE ASF_Index_Object
+>0 guid FEB103F8-12AD-4C64-840F-2A1D2F7AD48C
ASF_Media_Object_Index_Object
+>0 guid 3CB73FD0-0C4A-4803-953D-EDF7B6228F0C ASF_Timecode_Index_Object
+
+# ASF_File_Properties_Object
+>0 guid 8CABDCA1-A947-11CF-8EE4-00C00C205365
+
+# ASF_Stream_Properties_Object
+>0 guid B7DC0791-A9B7-11CF-8EE6-00C00C205365
+#>>56 lequad x Time Offset %lld
+#>>64 lelong x Type-Specicic Data Length %d
+#>>68 lelong x Error Correction Data Length %d
+#>>72 leshort x Flags 0x%x
+#>>74 lelong x Reserved %x
+# ASF_Audio_Media
+>>24 guid F8699E40-5B4D-11CF-A8FD-00805F5C442B \b, Audio Media (
+>>>78 leshort x \bCodec Id %d
+>>>80 leshort x \b, Number of channels %d
+>>>82 lelong x \b, Samples Per Second %d
+>>>86 lelong x \b, Average Number of Bytes Per Second %d
+>>>90 lelong x \b, Block Alignment %d
+>>>94 leshort x \b, Bits Per Sample %d
+# ASF_Video_Media
+>>24 guid BC19EFC0-5B4D-11CF-A8FD-00805F5C442B \b, Video Media (
+>>>78 lelong x \bEncoded Image Width %d
+>>>82 lelong x \b, Encoded Image Height %d
+#>>>85 leshort x \b, Format Data Size %x
+>>>93 lelong x \b, Image Width %d
+>>>97 lelong x \b, Image Height %d
+#>>>101 leshort x \b, Reserved 0x%x
+>>>103 leshort x \b, Bits Per Pixel Count %d
+#>>>105 lelong x \b, Compression ID %d
+#>>>109 lelong x \b, Image Size %d
+#>>>113 lelong x \b, Horizontal Pixels Per Meter %d
+#>>>117 lelong x \b, Vertical Pixels Per Meter %d
+#>>>121 lelong x \b, Colors Used Count %d
+#>>>125 lelong x \b, Important Colors Count %d
+>>0 lelong x \b, Error correction type
+>>40 use asf-name
+>>0 lelong x \b)
+#ASF_Header_Extension_Object
+>0 guid 5FBF03B5-A92E-11CF-8EE3-00C00C205365
+# ASF_Codec_List_Object
+>0 guid 86D15240-311D-11D0-A3A4-00A0C90348F6
+>0 guid 1EFB1A30-0B62-11D0-A39B-00A0C90348F6 ASF_Script_Command_Object
+>0 guid F487CD01-A951-11CF-8EE6-00C00C205365 ASF_Marker_Object
+>0 guid D6E229DC-35DA-11D1-9034-00A0C90349BE
ASF_Bitrate_Mutual_Exclusion_Object
+>0 guid 75B22635-668E-11CF-A6D9-00AA0062CE6C ASF_Error_Correction_Object
+# ASF_Content_Description_Object
+>0 guid 75B22633-668E-11CF-A6D9-00AA0062CE6C
+#>>24 leshort title length %d
+#>>26 leshort author length %d
+#>>28 leshort copyright length %d
+#>>30 leshort descriptor length %d
+#>>32 leshort rating length %d
+>0 guid D2D0A440-E307-11D2-97F0-00A0C95EA850
ASF_Extended_Content_Description_Object
+>0 guid 2211B3FA-BD23-11D2-B4B7-00A0C955FC6E ASF_Content_Branding_Object
+>0 guid 7BF875CE-468D-11D1-8D82-006097C9A2B2
ASF_Stream_Bitrate_Properties_Object
+>0 guid 2211B3FB-BD23-11D2-B4B7-00A0C955FC6E
ASF_Content_Encryption_Object
+>0 guid 298AE614-2622-4C17-B935-DAE07EE9289C
ASF_Extended_Content_Encryption_Object
+>0 guid 2211B3FC-BD23-11D2-B4B7-00A0C955FC6E
ASF_Digital_Signature_Object
+# ASF_Padding_Object
+>0 guid 1806D474-CADF-4509-A4BA-9AABCB96AAE8
+>0 guid 14E6A5CB-C672-4332-8399-A96952065B5A
ASF_Extended_Stream_Properties_Object
+>0 guid A08649CF-4775-4670-8A16-6E35357566CD
ASF_Advanced_Mutual_Exclusion_Object
+>0 guid D1465A40-5A79-4338-B71B-E36B8FD6C249
ASF_Group_Mutual_Exclusion_Object
+>0 guid D4FED15B-88D3-454F-81F0-ED5C45999E24
ASF_Stream_Prioritization_Object
+>0 guid A69609E6-517B-11D2-B6AF-00C04FD908E9
ASF_Bandwidth_Sharing_Object
+>0 guid 7C4346A9-EFE0-4BFC-B229-393EDE415C85 ASF_Language_List_Object
+>0 guid C5F8CBEA-5BAF-4877-8467-AA8C44FA4CCA ASF_Metadata_Object
+>0 guid 44231C94-9498-49D1-A141-1D134E457054 ASF_Metadata_Library_Object
+>0 guid D6E229DF-35DA-11D1-9034-00A0C90349BE ASF_Index_Parameters_Object
+>0 guid 6B203BAD-3F11-48E4-ACA8-D7613DE2CFA7
ASF_Media_Object_Index_Parameters_Object
+>0 guid F55E496D-9797-4B5D-8C8B-604DFE9BFB24
ASF_Timecode_Index_Parameters_Object
+>0 guid 26F18B5D-4584-47EC-9F5F-0E651F0452C9 ASF_Compatibility_Object
+>0 guid 43058533-6981-49E6-9B74-AD12CB86D58C
ASF_Advanced_Content_Encryption_Object
+>0 guid 59DACFC0-59E6-11D0-A3AC-00A0C90348F6 ASF_Command_Media
+>0 guid B61BE100-5B4E-11CF-A8FD-00805F5C44 ASF_JFIF_Media
+>0 guid 35907DE0-E415-11CF-A917-00805F5C442B ASF_Degradable_JPEG_Media
+>0 guid 91BD222C-F21C-497A-8B6D-5AA86BFC0185 ASF_File_Transfer_Media
+>0 guid 3AFB65E2-47EF-40F2-AC2C-70A90D71D343 ASF_Binary_Media
+>0 guid 776257D4-C627-41CB-8F81-7AC7FF1C40CC
ASF_Web_Stream_Media_Subtype
+>0 guid DA1E6B13-8359-4050-B398-388E965BF00C ASF_Web_Stream_Format
+>0 guid 20FB5700-5B55-11CF-A8FD-00805F5C442B ASF_No_Error_Correction
+>0 guid BFC3CD50-618F-11CF-8BB2-00AA00B4E220 ASF_Audio_Spread
+>0 guid ABD3D211-A9BA-11cf-8EE6-00C00C205365 ASF_Reserved_1
+>0 guid 7A079BB6-DAA4-4e12-A5CA-91D38DC11A8D
ASF_Content_Encryption_System_Windows_Media_DRM
+# _Network_Devices
+>0 guid 86D15241-311D-11D0-A3A4-00A0C90348F6 ASF_Reserved_2
+>0 guid 4B1ACBE3-100B-11D0-A39B-00A0C90348F6 ASF_Reserved_3
+>0 guid 4CFEDB20-75F6-11CF-9C0F-00A0C90349CB ASF_Reserved_4
+>0 guid D6E22A00-35DA-11D1-9034-00A0C90349BE ASF_Mutex_Language
+>0 guid D6E22A01-35DA-11D1-9034-00A0C90349BE ASF_Mutex_Bitrate
+>0 guid D6E22A02-35DA-11D1-9034-00A0C90349BE ASF_Mutex_Unknown
+>0 guid AF6060AA-5197-11D2-B6AF-00C04FD908E9
ASF_Bandwidth_Sharing_Exclusive
+>0 guid AF6060AB-5197-11D2-B6AF-00C04FD908E9
ASF_Bandwidth_Sharing_Partial
+>0 guid 399595EC-8667-4E2D-8FDB-98814CE76C1E
ASF_Payload_Extension_System_Timecode
+>0 guid E165EC0E-19ED-45D7-B4A7-25CBD1E28E9B
ASF_Payload_Extension_System_File_Name
+>0 guid D590DC20-07BC-436C-9CF7-F3BBFBF1A4DC
ASF_Payload_Extension_System_Content_Type
+>0 guid 1B1EE554-F9EA-4BC8-821A-376B74E4C4B8
ASF_Payload_Extension_System_Pixel_Aspect_Ratio
+>0 guid C6BD9450-867F-4907-83A3-C77921B733AD
ASF_Payload_Extension_System_Sample_Duration
+>0 guid 6698B84E-0AFA-4330-AEB2-1C0A98D7A44D
ASF_Payload_Extension_System_Encryption_Sample_ID
+>0 guid 00E1AF06-7BEC-11D1-A582-00C04FC29CFB
ASF_Payload_Extension_System_Degradable_JPEG
+
+0 name asf-object
+>0 use asf-name
+#>>16 lequad >0 (size %lld) [
+>>16 lequad >0
+>>>(16.q) use asf-object
+#>>16 lequad 0 ]
+
+# Microsoft Advanced Streaming Format (ASF) <mpru...@sgi.com>
+0 guid 75B22630-668E-11CF-A6D9-00AA0062CE6C Microsoft ASF
+!:mime video/x-ms-asf
+#>16 lequad >0 (size %lld
+#>>24 lelong x \b, %d header objects)
+>16 lequad >0
+>>30 use asf-object
+>>(16.q) use asf-object
Modified: vendor/file/dist/magic/Magdir/cad
==============================================================================
--- vendor/file/dist/magic/Magdir/cad Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/magic/Magdir/cad Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: cad,v 1.20 2019/08/10 13:34:17 christos Exp $
+# $File: cad,v 1.23 2020/05/30 23:58:07 christos Exp $
# autocad: file(1) magic for cad files
#
@@ -229,9 +229,13 @@
!:mime image/vnd.dwg
0 string AC1024 DWG AutoDesk AutoCAD 2010/2011/2012
!:mime image/vnd.dwg
-0 string AC1027 DWG AutoDesk AutoCAD 2013/2014
+0 string AC1027 DWG AutoDesk AutoCAD 2013-2017
!:mime image/vnd.dwg
+# From GNU LibreDWG
+0 string AC1032 DWG AutoDesk AutoCAD 2018/2019
+!:mime image/vnd.dwg
+
# KOMPAS 2D drawing from ASCON
# This is KOMPAS 2D drawing or fragment of drawing but is not detailed nor
# gathered nor specification
@@ -315,3 +319,6 @@
0 string
\xff\xfe\xff\x0e\x53\x00\x6b\x00\x65\x00\x74\x00\x63\x00\x68\x00\x55\x00\x70\x00\x20\x00\x4d\x00\x6f\x00\x64\x00\x65\x00\x6c\x00
SketchUp Model
!:mime application/vnd.sketchup.skp
!:ext skp
+
+4 regex/b
P[0-9][0-9]\\.[0-9][0-9][0-9][0-9]\\.[0-9][0-9][0-9][0-9]\\.[0-9] NAXOS
CAD System file from version %s
+!:strength +40
Modified: vendor/file/dist/magic/Magdir/commands
==============================================================================
--- vendor/file/dist/magic/Magdir/commands Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/magic/Magdir/commands Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: commands,v 1.61 2019/10/30 03:16:43 christos Exp $
+# $File: commands,v 1.63 2020/06/06 15:36:30 christos Exp $
# commands: file(1) magic for various shells and interpreters
#
#0 string/w : shell archive or script for
antique kernel text
@@ -83,6 +83,30 @@
!:mime text/x-shellscript
0 string/wt #!\ /usr/bin/env\ bash Bourne-Again shell script text
executable
!:mime text/x-shellscript
+
+# Fish shell magic
+# From: Benjamin Lowry <b...@ben.gmbh>
+0 string/wt #!\ /usr/local/bin/fish fish shell script text
executable
+!:mime text/x-shellscript
+0 string/wt #!\ /usr/bin/fish fish shell script text
executable
+!:mime text/x-shellscript
+0 string/wt #!\ /usr/bin/env\ fish fish shell script text
executable
+!:mime text/x-shellscript
+
+
+0 search/1/wt #!\ /usr/bin/tclsh Tcl/Tk script text executable
+!:mime text/x-tcl
+
+0 search/1/wt #!\ /usr/bin/texlua LuaTex script text executable
+!:mime text/x-luatex
+
+0 search/1/wt #!\ /usr/bin/luatex LuaTex script text executable
+!:mime text/x-luatex
+
+0 search/1/wt #!\ /usr/bin/stap Systemtap script text executable
+!:mime text/x-systemtap
+
+
# PHP scripts
# Ulf Harnhammar <u...@update.uu.se>
Modified: vendor/file/dist/magic/Magdir/compress
==============================================================================
--- vendor/file/dist/magic/Magdir/compress Tue Jun 16 22:53:56 2020
(r362253)
+++ vendor/file/dist/magic/Magdir/compress Wed Jun 17 01:11:26 2020
(r362254)
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-# $File: compress,v 1.77 2019/10/08 20:25:13 christos Exp $
+# $File: compress,v 1.79 2020/05/30 23:53:04 christos Exp $
# compress: file(1) magic for pure-compression formats (no archives)
#
# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -61,7 +61,9 @@
!:mime application/gzip
>>>0 use gzip-info
# size of the original (uncompressed) input data modulo 2^32
+>>-0 offset >48
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
