Author: delphij
Date: Tue Jun  9 22:13:25 2015
New Revision: 284193
URL: https://svnweb.freebsd.org/changeset/base/284193

Log:
  Update base system file(1) to 5.22 to address multiple denial of
  service issues. [EN-15:06]
  
  Improve reliability of ZFS when TRIM/UNMAP and/or L2ARC is used.
  [EN-15:07]
  
  Approved by:  so

Added:
  releng/10.1/contrib/file/magic/Magdir/kerberos
  releng/10.1/contrib/file/magic/Magdir/meteorological
  releng/10.1/contrib/file/magic/Magdir/qt
Deleted:
  releng/10.1/contrib/file/magic/Magdir/rinex
Modified:
  releng/10.1/UPDATING
  releng/10.1/contrib/file/ChangeLog
  releng/10.1/contrib/file/README
  releng/10.1/contrib/file/TODO
  releng/10.1/contrib/file/config.h.in
  releng/10.1/contrib/file/configure
  releng/10.1/contrib/file/configure.ac
  releng/10.1/contrib/file/doc/file.man
  releng/10.1/contrib/file/doc/libmagic.man
  releng/10.1/contrib/file/doc/magic.man
  releng/10.1/contrib/file/magic/Magdir/android
  releng/10.1/contrib/file/magic/Magdir/animation
  releng/10.1/contrib/file/magic/Magdir/archive
  releng/10.1/contrib/file/magic/Magdir/blender
  releng/10.1/contrib/file/magic/Magdir/cafebabe
  releng/10.1/contrib/file/magic/Magdir/commands
  releng/10.1/contrib/file/magic/Magdir/compress
  releng/10.1/contrib/file/magic/Magdir/database
  releng/10.1/contrib/file/magic/Magdir/elf
  releng/10.1/contrib/file/magic/Magdir/filesystems
  releng/10.1/contrib/file/magic/Magdir/images
  releng/10.1/contrib/file/magic/Magdir/jpeg
  releng/10.1/contrib/file/magic/Magdir/linux
  releng/10.1/contrib/file/magic/Magdir/macintosh
  releng/10.1/contrib/file/magic/Magdir/msooxml
  releng/10.1/contrib/file/magic/Magdir/netbsd
  releng/10.1/contrib/file/magic/Magdir/pascal
  releng/10.1/contrib/file/magic/Magdir/pgp
  releng/10.1/contrib/file/magic/Magdir/python
  releng/10.1/contrib/file/magic/Magdir/riff
  releng/10.1/contrib/file/magic/Magdir/sequent
  releng/10.1/contrib/file/magic/Magdir/sereal
  releng/10.1/contrib/file/magic/Magdir/ssh
  releng/10.1/contrib/file/magic/Magdir/vms
  releng/10.1/contrib/file/magic/Magdir/vorbis
  releng/10.1/contrib/file/magic/Magdir/windows
  releng/10.1/contrib/file/magic/Makefile.am
  releng/10.1/contrib/file/magic/Makefile.in
  releng/10.1/contrib/file/src/Makefile.in
  releng/10.1/contrib/file/src/apprentice.c
  releng/10.1/contrib/file/src/ascmagic.c
  releng/10.1/contrib/file/src/cdf.c
  releng/10.1/contrib/file/src/cdf.h
  releng/10.1/contrib/file/src/compress.c
  releng/10.1/contrib/file/src/elfclass.h
  releng/10.1/contrib/file/src/encoding.c
  releng/10.1/contrib/file/src/file.c
  releng/10.1/contrib/file/src/file.h
  releng/10.1/contrib/file/src/file_opts.h
  releng/10.1/contrib/file/src/fsmagic.c
  releng/10.1/contrib/file/src/funcs.c
  releng/10.1/contrib/file/src/getline.c
  releng/10.1/contrib/file/src/magic.c
  releng/10.1/contrib/file/src/magic.h
  releng/10.1/contrib/file/src/magic.h.in
  releng/10.1/contrib/file/src/pread.c
  releng/10.1/contrib/file/src/readcdf.c
  releng/10.1/contrib/file/src/readelf.c
  releng/10.1/contrib/file/src/softmagic.c
  releng/10.1/contrib/file/src/vasprintf.c
  releng/10.1/lib/libmagic/config.h
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  releng/10.1/sys/conf/newvers.sh

Modified: releng/10.1/UPDATING
==============================================================================
--- releng/10.1/UPDATING        Tue Jun  9 21:39:38 2015        (r284192)
+++ releng/10.1/UPDATING        Tue Jun  9 22:13:25 2015        (r284193)
@@ -16,6 +16,15 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20150609:      p29     FreeBSD-EN-15:06.file
+                       FreeBSD-EN-15:07.zfs
+
+       Updated base system file(1) to 5.22 to address multiple denial
+       of service issues. [EN-15:06]
+
+       Improved reliability of ZFS when TRIM/UNMAP and/or L2ARC is used.
+       [EN-15:07]
+
 20150513:      p10     FreeBSD-EN-15:04.freebsd-update
                        FreeBSD-EN-15:05.ufs
 

