The branch main has been updated by delphij:
URL:
https://cgit.FreeBSD.org/src/commit/?id=43a5ec4eb41567cc92586503212743d89686d78f
commit 43a5ec4eb41567cc92586503212743d89686d78f
Merge: a3522837b021 048bd4094ff3
Author: Xin LI <delp...@freebsd.org>
AuthorDate: 2022-01-04 06:02:42 +0000
Commit: Xin LI <delp...@freebsd.org>
CommitDate: 2022-01-04 06:03:39 +0000
file: upgrade to 5.41.
MFC after: 2 weeks
contrib/file/ChangeLog | 78 +++
contrib/file/Makefile.am | 2 +-
contrib/file/Makefile.in | 7 +-
contrib/file/README | 159 -----
contrib/file/README.DEVELOPER | 49 ++
contrib/file/RELEASE-PROCEDURE | 29 +
contrib/file/acinclude.m4 | 35 +-
contrib/file/aclocal.m4 | 79 +--
contrib/file/config.h.in | 3 +
contrib/file/configure | 608 +++--------------
contrib/file/configure.ac | 7 +-
contrib/file/doc/Makefile.in | 3 +-
contrib/file/doc/file.man | 61 +-
contrib/file/doc/magic.man | 9 +-
contrib/file/ltmain.sh | 0
contrib/file/m4/visibility.m4 | 77 +++
contrib/file/magic/Magdir/acorn | 10 +-
contrib/file/magic/Magdir/aes | 29 +
contrib/file/magic/Magdir/algol68 | 42 +-
contrib/file/magic/Magdir/amigaos | 147 +++-
contrib/file/magic/Magdir/android | 33 +-
contrib/file/magic/Magdir/animation | 163 ++++-
contrib/file/magic/Magdir/apple | 10 +-
contrib/file/magic/Magdir/archive | 207 ++++--
contrib/file/magic/Magdir/arm | 41 ++
contrib/file/magic/Magdir/asf | 6 +-
contrib/file/magic/Magdir/audio | 64 +-
contrib/file/magic/Magdir/avm | 33 +
contrib/file/magic/Magdir/biosig | 2 +-
contrib/file/magic/Magdir/blit | 6 +-
contrib/file/magic/Magdir/bm | 10 +
contrib/file/magic/Magdir/bsi | 7 +-
contrib/file/magic/Magdir/bytecode | 30 +
contrib/file/magic/Magdir/c-lang | 7 +-
contrib/file/magic/Magdir/c64 | 13 +-
contrib/file/magic/Magdir/cad | 109 ++-
contrib/file/magic/Magdir/cafebabe | 61 +-
contrib/file/magic/Magdir/citrus | 6 +-
contrib/file/magic/Magdir/clipper | 6 +-
contrib/file/magic/Magdir/coff | 78 ++-
contrib/file/magic/Magdir/commands | 100 +--
contrib/file/magic/Magdir/compress | 9 +-
contrib/file/magic/Magdir/console | 62 +-
contrib/file/magic/Magdir/coverage | 4 +-
contrib/file/magic/Magdir/crypto | 5 +
contrib/file/magic/Magdir/database | 212 +++++-
contrib/file/magic/Magdir/der | 7 +-
contrib/file/magic/Magdir/diff | 15 +-
contrib/file/magic/Magdir/digital | 3 +-
contrib/file/magic/Magdir/editors | 6 +-
contrib/file/magic/Magdir/elf | 45 +-
contrib/file/magic/Magdir/espressif | 4 +-
contrib/file/magic/Magdir/filesystems | 297 +++++----
contrib/file/magic/Magdir/fonts | 33 +-
contrib/file/magic/Magdir/forth | 46 +-
contrib/file/magic/Magdir/fsav | 12 +-
contrib/file/magic/Magdir/games | 215 +++++-
contrib/file/magic/Magdir/git | 8 +-
contrib/file/magic/Magdir/gnome | 6 +-
contrib/file/magic/Magdir/gnu | 42 +-
contrib/file/magic/Magdir/gpt | 4 +-
contrib/file/magic/Magdir/gpu | 10 +-
contrib/file/magic/Magdir/guile | 13 -
contrib/file/magic/Magdir/hitachi-sh | 6 +-
contrib/file/magic/Magdir/human68k | 4 +-
contrib/file/magic/Magdir/ibm370 | 6 +-
contrib/file/magic/Magdir/ibm6000 | 4 +-
contrib/file/magic/Magdir/icc | 26 +-
contrib/file/magic/Magdir/iff | 10 +-
contrib/file/magic/Magdir/images | 736 +++++++++++++++++----
contrib/file/magic/Magdir/intel | 6 +-
contrib/file/magic/Magdir/jpeg | 25 +-
contrib/file/magic/Magdir/lammps | 64 ++
contrib/file/magic/Magdir/lif | 45 +-
contrib/file/magic/Magdir/linux | 79 ++-
contrib/file/magic/Magdir/lisp | 5 +-
contrib/file/magic/Magdir/locoscript | 12 +
contrib/file/magic/Magdir/lua | 11 +-
contrib/file/magic/Magdir/mach | 140 ++--
contrib/file/magic/Magdir/macintosh | 18 +-
contrib/file/magic/Magdir/mail.news | 11 +-
contrib/file/magic/Magdir/map | 112 ++--
contrib/file/magic/Magdir/maple | 58 +-
contrib/file/magic/Magdir/mathematica | 95 ++-
contrib/file/magic/Magdir/measure | 7 +-
contrib/file/magic/Magdir/misctools | 35 +-
contrib/file/magic/Magdir/modem | 4 +-
contrib/file/magic/Magdir/motorola | 4 +-
contrib/file/magic/Magdir/mozilla | 6 +-
contrib/file/magic/Magdir/msdos | 313 +++++++--
contrib/file/magic/Magdir/msooxml | 23 +-
contrib/file/magic/Magdir/msx | 68 +-
contrib/file/magic/Magdir/neko | 12 -
contrib/file/magic/Magdir/netware | 6 +-
contrib/file/magic/Magdir/nim-lang | 29 +
contrib/file/magic/Magdir/ole2compounddocs | 71 +-
contrib/file/magic/Magdir/os2 | 137 +++-
contrib/file/magic/Magdir/pcjr | 8 +
contrib/file/magic/Magdir/pdf | 11 +-
contrib/file/magic/Magdir/pgf | 6 +-
contrib/file/magic/Magdir/pgp | 59 +-
contrib/file/magic/Magdir/pgp-binary-keys | 388 +++++++++++
contrib/file/magic/Magdir/plan9 | 11 +-
contrib/file/magic/Magdir/pmem | 18 +-
contrib/file/magic/Magdir/puzzle | 17 +
contrib/file/magic/Magdir/python | 208 +++---
contrib/file/magic/Magdir/riff | 364 +++++++++-
contrib/file/magic/Magdir/rtf | 4 +-
contrib/file/magic/Magdir/sccs | 12 +-
contrib/file/magic/Magdir/sgi | 20 +-
contrib/file/magic/Magdir/sgml | 4 +-
contrib/file/magic/Magdir/sinclair | 4 +-
contrib/file/magic/Magdir/sniffer | 8 +-
contrib/file/magic/Magdir/sosi | 4 +-
contrib/file/magic/Magdir/spectrum | 4 +-
contrib/file/magic/Magdir/sql | 110 ++-
contrib/file/magic/Magdir/statistics | 45 ++
contrib/file/magic/Magdir/terminfo | 4 +-
contrib/file/magic/Magdir/timezone | 22 +-
contrib/file/magic/Magdir/tplink | 26 +-
contrib/file/magic/Magdir/uf2 | 72 ++
contrib/file/magic/Magdir/virtual | 84 +--
contrib/file/magic/Magdir/vorbis | 8 +-
contrib/file/magic/Magdir/windows | 213 +++---
contrib/file/magic/Magdir/wordprocessors | 31 +-
contrib/file/magic/Magdir/wsdl | 4 +-
contrib/file/magic/Magdir/xenix | 26 +-
contrib/file/magic/Magdir/xilinx | 4 +-
contrib/file/magic/Magdir/xwindows | 10 +-
contrib/file/magic/Magdir/yara | 4 +-
contrib/file/magic/Magdir/zfs | 4 +-
contrib/file/magic/Magdir/zip | 14 +-
contrib/file/magic/Makefile.am | 29 +-
contrib/file/magic/Makefile.in | 31 +-
contrib/file/magic/scripts/create_filemagic_flac | 71 ++
contrib/file/python/CHANGELOG.md | 5 +
contrib/file/python/Makefile.am | 2 +-
contrib/file/python/Makefile.in | 5 +-
contrib/file/python/file_magic/__init__.py | 1 +
contrib/file/python/magic.py | 75 ++-
contrib/file/src/BNF | 151 +++++
contrib/file/src/Makefile.am | 2 +-
contrib/file/src/Makefile.in | 5 +-
contrib/file/src/apprentice.c | 86 ++-
contrib/file/src/ascmagic.c | 76 ++-
contrib/file/src/cdf.c | 29 +-
contrib/file/src/cdf.mk | 3 +
contrib/file/src/compress.c | 27 +-
contrib/file/src/der.c | 3 +-
contrib/file/src/encoding.c | 225 ++++---
contrib/file/src/file.c | 43 +-
contrib/file/src/file.h | 46 +-
contrib/file/src/file_opts.h | 2 +-
contrib/file/src/funcs.c | 76 ++-
contrib/file/src/is_csv.c | 7 +-
contrib/file/src/magic.c | 15 +-
contrib/file/src/magic.h.in | 1 +
contrib/file/src/memtest.c | 143 ++++
contrib/file/src/print.c | 14 +-
contrib/file/src/readelf.c | 141 ++--
contrib/file/src/seccomp.c | 16 +-
contrib/file/src/softmagic.c | 276 ++++----
contrib/file/src/vasprintf.c | 12 +-
contrib/file/tests/JW07022A.mp3.result | 2 +-
contrib/file/tests/Makefile.am | 94 ++-
contrib/file/tests/Makefile.in | 97 ++-
contrib/file/tests/android-vdex-1.result | 1 +
contrib/file/tests/android-vdex-1.testfile | Bin 0 -> 20 bytes
contrib/file/tests/android-vdex-2.result | 1 +
contrib/file/tests/android-vdex-2.testfile | Bin 0 -> 20 bytes
contrib/file/tests/bcachefs.result | 1 +
contrib/file/tests/bcachefs.testfile | Bin 0 -> 8192 bytes
contrib/file/tests/cl8m8ocofedso.result | 1 +
contrib/file/tests/cl8m8ocofedso.testfile | Bin 0 -> 27777 bytes
contrib/file/tests/ext4.result | 1 +
contrib/file/tests/ext4.testfile | Bin 0 -> 2048 bytes
contrib/file/tests/matilde.arm.result | 1 +
contrib/file/tests/matilde.arm.testfile | Bin 0 -> 14790 bytes
contrib/file/tests/pcjr.result | 1 +
contrib/file/tests/pcjr.testfile | Bin 0 -> 514 bytes
contrib/file/tests/pgp-binary-key-v2-phil.result | 1 +
contrib/file/tests/pgp-binary-key-v2-phil.testfile | Bin 0 -> 975 bytes
contrib/file/tests/pgp-binary-key-v3-lutz.result | 1 +
contrib/file/tests/pgp-binary-key-v3-lutz.testfile | Bin 0 -> 11722 bytes
contrib/file/tests/pgp-binary-key-v4-dsa.result | 1 +
contrib/file/tests/pgp-binary-key-v4-dsa.testfile | Bin 0 -> 1677 bytes
.../pgp-binary-key-v4-ecc-no-userid-secret.result | 1 +
...pgp-binary-key-v4-ecc-no-userid-secret.testfile | Bin 0 -> 794 bytes
.../tests/pgp-binary-key-v4-ecc-secret-key.result | 1 +
.../pgp-binary-key-v4-ecc-secret-key.testfile | Bin 0 -> 494 bytes
.../file/tests/pgp-binary-key-v4-rsa-key.result | 1 +
.../file/tests/pgp-binary-key-v4-rsa-key.testfile | Bin 0 -> 3695 bytes
.../pgp-binary-key-v4-rsa-no-userid-secret.result | 1 +
...pgp-binary-key-v4-rsa-no-userid-secret.testfile | Bin 0 -> 5907 bytes
.../tests/pgp-binary-key-v4-rsa-secret-key.result | 1 +
.../pgp-binary-key-v4-rsa-secret-key.testfile | Bin 0 -> 3695 bytes
contrib/file/tests/test.c | 90 ++-
contrib/file/tests/uf2.result | 1 +
contrib/file/tests/uf2.testfile | Bin 0 -> 512 bytes
lib/libmagic/config.h | 9 +-
200 files changed, 6716 insertions(+), 2713 deletions(-)
diff --cc contrib/file/README.DEVELOPER
index 000000000000,dfe27b973e8e..dfe27b973e8e
mode 000000,100644..100644
--- a/contrib/file/README.DEVELOPER
+++ b/contrib/file/README.DEVELOPER
diff --cc contrib/file/RELEASE-PROCEDURE
index 000000000000,af6ed0fe2b0f..af6ed0fe2b0f
mode 000000,100644..100644
--- a/contrib/file/RELEASE-PROCEDURE
+++ b/contrib/file/RELEASE-PROCEDURE
diff --cc contrib/file/ltmain.sh
index ffabee228c13,ffabee228c13..ffabee228c13
mode 100755,100644..100644
--- a/contrib/file/ltmain.sh
+++ b/contrib/file/ltmain.sh
diff --cc contrib/file/m4/visibility.m4
index 000000000000,7b24d39e683a..7b24d39e683a
mode 000000,100644..100644
--- a/contrib/file/m4/visibility.m4
+++ b/contrib/file/m4/visibility.m4
diff --cc contrib/file/magic/Magdir/aes
index 000000000000,e5e1edcb1350..e5e1edcb1350
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/aes
+++ b/contrib/file/magic/Magdir/aes
diff --cc contrib/file/magic/Magdir/arm
index 000000000000,b40f213cbfb4..b40f213cbfb4
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/arm
+++ b/contrib/file/magic/Magdir/arm
diff --cc contrib/file/magic/Magdir/avm
index 000000000000,86e96d110e30..86e96d110e30
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/avm
+++ b/contrib/file/magic/Magdir/avm
diff --cc contrib/file/magic/Magdir/bm
index 000000000000,a9a1d5bb3f42..a9a1d5bb3f42
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/bm
+++ b/contrib/file/magic/Magdir/bm
diff --cc contrib/file/magic/Magdir/bytecode
index 000000000000,501cd9d4415f..501cd9d4415f
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/bytecode
+++ b/contrib/file/magic/Magdir/bytecode
diff --cc contrib/file/magic/Magdir/crypto
index 000000000000,72a90ace2829..72a90ace2829
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/crypto
+++ b/contrib/file/magic/Magdir/crypto
diff --cc contrib/file/magic/Magdir/lammps
index 000000000000,5424383db80f..5424383db80f
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/lammps
+++ b/contrib/file/magic/Magdir/lammps
diff --cc contrib/file/magic/Magdir/locoscript
index 000000000000,87771ccdf9e6..87771ccdf9e6
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/locoscript
+++ b/contrib/file/magic/Magdir/locoscript
diff --cc contrib/file/magic/Magdir/nim-lang
index 000000000000,bc2cf987c7d3..bc2cf987c7d3
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/nim-lang
+++ b/contrib/file/magic/Magdir/nim-lang
diff --cc contrib/file/magic/Magdir/pcjr
index 000000000000,c3ab7a25fdf4..c3ab7a25fdf4
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/pcjr
+++ b/contrib/file/magic/Magdir/pcjr
diff --cc contrib/file/magic/Magdir/pgp-binary-keys
index 000000000000,1ce76d907b07..1ce76d907b07
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/pgp-binary-keys
+++ b/contrib/file/magic/Magdir/pgp-binary-keys
diff --cc contrib/file/magic/Magdir/puzzle
index 000000000000,ac983f32b8e6..ac983f32b8e6
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/puzzle
+++ b/contrib/file/magic/Magdir/puzzle
diff --cc contrib/file/magic/Magdir/statistics
index 000000000000,0ceb82cd272f..0ceb82cd272f
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/statistics
+++ b/contrib/file/magic/Magdir/statistics
diff --cc contrib/file/magic/Magdir/uf2
index 000000000000,49a86d7640c1..49a86d7640c1
mode 000000,100644..100644
--- a/contrib/file/magic/Magdir/uf2
+++ b/contrib/file/magic/Magdir/uf2
diff --cc contrib/file/magic/scripts/create_filemagic_flac
index 000000000000,0ecfb17277b6..0ecfb17277b6
mode 000000,100755..100755
--- a/contrib/file/magic/scripts/create_filemagic_flac
+++ b/contrib/file/magic/scripts/create_filemagic_flac
diff --cc contrib/file/python/file_magic/__init__.py
index 000000000000,c71f1242950a..c71f1242950a
mode 000000,100644..100644
--- a/contrib/file/python/file_magic/__init__.py
+++ b/contrib/file/python/file_magic/__init__.py
diff --cc contrib/file/src/BNF
index 000000000000,243532f99df7..243532f99df7
mode 000000,100644..100644
--- a/contrib/file/src/BNF
+++ b/contrib/file/src/BNF
diff --cc contrib/file/src/cdf.mk
index 000000000000,681616aee3c9..681616aee3c9
mode 000000,100644..100644
--- a/contrib/file/src/cdf.mk
+++ b/contrib/file/src/cdf.mk
diff --cc contrib/file/src/memtest.c
index 000000000000,f9506f6ea2a7..f9506f6ea2a7
mode 000000,100644..100644
--- a/contrib/file/src/memtest.c
+++ b/contrib/file/src/memtest.c
diff --cc contrib/file/tests/android-vdex-1.result
index 000000000000,2a4ef6d6b2cb..2a4ef6d6b2cb
mode 000000,100644..100644
--- a/contrib/file/tests/android-vdex-1.result
+++ b/contrib/file/tests/android-vdex-1.result
diff --cc contrib/file/tests/android-vdex-1.testfile
index 000000000000,25f4f06ef91f..25f4f06ef91f
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/android-vdex-2.result
index 000000000000,498ae97c7b18..498ae97c7b18
mode 000000,100644..100644
--- a/contrib/file/tests/android-vdex-2.result
+++ b/contrib/file/tests/android-vdex-2.result
diff --cc contrib/file/tests/android-vdex-2.testfile
index 000000000000,7e7761d7f359..7e7761d7f359
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/bcachefs.result
index 000000000000,6f31de2ae9d5..6f31de2ae9d5
mode 000000,100644..100644
--- a/contrib/file/tests/bcachefs.result
+++ b/contrib/file/tests/bcachefs.result
diff --cc contrib/file/tests/bcachefs.testfile
index 000000000000,4e8a3949b821..4e8a3949b821
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/cl8m8ocofedso.result
index 000000000000,323c31a8e231..323c31a8e231
mode 000000,100644..100644
--- a/contrib/file/tests/cl8m8ocofedso.result
+++ b/contrib/file/tests/cl8m8ocofedso.result
diff --cc contrib/file/tests/cl8m8ocofedso.testfile
index 000000000000,4b1651bccc08..4b1651bccc08
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/ext4.result
index 000000000000,e48ac193380c..e48ac193380c
mode 000000,100644..100644
--- a/contrib/file/tests/ext4.result
+++ b/contrib/file/tests/ext4.result
diff --cc contrib/file/tests/ext4.testfile
index 000000000000,6add6b92a62f..6add6b92a62f
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/matilde.arm.result
index 000000000000,4d9190d9d319..4d9190d9d319
mode 000000,100644..100644
--- a/contrib/file/tests/matilde.arm.result
+++ b/contrib/file/tests/matilde.arm.result
diff --cc contrib/file/tests/matilde.arm.testfile
index 000000000000,56ffab16e6fc..56ffab16e6fc
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pcjr.result
index 000000000000,955c8c7750af..955c8c7750af
mode 000000,100644..100644
--- a/contrib/file/tests/pcjr.result
+++ b/contrib/file/tests/pcjr.result
diff --cc contrib/file/tests/pcjr.testfile
index 000000000000,f8091d517084..f8091d517084
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v2-phil.result
index 000000000000,9a0c0959b69d..9a0c0959b69d
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v2-phil.result
+++ b/contrib/file/tests/pgp-binary-key-v2-phil.result
diff --cc contrib/file/tests/pgp-binary-key-v2-phil.testfile
index 000000000000,7c0952e64c5f..7c0952e64c5f
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v3-lutz.result
index 000000000000,5a8dba9622af..5a8dba9622af
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v3-lutz.result
+++ b/contrib/file/tests/pgp-binary-key-v3-lutz.result
diff --cc contrib/file/tests/pgp-binary-key-v3-lutz.testfile
index 000000000000,90aa2dcc36ac..90aa2dcc36ac
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v4-dsa.result
index 000000000000,e309526e7eea..e309526e7eea
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v4-dsa.result
+++ b/contrib/file/tests/pgp-binary-key-v4-dsa.result
diff --cc contrib/file/tests/pgp-binary-key-v4-dsa.testfile
index 000000000000,310efce0a091..310efce0a091
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
index 000000000000,9d075017f7ed..9d075017f7ed
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
+++ b/contrib/file/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
diff --cc contrib/file/tests/pgp-binary-key-v4-ecc-no-userid-secret.testfile
index 000000000000,289a291542e5..289a291542e5
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v4-ecc-secret-key.result
index 000000000000,ff323a7a22b0..ff323a7a22b0
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v4-ecc-secret-key.result
+++ b/contrib/file/tests/pgp-binary-key-v4-ecc-secret-key.result
diff --cc contrib/file/tests/pgp-binary-key-v4-ecc-secret-key.testfile
index 000000000000,f53f47af95a7..f53f47af95a7
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v4-rsa-key.result
index 000000000000,c22310fb9dde..c22310fb9dde
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v4-rsa-key.result
+++ b/contrib/file/tests/pgp-binary-key-v4-rsa-key.result
diff --cc contrib/file/tests/pgp-binary-key-v4-rsa-key.testfile
index 000000000000,7b70497d27f2..7b70497d27f2
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
index 000000000000,c3c2ae22819f..c3c2ae22819f
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
+++ b/contrib/file/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
diff --cc contrib/file/tests/pgp-binary-key-v4-rsa-no-userid-secret.testfile
index 000000000000,7d5a7b465f40..7d5a7b465f40
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/pgp-binary-key-v4-rsa-secret-key.result
index 000000000000,c22310fb9dde..c22310fb9dde
mode 000000,100644..100644
--- a/contrib/file/tests/pgp-binary-key-v4-rsa-secret-key.result
+++ b/contrib/file/tests/pgp-binary-key-v4-rsa-secret-key.result
diff --cc contrib/file/tests/pgp-binary-key-v4-rsa-secret-key.testfile
index 000000000000,7b70497d27f2..7b70497d27f2
mode 000000,100644..100644
Binary files differ
diff --cc contrib/file/tests/uf2.result
index 000000000000,8dae28d47c03..8dae28d47c03
mode 000000,100644..100644
--- a/contrib/file/tests/uf2.result
+++ b/contrib/file/tests/uf2.result
diff --cc contrib/file/tests/uf2.testfile
index 000000000000,be95440392d4..be95440392d4
mode 000000,100644..100644
Binary files differ
diff --cc lib/libmagic/config.h
index 90a9a115420c,000000000000..816087e19b5d
mode 100644,000000..100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@@ -1,424 -1,0 +1,427 @@@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Define in built-in ELF support is used */
+#define BUILTIN_ELF 1
+
+/* Enable bzlib compression support */
+/* #undef BZLIBSUPPORT */
+
+/* Define for ELF core file support */
+#define ELFCORE 1
+
+/* Define to 1 if you have the `asctime_r' function. */
+#define HAVE_ASCTIME_R 1
+
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
+/* Define to 1 if you have the <bzlib.h> header file. */
+/* #undef HAVE_BZLIB_H */
+
+/* Define to 1 if you have the `ctime_r' function. */
+#define HAVE_CTIME_R 1
+
+/* HAVE_DAYLIGHT */
+/* #undef HAVE_DAYLIGHT */
+
+/* Define to 1 if you have the declaration of `daylight', and to 0 if you
+ don't. */
+#define HAVE_DECL_DAYLIGHT 0
+
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+ */
+#define HAVE_DECL_TZNAME 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `dprintf' function. */
+#define HAVE_DPRINTF 1
+
+/* Define to 1 if you have the <err.h> header file. */
+#define HAVE_ERR_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fmtcheck' function. */
+#define HAVE_FMTCHECK 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the `freelocale' function. */
+#define HAVE_FREELOCALE 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#define HAVE_FSEEKO 1
+
+/* Define to 1 if you have the `getline' function. */
+#define HAVE_GETLINE 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
+/* Define to 1 if the system has the type `intptr_t'. */
+#define HAVE_INTPTR_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `bz2' library (-lbz2). */
+/* #undef HAVE_LIBBZ2 */
+
+/* Define to 1 if you have the `gnurx' library (-lgnurx). */
+/* #undef HAVE_LIBGNURX */
+
+/* Define to 1 if you have the `lzma' library (-llzma). */
+/* #undef HAVE_LIBLZMA */
+
+/* Define to 1 if you have the `seccomp' library (-lseccomp). */
+/* #undef HAVE_LIBSECCOMP */
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if you have the <lzma.h> header file. */
+/* #undef HAVE_LZMA_H */
+
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
+#define HAVE_MBRTOWC 1
+
+/* Define to 1 if <wchar.h> declares mbstate_t. */
+#define HAVE_MBSTATE_T 1
+
+/* Define to 1 if you have the `memmem' function. */
+#define HAVE_MEMMEM 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkostemp' function. */
+#define HAVE_MKOSTEMP 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `newlocale' function. */
+#define HAVE_NEWLOCALE 1
+
++/* Define to 1 if you have the `pipe2' function. */
++#define HAVE_PIPE2 1
++
+/* Define to 1 if you have the `pread' function. */
+#define HAVE_PREAD 1
+
+/* Have sig_t type */
+#define HAVE_SIG_T 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcasestr' function. */
+#define HAVE_STRCASESTR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcat' function. */
+#define HAVE_STRLCAT 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
+
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
+/* Define to 1 if you have the `strtof' function. */
+#define HAVE_STRTOF 1
+
+/* HAVE_STRUCT_OPTION */
+#define HAVE_STRUCT_OPTION 1
+
+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+
+/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
+#define HAVE_STRUCT_TM_TM_ZONE 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+/* #undef HAVE_SYS_SYSMACROS_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/utime.h> header file. */
+/* #undef HAVE_SYS_UTIME_H */
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* HAVE_TM_ISDST */
+#define HAVE_TM_ISDST 1
+
+/* HAVE_TM_ZONE */
+#define HAVE_TM_ZONE 1
+
+/* HAVE_TZNAME */
+#define HAVE_TZNAME 1
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `uselocale' function. */
+#define HAVE_USELOCALE 1
+
+/* Define to 1 if you have the `utime' function. */
+#define HAVE_UTIME 1
+
+/* Define to 1 if you have the `utimes' function. */
+#define HAVE_UTIMES 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+ declarations. */
+#define HAVE_VISIBILITY 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#define HAVE_WCTYPE_H 1
+
+/* Define to 1 if you have the `wcwidth' function. */
+#define HAVE_WCWIDTH 1
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* Define to 1 if you have the <xlocale.h> header file. */
+#define HAVE_XLOCALE_H 1
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#define HAVE_ZLIB_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
+ */
+/* #undef MAJOR_IN_MKDEV */
+
+/* Define to 1 if `major', `minor', and `makedev' are declared in
+ <sysmacros.h>. */
+/* #undef MAJOR_IN_SYSMACROS */
+
+/* Name of package */
+#define PACKAGE "file"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "chris...@astron.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "file"
+
+/* Define to the full name and version of this package. */
- #define PACKAGE_STRING "file 5.39"
++#define PACKAGE_STRING "file 5.41"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "file"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
- #define PACKAGE_VERSION "5.39"
++#define PACKAGE_VERSION "5.41"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Version number of package */
- #define VERSION "5.39"
++#define VERSION "5.41"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Enable xzlib compression support */
+/* #undef XZLIBSUPPORT */
+
+/* Enable zlib compression support */
+#define ZLIBSUPPORT 1
+
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT64_T */
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT8_T */
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef int32_t */
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef int64_t */
+
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+ if such a type exists, and if the system does not define it. */
+/* #undef intptr_t */
+
+/* Define to a type if <wchar.h> does not define. */
+/* #undef mbstate_t */
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint16_t */
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint64_t */
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint8_t */
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+ pointer, if such a type exists, and if the system does not define it. */
+/* #undef uintptr_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
