Module Name:	src
Committed By:	ghen
Date:		Sun Jun 24 19:43:45 UTC 2007

Modified Files:
	src/dist/file [netbsd-3-0]: ChangeLog LEGAL.NOTICE MAINT Makefile.in
	    README aclocal.m4 config.guess config.h.in config.sub configure
	    configure.in depcomp file2netbsd install-sh ltmain.sh missing
	    mkinstalldirs
	src/dist/file/doc [netbsd-3-0]: Makefile.in file.1 libmagic.3 magic.5
	src/dist/file/magic [netbsd-3-0]: Localstuff Makefile.am Makefile.in
	    magic.mime magic2mime
	src/dist/file/magic/magdir [netbsd-3-0]: adventure amigaos animation
	    apple archive audio bout c-lang c64 cad commands compress console
	    ctags diff digital dump editors elf filesystems flash fonts fsav
	    gnu iff images java linux lisp mach maple mathematica mime mips
	    misctools msdos ncr os2 perl psion python revision riff sgi sgml
	    sharc sql sun sysex tex tgif varied.out varied.script vmware
	    wordprocessors xwindows
	src/dist/file/python [netbsd-3-0]: Makefile.in
	src/dist/file/src [netbsd-3-0]: Makefile.am Makefile.in apprentice.c
	    apptype.c ascmagic.c compress.c file.c file.h fsmagic.c funcs.c
	    is_tar.c magic.c magic.h names.h patchlevel.h print.c readelf.c
	    readelf.h softmagic.c tar.h test.c
	src/distrib/sets/lists/base [netbsd-3-0]: shl.elf shl.mi
	src/lib [netbsd-3-0]: Makefile
	src/lib/libmagic [netbsd-3-0]: Makefile config.h shlib_version
	src/tools/file [netbsd-3-0]: Makefile
	src/usr.bin/file [netbsd-3-0]: Makefile
Added Files:
	src/dist/file/magic/magdir [netbsd-3-0]: basis bflt btsnoop cafebabe
	    cracklib mup os400 scientific unicode
Removed Files:
	src/dist/file/magic/magdir [netbsd-3-0]: bFLT

Log Message:
Pull up following revision(s) (requested by pooka in ticket #1804):
	dist/file/: synced with HEAD on 20070615
	distrib/sets/lists/base/shl.elf: revision 1.222
	distrib/sets/lists/base/shl.mi: revision 1.375 via patch
	lib/Makefile: revision 1.108 via patch
	lib/libmagic/Makefile: revision 1.5
	lib/libmagic/config.h: patch
	lib/libmagic/shlib_version: revision 1.3-1.4
	tools/file/Makefile: revision 1.4
	usr.bin/file/Makefile: revision 1.51-1.53
Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and
CVE-2007-2799).


To generate a diff of this commit:
cvs rdiff -r1.1.1.8 -r1.1.1.8.4.1 src/dist/file/ChangeLog
cvs rdiff -r1.4 -r1.4.4.1 src/dist/file/LEGAL.NOTICE \
    src/dist/file/config.guess src/dist/file/config.sub \
    src/dist/file/install-sh
cvs rdiff -r1.3 -r1.3.10.1 src/dist/file/MAINT
cvs rdiff -r1.12 -r1.12.4.1 src/dist/file/Makefile.in
cvs rdiff -r1.4 -r1.4.10.1 src/dist/file/README
cvs rdiff -r1.10 -r1.10.4.1 src/dist/file/aclocal.m4
cvs rdiff -r1.9 -r1.9.4.1 src/dist/file/config.h.in
cvs rdiff -r1.14 -r1.14.4.1 src/dist/file/configure
cvs rdiff -r1.13 -r1.13.4.1 src/dist/file/configure.in \
    src/dist/file/file2netbsd
cvs rdiff -r1.3 -r1.3.4.1 src/dist/file/depcomp src/dist/file/ltmain.sh \
    src/dist/file/missing src/dist/file/mkinstalldirs
cvs rdiff -r1.10 -r1.10.4.1 src/dist/file/doc/Makefile.in
cvs rdiff -r1.11 -r1.11.4.1 src/dist/file/doc/file.1 \
    src/dist/file/doc/magic.5
cvs rdiff -r1.3 -r1.3.4.1 src/dist/file/doc/libmagic.3
cvs rdiff -r1.1.1.1 -r1.1.1.1.10.1 src/dist/file/magic/Localstuff \
    src/dist/file/magic/magic2mime
cvs rdiff -r1.1.1.7 -r1.1.1.7.4.1 src/dist/file/magic/Makefile.am
cvs rdiff -r1.12 -r1.12.4.1 src/dist/file/magic/Makefile.in
cvs rdiff -r1.1.1.9 -r1.1.1.9.4.1 src/dist/file/magic/magic.mime
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 src/dist/file/magic/magdir/adventure \
    src/dist/file/magic/magdir/diff src/dist/file/magic/magdir/tex
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 src/dist/file/magic/magdir/amigaos \
    src/dist/file/magic/magdir/console src/dist/file/magic/magdir/gnu \
    src/dist/file/magic/magdir/linux
cvs rdiff -r1.1.1.5 -r1.1.1.5.4.1 src/dist/file/magic/magdir/animation \
    src/dist/file/magic/magdir/filesystems
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/dist/file/magic/magdir/apple \
    src/dist/file/magic/magdir/elf src/dist/file/magic/magdir/iff \
    src/dist/file/magic/magdir/varied.out
cvs rdiff -r1.1.1.7 -r1.1.1.7.4.1 src/dist/file/magic/magdir/archive \
    src/dist/file/magic/magdir/images
