Module Name: src Committed By: christos Date: Fri Feb 10 17:43:01 UTC 2017
Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7355 Log Message: 2017-02-10 12:24 Christos Zoulas <chris...@zoulas.com> * release 5.30 2017-02-07 23:27 Christos Zoulas <chris...@zoulas.com> * If we exceeded the offset in a search return no match (Christoph Biedl) * Be more lenient on corrupt CDF files (Christoph Biedl) 2017-02-04 16:46 Christos Zoulas <chris...@zoulas.com> * pacify ubsan sign extension (oss-fuzz/524) 2017-02-01 12:42 Christos Zoulas <chris...@zoulas.com> * off by one in cdf parsing (PR/593) * report debugging sections in elf (PR/591) 2016-11-06 10:52 Christos Zoulas <chris...@zoulas.com> * Allow @@@ in extensions * Add missing overflow check in der magic (Jonas Wagner) 2016-10-25 10:40 Christos Zoulas <chris...@zoulas.com> * release 5.29 2016-10-24 11:20 Christos Zoulas <chris...@zoulas.com> * der getlength overflow (Jonas Wagner) * multiple magic file load failure (Christoph Biedl) 2016-10-17 11:26 Christos Zoulas <chris...@zoulas.com> * CDF parsing improvements (Guy Helmer) 2016-07-20 7:26 Christos Zoulas <chris...@zoulas.com> * Add support for signed indirect offsets 2016-07-18 7:41 Christos Zoulas <chris...@zoulas.com> * cat /dev/null | file - should print empty (Christoph Biedl) 2016-07-05 15:20 Christos Zoulas <chris...@zoulas.com> * Bump string size from 64 to 96. 2016-06-13 20:20 Christos Zoulas <chris...@zoulas.com> * PR/556: Fix separators on annotations. 2016-06-13 19:40 Christos Zoulas <chris...@zoulas.com> * release 5.28 * fix leak on allocation failure 2016-06-01 1:20 Christos Zoulas <chris...@zoulas.com> * PR/555: Avoid overflow for offset > nbytes * PR/550: Segv on DER parsing: - use the correct variable for length - set offset to 0 on failure. 2016-05-13 12:00 Christos Zoulas <chris...@zoulas.com> * release 5.27 2016-04-18 9:35 Christos Zoulas <chris...@zoulas.com> * Errors comparing DER entries or computing offsets are just indications of malformed non-DER files. Don't print them. * Offset comparison was off-by-one. * Fix compression code (Werner Fink) * Put new bytes constant in the right file (not the generated one) 2016-04-16 18:34 Christos Zoulas <chris...@zoulas.com> * release 5.26 2016-03-31 13:50 Christos Zoulas <chris...@zoulas.com> * make the number of bytes read from files configurable. 2016-03-21 13:40 Christos Zoulas <chris...@zoulas.com> * Add bounds checks for DER code (discovered by Thomas Jarosch) * Change indirect recursion limit to indirect use count and bump from 15 to 50 to prevent abuse. 2016-03-13 20:39 Christos Zoulas <chris...@zoulas.com> * Add -00 which prints filename\0description\0 2016-03-01 13:28 Christos Zoulas <chris...@zoulas.com> * Fix ID3 indirect parsing 2016-01-19 10:18 Christos Zoulas <chris...@zoulas.com> * add DER parsing capability 2015-11-13 10:35 Christos Zoulas <chris...@zoulas.com> * provide dprintf(3) for the OS's that don't have it. 2015-11-11 16:25 Christos Zoulas <chris...@zoulas.com> * redo the compression code report decompression errors 2015-11-10 23:25 Christos Zoulas <chris...@zoulas.com> * REG_STARTEND code is not working as expected, delete it. 2015-11-09 16:05 Christos Zoulas <chris...@zoulas.com> * Add zlib support if we have it. 2015-11-05 11:22 Christos Zoulas <chris...@zoulas.com> * PR/492: compression forking was broken with magic_buffer. 2015-09-16 9:50 Christos Zoulas <chris...@zoulas.com> * release 5.25 2015-09-11 13:25 Christos Zoulas <chris...@zoulas.com> * add a limit to the length of regex searches 2015-09-08 9:50 Christos Zoulas <chris...@zoulas.com> * fix problems with --parameter (Christoph Biedl) 2015-07-11 10:35 Christos Zoulas <chris...@zoulas.com> * Windows fixes PR/466 (Jason Hood) 2015-07-09 10:35 Christos Zoulas <chris...@zoulas.com> * release 5.24 2015-06-11 8:52 Christos Zoulas <chris...@zoulas.com> * redo long option encoding to fix off-by-one in 5.23 2015-06-10 13:50 Christos Zoulas <chris...@zoulas.com> * release 5.23 2015-06-09 16:10 Christos Zoulas <chris...@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 * PR/459: Don't insert magic entries to the list if there are parsing errors for them. 2015-06-03 16:00 Christos Zoulas <chris...@zoulas.com> * PR/455: Add utf-7 encoding 2015-06-03 14:30 Christos Zoulas <chris...@zoulas.com> * PR/455: Implement -Z, look inside, but don't report on compression * PR/454: Fix allocation error on bad magic. 2015-05-29 10:30 Christos Zoulas <chris...@zoulas.com> * handle MAGIC_CONTINUE everywhere, not just in softmagic 2015-05-21 14:30 Christos Zoulas <chris...@zoulas.com> * don't print descriptions for NAME types when mime. 2015-04-09 15:59 Christos Zoulas <chris...@zoulas.com> * Add --extension to list the known extensions for this file type Idea by Andrew J Roazen 2015-02-14 12:23 Christos Zoulas <chris...@zoulas.com> * Bump file search buffer size to 1M. 2015-01-09 14:35 Christos Zoulas <chris...@zoulas.com> * Fix multiple issues with date formats reported by Christoph Biedl: - T_LOCAL meaning was reversed - Arithmetic did not work Also stop adjusting daylight savings for gmt printing. 2015-01-05 13:00 Christos Zoulas <chris...@zoulas.com> * PR/411: Fix memory corruption from corrupt cdf file. Status: Vendor Tag: CHRISTOS Release Tags: FILE5_30 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 U 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 N 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 N src/external/bsd/file/dist/src/localtime_r.c N 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 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/print.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 N src/external/bsd/file/dist/src/der.c N 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 U 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/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 N 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 C src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/aout U src/external/bsd/file/dist/magic/magdir/apl N src/external/bsd/file/dist/magic/magdir/bioinformatics U src/external/bsd/file/dist/magic/magdir/blender N src/external/bsd/file/dist/magic/magdir/application U src/external/bsd/file/dist/magic/magdir/applix N 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 N src/external/bsd/file/dist/magic/magdir/ber U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/communications 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/blit U src/external/bsd/file/dist/magic/magdir/bsi 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/btsnoop 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 N 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 N src/external/bsd/file/dist/magic/magdir/coff U src/external/bsd/file/dist/magic/magdir/commands C 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 N 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/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/fusecompress N src/external/bsd/file/dist/magic/magdir/finger U src/external/bsd/file/dist/magic/magdir/flash N 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/gnumeric U 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/geo U src/external/bsd/file/dist/magic/magdir/geos 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/grace U src/external/bsd/file/dist/magic/magdir/gpt N src/external/bsd/file/dist/magic/magdir/gpu U src/external/bsd/file/dist/magic/magdir/gringotts 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/lex U src/external/bsd/file/dist/magic/magdir/guile 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 U src/external/bsd/file/dist/magic/magdir/lif 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 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/linux U src/external/bsd/file/dist/magic/magdir/lua 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/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/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/mercurial U src/external/bsd/file/dist/magic/magdir/mlssa 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/meteorological U src/external/bsd/file/dist/magic/magdir/metastore N 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/mmdf U src/external/bsd/file/dist/magic/magdir/nitpicker U src/external/bsd/file/dist/magic/magdir/modem U src/external/bsd/file/dist/magic/magdir/mozilla U src/external/bsd/file/dist/magic/magdir/motorola 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/msx 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/music N 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/neko C 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/pkgadd 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/pbf 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/pbm N src/external/bsd/file/dist/magic/magdir/pc88 N 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 C src/external/bsd/file/dist/magic/magdir/pgp U src/external/bsd/file/dist/magic/magdir/scientific U src/external/bsd/file/dist/magic/magdir/plan9 U src/external/bsd/file/dist/magic/magdir/plus5 N 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 N 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/qt 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/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/sysex 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/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/vax U src/external/bsd/file/dist/magic/magdir/vmware U src/external/bsd/file/dist/magic/magdir/vms N 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/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/wordprocessors 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/windows U src/external/bsd/file/dist/magic/magdir/wireless N src/external/bsd/file/dist/magic/magdir/x68000 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 N src/external/bsd/file/dist/magic/magdir/yara U src/external/bsd/file/dist/magic/magdir/zfs U src/external/bsd/file/dist/magic/magdir/zilog U src/external/bsd/file/dist/magic/magdir/zyxel U src/external/bsd/file/dist/tests/escapevel.result 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 U src/external/bsd/file/dist/tests/issue311docx.testfile U src/external/bsd/file/dist/tests/escapevel.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/issue311docx.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 U src/external/bsd/file/dist/python/README 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 40 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCHRISTOS:yesterday -jCHRISTOS src/external/bsd/file/dist