Import Debian version 4.20-4

debian/patches/00list

@@ -1,35 +1,50 @@
-101-magic-remove-awk
-102-magic-remove-bzip
-103-magic-remove-cgm
-104-magic-remove-com
-105-magic-remove-emf
-106-magic-remove-msi
-107-magic-remove-quicktime
-201-magic-update-blender
-202-magic-update-cow
-203-magic-update-cracklib
-204-magic-update-elf
-205-magic-update-hp
-206-magic-update-m4v
-207-magic-update-perl
-208-magic-update-sh
-209-magic-update-spectrum
-301-magic-add-adf
-302-magic-add-ape
-303-magic-add-clarion
-304-magic-add-llvm
-305-magic-add-lua
-306-magic-add-lzma
-307-magic-add-openrisc
-308-magic-add-pe5
-309-magic-add-pmenu
-310-magic-add-scummvm
-311-magic-add-snes
-312-magic-add-subversion
-313-magic-add-syslinux
-901-file-elf
-902-file-kfreebsd
-903-file-localmagic
-904-file-make
-998-doc-manpages
-999-conglomeration
+101-magic-remove-awk.dpatch
+102-magic-remove-bzip.dpatch
+103-magic-remove-cgm.dpatch
+104-magic-remove-com.dpatch
+105-magic-remove-emf.dpatch
+106-magic-remove-msi.dpatch
+107-magic-remove-quicktime.dpatch
+201-magic-update-avi.dpatch
+202-magic-update-blender.dpatch
+203-magic-update-cow.dpatch
+204-magic-update-cracklib.dpatch
+205-magic-update-elf-a.dpatch
+206-magic-update-elf-b.dpatch
+207-magic-update-hp.dpatch
+208-magic-update-m4v.dpatch
+209-magic-update-pcp.dpatch
+210-magic-update-perl.dpatch
+211-magic-update-sh.dpatch
+212-magic-update-spectrum.dpatch
+301-magic-add-adf.dpatch
+302-magic-add-ape.dpatch
+303-magic-add-apple2.dpatch
+304-magic-add-arm.dpatch
+305-magic-add-avg.dpatch
+306-magic-add-clarion.dpatch
+307-magic-add-dds.dpatch
+308-magic-add-erlang.dpatch
+309-magic-add-gedcom.dpatch
+310-magic-add-inform.dpatch
+311-magic-add-llvm.dpatch
+312-magic-add-lua.dpatch
+313-magic-add-lzma.dpatch
+314-magic-add-nlm.dpatch
+315-magic-add-ocfs.dpatch
+316-magic-add-par2.dpatch
+317-magic-add-pe5.dpatch
+318-magic-add-pmenu.dpatch
+319-magic-add-scummvm.dpatch
+320-magic-add-sisu.dpatch
+321-magic-add-snes.dpatch
+322-magic-add-subversion.dpatch
+323-magic-add-supercollider.dpatch
+324-magic-add-xen.dpatch
+901-file-elf.dpatch
+902-file-kfreebsd.dpatch
+903-file-localmagic.dpatch
+904-file-make.dpatch
+998-doc-manpages.dpatch
+999-conglomeration.dpatch
+999-upstream-reg-startend.dpatch

debian/patches/101-magic-remove-awk.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 11-magic-remove-awk.dpatch by Michael Piefel <piefel@debian.org>
+## 101-magic-remove-awk.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Remove AWK detection by regular expression testing just for 'BEGIN:';
 ## DP: this caused a lot of false guesses (and problems with naughty programs

debian/patches/102-magic-remove-bzip.dpatch

@@ -1,18 +1,17 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 12-magic-remove-bzip.dpatch by Michael Piefel <piefel@debian.org>
+## 102-magic-remove-bzip.dpatch by Michael Piefel <piefel@debian.org>
 ##
-## DP: Disabled BZIP detection (closes: #277648).
+## DP: Disabled bzip detection (closes: #277648).
 
 @DPATCH@
 
 diff -Naur file-4.20.orig/magic/Magdir/compress file-4.20/magic/Magdir/compress
 --- file-4.20.orig/magic/Magdir/compress	2006-03-02 22:10:26.000000000 +0000
-+++ file-4.20/magic/Magdir/compress	2007-03-27 12:23:14.000000000 +0000
-@@ -101,18 +101,18 @@
- 
++++ file-4.20/magic/Magdir/compress	2007-04-03 12:26:56.000000000 +0000
+@@ -102,17 +102,17 @@
  # bzip	a block-sorting file compressor
  #	by Julian Seward <sewardj@cs.man.ac.uk> and others
--#
+ #
 -0	string		BZ		bzip compressed data
 ->2	byte		x		\b, version: %c
 ->3	string		=1		\b, compression block size 100k
@@ -24,7 +23,6 @@ diff -Naur file-4.20.orig/magic/Magdir/compress file-4.20/magic/Magdir/compress
 ->3	string		=7		\b, compression block size 700k
 ->3	string		=8		\b, compression block size 800k
 ->3	string		=9		\b, compression block size 900k
-+# Disabled because it is too weak (MPi)
 +#0	string		BZ		bzip compressed data
 +#>2	byte		x		\b, version: %c
 +#>3	string		=1		\b, compression block size 100k

debian/patches/103-magic-remove-cgm.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 13-magic-remove-cgm.dpatch by Michael Piefel <piefel@debian.org>
+## 103-magic-remove-cgm.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: FIXME
 
@@ -7,7 +7,7 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
 --- file-4.20.orig/magic/Magdir/images	2007-01-19 19:31:46.000000000 +0000
-+++ file-4.20/magic/Magdir/images	2007-03-27 12:23:14.000000000 +0000
++++ file-4.20/magic/Magdir/images	2007-04-03 12:28:49.000000000 +0000
 @@ -130,8 +130,8 @@
  # CGM image files
  0	string		BEGMF		clear text Computer Graphics Metafile
@@ -19,13 +19,12 @@ diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
  
  # MGR bitmaps  (Michael Haardt, u31b3hs@pool.informatik.rwth-aachen.de)
  0	string	yz	MGR bitmap, modern format, 8-bit aligned
-@@ -505,9 +505,6 @@
- # http://www.djvuzone.org/
+@@ -506,7 +506,7 @@
  0	string	AT&TFORM		DjVu Image file
  
--# From: Jason Bacon <bacon@smithers.neuro.mcw.edu>
+ # From: Jason Bacon <bacon@smithers.neuro.mcw.edu>
 -0	beshort	0x3020			character Computer Graphics Metafile
--
++#0	beshort	0x3020			character Computer Graphics Metafile
+ 
  # From Marc Espie
  0	lelong	20000630		OpenEXR image data
- 

debian/patches/104-magic-remove-com.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 14-magic-remove-com.dpatch by Michael Piefel <piefel@debian.org>
+## 104-magic-remove-com.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disable one-byte magic for COM (closes: #393775, #339618).
 
@@ -7,25 +7,23 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/msdos file-4.20/magic/Magdir/msdos
 --- file-4.20.orig/magic/Magdir/msdos	2007-01-19 19:35:20.000000000 +0000
-+++ file-4.20/magic/Magdir/msdos	2007-03-27 12:23:14.000000000 +0000
-@@ -262,8 +262,9 @@
++++ file-4.20/magic/Magdir/msdos	2007-04-03 12:32:00.000000000 +0000
+@@ -262,8 +262,8 @@
  # Uncommenting only the first two lines will cover about 2/3 of COM files,
  # but it isn't feasible to match all COM files since there must be at least
  # two dozen different one-byte "magics".
 -0	byte		0xe9		DOS executable (COM)
 ->0x1FE	leshort		0xAA55		\b, boot code
-+# Disabled one-byte magic (MPi)
 +#0	byte		0xe9		DOS executable (COM)
 +#>0x1FE	leshort		0xAA55		\b, boot code
  >6	string		SFX\ of\ LHarc	(%s)
  0	belong	0xffffffff		DOS executable (device driver)
  #CMD640X2.SYS
