Module Name: src Committed By: christos Date: Thu Oct 18 23:54:11 UTC 2018
Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28970 Log Message: 2018-10-18 19:32 Christos Zoulas <chris...@zoulas.com> * release 5.35 2018-09-10 20:38 Christos Zoulas <chris...@zoulas.com> * Add FreeBSD ELF core file support (John Baldwin) 2018-08-20 18:40 Christos Zoulas <chris...@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 <chris...@zoulas.com> * PR/23: Recognize JSON files 2018-07-25 10:17 Christos Zoulas <chris...@zoulas.com> * PR/18: file --mime-encoding should not print mime-type 2018-07-25 8:50 Christos Zoulas <chris...@zoulas.com> * release 5.34 2018-06-22 16:38 Christos Zoulas <chris...@zoulas.com> * Add Quad indirect offsets 2018-05-24 14:10 Christos Zoulas <chris...@zoulas.com> * Enable parsing of ELF dynamic sections to handle PIE better Status: Vendor Tag: CHRISTOS Release Tags: FILE5_35 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/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 U src/external/bsd/file/dist/TODO C src/external/bsd/file/dist/compile C src/external/bsd/file/dist/config.guess C src/external/bsd/file/dist/config.sub C src/external/bsd/file/dist/depcomp C src/external/bsd/file/dist/install-sh U 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/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/getopt_long.c 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/localtime_r.c U src/external/bsd/file/dist/src/gmtime_r.c U src/external/bsd/file/dist/src/strcasestr.c U src/external/bsd/file/dist/src/pread.c U src/external/bsd/file/dist/src/mygetopt.h 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/print.c C src/external/bsd/file/dist/src/compress.c N src/external/bsd/file/dist/src/is_json.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/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 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 C src/external/bsd/file/dist/src/file.c U src/external/bsd/file/dist/src/seccomp.c U src/external/bsd/file/dist/src/magic.h.in 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/magdir/adventure 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/animation 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 U src/external/bsd/file/dist/magic/magdir/android U src/external/bsd/file/dist/magic/magdir/apache U src/external/bsd/file/dist/magic/magdir/aout U src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/apl U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/bsi 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/assembler U src/external/bsd/file/dist/magic/magdir/asterix 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/basis U src/external/bsd/file/dist/magic/magdir/ber U src/external/bsd/file/dist/magic/magdir/beetle U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/bhl U src/external/bsd/file/dist/magic/magdir/bioinformatics N 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/bout U src/external/bsd/file/dist/magic/magdir/bsdi U src/external/bsd/file/dist/magic/magdir/communications U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U 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/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/coff U src/external/bsd/file/dist/magic/magdir/commands U src/external/bsd/file/dist/magic/magdir/filesystems 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 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 N 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/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/dyadic U src/external/bsd/file/dist/magic/magdir/ebml 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/esri U src/external/bsd/file/dist/magic/magdir/fcs U src/external/bsd/file/dist/magic/magdir/finger 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/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/gringotts U src/external/bsd/file/dist/magic/magdir/games U src/external/bsd/file/dist/magic/magdir/fusecompress 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/geo U src/external/bsd/file/dist/magic/magdir/geos N src/external/bsd/file/dist/magic/magdir/glibc U src/external/bsd/file/dist/magic/magdir/gimp 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/hitachi-sh U src/external/bsd/file/dist/magic/magdir/guile N src/external/bsd/file/dist/magic/magdir/hardware U src/external/bsd/file/dist/magic/magdir/human68k U src/external/bsd/file/dist/magic/magdir/hp U src/external/bsd/file/dist/magic/magdir/interleaf 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/javascript 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/karma C src/external/bsd/file/dist/magic/magdir/jpeg U src/external/bsd/file/dist/magic/magdir/keepass U src/external/bsd/file/dist/magic/magdir/kde U src/external/bsd/file/dist/magic/magdir/macintosh U src/external/bsd/file/dist/magic/magdir/kerberos N 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/lecter U src/external/bsd/file/dist/magic/magdir/lex U src/external/bsd/file/dist/magic/magdir/lif U 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/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/macos U src/external/bsd/file/dist/magic/magdir/mail.news U src/external/bsd/file/dist/magic/magdir/measure U src/external/bsd/file/dist/magic/magdir/magic U src/external/bsd/file/dist/magic/magdir/maple 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/mathematica 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/music U src/external/bsd/file/dist/magic/magdir/msx 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/qt 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/mime 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/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/motorola U src/external/bsd/file/dist/magic/magdir/mozilla U 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/mup U src/external/bsd/file/dist/magic/magdir/natinst U src/external/bsd/file/dist/magic/magdir/nasa U src/external/bsd/file/dist/magic/magdir/netbsd U src/external/bsd/file/dist/magic/magdir/ncr U src/external/bsd/file/dist/magic/magdir/neko U src/external/bsd/file/dist/magic/magdir/nitpicker 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/scientific U src/external/bsd/file/dist/magic/magdir/sysex 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/olf U src/external/bsd/file/dist/magic/magdir/os2 U src/external/bsd/file/dist/magic/magdir/ole2compounddocs 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 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 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/pc88 U src/external/bsd/file/dist/magic/magdir/pc98 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 U src/external/bsd/file/dist/magic/magdir/pgp 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/plus5 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/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/tcl 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/rpi U src/external/bsd/file/dist/magic/magdir/rpm 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/sc U src/external/bsd/file/dist/magic/magdir/sccs U src/external/bsd/file/dist/magic/magdir/sharc U src/external/bsd/file/dist/magic/magdir/sgi 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 U src/external/bsd/file/dist/magic/magdir/sgml U src/external/bsd/file/dist/magic/magdir/smalltalk 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/varied.out 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/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/sun U src/external/bsd/file/dist/magic/magdir/symbos U src/external/bsd/file/dist/magic/magdir/windows 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/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/unknown U src/external/bsd/file/dist/magic/magdir/uterus U src/external/bsd/file/dist/magic/magdir/uuencode U src/external/bsd/file/dist/magic/magdir/vicar U src/external/bsd/file/dist/magic/magdir/vax U src/external/bsd/file/dist/magic/magdir/vacuum-cleaner U src/external/bsd/file/dist/magic/magdir/varied.script U src/external/bsd/file/dist/magic/magdir/virtutech U src/external/bsd/file/dist/magic/magdir/virtual U src/external/bsd/file/dist/magic/magdir/vmware 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/webassembly 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/wordprocessors U src/external/bsd/file/dist/magic/magdir/wireless U src/external/bsd/file/dist/magic/magdir/x68000 U src/external/bsd/file/dist/magic/magdir/zfs U src/external/bsd/file/dist/magic/magdir/wsdl U src/external/bsd/file/dist/magic/magdir/xdelta U 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 N src/external/bsd/file/dist/tests/regex-eol.magic 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/test.c N src/external/bsd/file/dist/tests/zstd-3-skippable-frames.result N src/external/bsd/file/dist/tests/CVE-2014-1943.testfile N src/external/bsd/file/dist/tests/JW07022A.mp3.testfile U src/external/bsd/file/dist/tests/escapevel.testfile N src/external/bsd/file/dist/tests/fit-map-data.testfile U src/external/bsd/file/dist/tests/gedcom.testfile U src/external/bsd/file/dist/tests/hddrawcopytool.testfile U src/external/bsd/file/dist/tests/issue311docx.testfile N src/external/bsd/file/dist/tests/issue359xlsx.testfile N src/external/bsd/file/dist/tests/json1.testfile N src/external/bsd/file/dist/tests/json2.testfile N src/external/bsd/file/dist/tests/json3.testfile N src/external/bsd/file/dist/tests/regex-eol.testfile N src/external/bsd/file/dist/tests/zstd-v0.2-FF.testfile N src/external/bsd/file/dist/tests/zstd-v0.3-FF.testfile N src/external/bsd/file/dist/tests/zstd-v0.4-FF.testfile N src/external/bsd/file/dist/tests/zstd-v0.5-FF.testfile N src/external/bsd/file/dist/tests/zstd-v0.6-FF.testfile N src/external/bsd/file/dist/tests/zstd-v0.7-21.testfile N src/external/bsd/file/dist/tests/zstd-v0.7-22.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-01.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-02.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-03.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-16.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-20.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-21.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-22.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-23.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-F4.testfile N src/external/bsd/file/dist/tests/zstd-v0.8-FF.testfile N src/external/bsd/file/dist/tests/CVE-2014-1943.result N src/external/bsd/file/dist/tests/JW07022A.mp3.result U src/external/bsd/file/dist/tests/escapevel.result N src/external/bsd/file/dist/tests/fit-map-data.result U src/external/bsd/file/dist/tests/gedcom.result U src/external/bsd/file/dist/tests/hddrawcopytool.result U src/external/bsd/file/dist/tests/issue311docx.result N src/external/bsd/file/dist/tests/issue359xlsx.result N src/external/bsd/file/dist/tests/json1.result N src/external/bsd/file/dist/tests/json2.result N src/external/bsd/file/dist/tests/json3.result N src/external/bsd/file/dist/tests/regex-eol.result N src/external/bsd/file/dist/tests/zstd-skippable-frame-0.result N src/external/bsd/file/dist/tests/zstd-dictionary-0.result N src/external/bsd/file/dist/tests/zstd-dictionary-1.result N src/external/bsd/file/dist/tests/zstd-dictionary-2.result N src/external/bsd/file/dist/tests/zstd-v0.2-FF.result N src/external/bsd/file/dist/tests/zstd-skippable-frame-4.result N src/external/bsd/file/dist/tests/zstd-skippable-frame-8.result N src/external/bsd/file/dist/tests/zstd-skippable-frame-C.result N src/external/bsd/file/dist/tests/zstd-v0.3-FF.result N src/external/bsd/file/dist/tests/zstd-v0.4-FF.result N src/external/bsd/file/dist/tests/zstd-v0.5-FF.result N src/external/bsd/file/dist/tests/zstd-v0.6-FF.result N src/external/bsd/file/dist/tests/zstd-v0.7-00.result N src/external/bsd/file/dist/tests/zstd-v0.7-21.result N src/external/bsd/file/dist/tests/zstd-v0.7-22.result N src/external/bsd/file/dist/tests/zstd-v0.8-00.result N src/external/bsd/file/dist/tests/zstd-v0.8-01.result N src/external/bsd/file/dist/tests/zstd-v0.8-02.result N src/external/bsd/file/dist/tests/zstd-v0.8-03.result N src/external/bsd/file/dist/tests/zstd-v0.8-16.result N src/external/bsd/file/dist/tests/zstd-v0.8-20.result N src/external/bsd/file/dist/tests/zstd-v0.8-21.result N src/external/bsd/file/dist/tests/zstd-v0.8-22.result N src/external/bsd/file/dist/tests/zstd-v0.8-23.result N src/external/bsd/file/dist/tests/zstd-v0.8-F4.result N src/external/bsd/file/dist/tests/zstd-v0.8-FF.result C src/external/bsd/file/dist/doc/file.1 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 U src/external/bsd/file/dist/python/Makefile.am C src/external/bsd/file/dist/python/Makefile.in N src/external/bsd/file/dist/python/LICENSE N src/external/bsd/file/dist/python/CHANGELOG.md N src/external/bsd/file/dist/python/README.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 N src/external/bsd/file/dist/python/tests.py 39 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCHRISTOS:yesterday -jCHRISTOS src/external/bsd/file/dist