Import Debian version 4.21-1

debian/patches/00list

@@ -22,7 +22,6 @@
 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
 304-magic-add-arm.dpatch
 305-magic-add-avg.dpatch
@@ -56,4 +55,3 @@
 905-file-segfault.dpatch
 998-doc-manpages.dpatch
 999-conglomeration.dpatch
-999-upstream-reg-startend.dpatch

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

@@ -1,23 +1,23 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 211-magic-update-os2rexx.dpatch by 
+## 211-magic-update-os2rexx.dpatch by Werner Fink <werner@suse.de>
 ##
 ## 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 18:04:23.000000000 +0000
-@@ -14,8 +14,10 @@
+diff -Naur file-4.21.orig/magic/Magdir/msdos file-4.21/magic/Magdir/msdos
+--- file-4.21.orig/magic/Magdir/msdos	2007-06-01 18:32:10.000000000 +0000
++++ file-4.21/magic/Magdir/msdos	2007-06-01 18:35:45.000000000 +0000
+@@ -18,8 +18,10 @@
+ 100	regex/c =^[\ \t]{0,10}say\ ['"]	     OS/2 REXX batch file text
+ 
  
- # 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{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
++#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/302-magic-add-ape.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 302-magic-add-ape.dpatch by Robert Millan <rmh@aybabtu.com>
-##
-## DP: New magic for the Monkey's audio format (Closes: #334862).
-
-@DPATCH@
-
-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-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>
-+0	string	MAC\	Monkey's Audio file

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

@@ -5,15 +5,14 @@
 
 @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
-+
+diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
+--- file-4.21.orig/magic/Magdir/audio	2007-03-13 13:57:59.000000000 +0000
++++ file-4.21/magic/Magdir/audio	2007-06-01 18:42:38.000000000 +0000
+@@ -556,3 +556,7 @@
+ # From: Matthew Flaschen <matthew.flaschen@gatech.edu>
+ 0	string	#EXTM3U 	M3U playlist text
+ 
 +# 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)
++0	string	#!AMR		Adaptive Multi-Rate Codec (GSM telephony)

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

@@ -5,9 +5,9 @@
 
 @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
+diff -Naur file-4.21.orig/magic/Magdir/filesystems file-4.21/magic/Magdir/filesystems
+--- file-4.21.orig/magic/Magdir/filesystems	2007-05-16 00:02:54.000000000 +0000
++++ file-4.21/magic/Magdir/filesystems	2007-06-01 18:46:57.000000000 +0000
 @@ -1185,6 +1185,21 @@
  >>>>>>>>&0      bedate          =0                      full dump
  >>>>>>>>&0      bedate          !0                      incremental since: %s
@@ -27,6 +27,6 @@ diff -Naur file-4.20.orig/magic/Magdir/filesystems file-4.20/magic/Magdir/filesy
 +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/318-magic-add-par2.dpatch

@@ -5,14 +5,14 @@
 
 @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
+diff -Naur file-4.21.orig/magic/Magdir/archive file-4.21/magic/Magdir/archive
+--- file-4.21.orig/magic/Magdir/archive	2007-04-03 21:11:28.000000000 +0000
++++ file-4.21/magic/Magdir/archive	2007-06-01 18:49:15.000000000 +0000
+@@ -731,3 +731,7 @@
+ >4	lelong	0x1000006D	(EPOC release 3/4/5)
+ >4	lelong	0x10003A12	(EPOC release 6)
+ 0	lelong	0x10201A7A	Symbian installation file (Symbian OS 9.x)
 +
 +# Type: Parity Archive
 +# From: Daniel van Eeden <daniel_e@dds.nl>
-+0	string	PAR2	Parity Archive Volume Set
++0	string	PAR2		Parity Archive Volume Set

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

@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-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-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
+diff -Naur file-4.21.orig/magic/Magdir/console file-4.21/magic/Magdir/console
+--- file-4.21.orig/magic/Magdir/console	2007-03-18 21:45:28.000000000 +0000
++++ file-4.21/magic/Magdir/console	2007-06-01 18:51:01.000000000 +0000
+@@ -191,3 +191,8 @@
+ 0	string	PPF10			Playstation Patch File version 1.0
+ >5	byte	0			\b, Simple Encoding
+ >6	string	x			\b, description: %s
 +
 +# Type: scummVM savegame files
 +# From: Sven Hartge <debian@ds9.argh.org>

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

@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-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-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
+diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
+--- file-4.21.orig/magic/Magdir/revision	2007-04-09 16:33:07.000000000 +0000
++++ file-4.21/magic/Magdir/revision	2007-06-01 18:52:52.000000000 +0000
+@@ -7,3 +7,8 @@
+ # Conary changesets
+ # From: Jonathan Smith <smithj@rpath.com>
+ 0	belong	0xea3f81bb	Conary changeset data
 +
 +# Type: Subversion (SVN) dumps
 +# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>

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

@@ -6,13 +6,13 @@
 
 @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 @@
+diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
+--- file-4.21.orig/magic/Magdir/audio	2007-06-01 18:56:31.000000000 +0000
++++ file-4.21/magic/Magdir/audio	2007-06-01 18:57:19.000000000 +0000
+@@ -568,3 +568,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)
+ 0	string	#!AMR		Adaptive Multi-Rate Codec (GSM telephony)
 +
 +# Type: SuperCollider 3 Synth Definition File Format
 +# From: Mario Lang <mlang@debian.org>

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

