Import Debian version 4.20-6

debian/patches/00list

@@ -5,19 +5,22 @@
 105-magic-remove-com.dpatch
 106-magic-remove-emf.dpatch
 107-magic-remove-msi.dpatch
-108-magic-remove-quicktime.dpatch
+108-magic-remove-os2rexx.dpatch
+109-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
+207-magic-update-elf-c.dpatch
+208-magic-update-hp.dpatch
+209-magic-update-m4v.dpatch
+210-magic-update-macintosh.dpatch
+211-magic-update-pcp.dpatch
+212-magic-update-perl.dpatch
+213-magic-update-sh.dpatch
+214-magic-update-spectrum.dpatch
 301-magic-add-adf.dpatch
 302-magic-add-ape.dpatch
 303-magic-add-apple2.dpatch
@@ -30,22 +33,27 @@
 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
+313-magic-add-luks.dpatch
+314-magic-add-lzma.dpatch
+315-magic-add-mathcad.dpatch
+316-magic-add-nlm.dpatch
+317-magic-add-ocfs.dpatch
+318-magic-add-par2.dpatch
+319-magic-add-pe5.dpatch
+320-magic-add-pmenu.dpatch
+321-magic-add-powertab.dpatch
+322-magic-add-scummvm.dpatch
+323-magic-add-sisu.dpatch
+324-magic-add-snes.dpatch
+325-magic-add-subversion.dpatch
+326-magic-add-supercollider.dpatch
+327-magic-add-svg.dpatch
+328-magic-add-xen.dpatch
 901-file-elf.dpatch
 902-file-kfreebsd.dpatch
 903-file-localmagic.dpatch
 904-file-make.dpatch
+905-file-segfault.dpatch
 998-doc-manpages.dpatch
 999-conglomeration.dpatch
 999-upstream-reg-startend.dpatch

debian/patches/108-magic-remove-os2rexx.dpatch

@@ -0,0 +1,21 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 108-magic-remove-os2rexx.dpatch by Kees Cook <kees@ubuntu.com>
+##
+## DP: Workaround regex DoS (CVE-2007-2026)
+
+@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-05-17 16:44:41.000000000 +0000
+@@ -14,8 +14,8 @@
+ 
+ # OS/2 batch files are REXX. the second regex is a bit generic, oh well
+ # the matched commands seem to be common in REXX and uncommon elsewhere
+-100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
+-100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
++#100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
++#100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
+ 
+ 0	leshort		0x14c	MS Windows COFF Intel 80386 object file
+ #>4	ledate		x	stamp %s

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

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

debian/patches/207-magic-update-elf-c.dpatch

@@ -0,0 +1,55 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 207-magic-update-elf-c.dpatch by Matthias Urlichs <smurf@debian.org>
+##
+## DP: Missing elf architectures (Closes: #424859).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/elf file-4.20/magic/Magdir/elf
+--- file-4.20.orig/magic/Magdir/elf	2007-05-17 17:05:34.000000000 +0000
++++ file-4.20/magic/Magdir/elf	2007-05-17 17:09:08.000000000 +0000
+@@ -96,10 +96,44 @@
+ >>18	leshort		51		Stanford MIPS-X,
+ >>18	leshort		52		Motorola Coldfire,
+ >>18	leshort		53		Motorola M68HC12,
++>>18	leshort		54		Fujitsu MMA,
++>>18	leshort		55		Siemens PCP,
++>>18	leshort		56		Sony nCPU,
++>>18	leshort		57		Denso NDR1,
++>>18	leshort		58		Start*Core,
++>>18	leshort		59		Toyota ME16,
++>>18	leshort		60		ST100,
++>>18	leshort		61		Tinyj emb.,
+ >>18	leshort		62		x86-64,
++>>18	leshort		63		Sony DSP,
++>>18	leshort		66		FX66,
++>>18	leshort		67		ST9+ 8/16 bit,
++>>18	leshort		68		ST7 8 bit,
++>>18	leshort		69		MC68HC16,
++>>18	leshort		70		MC68HC11,
++>>18	leshort		71		MC68HC08,
++>>18	leshort		72		MC68HC05,
++>>18	leshort		73		SGI SVx,
++>>18	leshort		74		ST19 8 bit,
+ >>18	leshort		75		Digital VAX,
++>>18	leshort		76		Axis cris,
++>>18	leshort		77		Infineon 32-bit embedded,
++>>18	leshort		78		Element 14 64-bit DSP,
++>>18	leshort		79		LSI Logic 16-bit DSP,
++>>18	leshort		80		MMIX,
++>>18	leshort		81		Harvard machine-independent,
++>>18	leshort		82		SiTera Prism,
++>>18	leshort		83		Atmel AVR 8-bit,
++>>18	leshort		84		Fujitsu FR30,
++>>18	leshort		85		Mitsubishi D10V,
++>>18	leshort		86		Mitsubishi D30V,
++>>18	leshort		87		NEC v850,
+ >>18	leshort		88		Renesas M32R,
++>>18	leshort		89		Matsushita MN10300,
++>>18	leshort		90		Matsushita MN10200,
++>>18	leshort		91		picoJava,
+ >>18	leshort		92		OpenRISC,
++>>18	leshort		93		ARC Cores Tangent-A5,
+ >>18	leshort		0x3426		OpenRISC (obsolete),
+ >>18	leshort		0x8472		OpenRISC (obsolete),
+ >>18	leshort		94		Tensilica Xtensa,

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 207-magic-update-hp.dpatch by Michael Piefel <piefel@debian.org>
+## 208-magic-update-hp.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Updated HP 38/39/40/48/49 magic (closes: #326680).
 

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

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