cvs rdiff -r1.8 -r1.8.4.1 src/dist/file/magic/magdir/audio
cvs rdiff -r1.1.1.1 -r0 src/dist/file/magic/magdir/bFLT
cvs rdiff -r0 -r1.1.1.1.8.2 src/dist/file/magic/magdir/basis \
    src/dist/file/magic/magdir/bflt src/dist/file/magic/magdir/btsnoop \
    src/dist/file/magic/magdir/cafebabe
cvs rdiff -r1.1.1.1 -r1.1.1.1.10.1 src/dist/file/magic/magdir/bout \
    src/dist/file/magic/magdir/c64 src/dist/file/magic/magdir/cad \
    src/dist/file/magic/magdir/ctags src/dist/file/magic/magdir/digital \
    src/dist/file/magic/magdir/dump src/dist/file/magic/magdir/editors \
    src/dist/file/magic/magdir/fsav src/dist/file/magic/magdir/java \
    src/dist/file/magic/magdir/lisp src/dist/file/magic/magdir/mime \
    src/dist/file/magic/magdir/mips src/dist/file/magic/magdir/misctools \
    src/dist/file/magic/magdir/ncr src/dist/file/magic/magdir/psion \
    src/dist/file/magic/magdir/revision src/dist/file/magic/magdir/sharc \
    src/dist/file/magic/magdir/sql src/dist/file/magic/magdir/tgif \
    src/dist/file/magic/magdir/varied.script \
    src/dist/file/magic/magdir/xwindows
cvs rdiff -r1.1.1.2 -r1.1.1.2.10.1 src/dist/file/magic/magdir/c-lang \
    src/dist/file/magic/magdir/flash src/dist/file/magic/magdir/mach \
    src/dist/file/magic/magdir/maple src/dist/file/magic/magdir/os2 \
    src/dist/file/magic/magdir/python src/dist/file/magic/magdir/sysex \
    src/dist/file/magic/magdir/vmware \
    src/dist/file/magic/magdir/wordprocessors
cvs rdiff -r1.1.1.3 -r1.1.1.3.10.1 src/dist/file/magic/magdir/commands \
    src/dist/file/magic/magdir/compress src/dist/file/magic/magdir/fonts \
    src/dist/file/magic/magdir/mathematica src/dist/file/magic/magdir/sgml \
    src/dist/file/magic/magdir/sun
cvs rdiff -r0 -r1.1.1.2.8.2 src/dist/file/magic/magdir/cracklib
cvs rdiff -r1.1.1.8 -r1.1.1.8.4.1 src/dist/file/magic/magdir/msdos
cvs rdiff -r0 -r1.1.1.1.10.2 src/dist/file/magic/magdir/mup \
    src/dist/file/magic/magdir/scientific
cvs rdiff -r0 -r1.1.1.2.4.2 src/dist/file/magic/magdir/os400
cvs rdiff -r1.2 -r1.2.4.1 src/dist/file/magic/magdir/perl
cvs rdiff -r1.5 -r1.5.10.1 src/dist/file/magic/magdir/riff
cvs rdiff -r1.5 -r1.5.4.1 src/dist/file/magic/magdir/sgi
cvs rdiff -r0 -r1.1.1.1.4.2 src/dist/file/magic/magdir/unicode
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 src/dist/file/python/Makefile.in
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/dist/file/src/Makefile.am
cvs rdiff -r1.11 -r1.11.4.1 src/dist/file/src/Makefile.in
cvs rdiff -r1.7.2.1 -r1.7.2.1.2.1 src/dist/file/src/apprentice.c
cvs rdiff -r1.1.1.5 -r1.1.1.5.4.1 src/dist/file/src/apptype.c
cvs rdiff -r1.2 -r1.2.4.1 src/dist/file/src/ascmagic.c \
    src/dist/file/src/compress.c src/dist/file/src/is_tar.c \
    src/dist/file/src/magic.h src/dist/file/src/names.h \
    src/dist/file/src/patchlevel.h src/dist/file/src/print.c \
    src/dist/file/src/readelf.h src/dist/file/src/softmagic.c \
    src/dist/file/src/tar.h src/dist/file/src/test.c
cvs rdiff -r1.12 -r1.12.4.1 src/dist/file/src/file.c
cvs rdiff -r1.10.4.1 -r1.10.4.2 src/dist/file/src/file.h
cvs rdiff -r1.4 -r1.4.4.1 src/dist/file/src/fsmagic.c
cvs rdiff -r1.2.4.1 -r1.2.4.2 src/dist/file/src/funcs.c
cvs rdiff -r1.13.4.1 -r1.13.4.2 src/dist/file/src/magic.c
cvs rdiff -r1.7 -r1.7.4.1 src/dist/file/src/readelf.c
cvs rdiff -r1.99 -r1.99.4.1 src/distrib/sets/lists/base/shl.elf
cvs rdiff -r1.304.2.5.2.1 -r1.304.2.5.2.2 src/distrib/sets/lists/base/shl.mi
cvs rdiff -r1.95 -r1.95.4.1 src/lib/Makefile
cvs rdiff -r1.4 -r1.4.10.1 src/lib/libmagic/Makefile
cvs rdiff -r1.3 -r1.3.10.1 src/lib/libmagic/config.h
cvs rdiff -r1.2 -r1.2.10.1 src/lib/libmagic/shlib_version
cvs rdiff -r1.3 -r1.3.4.1 src/tools/file/Makefile
cvs rdiff -r1.50 -r1.50.4.1 src/usr.bin/file/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.