head	1.6;
access;
symbols
	perseant-exfatfs-base-20250801:1.6
	perseant-exfatfs-base-20240630:1.6
	perseant-exfatfs:1.6.0.34
	perseant-exfatfs-base:1.6
	cjep_sun2x:1.6.0.32
	cjep_sun2x-base:1.6
	cjep_staticlib_x-base1:1.6
	cjep_staticlib_x:1.6.0.30
	cjep_staticlib_x-base:1.6
	phil-wifi-20200421:1.6
	phil-wifi-20200411:1.6
	phil-wifi-20200406:1.6
	pgoyette-compat-merge-20190127:1.6
	pgoyette-compat-20190127:1.6
	pgoyette-compat-20190118:1.6
	pgoyette-compat-1226:1.6
	pgoyette-compat-1126:1.6
	pgoyette-compat-1020:1.6
	pgoyette-compat-0930:1.6
	pgoyette-compat-0906:1.6
	pgoyette-compat-0728:1.6
	pgoyette-compat-0625:1.6
	pgoyette-compat-0521:1.6
	pgoyette-compat-0502:1.6
	pgoyette-compat-0422:1.6
	pgoyette-compat-0415:1.6
	pgoyette-compat-0407:1.6
	pgoyette-compat-0330:1.6
	pgoyette-compat-0322:1.6
	pgoyette-compat-0315:1.6
	pgoyette-compat:1.6.0.28
	pgoyette-compat-base:1.6
	prg-localcount2-base3:1.6
	prg-localcount2-base2:1.6
	prg-localcount2-base1:1.6
	prg-localcount2:1.6.0.26
	prg-localcount2-base:1.6
	pgoyette-localcount-20170426:1.6
	bouyer-socketcan-base1:1.6
	pgoyette-localcount-20170320:1.6
	bouyer-socketcan:1.6.0.24
	bouyer-socketcan-base:1.6
	pgoyette-localcount-20170107:1.6
	pgoyette-localcount-20161104:1.6
	localcount-20160914:1.6
	pgoyette-localcount-20160806:1.6
	pgoyette-localcount-20160726:1.6
	pgoyette-localcount:1.6.0.22
	pgoyette-localcount-base:1.6
	netbsd-5-2-3-RELEASE:1.6
	netbsd-5-1-5-RELEASE:1.6
	yamt-pagecache-base9:1.6
	yamt-pagecache-tag8:1.6
	tls-earlyentropy:1.6.0.18
	tls-earlyentropy-base:1.6
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6
	riastradh-drm2-base3:1.6
	netbsd-5-2-2-RELEASE:1.6
	netbsd-5-1-4-RELEASE:1.6
	netbsd-5-2-1-RELEASE:1.6
	netbsd-5-1-3-RELEASE:1.6
	agc-symver:1.6.0.20
	agc-symver-base:1.6
	tls-maxphys-base:1.6
	yamt-pagecache-base8:1.6
	netbsd-5-2:1.6.0.16
	yamt-pagecache-base7:1.6
	netbsd-5-2-RELEASE:1.6
	netbsd-5-2-RC1:1.6
	yamt-pagecache-base6:1.6
	yamt-pagecache-base5:1.6
	yamt-pagecache-base4:1.6
	netbsd-5-1-2-RELEASE:1.6
	netbsd-5-1-1-RELEASE:1.6
	yamt-pagecache-base3:1.6
	yamt-pagecache-base2:1.6
	yamt-pagecache:1.6.0.2
	yamt-pagecache-base:1.6
	bouyer-quota2-nbase:1.6
	bouyer-quota2:1.6.0.14
	bouyer-quota2-base:1.6
	matt-nb5-pq3:1.6.0.12
	matt-nb5-pq3-base:1.6
	netbsd-5-1:1.6.0.10
	netbsd-5-1-RELEASE:1.6
	netbsd-5-1-RC4:1.6
	netbsd-5-1-RC3:1.6
	netbsd-5-1-RC2:1.6
	netbsd-5-1-RC1:1.6
	netbsd-5-0-2-RELEASE:1.6
	netbsd-5-0-1-RELEASE:1.6
	jym-xensuspend-nbase:1.6
	netbsd-5-0:1.6.0.8
	netbsd-5-0-RELEASE:1.6
	netbsd-5-0-RC4:1.6
	netbsd-5-0-RC3:1.6
	netbsd-5-0-RC2:1.6
	jym-xensuspend:1.6.0.6
	jym-xensuspend-base:1.6
	netbsd-5-0-RC1:1.6
	netbsd-5:1.6.0.4
	netbsd-5-base:1.6
	matt-mips64:1.5.0.14
	netbsd-4-0-1-RELEASE:1.3.2.1
	wrstuden-fixsa-newbase:1.3.2.1
	wrstuden-revivesa-base-1:1.5
	yamt-pf42-base4:1.5
	yamt-pf42-base3:1.5
	hpcarm-cleanup-nbase:1.5
	yamt-pf42-baseX:1.5
	yamt-pf42-base2:1.5
	wrstuden-revivesa:1.5.0.12
	wrstuden-revivesa-base:1.5
	yamt-pf42:1.5.0.10
	yamt-pf42-base:1.5
	keiichi-mipv6:1.5.0.8
	keiichi-mipv6-base:1.5
	matt-armv6-nbase:1.5
	matt-armv6-prevmlocking:1.5
	wrstuden-fixsa-base-1:1.3.2.1
	netbsd-4-0:1.3.2.1.0.2
	netbsd-4-0-RELEASE:1.3.2.1
	cube-autoconf:1.5.0.6
	cube-autoconf-base:1.5
	netbsd-4-0-RC5:1.3.2.1
	netbsd-4-0-RC4:1.3.2.1
	netbsd-4-0-RC3:1.3.2.1
	netbsd-4-0-RC2:1.3.2.1
	netbsd-4-0-RC1:1.3.2.1
	matt-armv6:1.5.0.4
	matt-armv6-base:1.5
	matt-mips64-base:1.5
	hpcarm-cleanup:1.5.0.2
	hpcarm-cleanup-base:1.5
	netbsd-3-1-1-RELEASE:1.1.1.9.6.1
	netbsd-3-0-3-RELEASE:1.1.1.9.4.1
	FILE4_21:1.1.1.13
	wrstuden-fixsa:1.3.0.4
	wrstuden-fixsa-base:1.3.2.1
	FILE4_20:1.1.1.12
	abandoned-netbsd-4-base:1.1.1.10
	abandoned-netbsd-4:1.1.1.10.0.2
	FILE4_18:1.1.1.11
	netbsd-3-1:1.1.1.9.0.6
	netbsd-3-1-RELEASE:1.1.1.9
	netbsd-3-0-2-RELEASE:1.1.1.9
	netbsd-3-1-RC4:1.1.1.9
	netbsd-3-1-RC3:1.1.1.9
	netbsd-3-1-RC2:1.1.1.9
	netbsd-3-1-RC1:1.1.1.9
	netbsd-4:1.3.0.2
	netbsd-4-base:1.3
	netbsd-3-0-1-RELEASE:1.1.1.9
	netbsd-3-0:1.1.1.9.0.4
	netbsd-3-0-RELEASE:1.1.1.9
	netbsd-3-0-RC6:1.1.1.9
	netbsd-3-0-RC5:1.1.1.9
	netbsd-3-0-RC4:1.1.1.9
	netbsd-3-0-RC3:1.1.1.9
	netbsd-3-0-RC2:1.1.1.9
	netbsd-3-0-RC1:1.1.1.9
	netbsd-2-0-3-RELEASE:1.1.1.5
	netbsd-2-1:1.1.1.5.0.6
	netbsd-2-1-RELEASE:1.1.1.5
	FILE4_16:1.1.1.10
	netbsd-2-1-RC6:1.1.1.5
	netbsd-2-1-RC5:1.1.1.5
	netbsd-2-1-RC4:1.1.1.5
	netbsd-2-1-RC3:1.1.1.5
	netbsd-2-1-RC2:1.1.1.5
	netbsd-2-1-RC1:1.1.1.5
	netbsd-2-0-2-RELEASE:1.1.1.5
	netbsd-3:1.1.1.9.0.2
	netbsd-3-base:1.1.1.9
	FILE4_13:1.1.1.9
	FILE413-BEFOREIMPORT:1.1.1.8
	netbsd-2-0-1-RELEASE:1.1.1.5
	netbsd-2:1.1.1.5.0.4
	netbsd-2-base:1.1.1.5
	FILE4_12:1.1.1.8
	netbsd-2-0-RELEASE:1.1.1.5
	netbsd-2-0-RC5:1.1.1.5
	netbsd-2-0-RC4:1.1.1.5
	netbsd-2-0-RC3:1.1.1.5
	netbsd-2-0-RC2:1.1.1.5
	netbsd-2-0-RC1:1.1.1.5
	FILE4_10:1.1.1.7
	FILE4_09:1.1.1.6
	netbsd-2-0:1.1.1.5.0.2
	netbsd-2-0-base:1.1.1.5
	FILE4_08:1.1.1.5
	FILE4_06:1.1.1.4
	FILE4_04:1.1.1.3
	FILE4_03:1.1.1.2
	FILE4_00:1.1.1.1
	CHRISTOS:1.1.1;
locks; strict;
comment	@# @;


1.6
date	2008.08.30.12.16.52;	author christos;	state dead;
branches;
next	1.5;

1.5
date	2007.06.07.11.32.45;	author pooka;	state Exp;
branches
	1.5.12.1;
next	1.4;

1.4
date	2007.03.04.15.22.09;	author pooka;	state Exp;
branches;
next	1.3;

1.3
date	2006.10.31.21.16.23;	author pooka;	state Exp;
branches
	1.3.2.1
	1.3.4.1;
next	1.2;

1.2
date	2006.10.20.15.54.45;	author christos;	state Exp;
branches;
next	1.1;

1.1
date	2003.03.25.22.30.23;	author pooka;	state Exp;
branches
	1.1.1.1;
next	;

1.5.12.1
date	2008.09.07.20.22.52;	author wrstuden;	state dead;
branches;
next	;

