updated libmagic to version 5.38

binding.gyp

@@ -18,12 +18,12 @@
       'dependencies': [
         'deps/libmagic/libmagic.gyp:libmagic',
       ],
-      'conditions': [
+      '_conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
-            'MACOSX_DEPLOYMENT_TARGET': '10.7',
+            'MACOSX_DEPLOYMENT_TARGET': '10.15',
             'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-            'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++1y',  # -std=gnu++1y
+            'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',  # -std=gnu++1y
             'CLANG_CXX_LIBRARY': 'libc++',
           }
         }],

deps/libmagic/AUTHORS

@@ -1 +1 @@
-See COPYING.
+See COPYING.

deps/libmagic/COPYING

@@ -1,4 +1,4 @@
-$File: COPYING,v 1.1 2008/02/05 19:08:11 christos Exp $
+$File: COPYING,v 1.2 2018/09/09 20:33:28 christos Exp $
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others;
 maintained 1994- Christos Zoulas.
@@ -15,7 +15,7 @@ are met:
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
- 
+
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

deps/libmagic/ChangeLog

@@ -1,3 +1,146 @@
+2020-02-13  13:10  Christos Zoulas <christos@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 <christos@zoulas.com>
+
+	* PR/136: Fix static build by adding a libmagic.pc (Fabrice Fontaine)
+
+2019-12-24  14:16  Christos Zoulas <christos@zoulas.com>
+
+	* add guid support
+
+2019-12-16  21:11  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.38
+
+2019-12-15  22:13  Christos Zoulas <christos@zoulas.com>
+    Document changes since the previous release:
+	- Always accept -S (no sandbox) even if we don't support sandboxing
+	- More syscalls elided for sandboxiing
+	- For ELF dynamic means having an interpreter not just PT_DYNAMIC
+	- Check for large ELF session header offset
+	- When saving and restoring a locale, keep the locale name in our
+	  own storage.
+	- Add a flag to disable CSV file detection.
+	- Don't pass NULL/0 to memset to appease sanitizers.
+	- Avoid spurious prints when looks for extensions or apple strings
+	  in fsmagic.
+	- Add builtin decompressors for xz and and bzip.
+	- Add a limit for the number of CDF elements.
+	- More checks for overflow in CDF.
+
+2019-05-14  22:26  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.37
+
+2019-05-09  22:27  Christos Zoulas <christos@zoulas.com>
+
+	* Make sure that continuation separators are printed
+	  with -k within softmagic
+
+2019-05-06  22:27  Christos Zoulas <christos@zoulas.com>
+
+	* Change SIGPIPE saving and restoring during compression to use
+	  sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko)
+	* Cache stat(2) calls more to reduce number of calls (Denys Vlasenko)
+
+2019-05-06  17:25  Christos Zoulas <christos@zoulas.com>
+
+	* PR/77: Handle --mime-type and -k correctly.
+
+2019-05-03  15:26  Christos Zoulas <christos@zoulas.com>
+
+	* Switch decompression code to use vfork() because
+	  tools like rpmdiff and rpmbuild call libmagic
+	  with large process footprints (Denys Vlasenko)
+
+2019-04-07  14:05  Christos Zoulas <christos@zoulas.com>
+
+	* PR/75: --enable-zlib, did not work.
+
+2019-02-27  11:54  Christos Zoulas <christos@zoulas.com>
+
+	* Improve regex efficiency (Michael Schroeder) by:
+		1. Prefixing regex searches with regular search
+		   for keywords where possible
+		2. Using memmem(3) where available
+
+2019-02-20  10:16  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.36
+
+2019-02-19  15:30  Christos Zoulas <christos@zoulas.com>
+
+	* Fix cast to use cast macros
+	* Add UCS-32 builtin detection (PR/61) reported by tmc
+
+2019-02-18  18:24  Christos Zoulas <christos@zoulas.com>
+
+	* Fix stack read (PR/62) and write (PR/64) stack overflows
+	  reported by spinpx 
+
+2018-10-18  19:32  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.35
+
+2018-09-10  20:38  Christos Zoulas <christos@zoulas.com>
+
+	* Add FreeBSD ELF core file support (John Baldwin)
+
+2018-08-20  18:40  Christos Zoulas <christos@zoulas.com>
+
+	* PR/30: Allow all parameter values to be set (don't treat 0 specially)
+	* handle default annotations on the softmagic match instead at the
+	  end.
+
+2018-07-25  10:17  Christos Zoulas <christos@zoulas.com>
+
+	* PR/23: Recognize JSON files
+
+2018-07-25  10:17  Christos Zoulas <christos@zoulas.com>
+
+	* PR/18: file --mime-encoding should not print mime-type
+
+2018-07-25   8:50  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.34
+
+2018-06-22  16:38  Christos Zoulas <christos@zoulas.com>
+
+	* Add Quad indirect offsets
+
+2018-05-24  14:10  Christos Zoulas <christos@zoulas.com>
+
+	* Enable parsing of ELF dynamic sections to handle PIE better
+
+2018-04-15  14:52  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.33
+
+2018-02-24  14:50  Christos Zoulas <christos@zoulas.com>
+
+	* extend the support for ${x?:} expansions for magic descriptions
+
+2018-02-21  16:25  Christos Zoulas <christos@zoulas.com>
+
+	* add support for ${x?:} in mime types to handle
+	  pie binaries.
+
+2017-11-03   9:23  Christos Zoulas <christos@zoulas.com>
+
+	* add support for negative offsets (offsets from the end of file)
+
+2017-09-26   8:22  Christos Zoulas <christos@zoulas.com>
+
+	* close the file on error when writing magic (Steve Grubb)
+
+2017-09-24  12:02  Christos Zoulas <christos@zoulas.com>
+
+	* seccomp support (Paul Moore)
+
 2017-09-02  11:53  Christos Zoulas <christos@zoulas.com>
 
 	* release 5.32
@@ -53,7 +196,7 @@
 	* Add missing overflow check in der magic (Jonas Wagner)
 
 2016-10-25  10:40  Christos Zoulas <christos@zoulas.com>
-	
+
 	* release 5.29
 
 2016-10-24  11:20  Christos Zoulas <christos@zoulas.com>
@@ -94,11 +237,11 @@
 	    - set offset to 0 on failure.
 
 2016-05-13  12:00  Christos Zoulas <christos@zoulas.com>
-	
+
 	* release 5.27
 
 2016-04-18   9:35  Christos Zoulas <christos@zoulas.com>
-	
+
 	* Errors comparing DER entries or computing offsets
 	  are just indications of malformed non-DER files.
 	  Don't print them.
@@ -107,7 +250,7 @@
 	* Put new bytes constant in the right file (not the generated one)
 
 2016-04-16  18:34  Christos Zoulas <christos@zoulas.com>
-	
+
 	* release 5.26
 
 2016-03-31  13:50  Christos Zoulas <christos@zoulas.com>
@@ -153,7 +296,7 @@
 	* PR/492: compression forking was broken with magic_buffer.
 
 2015-09-16   9:50  Christos Zoulas <christos@zoulas.com>
-	
+
 	* release 5.25
 
 2015-09-11  13:25  Christos Zoulas <christos@zoulas.com>
@@ -181,7 +324,7 @@
 	* release 5.23
 
 2015-06-09  16:10  Christos Zoulas <christos@zoulas.com>
-	
+
 	* Fix issue with regex range for magic with offset
 	* Always return true from mget with USE (success to mget not match
 	  indication). Fixes mime evaluation after USE magic
@@ -234,12 +377,12 @@
 	* add indirect relative for TIFF/Exif
 
 2014-12-16  18:10  Christos Zoulas <christos@zoulas.com>
-	
+
 	* restructure elf note printing to avoid repeated messages
 	* add note limit, suggested by Alexander Cherepanov
 
 2014-12-16  16:53  Christos Zoulas <christos@zoulas.com>
-	
+
 	* Bail out on partial pread()'s (Alexander Cherepanov)
 	* Fix incorrect bounds check in file_printable (Alexander Cherepanov)
 
@@ -250,7 +393,7 @@
 	  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 <christos@zoulas.com>
 
 	* release 5.21
@@ -293,7 +436,7 @@
 	  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 <christos@zoulas.com>
 
 	* fix bounds in note reading (Francisco Alonso / Red Hat)
@@ -324,7 +467,7 @@
 	* release 5.19
 
 2014-06-09   9:04  Christos Zoulas <christos@zoulas.com>
-	
+
 	* Misc buffer overruns and missing buffer size tests in cdf parsing
 	  (Francisco Alonso, Jan Kaluza)
 
@@ -354,7 +497,7 @@
 
 2014-05-04  14:55  Christos Zoulas <christos@zoulas.com>
 
-	* PR/351: Fix compilation of empty files 
+	* PR/351: Fix compilation of empty files
 
 2014-04-30  17:39  Christos Zoulas <christos@zoulas.com>
 
@@ -458,7 +601,7 @@
 	* Don't treat magic as an error if offset was past EOF (Christoph Biedl)
 
 2013-05-28  17:25  Christos Zoulas <christos@zoulas.com>
-	
+
 	* Fix spacing issues in softmagic and elf (Jan Kaluza)
 
 2013-05-02  18:00  Christos Zoulas <christos@zoulas.com>
@@ -514,7 +657,7 @@
 	* Make getline public so that file can link against it.
 	  Perhaps it is better to rename it, or hide it differently.
 	  Fixes builds on platforms that do not provide it.
-	  
+
 2013-01-07  16:30  Christos Zoulas <christos@zoulas.com>
 
 	* Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
@@ -864,7 +1007,7 @@
 	  (Cheng Renquan)
 
 2009-05-08  13:40  Christos Zoulas <christos@zoulas.com>
-	
+
 	* lint fixes and more from NetBSD
 
 2009-05-06  10:25  Christos Zoulas <christos@zoulas.com>
@@ -884,7 +1027,7 @@
 
 2009-03-27  18:43  Christos Zoulas <christos@zoulas.com>
 
-	* don't print \012- separators in the same magic entry 
+	* don't print \012- separators in the same magic entry
 	  if it consists of multiple magic printing lines.
 
 2009-03-23  10:20  Christos Zoulas <christos@zoulas.com>

deps/libmagic/MAINT

@@ -1,4 +1,4 @@
-$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $
+$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $
 
 Maintenance notes:
 

deps/libmagic/NEWS

@@ -1 +1 @@
-See ChangeLog.
+See ChangeLog.