Import file version 4.23 onto the vendor branch

1 files changed, 92 insertions, 58 deletions

diff --git a/contrib/file/magic.mime b/contrib/file/magic.mime
index 787a6c8..dfa62de 100644
--- a/contrib/file/magic.mime
+++ b/contrib/file/magic.mime
@@ -1,5 +1,25 @@
 # Magic data for KMimeMagic (originally for file(1) command)
 #
+# Note on adding additional MIME types:
+#
+# [RFC2045,RFC2046] specifies that Content Types, Content Subtypes, Character
+# Sets, Access Types, and conversion values for MIME mail will be assigned and
+# listed by the IANA.
+# http://www.iana.org/assignments/media-types/
+#
+# Any unregistered file type should be listed with a preceding x-, as in
+# application/x-foo (RFC2045 5.1), or a x., as in application/x.foo (RFC4288
+# 4.3).  Any non x-prefixed type should be registered with IANA and listed at
+# the above address.  Any other behavior is a MIME standards violation!
+#
+# It is preferred that when a registered MIME type exists, that
+# the registered Content-Type and Subtype be used to refer to a file of
+# that type, so don't use application/x-zip when application/zip is
+# registered.
+#
+# If an active RFC suggests that a MIME registration for a new type is in
+# progress, make a note of it pointing to that RFC.
+#
 # The format is 4-5 columns:
 #    Column #1: byte number to begin checking from, ">" indicates continuation
 #    Column #2: type of data to match
@@ -101,6 +121,10 @@
 
 38	string		\<\!DOCTYPE\040svg	image/svg+xml
 
+0	belong		0xfeedfeed	application/x-java-keystore
+
+0	belong		0xcececece	application/x-java-jce-keystore
+
 
 # xml
 0	string		\<?xml			text/xml
@@ -110,7 +134,8 @@
 # Java
 
 0	beshort		0xcafe
->2	beshort		0xbabe		application/java
+>2	beshort		0xbabe		application/x-java-applet
+>2	beshort		0xd00d		application/x-java-pack200
 
 #------------------------------------------------------------------------------
 # audio:  file(1) magic for sound formats
@@ -156,15 +181,15 @@
 
 # Creative Labs AUDIO stuff
 #					Standard MIDI data
-0	string	MThd			audio/unknown
+0	string	MThd			audio/x-midi
 #>9 	byte	>0			(format %d)
 #>11	byte	>1			using %d channels
 #					Creative Music (CMF) data
-0	string	CTMF			audio/unknown
+0	string	CTMF			audio/x-unknown
 #					SoundBlaster instrument data
-0	string	SBI			audio/unknown
+0	string	SBI			audio/x-unknown
 #					Creative Labs voice data
-0	string	Creative\ Voice\ File	audio/unknown
+0	string	Creative\ Voice\ File	audio/x-unknown
 ## is this next line right?  it came this way...
 #>19	byte	0x1A
 #>23	byte	>0			- version %d
@@ -210,7 +235,7 @@
 
 # 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
