CVS import: src/external/bsd/file/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Wed Jun 10 15:59:43 UTC 2026

Update of /cvsroot/src/external/bsd/file/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv20541

Log Message:
Import file-5.48 (previous was file-5.45)

2026-05-07  11:32  Christos Zoulas <christos%zoulas.com@localhost>

        * release 5.48

2026-05-11  15:55 Christos Zoulas <christos%zoulas.com@localhost>

        * add landlock support (valoq)

2026-04-19  15:55 Christos Zoulas <christos%zoulas.com@localhost>

        * add BE/LE GUID
        
2026-04-17  11:05 Christos Zoulas <christos%zoulas.com@localhost>

        * multiple fixes to prevent integer overflow in 32 bits (kerwin)

2026-04-15  12:40 Christos Zoulas <christos%zoulas.com@localhost>

        * PR/745: streamout: Don't flush when trying to set negative offsets
                  on pipes, just continue, fixes 'cat file.zip | file -'
        * PR/753: vmihalko: Fix race is magic_getpath()

2026-03-11  15:14 Christos Zoulas <christos%zoulas.com@localhost>

        * PR/728: Anton Monroe: Reinstate regex/c

2026-02-26  11:32  Christos Zoulas <christos%zoulas.com@localhost>

        * release 5.47

2026-02-04  09:54  Christos Zoulas <christos%zoulas.com@localhost>
        * Better multi-compound document identification by following the
          order of the directories entries. (Thomas Ledoux)

2026-01-19  14:00  Christos Zoulas <christos%zoulas.com@localhost>
        * if stat fails, don't attempt to restore times (Steven Grubb)

2025-05-28  15:20  Christos Zoulas <christos%zoulas.com@localhost>

        * PR/622: Odd_Bloke: Handle negative offsets in file_buffer(),
          when fd is not available.

2025-05-28  12:50  Christos Zoulas <christos%zoulas.com@localhost>

        * PR/655: jsummers: Obey str_flags in strings like we do for search
          and regex
        * PR/659: Pitzl: Apply MAGIC_CONTINUE to annotations; i.e. print
          only the first, unless -k is specified.
        
2024-12-19  14:44  Christos Zoulas <christos%zoulas.com@localhost>

        * PR/592: allow + in format strings
        * PR/592: signed operations should be done in signed context

2024-12-05  13:50 Christos Zoulas <christos%zoulas.com@localhost>

        * PR/578: jsummers: Don't crash on cygwin when tm_mon == -1
        * PR/579: net147: Fix stack overrun.

2024-11-27  14:44  Christos Zoulas <christos%zoulas.com@localhost>

        * release 5.46
        * Add OFFPOSITIVE

2024-11-25  13:56  Christos Zoulas <christos%zoulas.com@localhost>
        
        * avoid leaking symbols in libmagic

2024-11-10  13:56  Christos Zoulas <christos%zoulas.com@localhost>
        
        * PR/562: jsummers: Search/regex offsets are absolute to the
          beginning of the file, so adjust them by subtracting the
          offset that the "use" starts so that we don't double-count it.


2024-11-09  19:30  Christos Zoulas <christos%zoulas.com@localhost>
        * PR/543: matshch: bump nbuf so we can get the flags into the buffer.


2024-11-02  14:34  Christos Zoulas <christos%zoulas.com@localhost>

        * Add Android elf notes (enh)

2023-12-29  12:55  Christos Zoulas <christos%zoulas.com@localhost>

        * Add limit for number of magic warnings allowed

2023-07-29  12:55  Christos Zoulas <christos%zoulas.com@localhost>

        * check regex bounds (found by clusterfuzz)


Status:

Vendor Tag:     CHRISTOS
Release Tags:   FILE5_48
                