-@@ -286,15 +287,16 @@
+@@ -286,15 +286,15 @@
  >>77	string	>\x40			
  >>>77	string	<\x5B			
  >>>>77	string	x			\b, name: %.8s
 -0	byte		0x8c		DOS executable (COM)
-+# Disabled one-byte magic (MPi)
 +#0	byte		0x8c		DOS executable (COM)
  # 0xeb conflicts with "sequent" magic
 -0	byte		0xeb		DOS executable (COM)

debian/patches/105-magic-remove-emf.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 15-magic-remove-emf.dpatch by Michael Piefel <piefel@debian.org>
+## 105-magic-remove-emf.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disabled EMF detection as it not only caused false positives, which might
 ## DP: have been acceptible, but a segmentation fault (closes: #333502).
@@ -8,47 +8,26 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/msdos file-4.20/magic/Magdir/msdos
 --- file-4.20.orig/magic/Magdir/msdos	2007-01-19 19:35:20.000000000 +0000
-+++ file-4.20/magic/Magdir/msdos	2007-03-27 12:23:14.000000000 +0000
-@@ -572,24 +574,25 @@
- >4	byte	=0x30			Offline database
- 
- 
--# Windows Enhanced Metafile (EMF)
--# See msdn.microsoft.com/archive/en-us/dnargdi/html/msdn_enhmeta.asp 
--# for further information. Note that "0 lelong 1" should be true i.e.
--# the first double word in the file should be 1. With the extended
--# syntax available by some file commands you could write:
--# 0 lelong 1
--# &40 ulelong 0x464D4520 Windows Enhanced Metafile (EMF) image data
++++ file-4.20/magic/Magdir/msdos	2007-04-03 12:39:57.000000000 +0000
+@@ -579,17 +579,17 @@
+ # syntax available by some file commands you could write:
+ # 0 lelong 1
+ # &40 ulelong 0x464D4520 Windows Enhanced Metafile (EMF) image data
 -40	ulelong 0x464D4520	Windows Enhanced Metafile (EMF) image data
 ->44	ulelong x		version 0x%x.
--# If the description has a length greater than zero, it exists and is 
--# found at offset (*64).
-->64	ulelong >0		Description available at offset 0x%x
-->>60	ulelong	>0		(length 0x%x)
--# Note it would be better to print out the description, which is found 
--# as below. Unfortunately the following only prints out the first couple
--# of characters instead of all the "description length"
--# number of characters -- indicated by the ulelong at offset 60.
-->>(64.l)  lestring16 >0 Description: %15.15s
-+# This is pure ASCII magic, "EMF " at position 40 (MPi)
-+## Windows Enhanced Metafile (EMF)
-+## See msdn.microsoft.com/archive/en-us/dnargdi/html/msdn_enhmeta.asp 
-+## for further information. Note that "0 lelong 1" should be true i.e.
-+## the first double word in the file should be 1. With the extended
-+## syntax available by some file commands you could write:
-+## 0 lelong 1
-+## &40 ulelong 0x464D4520 Windows Enhanced Metafile (EMF) image data
 +#40	ulelong 0x464D4520	Windows Enhanced Metafile (EMF) image data
 +#>44	ulelong x		version 0x%x.
-+## If the description has a length greater than zero, it exists and is 
-+## found at offset (*64).
+ # If the description has a length greater than zero, it exists and is 
+ # found at offset (*64).
+->64	ulelong >0		Description available at offset 0x%x
+->>60	ulelong	>0		(length 0x%x)
 +#>64	ulelong >0		Description available at offset 0x%x
 +#>>60	ulelong	>0		(length 0x%x)
-+## Note it would be better to print out the description, which is found 
-+## as below. Unfortunately the following only prints out the first couple
-+## of characters instead of all the "description length"
-+## number of characters -- indicated by the ulelong at offset 60.
+ # Note it would be better to print out the description, which is found 
+ # as below. Unfortunately the following only prints out the first couple
+ # of characters instead of all the "description length"
+ # number of characters -- indicated by the ulelong at offset 60.
+->>(64.l)  lestring16 >0 Description: %15.15s
 +#>>(64.l)  lestring16 >0 Description: %15.15s
  
  # From: Alex Beregszaszi <alex@fsn.hu>

debian/patches/106-magic-remove-msi.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 16-magic-remove-msi.dpatch by Michael Piefel <piefel@debian.org>
+## 106-magic-remove-msi.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disable second MS Installer entry (closes: #409895).
 
@@ -7,12 +7,11 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/msdos file-4.20/magic/Magdir/msdos
 --- file-4.20.orig/magic/Magdir/msdos	2007-01-19 19:35:20.000000000 +0000
-+++ file-4.20/magic/Magdir/msdos	2007-03-27 12:23:14.000000000 +0000
-@@ -617,5 +620,6 @@
++++ file-4.20/magic/Magdir/msdos	2007-04-03 12:41:40.000000000 +0000
+@@ -617,5 +617,5 @@
  0	lelong	0x02468ace			Bochs Sparse disk image
  
  # from http://filext.com by Derek M Jones <derek@knosof.co.uk>
 -0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
-+# False positive with PPT
 +#0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
  0	string	\320\317\021\340\241\261\032\341	Microsoft Office Document

debian/patches/107-magic-remove-quicktime.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 17-magic-remove-quicktime.dpatch by Michael Piefel <piefel@debian.org>
+## 107-magic-remove-quicktime.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disabled some QuickTime entries (ASCII words, closes: #366986, #308394).
 

debian/patches/201-magic-update-avi.dpatch

@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 201-magic-update-avi.dpatch by root <ap@insysnet.ru>
+##
+## DP: Adds magic for H.264 video in AVI files (Closes: #347263).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/riff file-4.20/magic/Magdir/riff
+--- file-4.20.orig/magic/Magdir/riff	2006-11-17 16:09:54.000000000 +0000
++++ file-4.20/magic/Magdir/riff	2007-04-03 15:49:16.000000000 +0000
+@@ -130,6 +130,7 @@
+ >>>>>>>(104.l+132)      string/c        divx    DivX 4
+ >>>>>>>(104.l+132)      string/c        dx50    DivX 5
+ >>>>>>>(104.l+132)      string/c        xvid    XviD
++>>>>>>>(104.l+132)	string/c	h264	H.264
+ >>>>>>>(104.l+132)      string/c        wmv3    Windows Media Video 9
+ >>>>>>>(104.l+132)      string/c        h264    X.264
+ >>>>>>>(104.l+132)      lelong  0

debian/patches/201-magic-update-blender.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 21-magic-update-blender.dpatch by Josh Babcock <jbabcock@atlantech.net>
+## 202-magic-update-blender.dpatch by Josh Babcock <jbabcock@atlantech.net>
 ##
 ## DP: Adds magic for Blender python scripts (Closes: #323291).
 

debian/patches/202-magic-update-cow.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 22-magic-update-cow.dpatch by Matthew Palmer <mpalmer@debian.org>
+## 203-magic-update-cow.dpatch by Matthew Palmer <mpalmer@debian.org>
 ##
 ## DP: Update COW magic from 2.0 to 3.0 (Closes: #283515, #319128).
 

debian/patches/203-magic-update-cracklib.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 23-magic-update-cracklib.dpatch by Michael Piefel <piefel@debian.org>
+## 204-magic-update-cracklib.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Improved over-confident 64bit-cracklib rule (closes: #343504).
 

debian/patches/204-magic-update-elf.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 24-magic-update-elf.dpatch by Michael Piefel <piefel@debian.org>
+## 205-magic-update-elf-a.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: FIXME
 

debian/patches/307-magic-add-openrisc.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 34-magic-add-openrisc.dpatch by Robert Millan <rmh@aybabtu.com>
+## 206-magic-update-elf-b.dpatch by Robert Millan <rmh@aybabtu.com>
 ##
 ## DP: New magic for OpenRISC binary format (Closes: #316076).
 