Modified: releng/10.1/contrib/file/ChangeLog
==============================================================================
--- releng/10.1/contrib/file/ChangeLog  Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/ChangeLog  Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,3 +1,97 @@
+2015-01-02  15:15  Christos Zoulas <chris...@zoulas.com>
+
+       * release 5.22
+
+2015-01-01  12:01  Christos Zoulas <chris...@zoulas.com>
+
+       * add indirect relative for TIFF/Exif
+
+2014-12-16  18:10  Christos Zoulas <chris...@zoulas.com>
+       
+       * restructure elf note printing to avoid repeated messages
+       * add note limit, suggested by Alexander Cherepanov
+
+2014-12-16  16:53  Christos Zoulas <chris...@zoulas.com>
+       
+       * Bail out on partial pread()'s (Alexander Cherepanov)
+       * Fix incorrect bounds check in file_printable (Alexander Cherepanov)
+
+2014-12-11  20:01  Christos Zoulas <chris...@zoulas.com>
+
+       * PR/405: ignore SIGPIPE from uncompress programs
+       * change printable -> file_printable and use it in
+         more places for safety
+       * in ELF, instead of "(uses dynamic libraries)" when PT_INTERP
+         is present print the interpreter name.
+       
+2014-12-10  20:01  Christos Zoulas <chris...@zoulas.com>
+
+       * release 5.21
+
+2014-11-27  18:40  Christos Zoulas <chris...@zoulas.com>
+
+       * Allow setting more parameters from the command line.
+       * Split name/use and indirect magic recursion limits.
+
+2014-11-27  11:12  Christos Zoulas <chris...@zoulas.com>
+
+       * Adjust ELF parameters and the default recursion
+         level.
+       * Allow setting the recursion level dynamically.
+
+2014-11-24   8:55  Christos Zoulas <chris...@zoulas.com>
+
+       * The following fixes resulted from Thomas Jarosch's fuzzing
+         tests that revealed severe performance issues on pathological
+         input:
+           - limit number of elf program and sections processing
+           - abort elf note processing quickly
+           - reduce the number of recursion levels from 20 to 10
+           - preserve error messages in indirect magic handling
+
+       This is tracked as CVE-2014-8116 and CVE-2014-8117
+
+2014-11-12  10:30  Christos Zoulas <chris...@zoulas.com>
+
+       * fix bogus free in the user buffer case.
+
+2014-11-11  12:35  Christos Zoulas <chris...@zoulas.com>
+
+       * fix out of bounds read for pascal strings
+       * fix memory leak (not freeing the head of each mlist)
+
+2014-11-07  10:25  Christos Zoulas <chris...@zoulas.com>
+
+       * When printing strings from a file, convert them to printable
+         on a byte by byte basis, so that we don't get issues with
+         locale's trying to interpret random byte streams as UTF-8 and
+         having printf error out with EILSEQ.
+         
+2014-10-17  11:48  Christos Zoulas <chris...@zoulas.com>
+
+       * fix bounds in note reading (Francisco Alonso / Red Hat)
+
+2014-10-11  15:02  Christos Zoulas <chris...@zoulas.com>
+
+       * fix autoconf glue for setlocale and locale_t; some OS's
+         have locale_t in xlocale.h
+
+2014-10-10  15:01  Christos Zoulas <chris...@zoulas.com>
+
+       * release 5.20
+
+2014-08-17  10:01  Christos Zoulas <chris...@zoulas.com>
+
+       * recognize encrypted CDF documents
+
+2014-08-04   9:18  Christos Zoulas <chris...@zoulas.com>
+
+       * add magic_load_buffers from Brooks Davis
+
+2014-07-24  16:40  Christos Zoulas <chris...@zoulas.com>
+
+       * add thumbs.db support
+
 2014-06-12  12:28  Christos Zoulas <chris...@zoulas.com>
 
        * release 5.19

Modified: releng/10.1/contrib/file/README
==============================================================================
--- releng/10.1/contrib/file/README     Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/README     Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,6 +1,6 @@
 ## README for file(1) Command ##
 