debian/patches/210-magic-update-macintosh.dpatch

@@ -0,0 +1,44 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 210-magic-update-macintosh.dpatch by Josef Spillner <2005@kuarepoti-dju.net>
+##
+## DP: Extend HFS+ partition table detection (Closes: #405313).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/macintosh file-4.20/magic/Magdir/macintosh
+--- file-4.20.orig/magic/Magdir/macintosh	2005-01-19 17:56:21.000000000 +0000
++++ file-4.20/magic/Magdir/macintosh	2007-05-17 17:18:23.000000000 +0000
+@@ -321,7 +321,7 @@
+ # cstring. Of course, partitions can contain more than four entries, but 
+ # what're you gonna do?
+ 0x200		beshort		0x504D		Apple Partition data
+->0x2		beshort		x		block size: %d,
++>0x2		beshort		x		(block size: %d):
+ >0x230		string		x		first type: %s,
+ >0x210		string		x		name: %s,
+ >0x254		belong		x		number of blocks: %d,
+@@ -329,14 +329,22 @@
+ >>0x430		string		x		second type: %s,
+ >>0x410		string		x		name: %s,
+ >>0x454		belong		x		number of blocks: %d,
++>>0x600		beshort		0x504D
++>>>0x630	string		x		third type: %s,
++>>>0x610	string		x		name: %s,
++>>>0x654	belong		x		number of blocks: %d,
+ >>0x800		beshort		0x504D		
+->>>0x830	string		x		third type: %s,
++>>>0x830	string		x		fourth type: %s,
+ >>>0x810	string		x		name: %s,
+ >>>0x854	belong		x		number of blocks: %d,
+ >>>0xa00	beshort		0x504D		
+->>>>0xa30	string		x		fourth type: %s,
++>>>>0xa30	string		x		fifth type: %s,
+ >>>>0xa10	string		x		name: %s,
+ >>>>0xa54	belong		x		number of blocks: %d
++>>>0xc00	beshort		0x504D
++>>>>0xc30	string		x		sixth type: %s,
++>>>>0xc10	string		x		name: %s,
++>>>>0xc54	belong		x		number of blocks: %d
+ # AFAIK, only the signature is different
+ 0x200		beshort		0x5453		Apple Old Partition data
+ >0x2		beshort		x		block size: %d,

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 209-magic-update-pcp.dpatch by Werner Fink <werner@suse.de>
+## 211-magic-update-pcp.dpatch by Werner Fink <werner@suse.de>
 ##
 ## DP: Correct PCP entries.
 

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

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

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

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

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

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

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