U src/external/bsd/file/dist/Makefile.am
C src/external/bsd/file/dist/configure
U src/external/bsd/file/dist/acinclude.m4
C src/external/bsd/file/dist/configure.ac
C src/external/bsd/file/dist/aclocal.m4
C src/external/bsd/file/dist/Makefile.in
C src/external/bsd/file/dist/config.h.in
U src/external/bsd/file/dist/libmagic.pc.in
U src/external/bsd/file/dist/AUTHORS
U src/external/bsd/file/dist/COPYING
C src/external/bsd/file/dist/ChangeLog
U src/external/bsd/file/dist/INSTALL
U src/external/bsd/file/dist/NEWS
U src/external/bsd/file/dist/README.md
U src/external/bsd/file/dist/TODO
C src/external/bsd/file/dist/compile
U src/external/bsd/file/dist/config.guess
C src/external/bsd/file/dist/config.sub
U src/external/bsd/file/dist/install-sh
C src/external/bsd/file/dist/ltmain.sh
C src/external/bsd/file/dist/missing
U src/external/bsd/file/dist/MAINT
U src/external/bsd/file/dist/RELEASE-PROCEDURE
U src/external/bsd/file/dist/README.DEVELOPER
C src/external/bsd/file/dist/depcomp
C src/external/bsd/file/dist/m4/libtool.m4
C src/external/bsd/file/dist/m4/ltoptions.m4
C src/external/bsd/file/dist/m4/ltsugar.m4
C src/external/bsd/file/dist/m4/ltversion.m4
C src/external/bsd/file/dist/m4/lt~obsolete.m4
U src/external/bsd/file/dist/m4/visibility.m4
U src/external/bsd/file/dist/src/Makefile.am
C src/external/bsd/file/dist/src/Makefile.in
U src/external/bsd/file/dist/src/asctime_r.c
U src/external/bsd/file/dist/src/asprintf.c
U src/external/bsd/file/dist/src/ctime_r.c
U src/external/bsd/file/dist/src/dprintf.c
U src/external/bsd/file/dist/src/fmtcheck.c
U src/external/bsd/file/dist/src/getline.c
U src/external/bsd/file/dist/src/getopt_long.c
U src/external/bsd/file/dist/src/gmtime_r.c
U src/external/bsd/file/dist/src/localtime_r.c
U src/external/bsd/file/dist/src/pread.c
U src/external/bsd/file/dist/src/strcasestr.c
U src/external/bsd/file/dist/src/strlcat.c
U src/external/bsd/file/dist/src/strlcpy.c
U src/external/bsd/file/dist/src/vasprintf.c
U src/external/bsd/file/dist/src/buffer.c
C src/external/bsd/file/dist/src/magic.c
C src/external/bsd/file/dist/src/apprentice.c
C src/external/bsd/file/dist/src/softmagic.c
U src/external/bsd/file/dist/src/ascmagic.c
C src/external/bsd/file/dist/src/encoding.c
C src/external/bsd/file/dist/src/compress.c
C src/external/bsd/file/dist/src/is_csv.c
U src/external/bsd/file/dist/src/is_json.c
U src/external/bsd/file/dist/src/is_simh.c
U src/external/bsd/file/dist/src/is_tar.c
C src/external/bsd/file/dist/src/readelf.c
C src/external/bsd/file/dist/src/print.c
U src/external/bsd/file/dist/src/fsmagic.c
C src/external/bsd/file/dist/src/funcs.c
C src/external/bsd/file/dist/src/file.h
U src/external/bsd/file/dist/src/readelf.h
U src/external/bsd/file/dist/src/tar.h
U src/external/bsd/file/dist/src/apptype.c
C src/external/bsd/file/dist/src/der.c
U src/external/bsd/file/dist/src/der.h
U src/external/bsd/file/dist/src/file_opts.h
U src/external/bsd/file/dist/src/elfclass.h
U src/external/bsd/file/dist/src/mygetopt.h
C src/external/bsd/file/dist/src/cdf.c
C src/external/bsd/file/dist/src/cdf_time.c
C src/external/bsd/file/dist/src/readcdf.c
U src/external/bsd/file/dist/src/cdf.h
N src/external/bsd/file/dist/src/swap.c
N src/external/bsd/file/dist/src/swap.h
C src/external/bsd/file/dist/src/file.c
U src/external/bsd/file/dist/src/seccomp.c
N src/external/bsd/file/dist/src/landlock.c
U src/external/bsd/file/dist/src/magic.h.in
U src/external/bsd/file/dist/src/cdf.mk
U src/external/bsd/file/dist/src/BNF
U src/external/bsd/file/dist/src/memtest.c
U src/external/bsd/file/dist/doc/Makefile.am
C src/external/bsd/file/dist/doc/Makefile.in
C src/external/bsd/file/dist/doc/libmagic.3
C src/external/bsd/file/dist/doc/magic.5
C src/external/bsd/file/dist/doc/file.1
C src/external/bsd/file/dist/magic/Makefile.am
C src/external/bsd/file/dist/magic/Makefile.in
U src/external/bsd/file/dist/magic/Header
U src/external/bsd/file/dist/magic/Localstuff
U src/external/bsd/file/dist/magic/scripts/create_filemagic_flac
N src/external/bsd/file/dist/magic/magdir/a2ml
U src/external/bsd/file/dist/magic/magdir/acorn
U src/external/bsd/file/dist/magic/magdir/adi
U src/external/bsd/file/dist/magic/magdir/adventure
U src/external/bsd/file/dist/magic/magdir/aes
U src/external/bsd/file/dist/magic/magdir/algol68
U src/external/bsd/file/dist/magic/magdir/allegro
U src/external/bsd/file/dist/magic/magdir/alliant
U src/external/bsd/file/dist/magic/magdir/amanda
U src/external/bsd/file/dist/magic/magdir/amigaos
N src/external/bsd/file/dist/magic/magdir/andrew
U src/external/bsd/file/dist/magic/magdir/android
U src/external/bsd/file/dist/magic/magdir/animation
U src/external/bsd/file/dist/magic/magdir/aout
U src/external/bsd/file/dist/magic/magdir/apache
U src/external/bsd/file/dist/magic/magdir/apl
C src/external/bsd/file/dist/magic/magdir/apple
U src/external/bsd/file/dist/magic/magdir/application
U src/external/bsd/file/dist/magic/magdir/applix
U src/external/bsd/file/dist/magic/magdir/apt
C src/external/bsd/file/dist/magic/magdir/archive
U src/external/bsd/file/dist/magic/magdir/aria
U src/external/bsd/file/dist/magic/magdir/arm
U src/external/bsd/file/dist/magic/magdir/asf
U src/external/bsd/file/dist/magic/magdir/assembler
U src/external/bsd/file/dist/magic/magdir/asterix
N src/external/bsd/file/dist/magic/magdir/atari
U src/external/bsd/file/dist/magic/magdir/att3b
U src/external/bsd/file/dist/magic/magdir/audio
U src/external/bsd/file/dist/magic/magdir/avm
U src/external/bsd/file/dist/magic/magdir/basis
U src/external/bsd/file/dist/magic/magdir/beetle
U src/external/bsd/file/dist/magic/magdir/ber
U src/external/bsd/file/dist/magic/magdir/bflt
N src/external/bsd/file/dist/magic/magdir/bgcode
U src/external/bsd/file/dist/magic/magdir/bhl
U src/external/bsd/file/dist/magic/magdir/bioinformatics
U src/external/bsd/file/dist/magic/magdir/biosig
U src/external/bsd/file/dist/magic/magdir/blackberry
U src/external/bsd/file/dist/magic/magdir/blcr
U src/external/bsd/file/dist/magic/magdir/blender
U src/external/bsd/file/dist/magic/magdir/blit
U src/external/bsd/file/dist/magic/magdir/bm
U src/external/bsd/file/dist/magic/magdir/bout
U src/external/bsd/file/dist/magic/magdir/bsdi
U src/external/bsd/file/dist/magic/magdir/bsi
U src/external/bsd/file/dist/magic/magdir/btsnoop
U src/external/bsd/file/dist/magic/magdir/burp
U src/external/bsd/file/dist/magic/magdir/bytecode
U src/external/bsd/file/dist/magic/magdir/c-lang
U src/external/bsd/file/dist/magic/magdir/c64
C src/external/bsd/file/dist/magic/magdir/cad
U src/external/bsd/file/dist/magic/magdir/cafebabe
U src/external/bsd/file/dist/magic/magdir/cbor
U src/external/bsd/file/dist/magic/magdir/ccf
U src/external/bsd/file/dist/magic/magdir/cddb
U src/external/bsd/file/dist/magic/magdir/chord
U src/external/bsd/file/dist/magic/magdir/cisco
U src/external/bsd/file/dist/magic/magdir/citrus
U src/external/bsd/file/dist/magic/magdir/clarion
U src/external/bsd/file/dist/magic/magdir/claris
U src/external/bsd/file/dist/magic/magdir/clipper
U src/external/bsd/file/dist/magic/magdir/clojure
C src/external/bsd/file/dist/magic/magdir/coff
C src/external/bsd/file/dist/magic/magdir/commands
U src/external/bsd/file/dist/magic/magdir/communications
U src/external/bsd/file/dist/magic/magdir/compress
U src/external/bsd/file/dist/magic/magdir/console
U src/external/bsd/file/dist/magic/magdir/convex
U src/external/bsd/file/dist/magic/magdir/coverage
U src/external/bsd/file/dist/magic/magdir/cracklib
N src/external/bsd/file/dist/magic/magdir/creativeassembly
U src/external/bsd/file/dist/magic/magdir/crypto
U src/external/bsd/file/dist/magic/magdir/ctags
U src/external/bsd/file/dist/magic/magdir/ctf
U src/external/bsd/file/dist/magic/magdir/cubemap
U src/external/bsd/file/dist/magic/magdir/cups
U src/external/bsd/file/dist/magic/magdir/dact
U src/external/bsd/file/dist/magic/magdir/database
U src/external/bsd/file/dist/magic/magdir/dataone
U src/external/bsd/file/dist/magic/magdir/dbpf
U src/external/bsd/file/dist/magic/magdir/der
U src/external/bsd/file/dist/magic/magdir/diamond
U src/external/bsd/file/dist/magic/magdir/dif
C src/external/bsd/file/dist/magic/magdir/diff
U src/external/bsd/file/dist/magic/magdir/digital
U src/external/bsd/file/dist/magic/magdir/dolby
U src/external/bsd/file/dist/magic/magdir/dump
U src/external/bsd/file/dist/magic/magdir/dwarfs
U src/external/bsd/file/dist/magic/magdir/dyadic
U src/external/bsd/file/dist/magic/magdir/ebml
U src/external/bsd/file/dist/magic/magdir/edid
U src/external/bsd/file/dist/magic/magdir/editors
U src/external/bsd/file/dist/magic/magdir/efi
C src/external/bsd/file/dist/magic/magdir/elf
U src/external/bsd/file/dist/magic/magdir/encore
U src/external/bsd/file/dist/magic/magdir/epoc
U src/external/bsd/file/dist/magic/magdir/erlang
U src/external/bsd/file/dist/magic/magdir/espressif
U src/external/bsd/file/dist/magic/magdir/esri
U src/external/bsd/file/dist/magic/magdir/fcs
C src/external/bsd/file/dist/magic/magdir/filesystems
U src/external/bsd/file/dist/magic/magdir/finger
U src/external/bsd/file/dist/magic/magdir/firmware
U src/external/bsd/file/dist/magic/magdir/flash
U src/external/bsd/file/dist/magic/magdir/flif
U src/external/bsd/file/dist/magic/magdir/fonts
U src/external/bsd/file/dist/magic/magdir/forth
U src/external/bsd/file/dist/magic/magdir/fortran
U src/external/bsd/file/dist/magic/magdir/frame
U src/external/bsd/file/dist/magic/magdir/freebsd
U src/external/bsd/file/dist/magic/magdir/fsav
U src/external/bsd/file/dist/magic/magdir/fusecompress
C src/external/bsd/file/dist/magic/magdir/games
U src/external/bsd/file/dist/magic/magdir/gcc
U src/external/bsd/file/dist/magic/magdir/gconv
U src/external/bsd/file/dist/magic/magdir/gentoo
C src/external/bsd/file/dist/magic/magdir/geo
U src/external/bsd/file/dist/magic/magdir/geos
N src/external/bsd/file/dist/magic/magdir/gguf
U src/external/bsd/file/dist/magic/magdir/gimp
U src/external/bsd/file/dist/magic/magdir/git
U src/external/bsd/file/dist/magic/magdir/glibc
U src/external/bsd/file/dist/magic/magdir/gnome
U src/external/bsd/file/dist/magic/magdir/gnu
U src/external/bsd/file/dist/magic/magdir/gnumeric
U src/external/bsd/file/dist/magic/magdir/gpt
U src/external/bsd/file/dist/magic/magdir/gpu
U src/external/bsd/file/dist/magic/magdir/grace
U src/external/bsd/file/dist/magic/magdir/graphviz
U src/external/bsd/file/dist/magic/magdir/gringotts
U src/external/bsd/file/dist/magic/magdir/hardware
U src/external/bsd/file/dist/magic/magdir/hitachi-sh
U src/external/bsd/file/dist/magic/magdir/hp
U src/external/bsd/file/dist/magic/magdir/human68k
U src/external/bsd/file/dist/magic/magdir/ibm370
U src/external/bsd/file/dist/magic/magdir/ibm6000
U src/external/bsd/file/dist/magic/magdir/icc
U src/external/bsd/file/dist/magic/magdir/iff
U src/external/bsd/file/dist/magic/magdir/images
U src/external/bsd/file/dist/magic/magdir/inform
U src/external/bsd/file/dist/magic/magdir/intel
U src/external/bsd/file/dist/magic/magdir/interleaf
U src/external/bsd/file/dist/magic/magdir/island
U src/external/bsd/file/dist/magic/magdir/ispell
U src/external/bsd/file/dist/magic/magdir/isz
U src/external/bsd/file/dist/magic/magdir/java
U src/external/bsd/file/dist/magic/magdir/javascript
C src/external/bsd/file/dist/magic/magdir/jpeg
N src/external/bsd/file/dist/magic/magdir/k9
U src/external/bsd/file/dist/magic/magdir/karma
U src/external/bsd/file/dist/magic/magdir/kde
U src/external/bsd/file/dist/magic/magdir/keepass
U src/external/bsd/file/dist/magic/magdir/kerberos
N src/external/bsd/file/dist/magic/magdir/keyman
U src/external/bsd/file/dist/magic/magdir/kicad
U src/external/bsd/file/dist/magic/magdir/kml
U src/external/bsd/file/dist/magic/magdir/lammps
N src/external/bsd/file/dist/magic/magdir/lauterbach
U src/external/bsd/file/dist/magic/magdir/lecter
U src/external/bsd/file/dist/magic/magdir/lex
U src/external/bsd/file/dist/magic/magdir/lif
C src/external/bsd/file/dist/magic/magdir/linux
U src/external/bsd/file/dist/magic/magdir/lisp
U src/external/bsd/file/dist/magic/magdir/llvm
U src/external/bsd/file/dist/magic/magdir/locoscript
U src/external/bsd/file/dist/magic/magdir/lua
U src/external/bsd/file/dist/magic/magdir/luks
U src/external/bsd/file/dist/magic/magdir/m4
U src/external/bsd/file/dist/magic/magdir/mach
U src/external/bsd/file/dist/magic/magdir/macintosh
U src/external/bsd/file/dist/magic/magdir/macos
U src/external/bsd/file/dist/magic/magdir/magic
C src/external/bsd/file/dist/magic/magdir/mail.news
U src/external/bsd/file/dist/magic/magdir/make
U src/external/bsd/file/dist/magic/magdir/map
U src/external/bsd/file/dist/magic/magdir/maple
U src/external/bsd/file/dist/magic/magdir/marc21
U src/external/bsd/file/dist/magic/magdir/mathcad
U src/external/bsd/file/dist/magic/magdir/mathematica
U src/external/bsd/file/dist/magic/magdir/matroska
U src/external/bsd/file/dist/magic/magdir/mcrypt
U src/external/bsd/file/dist/magic/magdir/measure
U src/external/bsd/file/dist/magic/magdir/mercurial
U src/external/bsd/file/dist/magic/magdir/metastore
U src/external/bsd/file/dist/magic/magdir/meteorological
U src/external/bsd/file/dist/magic/magdir/microfocus
U src/external/bsd/file/dist/magic/magdir/mime
U src/external/bsd/file/dist/magic/magdir/mips
U src/external/bsd/file/dist/magic/magdir/mirage
U src/external/bsd/file/dist/magic/magdir/misctools
U src/external/bsd/file/dist/magic/magdir/mkid
U src/external/bsd/file/dist/magic/magdir/mlssa
U src/external/bsd/file/dist/magic/magdir/mmdf
U src/external/bsd/file/dist/magic/magdir/modem
U src/external/bsd/file/dist/magic/magdir/modulefile
U src/external/bsd/file/dist/magic/magdir/motorola
U src/external/bsd/file/dist/magic/magdir/mozilla
C src/external/bsd/file/dist/magic/magdir/msdos
U src/external/bsd/file/dist/magic/magdir/msooxml
U src/external/bsd/file/dist/magic/magdir/msvc
U src/external/bsd/file/dist/magic/magdir/msx
U src/external/bsd/file/dist/magic/magdir/mup
U src/external/bsd/file/dist/magic/magdir/music
U src/external/bsd/file/dist/magic/magdir/nasa
U src/external/bsd/file/dist/magic/magdir/natinst
U src/external/bsd/file/dist/magic/magdir/ncr
U src/external/bsd/file/dist/magic/magdir/netbsd
U src/external/bsd/file/dist/magic/magdir/netscape
U src/external/bsd/file/dist/magic/magdir/netware
U src/external/bsd/file/dist/magic/magdir/news
U src/external/bsd/file/dist/magic/magdir/nifty
U src/external/bsd/file/dist/magic/magdir/nim-lang
U src/external/bsd/file/dist/magic/magdir/nitpicker
N src/external/bsd/file/dist/magic/magdir/nix
U src/external/bsd/file/dist/magic/magdir/numpy
U src/external/bsd/file/dist/magic/magdir/oasis
U src/external/bsd/file/dist/magic/magdir/ocaml
U src/external/bsd/file/dist/magic/magdir/octave
U src/external/bsd/file/dist/magic/magdir/ole2compounddocs
U src/external/bsd/file/dist/magic/magdir/olf
U src/external/bsd/file/dist/magic/magdir/openfst
U src/external/bsd/file/dist/magic/magdir/opentimestamps
U src/external/bsd/file/dist/magic/magdir/oric
U src/external/bsd/file/dist/magic/magdir/os2
U src/external/bsd/file/dist/magic/magdir/os400
U src/external/bsd/file/dist/magic/magdir/os9
U src/external/bsd/file/dist/magic/magdir/osf1
N src/external/bsd/file/dist/magic/magdir/pack
U src/external/bsd/file/dist/magic/magdir/palm
U src/external/bsd/file/dist/magic/magdir/parix
U src/external/bsd/file/dist/magic/magdir/parrot
N src/external/bsd/file/dist/magic/magdir/partclone
U src/external/bsd/file/dist/magic/magdir/pascal
U src/external/bsd/file/dist/magic/magdir/pbf
U src/external/bsd/file/dist/magic/magdir/pbm
U src/external/bsd/file/dist/magic/magdir/pc98
U src/external/bsd/file/dist/magic/magdir/pci_ids
U src/external/bsd/file/dist/magic/magdir/pcjr
U src/external/bsd/file/dist/magic/magdir/pdf
U src/external/bsd/file/dist/magic/magdir/pdp
U src/external/bsd/file/dist/magic/magdir/perl
U src/external/bsd/file/dist/magic/magdir/pgf
C src/external/bsd/file/dist/magic/magdir/pgp
U src/external/bsd/file/dist/magic/magdir/pgp-binary-keys
U src/external/bsd/file/dist/magic/magdir/pkgadd
U src/external/bsd/file/dist/magic/magdir/plan9
U src/external/bsd/file/dist/magic/magdir/playdate
U src/external/bsd/file/dist/magic/magdir/plus5
U src/external/bsd/file/dist/magic/magdir/pmem
U src/external/bsd/file/dist/magic/magdir/polyml
U src/external/bsd/file/dist/magic/magdir/printer
U src/external/bsd/file/dist/magic/magdir/project
U src/external/bsd/file/dist/magic/magdir/psdbms
U src/external/bsd/file/dist/magic/magdir/psl
U src/external/bsd/file/dist/magic/magdir/pulsar
U src/external/bsd/file/dist/magic/magdir/puzzle
U src/external/bsd/file/dist/magic/magdir/pwsafe
U src/external/bsd/file/dist/magic/magdir/pyramid
U src/external/bsd/file/dist/magic/magdir/python
U src/external/bsd/file/dist/magic/magdir/qt
N src/external/bsd/file/dist/magic/magdir/r
U src/external/bsd/file/dist/magic/magdir/revision
U src/external/bsd/file/dist/magic/magdir/riff
U src/external/bsd/file/dist/magic/magdir/ringdove
U src/external/bsd/file/dist/magic/magdir/rpi
U src/external/bsd/file/dist/magic/magdir/rpm
U src/external/bsd/file/dist/magic/magdir/rpmsg
U src/external/bsd/file/dist/magic/magdir/rst
U src/external/bsd/file/dist/magic/magdir/rtf
U src/external/bsd/file/dist/magic/magdir/ruby
U src/external/bsd/file/dist/magic/magdir/rust
U src/external/bsd/file/dist/magic/magdir/sc
U src/external/bsd/file/dist/magic/magdir/sccs
U src/external/bsd/file/dist/magic/magdir/scientific
U src/external/bsd/file/dist/magic/magdir/securitycerts
U src/external/bsd/file/dist/magic/magdir/selinux
U src/external/bsd/file/dist/magic/magdir/sendmail
U src/external/bsd/file/dist/magic/magdir/sequent
U src/external/bsd/file/dist/magic/magdir/sereal
N src/external/bsd/file/dist/magic/magdir/sf3
U src/external/bsd/file/dist/magic/magdir/sgi
U src/external/bsd/file/dist/magic/magdir/sgml
U src/external/bsd/file/dist/magic/magdir/sharc
U src/external/bsd/file/dist/magic/magdir/sinclair
U src/external/bsd/file/dist/magic/magdir/sisu
U src/external/bsd/file/dist/magic/magdir/sketch
U src/external/bsd/file/dist/magic/magdir/smalltalk
U src/external/bsd/file/dist/magic/magdir/smile
U src/external/bsd/file/dist/magic/magdir/sniffer
U src/external/bsd/file/dist/magic/magdir/softquad
U src/external/bsd/file/dist/magic/magdir/sosi
U src/external/bsd/file/dist/magic/magdir/spec
U src/external/bsd/file/dist/magic/magdir/spectrum
U src/external/bsd/file/dist/magic/magdir/sql
U src/external/bsd/file/dist/magic/magdir/ssh
U src/external/bsd/file/dist/magic/magdir/ssl
U src/external/bsd/file/dist/magic/magdir/statistics
U src/external/bsd/file/dist/magic/magdir/subtitle
U src/external/bsd/file/dist/magic/magdir/sun
U src/external/bsd/file/dist/magic/magdir/svf
N src/external/bsd/file/dist/magic/magdir/syd
U src/external/bsd/file/dist/magic/magdir/sylk
U src/external/bsd/file/dist/magic/magdir/symbos
U src/external/bsd/file/dist/magic/magdir/sysex
N src/external/bsd/file/dist/magic/magdir/tapebackup
U src/external/bsd/file/dist/magic/magdir/tcl
U src/external/bsd/file/dist/magic/magdir/teapot
U src/external/bsd/file/dist/magic/magdir/terminfo
U src/external/bsd/file/dist/magic/magdir/tex
U src/external/bsd/file/dist/magic/magdir/tgif
U src/external/bsd/file/dist/magic/magdir/ti-8x
U src/external/bsd/file/dist/magic/magdir/timezone
U src/external/bsd/file/dist/magic/magdir/tplink
U src/external/bsd/file/dist/magic/magdir/uf2
U src/external/bsd/file/dist/magic/magdir/troff
U src/external/bsd/file/dist/magic/magdir/tuxedo
U src/external/bsd/file/dist/magic/magdir/typeset
U src/external/bsd/file/dist/magic/magdir/unicode
U src/external/bsd/file/dist/magic/magdir/unisig
U src/external/bsd/file/dist/magic/magdir/unknown
U src/external/bsd/file/dist/magic/magdir/usd
U src/external/bsd/file/dist/magic/magdir/uterus
U src/external/bsd/file/dist/magic/magdir/uuencode
N src/external/bsd/file/dist/magic/magdir/uxn
U src/external/bsd/file/dist/magic/magdir/vacuum-cleaner
U src/external/bsd/file/dist/magic/magdir/varied.out
U src/external/bsd/file/dist/magic/magdir/varied.script
U src/external/bsd/file/dist/magic/magdir/vax
U src/external/bsd/file/dist/magic/magdir/vicar
U src/external/bsd/file/dist/magic/magdir/virtual
U src/external/bsd/file/dist/magic/magdir/virtutech
U src/external/bsd/file/dist/magic/magdir/visx
U src/external/bsd/file/dist/magic/magdir/vms
U src/external/bsd/file/dist/magic/magdir/vmware
U src/external/bsd/file/dist/magic/magdir/vorbis
U src/external/bsd/file/dist/magic/magdir/vxl
U src/external/bsd/file/dist/magic/magdir/warc
U src/external/bsd/file/dist/magic/magdir/weak
U src/external/bsd/file/dist/magic/magdir/web
U src/external/bsd/file/dist/magic/magdir/webassembly
U src/external/bsd/file/dist/magic/magdir/windows
U src/external/bsd/file/dist/magic/magdir/wireless
U src/external/bsd/file/dist/magic/magdir/wordprocessors
U src/external/bsd/file/dist/magic/magdir/wsdl
U src/external/bsd/file/dist/magic/magdir/zfs
U src/external/bsd/file/dist/magic/magdir/x68000
U src/external/bsd/file/dist/magic/magdir/xdelta
C src/external/bsd/file/dist/magic/magdir/xenix
U src/external/bsd/file/dist/magic/magdir/xilinx
U src/external/bsd/file/dist/magic/magdir/xo65
U src/external/bsd/file/dist/magic/magdir/xwindows
U src/external/bsd/file/dist/magic/magdir/yara
U src/external/bsd/file/dist/magic/magdir/zilog
U src/external/bsd/file/dist/magic/magdir/zip
U src/external/bsd/file/dist/magic/magdir/zyxel
U src/external/bsd/file/dist/tests/Makefile.am
C src/external/bsd/file/dist/tests/Makefile.in
U src/external/bsd/file/dist/tests/README
U src/external/bsd/file/dist/tests/android-vdex-1.result
U src/external/bsd/file/dist/tests/android-vdex-1.testfile
U src/external/bsd/file/dist/tests/android-vdex-2.result
U src/external/bsd/file/dist/tests/android-vdex-2.testfile
U src/external/bsd/file/dist/tests/arj.result
U src/external/bsd/file/dist/tests/arj.testfile
U src/external/bsd/file/dist/tests/bcachefs.result
U src/external/bsd/file/dist/tests/bcachefs.testfile
U src/external/bsd/file/dist/tests/bcachefs2.result
U src/external/bsd/file/dist/tests/bcachefs2.testfile
N src/external/bsd/file/dist/tests/bgcode.result
N src/external/bsd/file/dist/tests/bgcode.testfile
U src/external/bsd/file/dist/tests/cl8m8ocofedso.result
U src/external/bsd/file/dist/tests/cl8m8ocofedso.testfile
U src/external/bsd/file/dist/tests/cmd1.result
U src/external/bsd/file/dist/tests/cmd1.testfile
U src/external/bsd/file/dist/tests/cmd2.result
U src/external/bsd/file/dist/tests/cmd2.testfile
U src/external/bsd/file/dist/tests/cmd3.result
U src/external/bsd/file/dist/tests/cmd3.testfile
U src/external/bsd/file/dist/tests/cmd4.result
U src/external/bsd/file/dist/tests/cmd4.testfile
U src/external/bsd/file/dist/tests/CVE-2014-1943.result
U src/external/bsd/file/dist/tests/CVE-2014-1943.testfile
U src/external/bsd/file/dist/tests/dsd64-dff.result
U src/external/bsd/file/dist/tests/dsd64-dff.testfile
U src/external/bsd/file/dist/tests/dsd64-dsf.result
U src/external/bsd/file/dist/tests/dsd64-dsf.testfile
N src/external/bsd/file/dist/tests/efi-signature-list-sha256.result
N src/external/bsd/file/dist/tests/efi-signature-list-sha256.testfile
U src/external/bsd/file/dist/tests/escapevel.result
U src/external/bsd/file/dist/tests/escapevel.testfile
U src/external/bsd/file/dist/tests/ext4.result
U src/external/bsd/file/dist/tests/test.c
U src/external/bsd/file/dist/tests/ext4.testfile
U src/external/bsd/file/dist/tests/fit-map-data.result
U src/external/bsd/file/dist/tests/fit-map-data.testfile
U src/external/bsd/file/dist/tests/gedcom.result
U src/external/bsd/file/dist/tests/gedcom.testfile
U src/external/bsd/file/dist/tests/gpkg-1-zst.result
U src/external/bsd/file/dist/tests/gpkg-1-zst.testfile
U src/external/bsd/file/dist/tests/hello-racket_rkt.result
U src/external/bsd/file/dist/tests/hello-racket_rkt.testfile
U src/external/bsd/file/dist/tests/hddrawcopytool.result
U src/external/bsd/file/dist/tests/hddrawcopytool.testfile
U src/external/bsd/file/dist/tests/HWP2016.hwp.result
U src/external/bsd/file/dist/tests/HWP2016.hwp.testfile
U src/external/bsd/file/dist/tests/HWP2016.hwpx.zip.result
U src/external/bsd/file/dist/tests/HWP2016.hwpx.zip.testfile
U src/external/bsd/file/dist/tests/HWP97.hwp.result
U src/external/bsd/file/dist/tests/HWP97.hwp.testfile
U src/external/bsd/file/dist/tests/issue311docx.result
U src/external/bsd/file/dist/tests/issue311docx.testfile
U src/external/bsd/file/dist/tests/issue359xlsx.result
U src/external/bsd/file/dist/tests/issue359xlsx.testfile
U src/external/bsd/file/dist/tests/jpeg-text.result
U src/external/bsd/file/dist/tests/jpeg-text.testfile
U src/external/bsd/file/dist/tests/json1.result
U src/external/bsd/file/dist/tests/json1.testfile
U src/external/bsd/file/dist/tests/json2.result
U src/external/bsd/file/dist/tests/json2.testfile
U src/external/bsd/file/dist/tests/json3.result
U src/external/bsd/file/dist/tests/json3.testfile
U src/external/bsd/file/dist/tests/json4.result
U src/external/bsd/file/dist/tests/json4.testfile
U src/external/bsd/file/dist/tests/json5.result
U src/external/bsd/file/dist/tests/json5.testfile
U src/external/bsd/file/dist/tests/json6.result
U src/external/bsd/file/dist/tests/json6.testfile
U src/external/bsd/file/dist/tests/json7.result
U src/external/bsd/file/dist/tests/json7.testfile
U src/external/bsd/file/dist/tests/json8.result
U src/external/bsd/file/dist/tests/json8.testfile
U src/external/bsd/file/dist/tests/jsonlines1.result
U src/external/bsd/file/dist/tests/jsonlines1.testfile
U src/external/bsd/file/dist/tests/JW07022A.mp3.result
U src/external/bsd/file/dist/tests/JW07022A.mp3.testfile
N src/external/bsd/file/dist/tests/keyman-0.result
N src/external/bsd/file/dist/tests/keyman-0.testfile
N src/external/bsd/file/dist/tests/keyman-1.result
N src/external/bsd/file/dist/tests/keyman-1.testfile
N src/external/bsd/file/dist/tests/keyman-2.result
N src/external/bsd/file/dist/tests/keyman-2.testfile
U src/external/bsd/file/dist/tests/matilde.arm.result
U src/external/bsd/file/dist/tests/matilde.arm.testfile
U src/external/bsd/file/dist/tests/multiple-A.magic
U src/external/bsd/file/dist/tests/multiple-B.magic
U src/external/bsd/file/dist/tests/multiple.flags
U src/external/bsd/file/dist/tests/multiple.result
U src/external/bsd/file/dist/tests/multiple.testfile
U src/external/bsd/file/dist/tests/pcjr.result
U src/external/bsd/file/dist/tests/pcjr.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v2-phil.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v2-phil.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v3-lutz.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v3-lutz.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-dsa.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-dsa.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-ecc-no-userid-secret.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-ecc-secret-key.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-ecc-secret-key.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-key.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-key.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-no-userid-secret.testfile
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-secret-key.result
U src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-secret-key.testfile
U src/external/bsd/file/dist/tests/pnm1.result
U src/external/bsd/file/dist/tests/pnm1.testfile
U src/external/bsd/file/dist/tests/pnm2.result
U src/external/bsd/file/dist/tests/pnm2.testfile
U src/external/bsd/file/dist/tests/pnm3.result
U src/external/bsd/file/dist/tests/pnm3.testfile
U src/external/bsd/file/dist/tests/regex-eol.magic
U src/external/bsd/file/dist/tests/regex-eol.result
U src/external/bsd/file/dist/tests/regex-eol.testfile
U src/external/bsd/file/dist/tests/registry-pol.result
U src/external/bsd/file/dist/tests/registry-pol.testfile
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-aarch64.result
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-aarch64.testfile
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-powerpc64.result
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-powerpc64.testfile
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-s390x.result
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-s390x.testfile
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-x86_64.result
N src/external/bsd/file/dist/tests/rpm-v3.0-bin-x86_64.testfile
N src/external/bsd/file/dist/tests/rpm-v3.0-src.result
N src/external/bsd/file/dist/tests/rpm-v3.0-src.testfile
N src/external/bsd/file/dist/tests/searchbug.magic
N src/external/bsd/file/dist/tests/searchbug.result
N src/external/bsd/file/dist/tests/searchbug.testfile
U src/external/bsd/file/dist/tests/uf2.result
U src/external/bsd/file/dist/tests/uf2.testfile
N src/external/bsd/file/dist/tests/utf16xmlsvg.testfile
N src/external/bsd/file/dist/tests/utf16xmlsvg.result
U src/external/bsd/file/dist/tests/xclbin.result
U src/external/bsd/file/dist/tests/xclbin.testfile
U src/external/bsd/file/dist/tests/zstd-3-skippable-frames.result
U src/external/bsd/file/dist/tests/zstd-dictionary-0.result
U src/external/bsd/file/dist/tests/zstd-dictionary-1.result
U src/external/bsd/file/dist/tests/zstd-dictionary-2.result
U src/external/bsd/file/dist/tests/zstd-skippable-frame-0.result
U src/external/bsd/file/dist/tests/zstd-skippable-frame-4.result
U src/external/bsd/file/dist/tests/zstd-skippable-frame-8.result
U src/external/bsd/file/dist/tests/zstd-skippable-frame-C.result
U src/external/bsd/file/dist/tests/zstd-v0.2-FF.result
U src/external/bsd/file/dist/tests/zstd-v0.2-FF.testfile
U src/external/bsd/file/dist/tests/zstd-v0.3-FF.result
U src/external/bsd/file/dist/tests/zstd-v0.3-FF.testfile
U src/external/bsd/file/dist/tests/zstd-v0.4-FF.result
U src/external/bsd/file/dist/tests/zstd-v0.4-FF.testfile
U src/external/bsd/file/dist/tests/zstd-v0.5-FF.result
U src/external/bsd/file/dist/tests/zstd-v0.5-FF.testfile
U src/external/bsd/file/dist/tests/zstd-v0.6-FF.result
U src/external/bsd/file/dist/tests/zstd-v0.6-FF.testfile
U src/external/bsd/file/dist/tests/zstd-v0.7-00.result
U src/external/bsd/file/dist/tests/zstd-v0.7-21.result
U src/external/bsd/file/dist/tests/zstd-v0.7-21.testfile
U src/external/bsd/file/dist/tests/zstd-v0.7-22.result
U src/external/bsd/file/dist/tests/zstd-v0.7-22.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-00.result
U src/external/bsd/file/dist/tests/zstd-v0.8-01.result
U src/external/bsd/file/dist/tests/zstd-v0.8-01.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-02.result
U src/external/bsd/file/dist/tests/zstd-v0.8-02.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-03.result
U src/external/bsd/file/dist/tests/zstd-v0.8-03.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-16.result
U src/external/bsd/file/dist/tests/zstd-v0.8-16.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-20.result
U src/external/bsd/file/dist/tests/zstd-v0.8-20.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-21.result
U src/external/bsd/file/dist/tests/zstd-v0.8-21.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-22.result
U src/external/bsd/file/dist/tests/zstd-v0.8-22.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-23.result
U src/external/bsd/file/dist/tests/zstd-v0.8-23.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-F4.result
U src/external/bsd/file/dist/tests/zstd-v0.8-F4.testfile
U src/external/bsd/file/dist/tests/zstd-v0.8-FF.result
U src/external/bsd/file/dist/tests/zstd-v0.8-FF.testfile
U src/external/bsd/file/dist/python/Makefile.am
C src/external/bsd/file/dist/python/Makefile.in
U src/external/bsd/file/dist/python/README.md
U src/external/bsd/file/dist/python/LICENSE
U src/external/bsd/file/dist/python/CHANGELOG.md
U src/external/bsd/file/dist/python/example.py
U src/external/bsd/file/dist/python/magic.py
U src/external/bsd/file/dist/python/setup.py
U src/external/bsd/file/dist/python/tests.py
U src/external/bsd/file/dist/python/file_magic/__init__.py

56 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jCHRISTOS:yesterday -jCHRISTOS src/external/bsd/file/dist