debian/patches/205-magic-update-hp.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 25-magic-update-hp.dpatch by Michael Piefel <piefel@debian.org>
+## 207-magic-update-hp.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Updated HP 38/39/40/48/49 magic (closes: #326680).
 
@@ -7,7 +7,7 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/hp file-4.20/magic/Magdir/hp
 --- file-4.20.orig/magic/Magdir/hp	2003-02-08 18:30:39.000000000 +0000
-+++ file-4.20/magic/Magdir/hp	2007-03-27 12:23:14.000000000 +0000
++++ file-4.20/magic/Magdir/hp	2007-04-03 12:48:02.000000000 +0000
 @@ -203,33 +203,36 @@
  >8	long		>0		%d messages
  
@@ -96,10 +96,10 @@ diff -Naur file-4.20.orig/magic/Magdir/hp file-4.20/magic/Magdir/hp
  # hpBSD magic numbers
  0	beshort		200		hp200 (68010) BSD
  >2	beshort		0407		impure binary
-@@ -390,6 +410,3 @@
- >>>>>>>>>0xC4	belong	33		- received SIGXCPU
+@@ -391,5 +411,5 @@
  >>>>>>>>>0xC4	belong	34		- received SIGXFSZ
  
--# From: AMAKAWA Shuhei <sa264@cam.ac.uk>
+ # From: AMAKAWA Shuhei <sa264@cam.ac.uk>
 -0	string	HPHP49-			HP49 binary
--
++#0	string	HPHP49-			HP49 binary
+ 

debian/patches/206-magic-update-m4v.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 26-magic-update-m4v.dpatch by Nigel McNie <nigel@mcnie.name>
+## 208-magic-update-m4v.dpatch by Nigel McNie <nigel@mcnie.name>
 ##
 ## DP: Detect m4v files as m4v instead of mp4 (Closes: #384018).
 

debian/patches/209-magic-update-pcp.dpatch

@@ -0,0 +1,38 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 209-magic-update-pcp.dpatch by Werner Fink <werner@suse.de>
+##
+## DP: Correct PCP entries.
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/sgi file-4.20/magic/Magdir/sgi
+--- file-4.20.orig/magic/Magdir/sgi	2005-06-22 21:42:48.000000000 +0000
++++ file-4.20/magic/Magdir/sgi	2007-04-03 14:18:32.000000000 +0000
+@@ -8,12 +8,12 @@
+ 0	string	PmNs				PCP compiled namespace (V.0)
+ 0	string	PmN				PCP compiled namespace
+ >3	string	>\0				(V.%1.1s)
+-3	lelong	0x84500526			PCP archive
++3	belong	0x84500526			PCP archive
+ >7	byte	x				(V.%d)
+->20	lelong	-2				temporal index
+->20	lelong	-1				metadata
+->20	lelong	0				log volume #0
+->20	lelong	>0				log volume #%ld
++>20	belong	-2				temporal index
++>20	belong	-1				metadata
++>20	belong	0				log volume #0
++>20	belong	>0				log volume #%ld
+ >24	string	>\0				host: %s
+ 0	string	PCPFolio			PCP 
+ >9	string	Version:			Archive Folio
+@@ -27,6 +27,9 @@
+ 0	string	#pmlogger			PCP pmlogger config
+ >10	string	Version
+ >18	string	>\0				(V%1.1s)
++0	string	#pmdahotproc			PCP pmdahotproc config
++>13	string	Version
++>21	string	>\0				(V%-3.3s)
+ 0	string	PcPh				PCP Help 
+ >4	string	1				Index
+ >4	string	2				Text

debian/patches/207-magic-update-perl.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 27-magic-update-perl.dpatch by Michael Piefel <piefel@debian.org>
+## 210-magic-update-perl.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Make Perl script entries consistent (closes: #394523).
 

debian/patches/208-magic-update-sh.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 28-magic-update-sh.dpatch by Mark Hindley <mark@hindley.org.uk>
+## 211-magic-update-sh.dpatch by Mark Hindley <mark@hindley.org.uk>
 ##
 ## DP: Changing sh identifier from Bourne to POSIX (Closes: #368613).
 

debian/patches/209-magic-update-spectrum.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 29-magic-update-spectrum.dpatch by Philip Kendall <pak21@srcf.ucam.org>
+## 212-magic-update-spectrum.dpatch by Philip Kendall <pak21@srcf.ucam.org>
 ##
 ## DP: Adding additional magics (Closes: #296202).
 

debian/patches/301-magic-add-adf.dpatch

@@ -7,14 +7,13 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/database file-4.20/magic/Magdir/database
 --- file-4.20.orig/magic/Magdir/database	2007-01-22 06:40:00.000000000 +0000
-+++ file-4.20/magic/Magdir/database	2007-03-27 17:29:50.000000000 +0000
-@@ -210,3 +210,9 @@
++++ file-4.20/magic/Magdir/database	2007-04-03 12:54:46.000000000 +0000
+@@ -210,3 +210,8 @@
  16	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
  17	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
  18	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
 +