@@ -5,14 +5,13 @@
 
 @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
-+
+diff -Naur file-4.21.orig/magic/Magdir/linux file-4.21/magic/Magdir/linux
+--- file-4.21.orig/magic/Magdir/linux	2007-04-23 14:32:39.000000000 +0000
++++ file-4.21/magic/Magdir/linux	2007-06-01 19:00:29.000000000 +0000
+@@ -246,3 +246,9 @@
+ >72	string	x		%s]
+ >168	string	x		UUID: %s
+ 
 +# Type: Xen, the virtual machine monitor
 +# From: Radek Vokal <rvokal@redhat.com>
 +0	string		LinuxGuestRecord	Xen saved domain

debian/patches/905-file-segfault.dpatch

@@ -5,17 +5,6 @@
 
 @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

debian/patches/999-conglomeration.dpatch

@@ -5,21 +5,20 @@
 
 @DPATCH@
 
-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-03-27 12:23:14.000000000 +0000
-@@ -156,9 +156,7 @@
- 
+diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
+--- file-4.21.orig/magic/magic.mime	2007-06-01 19:04:43.000000000 +0000
++++ file-4.21/magic/magic.mime	2007-06-01 19:18:52.000000000 +0000
+@@ -157,8 +157,7 @@
  # Creative Labs AUDIO stuff
  #					Standard MIDI data
--0	string	MThd			audio/unknown
+ 0	string	MThd			audio/unknown
 -#>9 	byte	>0			(format %d)
 -#>11	byte	>1			using %d channels
 +0	string	MThd			audio/midi
  #					Creative Music (CMF) data
  0	string	CTMF			audio/unknown
  #					SoundBlaster instrument data
-@@ -273,7 +271,7 @@
+@@ -273,7 +272,7 @@
  0       string          #!/usr/bin/awk          application/x-awk
  0       string          #!\ /usr/bin/awk        application/x-awk
  # update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
@@ -28,7 +27,7 @@ diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
  
  # For Larry Wall's perl language.  The ``eval'' line recognizes an
  # outrageously clever hack for USG systems.
-@@ -298,7 +296,7 @@
+@@ -306,7 +305,7 @@
  # because it tries to uncompress it to figure out what's inside.
  
  # standard unix compress
@@ -37,7 +36,7 @@ diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
  
  # gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
  0       string          \037\213        application/x-gzip
-@@ -400,18 +398,15 @@
+@@ -408,18 +407,14 @@
  #------------------------------------------------------------------------------
  # html:  file(1) magic for HTML (HyperText Markup Language) docs
  #
@@ -50,20 +49,20 @@ diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
 -0	string		\<title	text/html
 -0       string          \<html	text/html
 -0       string          \<HTML	text/html
-+0	string/cB	\<!DOCTYPE\ html	text/html
-+0	string/cb	\<head	text/html
-+0	string/cb	\<title	text/html
-+0       string/bc	\<html	text/html
- 0	string		\<!--	text/html
+-0	string		\<!--	text/html
 -0	string		\<h1	text/html
 -0	string		\<H1	text/html
 -0	string/c	\<!doctype\ html	text/html
-+0	string/c	\<h1	text/html
-+
++0	string/cB	\<!DOCTYPE\ html	text/html
++0	string/cb	\<head			text/html
++0	string/cb	\<title			text/html
++0	string/bc	\<html			text/html
++0	string		\<!--			text/html
++0	string/c	\<h1			text/html
  
  #------------------------------------------------------------------------------
  # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
-@@ -474,7 +469,7 @@
+@@ -482,7 +477,7 @@
  0	beshort		0xffd8		image/jpeg
  
  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
@@ -72,7 +71,7 @@ diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
  #>14	byte		12		(OS/2 1.x format)
  #>14	byte		64		(OS/2 2.x format)
  #>14	byte		40		(Windows 3.x format)