1.3.2.1
date	2007.06.15.16.14.42;	author liamjfoy;	state Exp;
branches;
next	;

1.3.4.1
date	2007.09.03.06.53.21;	author wrstuden;	state Exp;
branches;
next	;

1.1.1.1
date	2003.03.25.22.30.23;	author pooka;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2003.05.25.21.28.17;	author pooka;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2003.09.25.17.59.13;	author pooka;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2003.10.27.16.14.26;	author pooka;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2004.03.23.08.31.46;	author pooka;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2004.04.08.12.22.21;	author pooka;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2004.09.16.13.43.48;	author pooka;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2004.12.13.10.24.56;	author pooka;	state Exp;
branches;
next	1.1.1.9;

1.1.1.9
date	2005.02.21.14.33.23;	author pooka;	state Exp;
branches
	1.1.1.9.2.1
	1.1.1.9.4.1
	1.1.1.9.6.1;
next	1.1.1.10;

1.1.1.10
date	2005.10.17.17.48.28;	author pooka;	state Exp;
branches;
next	1.1.1.11;

1.1.1.11
date	2006.10.31.20.34.53;	author pooka;	state Exp;
branches;
next	1.1.1.12;

1.1.1.12
date	2007.03.04.14.54.54;	author pooka;	state Exp;
branches;
next	1.1.1.13;

1.1.1.13
date	2007.06.07.11.24.38;	author pooka;	state Exp;
branches;
next	;

1.1.1.9.2.1
date	2007.06.24.19.41.49;	author ghen;	state Exp;
branches;
next	;

1.1.1.9.4.1
date	2007.06.24.19.43.16;	author ghen;	state Exp;
branches;
next	;

1.1.1.9.6.1
date	2007.06.24.19.45.11;	author ghen;	state Exp;
branches;
next	;


desc
@@


1.6
log
@resolve conflicts, fix build.
@
text
@# Magic data for KMimeMagic (originally for file(1) command)
#
# The format is 4-5 columns:
#    Column #1: byte number to begin checking from, ">" indicates continuation
#    Column #2: type of data to match
#    Column #3: contents of data to match
#    Column #4: MIME type of result
#    Column #5: MIME encoding of result (optional)

#------------------------------------------------------------------------------
# Localstuff:  file(1) magic for locally observed files
# Add any locally observed files here.

# Real Audio (Magic .ra\0375)
0	belong		0x2e7261fd	audio/x-pn-realaudio
0	string		.RMF		application/vnd.rn-realmedia

#video/x-pn-realvideo
#video/vnd.rn-realvideo
#application/vnd.rn-realmedia
#	sigh, there are many mimes for that but the above are the most common.

# Taken from magic, converted to magic.mime
# mime types according to http://www.geocities.com/nevilo/mod.htm:
#	audio/it	.it
#	audio/x-zipped-it	.itz
#	audio/xm	fasttracker modules
#	audio/x-s3m	screamtracker modules
#	audio/s3m	screamtracker modules
#	audio/x-zipped-mod	mdz
#	audio/mod	mod
#	audio/x-mod	All modules (mod, s3m, 669, mtm, med, xm, it, mdz, stm, itz, xmz, s3z)

# Taken from loader code from mikmod version 2.14
# by Steve McIntyre (stevem@@chiark.greenend.org.uk)
# <doj@@cubic.org> added title printing on 2003-06-24
0	string	MAS_UTrack_V00
>14	string	>/0		audio/x-mod
#audio/x-tracker-module

#0	string	UN05		MikMod UNI format module sound data

0	string	Extended\ Module: audio/x-mod
#audio/x-tracker-module
##>17	string	>\0		Title: "%s"

21	string/c	\!SCREAM!	audio/x-mod
#audio/x-screamtracker-module
21	string	BMOD2STM	audio/x-mod
#audio/x-screamtracker-module
1080	string	M.K.		audio/x-mod
#audio/x-protracker-module
#>0	string	>\0		Title: "%s"
1080	string	M!K!		audio/x-mod
#audio/x-protracker-module
#>0	string	>\0		Title: "%s"
1080	string	FLT4		audio/x-mod
#audio/x-startracker-module
#>0	string	>\0		Title: "%s"
1080	string	FLT8		audio/x-mod
#audio/x-startracker-module
#>0	string	>\0		Title: "%s"
1080	string	4CHN		audio/x-mod
#audio/x-fasttracker-module
#>0	string	>\0		Title: "%s"
1080	string	6CHN		audio/x-mod
#audio/x-fasttracker-module
#>0	string	>\0		Title: "%s"
1080	string	8CHN		audio/x-mod
#audio/x-fasttracker-module
#>0	string	>\0		Title: "%s"
1080	string	CD81		audio/x-mod
#audio/x-oktalyzer-tracker-module
#>0	string	>\0		Title: "%s"
1080	string	OKTA		audio/x-mod
#audio/x-oktalyzer-tracker-module
#>0	string	>\0		Title: "%s"
# Not good enough.
#1082	string	CH
#>1080	string	>/0		%.2s-channel Fasttracker "oktalyzer" module sound data
1080	string	16CN		audio/x-mod
#audio/x-taketracker-module
#>0	string	>\0		Title: "%s"
1080	string	32CN		audio/x-mod
#audio/x-taketracker-module
#>0	string	>\0		Title: "%s"

# Impuse tracker module (it)
0	string		IMPM		audio/x-mod
#>4	string		>\0		"%s"
#>40	leshort		!0		compatible w/ITv%x
#>42	leshort		!0		created w/ITv%x

#------------------------------------------------------------------------------
# end local stuff
#------------------------------------------------------------------------------

# xml based formats!

# svg

38	string		\<\!DOCTYPE\040svg	image/svg+xml


# xml
0	string		\<?xml			text/xml


#------------------------------------------------------------------------------
# Java

0	beshort		0xcafe
>2	beshort		0xbabe		application/java

#------------------------------------------------------------------------------
# audio:  file(1) magic for sound formats
#
# from Jan Nicolai Langfeldt <janl@@ifi.uio.no>,
#

# Sun/NeXT audio data
0	string		.snd
>12	belong		1		audio/basic
>12	belong		2		audio/basic
>12	belong		3		audio/basic
>12	belong		4		audio/basic
>12	belong		5		audio/basic
>12	belong		6		audio/basic
>12	belong		7		audio/basic

>12	belong		23		audio/x-adpcm

# DEC systems (e.g. DECstation 5000) use a variant of the Sun/NeXT format
# that uses little-endian encoding and has a different magic number
# (0x0064732E in little-endian encoding).
0	lelong		0x0064732E
>12	lelong		1		audio/x-dec-basic
>12	lelong		2		audio/x-dec-basic
>12	lelong		3		audio/x-dec-basic
>12	lelong		4		audio/x-dec-basic
>12	lelong		5		audio/x-dec-basic
>12	lelong		6		audio/x-dec-basic
>12	lelong		7		audio/x-dec-basic
#                                       compressed (G.721 ADPCM)
>12	lelong		23		audio/x-dec-adpcm

# Bytes 0-3 of AIFF, AIFF-C, & 8SVX audio files are "FORM"
#					AIFF audio data
8	string		AIFF		audio/x-aiff
#					AIFF-C audio data
8	string		AIFC		audio/x-aiff
#					IFF/8SVX audio data
8	string		8SVX		audio/x-aiff



# Creative Labs AUDIO stuff
#					Standard MIDI data
0	string	MThd			audio/unknown
#>9 	byte	>0			(format %d)
#>11	byte	>1			using %d channels
#					Creative Music (CMF) data
0	string	CTMF			audio/unknown
#					SoundBlaster instrument data
0	string	SBI			audio/unknown
#					Creative Labs voice data
0	string	Creative\ Voice\ File	audio/unknown
## is this next line right?  it came this way...
#>19	byte	0x1A
#>23	byte	>0			- version %d
#>22	byte	>0			\b.%d

# [GRR 950115:  is this also Creative Labs?  Guessing that first line
#  should be string instead of unknown-endian long...]
#0	long		0x4e54524b	MultiTrack sound data
#0	string		NTRK		MultiTrack sound data
#>4	long		x		- version %ld

# Microsoft WAVE format (*.wav)
# [GRR 950115:  probably all of the shorts and longs should be leshort/lelong]
#					Microsoft RIFF
0	string		RIFF
#					- WAVE format
>8	string		WAVE		audio/x-wav
>8	string/B	AVI		video/x-msvideo
#
>8 	string		CDRA		image/x-coreldraw

# AAC (aka MPEG-2 NBC)
0       beshort&0xfff6    0xfff0          audio/X-HX-AAC-ADTS
0       string          ADIF            audio/X-HX-AAC-ADIF
0       beshort&0xffe0  0x56e0          audio/MP4A-LATM
0       beshort         0x4De1          audio/MP4A-LATM

# MPEG Layer 3 sound files
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
#MP3 with ID3 tag
0	string		ID3		audio/mpeg
# Ogg/Vorbis
0	string		OggS		application/ogg

#------------------------------------------------------------------------------
# c-lang:  file(1) magic for C programs or various scripts
#