@@ -0,0 +1,43 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 313-magic-add-luks.dpatch by Anthon van der Neut <anthon@mnt.org>
+##
+## DP: New magic for the Linux Unified Key Setup (Closes: #394246).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/luks file-4.20/magic/Magdir/luks
+--- file-4.20.orig/magic/Magdir/luks	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/luks	2007-05-17 16:22:35.000000000 +0000
+@@ -0,0 +1,10 @@
++# Type:	Linux Unified Key Setup
++# URL:	http://luks.endorphin.org/spec
++# From:	Anthon van der Neut <anthon@mnt.org>
++
++0	string		LUKS\xba\xbe	LUKS encrypted file,
++>6	beshort		x		ver %d
++>8	string		x		[%s,
++>40	string		x		%s,
++>72	string		x		%s]
++>168	string		x		UUID: %s
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2007-05-17 16:20:03.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-05-17 16:22:54.000000000 +0000
+@@ -119,6 +119,7 @@
+ Magdir/lisp \
+ Magdir/llvm \
+ Magdir/lua \
++Magdir/luks \
+ Magdir/mach \
+ 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-05-17 16:20:03.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-05-17 16:22:48.000000000 +0000
+@@ -259,6 +259,7 @@
+ Magdir/lisp \
+ Magdir/llvm \
+ Magdir/lua \
++Magdir/luks \
+ Magdir/mach \
+ Magdir/macintosh \
+ Magdir/magic \

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 313-magic-add-lzma.dpatch by Robert Millan <rmh@aybabtu.com>
+## 314-magic-add-lzma.dpatch by Robert Millan <rmh@aybabtu.com>
 ##
 ## DP: New magic for the LZMA compression format (Closes: #364260).
 

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

@@ -0,0 +1,38 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 315-magic-add-mathcad.dpatch by Josh Triplett <josh@freedesktop.org>
+##
+## DP: New magic for Mathcad documents (Closes: #421426).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/mathcad file-4.20/magic/Magdir/mathcad
+--- file-4.20.orig/magic/Magdir/mathcad	1970-01-01 00:00:00.000000000 +0000
++++ file-4.20/magic/Magdir/mathcad	2007-05-17 17:00:39.000000000 +0000
+@@ -0,0 +1,5 @@
++# Type:	Mathcad documents
++# URL:	http://www.mathsoft.com/
++# From:	Josh Triplett <josh@freedesktop.org>
++
++0	string	.MCAD\		Mathcad document
+diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
+--- file-4.20.orig/magic/Makefile.am	2007-05-17 16:59:17.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-05-17 17:01:07.000000000 +0000
+@@ -125,6 +125,7 @@
+ Magdir/magic \
+ Magdir/mail.news \
+ Magdir/maple \
++Magdir/mathcad \
+ Magdir/mathematica \
+ Magdir/matroska \
+ Magdir/mcrypt \
+diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
+--- file-4.20.orig/magic/Makefile.in	2007-05-17 16:59:17.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-05-17 17:01:02.000000000 +0000
+@@ -265,6 +265,7 @@
+ Magdir/magic \
+ Magdir/mail.news \
+ Magdir/maple \
++Magdir/mathcad \
+ Magdir/mathematica \
+ Magdir/matroska \
+ Magdir/mcrypt \

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 314-magic-add-nlm.dpatch by Mads Martin Joergensen <mmj@suse.de>
+## 316-magic-add-nlm.dpatch by Mads Martin Joergensen <mmj@suse.de>
 ##
 ## DP: New magic for NetWare Loadable Modules (NLMs).
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 315-magic-add-ocfs.dpatch by Aaron Botsis <redhat@digitalmafia.org>
+## 317-magic-add-ocfs.dpatch by Aaron Botsis <redhat@digitalmafia.org>
 ##
 ## DP: New magic for the Oracle Clustered Filesystem.
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 316-magic-add-par2.dpatch by Daniel van Eeden <daniel_e@dds.nl>
+## 318-magic-add-par2.dpatch by Daniel van Eeden <daniel_e@dds.nl>
 ##
 ## DP: New magic for PAR2 archive files (Closes: #294070).
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 317-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
+## 319-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
 ##
 ## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 318-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
+## 320-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
 ##
 ## DP: New magic for pmenu (Closes: #38543).
 

debian/patches/321-magic-add-powertab.dpatch