-@@ -706,8 +701,10 @@
+@@ -720,8 +715,10 @@
  #------------------------------------------------------------------------------
  # Hierarchical Data Format, used to facilitate scientific data exchange
  # specifications at http://hdf.ncsa.uiuc.edu/
@@ -85,7 +84,7 @@ diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
  
  # Adobe Photoshop
  0	string		8BPS			image/x-photoshop
-@@ -777,21 +774,25 @@
+@@ -791,21 +788,26 @@
  # Debian has entries for the old PGP formats:
  # pgp:  file(1) magic for Pretty Good Privacy
  # see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html
@@ -100,43 +99,42 @@ diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
 ->15     string          PGP\040SIGNATURE-       signature
 -0       beshort         0x8501                  data
 +#text/PGP key public ring
-+0	beshort		0x9900			application/pgp
++0	beshort		0x9900		application/pgp
 +#text/PGP key security ring
-+0	beshort		0x9501			application/pgp
++0	beshort		0x9501		application/pgp
 +#text/PGP key security ring
-+0	beshort		0x9500			application/pgp
++0	beshort		0x9500		application/pgp
 +#text/PGP encrypted data
-+0	beshort		0xa600			application/pgp-encrypted
++0	beshort		0xa600		application/pgp-encrypted
 +#text/PGP armored data
 +##public key block
 +2	string	---BEGIN\ PGP\ PUBLIC\ KEY\ BLOCK-	application/pgp-keys
-+0	string	-----BEGIN\040PGP\40MESSAGE-			application/pgp
-+0	string	-----BEGIN\040PGP\40SIGNATURE-			application/pgp-signature
++0	string	-----BEGIN\040PGP\40MESSAGE-		application/pgp
++0	string	-----BEGIN\040PGP\40SIGNATURE-		application/pgp-signature
  #
  # GnuPG Magic:
--#
+ #
 -0       beshort         0x9901                  text/GnuPG key public ring
 -0       beshort         0x8501                  text/OpenPGP data
 +#text/GnuPG key public ring
-+0	beshort		0x9901			application/pgp
++0	beshort		0x9901		application/pgp
 +#text/OpenPGP data
-+0	beshort		0x8501			application/pgp-encrypted	
++0	beshort		0x8501		application/pgp-encrypted
  
  # flash:        file(1) magic for Macromedia Flash file format
  #
-@@ -951,3 +952,9 @@
- 
- # 
- 128	string		DICM		application/dicom
+@@ -969,3 +971,8 @@
+ # Symbian installation files
+ 8	lelong	0x10000419	application/vnd.symbian.install
+ 0	lelong	0x10201A7A	x-epoc/x-sisx-app
 +
 +# Gnumeric spreadsheet
 +# This entry is only semi-helpful, as Gnumeric compresses its files, so
 +# they will ordinarily reported as "compressed", but at least -z helps
-+39      string          =<gmr:Workbook           application/x-gnumeric
-+
-diff -Naur file-4.20.orig/src/file.c file-4.20/src/file.c
---- file-4.20.orig/src/file.c	2007-01-25 21:05:46.000000000 +0000
-+++ file-4.20/src/file.c	2007-03-27 12:23:14.000000000 +0000
++39	string	=<gmr:Workbook	application/x-gnumeric
+diff -Naur file-4.21.orig/src/file.c file-4.21/src/file.c
+--- file-4.21.orig/src/file.c	2007-05-08 14:44:18.000000000 +0000
++++ file-4.21/src/file.c	2007-06-01 19:19:33.000000000 +0000
 @@ -352,7 +352,7 @@
  	}
  
@@ -146,9 +144,9 @@ diff -Naur file-4.20.orig/src/file.c file-4.20/src/file.c
  }
  
  
-diff -Naur file-4.20.orig/src/fsmagic.c file-4.20/src/fsmagic.c
---- file-4.20.orig/src/fsmagic.c	2007-01-12 17:40:53.000000000 +0000
-+++ file-4.20/src/fsmagic.c	2007-03-27 12:23:14.000000000 +0000
+diff -Naur file-4.21.orig/src/fsmagic.c file-4.21/src/fsmagic.c
+--- file-4.21.orig/src/fsmagic.c	2007-01-12 17:40:53.000000000 +0000
++++ file-4.21/src/fsmagic.c	2007-06-01 19:19:33.000000000 +0000
 @@ -92,7 +92,8 @@
  		if (file_printf(ms, "cannot open `%s' (%s)",
  		    fn, strerror(errno)) == -1)

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

@@ -1,37 +0,0 @@
-#!/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;