# XPM icons (Greg Roelofs, newt@@uchicago.edu)
# ideally should go into "images", but entries below would tag XPM as C source
0	string		/*\ XPM		image/x-xpmi 7bit

# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
#16	beshort		0x3d3d		image/x-3ds

# this first will upset you if you're a PL/1 shop... (are there any left?)
# in which case rm it; ascmagic will catch real C programs
#					C or REXX program text
#0	string		/*		text/x-c
#					C++ program text
#0	string		//		text/x-c++

#------------------------------------------------------------------------------
# commands:  file(1) magic for various shells and interpreters
#
#0       string          :\ shell archive or commands for antique kernel text
0       string          #!/bin/sh               application/x-shellscript
0       string          #!\ /bin/sh             application/x-shellscript
0       string          #!/bin/csh              application/x-shellscript
0       string          #!\ /bin/csh            application/x-shellscript
# korn shell magic, sent by George Wu, gwu@@clyde.att.com
0       string          #!/bin/ksh              application/x-shellscript
0       string          #!\ /bin/ksh            application/x-shellscript
0       string          #!/bin/tcsh             application/x-shellscript
0       string          #!\ /bin/tcsh           application/x-shellscript
0       string          #!/usr/local/tcsh       application/x-shellscript
0       string          #!\ /usr/local/tcsh     application/x-shellscript
0       string          #!/usr/local/bin/tcsh   application/x-shellscript
0       string          #!\ /usr/local/bin/tcsh application/x-shellscript
# bash shell magic, from Peter Tobias (tobias@@server.et-inf.fho-emden.de)
0       string          #!/bin/bash     		application/x-shellscript
0       string          #!\ /bin/bash           application/x-shellscript
0       string          #!/usr/local/bin/bash   application/x-shellscript
0       string          #!\ /usr/local/bin/bash application/x-shellscript

#
# zsh/ash/ae/nawk/gawk magic from cameron@@cs.unsw.oz.au (Cameron Simpson)
0       string          #!/bin/zsh	        application/x-shellscript
0       string          #!/usr/bin/zsh	        application/x-shellscript
0       string          #!/usr/local/bin/zsh    application/x-shellscript
0       string          #!\ /usr/local/bin/zsh  application/x-shellscript
0       string          #!/usr/local/bin/ash    application/x-shellscript
0       string          #!\ /usr/local/bin/ash  application/x-shellscript
#0       string          #!/usr/local/bin/ae     Neil Brown's ae
#0       string          #!\ /usr/local/bin/ae   Neil Brown's ae
0       string          #!/bin/nawk             application/x-nawk
0       string          #!\ /bin/nawk           application/x-nawk
0       string          #!/usr/bin/nawk         application/x-nawk
0       string          #!\ /usr/bin/nawk       application/x-nawk
0       string          #!/usr/local/bin/nawk   application/x-nawk
0       string          #!\ /usr/local/bin/nawk application/x-nawk
0       string          #!/bin/gawk             application/x-gawk
0       string          #!\ /bin/gawk           application/x-gawk
0       string          #!/usr/bin/gawk         application/x-gawk
0       string          #!\ /usr/bin/gawk       application/x-gawk
0       string          #!/usr/local/bin/gawk   application/x-gawk
0       string          #!\ /usr/local/bin/gawk application/x-gawk
#
0       string          #!/bin/awk              application/x-awk
0       string          #!\ /bin/awk            application/x-awk
0       string          #!/usr/bin/awk          application/x-awk
0       string          #!\ /usr/bin/awk        application/x-awk
# update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
0	regex		BEGIN[[:space:]]*[{]	application/x-awk

# For Larry Wall's perl language.  The ``eval'' line recognizes an
# outrageously clever hack for USG systems.
#                               Keith Waclena <keith@@cerberus.uchicago.edu>
0       string          #!/bin/perl                     application/x-perl
0       string          #!\ /bin/perl                   application/x-perl
0       string          eval\ "exec\ /bin/perl          application/x-perl
0       string          #!/usr/bin/perl                 application/x-perl
0       string          #!\ /usr/bin/perl               application/x-perl
0       string          eval\ "exec\ /usr/bin/perl      application/x-perl
0       string          #!/usr/local/bin/perl           application/x-perl
0       string          #!\ /usr/local/bin/perl         application/x-perl
0       string          eval\ "exec\ /usr/local/bin/perl application/x-perl

#------------------------------------------------------------------------------
# compress:  file(1) magic for pure-compression formats (no archives)
#
# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, whap, etc.
#
# Formats for various forms of compressed data
# Formats for "compress" proper have been moved into "compress.c",
# because it tries to uncompress it to figure out what's inside.

# standard unix compress
0	string		\037\235	application/x-compress

# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
0       string          \037\213        application/x-gzip

0		string			PK\003\004		application/x-zip

# RAR archiver (Greg Roelofs, newt@@uchicago.edu)
0	string		Rar!		application/x-rar

# According to gzip.h, this is the correct byte order for packed data.
0	string		\037\036	application/octet-stream
#
# This magic number is byte-order-independent.
#
0	short		017437		application/octet-stream

# XXX - why *two* entries for "compacted data", one of which is
# byte-order independent, and one of which is byte-order dependent?
#
# compacted data
0	short		0x1fff		application/octet-stream
0	string		\377\037	application/octet-stream
# huf output
0	short		0145405		application/octet-stream

# Squeeze and Crunch...
# These numbers were gleaned from the Unix versions of the programs to
# handle these formats.  Note that I can only uncrunch, not crunch, and
# I didn't have a crunched file handy, so the crunch number is untested.
#				Keith Waclena <keith@@cerberus.uchicago.edu>
#0	leshort		0x76FF		squeezed data (CP/M, DOS)
#0	leshort		0x76FE		crunched data (CP/M, DOS)

# Freeze
#0	string		\037\237	Frozen file 2.1
#0	string		\037\236	Frozen file 1.0 (or gzip 0.5)

# lzh?
#0	string		\037\240	LZH compressed data

257	string		ustar\0		application/x-tar	posix
257	string		ustar\040\040\0		application/x-tar	gnu

0	short		070707		application/x-cpio
0	short		0143561		application/x-cpio	swapped

0	string		=<ar>		application/x-archive
0	string		\!<arch>	application/x-archive
>8	string		debian		application/x-debian-package

#------------------------------------------------------------------------------
#
# RPM: file(1) magic for Red Hat Packages   Erik Troan (ewt@@redhat.com)
#
0       beshort         0xedab
>2      beshort         0xeedb          application/x-rpm

0	lelong&0x8080ffff	0x0000081a	application/x-arc	lzw
0	lelong&0x8080ffff	0x0000091a	application/x-arc	squashed
0	lelong&0x8080ffff	0x0000021a	application/x-arc	uncompressed
0	lelong&0x8080ffff	0x0000031a	application/x-arc	packed
0	lelong&0x8080ffff	0x0000041a	application/x-arc	squeezed
0	lelong&0x8080ffff	0x0000061a	application/x-arc	crunched

0	leshort	0xea60	application/x-arj

# LHARC/LHA archiver (Greg Roelofs, newt@@uchicago.edu)
2	string	-lh0-	application/x-lharc	lh0
2	string	-lh1-	application/x-lharc	lh1
2	string	-lz4-	application/x-lharc	lz4
2	string	-lz5-	application/x-lharc	lz5
#	[never seen any but the last; -lh4- reported in comp.compression:]
2	string	-lzs-	application/x-lha	lzs
2	string	-lh\ -	application/x-lha	lh
2	string	-lhd-	application/x-lha	lhd
2	string	-lh2-	application/x-lha	lh2
2	string	-lh3-	application/x-lha	lh3
2	string	-lh4-	application/x-lha	lh4
2	string	-lh5-	application/x-lha	lh5
2	string	-lh6-	application/x-lha	lh6
2	string	-lh7-	application/x-lha	lh7
# Shell archives
10	string	#\ This\ is\ a\ shell\ archive	application/octet-stream	x-shell

#------------------------------------------------------------------------------
# frame:  file(1) magic for FrameMaker files
#
# This stuff came on a FrameMaker demo tape, most of which is
# copyright, but this file is "published" as witness the following:
#
0	string		\<MakerFile	application/x-frame
0	string		\<MIFFile	application/x-frame
0	string		\<MakerDictionary	application/x-frame
0	string		\<MakerScreenFon	application/x-frame
0	string		\<MML		application/x-frame
0	string		\<Book		application/x-frame
0	string		\<Maker		application/x-frame

#------------------------------------------------------------------------------
# html:  file(1) magic for HTML (HyperText Markup Language) docs
#
# from Daniel Quinlan <quinlan@@yggdrasil.com>
#
0	string		\<HEAD	text/html
0	string		\<head	text/html
0	string		\<TITLE	text/html
0	string		\<title	text/html
0       string          \<html	text/html
0       string          \<HTML	text/html
0	string		\<!--	text/html
0	string		\<h1	text/html
0	string		\<H1	text/html
0	string/c	\<!doctype\ html	text/html

#------------------------------------------------------------------------------
# images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
#
# originally from jef@@helios.ee.lbl.gov (Jef Poskanzer),
# additions by janl@@ifi.uio.no as well as others. Jan also suggested
# merging several one- and two-line files into here.
#
# XXX - byte order for GIF and TIFF fields?
# [GRR:  TIFF allows both byte orders; GIF is probably little-endian]
#

# [GRR:  what the hell is this doing in here?]
#0	string		xbtoa		btoa'd file

# PBMPLUS
#					PBM file
0	string		P1		image/x-portable-bitmap	7bit
#					PGM file
0	string		P2		image/x-portable-greymap	7bit
#					PPM file
0	string		P3		image/x-portable-pixmap	7bit
#					PBM "rawbits" file
0	string		P4		image/x-portable-bitmap
#					PGM "rawbits" file
0	string		P5		image/x-portable-greymap
#					PPM "rawbits" file
0	string		P6		image/x-portable-pixmap

# NIFF (Navy Interchange File Format, a modification of TIFF)
# [GRR:  this *must* go before TIFF]
0	string		IIN1		image/x-niff

# TIFF and friends
#					TIFF file, big-endian
0	string		MM		image/tiff
#					TIFF file, little-endian
0	string		II		image/tiff

# possible GIF replacements; none yet released!
# (Greg Roelofs, newt@@uchicago.edu)
#
# GRR 950115:  this was mine ("Zip GIF"):
#					ZIF image (GIF+deflate alpha)
0	string		GIF94z		image/unknown
#
# GRR 950115:  this is Jeremy Wohl's Free Graphics Format (better):
#					FGF image (GIF+deflate beta)
0	string		FGF95a		image/unknown
#
# GRR 950115:  this is Thomas Boutell's Portable Bitmap Format proposal
# (best; not yet implemented):
#					PBF image (deflate compression)
0	string		PBF		image/unknown

# GIF
0	string		GIF		image/gif

# JPEG images
0	beshort		0xffd8		image/jpeg

# PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@@uchicago.edu)
0	string		BM		image/bmp
#>14	byte		12		(OS/2 1.x format)
#>14	byte		64		(OS/2 2.x format)
#>14	byte		40		(Windows 3.x format)
#0	string		IC		icon
#0	string		PI		pointer
#0	string		CI		color icon
#0	string		CP		color pointer
#0	string		BA		bitmap array

# CDROM Filesystems
32769    string    CD001     application/x-iso9660

# Newer StuffIt archives (grant@@netbsd.org)
0	string		StuffIt			application/x-stuffit
#>162	string		>0			: %s

# BinHex is the Macintosh ASCII-encoded file format (see also "apple")
# Daniel Quinlan, quinlan@@yggdrasil.com
11	string	must\ be\ converted\ with\ BinHex\ 4	application/mac-binhex40
##>41	string	x					\b, version %.3s


#------------------------------------------------------------------------------
# lisp:  file(1) magic for lisp programs
#
# various lisp types, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	string	;;			text/plain	8bit
# Emacs 18 - this is always correct, but not very magical.
0	string	\012(			application/x-elc
# Emacs 19
0	string	;ELC\023\000\000\000	application/x-elc

#------------------------------------------------------------------------------
# mail.news:  file(1) magic for mail and news
#
# There are tests to ascmagic.c to cope with mail and news.
0	string		Relay-Version: 	message/rfc822	7bit
0	string		#!\ rnews	message/rfc822	7bit
0	string		N#!\ rnews	message/rfc822	7bit
0	string		Forward\ to 	message/rfc822	7bit
0	string		Pipe\ to 	message/rfc822	7bit
0	string		Return-Path:	message/rfc822	7bit
0	string		Received:	message/rfc822
0	string		Path:		message/news	8bit
0	string		Xref:		message/news	8bit
0	string		From:		message/rfc822	7bit
0	string		Article 	message/news	8bit
#------------------------------------------------------------------------------
# msword: file(1) magic for MS Word files
#
# Contributor claims:
# Reversed-engineered MS Word magic numbers
#

0	string		\376\067\0\043			application/msword
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
0	string		\333\245-\0\0\0			application/msword



#------------------------------------------------------------------------------
# printer:  file(1) magic for printer-formatted files
#

# PostScript
0	string		%!		application/postscript
0	string		\004%!		application/postscript

# Acrobat
# (due to clamen@@cs.cmu.edu)
0	string		%PDF-		application/pdf

#------------------------------------------------------------------------------
# sc:  file(1) magic for "sc" spreadsheet
#
38	string		Spreadsheet	application/x-sc

#------------------------------------------------------------------------------
# tex:  file(1) magic for TeX files
#
# XXX - needs byte-endian stuff (big-endian and little-endian DVI?)
#
# From <conklin@@talisman.kaleida.com>

# Although we may know the offset of certain text fields in TeX DVI
# and font files, we can't use them reliably because they are not
# zero terminated. [but we do anyway, christos]
0	string		\367\002	application/x-dvi
#0	string		\367\203	TeX generic font data
#0	string		\367\131	TeX packed font data
#0	string		\367\312	TeX virtual font data
#0	string		This\ is\ TeX,	TeX transcript text
#0	string		This\ is\ METAFONT,	METAFONT transcript text

# There is no way to detect TeX Font Metric (*.tfm) files without
# breaking them apart and reading the data.  The following patterns
# match most *.tfm files generated by METAFONT or afm2tfm.
2	string		\000\021	application/x-tex-tfm
2	string		\000\022	application/x-tex-tfm
#>34	string		>\0		(%s)

# Texinfo and GNU Info, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	string		\\input\ texinfo		text/x-texinfo
0	string		This\ is\ Info\ file	text/x-info

# correct TeX magic for Linux (and maybe more)
# from Peter Tobias (tobias@@server.et-inf.fho-emden.de)
#
0	leshort		0x02f7		application/x-dvi

# RTF - Rich Text Format
0	string		{\\rtf		text/rtf

# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

#------------------------------------------------------------------------------
# animation:  file(1) magic for animation/movie formats
#
# animation formats, originally from vax@@ccwf.cc.utexas.edu (VaX#n8)
#						MPEG file
# MPEG sequences
0       belong             0x000001BA
>4      byte               &0x40          video/mp2p
>4      byte               ^0x40          video/mpeg
0       belong             0x000001BB     video/mpeg
0       belong             0x000001B0     video/mp4v-es
0       belong             0x000001B5     video/mp4v-es
0       belong             0x000001B3     video/mpv
0       belong&0xFF5FFF1F  0x47400010     video/mp2t
0       belong             0x00000001
>4      byte&0x1F	   0x07           video/h264

# FLI animation format
0	leshort		0xAF11				video/fli
# FLC animation format
0	leshort		0xAF12				video/flc
#
# SGI and Apple formats
# Added ISO mimes
0	string		MOVI	      video/sgi
4	string		moov	      video/quicktime
4	string		mdat	      video/quicktime
4	string		wide	      video/quicktime
4	string		skip	      video/quicktime
4	string		free	      video/quicktime
4	string		idsc	      image/x-quicktime
4	string		idat	      image/x-quicktime
4	string		pckg	      application/x-quicktime
4	string/B	jP	      image/jp2
4	string		ftyp
>8	string		isom	      video/mp4
>8	string		mp41	      video/mp4
>8	string		mp42	      video/mp4
>8	string/B	jp2	      image/jp2
>8	string		3gp	      video/3gpp
>8      string          avc1          video/3gpp
>8	string		mmp4	      video/mp4
>8	string/B	M4A	      audio/mp4
>8	string/B	qt	      video/quicktime
# The contributor claims:
#   I couldn't find a real magic number for these, however, this
#   -appears- to work.  Note that it might catch other files, too,
#   so BE CAREFUL!
#
# Note that title and author appear in the two 20-byte chunks
# at decimal offsets 2 and 22, respectively, but they are XOR'ed with
# 255 (hex FF)! DL format SUCKS BIG ROCKS.
#
#						DL file version 1 , medium format (160x100, 4 images/screen)
0	byte		1			video/unknown
0	byte		2			video/unknown
#
# Databases
#
# GDBM magic numbers
#  Will be maintained as part of the GDBM distribution in the future.
#  <downsj@@teeny.org>
0       belong  0x13579ace      application/x-gdbm
0       lelong  0x13579ace      application/x-gdbm
0       string  GDBM            application/x-gdbm
#
0       belong  0x061561        application/x-dbm
#
# Executables
#
0	string		\177ELF
>16	leshort		0		application/octet-stream
>16	leshort		1		application/x-object
>16	leshort		2		application/x-executable
>16	leshort		3		application/x-sharedlib
>16	leshort		4		application/x-coredump
>16	beshort		0		application/octet-stream
>16	beshort		1		application/x-object
>16	beshort		2		application/x-executable
>16	beshort		3		application/x-sharedlib
>16	beshort		4		application/x-coredump
#
# DOS
0		string			MZ				application/x-dosexec
#
# KDE
0		string	[KDE\ Desktop\ Entry]	application/x-kdelnk
0		string	#\ KDE\ Config\ File	application/x-kdelnk
# xmcd database file for kscd
0		string	#\ xmcd                text/xmcd

#------------------------------------------------------------------------------
# pkgadd:  file(1) magic for SysV R4 PKG Datastreams
#
0       string          #\ PaCkAgE\ DaTaStReAm  application/x-svr4-package

#PNG Image Format
0	string		\x89PNG			image/png

# MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
0	string		\x8aMNG			video/x-mng
0	string		\x8aJNG			video/x-jng

#------------------------------------------------------------------------------
# Hierarchical Data Format, used to facilitate scientific data exchange
# specifications at http://hdf.ncsa.uiuc.edu/
0	belong		0x0e031301	Hierarchical Data Format (version 4) data
0	string		\211HDF\r\n\032	Hierarchical Data Format (version 5) data

# Adobe Photoshop
0	string		8BPS			image/x-photoshop

# Felix von Leitner <felix-file@@fefe.de>
0	string		d8:announce		application/x-bittorrent


# lotus 1-2-3 document
0	belong	0x00001a00	application/x-123
0	belong	0x00000200 	application/x-123

# MS Access database
4	string	Standard\ Jet\ DB	application/msaccess

## magic for XBase files
#0      byte       0x02
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x03
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x04
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x05
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x30
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x43
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x7b
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x83
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x8b
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x8e
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0xb3
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0xf5
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0	leshort		0x0006		application/x-dbt

# Debian has entries for the old PGP formats:
# pgp:  file(1) magic for Pretty Good Privacy
# see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html
0       beshort         0x9900                  text/PGP key public ring
0       beshort         0x9501                  text/PGP key security ring
0       beshort         0x9500                  text/PGP key security ring
0       beshort         0xa600                  text/PGP encrypted data
0       string          -----BEGIN\040PGP       text/PGP armored data
>15     string          PUBLIC\040KEY\040BLOCK- public key block
>15     string          MESSAGE-                message
>15     string          SIGNED\040MESSAGE-      signed message
>15     string          PGP\040SIGNATURE-       signature
0       beshort         0x8501                  data
#
# GnuPG Magic:
#
0       beshort         0x9901                  text/GnuPG key public ring
0       beshort         0x8501                  text/OpenPGP data

# flash:        file(1) magic for Macromedia Flash file format
#
# See
#
#       http://www.macromedia.com/software/flash/open/
#
0	string		FWS
>3	byte		x			application/x-shockwave-flash

# The following paramaters are created for Namazu.
# <http://www.namazu.org/>
#
# 1999/08/13
#0	string		\<!--\ MHonArc		text/html; x-type=mhonarc
0	string		BZh			application/x-bzip2

# 1999/09/09
# VRML (suggested by Masao Takaku)
0	string		#VRML\ V1.0\ ascii	model/vrml
0	string		#VRML\ V2.0\ utf8	model/vrml

#------------------------------------------------------------------------------
# ichitaro456: file(1) magic for Just System Word Processor Ichitaro
#
# Contributor kenzo-:
# Reversed-engineered JS Ichitaro magic numbers
#

0	string		DOC
>43	byte		0x14		application/ichitaro4
>144	string	JDASH		application/ichitaro4

0	string		DOC
>43	byte		0x15		application/ichitaro5

0	string		DOC
>43	byte		0x16		application/ichitaro6

#------------------------------------------------------------------------------
# office97: file(1) magic for MicroSoft Office files
#
# Contributor kenzo-:
# Reversed-engineered MS Office magic numbers
#

#0       string          \320\317\021\340\241\261\032\341
#>48     byte            0x1B            application/excel

2080	string	Microsoft\ Excel\ 5.0\ Worksheet	application/excel
2114	string	Biff5					application/excel

0       string	\224\246\056		application/msword

0	belong	0x31be0000		application/msword

0	string	PO^Q`			application/msword

0	string	\320\317\021\340\241\261\032\341
>546	string	bjbj			application/msword
>546	string	jbjb			application/msword

512	string	R\0o\0o\0t\0\ \0E\0n\0t\0r\0y	application/msword

2080	string	Microsoft\ Word\ 6.0\ Document	application/msword
2080	string	Documento\ Microsoft\ Word\ 6	application/msword
2112	string	MSWordDoc			application/msword

#0	string	\320\317\021\340\241\261\032\341	application/powerpoint
0	string	\320\317\021\340\241\261\032\341	application/msword

0       string  #\ PaCkAgE\ DaTaStReAm  application/x-svr4-package


# WinNT/WinCE PE files (Warner Losh, imp@@village.org)
#
128		string	PE\000\000	application/octet-stream
0		string	PE\000\000	application/octet-stream

# miscellaneous formats
0		string	LZ		application/octet-stream

# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream

# .EXE formats (Greg Roelofs, newt@@uchicago.edu)
#
0		string	MZ
>24		string	@@		application/octet-stream

0		string	MZ
>30		string	Copyright\ 1989-1990\ PKWARE\ Inc.	application/x-zip

0		string	MZ
>30		string	PKLITE\ Copr.	application/x-zip

0		string	MZ
>36		string	LHa's\ SFX	application/x-lha

0		string	MZ		application/octet-stream

# LHA archiver
2		string	-lh
>6		string	-		application/x-lha


# Zoo archiver
20		lelong	0xfdc4a7dc	application/x-zoo

# ARC archiver
0       	lelong&0x8080ffff	0x0000081a	application/x-arc
0		lelong&0x8080ffff	0x0000091a	application/x-arc
0		lelong&0x8080ffff	0x0000021a	application/x-arc
0		lelong&0x8080ffff	0x0000031a	application/x-arc
0		lelong&0x8080ffff	0x0000041a	application/x-arc
0		lelong&0x8080ffff	0x0000061a	application/x-arc

# Microsoft Outlook's Transport Neutral Encapsulation Format (TNEF)
0		lelong	0x223e9f78	application/ms-tnef

# From: stephane.loeuillet@@tiscali.f
# http://www.djvuzone.org/
0	string		AT&TFORM	image/x.djvu

# Danny Milosavljevic <danny.milo@@gmx.net>
# this are adrift (adventure game standard) game files, extension .taf
# depending on version magic continues with 0x93453E6139FA (V 4.0)
# 0x9445376139FA (V 3.90)
# 0x9445366139FA (V 3.80)
# this is from source (http://www.adrift.org.uk/) and I have some taf
# files, and checked them.
#0	belong	0x3C423FC9
#>4	belong	0x6A87C2CF	application/x-adrift
#0	string	\000\000\001\000	image/x-ico

# Quark Xpress 3 Files:
# (made the mimetype up)
0	string	\0\0MMXPR3\0	application/x-quark-xpress-3

# EET archive
# From: Tilman Sauerbeck <tilman@@code-monkey.de>
0	belong	0x1ee7ff00	application/x-eet

# From: Denis Knauf, via gentoo.
0	string	fLaC		audio/x-flac
0	string	CWS		application/x-shockwave-flash

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@


1.5
log
@crunch cornflakes
@
text
@@


1.5.12.1
log
@Delete a bunch of things that are now gone in head.
@
text
@@


1.4
log
@apply conflict therapy for 4.20 import
@
text
@d954 4
@


1.3
log
@welcome to file 4.18.  have a nice day.
@
text
@d102 1
a102 3
0	string		\<?xml
#			text/xml
>38	string		\<\!DOCTYPE\040svg	image/svg+xml
d112 2
a113 2
0	short		0xcafe
>2	short		0xbabe		application/java
d136 1
a136 1
0	lelong		0x0064732E	
d149 1
a149 1
8	string		AIFF		audio/x-aiff	
d151 1
a151 1
8	string		AIFC		audio/x-aiff	
d153 1
a153 1
8	string		8SVX		audio/x-aiff	
d159 1
a159 1
0	string	MThd			audio/unknown	
d163 1
a163 1
0	string	CTMF			audio/unknown	
d165 1
a165 1
0	string	SBI			audio/unknown	
d167 1
a167 1
0	string	Creative\ Voice\ File	audio/unknown	
d196 6
a201 1
0       beshort		&0xffe0		audio/mpeg
d414 1
a414 4
0	string		\<!doctype\ HTML	text/html
0	string		\<!DOCTYPE\ HTML	text/html
0	string		\<!doctype\ html	text/html
0	string		\<!doctype\ HTML	text/html
d533 5
a537 1
0	string		\320\317\021\340\241\261	application/msword
d573 1
a573 1
#0	string		This\ is\ TeX,	TeX transcript text	
d595 8
d618 1
a618 1
>4      byte&1F            0x07           video/h264
d673 1
a673 1
0	string		\177ELF 
d690 1
a690 1
0		string	\#\ KDE\ Config\ File	application/x-kdelnk
d692 1
a692 1
0		string	\#\ xmcd                text/xmcd
d727 1
a727 1
#0      byte       0x02	
d731 1
a731 1
#0      byte       0x03	
d735 1
a735 1
#0      byte       0x04	
d739 1
a739 1
#0      byte       0x05	
d755 1
a755 1
#0      byte       0x83	
d763 1
a763 1
#0      byte       0x8e	
d784 1
a784 1
0       string          -----BEGIN\040PGP       text/PGP armored data 
d792 1
a792 1
# 
d802 1
a802 1
0	string		FWS             
d877 2
d931 1
a931 1
# (made the mimetype up) 
d941 13
@


1.3.4.1
log
@Sync w/ NetBSD-4-RC_1
@
text
@d102 3
a104 1
38	string		\<\!DOCTYPE\040svg	image/svg+xml
d114 2
a115 2
0	beshort		0xcafe
>2	beshort		0xbabe		application/java
d138 1
a138 1
0	lelong		0x0064732E
d151 1
a151 1
8	string		AIFF		audio/x-aiff
d153 1
a153 1
8	string		AIFC		audio/x-aiff
d155 1
a155 1
8	string		8SVX		audio/x-aiff
d161 1
a161 1
0	string	MThd			audio/unknown
d165 1
a165 1
0	string	CTMF			audio/unknown
d167 1
a167 1
0	string	SBI			audio/unknown
d169 1
a169 1
0	string	Creative\ Voice\ File	audio/unknown
d198 1
a198 6
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
d411 4
a414 1
0	string/c	\<!doctype\ html	text/html
d533 1
a533 5
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
d569 1
a569 1
#0	string		This\ is\ TeX,	TeX transcript text
a590 8
# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

d606 1
a606 1
>4      byte&0x1F	   0x07           video/h264
d661 1
a661 1
0	string		\177ELF
d678 1
a678 1
0		string	#\ KDE\ Config\ File	application/x-kdelnk
d680 1
a680 1
0		string	#\ xmcd                text/xmcd
d715 1
a715 1
#0      byte       0x02
d719 1
a719 1
#0      byte       0x03
d723 1
a723 1
#0      byte       0x04
d727 1
a727 1
#0      byte       0x05
d743 1
a743 1
#0      byte       0x83
d751 1
a751 1
#0      byte       0x8e
d772 1
a772 1
0       string          -----BEGIN\040PGP       text/PGP armored data
d780 1
a780 1
#
d790 1
a790 1
0	string		FWS
a864 2
# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream
d917 1
a917 1
# (made the mimetype up)
a926 17

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@


1.3.2.1
log
@Pull up following (requested by pooka in ticket #724):

bring file(1) to 4.21
@
text
@d102 3
a104 1
38	string		\<\!DOCTYPE\040svg	image/svg+xml
d114 2
a115 2
0	beshort		0xcafe
>2	beshort		0xbabe		application/java
d138 1
a138 1
0	lelong		0x0064732E
d151 1
a151 1
8	string		AIFF		audio/x-aiff
d153 1
a153 1
8	string		AIFC		audio/x-aiff
d155 1
a155 1
8	string		8SVX		audio/x-aiff
d161 1
a161 1
0	string	MThd			audio/unknown
d165 1
a165 1
0	string	CTMF			audio/unknown
d167 1
a167 1
0	string	SBI			audio/unknown
d169 1
a169 1
0	string	Creative\ Voice\ File	audio/unknown
d198 1
a198 6
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
d411 4
a414 1
0	string/c	\<!doctype\ html	text/html
d533 1
a533 5
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
d569 1
a569 1
#0	string		This\ is\ TeX,	TeX transcript text
a590 8
# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

d606 1
a606 1
>4      byte&0x1F	   0x07           video/h264
d661 1
a661 1
0	string		\177ELF
d678 1
a678 1
0		string	#\ KDE\ Config\ File	application/x-kdelnk
d680 1
a680 1
0		string	#\ xmcd                text/xmcd
d715 1
a715 1
#0      byte       0x02
d719 1
a719 1
#0      byte       0x03
d723 1
a723 1
#0      byte       0x04
d727 1
a727 1
#0      byte       0x05
d743 1
a743 1
#0      byte       0x83
d751 1
a751 1
#0      byte       0x8e
d772 1
a772 1
0       string          -----BEGIN\040PGP       text/PGP armored data
d780 1
a780 1
#
d790 1
a790 1
0	string		FWS
a864 2
# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream
d917 1
a917 1
# (made the mimetype up)
a926 17

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@


1.2
log
@remove 3d magic.
@
text
@d272 2
a273 1
0       string          BEGIN                   application/x-awk
d923 4
@


1.1
log
@Initial revision
@
text
@d14 80
d98 13
d157 2
d187 1
a187 1
>8	string		AVI		video/x-msvideo
d189 7
a195 1
0	belong		0x2e7261fd	application/x-realaudio
d202 1
a202 1
0	string		OggS		audio/x-ogg
d210 1
a210 1
0	string		/*\ XPM		image/x-xpm	7bit
d212 2
a213 2
# 3DS (3d Studio files)
16	beshort		0x3d3d		image/x-3ds
d247 2
d304 3
d345 1
a345 1
0	string		!<arch>		application/x-archive
d362 1
a362 1
0	leshort	0xea60	application/octet-stream	x-arj
d413 1
d486 12
d519 1
d579 2
a580 2
#0	string		\\input\ texinfo	Texinfo source text
#0	string		This\ is\ Info\ file	GNU Info text
d595 12
a606 2
0	belong		0x000001b3			video/mpeg
0	belong		0x000001ba			video/mpeg
a610 2
# AVI
>8	string		AVI\ 				video/avi
d613 21
a633 4
#
0	string		MOVI				video/sgi
4	string		moov				video/quicktime	moov
4	string		mdat				video/quicktime	mdat
d660 11
a670 11
0       string          \177ELF 
>4      byte            0
>4      byte            1
>4      byte            2
>5      byte            0
>5      byte            1
>>16    leshort         0
>>16    leshort         1               application/x-object
>>16    leshort         2               application/x-executable
>>16    leshort         3               application/x-sharedlib
>>16    leshort         4               application/x-coredump
d691 1
d698 224
@


1.1.1.1
log
@file 4.00
@
text
@@


1.1.1.2
log
@file 4.03

small changes & fixes
@
text
@a94 2
>8 	string		CDRA		image/x-coreldraw

a200 3
# RAR archiver (Greg Roelofs, newt@@uchicago.edu)
0	string		Rar!		application/x-rar

d256 1
a256 1
0	leshort	0xea60	application/x-arj
a306 1
0	string		\<!doctype\ HTML	text/html
a545 1
0	string		\x8aJNG			video/x-jng
a551 65

# Adobe Photoshop
0	string		8BPS			image/x-photoshop

# Felix von Leitner <felix-file@@fefe.de>
0	string		d8:announce		application/x-bittorrent


# lotus 1-2-3 document
0	belong	0x00001a00	application/x-123
0	belong	0x00000200 	application/x-123

# MS Access database
4	string	Standard\ Jet\ DB	application/msaccess

## magic for XBase files
#0      byte       0x02	
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x03	
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x04	
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x05	
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x30
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x43
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x7b
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x83	
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x8b
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0x8e	
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0xb3
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0      byte       0xf5
#>8     leshort	  >0
#>>12   leshort    0	application/x-dbf
#
#0	leshort		0x0006		application/x-dbt
@


1.1.1.3
log
@file 4.04

fixes, patches and more magic
@
text
@d103 1
a103 1
0	string		OggS		application/ogg
@


1.1.1.4
log
@file 4.06

magic and bug fixes
@
text
@a147 2
0       string          #!/bin/zsh	        application/x-shellscript
0       string          #!/usr/bin/zsh	        application/x-shellscript
@


1.1.1.5
log
@file 4.08: bugfixes 'n more magic 'n stuff
@
text
@d103 1
a103 1
0	string		OggS		audio/ogg
a407 1
0	string		Received:	message/rfc822
d467 2
a468 2
0	string		\\input\ texinfo		text/x-texinfo
0	string		This\ is\ Info\ file	text/x-info
a625 161

# Debian has entries for the old PGP formats:
# pgp:  file(1) magic for Pretty Good Privacy
# see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html
0       beshort         0x9900                  text/PGP key public ring
0       beshort         0x9501                  text/PGP key security ring
0       beshort         0x9500                  text/PGP key security ring
0       beshort         0xa600                  text/PGP encrypted data
0       string          -----BEGIN\040PGP       text/PGP armored data 
>15     string          PUBLIC\040KEY\040BLOCK- public key block
>15     string          MESSAGE-                message
>15     string          SIGNED\040MESSAGE-      signed message
>15     string          PGP\040SIGNATURE-       signature
0       beshort         0x8501                  data
#
# GnuPG Magic:
# 
0       beshort         0x9901                  text/GnuPG key public ring
0       beshort         0x8501                  text/OpenPGP data

# flash:        file(1) magic for Macromedia Flash file format
#
# See
#
#       http://www.macromedia.com/software/flash/open/
#
0	string		FWS             
>3	byte		x			application/x-shockwave-flash

# The following paramaters are created for Namazu.
# <http://www.namazu.org/>
#
# 1999/08/13
#0	string		\<!--\ MHonArc		text/html; x-type=mhonarc
0	string		BZh			application/x-bzip2

# 1999/09/09
# VRML (suggested by Masao Takaku)
0	string		#VRML\ V1.0\ ascii	model/vrml
0	string		#VRML\ V2.0\ utf8	model/vrml

#------------------------------------------------------------------------------
# ichitaro456: file(1) magic for Just System Word Processor Ichitaro
#
# Contributor kenzo-:
# Reversed-engineered JS Ichitaro magic numbers
#

0	string		DOC
>43	byte		0x14		application/ichitaro4
>144	string	JDASH		application/ichitaro4

0	string		DOC
>43	byte		0x15		application/ichitaro5

0	string		DOC
>43	byte		0x16		application/ichitaro6

#------------------------------------------------------------------------------
# office97: file(1) magic for MicroSoft Office files
#
# Contributor kenzo-:
# Reversed-engineered MS Office magic numbers
#

#0       string          \320\317\021\340\241\261\032\341
#>48     byte            0x1B            application/excel

2080	string	Microsoft\ Excel\ 5.0\ Worksheet	application/excel
2114	string	Biff5					application/excel

0       string	\224\246\056		application/msword

0	belong	0x31be0000		application/msword

0	string	PO^Q`			application/msword

0	string	\320\317\021\340\241\261\032\341
>546	string	bjbj			application/msword
>546	string	jbjb			application/msword

512	string	R\0o\0o\0t\0\ \0E\0n\0t\0r\0y	application/msword

2080	string	Microsoft\ Word\ 6.0\ Document	application/msword
2080	string	Documento\ Microsoft\ Word\ 6	application/msword
2112	string	MSWordDoc			application/msword

#0	string	\320\317\021\340\241\261\032\341	application/powerpoint
0	string	\320\317\021\340\241\261\032\341	application/msword

0       string  #\ PaCkAgE\ DaTaStReAm  application/x-svr4-package


# WinNT/WinCE PE files (Warner Losh, imp@@village.org)
#
128		string	PE\000\000	application/octet-stream
0		string	PE\000\000	application/octet-stream

# miscellaneous formats
0		string	LZ		application/octet-stream


# .EXE formats (Greg Roelofs, newt@@uchicago.edu)
#
0		string	MZ
>24		string	@@		application/octet-stream

0		string	MZ
>30		string	Copyright\ 1989-1990\ PKWARE\ Inc.	application/x-zip

0		string	MZ
>30		string	PKLITE\ Copr.	application/x-zip

0		string	MZ
>36		string	LHa's\ SFX	application/x-lha

0		string	MZ		application/octet-stream

# LHA archiver
2		string	-lh
>6		string	-		application/x-lha


# Zoo archiver
20		lelong	0xfdc4a7dc	application/x-zoo

# ARC archiver
0       	lelong&0x8080ffff	0x0000081a	application/x-arc
0		lelong&0x8080ffff	0x0000091a	application/x-arc
0		lelong&0x8080ffff	0x0000021a	application/x-arc
0		lelong&0x8080ffff	0x0000031a	application/x-arc
0		lelong&0x8080ffff	0x0000041a	application/x-arc
0		lelong&0x8080ffff	0x0000061a	application/x-arc

# Microsoft Outlook's Transport Neutral Encapsulation Format (TNEF)
0		lelong	0x223e9f78	application/ms-tnef


#
# QuickTime format
# Contributer: Peter Breton
#

0	string		MOVI		video/quicktime
4	string		moov		video/quicktime
4	string		mdat		video/quicktime

# Video Formate
0       string          RIFF
# AVI == Audio Video Interleave
>8      string          AVI\            
#>0xbc   string         >\0             video/x-%s

>>0xbc  string          DIV3            video/x-DivX-3
>>0xbc  string          div3            video/x-divX-3
>>0xbc  string          DIV4            video/x-DivX-4
>>0x70  string          DX50            video/x-DIVX-5
>>0x70  string          MP4             video/x-MPEG-4
>>0xbc  string          DIVX            video/x-DivX
>8      string          WAVE            audio/x-wav

@


1.1.1.6
log
@file 4.09:
* (almost) fix toolbuild on platforms with a lacking wchar
* more magic
@
text
@a787 3
# From: stephane.loeuillet@@tiscali.f
# http://www.djvuzone.org/
0	string		AT&TFORM	image/x.djvu
@


1.1.1.7
log
@file 4.10

minor fixes and improvements
@
text
@a13 80
# Real Audio (Magic .ra\0375)
0	belong		0x2e7261fd	audio/x-pn-realaudio
0	string		.RMF		application/vnd.rn-realmedia

#video/x-pn-realvideo
#video/vnd.rn-realvideo
#application/vnd.rn-realmedia
#	sigh, there are many mimes for that but the above are the most common.

# Taken from magic, converted to magic.mime
# mime types according to http://www.geocities.com/nevilo/mod.htm:
#	audio/it	.it
#	audio/x-zipped-it	.itz
#	audio/xm	fasttracker modules
#	audio/x-s3m	screamtracker modules
#	audio/s3m	screamtracker modules
#	audio/x-zipped-mod	mdz
#	audio/mod	mod
#	audio/x-mod	All modules (mod, s3m, 669, mtm, med, xm, it, mdz, stm, itz, xmz, s3z)

# Taken from loader code from mikmod version 2.14
# by Steve McIntyre (stevem@@chiark.greenend.org.uk)
# <doj@@cubic.org> added title printing on 2003-06-24
0	string	MAS_UTrack_V00
>14	string	>/0		audio/x-mod
#audio/x-tracker-module

#0	string	UN05		MikMod UNI format module sound data

0	string	Extended\ Module: audio/x-mod
#audio/x-tracker-module
##>17	string	>\0		Title: "%s"

21	string/c	!SCREAM!	audio/x-mod
#audio/x-screamtracker-module
21	string	BMOD2STM	audio/x-mod
#audio/x-screamtracker-module
1080	string	M.K.		audio/x-mod
#audio/x-protracker-module
#>0	string	>\0		Title: "%s"
1080	string	M!K!		audio/x-mod
#audio/x-protracker-module
#>0	string	>\0		Title: "%s"
1080	string	FLT4		audio/x-mod
#audio/x-startracker-module
#>0	string	>\0		Title: "%s"
1080	string	FLT8		audio/x-mod
#audio/x-startracker-module
#>0	string	>\0		Title: "%s"
1080	string	4CHN		audio/x-mod
#audio/x-fasttracker-module
#>0	string	>\0		Title: "%s"
1080	string	6CHN		audio/x-mod
#audio/x-fasttracker-module
#>0	string	>\0		Title: "%s"
1080	string	8CHN		audio/x-mod
#audio/x-fasttracker-module
#>0	string	>\0		Title: "%s"
1080	string	CD81		audio/x-mod
#audio/x-oktalyzer-tracker-module
#>0	string	>\0		Title: "%s"
1080	string	OKTA		audio/x-mod
#audio/x-oktalyzer-tracker-module
#>0	string	>\0		Title: "%s"
# Not good enough.
#1082	string	CH
#>1080	string	>/0		%.2s-channel Fasttracker "oktalyzer" module sound data
1080	string	16CN		audio/x-mod
#audio/x-taketracker-module
#>0	string	>\0		Title: "%s"
1080	string	32CN		audio/x-mod
#audio/x-taketracker-module
#>0	string	>\0		Title: "%s"

# Impuse tracker module (it)
0	string		IMPM		audio/x-mod
#>4	string		>\0		"%s"
#>40	leshort		!0		compatible w/ITv%x
#>42	leshort		!0		created w/ITv%x

a17 13
# xml based formats!

# svg

0	string		\<?xml
#			text/xml
>38	string		\<\!DOCTYPE\040svg	image/svg+xml


# xml
0	string		\<?xml			text/xml


a63 2


d103 1
a103 1
0	string		OggS		application/ogg
a386 12
# CDROM Filesystems
32769    string    CD001     application/x-iso9660

# Newer StuffIt archives (grant@@netbsd.org)
0	string		StuffIt			application/x-stuffit
#>162	string		>0			: %s

# BinHex is the Macintosh ASCII-encoded file format (see also "apple")
# Daniel Quinlan, quinlan@@yggdrasil.com
11	string	must\ be\ converted\ with\ BinHex\ 4	application/mac-binhex40
##>41	string	x					\b, version %.3s

a790 10

# Danny Milosavljevic <danny.milo@@gmx.net>
# this are adrift (adventure game standard) game files, extension .taf
# depending on version magic continues with 0x93453E6139FA (V 4.0)
# 0x9445376139FA (V 3.90)
# 0x9445366139FA (V 3.80)
# this is from source (http://www.adrift.org.uk/) and I have some taf
# files, and checked them.
#0       belong          0x3C423FC9
#>4      belong          0x6A87C2CF application/x-adrift
@


1.1.1.8
log
@file 4.12

+ assorted bug fixes
+ switch to 2-clause license
@
text
@d187 1
a187 1
>8	string/B	AVI		video/x-msvideo
d189 1
d591 2
a592 7
# MPEG sequences
0	belong		   0x000001BA	  video/mpeg
0	belong		   0x000001BB	  video/mpeg
0	belong		   0x000001B0	  video/mp4v-es
0	belong		   0x000001B5	  video/mp4v-es
0	belong		   0x000001B3	  video/mpv
0	belong&0xFF5FFF1F  0x47400010	  video/mp2t
d597 2
d601 4
a604 21
# Added ISO mimes
# Added ISO mimes
0	string		MOVI	      video/sgi
4	string		moov	      video/quicktime
4	string		mdat	      video/quicktime
4	string		wide	      video/quicktime
4	string		skip	      video/quicktime
4	string		free	      video/quicktime
4	string		idsc	      image/x-quicktime
4	string		idat	      image/x-quicktime
4	string		pckg	      application/x-quicktime
4	string/B	jP	      image/jp2
4	string		ftyp	      application/octet-stream
>8	string		isom	      video/mp4
>8	string		mp41	      video/mp4
>8	string		mp42	      video/mp4
>8	string/B	jp2	      image/jp2
>8	string		3gp	      video/3gpp
>8	string		mmp4	      video/mp4
>8	string/B	M4A	      audio/mp4
>8	string/B	qt	      video/quicktime
d631 11
a641 11
0	string		\177ELF 
>16	leshort		0		application/octet-stream
>16	leshort		1		application/x-object
>16	leshort		2		application/x-executable
>16	leshort		3		application/x-sharedlib
>16	leshort		4		application/x-coredump
>16	beshort		0		application/octet-stream
>16	beshort		1		application/x-object
>16	beshort		2		application/x-executable
>16	beshort		3		application/x-sharedlib
>16	beshort		4		application/x-coredump
d871 24
d906 2
a907 8
#0	belong	0x3C423FC9
#>4	belong	0x6A87C2CF	application/x-adrift
#0	string	\000\000\001\000	image/x-ico

# Quark Xpress 3 Files:
# (made the mimetype up) 
0	string	\0\0MMXPR3\0	application/x-quark-xpress-3

@


1.1.1.9
log
@file 4.13

Just the usual bugfixes and magic additions, nothing major.
@
text
@a190 5
# AAC (aka MPEG-2 NBC)
0       beshort&FFF6    0xFFF0          audio/X-HX-AAC-ADTS
0       string          ADIF            audio/X-HX-AAC-ADIF
0       beshort&0xFFE0  0x56E0          audio/MP4A-LATM
0       beshort         0x4DE1          audio/MP4A-LATM
d205 1
a205 1
0	string		/*\ XPM		image/x-xpmi 7bit
d591 6
a596 11
0       belong             0x000001BA
>4      byte               &0x40          video/mp2p
>4      byte               ^0x40          video/mpeg
0       belong             0x000001BB     video/mpeg
0       belong             0x000001B0     video/mp4v-es
0       belong             0x000001B5     video/mp4v-es
0       belong             0x000001B3     video/mpv
0       belong&0xFF5FFF1F  0x47400010     video/mp2t
0       belong             0x00000001
>4      byte&1F            0x07           video/h264

d604 1
d615 1
a615 1
4	string		ftyp
a620 1
>8      string          avc1          video/3gpp
@


1.1.1.9.6.1
log
@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).
@
text
@d47 1
a47 1
21	string/c	\!SCREAM!	audio/x-mod
d102 3
a104 1
38	string		\<\!DOCTYPE\040svg	image/svg+xml
d114 2
a115 2
0	beshort		0xcafe
>2	beshort		0xbabe		application/java
d138 1
a138 1
0	lelong		0x0064732E
d151 1
a151 1
8	string		AIFF		audio/x-aiff
d153 1
a153 1
8	string		AIFC		audio/x-aiff
d155 1
a155 1
8	string		8SVX		audio/x-aiff
d161 1
a161 1
0	string	MThd			audio/unknown
d165 1
a165 1
0	string	CTMF			audio/unknown
d167 1
a167 1
0	string	SBI			audio/unknown
d169 1
a169 1
0	string	Creative\ Voice\ File	audio/unknown
d192 1
a192 1
0       beshort&0xfff6    0xfff0          audio/X-HX-AAC-ADTS
d194 2
a195 2
0       beshort&0xffe0  0x56e0          audio/MP4A-LATM
0       beshort         0x4De1          audio/MP4A-LATM
d198 1
a198 6
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
d212 2
a213 2
# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
#16	beshort		0x3d3d		image/x-3ds
d272 1
a272 2
# update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
0	regex		BEGIN[[:space:]]*[{]	application/x-awk
d345 1
a345 1
0	string		\!<arch>	application/x-archive
d410 4
a413 1
0	string/c	\<!doctype\ html	text/html
d532 1
a532 5
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
d568 1
a568 1
#0	string		This\ is\ TeX,	TeX transcript text
a589 8
# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

d605 1
a605 1
>4      byte&0x1F	   0x07           video/h264
d660 1
a660 1
0	string		\177ELF
d677 1
a677 1
0		string	#\ KDE\ Config\ File	application/x-kdelnk
d679 1
a679 1
0		string	#\ xmcd                text/xmcd
d714 1
a714 1
#0      byte       0x02
d718 1
a718 1
#0      byte       0x03
d722 1
a722 1
#0      byte       0x04
d726 1
a726 1
#0      byte       0x05
d742 1
a742 1
#0      byte       0x83
d750 1
a750 1
#0      byte       0x8e
d771 1
a771 1
0       string          -----BEGIN\040PGP       text/PGP armored data
d779 1
a779 1
#
d789 1
a789 1
0	string		FWS
a863 2
# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream
d916 1
a916 1
# (made the mimetype up)
a918 24
# EET archive
# From: Tilman Sauerbeck <tilman@@code-monkey.de>
0	belong	0x1ee7ff00	application/x-eet

# From: Denis Knauf, via gentoo.
0	string	fLaC		audio/x-flac
0	string	CWS		application/x-shockwave-flash

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@


1.1.1.9.4.1
log
@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).
@
text
@d47 1
a47 1
21	string/c	\!SCREAM!	audio/x-mod
d102 3
a104 1
38	string		\<\!DOCTYPE\040svg	image/svg+xml
d114 2
a115 2
0	beshort		0xcafe
>2	beshort		0xbabe		application/java
d138 1
a138 1
0	lelong		0x0064732E
d151 1
a151 1
8	string		AIFF		audio/x-aiff
d153 1
a153 1
8	string		AIFC		audio/x-aiff
d155 1
a155 1
8	string		8SVX		audio/x-aiff
d161 1
a161 1
0	string	MThd			audio/unknown
d165 1
a165 1
0	string	CTMF			audio/unknown
d167 1
a167 1
0	string	SBI			audio/unknown
d169 1
a169 1
0	string	Creative\ Voice\ File	audio/unknown
d192 1
a192 1
0       beshort&0xfff6    0xfff0          audio/X-HX-AAC-ADTS
d194 2
a195 2
0       beshort&0xffe0  0x56e0          audio/MP4A-LATM
0       beshort         0x4De1          audio/MP4A-LATM
d198 1
a198 6
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
d212 2
a213 2
# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
#16	beshort		0x3d3d		image/x-3ds
d272 1
a272 2
# update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
0	regex		BEGIN[[:space:]]*[{]	application/x-awk
d345 1
a345 1
0	string		\!<arch>	application/x-archive
d410 4
a413 1
0	string/c	\<!doctype\ html	text/html
d532 1
a532 5
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
d568 1
a568 1
#0	string		This\ is\ TeX,	TeX transcript text
a589 8
# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

d605 1
a605 1
>4      byte&0x1F	   0x07           video/h264
d660 1
a660 1
0	string		\177ELF
d677 1
a677 1
0		string	#\ KDE\ Config\ File	application/x-kdelnk
d679 1
a679 1
0		string	#\ xmcd                text/xmcd
d714 1
a714 1
#0      byte       0x02
d718 1
a718 1
#0      byte       0x03
d722 1
a722 1
#0      byte       0x04
d726 1
a726 1
#0      byte       0x05
d742 1
a742 1
#0      byte       0x83
d750 1
a750 1
#0      byte       0x8e
d771 1
a771 1
0       string          -----BEGIN\040PGP       text/PGP armored data
d779 1
a779 1
#
d789 1
a789 1
0	string		FWS
a863 2
# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream
d916 1
a916 1
# (made the mimetype up)
a918 24
# EET archive
# From: Tilman Sauerbeck <tilman@@code-monkey.de>
0	belong	0x1ee7ff00	application/x-eet

# From: Denis Knauf, via gentoo.
0	string	fLaC		audio/x-flac
0	string	CWS		application/x-shockwave-flash

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@


1.1.1.9.2.1
log
@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).
@
text
@d47 1
a47 1
21	string/c	\!SCREAM!	audio/x-mod
d102 3
a104 1
38	string		\<\!DOCTYPE\040svg	image/svg+xml
d114 2
a115 2
0	beshort		0xcafe
>2	beshort		0xbabe		application/java
d138 1
a138 1
0	lelong		0x0064732E
d151 1
a151 1
8	string		AIFF		audio/x-aiff
d153 1
a153 1
8	string		AIFC		audio/x-aiff
d155 1
a155 1
8	string		8SVX		audio/x-aiff
d161 1
a161 1
0	string	MThd			audio/unknown
d165 1
a165 1
0	string	CTMF			audio/unknown
d167 1
a167 1
0	string	SBI			audio/unknown
d169 1
a169 1
0	string	Creative\ Voice\ File	audio/unknown
d192 1
a192 1
0       beshort&0xfff6    0xfff0          audio/X-HX-AAC-ADTS
d194 2
a195 2
0       beshort&0xffe0  0x56e0          audio/MP4A-LATM
0       beshort         0x4De1          audio/MP4A-LATM
d198 1
a198 6
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
d212 2
a213 2
# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
#16	beshort		0x3d3d		image/x-3ds
d272 1
a272 2
# update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
0	regex		BEGIN[[:space:]]*[{]	application/x-awk
d345 1
a345 1
0	string		\!<arch>	application/x-archive
d410 4
a413 1
0	string/c	\<!doctype\ html	text/html
d532 1
a532 5
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
d568 1
a568 1
#0	string		This\ is\ TeX,	TeX transcript text
a589 8
# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

d605 1
a605 1
>4      byte&0x1F	   0x07           video/h264
d660 1
a660 1
0	string		\177ELF
d677 1
a677 1
0		string	#\ KDE\ Config\ File	application/x-kdelnk
d679 1
a679 1
0		string	#\ xmcd                text/xmcd
d714 1
a714 1
#0      byte       0x02
d718 1
a718 1
#0      byte       0x03
d722 1
a722 1
#0      byte       0x04
d726 1
a726 1
#0      byte       0x05
d742 1
a742 1
#0      byte       0x83
d750 1
a750 1
#0      byte       0x8e
d771 1
a771 1
0       string          -----BEGIN\040PGP       text/PGP armored data
d779 1
a779 1
#
d789 1
a789 1
0	string		FWS
a863 2
# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream
d916 1
a916 1
# (made the mimetype up)
a918 24
# EET archive
# From: Tilman Sauerbeck <tilman@@code-monkey.de>
0	belong	0x1ee7ff00	application/x-eet

# From: Denis Knauf, via gentoo.
0	string	fLaC		audio/x-flac
0	string	CWS		application/x-shockwave-flash

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@


1.1.1.10
log
@file 4.16

Changes since 4.13:
* DragonFly ELF note support
* read buffer dynamically allocated
* Add -h flag and dereference symlinks if POSIXLY_CORRECT
* Avoid search and regex buffer overflows
* cross-compilation fixes
* don't close stdin in the library.
* search for elf notes in shared libraries too.

Now with more magic than ever before!
@
text
@d47 1
a47 1
21	string/c	\!SCREAM!	audio/x-mod
d192 1
a192 1
0       beshort&0xfff6    0xfff0          audio/X-HX-AAC-ADTS
d194 2
a195 2
0       beshort&0xffe0  0x56e0          audio/MP4A-LATM
0       beshort         0x4De1          audio/MP4A-LATM
d345 1
a345 1
0	string		\!<arch>	application/x-archive
a918 3
# EET archive
# From: Tilman Sauerbeck <tilman@@code-monkey.de>
0	belong	0x1ee7ff00	application/x-eet
@


1.1.1.11
log
@file 4.18

changes since 4.16: bugfixes, magic improvements, other minor improvements
@
text
@d212 2
a213 2
# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
#16	beshort		0x3d3d		image/x-3ds
d272 1
a272 2
# update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
0	regex		BEGIN[[:space:]]*[{]	application/x-awk
a921 4

# From: Denis Knauf, via gentoo.
0	string	fLaC		audio/x-flac
0	string	CWS		application/x-shockwave-flash
@


1.1.1.12
log
@file 4.20, contains fixes to the magic parser, new syntax and a
buffer overflow fix
@
text
@d102 3
a104 1
38	string		\<\!DOCTYPE\040svg	image/svg+xml
d114 2
a115 2
0	beshort		0xcafe
>2	beshort		0xbabe		application/java
d138 1
a138 1
0	lelong		0x0064732E
d151 1
a151 1
8	string		AIFF		audio/x-aiff
d153 1
a153 1
8	string		AIFC		audio/x-aiff
d155 1
a155 1
8	string		8SVX		audio/x-aiff
d161 1
a161 1
0	string	MThd			audio/unknown
d165 1
a165 1
0	string	CTMF			audio/unknown
d167 1
a167 1
0	string	SBI			audio/unknown
d169 1
a169 1
0	string	Creative\ Voice\ File	audio/unknown
d198 1
a198 6
# modified by Joerg Jenderek
# GRR the original test are too common for many DOS files
# so test 1 <= kbits nibble <= E
0       beshort		&0xffe0		
>2	ubyte&0xF0	>0x0F		
>>2	ubyte&0xF0	<0xE1		audio/mpeg
d411 4
a414 1
0	string/c	\<!doctype\ html	text/html
d533 1
a533 5
# disable this one because it applies also to other
# Office/OLE documents for which msword is not correct. See PR#2608.
# from magic file of the apache
#0	string		\320\317\021\340\241\261	application/msword
512	string		\354\245\301			application/msword
d569 1
a569 1
#0	string		This\ is\ TeX,	TeX transcript text
a590 8
# TeX documents, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	search/400	\\input		text/x-tex
0	search/400	\\section	text/x-tex
0	search/400	\\setlength	text/x-tex
0	search/400	\\documentstyle	text/x-tex
0	search/400	\\chapter	text/x-tex
0	search/400	\\documentclass	text/x-tex

d606 1
a606 1
>4      byte&0x1F	   0x07           video/h264
d661 1
a661 1
0	string		\177ELF
d678 1
a678 1
0		string	#\ KDE\ Config\ File	application/x-kdelnk
d680 1
a680 1
0		string	#\ xmcd                text/xmcd
d715 1
a715 1
#0      byte       0x02
d719 1
a719 1
#0      byte       0x03
d723 1
a723 1
#0      byte       0x04
d727 1
a727 1
#0      byte       0x05
d743 1
a743 1
#0      byte       0x83
d751 1
a751 1
#0      byte       0x8e
d772 1
a772 1
0       string          -----BEGIN\040PGP       text/PGP armored data
d780 1
a780 1
#
d790 1
a790 1
0	string		FWS
a864 2
# DOS device drivers by Joerg Jenderek
0	belong		0xffffffff	application/octet-stream
d917 1
a917 1
# (made the mimetype up)
a926 13

# Hangul Document Files:
# Reversed-engineered HWP magic numbers
# From: Won-Kyu Park <wkpark@@kldp.org>
512	string		R\0o\0o\0t\0	application/x-hwp

0	string/c	BEGIN:VCARD	text/x-vcard
0	string		WordPro\0	application/vnd.lotus-wordpro
0	string		WordPro\r\373	application/vnd.lotus-wordpro
0	string		CPC\262		image/cpi

# 
128	string		DICM		application/dicom
@


1.1.1.13
log
@file 4.21.  bugfixes
@
text
@a953 4

# Symbian installation files
8	lelong	0x10000419	application/vnd.symbian.install
0	lelong	0x10201A7A	x-epoc/x-sisx-app
@