-+#----------------------------------------------------------------------
-+# ADF: file(1) magic for Advanced Data Format (ADF) databases
-+#
-+# Computational Fluid Dynamics (see http://www.grc.nasa.gov/WWW/cgns/adf)
-+>0	string		@(#)ADF\ Database	CGNS Advanced Data Format
++# Type: Advanced Data Format (ADF) database
++# URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
++# From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
++0	string	@(#)ADF\ Database	CGNS Advanced Data Format

debian/patches/302-magic-add-ape.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 31-magic-add-ape.dpatch by Robert Millan <rmh@aybabtu.com>
+## 302-magic-add-ape.dpatch by Robert Millan <rmh@aybabtu.com>
 ##
 ## DP: New magic for the Monkey's audio format (Closes: #334862).
 
@@ -7,12 +7,13 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/audio file-4.20/magic/Magdir/audio
 --- file-4.20.orig/magic/Magdir/audio	2007-01-19 19:26:35.000000000 +0000
-+++ file-4.20/magic/Magdir/audio	2007-03-27 16:22:03.000000000 +0000
-@@ -552,3 +552,7 @@
++++ file-4.20/magic/Magdir/audio	2007-04-03 12:56:35.000000000 +0000
+@@ -552,3 +552,8 @@
  # http://download.ncl.ie/doc/api/ie/ncl/media/music/IMelody.html
  # http://www.wx800.com/msg/download/irda/iMelody.pdf
  0	string	BEGIN:IMELODY	iMelody Ringtone Format
 +
++# Type: Monkey's audio
++# URL:  <http://www.monkeysaudio.com/>
 +# From: Robert Millan <rmh@aybabtu.com>
-+# Monkey's Audio <http://www.monkeysaudio.com/>
-+0	string	MAC\		Monkey's Audio file
++0	string	MAC\	Monkey's Audio file

debian/patches/303-magic-add-apple2.dpatch

@@ -0,0 +1,34 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 303-magic-add-apple2.dpatch by Radek Vokal <rvokal@redhat.com>
+##
+## DP: Adds new magic for Apple Emulator 2IMG format.
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/apple file-4.20/magic/Magdir/apple
+--- file-4.20.orig/magic/Magdir/apple	2006-03-02 22:10:26.000000000 +0000
++++ file-4.20/magic/Magdir/apple	2007-04-03 14:03:21.000000000 +0000
+@@ -10,6 +10,23 @@
+ 0	belong		0x00051600		AppleSingle encoded Macintosh file
+ 0	belong		0x00051607		AppleDouble encoded Macintosh file
+ 
++# Type: Apple Emulator 2IMG format
++# From: Radek Vokal <rvokal@redhat.com>
++0	string		2IMG	Apple ][ 2IMG Disk Image
++>4	string		XGS!	\b, XGS
++>4	string		CTKG	\b, Catakig
++>4	string		ShIm	\b, Sheppy's ImageMaker
++>4	string		WOOF	\b, Sweet 16
++>4	string		B2TR	\b, Bernie ][ the Rescue
++>4	string		!nfc	\b, ASIMOV2
++>4	string		x	\b, Unknown Format
++>0xc	byte		00	\b, DOS 3.3 sector order
++>>0x10	byte		00	\b, Volume 254
++>>0x10	byte&0x7f	x	\b, Volume %u
++>0xc	byte		01	\b, ProDOS sector order
++>>0x14	short		x	\b, %u Blocks
++>0xc	byte		02	\b, NIB data
++
+ # magic for Newton PDA package formats
+ # from Ruda Moura <ruda@helllabs.org>
+ 0	string	package0	Newton package, NOS 1.x,

debian/patches/303-magic-add-clarion.dpatch

@@ -1,62 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 302-magic-add-clarion.dpatch by Julien Blache <jblache@debian.org>
-##
-## DP: New magic for the Clarion files (Closes: #282680).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/clarion file-4.20/magic/Magdir/clarion
---- file-4.20.orig/magic/Magdir/clarion	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/clarion	2007-03-27 17:07:02.000000000 +0000
-@@ -0,0 +1,29 @@
-+#
-+# Magic numbers for the Clarion Personal/Professional Developer (v2 and above) files
-+#
-+# Julien BLACHE <jb@jblache.org>
-+#
-+
-+#### Database and associated files
-+
-+### Database files
-+## signature
-+0	leshort		0x3343	Clarion Personal/Professional Developer (v2 and above) data file
-+## interesting attributes
-+>2	leshort		&0x0001	\b, locked
-+>2	leshort		&0x0004	\b, encrypted
-+>2	leshort		&0x0008	\b, memo file exists
-+>2	leshort		&0x0010	\b, compressed
-+>2	leshort		&0x0040	\b, read only
-+## number of records
-+>5	lelong		x	\b, %ld records
-+
-+### Memo files
-+0	leshort		0x334d	Clarion Personal/Professional Developer (v2 and above) memo data
-+
-+### Key/Index files
-+## No magic ? :(
-+
-+
-+#### Help files
-+0	leshort		0x49e0	Clarion Personal/Professional Developer (v2 and above) help data
-diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-03-27 17:07:26.000000000 +0000
-@@ -60,6 +60,7 @@
- Magdir/cisco \
- Magdir/citrus \
- Magdir/claris \
-+Magdir/clarion \
- Magdir/clipper \
- Magdir/cracklib \
- Magdir/spec \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-03-27 17:07:32.000000000 +0000
-@@ -200,6 +200,7 @@
- Magdir/cisco \
- Magdir/citrus \
- Magdir/claris \
-+Magdir/clarion \
- Magdir/clipper \
- Magdir/cracklib \
- Magdir/spec \

debian/patches/304-magic-add-arm.dpatch

@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 304-magic-add-arm.dpatch by Russell Coker <russell@coker.com.au>
+##
+## DP: New magic for Adaptive Multi-Rate Codec files (Closes: #279322).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/audio file-4.20/magic/Magdir/audio
+--- file-4.20.orig/magic/Magdir/audio	2007-04-03 16:17:31.000000000 +0000
++++ file-4.20/magic/Magdir/audio	2007-04-03 16:18:26.000000000 +0000
+@@ -557,3 +557,8 @@
+ # URL:  <http://www.monkeysaudio.com/>
+ # From: Robert Millan <rmh@aybabtu.com>
+ 0	string	MAC\	Monkey's Audio file
++
++# Type: Adaptive Multi-Rate Codec
++# URL:  http://filext.com/detaillist.php?extdetail=AMR
++# From: Russell Coker <russell@coker.com.au>
++0	string	#!AMR	Adaptive Multi-Rate Codec (GSM telephony)

debian/patches/305-magic-add-avg.dpatch

@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 305-magic-add-avg.dpatch by David Newgas <david@newgas.net>
+##
+## DP: New magic for the AVG vault files (Closes: #381053).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/fsav file-4.20/magic/Magdir/fsav
+--- file-4.20.orig/magic/Magdir/fsav	2006-03-02 22:10:26.000000000 +0000
++++ file-4.20/magic/Magdir/fsav	2007-04-03 15:42:06.000000000 +0000
+@@ -58,3 +58,7 @@
+ >>>>769	string		ustar\0		\b, tared
+ >512	string		\037\213	\b, gzipped
+ >769	string		ustar\0		\b, tared
++
++# Type: Grisoft AVG AntiVirus
++# From: David Newgas <david@newgas.net>
++0	string	AVG7_ANTIVIRUS_VAULT_FILE	AVG 7 Antivirus vault file data

debian/patches/306-magic-add-clarion.dpatch

@@ -0,0 +1,56 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 306-magic-add-clarion.dpatch by Julien Blache <jblache@debian.org>
+##
+## DP: New magic for the Clarion files (Closes: #282680).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/clarion file-4.20/magic/Magdir/clarion
+--- file-4.20.orig/magic/Magdir/clarion	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/clarion	2007-04-03 13:02:27.000000000 +0000
+@@ -0,0 +1,23 @@
++# Type: Clarion Personal/Professional Developer (v2 and above)
++# From: Julien Blache <jb@jblache.org>
++
++# Database files
++# signature
++0	leshort	0x3343	Clarion Personal/Professional Developer (v2 and above) data file
++# attributes
++>2	leshort	&0x0001	\b, locked
++>2	leshort	&0x0004	\b, encrypted
++>2	leshort	&0x0008	\b, memo file exists
++>2	leshort	&0x0010	\b, compressed
++>2	leshort	&0x0040	\b, read only
++# number of records
++>5	lelong	x	\b, %ld records
++
++# Memo files
++0	leshort	0x334d	Clarion Personal/Professional Developer (v2 and above) memo data
++
++# Key/Index files
++# No magic? :(
++
++# Help files
++0	leshort	0x49e0	Clarion Personal/Professional Developer (v2 and above) help data
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 12:57:46.000000000 +0000
+@@ -60,6 +60,7 @@
+ Magdir/cisco \
+ Magdir/citrus \
+ Magdir/claris \
++Magdir/clarion \
+ Magdir/clipper \
+ Magdir/cracklib \
+ Magdir/spec \
+diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
+--- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 12:57:46.000000000 +0000
+@@ -200,6 +200,7 @@
+ Magdir/cisco \
+ Magdir/citrus \
+ Magdir/claris \
++Magdir/clarion \
+ Magdir/clipper \
+ Magdir/cracklib \
+ Magdir/spec \

debian/patches/307-magic-add-dds.dpatch

@@ -0,0 +1,22 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 307-magic-add-dds.dpatch from Morten Hustveit <morten@debian.org>
+##
+## DP: New magic for DirectDraw Surface files (Closes: #276133).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/msdos file-4.20/magic/Magdir/msdos
+--- file-4.20.orig/magic/Magdir/msdos	2007-01-19 19:35:20.000000000 +0000
++++ file-4.20/magic/Magdir/msdos	2007-04-03 16:35:15.000000000 +0000
+@@ -619,3 +619,11 @@
+ # from http://filext.com by Derek M Jones <derek@knosof.co.uk>
+ 0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
+ 0	string	\320\317\021\340\241\261\032\341	Microsoft Office Document
++
++# Type: Microsoft DirectDraw Surface
++# URL:  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/DDSFileReference/ddsfileformat.asp
++# From: Morten Hustveit <morten@debian.org>
++0	string	DDS\040\174\000\000\000	Microsoft DirectDraw Surface (DDS),
++>16	lelong	>0			%hd x
++>12	lelong	>0			%hd,
++>84	string	x			%.4s

debian/patches/308-magic-add-erlang.dpatch

@@ -0,0 +1,49 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 308-magic-add-erlang.dpatch
+##
+## DP: New magic for Erlang BEAM and JAM files (Closes: #388356).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/erlang file-4.20/magic/Magdir/erlang
+--- file-4.20.orig/magic/Magdir/erlang	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/erlang	2007-04-03 15:36:54.000000000 +0000
+@@ -0,0 +1,16 @@
++# Type: Erlang JAM and BEAM files
++# URL:  http://www.erlang.org/faq/x779.html#AEN812
++
++# OTP R3-R4
++0	string	\0177BEAM!	Old Erlang BEAM file
++>6	short	>0		- version %d
++
++# OTP R5 and onwards
++0	string	FOR1
++>8	string	BEAM		Erlang BEAM file
++
++# 4.2 version may have a copyright notice!
++4	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
++79	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
++
++4	string	1.0 Fri Feb 3 09:55:56 MET 1995	Erlang JAM file - version 4.3
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 15:33:45.000000000 +0000
+@@ -80,6 +80,7 @@
+ Magdir/elf \
+ Magdir/encore \
+ Magdir/epoc \
++Magdir/erlang \
+ Magdir/esri \
+ Magdir/fcs \
+ Magdir/filesystems \
+diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
+--- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 15:33:57.000000000 +0000
+@@ -220,6 +220,7 @@
+ Magdir/elf \
+ Magdir/encore \
+ Magdir/epoc \
++Magdir/erlang \
+ Magdir/esri \
+ Magdir/fcs \
+ Magdir/filesystems \

debian/patches/309-magic-add-gedcom.dpatch

@@ -0,0 +1,22 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 309-magic-add-gedcom.dpatch by Phil Endecott <phil05@chezphil.org>
+##
+## DP: New magic for GEDCOME genealogical data files (Closes: #277339).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/scientific file-4.20/magic/Magdir/scientific
+--- file-4.20.orig/magic/Magdir/scientific	2005-08-18 15:52:56.000000000 +0000
++++ file-4.20/magic/Magdir/scientific	2007-04-03 16:29:26.000000000 +0000
+@@ -58,3 +58,11 @@
+ >1104	ulong	>0		%d x
+ >1108	ulong	>0		%d,
+ >1120	ulong	>0		%d bits/pixel
++
++# Type: GEDCOME genealogical (family history) data
++# From: Phil Endecott <phil05@chezphil.org>
++0	string	0\ HEAD								GEDCOM text
++0	string	\000\060\000\040\000\110\000\105\000\101\000\104		GEDCOM text
++0	string	\060\000\040\000\110\000\105\000\101\000\104\000		GEDCOM text
++0	string	\376\377\000\060\000\040\000\110\000\105\000\101\000\104	GEDCOM text
++0	string	\377\376\060\000\040\000\110\000\105\000\101\000\104\000	GEDCOM text

debian/patches/310-magic-add-inform.dpatch

@@ -0,0 +1,53 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 310-magic-add-inform.dpatch by Reuben Thomas <rrt@sc3d.org>
+##
+## DP: New magic for the Inform interactive fiction language (Closes: #394522).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/inform file-4.20/magic/Magdir/inform
+--- file-4.20.orig/magic/Magdir/inform	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/inform	2007-04-03 15:16:07.000000000 +0000
+@@ -0,0 +1,5 @@
++# Type: Inform interactive fiction language
++# URL:  http://www.inform-fiction.org/
++# From: Reuben Thomas <rrt@sc3d.org>
++
++0	regex	[Cc]onstant[[:space:]]+[Ss]tory	Inform source text
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 15:16:24.000000000 +0000
+@@ -102,6 +103,7 @@
+ Magdir/ibm6000 \
+ Magdir/iff \
+ Magdir/images \
++Magdir/inform \
+ Magdir/intel \
+ Magdir/interleaf \
+ Magdir/island \
+diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
+--- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 15:16:31.000000000 +0000
+@@ -242,6 +243,7 @@
+ Magdir/ibm6000 \
+ Magdir/iff \
+ Magdir/images \
++Magdir/inform \
+ Magdir/intel \
+ Magdir/interleaf \
+ Magdir/island \
+diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
+--- file-4.20.orig/magic/magic.mime	2007-01-25 22:10:35.000000000 +0000
++++ file-4.20/magic/magic.mime	2007-04-03 15:18:29.000000000 +0000
+@@ -600,6 +600,11 @@
+ 0	search/400	\\chapter	text/x-tex
+ 0	search/400	\\documentclass	text/x-tex
+ 
++# Type: Inform interactive fiction language
++# URL:  http://www.inform-fiction.org/
++# From: Reuben Thomas <rrt@sc3d.org>
++0	regex		[Cc]onstant[[:space:]]+[Ss]tory	text/x-inform
++
+ #------------------------------------------------------------------------------
+ # animation:  file(1) magic for animation/movie formats
+ #

debian/patches/304-magic-add-llvm.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 33-magic-add-llvm.dpatch by Al Stone <ahs3@debian.org>
+## 311-magic-add-llvm.dpatch by Al Stone <ahs3@debian.org>
 ##
 ## DP: New magic for the LLVM byte-codes (Closes: #293427).
 
@@ -7,23 +7,19 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/llvm file-4.20/magic/Magdir/llvm
 --- file-4.20.orig/magic/Magdir/llvm	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/llvm	2007-03-27 17:52:42.000000000 +0000
-@@ -0,0 +1,12 @@
++++ file-4.20/magic/Magdir/llvm	2007-04-03 13:06:24.000000000 +0000
+@@ -0,0 +1,8 @@
++# Type: LLVM byte-codes
++# URL:  http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature
++# From: Al Stone <ahs3@fc.hp.com>
 +
-+#------------------------------------------------------------------------------
-+# llvm:  file(1) magic for LLVM byte-codes
-+#
-+# Send additions to Al Stone <ahs3@fc.hp.com>
-+# Source: http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature
-+#
 +0	string	llvm	LLVM byte-codes, uncompressed
 +0	string	llvc0	LLVM byte-codes, null compression
 +0	string	llvc1	LLVM byte-codes, gzip compression
 +0	string	llvc2	LLVM byte-codes, bzip2 compression
-+
 diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-03-27 17:53:20.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-03-27 17:52:42.000000000 +0000
+--- file-4.20.orig/magic/Makefile.am	2007-04-03 13:05:24.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 13:05:37.000000000 +0000
 @@ -115,6 +115,7 @@
  Magdir/lif \
  Magdir/linux \
@@ -33,8 +29,8 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/macintosh \
  Magdir/magic \
 diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-27 17:53:20.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-03-27 17:52:42.000000000 +0000
+--- file-4.20.orig/magic/Makefile.in	2007-04-03 13:05:24.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 13:05:37.000000000 +0000
 @@ -255,6 +255,7 @@
  Magdir/lif \
  Magdir/linux \

debian/patches/305-magic-add-lua.dpatch

@@ -1,5 +1,6 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 32-magic-add-lua.dpatch by Reuben Thomas <rrt@sc3d.org>
+## 312-magic-add-lua.dpatch by Reuben Thomas <rrt@sc3d.org> and
+## Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
 ##
 ## DP: New magic for the Lua scripting language (Closes: #394524).
 
@@ -7,22 +8,26 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/lua file-4.20/magic/Magdir/lua
 --- file-4.20.orig/magic/Magdir/lua	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/lua	2007-03-27 17:56:43.000000000 +0000
-@@ -0,0 +1,10 @@
++++ file-4.20/magic/Magdir/lua	2007-04-03 15:56:38.000000000 +0000
+@@ -0,0 +1,14 @@
++# Type: Lua scripting language
++# URL:  http://www.lua.org/
++# From: Reuben Thomas <rrt@sc3d.org>, Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
 +
-+#------------------------------------------------------------------------------
-+# lua:  file(1) magic for Lua
-+#
-+# From: Reuben Thomas <rrt@sc3d.org>
++# Lua scripts
 +0	string/b	#!\ /usr/bin/lua	Lua script text executable
 +0	string/b	#!\ /usr/local/bin/lua	Lua script text executable
 +0	string		#!/usr/bin/env\ lua	Lua script text executable
 +0	string		#!\ /usr/bin/env\ lua	Lua script text executable
 +
++# Lua bytecode
++0	string		\033Lua			Lua bytecode,
++>4	byte		0x50			version 5.0
++>4	byte		0x51			version 5.1
 diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-03-27 17:56:21.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-03-27 17:56:57.000000000 +0000
-@@ -116,6 +116,7 @@
+--- file-4.20.orig/magic/Makefile.am	2007-04-03 15:55:15.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 15:54:51.000000000 +0000
+@@ -118,6 +118,7 @@
  Magdir/linux \
  Magdir/lisp \
  Magdir/llvm \
@@ -31,9 +36,9 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/macintosh \
  Magdir/magic \
 diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-27 17:56:21.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-03-27 17:57:03.000000000 +0000
-@@ -256,6 +256,7 @@
+--- file-4.20.orig/magic/Makefile.in	2007-04-03 15:55:15.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 15:54:51.000000000 +0000
+@@ -258,6 +258,7 @@
  Magdir/linux \
  Magdir/lisp \
  Magdir/llvm \
@@ -42,18 +47,19 @@ diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
  Magdir/macintosh \
  Magdir/magic \
 diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
---- file-4.20.orig/magic/magic.mime	2007-03-27 17:56:21.000000000 +0000
-+++ file-4.20/magic/magic.mime	2007-03-27 17:56:43.000000000 +0000
-@@ -288,6 +288,13 @@
+--- file-4.20.orig/magic/magic.mime	2007-04-03 15:55:15.000000000 +0000
++++ file-4.20/magic/magic.mime	2007-04-03 15:54:51.000000000 +0000
+@@ -288,6 +288,14 @@
  0       string          #!\ /usr/local/bin/perl         application/x-perl
  0       string          eval\ "exec\ /usr/local/bin/perl application/x-perl
  
-+# For the Lua scripting language (http://www.lua.org/)
-+# Reuben Thomas <rrt@sc3d.org>
-+0	string/B	#!\ /usr/bin/lua		application/x-lua
-+0	string/B	#!\ /usr/local/bin/lua		application/x-lua
-+0	string		#!/usr/bin/env\ lua		application/x-lua
-+0	string		#!\ /usr/bin/env\ lua		application/x-lua
++# Type: Lua scripting language
++# URL:  http://www.lua.org/
++# From: Reuben Thomas <rrt@sc3d.org>
++0	string/B	#!\ /usr/bin/lua	application/x-lua
++0	string/B	#!\ /usr/local/bin/lua	application/x-lua
++0	string		#!/usr/bin/env\ lua	application/x-lua
++0	string		#!\ /usr/bin/env\ lua	application/x-lua
 +
  #------------------------------------------------------------------------------
  # compress:  file(1) magic for pure-compression formats (no archives)

debian/patches/306-magic-add-lzma.dpatch

@@ -1,20 +1,20 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 33-magic-add-lzma.dpatch by Robert Millan <rmh@aybabtu.com>
+## 313-magic-add-lzma.dpatch by Robert Millan <rmh@aybabtu.com>
 ##
 ## DP: New magic for the LZMA compression format (Closes: #364260).
 
 @DPATCH@
 
 diff -Naur file-4.20.orig/magic/Magdir/compress file-4.20/magic/Magdir/compress
---- file-4.20.orig/magic/Magdir/compress	2006-03-02 22:10:26.000000000 +0000
-+++ file-4.20/magic/Magdir/compress	2007-03-27 15:54:00.000000000 +0000
+--- file-4.20.orig/magic/Magdir/compress	2007-04-03 13:10:23.000000000 +0000
++++ file-4.20/magic/Magdir/compress	2007-04-03 13:15:02.000000000 +0000
 @@ -174,6 +174,11 @@
  >6	byte		x			version %d
  >7	byte		x			\b.%d
  
-+# LZMA (7-zip sister format)
-+# http://www.7-zip.org/sdk.html
-+#
++# Type: LZMA
++# URL:  http://www.7-zip.org/sdk.html
++# From: Robert Millan <rmh@aybabtu.com>
 +0	string		]\000\000\200\000\377\377\377\377\377\377\377\377	LZMA compressed data
 +
  # AFX compressed files (Wolfram Kleff)

debian/patches/313-magic-add-syslinux.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 37-magic-add-syslinux.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: FIXME
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
---- file-4.20.orig/magic/Magdir/images	2007-03-27 17:58:55.000000000 +0000
-+++ file-4.20/magic/Magdir/images	2007-03-27 17:59:58.000000000 +0000
-@@ -527,3 +527,9 @@
- # Ulead Photo Explorer5 (.pe5)
- # Source: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
- 0	string	IIO2H		Ulead Photo Explorer5
-+
-+# The boot loaders syslinux and isolinux use a RLE based image format
-+# called SLL16 to store splash screens.
-+0	lelong	0x1413f33d	Syslinux SLL16 image data,
-+>4	leshort	>0		%hd x
-+>6	leshort	>0		%hd

debian/patches/314-magic-add-nlm.dpatch

@@ -0,0 +1,37 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 314-magic-add-nlm.dpatch by Mads Martin Joergensen <mmj@suse.de>
+##
+## DP: New magic for NetWare Loadable Modules (NLMs).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/netware file-4.20/magic/Magdir/netware
+--- file-4.20.orig/magic/Magdir/netware	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/netware	2007-04-03 14:28:28.000000000 +0000
+@@ -0,0 +1,4 @@
++# Type: NetWare Loadable Modules (NLMs)
++# From: Mads Martin Joergensen <mmj@suse.de>
++
++0	string	NetWare\ Loadable\ Module	NetWare Loadable Module
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2007-04-03 14:26:17.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 14:26:54.000000000 +0000
+@@ -141,6 +141,7 @@
+ Magdir/ncr \
+ Magdir/netbsd \
+ Magdir/netscape \
++Magdir/netware \
+ Magdir/news \
+ Magdir/nitpicker \
+ Magdir/ocaml \
+diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
+--- file-4.20.orig/magic/Makefile.in	2007-04-03 14:26:17.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 14:27:04.000000000 +0000
+@@ -281,6 +281,7 @@
+ Magdir/ncr \
+ Magdir/netbsd \
+ Magdir/netscape \
++Magdir/netware \
+ Magdir/news \
+ Magdir/nitpicker \
+ Magdir/ocaml \

debian/patches/315-magic-add-ocfs.dpatch

@@ -0,0 +1,32 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 315-magic-add-ocfs.dpatch by Aaron Botsis <redhat@digitalmafia.org>
+##
+## DP: New magic for the Oracle Clustered Filesystem.
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/filesystems file-4.20/magic/Magdir/filesystems
+--- file-4.20.orig/magic/Magdir/filesystems	2007-01-25 16:08:39.000000000 +0000
++++ file-4.20/magic/Magdir/filesystems	2007-04-03 14:11:24.000000000 +0000
+@@ -1185,6 +1185,21 @@
+ >>>>>>>>&0      bedate          =0                      full dump
+ >>>>>>>>&0      bedate          !0                      incremental since: %s
+ 
++# Type: Oracle Clustered Filesystem
++# From: Aaron Botsis <redhat@digitalmafia.org>
++8	string	OracleCFS	Oracle Clustered Filesystem,
++>4	long	x		rev %d
++>0	long	x		\b.%d,
++>560	string	x		label: %.64s,
++>136	string	x		mountpoint: %.128s
++
++# Type: Oracle ASM tagged volume
++# From: Aaron Botsis <redhat@digitalmafia.org>
++32	string	ORCLDISK	Oracle ASM Volume,
++>40	string	x		Disk Name: %0.12s
++32	string	ORCLCLRD	Oracle ASM Volume (cleared),
++>40	string	x		Disk Name: %0.12s
++
+ # VMS backup savesets - gerardo.cacciari@gmail.com
+ # had to comment out GEM Image and G3 raw data  entries due to conflict
+ #0            byte    x

debian/patches/316-magic-add-par2.dpatch

@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 316-magic-add-par2.dpatch by Daniel van Eeden <daniel_e@dds.nl>
+##
+## DP: New magic for PAR2 archive files (Closes: #294070).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/archive file-4.20/magic/Magdir/archive
+--- file-4.20.orig/magic/Magdir/archive	2007-01-19 19:30:53.000000000 +0000
++++ file-4.20/magic/Magdir/archive	2007-04-03 16:03:14.000000000 +0000
+@@ -723,3 +723,7 @@
+ >14	byte	0x54		end slice
+ >14	beshort	0x4e4e		multi-part
+ >14	beshort	0x4e53		multi-part, with -S
++
++# Type: Parity Archive
++# From: Daniel van Eeden <daniel_e@dds.nl>
++0	string	PAR2	Parity Archive Volume Set

debian/patches/308-magic-add-pe5.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 34-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
+## 317-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
 ##
 ## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
 
@@ -13,7 +13,7 @@ diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
  # http://www.xara.com/ for Windows and as GPL application for
  0	string	XARA\243\243	Xara graphics file
 +
++# Type: Ulead Photo Explorer5 (.pe5)
++# URL:  http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
 +# From: Simon Horman <horms@debian.org>
-+# Ulead Photo Explorer5 (.pe5)
-+# Source: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
-+0	string	IIO2H		Ulead Photo Explorer5
++0	string	IIO2H	Ulead Photo Explorer5

debian/patches/309-magic-add-pmenu.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 309-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
+## 318-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
 ##
 ## DP: New magic for pmenu (Closes: #38543).
 
@@ -7,11 +7,13 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/commands file-4.20/magic/Magdir/commands
 --- file-4.20.orig/magic/Magdir/commands	2007-01-19 19:28:01.000000000 +0000
-+++ file-4.20/magic/Magdir/commands	2007-03-27 17:40:20.000000000 +0000
-@@ -54,3 +54,6 @@
++++ file-4.20/magic/Magdir/commands	2007-04-03 13:21:02.000000000 +0000
+@@ -54,3 +54,8 @@
  0	string		Zend\x00		PHP script Zend Optimizer data
  
  0	string		$!			DCL command file
 +
-+# pdmenu
-+0	string		#!/usr/bin/pdmenu	Pdmenu configuration file text
++# Type: Pdmenu
++# URL:  http://packages.debian.org/pdmenu
++# From: Edward Betts <edward@debian.org>
++0	string	#!/usr/bin/pdmenu	Pdmenu configuration file text

debian/patches/310-magic-add-scummvm.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 308-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
+## 319-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
 ##
 ## DP: New magic for scummVM savegame files (Closes: #263488).
 
@@ -7,12 +7,13 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/console file-4.20/magic/Magdir/console
 --- file-4.20.orig/magic/Magdir/console	2007-03-01 20:17:26.000000000 +0000
-+++ file-4.20/magic/Magdir/console	2007-03-27 17:20:57.000000000 +0000
-@@ -168,3 +168,7 @@
++++ file-4.20/magic/Magdir/console	2007-04-03 13:24:22.000000000 +0000
+@@ -168,3 +168,8 @@
  # From Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
  0	string		GBS		Nintendo Gameboy Music/Audio Data
  12	string		GameBoy\ Music\ Module	Nintendo Gameboy Music Module
 +
-+# From Sven Hartge <debian@ds9.argh.org>
-+0	string		SCVM		scummVM savegame
-+>12	string		>\0		"%s"
++# Type: scummVM savegame files
++# From: Sven Hartge <debian@ds9.argh.org>
++0	string	SCVM	scummVM savegame
++>12	string	>\0	"%s"

debian/patches/320-magic-add-sisu.dpatch

@@ -0,0 +1,48 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 320-magic-add-sisu.dpatch by Ralph Amissah <ralph.amissah@gmail.com>
+##
+## DP: New magic for SiSU Markup Language.
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/sisu file-4.20/magic/Magdir/sisu
+--- file-4.20.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/sisu	2007-04-03 13:36:58.000000000 +0000
+@@ -0,0 +1,15 @@
++# Type: SiSU Markup Language
++# URL:  http://www.sisudoc.org/
++# From: Ralph Amissah <ralph.amissah@gmail.com>
++
++0	regex	\^%?[\ \t]*SiSU[\ \t]+insert	SiSU text insert
++>5	regex	[0-9.]+				%s
++
++0	regex	\^%?[\ \t]*SiSU[\ \t]+master	SiSU text master
++>5	regex	[0-9.]+				%s
++
++0	regex	\^%?[\ \t]*SiSU([\ \t]+text)?	SiSU text
++>5	regex	[0-9.]+				%s
++
++0	regex	\^%*[\ \t]*sisu-[0-9.]+		SiSU text
++>5	regex	[0-9.]+				%s
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-03 13:37:12.000000000 +0000
+@@ -176,6 +176,7 @@
+ Magdir/sgml \
+ Magdir/sharc \
+ Magdir/sinclair \
++Magdir/sisu \
+ Magdir/sketch \
+ Magdir/smalltalk \
+ Magdir/sniffer \
+diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
+--- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-03 13:37:29.000000000 +0000
+@@ -316,6 +316,7 @@
+ Magdir/sgml \
+ Magdir/sharc \
+ Magdir/sinclair \
++Magdir/sisu \
+ Magdir/sketch \
+ Magdir/smalltalk \
+ Magdir/sniffer \

debian/patches/311-magic-add-snes.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 35-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
+## 321-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
 ##
 ## DP: New magic for SNES SPC700 sound files (Closes: #410847).
 
@@ -7,12 +7,13 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/audio file-4.20/magic/Magdir/audio
 --- file-4.20.orig/magic/Magdir/audio	2007-01-19 19:26:35.000000000 +0000
-+++ file-4.20/magic/Magdir/audio	2007-03-27 15:25:56.000000000 +0000
-@@ -268,6 +268,13 @@
++++ file-4.20/magic/Magdir/audio	2007-04-03 13:26:08.000000000 +0000
+@@ -268,6 +268,14 @@
  >122	byte&0x1	=1		PAL
  >122	byte&0x1	=0		NTSC
  
-+# SNES SPC700 sound files
++# Type: SNES SPC700 sound files
++# From: Josh Triplett <josh@freedesktop.org>
 +>&0	string	0.30	\b, version %s
 +>>0x23	byte	0x1B	\b, without ID666 tag
 +>>0x23	byte	0x1A	\b, with ID666 tag

debian/patches/312-magic-add-subversion.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 36-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
+## 322-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: New magic for SVN dumps (closes: #256652).
 
@@ -7,14 +7,13 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/revision file-4.20/magic/Magdir/revision
 --- file-4.20.orig/magic/Magdir/revision	2003-05-25 23:04:55.000000000 +0000
-+++ file-4.20/magic/Magdir/revision	2007-03-27 12:23:14.000000000 +0000
-@@ -3,3 +3,9 @@
++++ file-4.20/magic/Magdir/revision	2007-04-03 13:28:01.000000000 +0000
+@@ -3,3 +3,8 @@
  # file(1) magic for revision control files
  # From Hendrik Scholz <hendrik@scholz.net>
  0   string /1\ :pserver:    cvs password text file
 +
-+
-+# Subversion (SVN) dumps
-+# Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
-+0       string  SVN-fs-dump-format-version:     Subversion dumpfile
-+>28     string  >\0                             (version: %s)
++# Type: Subversion (SVN) dumps
++# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
++0	string	SVN-fs-dump-format-version:	Subversion dumpfile
++>28	string	>\0				(version: %s)

debian/patches/323-magic-add-supercollider.dpatch

@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 323-magic-add-supercollider.dpatch by Mario Lang <mlang@debian.org>
+##
+## DP: Adds new magic for SuperCollider 3 Synth Definition File Format
+## DP: (Closes: #284803).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/audio file-4.20/magic/Magdir/audio
+--- file-4.20.orig/magic/Magdir/audio	2007-04-03 16:21:12.000000000 +0000
++++ file-4.20/magic/Magdir/audio	2007-04-03 16:21:57.000000000 +0000
+@@ -570,3 +570,8 @@
+ # URL:  http://filext.com/detaillist.php?extdetail=AMR
+ # From: Russell Coker <russell@coker.com.au>
+ 0	string	#!AMR	Adaptive Multi-Rate Codec (GSM telephony)
++
++# Type: SuperCollider 3 Synth Definition File Format
++# From: Mario Lang <mlang@debian.org>
++0	string	SCgf	SuperCollider3 Synth Definition file,
++>4	belong	x	version %d

debian/patches/324-magic-add-xen.dpatch

@@ -0,0 +1,21 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 324-magic-add-xen.dpatch by Radek Vokal <rvokal@redhat.com>
+##
+## DP: xen patch, recognizes Xen saved domain
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/linux file-4.20/magic/Magdir/linux
+--- file-4.20.orig/magic/Magdir/linux	2006-11-25 18:36:10.000000000 +0000
++++ file-4.20/magic/Magdir/linux	2007-04-03 13:49:17.000000000 +0000
+@@ -236,3 +236,10 @@
+ >20	lelong	1			MLS
+ >24	lelong	x			%d symbols
+ >28	lelong	x			%d ocons
++
++# Type: Xen, the virtual machine monitor
++# From: Radek Vokal <rvokal@redhat.com>
++0	string		LinuxGuestRecord	Xen saved domain
++#>2	regex		\(name\ [^)]*\)		%s
++>20	search/256	(name			(name
++>>&1	string		x			%s...)

debian/patches/901-file-elf.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 91-file-elf.dpatch by Alessandro Rubini <rubini@gnudd.com>
+## 901-file-elf.dpatch by Alessandro Rubini <rubini@gnudd.com>
 ##
 ## DP: Revert ELF file-reading (closes: #345089).
 

debian/patches/902-file-kfreebsd.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 92-file-kfreebsd.dpatch by Robert Millan <rmh@aybabtu.com>
+## 902-file-kfreebsd.dpatch by Robert Millan <rmh@aybabtu.com>
 ##
 ## DP: Detect GNU/kFreeBSD binaries (closes: #307475).
 

debian/patches/903-file-localmagic.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 93-magic-local.dpatch by Michael Piefel <piefel@debian.org>
+## 903-magic-local.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: No longer includes Localstuff in /usr/share/misc/magic. Local definitions
 ## DP: should go to /etc/magic.

debian/patches/904-file-make.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 94-file-make.dpatch by Michael Piefel <piefel@debian.org>
+## 904-file-make.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: FIXME
 

debian/patches/998-doc-manpages.dpatch

@@ -1,13 +1,13 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 95-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
+## 905-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
 ##
-## DP: FIXME
+## DP: FIXME, and #417511.
 
 @DPATCH@
 
 diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
 --- file-4.20.orig/doc/file.man	2007-01-25 21:05:46.000000000 +0000
-+++ file-4.20/doc/file.man	2007-03-27 12:23:14.000000000 +0000
++++ file-4.20/doc/file.man	2007-04-03 17:57:01.000000000 +0000
 @@ -47,9 +47,8 @@
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
@@ -20,6 +20,28 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  .Em "preserve these keywords" .
  People depend on knowing that all the readable files in a directory
  have the word 
+@@ -76,17 +75,17 @@
+ implement them)
+ are intuited if they are defined in
+ the system header file
+-.In sys/stat.h .
++.Pa sys/stat.h .
+ .Pp
+ The magic number tests are used to check for files with data in
+ particular fixed formats.
+ The canonical example of this is a binary executable (compiled program)
+ .Dv a.out
+ file, whose format is defined in 
+-.In elf.h ,
+-.In a.out.h
++.Pa elf.h ,
++.Pa a.out.h
+ and possibly
+-.In exec.h
++.Pa exec.h
+ in the standard include directory.
+ These files have a 
+ .Sq "magic number"
 @@ -99,12 +98,14 @@
  has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
@@ -37,6 +59,15 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  .Nm
  will look in
  .Pa $HOME/.magic.mgc ,
+@@ -144,7 +145,7 @@
+ it will
+ attempt to determine in what language the file is written.
+ The language tests look for particular strings (cf
+-.In names.h
++.Pa names.h
+ that can appear anywhere in the first few blocks of a file.
+ For example, the keyword
+ .Em .br
 @@ -161,7 +162,8 @@
  archives).
  .Pp
@@ -116,7 +147,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
 +and mirrors).
 diff -Naur file-4.20.orig/doc/libmagic.man file-4.20/doc/libmagic.man
 --- file-4.20.orig/doc/libmagic.man	2007-01-25 21:04:08.000000000 +0000
