Import Debian version 4.25-1

debian/patches/00list

@@ -1,4 +1,3 @@
-201-magic-update-mp3.dpatch
 202-magic-update-awk.dpatch
 203-magic-update-reiserfs.dpatch
 204-magic-update-asf.dpatch
@@ -10,6 +9,9 @@
 210-magic-update-digifax.dpatch
 211-magic-update-mono.dpatch
 212-magic-update-pfm.dpatch
+213-magic-update-ocaml.dpatch
+214-magic-update-linuxswap.dpatch
+215-magic-update-linuxext.dpatch
 320-magic-add-par2.dpatch
 321-magic-add-pe5.dpatch
 322-magic-add-pmenu.dpatch
@@ -34,8 +36,6 @@
 901-file-mgc.dpatch
 903-file-localmagic.dpatch
 904-file-make.dpatch
-905-file-printf.dpatch
 906-file-hurd.dpatch
-907-file-funcs.dpatch
 998-doc-manpages.dpatch
 999-conglomeration.dpatch

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

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 201-magic-update-mp3.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Fixes regressions with mp3 files (Closes: #480683, #481377).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/animation file-4.24/magic/Magdir/animation
---- file-4.24.orig/magic/Magdir/animation	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/magic/Magdir/animation	2008-05-21 09:23:29.000000000 +0000
-@@ -276,7 +276,7 @@
- # modified by Joerg Jenderek
- # GRR the original test are too common for many DOS files
- # so don't accept as MP3 until we've tested the rate
--0       beshort&0xFFFE
-+0	beshort&0xFFFE 0xFFFA
- # rates
- >2      byte&0xF0       0x10           MPEG ADTS, layer III, v1,  32 kbps
- !:mime	audio/mpeg

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

@@ -6,14 +6,14 @@
 @DPATCH@
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-06-13 09:30:59.000000000 +0200
-+++ file/magic/Magdir/commands	2008-06-13 09:31:50.000000000 +0200
+--- file.orig/magic/Magdir/commands	2008-04-16 12:28:04.000000000 +0000
++++ file/magic/Magdir/commands	2008-07-15 13:28:19.000000000 +0000
 @@ -12,6 +12,8 @@
- !:mime	application/x-shellscript
+ !:mime	text/x-shellscript
  0	string/b 	#!\ /bin/tcsh		Tenex C shell script text executable
- !:mime	application/x-shellscript
+ !:mime	text/x-shellscript
 +0	string/b	#!\ /usr/bin/tcsh	Tenex C shell script text executable
-+!:mime application/x-shellscript
++!:mime	text/x-shellscript
  0	string/b 	#!\ /usr/local/tcsh	Tenex C shell script text executable
- !:mime	application/x-shellscript
+ !:mime	text/x-shellscript
  0	string/b	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable

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

@@ -6,16 +6,16 @@
 @DPATCH@
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-06-13 14:56:16.000000000 +0200
-+++ file/magic/Magdir/commands	2008-06-13 14:57:49.000000000 +0200
-@@ -59,6 +59,10 @@
+--- file.orig/magic/Magdir/commands	2008-07-15 13:31:02.000000000 +0000
++++ file/magic/Magdir/commands	2008-07-15 13:30:55.000000000 +0000
+@@ -58,6 +58,10 @@ o	string/b	#!\ /usr/bin/tcsh	Tenex C she
  # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
  0	string/b	#!\ /bin/bash	Bourne-Again shell script text executable
- !:mime	application/x-shellscript
+ !:mime	text/x-shellscript
 +0	string/b	#!\ /usr/bin/bash	Bourne-Again shell script text executable
-+!:mime	application/x-shellscript
++!:mime text/x-shellscript
 +0	string/b	#!\ /usr/local/bash	Bourne-Again shell script text executable
-+!:mime	application/x-shellscript
++!:mime text/x-shellscript
  0	string/b	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
- !:mime	application/x-shellscript
+ !:mime	text/x-shellscript
  

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

@@ -6,9 +6,9 @@
 @DPATCH@
 
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
---- file.orig/magic/Magdir/msdos	2008-06-13 15:23:32.000000000 +0200
-+++ file/magic/Magdir/msdos	2008-06-13 15:28:28.000000000 +0200
-@@ -65,6 +65,7 @@
+--- file.orig/magic/Magdir/msdos	2008-07-02 15:16:52.000000000 +0000
++++ file/magic/Magdir/msdos	2008-07-15 13:33:43.000000000 +0000
+@@ -68,6 +68,7 @@
  >>&0	leshort		0x290	PA-RISC
  >>&18	leshort&0x0100	>0	32-bit
  >>&18	leshort&0x1000	>0	system file
@@ -16,12 +16,3 @@ diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
  >>&0xf4 search/0x140 \x0\x40\x1\x0
  >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive
  >30		string	Copyright\ 1989-1990\ PKWARE\ Inc.	Self-extracting PKZIP archive
-@@ -94,7 +95,7 @@
- >>>>(0x3c.l+4)	leshort		0x290	PA-RISC
- >>>>(0x3c.l+22)	leshort&0x0100	>0	32-bit
- >>>>(0x3c.l+22)	leshort&0x1000	>0	system file
-->>>>(0x3c.l+232)	lelong	>0	Mono/.Net assembly
-+>>>>(0x3c.l+232)	lelong	>0	\b, Mono/.Net assembly
- 
- >>>>(0x3c.l+0xf8)	string		UPX0 \b, UPX compressed
- >>>>(0x3c.l+0xf8)	search/0x140	PEC2 \b, PECompact2 compressed

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

@@ -6,10 +6,10 @@
 @DPATCH@
 
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
---- file.orig/magic/Magdir/msdos	2008-06-13 15:28:28.000000000 +0200
-+++ file/magic/Magdir/msdos	2008-06-13 15:32:04.000000000 +0200
+--- file.orig/magic/Magdir/msdos	2008-07-02 15:16:52.000000000 +0000
++++ file/magic/Magdir/msdos	2008-07-15 13:36:26.000000000 +0000
 @@ -504,6 +504,13 @@
- # Acroread or something  files wrongly identified as G3  .pfm
+ # Acroread or something	 files wrongly identified as G3	 .pfm
  # these have the form \000 \001 any? \002 \000 \000
  # or \000 \001 any? \022 \000 \000
 +0	belong&0xffff00ff	0x00010012	PFM data
@@ -19,6 +19,6 @@ diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
 +0	belong&0xffff00ff	0x00010002	PFM data
 +>4	string			\000\000
 +>6	string			>\060		- %s
- #0	string  \000\001 pfm?
- #>3	string  \022\000\000Copyright\  yes
- #>3	string  \002\000\000Copyright\  yes
+ #0	string	\000\001 pfm?
+ #>3	string	\022\000\000Copyright\	yes
+ #>3	string	\002\000\000Copyright\	yes

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

@@ -0,0 +1,25 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 213-magic-update-ocaml.dpatch by Eric Cooper <ecc@cmu.edu>
+##
+## DP: Update ocaml magic (Closes: #488992).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/ocaml file/magic/Magdir/ocaml
+--- file.orig/magic/Magdir/ocaml	2008-07-15 14:13:20.000000000 +0000
++++ file/magic/Magdir/ocaml	2008-07-15 14:13:08.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ #------------------------------------------------------------------------------
+ # ocaml: file(1) magic for Objective Caml files.
+-0	string	Caml1999	Objective caml
++0	string	Caml1999	OCaml
+ >8	string	X		exec file
+ >8	string	I		interface file (.cmi)
+ >8	string	O		object file (.cmo)
+@@ -10,4 +10,4 @@
+ >8	string	Z		native library file (.cmxa)
+ >8	string	M		abstract syntax tree implementation file
+ >8	string	N		abstract syntax tree interface file
+->9	string	>\0		(Version %3.3s).
++>9	string	>\0		(Version %3.3s)

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

@@ -0,0 +1,35 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 214-magic-update-linuxswap.dpatch by Russell Coker <russell@coker.com.au>
+##
+## DP: Adding volume label and UUID support for linux swap (Closes: #489865).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
+--- file.orig/magic/Magdir/linux	2008-06-04 18:02:25.000000000 +0000
++++ file/magic/Magdir/linux	2008-07-15 14:16:43.000000000 +0000
+@@ -56,11 +56,19 @@
+ # Linux swap file with swsusp1 image, from Jeff Bailey <jbailey@ubuntu.com>
+ 4076	string		SWAPSPACE2S1SUSPEND	Linux/i386 swap file (new style) with SWSUSP1 image
+ # according to man page of mkswap (8) March 1999
+-4086	string		SWAPSPACE2	Linux/i386 swap file (new style)
+->0x400	long		x		%d (4K pages)
+->0x404	long		x		size %d pages
+->>4086	string		SWAPSPACE2	
+->>>1052	string		>\0		Label %s
++# volume label and UUID Russell Coker
++# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
++4086	string		SWAPSPACE2	Linux/i386 swap file (new style),
++>0x400	long		x		version %d (4K pages),
++>0x404	long		x		size %d pages,
++>1052	string		\0		no label,
++>1052	string		>\0		LABEL=%s,
++>0x40c	belong		x		UUID=%x
++>0x410	beshort		x		\b-%x
++>0x412	beshort		x		\b-%x
++>0x414	beshort		x		\b-%x
++>0x416	belong		x		\b-%x
++>0x41a	beshort		x		\b%x
+ # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
+ #
+ #	from Erik Troan (ewt@redhat.com) examining od dumps, so this

debian/patches/215-magic-update-linuxext.dpatch

@@ -0,0 +1,68 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 215-magic-update-linuxext.dpatch by Russell Coker <russell@coker.com.au>
+##
+## DP: Adding volume label and UUID support for linux ext (Closes: #489865).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems	2008-07-02 13:47:23.000000000 +0000
++++ file/magic/Magdir/filesystems	2008-07-15 14:21:39.000000000 +0000
+@@ -1027,6 +1027,8 @@
+ 
+ # ext2/ext3 filesystems - Andreas Dilger <adilger@dilger.ca>
+ # ext4 filesystem - Eric Sandeen <sandeen@sandeen.net>
++# volume label and UUID Russell Coker
++# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
+ 0x438   leshort         0xEF53          Linux
+ >0x44c  lelong          x               rev %d
+ >0x43e  leshort         x               \b.%d
+@@ -1042,25 +1044,32 @@
+ #   else large RO_COMPAT?
+ >>>0x464 lelong         >0x0000007      ext4 filesystem data
+ #  else large INCOMPAT?
+->>0x460 lelong          >0x000003f      ext4 filesystem data
++>>0x460	lelong          >0x000003f      ext4 filesystem data
++>0x468	belong		x		\b, UUID=%x
++>0x46c	beshort		x		\b-%x
++>0x46e	beshort		x		\b-%x
++>0x470	beshort		x		\b-%x
++>0x472	belong		x		\b-%x
++>0x476	beshort		x		\b%x
++>0x478	string		>0		\b, volume name "%s"
+ # General flags for any ext* fs
+->0x460  lelong          &0x0000004      (needs journal recovery)
+->0x43a  leshort         &0x0000002      (errors)
++>0x460	lelong          &0x0000004      (needs journal recovery)
++>0x43a	leshort         &0x0000002      (errors)
+ # INCOMPAT flags
+->0x460  lelong          &0x0000001      (compressed)
+-#>0x460 lelong          &0x0000002      (filetype)
+-#>0x460 lelong          &0x0000010      (meta bg)
+->0x460  lelong          &0x0000040      (extents)
+->0x460  lelong          &0x0000080      (64bit)
+-#>0x460 lelong          &0x0000100      (mmp)
+-#>0x460 lelong          &0x0000200      (flex bg)
++>0x460	lelong          &0x0000001      (compressed)
++#>0x460	lelong          &0x0000002      (filetype)
++#>0x460	lelong          &0x0000010      (meta bg)
++>0x460	lelong          &0x0000040      (extents)
++>0x460	lelong          &0x0000080      (64bit)
++#>0x460	lelong          &0x0000100      (mmp)
++#>0x460	lelong          &0x0000200      (flex bg)
+ # RO_INCOMPAT flags
+-#>0x464 lelong          &0x0000001      (sparse super)
+->0x464  lelong          &0x0000002      (large files)
+->0x464  lelong          &0x0000008      (huge files)
+-#>0x464 lelong          &0x0000010      (gdt checksum)
+-#>0x464 lelong          &0x0000020      (many subdirs)
+-#>0x463 lelong          &0x0000040      (extra isize)
++#>0x464	lelong          &0x0000001      (sparse super)
++>0x464	lelong          &0x0000002      (large files)
++>0x464	lelong          &0x0000008      (huge files)
++#>0x464	lelong          &0x0000010      (gdt checksum)
++#>0x464	lelong          &0x0000020      (many subdirs)
++#>0x463	lelong          &0x0000040      (extra isize)
+ 
+ # SGI disk labels - Nathan Scott <nathans@debian.org>
+ 0	belong		0x0BE5A941	SGI disk label (volume header)

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

@@ -5,15 +5,15 @@
 
 @DPATCH@
 
-diff -Naurp file-4.24.orig/magic/Magdir/images file-4.24/magic/Magdir/images
---- file-4.24.orig/magic/Magdir/images	2008-03-07 14:58:54.000000000 +0000
-+++ file-4.24/magic/Magdir/images	2008-04-07 08:07:42.000000000 +0000
-@@ -588,3 +588,8 @@
- 0	string	\xed\xfe\xda\xbe	Cytovision FLEX file
- 0	string	\xed\xab\xed\xfe	Cytovision FLEX file
- 0	string	\xad\xfd\xea\xad	Cytovision RATS file
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2008-07-02 15:16:52.000000000 +0000
++++ file/magic/Magdir/images	2008-07-15 13:39:37.000000000 +0000
+@@ -600,3 +600,8 @@
+ # Wavelet Scalar Quantization format used in gray-scale fingerprint images
+ # From Tano M Fotang <mfotang@quanteq.com>
+ 0	string	\xff\xa0\xff\xa8\x00	Wavelet Scalar Quantization image data
 +
-+# Type: Ulead Photo Explorer5 (.pe5)
-+# URL:  http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
-+# From: Simon Horman <horms@debian.org>
++# Type:	Ulead Photo Explorer5 (.pe5)
++# URL:	http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
++# From:	Simon Horman <horms@debian.org>
 +0	string	IIO2H	Ulead Photo Explorer5

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

@@ -5,18 +5,16 @@
 
 @DPATCH@
 
-diff -Naurp file-4.24.orig/magic/Magdir/games file-4.24/magic/Magdir/games
---- file-4.24.orig/magic/Magdir/games	2008-02-19 17:27:30.000000000 +0000
-+++ file-4.24/magic/Magdir/games	2008-04-07 08:09:12.000000000 +0000
-@@ -151,3 +151,16 @@
- >4	lelong	x		containing %d lumps
- 0	string	=PWAD		doom patch PWAD data
- >4	lelong	x		containing %d lumps
-+
-+# Type: SGF Smart Game Format
-+# URL:  http://www.red-bean.com/sgf/
-+# From: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
-+
+diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
+--- file.orig/magic/Magdir/games	2008-04-23 19:00:59.000000000 +0000
++++ file/magic/Magdir/games	2008-07-15 13:41:19.000000000 +0000
+@@ -243,3 +243,14 @@
+ >&0		string		n\ 					NetImmerse game engine file
+ >>&0		regex		[0-9a-z.]+				\b, version %s
+ 
++# Type:	SGF Smart Game Format
++# URL:	http://www.red-bean.com/sgf/
++# From:	Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
 +2	regex/c	\\(;.*GM\\[[0-9]{1,2}\\]	Smart Game Format
 +>2	regex/c	GM\\[1\\]			- Go Game
 +>2	regex/c	GM\\[6\\]			- BackGammon Game

debian/patches/338-magic-add-cromfs.dpatch

@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-diff -Naurp file-4.24.orig/magic/Magdir/filesystems file-4.24/magic/Magdir/filesystems
---- file-4.24.orig/magic/Magdir/filesystems	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/magic/Magdir/filesystems	2008-05-21 09:40:38.000000000 +0000
-@@ -1289,3 +1289,15 @@
- # really le32 operation,destination,payloadsize (but quite predictable)
- # 01 00 00 00 00 00 00 c0 00 02 00 00
- 0	string		\1\0\0\0\0\0\0\300\0\2\0\0	Marvell Libertas firmware
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems	2008-07-02 13:47:23.000000000 +0000
++++ file/magic/Magdir/filesystems	2008-07-15 13:43:26.000000000 +0000
+@@ -1327,3 +1327,15 @@
+ # dvdisaster's .ecc
+ # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
+ 0	string	*dvdisaster*	dvdisaster error correction file
 +
 +# Type:	CROM filesystem
 +# From:	Werner Fink <werner@suse.de>

debian/patches/901-file-mgc.dpatch

@@ -7,9 +7,9 @@
 @DPATCH@
 
 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
---- file.orig/magic/Makefile.am	2008-07-01 18:24:19.000000000 +0200
-+++ file/magic/Makefile.am	2008-07-01 18:24:26.000000000 +0200
-@@ -1,7 +1,7 @@
+--- file.orig/magic/Makefile.am	2008-06-17 17:49:11.000000000 +0000
++++ file/magic/Makefile.am	2008-07-15 13:49:08.000000000 +0000
+@@ -4,7 +4,7 @@
  MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
  
@@ -18,7 +18,7 @@ diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
  
  EXTRA_DIST = Header Localstuff \
  $(MAGIC_FRAGMENT_DIR)/acorn \
-@@ -210,8 +210,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
+@@ -216,8 +216,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
  $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
@@ -40,12 +40,12 @@ diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
  
  # FIXME: Build file natively as well so that it can be used to compile
  # the target's magic file
-@@ -221,6 +233,5 @@ else
- FILE_COMPILE = $(top_builddir)/src/file
+@@ -229,6 +241,5 @@ FILE_COMPILE = $(top_builddir)/src/file
+ FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
--${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE)
+-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
 -	$(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
 -	@mv $(MAGIC_FRAGMENT_BASE).mgc $@
-+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE) $(RAW)
++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
 +	$(FILE_COMPILE) -C -m $(RAW)

debian/patches/903-file-localmagic.dpatch

@@ -6,9 +6,9 @@
 
 @DPATCH@
 
-diff -Naurp file-4.24.orig/magic/Header file-4.24/magic/Header
---- file-4.24.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
-+++ file-4.24/magic/Header	2008-04-07 08:17:11.000000000 +0000
+diff -Naurp file.orig/magic/Header file/magic/Header
+--- file.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
++++ file/magic/Header	2008-07-15 13:51:04.000000000 +0000
 @@ -1,5 +1,5 @@
 -# Magic
  # Magic data for file(1) command.
@@ -19,34 +19,34 @@ diff -Naurp file-4.24.orig/magic/Header file-4.24/magic/Header
 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
 +# this file as a wishlist bug against file (using the reportbug utility).
 +
-diff -Naurp file-4.24.orig/magic/magic.local file-4.24/magic/magic.local
---- file-4.24.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.24/magic/magic.local	2008-04-07 08:17:11.000000000 +0000
+diff -Naurp file.orig/magic/magic.local file/magic/magic.local
+--- file.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
++++ file/magic/magic.local	2008-07-15 13:51:04.000000000 +0000
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
-diff -Naurp file-4.24.orig/src/Makefile.am file-4.24/src/Makefile.am
---- file-4.24.orig/src/Makefile.am	2008-02-24 01:33:05.000000000 +0000
-+++ file-4.24/src/Makefile.am	2008-04-07 08:16:39.000000000 +0000
-@@ -5,7 +5,7 @@ EXTRA_DIST = getopt_long.c
+diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
+--- file.orig/src/Makefile.am	2008-05-09 14:12:55.000000000 +0000
++++ file/src/Makefile.am	2008-07-15 13:51:37.000000000 +0000
+@@ -4,7 +4,7 @@ include_HEADERS = magic.h
  
  bin_PROGRAMS = file
  
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- 
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
- 	compress.c is_tar.c readelf.c print.c fsmagic.c \
-diff -Naurp file-4.24.orig/src/Makefile.in file-4.24/src/Makefile.in
---- file-4.24.orig/src/Makefile.in	2008-03-22 21:40:13.000000000 +0000
-+++ file-4.24/src/Makefile.in	2008-04-07 08:16:47.000000000 +0000
-@@ -198,7 +198,7 @@ MAGIC = $(pkgdatadir)/magic
+ AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
+     -Wmissing-declarations -Wredundant-decls -Wnested-externs \
+     -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
+diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
+--- file.orig/src/Makefile.in	2008-07-02 15:24:28.000000000 +0000
++++ file/src/Makefile.in	2008-07-15 13:52:00.000000000 +0000
+@@ -197,7 +197,7 @@ top_srcdir = @top_srcdir@
+ MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
- EXTRA_DIST = getopt_long.c
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
- 	compress.c is_tar.c readelf.c print.c fsmagic.c \
- 	funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c \
+ AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
+     -Wmissing-declarations -Wredundant-decls -Wnested-externs \
+     -Wsign-compare -Wreturn-type -Wswitch -Wshadow \

debian/patches/905-file-printf.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 905-file-printf.dpatch by Martin Dorey <mdorey@bluearc.com>
-##
-## DP: Removing annoying warnings when files can't be opened (Closes: #481512).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/src/magic.c file-4.24/src/magic.c
---- file-4.24.orig/src/magic.c	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/src/magic.c	2008-05-21 08:47:05.000000000 +0000
-@@ -302,7 +302,6 @@ file_or_fd(struct magic_set *ms, const c
- 			(void)strcat(strcpy(tmp, inname), ".exe");
- 			if ((fd = open(tmp, flags)) < 0) {
- #endif
--				fprintf(stderr, "couldn't open file\n");
- 				if (info_from_stat(ms, sb.st_mode) == -1)
- 					goto done;
- 				rv = 0;

debian/patches/907-file-funcs.dpatch

@@ -1,58 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 907-file-funcs.dpatch by Martin Dorey <mdorey@bluearc.com>
-##
-## DP: Fixing regression in file 4.24 with file_printf(); (Closes: #481523).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/src/funcs.c file-4.24/src/funcs.c
---- file-4.24.orig/src/funcs.c	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/src/funcs.c	2008-05-21 08:54:06.000000000 +0000
-@@ -45,18 +45,15 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.39 20
-  * Like printf, only we append to a buffer.
-  */
- protected int
--file_printf(struct magic_set *ms, const char *fmt, ...)
-+file_vprintf(struct magic_set *ms, const char *fmt, va_list ap)
- {
--	va_list ap;
- 	size_t size;
- 	int len;
- 	char *buf, *newstr;
- 
--	va_start(ap, fmt);
- 	len = vasprintf(&buf, fmt, ap);
- 	if (len < 0)
- 		goto out;
--	va_end(ap);
- 
- 	if (ms->o.buf != NULL) {
- 		len = asprintf(&newstr, "%s%s", ms->o.buf, buf);
-@@ -73,6 +70,18 @@ out:
- 	return -1;
- }
- 
-+protected int
-+file_printf(struct magic_set *ms, const char *fmt, ...)
-+{
-+	va_list ap;
-+	int len;
-+
-+	va_start(ap, fmt);
-+	len = file_vprintf(ms, fmt, ap);
-+	va_end(ap);
-+	return len;
-+}
-+
- /*
-  * error - print best error message possible
-  */
-@@ -89,7 +98,7 @@ file_error_core(struct magic_set *ms, in
- 		ms->o.buf = NULL;
- 		file_printf(ms, "line %u: ", lineno);
- 	}
--        file_printf(ms, f, va);
-+	file_vprintf(ms, f, va);
- 	if (error > 0)
- 		file_printf(ms, " (%s)", strerror(error));
- 	ms->haderr++;