+0	string		/*\ XPM		image/x-xpmi
 
 # 3DS (3d Studio files) Conflicts with diff output 0x3d '='
 #16	beshort		0x3d3d		image/x-3ds
@@ -273,7 +298,8 @@
 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
+# Too general, \EBEGIN matches in postscript
+#0	regex		BEGIN[[:space:]]*[{]	application/x-awk
 
 # For Larry Wall's perl language.  The ``eval'' line recognizes an
 # outrageously clever hack for USG systems.
@@ -303,7 +329,7 @@
 # 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
+0		string			PK\003\004		application/zip
 
 # RAR archiver (Greg Roelofs, newt@uchicago.edu)
 0	string		Rar!		application/x-rar
@@ -389,13 +415,16 @@
 # 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
+# Note that this is the Framemaker Maker Interchange Format, not the
+# Normal format which would be application/vnd.framemaker.
+#
+0	string		\<MakerFile	application/x-mif
+0	string		\<MIFFile	application/x-mif
+0	string		\<MakerDictionary	application/x-mif
+0	string		\<MakerScreenFon	application/x-mif
+0	string		\<MML		application/x-mif
+0	string		\<Book		application/x-mif
+0	string		\<Maker		application/x-mif
 
 #------------------------------------------------------------------------------
 # html:  file(1) magic for HTML (HyperText Markup Language) docs
@@ -429,11 +458,11 @@
 
 # PBMPLUS
 #					PBM file
-0	string		P1		image/x-portable-bitmap	7bit
+0	string		P1		image/x-portable-bitmap
 #					PGM file
-0	string		P2		image/x-portable-greymap	7bit
+0	string		P2		image/x-portable-greymap
 #					PPM file
-0	string		P3		image/x-portable-pixmap	7bit
+0	string		P3		image/x-portable-pixmap
 #					PBM "rawbits" file
 0	string		P4		image/x-portable-bitmap
 #					PGM "rawbits" file
@@ -456,16 +485,16 @@
 #
 # GRR 950115:  this was mine ("Zip GIF"):
 #					ZIF image (GIF+deflate alpha)
-0	string		GIF94z		image/unknown
+0	string		GIF94z		image/x-unknown
 #
 # GRR 950115:  this is Jeremy Wohl's Free Graphics Format (better):
 #					FGF image (GIF+deflate beta)
-0	string		FGF95a		image/unknown
+0	string		FGF95a		image/x-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
+0	string		PBF		image/x-unknown
 
 # GIF
 0	string		GIF		image/gif
@@ -485,7 +514,7 @@
 #0	string		BA		bitmap array
 
 # CDROM Filesystems
-32769    string    CD001     application/x-iso9660
+32769    string    CD001     application/x-iso9660-image
 
 # Newer StuffIt archives (grant@netbsd.org)
 0	string		StuffIt			application/x-stuffit
@@ -501,7 +530,7 @@
 # lisp:  file(1) magic for lisp programs
 #
 # various lisp types, from Daniel Quinlan (quinlan@yggdrasil.com)
-0	string	;;			text/plain	8bit
+0	string	;;			text/plain
 # Emacs 18 - this is always correct, but not very magical.
 0	string	\012(			application/x-elc
 # Emacs 19
@@ -511,17 +540,17 @@
 # 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		Relay-Version: 	message/rfc822
+0	string		#!\ rnews	message/rfc822
+0	string		N#!\ rnews	message/rfc822
+0	string		Forward\ to 	message/rfc822
+0	string		Pipe\ to 	message/rfc822
+0	string		Return-Path:	message/rfc822
 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
+0	string		Path:		message/news
+0	string		Xref:		message/news
+0	string		From:		message/rfc822
+0	string		Article 	message/news
 #------------------------------------------------------------------------------
 # msword: file(1) magic for MS Word files
 #
@@ -618,13 +647,13 @@
 >4      byte&0x1F	   0x07           video/h264
 
 # FLI animation format
-0	leshort		0xAF11				video/fli
+0	leshort		0xAF11				video/x-fli
 # FLC animation format
-0	leshort		0xAF12				video/flc
+0	leshort		0xAF12				video/x-flc
 #
 # SGI and Apple formats
 # Added ISO mimes
-0	string		MOVI	      video/sgi
+0	string		MOVI	      video/x-sgi-movie
 4	string		moov	      video/quicktime
 4	string		mdat	      video/quicktime
 4	string		wide	      video/quicktime
@@ -632,7 +661,7 @@
 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		pckg	      application/x-quicktime-player
 4	string/B	jP	      image/jp2
 4	string		ftyp
 >8	string		isom	      video/mp4
@@ -654,8 +683,8 @@
 # 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
+0	byte		1			video/x-unknown
+0	byte		2			video/x-unknown
 #
 # Databases
 #
@@ -689,7 +718,7 @@
 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
+0		string	#\ xmcd                text/x-xmcd
 
 #------------------------------------------------------------------------------
 # pkgadd:  file(1) magic for SysV R4 PKG Datastreams
@@ -710,7 +739,7 @@
 0	string		\211HDF\r\n\032	Hierarchical Data Format (version 5) data
 
 # Adobe Photoshop
-0	string		8BPS			image/x-photoshop
+0	string		8BPS			image/vnd.adobe.photoshop
 
 # Felix von Leitner <felix-file@fefe.de>
 0	string		d8:announce		application/x-bittorrent
@@ -721,7 +750,7 @@
 0	belong	0x00000200 	application/x-123
 
 # MS Access database
-4	string	Standard\ Jet\ DB	application/msaccess
+4	string	Standard\ Jet\ DB	application/x-msaccess
 
 ## magic for XBase files
 #0      byte       0x02
@@ -777,10 +806,10 @@
 # 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       beshort         0x9900                  application/x-pgp-keyring
+0       beshort         0x9501                  application/x-pgp-keyring
+0       beshort         0x9500                  application/x-pgp-keyring
+0       beshort         0xa600                  application/pgp-encrypted
 0       string          -----BEGIN\040PGP       text/PGP armored data
 >15     string          PUBLIC\040KEY\040BLOCK- public key block
 >15     string          MESSAGE-                message
@@ -790,7 +819,7 @@
 #
 # GnuPG Magic:
 #
-0       beshort         0x9901                  text/GnuPG key public ring
+0       beshort         0x9901                  application/x-gnupg-keyring
 0       beshort         0x8501                  text/OpenPGP data
 
 # flash:        file(1) magic for Macromedia Flash file format
@@ -801,6 +830,9 @@
 #
 0	string		FWS
 >3	byte		x			application/x-shockwave-flash
+# Flash Video
+0	string		FLV			video/x-flv
+
 
 # The following paramaters are created for Namazu.
 # <http://www.namazu.org/>
@@ -822,14 +854,14 @@
 #
 
 0	string		DOC
->43	byte		0x14		application/ichitaro4
->144	string	JDASH		application/ichitaro4
+>43	byte		0x14		application/x-ichitaro4
+>144	string	JDASH		application/x-ichitaro4
 
 0	string		DOC
->43	byte		0x15		application/ichitaro5
+>43	byte		0x15		application/x-ichitaro5
 
 0	string		DOC
->43	byte		0x16		application/ichitaro6
+>43	byte		0x16		application/x-ichitaro6
 
 #------------------------------------------------------------------------------
 # office97: file(1) magic for MicroSoft Office files
@@ -841,8 +873,8 @@
 #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
+2080	string	Microsoft\ Excel\ 5.0\ Worksheet	application/vnd.ms-excel
+2114	string	Biff5					application/vnd.ms-excel
 
 0       string	\224\246\056		application/msword
 
@@ -883,10 +915,10 @@
 >24		string	@		application/octet-stream
 
 0		string	MZ
->30		string	Copyright\ 1989-1990\ PKWARE\ Inc.	application/x-zip
+>30		string	Copyright\ 1989-1990\ PKWARE\ Inc.	application/zip
 
 0		string	MZ
->30		string	PKLITE\ Copr.	application/x-zip
+>30		string	PKLITE\ Copr.	application/zip
 
 0		string	MZ
 >36		string	LHa's\ SFX	application/x-lha
@@ -910,11 +942,11 @@
 0		lelong&0x8080ffff	0x0000061a	application/x-arc
 
 # Microsoft Outlook's Transport Neutral Encapsulation Format (TNEF)
-0		lelong	0x223e9f78	application/ms-tnef
+0		lelong	0x223e9f78	application/vnd.ms-tnef
 
 # From: stephane.loeuillet@tiscali.f
 # http://www.djvuzone.org/
-0	string		AT&TFORM	image/x.djvu
+0	string		AT&TFORM	image/vnd.djvu
 
 # Danny Milosavljevic <danny.milo@gmx.net>
 # this are adrift (adventure game standard) game files, extension .taf
@@ -947,7 +979,7 @@
 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
+0	string		CPC\262		image/x-cpi
 
 # 
 128	string		DICM		application/dicom
@@ -955,3 +987,5 @@
 # Symbian installation files
 8	lelong	0x10000419	application/vnd.symbian.install
 0	lelong	0x10201A7A	x-epoc/x-sisx-app
+# FORTRAN source
+0	string/c	c\ 		text/x-fortran