Import Debian version 5.04-4

debian/patches/129-magic-update-qemu.patch

@@ -0,0 +1,91 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description:
+ Update QEMU image magic, based on some reference docs and checked against
+ actual QEMU images (Closes: #451524).
+
+diff -Naurp file.orig//magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig//magic/Magdir/msdos	2010-07-13 17:00:52.246670740 +0200
++++ file/magic/Magdir/msdos	2010-07-13 17:02:50.322699548 +0200
+@@ -639,43 +639,58 @@
+ #--------------------------------------------------------------------
+ # Qemu Emulator Images
+ # Lines written by Friedrich Schwittay (f.schwittay@yousable.de)
+-# Made by reading sources and doing trial and error on existing
+-# qcow files
+-0	string	QFI	Qemu Image, Format: Qcow
++# Updated by Adam Buchbinder (adam.buchbinder@gmail.com)
++# Made by reading sources, reading documentation, and doing trial and error
++# on existing QCOW files
++0	string	QFI\xFB	QEMU QCOW Image
+ 
+ # Uncomment the following line to display Magic (only used for debugging
+ # this magic number)
+ #>0	string	x	, Magic: %s
+ 
+-# There are currently 2 Versions: "1" and "2"
+-# I do not use Version 2 and therefor branch here
+-# but can assure: it works (tested on both versions)
+-# Also my Qemu 0.9.0 which uses this Version 2 refuses
+-# to start in its bios
+->0x04	belong	2	, Version: 2
+->0x04	belong	1	, Version: 1
++# There are currently 2 Versions: "1" and "2".
++# http://www.gnome.org/~markmc/qcow-image-format-version-1.html
++>4	belong	1	(v1)
+ 
+-# Using the existence of the Backing File Offset to Branch or not
++# Using the existence of the Backing File Offset to determine whether
+ # to read Backing File Information
+->>0xc	 belong	 >0	 , Backing File( Offset: %lu
+->>>(0xc.L)	 string >\0	, Path: %s
+-
+-# Didn't get the trick here how qemu stores the "Size" at this Position
+-# There is actually something stored but nothing makes sense
+-# The header in the sources talks about it
+-#>>>16	 lelong	 x	 , Size: %lu
++>>12	belong	 >0	 \b, has backing file (
++# Note that this isn't a null-terminated string; the length is actually
++# (16.L). Assuming a null-terminated string happens to work usually, but it
++# may spew junk until it reaches a \0 in some cases.
++>>>(12.L)	 string >\0	\bpath %s
+ 
+ # Modification time of the Backing File
+ # Really useful if you want to know if your backing
+ # file is still usable together with this image
+->>>20	 bedate x	, Mtime: %s )
++>>>>20	bedate >0	\b, mtime %s)
++>>>>20	default x	\b)
++
++# Size is stored in bytes in a big-endian u64.
++>>24	bequad	x	 \b, %lld bytes
++
++# 1 for AES encryption, 0 for none.
++>>36	belong	1	\b, AES-encrypted
++
++# http://www.gnome.org/~markmc/qcow-image-format.html
++>4	belong	2	(v2)
++# Using the existence of the Backing File Offset to determine whether
++# to read Backing File Information
++>>8	bequad  >0	 \b, has backing file
++# Note that this isn't a null-terminated string; the length is actually
++# (16.L). Assuming a null-terminated string happens to work usually, but it
++# may spew junk until it reaches a \0 in some cases. Also, since there's no
++# .Q modifier, we just use the bottom four bytes as an offset. Note that if
++# the file is over 4G, and the backing file path is stored after the first 4G,
++# the wrong filename will be printed. (This should be (8.Q), when that syntax
++# is introduced.)
++>>>(12.L)	 string >\0	(path %s)
++>>24	bequad	x	\b, %lld bytes
++>>32	belong	1	\b, AES-encrypted
+ 
+-# Don't know how to calculate in Magicfiles
+-# Also: this Information is not reliably
+-#	stored in image-files
+->>24	 lelong	 x	 , Disk Size could be: %d * 256 bytes
++>4	default x	(unknown version)
+ 
+-0	string	QEVM		QEMU's suspend to disk image
++0	string	QEVM		QEMU suspend to disk image
+ 
+ 0	string	Bochs\ Virtual\ HD\ Image	Bochs disk image,
+ >32	string	x				type %s,

