Import Debian version 4.20-7

debian/patches/00list

@@ -5,8 +5,7 @@
 105-magic-remove-com.dpatch
 106-magic-remove-emf.dpatch
 107-magic-remove-msi.dpatch
-108-magic-remove-os2rexx.dpatch
-109-magic-remove-quicktime.dpatch
+108-magic-remove-quicktime.dpatch
 201-magic-update-avi.dpatch
 202-magic-update-blender.dpatch
 203-magic-update-cow.dpatch
@@ -17,10 +16,11 @@
 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
+211-magic-update-os2rexx.dpatch
+212-magic-update-pcp.dpatch
+213-magic-update-perl.dpatch
+214-magic-update-sh.dpatch
+215-magic-update-spectrum.dpatch
 301-magic-add-adf.dpatch
 302-magic-add-ape.dpatch
 303-magic-add-apple2.dpatch

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

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

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

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 108-magic-remove-os2rexx.dpatch by Kees Cook <kees@ubuntu.com>
+## 211-magic-update-os2rexx.dpatch by 
 ##
 ## DP: Workaround regex DoS (CVE-2007-2026)
 
@@ -7,15 +7,17 @@
 
 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 @@
++++ file-4.20/magic/Magdir/msdos	2007-05-17 18:04:23.000000000 +0000
+@@ -14,8 +14,10 @@
  
  # 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
++#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{0,255}call\\s{1,99}rxfuncadd	OS/2 REXX batch file text
++100	regex/c =^\\s{0,255}say\ ['"]			OS/2 REXX batch file text
  
  0	leshort		0x14c	MS Windows COFF Intel 80386 object file
  #>4	ledate		x	stamp %s

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

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

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

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

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

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

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

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