@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 321-magic-add-powertab.dpatch by Jelmer Vernooij <jelmer@samba.org>
+##
+## DP: New magic for Power-Tab
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/chord file-4.20/magic/Magdir/chord
+--- file-4.20.orig/magic/Magdir/chord	2003-03-24 14:48:32.000000000 +0000
++++ file-4.20/magic/Magdir/chord	2007-05-17 16:33:26.000000000 +0000
+@@ -7,3 +7,8 @@
+ #
+ 0	string		{title		Chord text file
+ 
++# Type:	PowerTab file format
++# URL:	http://www.power-tab.net/
++# From:	Jelmer Vernooij <jelmer@samba.org>
++0	string		ptab\003\000	Power-Tab v3 Tablature File
++0	string		ptab\004\000	Power-Tab v4 Tablature File

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 319-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
+## 322-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
 ##
 ## DP: New magic for scummVM savegame files (Closes: #263488).
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 320-magic-add-sisu.dpatch by Ralph Amissah <ralph.amissah@gmail.com>
+## 323-magic-add-sisu.dpatch by Ralph Amissah <ralph.amissah@gmail.com>
 ##
 ## DP: New magic for SiSU Markup Language.
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 321-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
+## 324-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
 ##
 ## DP: New magic for SNES SPC700 sound files (Closes: #410847).
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 322-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
+## 325-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: New magic for SVN dumps (closes: #256652).
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 323-magic-add-supercollider.dpatch by Mario Lang <mlang@debian.org>
+## 326-magic-add-supercollider.dpatch by Mario Lang <mlang@debian.org>
 ##
 ## DP: Adds new magic for SuperCollider 3 Synth Definition File Format
 ## DP: (Closes: #284803).

debian/patches/327-magic-add-svg.dpatch

@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 327-magic-add-svg.dpatch by Noel Torres <tecnico@ejerciciosresueltos.com>
+##
+## DP: Adds magic for SVG (Closes: #417331).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/sgml file-4.20/magic/Magdir/sgml
+--- file-4.20.orig/magic/Magdir/sgml	2007-01-19 21:09:07.000000000 +0000
++++ file-4.20/magic/Magdir/sgml	2007-05-17 16:54:52.000000000 +0000
+@@ -33,3 +33,9 @@
+ 0	string	#\ HTTP\ Cookie\ File	Web browser cookie text
+ 0	string	#\ Netscape\ HTTP\ Cookie\ File	Netscape cookie text
+ 0	string	#\ KDE\ Cookie\ File	Konqueror cookie text
++
++# Type:	SVG Vectorial Graphics
++# From:	Noel Torres <tecnico@ejerciciosresueltos.com>
++0	string	\<?xml\ version="
++>15	string	>\0
++>>23	regex	.*\<svg			SVG Scalable Vector Graphics image

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 324-magic-add-xen.dpatch by Radek Vokal <rvokal@redhat.com>
+## 328-magic-add-xen.dpatch by Radek Vokal <rvokal@redhat.com>
 ##
 ## DP: xen patch, recognizes Xen saved domain
 

debian/patches/905-file-segfault.dpatch

@@ -0,0 +1,33 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 905-file-segfault.dpatch by Sven Anders <anders@anduras.de>
+##
+## DP: Fixes a segfault with -c.
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/src/magic.c file-4.20/src/magic.c
+--- file-4.20.orig/src/magic.c	2007-03-01 22:14:55.000000000 +0000
++++ file-4.20/src/magic.c	2007-05-17 16:39:17.000000000 +0000
+@@ -109,6 +109,7 @@
+ 	ms->haderr = 0;
+ 	ms->error = -1;
+ 	ms->mlist = NULL;
++	ms->file = NULL;
+ 	return ms;
+ free3:
+ 	free(ms->o.pbuf);
+diff -Naur file-4.20.orig/src/print.c file-4.20/src/print.c
+--- file-4.20.orig/src/print.c	2007-01-18 05:45:35.000000000 +0000
++++ file-4.20/src/print.c	2007-05-17 16:39:17.000000000 +0000
+@@ -179,7 +179,10 @@
+ 	/* cuz we use stdout for most, stderr here */
+ 	(void) fflush(stdout); 
+ 
+-	(void) fprintf(stderr, "%s, %lu: Warning ", ms->file,
++	if (!ms->file)
++	  fprintf(stderr, "Warning ");
++	else
++	  (void) fprintf(stderr, "%s, %lu: Warning ", ms->file,
+ 	    (unsigned long)ms->line);
+ 	(void) vfprintf(stderr, f, va);
+ 	va_end(va);

debian/patches/998-doc-manpages.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 905-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
+## 998-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: FIXME, and #417511.
 

debian/rules

@@ -59,7 +59,7 @@ clean: unpatch
 	# Cleaning package
 	-$(MAKE) clean
 	-$(MAKE) distclean
-	rm -rf python-build
+	rm -rf python/build
 
 	dh_clean