-    @(#) $File: README,v 1.48 2014/03/07 13:55:30 christos Exp $
+    @(#) $File: README,v 1.49 2015/01/02 20:23:04 christos Exp $
 
 Mailing List: f...@mx.gw.com  
 Mailing List archives: http://mx.gw.com/pipermail/file/  
@@ -25,8 +25,8 @@ A public read-only git repository of the
 
        https://github.com/file/file
 
-The major changes for 5.x are CDF file parsing, indirect magic, and
-overhaul in mime and ascii encoding handling.
+The major changes for 5.x are CDF file parsing, indirect magic, name/use
+(recursion) and overhaul in mime and ascii encoding handling.
 
 The major feature of 4.x is the refactoring of the code into a library,
 and the re-write of the file command in terms of that library. The library
@@ -67,33 +67,41 @@ in magic(5) format please, to the mainta
 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/asctime_r.c - replacement for OS's that don't have it.  
 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/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/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 - for systems that don't have it.  
+src/ctime_r.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/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/getopt_long.c - for systems that don't have it.  
-src/getline.c - for systems that don't have it.  
+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/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).  
 src/names.h - header file for ascmagic.c  
+src/magic.h.in - source file for magic.h
 src/magic.c - the libmagic api  
+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/strlcat.c - for systems that don't have it.  
-src/strlcpy.c - for systems that don't have it.  
+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/tar.h - tar file definitions
 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.

Modified: releng/10.1/contrib/file/TODO
==============================================================================
--- releng/10.1/contrib/file/TODO       Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/TODO       Tue Jun  9 22:13:25 2015        
(r284193)
@@ -15,3 +15,5 @@ small amount of C is needed (because fas
 required for soft magic, not the more detailed information given by
 hard-wired routines). In this regard, note that hplip, which is
 BSD-licensed, has a magic reimplementation in Python.
+
+Read the kerberos magic entry for more ideas.

Modified: releng/10.1/contrib/file/config.h.in
==============================================================================
--- releng/10.1/contrib/file/config.h.in        Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/config.h.in        Tue Jun  9 22:13:25 2015        
(r284193)
@@ -44,6 +44,9 @@
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
+/* Define to 1 if you have the `freelocale' function. */
+#undef HAVE_FREELOCALE
+
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
@@ -95,9 +98,15 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
+/* Define to 1 if you have the `newlocale' function. */
+#undef HAVE_NEWLOCALE
+
 /* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
@@ -182,6 +191,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `uselocale' function. */
+#undef HAVE_USELOCALE
+
 /* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
@@ -219,6 +231,9 @@
 /* Define to 1 if `vfork' works. */
 #undef HAVE_WORKING_VFORK
 
+/* Define to 1 if you have the <xlocale.h> header file. */
+#undef HAVE_XLOCALE_H
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 

Modified: releng/10.1/contrib/file/configure
==============================================================================
--- releng/10.1/contrib/file/configure  Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/configure  Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.19.
+# Generated by GNU Autoconf 2.69 for file 5.22.
 #
 # Report bugs to <chris...@astron.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.19'
-PACKAGE_STRING='file 5.19'
+PACKAGE_VERSION='5.22'
+PACKAGE_STRING='file 5.22'
 PACKAGE_BUGREPORT='chris...@astron.com'
 PACKAGE_URL=''
 
@@ -1327,7 +1327,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.19 to adapt to many kinds of systems.
+\`configure' configures file 5.22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of file 5.19:";;
+     short | recursive ) echo "Configuration of file 5.22:";;
    esac
   cat <<\_ACEOF
 
@@ -1507,7 +1507,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-file configure 5.19
+file configure 5.22
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2163,7 +2163,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.19, which was
+It was created by file $as_me 5.22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3029,7 +3029,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='file'
- VERSION='5.19'
+ VERSION='5.22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12785,7 +12785,7 @@ fi
 
 done
 
-for ac_header in getopt.h err.h
+for ac_header in getopt.h err.h xlocale.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" 
"$ac_includes_default"
@@ -14191,7 +14191,7 @@ fi
 fi
 
 
-for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth 
strtof
+for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth 
strtof newlocale uselocale freelocale setlocale
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -14998,7 +14998,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # 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.19, which was
+This file was extended by file $as_me 5.22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15064,7 +15064,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.19
+file config.status 5.22
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: releng/10.1/contrib/file/configure.ac
==============================================================================
--- releng/10.1/contrib/file/configure.ac       Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/configure.ac       Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.19],[chris...@astron.com])
+AC_INIT([file],[5.22],[chris...@astron.com])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -82,7 +82,7 @@ AC_HEADER_MAJOR
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(stdint.h fcntl.h locale.h stdint.h inttypes.h unistd.h)
 AC_CHECK_HEADERS(stddef.h utime.h wchar.h wctype.h limits.h)
-AC_CHECK_HEADERS(getopt.h err.h)
+AC_CHECK_HEADERS(getopt.h err.h xlocale.h)
 AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h)
 AC_CHECK_HEADERS(zlib.h)
 
@@ -138,7 +138,7 @@ else
 fi])
 
 dnl Checks for functions
-AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth 
strtof)
+AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth 
strtof newlocale uselocale freelocale setlocale)
 
 dnl Provide implementation of some required functions if necessary
 AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline 
ctime_r asctime_r pread strcasestr fmtcheck)

Modified: releng/10.1/contrib/file/doc/file.man
==============================================================================
--- releng/10.1/contrib/file/doc/file.man       Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/doc/file.man       Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,5 +1,5 @@
-.\" $File: file.man,v 1.106 2014/03/07 23:11:51 christos Exp $
-.Dd January 30, 2014
+.\" $File: file.man,v 1.111 2014/12/16 23:18:40 christos Exp $
+.Dd December 16, 2014
 .Dt FILE __CSECTION__
 .Os
 .Sh NAME
@@ -16,6 +16,7 @@
 .Op Fl F Ar separator
 .Op Fl f Ar namefile
 .Op Fl m Ar magicfiles
+.Op Fl P Ar name=value
 .Ar
 .Ek
 .Nm
@@ -303,6 +304,16 @@ or
 attempt to preserve the access time of files analyzed, to pretend that
 .Nm
 never read them.
+.It Fl P , Fl Fl parameter Ar name=value
+Set various parameter limits.
+.Bl -column "elf_phnum" "Default" 
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" -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 elf_notes Ta 256 Ta max ELF notes processed
+.It Li elf_phnum Ta 128 Ta max ELF program sections processed
+.It Li elf_shnum Ta 32768 Ta max ELF sections processed
+.El
 .It Fl r , Fl Fl raw
 Don't translate unprintable characters to \eooo.
 Normally
@@ -385,6 +396,7 @@ options.
 .Xr hexdump 1 ,
 .Xr od 1 ,
 .Xr strings 1 ,
+.Xr fstyp 8
 .Sh STANDARDS CONFORMANCE
 This program is believed to exceed the System V Interface Definition
 of FILE(CMD), as near as one can determine from the vague language

Modified: releng/10.1/contrib/file/doc/libmagic.man
==============================================================================
--- releng/10.1/contrib/file/doc/libmagic.man   Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/doc/libmagic.man   Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.28 2014/03/02 14:47:16 christos Exp $
+.\" $File: libmagic.man,v 1.34 2014/12/16 23:18:40 christos Exp $
 .\"
 .\" Copyright (c) Christos Zoulas 2003.
 .\" All Rights Reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 6, 2012
+.Dd December 16, 2014
 .Dt LIBMAGIC 3
 .Os
 .Sh NAME
@@ -40,6 +40,9 @@
 .Nm magic_compile ,
 .Nm magic_list ,
 .Nm magic_load ,
+.Nm magic_load_buffers ,
+.Nm magic_setparam ,
+.Nm magic_getparam ,
 .Nm magic_version
 .Nd Magic number recognition library
 .Sh LIBRARY
@@ -71,6 +74,12 @@
 .Ft int
 .Fn magic_load "magic_t cookie" "const char *filename"
 .Ft int
+.Fn magic_load_buffers "magic_t cookie" "void **buffers" "size_t *sizes" 
"size_t nbuffers"
+.Ft int
+.Fn magic_getparam "magic_t cookie" "int param" "void *value"
+.Ft int
+.Fn magic_setparam "magic_t cookie" "int param" "const void *value"
+.Ft int
 .Fn magic_version "void"
 .Sh DESCRIPTION
 These functions
@@ -253,6 +262,60 @@ adds
 to the database filename as appropriate.
 .Pp
 The
+.Fn magic_load_buffers
+function takes an array of size
+.Fa nbuffers
+of
+.Fa buffers
+with a respective size for each in the array of
+.Fa sizes
+loaded with the contents of the magic databases from the filesystem.
+This function can be used in environment where the magic library does
+not have direct access to the filesystem, but can access the magic
+database via shared memory or other IPC means.
+.Pp
+The
+.Fn magic_getparam
+and
+.Fn magic_setparam
+allow getting and setting various limits related to the the magic
+library.
+.Bl -column "MAGIC_PARAM_ELF_PHNUM_MAX" "size_t" "Default" -offset indent
+.It Sy "Parameter" Ta Sy "Type" Ta Sy "Default"
+.It Li MAGIC_PARAM_INDIR_MAX Ta size_t Ta 15
+.It Li MAGIC_PARAM_NAME_MAX Ta size_t Ta 30
+.It Li MAGIC_PARAM_ELF_NOTES_MAX Ta size_t Ta 256
+.It Li MAGIC_PARAM_ELF_PHNUM_MAX Ta size_t Ta 128
+.It Li MAGIC_PARAM_ELF_SHNUM_MAX Ta size_t Ta 32768
+.El
+.Pp
+The
+.Dv MAGIC_PARAM_INDIR_RECURSION
+parameter controls how many levels of recursion will be followed for
+indirect magic entries.
+.Pp
+The
+.Dv MAGIC_PARAM_NAME_RECURSION
+parameter controls how many levels of recursion will be followed for
+for name/use calls.
+.Pp
+The
+.Dv MAGIC_PARAM_NAME_MAX
+parameter controls the maximum number of calls for name/use.
+.Pp
+The
+.Dv MAGIC_PARAM_NOTES_MAX
+parameter controls how many ELF notes will be processed.
+.Pp
+The
+.Dv MAGIC_PARAM_PHNUM_MAX
+parameter controls how many ELF program sections will be processed.
+.Pp
+The
+.Dv MAGIC_PARAM_SHNUM_MAX
+parameter controls how many ELF sections will be processed.
+.Pp
+The
 .Fn magic_version
 command returns the version number of this library which is compiled into
 the shared library using the constant

Modified: releng/10.1/contrib/file/doc/magic.man
==============================================================================
--- releng/10.1/contrib/file/doc/magic.man      Tue Jun  9 21:39:38 2015        
(r284192)
+++ releng/10.1/contrib/file/doc/magic.man      Tue Jun  9 22:13:25 2015        
(r284193)
@@ -1,5 +1,5 @@
-.\" $File: magic.man,v 1.84 2014/06/03 19:01:34 christos Exp $
-.Dd June 3, 2014
+.\" $File: magic.man,v 1.85 2015/01/01 17:07:34 christos Exp $
+.Dd January 1, 2015
 .Dt MAGIC __FSECTION__
 .Os
 .\" install as magic.4 on USG, magic.5 on V7, Berkeley and Linux systems.
@@ -200,6 +200,11 @@ interpreted as a UNIX-style date, but in
 than UTC.
 .It Dv indirect
 Starting at the given offset, consult the magic database again.
+The offset of th
+.Dv indirect
+magic is by default absolute in the file, but one can specify
+.Dv /r
+to indicate that the offset is relative from the beginning of the entry.
 .It Dv name
 Define a
 .Dq named

Modified: releng/10.1/contrib/file/magic/Magdir/android
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/android       Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/android       Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------
-# $File: android,v 1.4 2014/06/03 19:01:34 christos Exp $
+# $File: android,v 1.7 2014/11/10 05:08:23 christos Exp $
 # Various android related magic entries
 #------------------------------------------------------------
 
@@ -15,54 +15,11 @@
 >0     regex   dey\n[0-9]{2}\0 Dalvik dex file (optimized for host)
 >4     string  >000                    version %s
 
-# http://android.stackexchange.com/questions/23357/\
-# is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
-# 23608#23608
-0      string  ANDROID\040BACKUP\n     Android Backup
->15    string  1\n                     \b, version 1
->17    string  0\n                     \b, uncompressed
->17    string  1\n                     \b, compressed
->19    string  none\n                  \b, unencrypted
->19    string  AES-256\n               \b, encrypted AES-256
-
-# Android bootimg format
-# From https://android.googlesource.com/\
-# platform/system/core/+/master/mkbootimg/bootimg.h
-0              string  ANDROID!        Android bootimg
->8             lelong  >0                      \b, kernel
->>12   lelong  >0                      \b (0x%x)
->16            lelong  >0                      \b, ramdisk
->>20   lelong  >0                      \b (0x%x)
->24            lelong  >0                      \b, second stage
->>28   lelong  >0                      \b (0x%x)
->36            lelong  >0                      \b, page size: %d
->38            string  >0                      \b, name: %s
->64            string  >0                      \b, cmdline (%s)
-# Dalvik .dex format. http://retrodev.com/android/dexformat.html
-# From <m...@google.com> "Mike Fleming"
-# Fixed to avoid regexec 17 errors on some dex files
-# From <d...@lookout.com> "Tim Strazzere"
-0      string  dex\n
->0     regex   dex\n[0-9]{2}\0 Dalvik dex file
->4     string  >000                    version %s
-0      string  dey\n
->0     regex   dey\n[0-9]{2}\0 Dalvik dex file (optimized for host)
->4     string  >000                    version %s
-
-# http://android.stackexchange.com/questions/23357/\
-# is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
-# 23608#23608
-0      string  ANDROID\040BACKUP\n     Android Backup
->15    string  1\n                     \b, version 1
->17    string  0\n                     \b, uncompressed
->17    string  1\n                     \b, compressed
->19    string  none\n                  \b, unencrypted
->19    string  AES-256\n               \b, encrypted AES-256
-
 # Android bootimg format
 # From https://android.googlesource.com/\
 # platform/system/core/+/master/mkbootimg/bootimg.h
 0              string  ANDROID!        Android bootimg
+>1024  string  LOKI\01         \b, LOKI'd
 >8             lelong  >0                      \b, kernel
 >>12   lelong  >0                      \b (0x%x)
 >16            lelong  >0                      \b, ramdisk
@@ -98,3 +55,85 @@
 #>>>>>&1       regex/1l .*     \b, PBKDF2 rounds: %s
 #>>>>>>&1      regex/1l .*     \b, IV: %s
 #>>>>>>>&1     regex/1l .*     \b, Key: %s
+
+# *.pit files by Joerg Jenderek
+# http://forum.xda-developers.com/showthread.php?p=9122369
+# http://forum.xda-developers.com/showthread.php?t=816449
+# Partition Information Table for Samsung's smartphone with Android
+# used by flash software Odin
+0              ulelong                 0x12349876      
+# 1st pit entry marker
+>0x01C ulequad&0xFFFFFFFCFFFFFFFC      =0x0000000000000000     
+# minimal 13 and maximal 18 PIT entries found
+>>4            ulelong                 <128    Partition Information Table for 
Samsung smartphone
+>>>4           ulelong                 x       \b, %d entries
+# 1. pit entry
+>>>4           ulelong                 >0      \b; #1
+>>>0x01C       use                             PIT-entry
+>>>4           ulelong                 >1      \b; #2
+>>>0x0A0       use                             PIT-entry
+>>>4           ulelong                 >2      \b; #3
+>>>0x124       use                             PIT-entry
+>>>4           ulelong                 >3      \b; #4
+>>>0x1A8       use                             PIT-entry
+>>>4           ulelong                 >4      \b; #5
+>>>0x22C       use                             PIT-entry
+>>>4           ulelong                 >5      \b; #6
+>>>0x2B0       use                             PIT-entry
+>>>4           ulelong                 >6      \b; #7
+>>>0x334       use                             PIT-entry
+>>>4           ulelong                 >7      \b; #8
+>>>0x3B8       use                             PIT-entry
+>>>4           ulelong                 >8      \b; #9
+>>>0x43C       use                             PIT-entry
+>>>4           ulelong                 >9      \b; #10
+>>>0x4C0       use                             PIT-entry
+>>>4           ulelong                 >10     \b; #11
+>>>0x544       use                             PIT-entry
+>>>4           ulelong                 >11     \b; #12
+>>>0x5C8       use                             PIT-entry
+>>>4           ulelong                 >12     \b; #13
+>>>>0x64C      use                             PIT-entry
+# 14. pit entry
+>>>4           ulelong                 >13     \b; #14
+>>>>0x6D0      use                             PIT-entry
+>>>4           ulelong                 >14     \b; #15
+>>>0x754       use                             PIT-entry
+>>>4           ulelong                 >15     \b; #16
+>>>0x7D8       use                             PIT-entry
+>>>4           ulelong                 >16     \b; #17
+>>>0x85C       use                             PIT-entry
+# 18. pit entry
+>>>4           ulelong                 >17     \b; #18
+>>>0x8E0       use                             PIT-entry
+
+0      name                    PIT-entry
+# garbage value implies end of pit entries
+>0x00          ulequad&0xFFFFFFFCFFFFFFFC      =0x0000000000000000     
+# skip empty partition name
+>>0x24         ubyte                           !0                      
+# partition name
+>>>0x24                string                          >\0                     
%-.32s
+# flags
+>>>0x0C                ulelong&0x00000002              2                       
\b+RW
+# partition ID:
+# 
0~IPL,MOVINAND,GANG;1~PIT,GPT;2~HIDDEN;3~SBL,HIDDEN;4~SBL2,HIDDEN;5~BOOT;6~KENREl,RECOVER,misc;7~RECOVER
+# 
;11~MODEM;20~efs;21~PARAM;22~FACTORY,SYSTEM;23~DBDATAFS,USERDATA;24~CACHE;80~BOOTLOADER;81~TZSW
+>>>0x08        ulelong         x                       (0x%x)
+# filename
+>>>0x44                string                          >\0                     
"%-.64s"
+#>>>0x18       ulelong                         >0                      
+# blocksize in 512 byte units ?
+#>>>>0x18      ulelong                         x                       \b, %db
+# partition size in blocks ?
+#>>>>0x22      ulelong                         x                       \b*%d
+
+# Android bootimg format
+# From https://android.googlesource.com/\
+# platform/system/core/+/master/libsparse/sparse_format.h
+0              lelong  0xed26ff3a              Android sparse image
+>4             leshort x                       \b, version: %d
+>6             leshort x                       \b.%d
+>16            lelong  x                       \b, Total of %d
+>12            lelong  x                       \b %d-byte output blocks in
+>20            lelong  x                       \b %d input chunks.

Modified: releng/10.1/contrib/file/magic/Magdir/animation
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/animation     Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/animation     Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: animation,v 1.53 2014/04/30 21:41:02 christos Exp $
+# $File: animation,v 1.56 2014/10/23 23:12:51 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -32,43 +32,155 @@
 !:mime application/x-quicktime-player
 4      string/W        jP              JPEG 2000 image
 !:mime image/jp2
+# http://www.ftyps.com/ with local additions
 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
-!:mime video/mp4
->8     string          mp7t            \b, MPEG v4 system, MPEG v7 XML
->8     string          mp7b            \b, MPEG v4 system, MPEG v7 binary XML
->8     string/W        jp2             \b, JPEG 2000
-!:mime image/jp2
+>8     string          3g2             \b, MPEG v4 system, 3GPP2
+!:mime video/3gpp2
+>>11   byte            4               \b v4 (H.263/AMR GSM 6.10)
+>>11   byte            5               \b v5 (H.263/AMR GSM 6.10)
+>>11   byte            6               \b v6 (ITU H.264/AMR GSM 6.10)
+>>11   byte            a               \b C.S0050-0 V1.0
+>>11   byte            b               \b C.S0050-0-A V1.0.0
+>>11   byte            c               \b C.S0050-0-B V1.0
 >8     string          3ge             \b, MPEG v4 system, 3GPP
 !:mime video/3gpp
+>>11   byte            6               \b, Release 6 MBMS Extended 
Presentations
+>>11   byte            7               \b, Release 7 MBMS Extended 
Presentations
 >8     string          3gg             \b, MPEG v4 system, 3GPP
+>11    byte            6               \b, Release 6 General Profile
 !:mime video/3gpp
 >8     string          3gp             \b, MPEG v4 system, 3GPP
+>11    byte            1               \b, Release %d (non existent)
+>11    byte            2               \b, Release %d (non existent)
+>11    byte            3               \b, Release %d (non existent)
+>11    byte            4               \b, Release %d
+>11    byte            5               \b, Release %d
+>11    byte            6               \b, Release %d
+>11    byte            7               \b, Release %d Streaming Servers
 !:mime video/3gpp
 >8     string          3gs             \b, MPEG v4 system, 3GPP
+>11    byte            7               \b, Release %d Streaming Servers
 !:mime video/3gpp
->8     string          3g2             \b, MPEG v4 system, 3GPP2
+>8     string          avc1            \b, MPEG v4 system, 3GPP JVT AVC [ISO 
14496-12:2005]
+!:mime video/mp4
+>8     string/W        qt              \b, Apple QuickTime movie
+!:mime video/quicktime
+>8     string          CAEP            \b, Canon Digital Camera
+>8     string          caqv            \b, Casio Digital Camera
+>8     string          CDes            \b, Convergent Design
+>8     string          da0a            \b, DMB MAF w/ MPEG Layer II aud, MOT 
slides, DLS, JPG/PNG/MNG
+>8     string          da0b            \b, DMB MAF, ext DA0A, with 3GPP timed 
text, DID, TVA, REL, IPMP
+>8     string          da1a            \b, DMB MAF audio with ER-BSAC audio, 
JPG/PNG/MNG images
+>8     string          da1b            \b, DMB MAF, ext da1a, with 3GPP timed 
text, DID, TVA, REL, IPMP
+>8     string          da2a            \b, DMB MAF aud w/ HE-AAC v2 aud, MOT 
slides, DLS, JPG/PNG/MNG
+>8     string          da2b            \b, DMB MAF, ext da2a, with 3GPP timed 
text, DID, TVA, REL, IPMP
+>8     string          da3a            \b, DMB MAF aud with HE-AAC aud, 
JPG/PNG/MNG images
+>8     string          da3b            \b, DMB MAF, ext da3a w/ BIFS, 3GPP, 
DID, TVA, REL, IPMP
+>8     string          dmb1            \b, DMB MAF supporting all the 
components defined in the spec
+>8     string          dmpf            \b, Digital Media Project
+>8     string          drc1            \b, Dirac (wavelet compression), encap 
in ISO base media (MP4)
+>8     string          dv1a            \b, DMB MAF vid w/ AVC vid, ER-BSAC 
aud, BIFS, JPG/PNG/MNG, TS
+>8     string          dv1b            \b, DMB MAF, ext dv1a, with 3GPP timed 
text, DID, TVA, REL, IPMP
+>8     string          dv2a            \b, DMB MAF vid w/ AVC vid, HE-AAC v2 
aud, BIFS, JPG/PNG/MNG, TS
+>8     string          dv2b            \b, DMB MAF, ext dv2a, with 3GPP timed 
text, DID, TVA, REL, IPMP
+>8     string          dv3a            \b, DMB MAF vid w/ AVC vid, HE-AAC aud, 
BIFS, JPG/PNG/MNG, TS
+>8     string          dv3b            \b, DMB MAF, ext dv3a, with 3GPP timed 
text, DID, TVA, REL, IPMP
+>8     string          dvr1            \b, DVB (.DVB) over RTP
+!:mime video/vnd.dvb.file
+>8     string          dvt1            \b, DVB (.DVB) over MPEG-2 Transport 
Stream
+!:mime video/vnd.dvb.file
+>8     string          F4V             \b, Video for Adobe Flash Player 9+ 
(.F4V)
+!:mime video/mp4
+>8     string          F4P             \b, Protected Video for Adobe Flash 
Player 9+ (.F4P)
+!:mime video/mp4
+>8     string          F4A             \b, Audio for Adobe Flash Player 9+ 
(.F4A)
+!:mime audio/mp4
+>8     string          F4B             \b, Audio Book for Adobe Flash Player 
9+ (.F4B)
+!:mime audio/mp4
+>8     string          isc2            \b, ISMACryp 2.0 Encrypted File
+#      ?/enc-isoff-generic
+>8     string          iso2            \b, MP4 Base Media v2 [ISO 
14496-12:2005]
+!:mime video/mp4
+>8     string          isom            \b, MP4 Base Media v1 [IS0 
14496-12:2003]
+!:mime video/mp4
+>8     string/W        jp2             \b, JPEG 2000
+!:mime image/jp2
+>8     string          JP2             \b, JPEG 2000 Image (.JP2) [ISO 15444-1 
?]
+!:mime image/jp2
+>8     string          JP20            \b, Unknown, from GPAC samples (prob 
non-existent)
+>8     string          jpm             \b, JPEG 2000 Compound Image (.JPM) 
[ISO 15444-6]
+!:mime image/jpm
+>8     string          jpx             \b, JPEG 2000 w/ extensions (.JPX) [ISO 
15444-2]
+!:mime image/jpx
+>8     string          KDDI            \b, 3GPP2 EZmovie for KDDI 3G cellphones
 !:mime video/3gpp2
->>11   byte            4               \b v4 (H.263/AMR GSM 6.10)
->>11   byte            5               \b v5 (H.263/AMR GSM 6.10)
->>11   byte            6               \b v6 (ITU H.264/AMR GSM 6.10)
+>8     string          M4A             \b, Apple iTunes ALAC/AAC-LC (.M4A) 
Audio
+!:mime audio/x-m4a
+>8     string          M4B             \b, Apple iTunes ALAC/AAC-LC (.M4B) 
Audio Book
+!:mime audio/mp4
+>8     string          M4P             \b, Apple iTunes ALAC/AAC-LC (.M4P) AES 
Protected Audio
+!:mime video/mp4
+>8     string          M4V             \b, Apple iTunes Video (.M4V) Video
+!:mime video/x-m4v
+>8     string          M4VH            \b, Apple TV (.M4V)
+!:mime video/x-m4v
+>8     string          M4VP            \b, Apple iPhone (.M4V)
+!:mime video/x-m4v
+>8     string          mj2s            \b, Motion JPEG 2000 [ISO 15444-3] 
Simple Profile
+!:mime video/mj2
+>8     string          mjp2            \b, Motion JPEG 2000 [ISO 15444-3] 
General Profile
+!:mime video/mj2
+>8     string          mmp4            \b, MPEG-4/3GPP Mobile Profile (.MP4 / 
.3GP) (for NTT)
+!:mime video/mp4
+>8     string          mobi            \b, MPEG-4, MOBI format
+!:mime video/mp4
+>8     string          mp21            \b, MPEG-21 [ISO/IEC 21000-9]
+>8     string          mp41            \b, MP4 v1 [ISO 14496-1:ch13]
+!:mime video/mp4
+>8     string          mp42            \b, MP4 v2 [ISO 14496-14]
+!:mime video/mp4
+>8     string          mp71            \b, MP4 w/ MPEG-7 Metadata [per ISO 
14496-12]
+>8     string          mp7t            \b, MPEG v4 system, MPEG v7 XML
+>8     string          mp7b            \b, MPEG v4 system, MPEG v7 binary XML
 >8     string          mmp4            \b, MPEG v4 system, 3GPP Mobile
 !:mime video/mp4
->8     string          avc1            \b, MPEG v4 system, 3GPP JVT AVC
-!:mime video/3gpp
->8     string/W        M4A             \b, MPEG v4 system, iTunes AAC-LC
+>8     string          MPPI            \b, Photo Player, MAF [ISO/IEC 23000-3]
+>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
+>8     string          NDAS            \b, MP4 v2 [ISO 14496-14] Nero Digital 
AAC Audio
 !:mime audio/mp4
->8     string/W        M4V             \b, MPEG v4 system, iTunes AVC-LC
+>8     string          NDSC            \b, MPEG-4 (.MP4) Nero Cinema Profile
 !:mime video/mp4
->8     string/W        M4P             \b, MPEG v4 system, iTunes AES encrypted
->8     string/W        M4B             \b, MPEG v4 system, iTunes bookmarked
->8     string/W        qt              \b, Apple QuickTime movie
+>8     string          NDSH            \b, MPEG-4 (.MP4) Nero HDTV Profile
+!:mime video/mp4
+>8     string          NDSM            \b, MPEG-4 (.MP4) Nero Mobile Profile
+!:mime video/mp4
+>8     string          NDSP            \b, MPEG-4 (.MP4) Nero Portable Profile
+!:mime video/mp4
+>8     string          NDSS            \b, MPEG-4 (.MP4) Nero Standard Profile
+!:mime video/mp4
+>8     string          NDXC            \b, H.264/MPEG-4 AVC (.MP4) Nero Cinema 
Profile
+!:mime video/mp4
+>8     string          NDXH            \b, H.264/MPEG-4 AVC (.MP4) Nero HDTV 
Profile
+!:mime video/mp4
+>8     string          NDXM            \b, H.264/MPEG-4 AVC (.MP4) Nero Mobile 
Profile
+!:mime video/mp4
+>8     string          NDXP            \b, H.264/MPEG-4 AVC (.MP4) Nero 
Portable Profile
+!:mime video/mp4
+>8     string          NDXS            \b, H.264/MPEG-4 AVC (.MP4) Nero 
Standard Profile
+!:mime video/mp4
+>8     string          odcf            \b, OMA DCF DRM Format 2.0 
(OMA-TS-DRM-DCF-V2_0-20060303-A)
+>8     string          opf2            \b, OMA PDCF DRM Format 2.1 
(OMA-TS-DRM-DCF-V2_1-20070724-C)
+>8     string          opx2            \b, OMA PDCF DRM + XBS ext 
(OMA-TS-DRM_XBS-V1_0-20070529-C)
+>8     string          pana            \b, Panasonic Digital Camera
+>8     string          qt              \b, Apple QuickTime (.MOV/QT)
 !:mime video/quicktime
+>8     string          ROSS            \b, Ross Video
+>8     string          sdv             \b, SD Memory Card Video
+>8     string          ssc1            \b, Samsung stereo, single stream 
(patent pending)
+>8     string          ssc2            \b, Samsung stereo, dual stream (patent 
pending)
 
 # MPEG sequences
 # Scans for all common MPEG header start codes

Modified: releng/10.1/contrib/file/magic/Magdir/archive
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/archive       Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/archive       Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: archive,v 1.87 2014/06/03 19:15:58 christos Exp $
+# $File: archive,v 1.88 2014/08/16 10:42:17 christos Exp $
 # archive:  file(1) magic for archive formats (see also "msdos" for self-
 #           extracting compressed archives)
 #
@@ -954,34 +954,3 @@
 >0xE08 search/7776             \x55\xAA        
 >>&-512        indirect                x               \b; contains 
 
-# Symantec GHOST image by Joerg Jenderek at May 2014
-# http://us.norton.com/ghost/
-# http://www.garykessler.net/library/file_sigs.html
-0              ubelong&0xFFFFf7f0      0xFEEF0100      Norton GHost image
-# *.GHO
->2             ubyte&0x08              0x00            \b, first file
-# *.GHS or *.[0-9] with cns program option
->2             ubyte&0x08              0x08            \b, split file
-# part of split index interesting for *.ghs
->>4            ubyte                   x               id=0x%x
-# compression tag minus one equals numeric compression command line switch 
z[1-9]
->3             ubyte                   0               \b, no compression
->3             ubyte                   2               \b, fast compression 
(Z1)
->3             ubyte                   3               \b, medium compression 
(Z2)
->3             ubyte                   >3              
->>3            ubyte                   <11             \b, compression (Z%d-1)
->2             ubyte&0x08              0x00            
-# ~ 30 byte password field only for *.gho
->>12           ubequad                 !0              \b, password protected
->>44           ubyte                   !1              
-# 1~Image All, sector-by-sector only for *.gho
->>>10          ubyte                   1               \b, sector copy
-# 1~Image Boot track only for *.gho
->>>43          ubyte                   1               \b, boot track
-# 1~Image Disc only for *.gho implies Image Boot track and sector copy
->>44           ubyte                   1               \b, disc sector copy
-# optional image description only *.gho
->>0xff         string                  >\0             "%-.254s"
-# look for DOS sector end sequence
->0xE08 search/7776             \x55\xAA        
->>&-512        indirect                x               \b; contains 

Modified: releng/10.1/contrib/file/magic/Magdir/blender
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/blender       Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/blender       Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: blender,v 1.5 2009/09/19 16:28:08 christos Exp $
+# $File: blender,v 1.6 2014/08/30 08:34:17 christos Exp $
 # blender: file(1) magic for Blender 3D related files
 #
 # Native format rule v1.2. For questions use the developers list 
@@ -35,5 +35,5 @@
 >>>0x44                string  =GLOB           \b.
 >>>>0x60       beshort x               \b%.4d
 
-# Scripts that run in the embeded Python interpreter
+# Scripts that run in the embedded Python interpreter
 0              string  #!BPY           Blender3D BPython script

Modified: releng/10.1/contrib/file/magic/Magdir/cafebabe
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/cafebabe      Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/cafebabe      Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: cafebabe,v 1.16 2014/04/30 21:41:02 christos Exp $
+# $File: cafebabe,v 1.17 2015/01/01 17:07:00 christos Exp $
 # Cafe Babes unite!
 #
 # Since Java bytecode and Mach-O universal binaries have the same magic number,
@@ -45,7 +45,7 @@
 
 0      name            mach-o          \b [
 >0     use             mach-o-cpu      \b
->&(8.L)        indirect                        \b: 
+>(8.L) indirect                        \b: 
 >0     belong          x               \b]
 
 0      belong          0xcafebabe

Modified: releng/10.1/contrib/file/magic/Magdir/commands
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/commands      Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/commands      Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: commands,v 1.50 2014/05/30 16:48:44 christos Exp $
+# $File: commands,v 1.51 2014/09/27 00:12:55 christos Exp $
 # commands:  file(1) magic for various shells and interpreters
 #
 #0     string/w        :                       shell archive or script for 
antique kernel text
@@ -56,7 +56,7 @@
 !:mime text/x-awk
 0      string/wt       #!\ /usr/bin/awk        awk script text executable
 !:mime text/x-awk
-0      regex/4096      =^\\s{0,100}BEGIN\\s{0,100}[{]  awk script text
+0      regex/4096      =^\\s{0,100}BEGIN\\s{0,100}[{]  awk or perl script text
 
 # AT&T Bell Labs' Plan 9 shell
 0      string/wt       #!\ /bin/rc     Plan 9 rc shell script text executable

Modified: releng/10.1/contrib/file/magic/Magdir/compress
==============================================================================
--- releng/10.1/contrib/file/magic/Magdir/compress      Tue Jun  9 21:39:38 
2015        (r284192)
+++ releng/10.1/contrib/file/magic/Magdir/compress      Tue Jun  9 22:13:25 
2015        (r284193)
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: compress,v 1.58 2014/05/07 19:36:59 christos Exp $
+# $File: compress,v 1.62 2014/09/13 14:27:12 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -251,3 +251,13 @@
 # http://code.google.com/p/snappy/source/browse/trunk/framing_format.txt
 0      string  \377\006\0\0sNaPpY      snappy framed data
 !:mime application/x-snappy-framed
+
+# qpress, http://www.quicklz.com/
+0      string  qpress10        qpress compressed data
+!:mime application/x-qpress
+
+# Zlib https://www.ietf.org/rfc/rfc6713.txt
+0      beshort%31      =0      

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to