debian/patches/130-magic-update-psf2.patch

@@ -0,0 +1,42 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description:
+ Adding detection of PSF2 fonts (Closes: #492035).
+ .
+ Linux console fonts come in two formats; PSF1 is already detected, but
+ PSF2, used for fonts which aren't 8-by-x shaped, was not. Add detection
+ of these fonts, and make the output look similar to the PSF1 output,
+ though with a different version number.
+ .
+ For more information, see:
+ http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html
+
+diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
+--- file.orig/magic/Magdir/linux	2010-07-13 18:21:11.561672573 +0200
++++ file/magic/Magdir/linux	2010-07-13 18:23:37.790780191 +0200
+@@ -46,12 +46,21 @@
+ 2	string		LILO		Linux/i386 LILO boot/chain loader
+ #
+ # PSF fonts, from H. Peter Anvin <hpa@yggdrasil.com>
+-0	leshort		0x0436		Linux/i386 PC Screen Font data,
+->2	byte		0		256 characters, no directory,
+->2	byte		1		512 characters, no directory,
+->2	byte		2		256 characters, Unicode directory,
+->2	byte		3		512 characters, Unicode directory,
++# Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
++# See: http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html
++0	leshort		0x0436		Linux/i386 PC Screen Font v1 data,
++>2	byte&0x01	0		256 characters,
++>2	byte&0x01	!0		512 characters,
++>2	byte&0x02	0		no directory,
++>2	byte&0x02	!0		Unicode directory,
+ >3	byte		>0		8x%d
++0	string		\x72\xb5\x4a\x86\x00\x00 Linux/i386 PC Screen Font v2 data,
++>16	lelong		x		%d characters,
++>12	lelong&0x01	0		no directory,
++>12	lelong&0x01	!0		Unicode directory,
++>24	lelong		x		%d
++>28	lelong		x		\bx%d
++
+ # Linux swap file, from Daniel Quinlan <quinlan@yggdrasil.com>
+ 4086	string		SWAP-SPACE	Linux/i386 swap file
+ # From: Jeff Bailey <jbailey@ubuntu.com>

debian/patches/131-magic-update-dyatic.patch

@@ -0,0 +1,52 @@
+Author: Richard Smith <busreply@broadmeadow.eu>
+Description: Updating Dyalog APL magics (Closes: #537893).
+
+diff -Naurp file.orig/magic/Magdir/dyadic file/magic/Magdir/dyadic
+--- file.orig/magic/Magdir/dyadic	2010-07-11 00:17:48.680930074 +0200
++++ file/magic/Magdir/dyadic	2010-07-13 18:56:06.213685552 +0200
+@@ -3,7 +3,7 @@
+ # $File: dyadic,v 1.4 2009/09/19 16:28:09 christos Exp $
+ # Dyadic: file(1) magic for Dyalog APL.
+ #
+-0 	byte	0xaa
++0	byte	0xaa
+ >1	byte	<4		Dyalog APL
+ >>1	byte	0x00		incomplete workspace
+ >>1	byte	0x01		component file
+@@ -11,3 +11,36 @@
+ >>1	byte	0x03		workspace
+ >>2	byte	x		version %d
+ >>3	byte	x		.%d
++
++0	beshort		0xaa03		Dyalog APL
++>2	byte		x		workspace type %d
++>3	byte		x		subtype %d
++>7	byte&0x28	0x00		32-bit
++>7	byte&0x28	0x20		64-bit
++>7	byte&0x0c	0x00		classic
++>7	byte&0x0c	0x04		unicode
++>7	byte&0x88	0x00		big-endian
++>7	byte&0x88	0x80		little-endian
++
++0	byte		0xaa		Dyalog APL
++>1	byte		0x00		aplcore
++>1	byte		0x01		component file 32-bit non-journaled non-checksummed
++>1	byte		0x02		external variable exclusive
++>1	byte		0x06		external variable shared
++>1	byte		0x07		session
++>1	byte		0x08		mapped file 32-bit
++>1	byte		0x09		component file 64-bit non-journaled non-checksummed
++>1	byte		0x0a		mapped file 64-bit
++>1	byte		0x0b		component file 32-bit level 1 journaled non-checksummed
++>1	byte		0x0c		component file 64-bit level 1 journaled non-checksummed
++>1	byte		0x0d		component file 32-bit level 1 journaled checksummed
++>1	byte		0x0e		component file 64-bit level 1 journaled checksummed
++>1	byte		0x0f		component file 32-bit level 2 journaled checksummed
++>1	byte		0x10		component file 64-bit level 2 journaled checksummed
++>1	byte		0x11		component file 32-bit level 3 journaled checksummed
++>1	byte		0x12		component file 64-bit level 3 journaled checksummed
++>1	byte		0x13		component file 32-bit non-journaled checksummed
++>1	byte		0x14		component file 64-bit non-journaled checksummed
++>1	byte		0x80		DDB
++
++0	short		0x6060		Dyalog APL transfer

debian/patches/239-magic-add-datafork.patch

@@ -0,0 +1,22 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Add new magic for datafork fonts (Closes: #291908).
+
+diff -Naurp file.orig/magic/Magdir/macintosh file/magic/Magdir/macintosh
+--- file.orig/magic/Magdir/macintosh	2010-07-11 00:17:48.692930622 +0200
++++ file/magic/Magdir/macintosh	2010-07-13 17:26:21.169673589 +0200
+@@ -376,3 +376,15 @@
+ 
+ # From: Remi Mommsen <mommsen@slac.stanford.edu>
+ 0		string		BOMStore	Mac OS X bill of materials (BOM) file
++
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# URL: http://en.wikipedia.org/wiki/Datafork_TrueType
++# Derived from the 'fondu' and 'ufond' source code (fondu.sf.net). 'sfnt' is
++# TrueType; 'POST' is PostScript. 'FONT' and 'NFNT' sometimes appear, but I
++# don't know what they mean.
++0	belong	0x100
++>(0x4.L+24)	beshort	x
++>>&4	belong	0x73666e74	Mac OSX datafork font, TrueType
++>>&4	belong	0x464f4e54	Mac OSX datafork font, 'FONT'
++>>&4	belong	0x4e464e54	Mac OSX datafork font, 'NFNT'
++>>&4	belong	0x504f5354	Mac OSX datafork font, PostScript

debian/patches/240-magic-add-pdb.patch

@@ -0,0 +1,36 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Adding new magics for PDB files (Closes: #480829).
+
+diff -Naurp file.orig/magic/Magdir/scientific file/magic/Magdir/scientific
+--- file.orig/magic/Magdir/scientific	2010-07-11 00:17:48.700953291 +0200
++++ file/magic/Magdir/scientific	2010-07-13 18:10:28.461677038 +0200
+@@ -71,3 +71,29 @@
+ 0	string	\060\000\040\000\110\000\105\000\101\000\104\000		GEDCOM data
+ 0	string	\376\377\000\060\000\040\000\110\000\105\000\101\000\104	GEDCOM data
+ 0	string	\377\376\060\000\040\000\110\000\105\000\101\000\104\000	GEDCOM data
++
++# PDB: Protein Data Bank files
++# Adam Buchbinder <adam.buchbinder@gmail.com>
++#
++# http://www.wwpdb.org/documentation/format32/sect2.html
++# http://www.ch.ic.ac.uk/chemime/
++#
++# The PDB file format is fixed-field, 80 columns. From the spec:
++#
++# COLS        DATA
++#  1 -  6      "HEADER"
++#  11 - 50     String(40)
++#  51 - 59     Date
++#  63 - 66     IDcode
++#
++# Thus, positions 7-10, 60-62 and 67-80 are spaces. The Date must be in the
++# format DD-MMM-YY, e.g., 01-JAN-70, and the IDcode consists of numbers and
++# uppercase letters. However, examples have been seen without the date string,
++# e.g., the example on the chemime site.
++0	string	HEADER\ \ \ \ 
++>&0	regex/1	\^.{40}
++>>&0	regex/1	[0-9]{2}-[A-Z]{3}-[0-9]{2}\ {3}
++>>>&0	regex/1s	[A-Z0-9]{4}.{14}$
++>>>>&0	regex/1	[A-Z0-9]{4}	Protein Data Bank data, ID Code %s
++!:mime	chemical/x-pdb
++>>>>0	regex/1	[0-9]{2}-[A-Z]{3}-[0-9]{2}	\b, %s

debian/patches/241-magic-add-canon.patch

@@ -0,0 +1,32 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Adding new magics for Canon CRW and CR2 files (Closes: #516054).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2010-07-13 18:47:51.670671838 +0200
++++ file/magic/Magdir/images	2010-07-13 18:48:12.525672541 +0200
+@@ -63,6 +63,25 @@
+ 0	string		IIN1		NIFF image data
+ !:mime	image/x-niff
+ 
++# Canon RAW version 1 (CRW) files are a type of Canon Image File Format
++# (CIFF) file. These are apparently all little-endian.
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# URL: http://www.sno.phy.queensu.ca/~phil/exiftool/canon_raw.html
++0	string		II\x1a\0\0\0HEAPCCDR	Canon CIFF raw image data
++!:mime	image/x-canon-crw
++>16	leshort		x	\b, version %d.
++>14	leshort		x	\b%d
++
++# Canon RAW version 2 (CR2) files are a kind of TIFF with an extra magic
++# number. Put this above the TIFF test to make sure we detect them.
++# These are apparently all little-endian.
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# URL: http://libopenraw.freedesktop.org/wiki/Canon_CR2
++0	string		II\x2a\0\x10\0\0\0CR	Canon CR2 raw image data
++!:mime	image/x-canon-cr2
++>10	byte		x	\b, version %d.
++>11	byte		x	\b%d
++
+ # Tag Image File Format, from Daniel Quinlan (quinlan@yggdrasil.com)
+ # The second word of TIFF files is the TIFF version number, 42, which has
+ # never changed.  The TIFF specification recommends testing for it.

debian/patches/242-magic-add-gdsii.patch

@@ -0,0 +1,17 @@
+Author: Євгеній Мещеряков <eugen@debian.org>
+Description: Adding new magics for GDSII (Closes: #576462).
+
+diff -Naurp file.orig/magic/Magdir/scientific file/magic/Magdir/scientific
+--- file.orig/magic/Magdir/scientific	2010-07-13 19:20:16.702717178 +0200
++++ file/magic/Magdir/scientific	2010-07-13 19:19:47.037693749 +0200
+@@ -97,3 +97,10 @@
+ >>>>&0	regex/1	[A-Z0-9]{4}	Protein Data Bank data, ID Code %s
+ !:mime	chemical/x-pdb
+ >>>>0	regex/1	[0-9]{2}-[A-Z]{3}-[0-9]{2}	\b, %s
++
++# Type:	GDSII Stream file
++0	belong	0x00060002	GDSII Stream file
++>4	byte	0x00
++>>5	byte	x		version %d.0
++>4	byte	>0x00		version %d
++>>5	byte	x		\b.%d

debian/patches/243-magic-add-git-index.patch

@@ -0,0 +1,19 @@
+Author: Frédéric Brière <fbriere@fbriere.net>
+Description: Adding new magics for Git index files (Closes: #583679).
+
+diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
+--- file.orig/magic/Magdir/revision	2010-07-13 19:28:53.070674134 +0200
++++ file/magic/Magdir/revision	2010-07-13 19:28:37.817698688 +0200
+@@ -28,6 +28,12 @@
+ 0	string	\377tOc		Git pack index
+ >4	belong	=2		\b, version 2
+ 
++# Type: Git index file
++# From: Frédéric Brière <fbriere@fbriere.net>
++0	string	DIRC		Git index
++>4	belong	>0		\b, version %d
++>>8	belong	>0		\b, %d entries
++
+ # Type:	Mercurial bundles
+ # From:	Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
+ 0	string	HG10		Mercurial bundle,

debian/patches/906-doc-manpages-typo2.patch

@@ -0,0 +1,24 @@
+Author: Ori Avtalion <ori@avtalion.name>
+Description: Fixing typo and formating issue (Closes: #499754).
+
+diff -Naurp file.orig/doc/magic.man file/doc/magic.man
+--- file.orig/doc/magic.man	2010-07-11 00:17:48.664928248 +0200
++++ file/doc/magic.man	2010-07-13 17:08:25.697672263 +0200
+@@ -283,7 +283,7 @@ then print the string), with
+ The special test
+ .Em x
+ always evaluates to true.
+-.Dv message
++.It Dv message
+ The message to be printed if the comparison succeeds.
+ If the string contains a
+ .Xr printf 3
+@@ -348,7 +348,7 @@ If a the test on a line at level
+ .Em n
+ succeeds, all following tests at level
+ .Em n+1
+-are performed, and the messages printed if the tests succeed, untile a line
++are performed, and the messages printed if the tests succeed, until a line
+ with level
+ .Em n
+ (or less) appears.

debian/patches/908-file-coredump.patch

@@ -0,0 +1,34 @@
+Author: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
+Description:
+ File does not always correctly report the faulty command for core files
+ anymore.
+
+diff -Naurp file.orig/src/readelf.c file/src/readelf.c
+--- file.orig/src/readelf.c	2010-07-11 00:17:48.717928843 +0200
++++ file/src/readelf.c	2010-07-13 16:45:37.341674011 +0200
+@@ -738,6 +738,25 @@ core:
+ 				/*
+ 				 * Well, that worked.
+ 				 */
++
++				/*
++				 * Try next offsets, in case this match is
++				 * in the middle of a string.
++				 */
++				size_t k;
++				for (k = i + 1 ; k < NOFFSETS ; k++) {
++					if (prpsoffsets(k) >= prpsoffsets(i))
++						continue;
++					size_t no;
++					int adjust = 1;
++					for (no = doff + prpsoffsets(k);
++					     no < doff + prpsoffsets(i); no++)
++						adjust = adjust
++						         && isprint(nbuf[no]);
++					if (adjust)
++						i = k;
++				}
++
+ 				cname = (unsigned char *)
+ 				    &nbuf[doff + prpsoffsets(i)];
+ 				for (cp = cname; *cp && isprint(*cp); cp++)

debian/patches/series

@@ -23,6 +23,9 @@
 126-magic-update-7zip.patch
 127-magic-update-lzma.patch
 128-magic-update-xz.patch
+129-magic-update-qemu.patch
+130-magic-update-psf2.patch
+131-magic-update-dyatic.patch
 200-magic-add-par2.patch
 201-magic-add-pe5.patch
 202-magic-add-pmenu.patch
@@ -61,9 +64,16 @@
 236-magic-add-foveon-x3f.patch
 237-magic-add-paint-net.patch
 238-magic-add-dact.patch
+239-magic-add-datafork.patch
+240-magic-add-pdb.patch
+241-magic-add-canon.patch
+242-magic-add-gdsii.patch
+243-magic-add-git-index.patch
 901-file-localmagic.patch
 902-file-make.patch
 904-doc-manpages.patch
 905-doc-manpages-typo.patch
-906-file-python.patch
+906-doc-manpages-typo2.patch
+907-file-python.patch
+908-file-coredump.patch
 999-conglomeration.patch