-+++ file-4.20/doc/libmagic.man	2007-03-27 12:23:14.000000000 +0000
++++ file-4.20/doc/libmagic.man	2007-04-03 17:56:16.000000000 +0000
 @@ -39,7 +39,7 @@
  .Nm magic_load
  .Nd Magic number recognition library.
@@ -128,7 +159,7 @@ diff -Naur file-4.20.orig/doc/libmagic.man file-4.20/doc/libmagic.man
  .Ft magic_t
 diff -Naur file-4.20.orig/doc/magic.man file-4.20/doc/magic.man
 --- file-4.20.orig/doc/magic.man	2007-01-12 17:38:27.000000000 +0000
-+++ file-4.20/doc/magic.man	2007-03-27 12:23:14.000000000 +0000
++++ file-4.20/doc/magic.man	2007-04-03 17:56:16.000000000 +0000
 @@ -65,7 +65,7 @@
  .Dq c
  flag, specifies case insensitive matching: lowercase

debian/patches/999-conglomeration.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 99-conglomeration.dpatch by Michael Piefel <piefel@debian.org>
+## 999-conglomeration.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Needs to be broken out (FIXME).
 

debian/patches/999-upstream-reg-startend.dpatch

@@ -0,0 +1,37 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/src/softmagic.c file-4.20/src/softmagic.c
+--- file-4.20.orig/src/softmagic.c	2007-01-18 05:45:35.000000000 +0000
++++ file-4.20/src/softmagic.c	2007-04-03 18:01:25.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ 
+ #ifndef	lint
+-FILE_RCSID("@(#)$File: softmagic.c,v 1.91 2007/01/18 05:29:33 ljt Exp $")
++FILE_RCSID("@(#)$File: softmagic.c,v 1.95 2007/03/03 19:09:25 christos Exp $")
+ #endif	/* lint */
+ 
+ private int match(struct magic_set *, struct magic *, uint32_t,
+@@ -1523,10 +1523,20 @@
+ 		}
+ 		else {
+ 			regmatch_t pmatch[1];
++#ifndef REG_STARTEND
++#define	REG_STARTEND	0
++			size_t l = ms->search.s_len - 1;
++			char c = ms->search.s[l];
++			((char *)(intptr_t)ms->search.s)[l] = '\0';
++#else
+ 			pmatch[0].rm_so = 0;
+ 			pmatch[0].rm_eo = ms->search.s_len;
++#endif
+ 			rc = regexec(&rx, (const char *)ms->search.s,
+ 			    1, pmatch, REG_STARTEND);
++#if REG_STARTEND == 0
++			((char *)(intptr_t)ms->search.s)[l] = c;
++#endif
+ 			switch (rc) {
+ 			case 0:
+ 				ms->search.s += (int)pmatch[0].rm_so;