]> git.pld-linux.org Git - packages/file.git/blame - file-debian.patch
projects / packages / file.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to file-5.01
[packages/file.git] / file-debian.patch
CommitLineData
49c71311
AG		 1Author: Daniel Baumann <daniel@debian.org>
2Description: Addding mime to asf magic.
2507d101 3
49c71311
AG		 4diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
5--- file.orig/magic/Magdir/animation 2008-11-07 22:49:20.000000000 +0000
6+++ file/magic/Magdir/animation 2009-02-18 11:57:43.000000000 +0000
7@@ -697,6 +697,7 @@
8
9 # Microsoft Advanced Streaming Format (ASF) <mpruett@sgi.com>
10 0 belong 0x3026b275 Microsoft ASF
11+!:mime video/x-ms-asf
12
13 # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
14 0 string \x8aMNG MNG video data,
15Author: Werner Fink <werner@suse.de>
16Description: Updates (and re-enables) awk magic.
2507d101 17
49c71311
AG		 18diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
19--- file.orig/magic/Magdir/commands 2008-05-04 14:12:49.000000000 +0000
20+++ file/magic/Magdir/commands 2008-05-21 09:36:15.000000000 +0000
65ee9ebf
AM		 21@@ -49,6 +49,7 @@
22 # update to distinguish from *.vcf files
23 # this is broken because postscript has /EBEGIN{ for example.
24 #0 search/Bb BEGIN { awk script text
25+0 regex =^\\s*BEGIN\\s*[{] awk script text
b04ec308 26
65ee9ebf
AM		 27 # AT&T Bell Labs' Plan 9 shell
28 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable
49c71311
AG		 29Author: Daniel Baumann <daniel@debian.org>
30Description: Adding another shebang path for bash.
65ee9ebf 31
49c71311
AG		 32diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
33--- file.orig/magic/Magdir/commands 2008-04-16 12:28:04.000000000 +0000
34+++ file/magic/Magdir/commands 2009-02-18 11:58:44.000000000 +0000
35@@ -56,6 +56,10 @@
36 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
37 0 string/b #!\ /bin/bash Bourne-Again shell script text executable
38 !:mime text/x-shellscript
39+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable
40+!:mime text/x-shellscript
41+0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable
42+!:mime text/x-shellscript
43 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable
44 !:mime text/x-shellscript
45
46Author: Werner Fink <werner@suse.de>
47Description: Updating reiserfs magic to detect ReiserFS V3.6.19.
65ee9ebf 48
49c71311
AG		 49diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
50--- file.orig/magic/Magdir/filesystems 2008-05-04 14:12:49.000000000 +0000
51+++ file/magic/Magdir/filesystems 2008-05-21 09:43:04.000000000 +0000
65ee9ebf
AM		 52@@ -1178,6 +1178,7 @@
53 # reiserfs - russell@coker.com.au
54 0x10034 string ReIsErFs ReiserFS V3.5
55 0x10034 string ReIsEr2Fs ReiserFS V3.6
56+0x10034 string ReIsEr3Fs ReiserFS V3.6.19
57 >0x1002c leshort x block size %d
58 >0x10032 leshort &2 (mounted or unclean)
59 >0x10000 lelong x num blocks %d
49c71311
AG		 60Author: Daniel Baumann <daniel@debian.org>
61Description: Addding another shebang path for tcsh.
65ee9ebf
AM		 62
63diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
64--- file.orig/magic/Magdir/commands 2008-04-16 12:28:04.000000000 +0000
65+++ file/magic/Magdir/commands 2008-07-15 13:28:19.000000000 +0000
66@@ -12,6 +12,8 @@
67 !:mime text/x-shellscript
68 0 string/b #!\ /bin/tcsh Tenex C shell script text executable
69 !:mime text/x-shellscript
70+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable
71+!:mime text/x-shellscript
72 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable
73 !:mime text/x-shellscript
74 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable
49c71311
AG		 75Author: n/a
76Description: Updating zip magic.
65ee9ebf
AM		 77
78diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
79--- file.orig/magic/Magdir/msdos 2008-05-31 22:17:03.000000000 +0200
80+++ file/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
81@@ -256,7 +256,7 @@
82
83 # a few unknown ZIP sfxes, no idea if they are needed or if they are
84 # already captured by the generic patterns above
85->122 string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive
86+>0x7a string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive
87 >(8.s*16) search/0x20 PKSFX \b, ZIP self-extracting archive (PKZIP)
88 # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive
89 #
49c71311
AG		 90Author: n/a
91Description: Update RealMedia magic.
65ee9ebf
AM		 92
93diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
94--- file.orig/magic/Magdir/audio 2008-05-31 22:17:03.000000000 +0200
95+++ file/magic/Magdir/audio 2008-06-13 09:48:01.000000000 +0200
96@@ -116,7 +116,7 @@
97 # Real Audio (Magic .ra\0375)
98 0 belong 0x2e7261fd RealAudio sound file
99 !:mime audio/x-pn-realaudio
100-0 string .RMF RealMedia file
101+0 string .RMF\0\0\0 RealMedia file
102 !:mime application/vnd.rn-realmedia
103 #video/x-pn-realvideo
104 #video/vnd.rn-realvideo
49c71311
AG		 105Author: n/a
106Description: Updating OS/2 REXX magic.
65ee9ebf
AM		 107
108diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
109--- file.orig/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
110+++ file/magic/Magdir/msdos 2008-06-13 09:51:35.000000000 +0200
111@@ -14,8 +14,10 @@
2507d101 112
65ee9ebf
AM		 113 # OS/2 batch files are REXX. the second regex is a bit generic, oh well
114 # the matched commands seem to be common in REXX and uncommon elsewhere
115-100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
116-100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
117+100 search/0xffff rxfuncadd
118+>100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
119+100 search/0xffff say
120+>100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
121
122 0 leshort 0x14c MS Windows COFF Intel 80386 object file
123 #>4 ledate x stamp %s
49c71311
AG		 124Author: n/a
125Description: Updating Digifax magic.
65ee9ebf 126
b04ec308
JB		 127diff -Naurp file.orig/magic/Magdir/modem file/magic/Magdir/modem
128--- file.orig/magic/Magdir/modem 2008-06-13 15:00:30.000000000 +0200
129+++ file/magic/Magdir/modem 2008-06-13 15:25:40.000000000 +0200
130@@ -2,9 +2,9 @@
131 # modem: file(1) magic for modem programs
2507d101 132 #
b04ec308
JB		 133 # From: Florian La Roche <florian@knorke.saar.de>
134-4 string Research, Digifax-G3-File
135->29 byte 1 , fine resolution
136->29 byte 0 , normal resolution
137+1 string PC\ Research,\ Inc Digifax-G3-File
138+>29 byte 1 \b, fine resolution
139+>29 byte 0 \b, normal resolution
2507d101 140
b04ec308
JB		 141 0 short 0x0100 raw G3 data, byte-padded
142 0 short 0x1400 raw G3 data
49c71311
AG		 143Author: n/a
144Description: Updating Mono magic.
65ee9ebf 145
b04ec308
JB		 146diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
147--- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
148+++ file/magic/Magdir/msdos 2008-07-15 13:33:43.000000000 +0000
149@@ -68,6 +68,7 @@
150 >>&0 leshort 0x290 PA-RISC
151 >>&18 leshort&0x0100 >0 32-bit
152 >>&18 leshort&0x1000 >0 system file
153+>>&228 lelong >0 \b, Mono/.Net assembly
154 >>&0xf4 search/0x140 \x0\x40\x1\x0
155 >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive
156 >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive
49c71311
AG		 157Author: n/a
158Description: Updating pfm magic.
65ee9ebf 159
b04ec308
JB		 160diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
161--- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
162+++ file/magic/Magdir/msdos 2008-07-15 13:36:26.000000000 +0000
163@@ -504,6 +504,13 @@
164 # Acroread or something files wrongly identified as G3 .pfm
165 # these have the form \000 \001 any? \002 \000 \000
166 # or \000 \001 any? \022 \000 \000
167+0 belong&0xffff00ff 0x00010012 PFM data
168+>4 string \000\000
169+>6 string >\060 - %s
170+
171+0 belong&0xffff00ff 0x00010002 PFM data
172+>4 string \000\000
173+>6 string >\060 - %s
174 #0 string \000\001 pfm?
175 #>3 string \022\000\000Copyright\ yes
176 #>3 string \002\000\000Copyright\ yes
49c71311
AG		 177Author: Eric Cooper <ecc@cmu.edu>
178Description: Updating ocaml magic (Closes: #488992).
65ee9ebf
AM		 179
180diff -Naurp file.orig/magic/Magdir/ocaml file/magic/Magdir/ocaml
181--- file.orig/magic/Magdir/ocaml 2008-07-15 14:13:20.000000000 +0000
182+++ file/magic/Magdir/ocaml 2008-07-15 14:13:08.000000000 +0000
183@@ -1,7 +1,7 @@
2507d101 184
65ee9ebf
AM		 185 #------------------------------------------------------------------------------
186 # ocaml: file(1) magic for Objective Caml files.
187-0 string Caml1999 Objective caml
188+0 string Caml1999 OCaml
189 >8 string X exec file
190 >8 string I interface file (.cmi)
191 >8 string O object file (.cmo)
192@@ -10,4 +10,4 @@
193 >8 string Z native library file (.cmxa)
194 >8 string M abstract syntax tree implementation file
195 >8 string N abstract syntax tree interface file
196->9 string >\0 (Version %3.3s).
197+>9 string >\0 (Version %3.3s)
49c71311
AG		 198Author: Russell Coker <russell@coker.com.au>
199Description: Adding volume label and UUID support for linux swap (Closes: #489865).
65ee9ebf 200
b04ec308
JB		 201diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
202--- file.orig/magic/Magdir/linux 2008-06-04 18:02:25.000000000 +0000
203+++ file/magic/Magdir/linux 2008-07-15 14:16:43.000000000 +0000
204@@ -56,11 +56,19 @@
205 # Linux swap file with swsusp1 image, from Jeff Bailey <jbailey@ubuntu.com>
206 4076 string SWAPSPACE2S1SUSPEND Linux/i386 swap file (new style) with SWSUSP1 image
207 # according to man page of mkswap (8) March 1999
208-4086 string SWAPSPACE2 Linux/i386 swap file (new style)
209->0x400 long x %d (4K pages)
210->0x404 long x size %d pages
211->>4086 string SWAPSPACE2
212->>>1052 string >\0 Label %s
213+# volume label and UUID Russell Coker
214+# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
215+4086 string SWAPSPACE2 Linux/i386 swap file (new style),
216+>0x400 long x version %d (4K pages),
217+>0x404 long x size %d pages,
218+>1052 string \0 no label,
219+>1052 string >\0 LABEL=%s,
49c71311
AG		 220+>0x40c belong x UUID=%08x
221+>0x410 beshort x \b-%04x
222+>0x412 beshort x \b-%04x
223+>0x414 beshort x \b-%04x
224+>0x416 belong x \b-%08x
225+>0x41a beshort x \b%04x
b04ec308
JB		 226 # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
227 #
228 # from Erik Troan (ewt@redhat.com) examining od dumps, so this
49c71311
AG		 229Author: Russell Coker <russell@coker.com.au>
230Description: Adding volume label and UUID support for linux ext (Closes: #489865).
65ee9ebf 231
b04ec308
JB		 232diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
233--- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000
234+++ file/magic/Magdir/filesystems 2008-07-15 14:21:39.000000000 +0000
235@@ -1027,6 +1027,8 @@
236
237 # ext2/ext3 filesystems - Andreas Dilger <adilger@dilger.ca>
238 # ext4 filesystem - Eric Sandeen <sandeen@sandeen.net>
239+# volume label and UUID Russell Coker
240+# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
241 0x438 leshort 0xEF53 Linux
242 >0x44c lelong x rev %d
243 >0x43e leshort x \b.%d
244@@ -1042,25 +1044,32 @@
245 # else large RO_COMPAT?
246 >>>0x464 lelong >0x0000007 ext4 filesystem data
247 # else large INCOMPAT?
248->>0x460 lelong >0x000003f ext4 filesystem data
249+>>0x460 lelong >0x000003f ext4 filesystem data
49c71311
AG		 250+>0x468 belong x \b, UUID=%08x
251+>0x46c beshort x \b-%04x
252+>0x46e beshort x \b-%04x
253+>0x470 beshort x \b-%04x
254+>0x472 belong x \b-%08x
255+>0x476 beshort x \b%04x
b04ec308
JB		 256+>0x478 string >0 \b, volume name "%s"
257 # General flags for any ext* fs
258->0x460 lelong &0x0000004 (needs journal recovery)
259->0x43a leshort &0x0000002 (errors)
260+>0x460 lelong &0x0000004 (needs journal recovery)
261+>0x43a leshort &0x0000002 (errors)
262 # INCOMPAT flags
263->0x460 lelong &0x0000001 (compressed)
264-#>0x460 lelong &0x0000002 (filetype)
265-#>0x460 lelong &0x0000010 (meta bg)
266->0x460 lelong &0x0000040 (extents)
267->0x460 lelong &0x0000080 (64bit)
268-#>0x460 lelong &0x0000100 (mmp)
269-#>0x460 lelong &0x0000200 (flex bg)
270+>0x460 lelong &0x0000001 (compressed)
271+#>0x460 lelong &0x0000002 (filetype)
272+#>0x460 lelong &0x0000010 (meta bg)
273+>0x460 lelong &0x0000040 (extents)
274+>0x460 lelong &0x0000080 (64bit)
275+#>0x460 lelong &0x0000100 (mmp)
276+#>0x460 lelong &0x0000200 (flex bg)
277 # RO_INCOMPAT flags
278-#>0x464 lelong &0x0000001 (sparse super)
279->0x464 lelong &0x0000002 (large files)
280->0x464 lelong &0x0000008 (huge files)
281-#>0x464 lelong &0x0000010 (gdt checksum)
282-#>0x464 lelong &0x0000020 (many subdirs)
283-#>0x463 lelong &0x0000040 (extra isize)
284+#>0x464 lelong &0x0000001 (sparse super)
285+>0x464 lelong &0x0000002 (large files)
286+>0x464 lelong &0x0000008 (huge files)
287+#>0x464 lelong &0x0000010 (gdt checksum)
288+#>0x464 lelong &0x0000020 (many subdirs)
289+#>0x463 lelong &0x0000040 (extra isize)
290
291 # SGI disk labels - Nathan Scott <nathans@debian.org>
292 0 belong 0x0BE5A941 SGI disk label (volume header)
49c71311
AG		 293Author: Toeroek Edwin <edwintorok@gmail.com>
294Description: Updating llvm magic (Closes: #505805).
65ee9ebf 295
49c71311
AG		 296diff -Naurp file.orig/magic/Magdir/llvm file/magic/Magdir/llvm
297--- file.orig/magic/Magdir/llvm 2008-10-19 14:31:15.000000000 +0000
298+++ file/magic/Magdir/llvm 2008-11-15 19:15:51.000000000 +0000
299@@ -1,10 +1,12 @@
300
301 #------------------------------------------------------------------------------
302 # llvm: file(1) magic for LLVM byte-codes
303-# URL: http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature
304+# URL: http://llvm.org/docs/BitCodeFormat.html
305 # From: Al Stone <ahs3@fc.hp.com>
306
307 0 string llvm LLVM byte-codes, uncompressed
308 0 string llvc0 LLVM byte-codes, null compression
309 0 string llvc1 LLVM byte-codes, gzip compression
310 0 string llvc2 LLVM byte-codes, bzip2 compression
311+0 string \xde\xc0\x17\x0b LLVM bitcode, wrapper
312+0 string BC\xc0\xde LLVM bitcode
313Author: Daniel Baumann <daniel@debian.org>
314Description: Adding mime entries for ruby (Closes: #502201).
315
316diff -Naurp file.orig/magic/Magdir/ruby file/magic/Magdir/ruby
317--- file.orig/magic/Magdir/ruby 2008-10-19 14:31:15.000000000 +0000
318+++ file/magic/Magdir/ruby 2008-11-15 19:28:44.000000000 +0000
319@@ -5,6 +5,10 @@
320
321 # Ruby scripts
322 0 search/1/b #!\ /usr/bin/ruby Ruby script text executable
323+!:mime application/x-ruby
324 0 search/1/b #!\ /usr/local/bin/ruby Ruby script text executable
325+!:mime application/x-ruby
326 0 search/1 #!/usr/bin/env\ ruby Ruby script text executable
327+!:mime application/x-ruby
328 0 search/1 #!\ /usr/bin/env\ ruby Ruby script text executable
329+!:mime application/x-ruby
330Author: Ori Avtalion <ori@avtalion.name>
331Description: Adding mime entries for gimp (Closes: #501200).
332
333diff -Naurp file.orig/magic/Magdir/gimp file/magic/Magdir/gimp
334--- file.orig/magic/Magdir/gimp 2008-10-19 14:31:15.000000000 +0000
335+++ file/magic/Magdir/gimp 2008-11-15 19:32:22.000000000 +0000
336@@ -10,6 +10,7 @@
337 # ('Bucky' LaDieu, nega@vt.edu)
338
339 0 string gimp\ xcf GIMP XCF image data,
340+!:mime image/x-xcf
341 >9 string file version 0,
342 >9 string v version
343 >>10 string >\0 %s,
344Author: Adam Buchbinder <adam.buchbinder@gmail.com>
345Description: pdating wav magics (Closes: #508174).
346
347diff -Naurp file.orig/magic/Magdir/riff file/magic/Magdir/riff
348--- file.orig/magic/Magdir/riff 2008-12-05 17:28:11.000000000 -0500
349+++ file/magic/Magdir/riff 2008-12-05 17:33:48.000000000 -0500
350@@ -39,12 +39,14 @@
351 >>20 leshort 2 \b, Microsoft ADPCM
352 >>20 leshort 6 \b, ITU G.711 A-law
353 >>20 leshort 7 \b, ITU G.711 mu-law
354+>>20 leshort 8 \b, Microsoft DTS
355 >>20 leshort 17 \b, IMA ADPCM
356 >>20 leshort 20 \b, ITU G.723 ADPCM (Yamaha)
357 >>20 leshort 49 \b, GSM 6.10
358 >>20 leshort 64 \b, ITU G.721 ADPCM
359 >>20 leshort 80 \b, MPEG
360 >>20 leshort 85 \b, MPEG Layer 3
361+>>20 leshort 0x2001 \b, DTS
362 >>22 leshort =1 \b, mono
363 >>22 leshort =2 \b, stereo
364 >>22 leshort >2 \b, %d channels
365Author: Adam Buchbinder <adam.buchbinder@gmail.com>
366Description: Fixing false matches against Z-machine pattern. A particular MP3 file as well as a particular file from texlive-omega match the pattern for Z-machine games. Make the pattern a bit more restrictive to get rid of the false matches. (Closes: #499748)
367
368diff -Naurp file.orig/magic/Magdir/adventure file/magic/Magdir/adventure
369--- file.orig/magic/Magdir/adventure 2009-03-21 09:20:03.000000000 +0000
370+++ file/magic/Magdir/adventure 2009-03-21 09:27:01.000000000 +0000
371@@ -17,17 +17,23 @@
372 #------------------------------------------------------------------------------
373 # Z-machine: file(1) magic for Z-machine binaries.
374 #
375-# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which
376-# appears to be a version-0 Z-machine binary.
377+# Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
378 #
379-# The (false match) message is to correct that behavior. Perhaps it is
380-# not needed.
381+# The first byte is the Z-machine revision; it is always between 1 and 8. We
382+# had false matches (for instance, inbig5.ocp from the Omega TeX extension as
383+# well as an occasional MP3 file), so we sanity-check the version number.
384 #
385-16 belong&0xfe00f0f0 0x3030 Infocom game data
386->0 ubyte 0 (false match)
387->0 ubyte >0 (Z-machine %d,
388->>2 ubeshort x Release %d /
389->>18 string >\0 Serial %.6s)
390+# It might be possible to sanity-check the release number as well, as it seems
391+# (at least in classic Infocom games) to always be a relatively small number,
392+# always under 150 or so, but as this isn't rigorous, we'll wait on that until
393+# it becomes clear that it's needed.
394+#
395+0 ubyte >0
396+>0 ubyte <9
397+>>16 belong&0xfe00f0f0 0x3030 Infocom game data
398+>>>0 ubyte x (Z-machine %d,
399+>>>>2 ubeshort x Release %d /
400+>>>>18 string >\0 Serial %.6s)
401
402 #------------------------------------------------------------------------------
403 # Glulx: file(1) magic for Glulx binaries.
404Author: Adam Buchbinder <adam.buchbinder@gmail.com>
405Description:
406 The XWD magic is too simple--it just matches a single big-endian long at the
407 beginning of the file. This patch implements a few other checks
408 (Closes: #511764).
65ee9ebf 409
49c71311
AG		 410diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
411--- file.orig/magic/Magdir/images 2009-03-21 09:20:04.000000000 +0000
412+++ file/magic/Magdir/images 2009-03-21 09:34:29.000000000 +0000
413@@ -308,11 +308,20 @@
414 # As described in /usr/X11R6/include/X11/XWDFile.h
415 # used by the xwd program.
416 # Bradford Castalia, idaeim, 1/01
417-4 belong 7 XWD X Window Dump image data
418->100 string >\0 \b, "%s"
419->16 belong x \b, %dx
420->20 belong x \b%dx
421->12 belong x \b%d
422+# updated by Adam Buchbinder, 2/09
423+# The following assumes version 7 of the format; the first long is the length
424+# of the header, which is at least 25 4-byte longs, and the one at offset 8
425+# is a constant which is always either 1 or 2. Offset 12 is the pixmap depth,
426+# which is a maximum of 32.
427+0 belong >100
428+>8 belong <3
429+>>12 belong <33
430+>>>4 belong 7 XWD X Window Dump image data
431+!:mime image/x-xwindowdump
432+>>>>100 string >\0 \b, "%s"
433+>>>>16 belong x \b, %dx
434+>>>>20 belong x \b%dx
435+>>>>12 belong x \b%d
436
437 # PDS - Planetary Data System
438 # These files use Parameter Value Language in the header section.
439Author: Adam Buchbinder <adam.buchbinder@gmail.com>
440Description:
441 UTF-32BE text is detected by the presence of the Byte Order Mark, in UTF-32BE
442 encoding. The stock version of the BOM is incorrect; it should read 00 00 FE
443 FF, according to the Unicode FAQ: http://unicode.org/faq/utf_bom.html#bom4
444 (Closes: #513526).
445
446diff -Naurp file.orig/magic/Magdir/unicode file/magic/Magdir/unicode
447--- file.orig/magic/Magdir/unicode 2009-03-21 09:20:03.000000000 +0000
448+++ file/magic/Magdir/unicode 2009-03-21 17:02:09.000000000 +0000
449@@ -9,6 +9,6 @@
450 0 string +/v+ Unicode text, UTF-7
451 0 string +/v/ Unicode text, UTF-7
452 0 string \335\163\146\163 Unicode text, UTF-8-EBCDIC
453-0 string \376\377\000\000 Unicode text, UTF-32, big-endian
454+0 string \000\000\376\377 Unicode text, UTF-32, big-endian
455 0 string \377\376\000\000 Unicode text, UTF-32, little-endian
456 0 string \016\376\377 Unicode text, SCSU (Standard Compression Scheme for Unicode)
457Author: Adam Buchbinder <adam.buchbinder@gmail.com>
458Description: Updating magic for spectrum tap files (Closes: #501589).
459
460diff -Naurp file.orig/magic/Magdir/spectrum file/magic/Magdir/spectrum
461--- file.orig/magic/Magdir/spectrum 2009-03-21 09:20:03.000000000 +0000
462+++ file/magic/Magdir/spectrum 2009-03-21 17:24:09.000000000 +0000
463@@ -19,13 +19,17 @@
464 # Tape file. This assumes the .TAP starts with a Spectrum-format header,
465 # which nearly all will.
466 #
467-0 string \023\000\000 Spectrum .TAP data
468->4 string x "%-10.10s"
469->3 byte 0 - BASIC program
470->3 byte 1 - number array
471->3 byte 2 - character array
472->3 byte 3 - memory block
473->>14 belong 0x001B0040 (screen)
474+# Update: Sanity-check string contents to be printable.
475+# -Adam Buchbinder <adam.buchbinder@gmail.com>
476+#
477+0 string \023\000\000
478+>4 string >\0
479+>>4 string <\177 Spectrum .TAP data "%-10.10s"
480+>>>3 byte 0 - BASIC program
481+>>>3 byte 1 - number array
482+>>>3 byte 2 - character array
483+>>>3 byte 3 - memory block
484+>>>>14 belong 0x001B0040 (screen)
485
486 # The following three blocks are from pak21-spectrum@srcf.ucam.org
487 # TZX tape images
488Author: Daniel van Eeden <daniel_e@dds.nl>
489Description: New magic for PAR2 archive files (Closes: #294070).
490
491diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
492--- file.orig/magic/Magdir/archive 2008-02-28 18:57:34.000000000 +0000
493+++ file/magic/Magdir/archive 2008-04-07 08:05:47.000000000 +0000
b04ec308
JB		 494@@ -803,3 +803,6 @@
495 >24 belong 1 SHA-1 checksum
496 >24 belong 2 MD5 checksum
497
498+# Type: Parity Archive
499+# From: Daniel van Eeden <daniel_e@dds.nl>
500+0 string PAR2 Parity Archive Volume Set
49c71311
AG		 501Author: Simon Horman <horms@debian.org>
502Description: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
65ee9ebf 503
49c71311
AG		 504diff -Naurp file.org/magic/Magdir/images file/magic/Magdir/images
505--- file.org/magic/Magdir/images 2009-02-02 15:55:49.000000000 +0000
506+++ file/magic/Magdir/images 2009-02-18 11:28:44.000000000 +0000
507@@ -605,3 +605,8 @@
2adda200
AM		 508 # JPEG 2000 Code Stream Bitmap
509 # From Petr Splichal <psplicha@redhat.com>
510 0 string \xFF\x4F\xFF\x51\x00 JPEG-2000 Code Stream Bitmap data
511+
49c71311
AG		 512+# Type: Ulead Photo Explorer5 (.pe5)
513+# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
514+# From: Simon Horman <horms@debian.org>
515+0 string IIO2H Ulead Photo Explorer5
516Author: Edward Betts <edward@debian.org>
517Description: New magic for pmenu (Closes: #38543).
65ee9ebf 518
49c71311
AG		 519diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
520--- file.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000 +0000
521+++ file/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000
65ee9ebf
AM		 522@@ -55,3 +55,8 @@
523 0 string Zend\x00 PHP script Zend Optimizer data
524
525 0 string $! DCL command file
526+
527+# Type: Pdmenu
528+# URL: http://packages.debian.org/pdmenu
529+# From: Edward Betts <edward@debian.org>
530+0 string #!/usr/bin/pdmenu Pdmenu configuration file text
49c71311
AG		 531Author: Jelmer Vernooij <jelmer@samba.org>
532Description: New magic for Power-Tab
65ee9ebf 533
49c71311
AG		 534diff -Naurp file.orig/magic/Magdir/chord file/magic/Magdir/chord
535--- file.orig/magic/Magdir/chord 2008-02-19 17:27:28.000000000 +0000
536+++ file/magic/Magdir/chord 2009-02-18 11:42:42.000000000 +0000
65ee9ebf
AM		 537@@ -7,3 +7,8 @@
538 #
539 0 string {title Chord text file
540
541+# Type: PowerTab file format
542+# URL: http://www.power-tab.net/
543+# From: Jelmer Vernooij <jelmer@samba.org>
544+0 string ptab\003\000 Power-Tab v3 Tablature File
545+0 string ptab\004\000 Power-Tab v4 Tablature File
49c71311
AG		 546Author: Sven Hartge <debian@ds9.argh.org>
547Description: New magic for ScummVM savegame files (Closes: #263488).
65ee9ebf 548
49c71311
AG		 549diff -Naurp file.orig/magic/Magdir/console file/magic/Magdir/console
550--- file.orig/magic/Magdir/console 2007-09-26 20:22:31.000000000 +0000
551+++ file/magic/Magdir/console 2008-01-12 17:36:55.000000000 +0000
65ee9ebf
AM		 552@@ -252,3 +252,7 @@
553 # .w3m
554 0 string HM3W Warcraft III map file
555
556+# Type: scummVM savegame files
557+# From: Sven Hartge <debian@ds9.argh.org>
49c71311 558+0 string SCVM ScummVM savegame
65ee9ebf 559+>12 string >\0 "%s"
49c71311
AG		 560Author: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
561Description: New magic for SGF Smart Game Format
65ee9ebf
AM		 562
563diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
564--- file.orig/magic/Magdir/games 2008-04-23 19:00:59.000000000 +0000
565+++ file/magic/Magdir/games 2008-07-15 13:41:19.000000000 +0000
566@@ -243,3 +243,14 @@
567 >&0 string n\ NetImmerse game engine file
568 >>&0 regex [0-9a-z.]+ \b, version %s
569
570+# Type: SGF Smart Game Format
571+# URL: http://www.red-bean.com/sgf/
572+# From: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
573+2 regex/c \\(;.*GM\\[[0-9]{1,2}\\] Smart Game Format
574+>2 regex/c GM\\[1\\] - Go Game
575+>2 regex/c GM\\[6\\] - BackGammon Game
576+>2 regex/c GM\\[11\\] - Hex Game
577+>2 regex/c GM\\[18\\] - Amazons Game
578+>2 regex/c GM\\[19\\] - Octi Game
579+>2 regex/c GM\\[20\\] - Gess Game
580+>2 regex/c GM\\[21\\] - twix Game
49c71311
AG		 581Author: Ralph Amissah <ralph.amissah@gmail.com>
582Description: New magic for SiSU Markup Language.
65ee9ebf 583
49c71311
AG		 584diff -Naurp file.orig/magic/Magdir/sisu file/magic/Magdir/sisu
585--- file.orig/magic/Magdir/sisu 1970-01-01 00:00:00.000000000 +0000
586+++ file/magic/Magdir/sisu 2008-04-07 08:10:25.000000000 +0000
65ee9ebf
AM		 587@@ -0,0 +1,18 @@
588+# Type: SiSU Markup Language
589+# URL: http://www.sisudoc.org/
590+# From: Ralph Amissah <ralph.amissah@gmail.com>
591+
592+0 regex \^%?[\ \t]*SiSU[\ \t]+insert SiSU text insert
593+>5 regex [0-9.]+ %s
594+
595+0 regex \^%[\ \t]+SiSU[\ \t]+master SiSU text master
596+>5 regex [0-9.]+ %s
597+
598+0 regex \^%?[\ \t]*SiSU[\ \t]+text SiSU text
599+>5 regex [0-9.]+ %s
600+
601+0 regex \^%?[\ \t]*SiSU[\ \t][0-9.]+ SiSU text
602+>5 regex [0-9.]+ %s
603+
604+0 regex \^%*[\ \t]*sisu-[0-9.]+ SiSU text
605+>5 regex [0-9.]+ %s
49c71311
AG		 606diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
607--- file.orig/magic/Makefile.am 2008-03-22 21:41:00.000000000 +0000
608+++ file/magic/Makefile.am 2008-04-07 08:11:04.000000000 +0000
65ee9ebf
AM		 609@@ -170,6 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
610 $(MAGIC_FRAGMENT_DIR)/sgml \
611 $(MAGIC_FRAGMENT_DIR)/sharc \
612 $(MAGIC_FRAGMENT_DIR)/sinclair \
613+$(MAGIC_FRAGMENT_DIR)/sisu \
614 $(MAGIC_FRAGMENT_DIR)/sketch \
615 $(MAGIC_FRAGMENT_DIR)/smalltalk \
616 $(MAGIC_FRAGMENT_DIR)/sniffer \
49c71311
AG		 617diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
618--- file.orig/magic/Makefile.in 2008-03-22 21:41:06.000000000 +0000
619+++ file/magic/Makefile.in 2008-04-07 08:11:10.000000000 +0000
65ee9ebf
AM		 620@@ -330,6 +330,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
621 $(MAGIC_FRAGMENT_DIR)/sgml \
622 $(MAGIC_FRAGMENT_DIR)/sharc \
623 $(MAGIC_FRAGMENT_DIR)/sinclair \
624+$(MAGIC_FRAGMENT_DIR)/sisu \
625 $(MAGIC_FRAGMENT_DIR)/sketch \
626 $(MAGIC_FRAGMENT_DIR)/smalltalk \
627 $(MAGIC_FRAGMENT_DIR)/sniffer \
49c71311
AG		 628Author: Josh Triplett <josh@freedesktop.org>
629Description: New magic for SNES SPC700 sound files (Closes: #410847).
65ee9ebf 630
49c71311
AG		 631diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
632--- file.orig/magic/Magdir/audio 2008-11-07 15:44:13.000000000 +0000
633+++ file/magic/Magdir/audio 2009-02-18 11:43:50.000000000 +0000
634@@ -306,6 +306,15 @@
65ee9ebf
AM		 635 >122 byte&0x1 =1 PAL
636 >122 byte&0x1 =0 NTSC
637
638+# Type: SNES SPC700 sound files
639+# From: Josh Triplett <josh@freedesktop.org>
640+0 string SNES-SPC700\ Sound\ File\ Data\ v SNES SPC700 sound file
641+>&0 string 0.30 \b, version %s
642+>>0x23 byte 0x1B \b, without ID666 tag
643+>>0x23 byte 0x1A \b, with ID666 tag
644+>>>0x2E string >\0 \b, song "%.32s"
645+>>>0x4E string >\0 \b, game "%.32s"
646+
647 # Impulse tracker module (audio/x-it)
648 0 string IMPM Impulse Tracker module sound data -
49c71311
AG		 649 !:mime audio/x-mod
650Author: Nicolas Collignon <tsointsoin@gmail.com>
651Description: New magic for OpenSSH key files (Closes: #439537).
65ee9ebf 652
49c71311
AG		 653diff -Naurp file.orig/magic/Magdir/ssh file/magic/Magdir/ssh
654--- file.orig/magic/Magdir/ssh 1970-01-01 00:00:00.000000000 +0000
655+++ file/magic/Magdir/ssh 2009-02-18 11:50:34.000000000 +0000
65ee9ebf 656@@ -0,0 +1,8 @@
49c71311
AG		 657+# Type: OpenSSH key files
658+# From: Nicolas Collignon <tsointsoin@gmail.com>
65ee9ebf
AM		 659+
660+0 string SSH\ PRIVATE\ KEY OpenSSH RSA1 private key,
661+>28 string >\0 version %s
662+
663+0 string ssh-dss\ OpenSSH DSA public key
664+0 string ssh-rsa\ OpenSSH RSA public key
49c71311
AG		 665diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
666--- file.orig/magic/Makefile.am 2009-02-18 11:49:05.000000000 +0000
667+++ file/magic/Makefile.am 2009-02-18 11:51:14.000000000 +0000
668@@ -183,6 +183,7 @@ $(MAGIC_FRAGMENT_DIR)/softquad \
669 $(MAGIC_FRAGMENT_DIR)/spec \
670 $(MAGIC_FRAGMENT_DIR)/spectrum \
671 $(MAGIC_FRAGMENT_DIR)/sql \
672+$(MAGIC_FRAGMENT_DIR)/ssh \
673 $(MAGIC_FRAGMENT_DIR)/sun \
674 $(MAGIC_FRAGMENT_DIR)/sysex \
675 $(MAGIC_FRAGMENT_DIR)/teapot \
676diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
677--- file.orig/magic/Makefile.in 2009-02-18 11:49:05.000000000 +0000
678+++ file/magic/Makefile.in 2009-02-18 11:51:20.000000000 +0000
679@@ -345,6 +345,7 @@ $(MAGIC_FRAGMENT_DIR)/softquad \
680 $(MAGIC_FRAGMENT_DIR)/spec \
681 $(MAGIC_FRAGMENT_DIR)/spectrum \
682 $(MAGIC_FRAGMENT_DIR)/sql \
683+$(MAGIC_FRAGMENT_DIR)/ssh \
684 $(MAGIC_FRAGMENT_DIR)/sun \
685 $(MAGIC_FRAGMENT_DIR)/sysex \
686 $(MAGIC_FRAGMENT_DIR)/teapot \
687Author: Nicolas Collignon <tsointsoin@gmail.com>
688Description: New magic for OpenSSL certificates/key files (Closes: #439537).
689
690diff -Naurp file.orig/magic/Magdir/ssl file/magic/Magdir/ssl
691--- file.orig/magic/Magdir/ssl 1970-01-01 00:00:00.000000000 +0000
692+++ file/magic/Magdir/ssl 2009-02-18 11:53:12.000000000 +0000
65ee9ebf
AM		 693@@ -0,0 +1,7 @@
694+# Type: OpenSSL certificates/key files
695+# From: Nicolas Collignon <tsointsoin@gmail.com>
696+
697+0 string -----BEGIN\ CERTIFICATE----- PEM certificate
698+0 string -----BEGIN\ CERTIFICATE\ REQ PEM certificate request
699+0 string -----BEGIN\ RSA\ PRIVATE PEM RSA private key
700+0 string -----BEGIN\ DSA\ PRIVATE PEM DSA private key
49c71311
AG		 701diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
702--- file.orig/magic/Makefile.am 2009-02-18 11:52:50.000000000 +0000
703+++ file/magic/Makefile.am 2009-02-18 11:53:27.000000000 +0000
704@@ -184,6 +184,7 @@ $(MAGIC_FRAGMENT_DIR)/spec \
705 $(MAGIC_FRAGMENT_DIR)/spectrum \
706 $(MAGIC_FRAGMENT_DIR)/sql \
707 $(MAGIC_FRAGMENT_DIR)/ssh \
708+$(MAGIC_FRAGMENT_DIR)/ssl \
709 $(MAGIC_FRAGMENT_DIR)/sun \
710 $(MAGIC_FRAGMENT_DIR)/sysex \
711 $(MAGIC_FRAGMENT_DIR)/teapot \
712diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
713--- file.orig/magic/Makefile.in 2009-02-18 11:52:50.000000000 +0000
714+++ file/magic/Makefile.in 2009-02-18 11:53:31.000000000 +0000
715@@ -346,6 +346,7 @@ $(MAGIC_FRAGMENT_DIR)/spec \
716 $(MAGIC_FRAGMENT_DIR)/spectrum \
717 $(MAGIC_FRAGMENT_DIR)/sql \
718 $(MAGIC_FRAGMENT_DIR)/ssh \
719+$(MAGIC_FRAGMENT_DIR)/ssl \
720 $(MAGIC_FRAGMENT_DIR)/sun \
721 $(MAGIC_FRAGMENT_DIR)/sysex \
722 $(MAGIC_FRAGMENT_DIR)/teapot \
723Author: Michael Piefel <piefel@debian.org>
724Description: New magic for SVN dumps (closes: #256652).
65ee9ebf 725
49c71311
AG		 726diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
727--- file.orig/magic/Magdir/revision 2008-02-19 17:27:33.000000000 +0000
728+++ file/magic/Magdir/revision 2009-02-18 11:54:35.000000000 +0000
65ee9ebf
AM		 729@@ -17,3 +17,8 @@
730 0 string HG10 Mercurial bundle,
731 >4 string UN uncompressed
732 >4 string BZ bzip2 compressed
733+
734+# Type: Subversion (SVN) dumps
735+# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
736+0 string SVN-fs-dump-format-version: Subversion dumpfile
737+>28 string >\0 (version: %s)
49c71311
AG		 738Author: Mario Lang <mlang@debian.org>
739Description: Adds new magic for SuperCollider 3 Synth Definition File Format (Closes: #284803).
65ee9ebf 740
49c71311
AG		 741diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
742--- file.orig/magic/Magdir/audio 2008-01-12 17:39:01.000000000 +0000
743+++ file/magic/Magdir/audio 2008-01-12 17:38:49.000000000 +0000
65ee9ebf
AM		 744@@ -576,3 +576,8 @@
745 # URL: http://filext.com/detaillist.php?extdetail=AMR
746 # From: Russell Coker <russell@coker.com.au>
747 0 string #!AMR Adaptive Multi-Rate Codec (GSM telephony)
748+
749+# Type: SuperCollider 3 Synth Definition File Format
750+# From: Mario Lang <mlang@debian.org>
751+0 string SCgf SuperCollider3 Synth Definition file,
752+>4 belong x version %d
49c71311
AG		 753Author: Radek Vokal <rvokal@redhat.com>
754Description: xen patch, recognizes Xen saved domain
65ee9ebf 755
49c71311
AG		 756diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
757--- file.orig/magic/Magdir/linux 2008-01-12 17:47:04.000000000 +0000
758+++ file/magic/Magdir/linux 2008-01-12 17:46:42.000000000 +0000
65ee9ebf
AM		 759@@ -248,3 +248,9 @@
760 >72 string x %s]
761 >168 string x UUID: %s
762
763+# Type: Xen, the virtual machine monitor
764+# From: Radek Vokal <rvokal@redhat.com>
765+0 string LinuxGuestRecord Xen saved domain
766+#>2 regex \(name\ [^)]*\) %s
767+>20 search/256 (name (name
768+>>&1 string x %s...)
49c71311
AG		 769Author: Mathias Brodala <info@noctus.net>
770Description: New magic for X11 cursor files (Closes: #451246).
65ee9ebf 771
49c71311
AG		 772diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
773--- file.orig/magic/Magdir/images 2009-02-18 11:38:10.000000000 +0000
774+++ file/magic/Magdir/images 2009-02-18 11:39:22.000000000 +0000
775@@ -610,3 +610,8 @@
776 # URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
777 # From: Simon Horman <horms@debian.org>
778 0 string IIO2H Ulead Photo Explorer5
65ee9ebf 779+
49c71311
AG		 780+# Type: X11 cursor
781+# URL: http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
782+# From: Mathias Brodala <info@noctus.net>
783+0 string Xcur X11 cursor
784Author: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
785Description: New magic for Freemind (Closes: #472385).
65ee9ebf
AM		 786
787diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
788--- file.orig/magic/Magdir/wordprocessors 2008-05-04 14:12:49.000000000 +0000
789+++ file/magic/Magdir/wordprocessors 2008-05-04 14:18:38.000000000 +0000
790@@ -148,3 +148,8 @@
791 0 string DOC
792 >43 byte 0x16 Just System Word Processor Ichitaro v6
793 !:mime application/x-ichitaro6
794+
795+# Type: Freemind mindmap documents
796+# From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
797+0 string/cB \<map\ version Freemind document
798+!:mime application/x-freemind
49c71311
AG		 799Author: Benoit Sibaud <bsibaud@april.org>
800Description: New magic for QDBM Quick Database Manager (Closes: #481717).
801
802diff -Naurp file.orig/magic/Magdir/database file/magic/Magdir/database
803--- file.orig/magic/Magdir/database 2009-05-03 00:07:11.000000000 +0000
804+++ file/magic/Magdir/database 2009-05-03 08:21:15.000000000 +0000
805@@ -267,3 +267,8 @@
806 >40 lequad x \b, bnum=%lld
807 >48 lequad x \b, rnum=%lld
808 >56 lequad x \b, fsiz=%lld
65ee9ebf
AM		 809+
810+# Type: QDBM Quick Database Manager
811+# From: Benoit Sibaud <bsibaud@april.org>
49c71311
AG		 812+0 string \\[depot\\]\n\f Quick Database Manager, little endian
813+0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
814Author: Benoit Sibaud <bsibaud@april.org>
815Description: New magic for TokyoCabinet database (Closes: #481768).
816
817diff -Naurp file.orig/magic/Magdir/database file/magic/Magdir/database
818--- file.orig/magic/Magdir/database 2009-05-03 08:22:43.000000000 +0000
819+++ file/magic/Magdir/database 2009-05-03 08:23:25.000000000 +0000
820@@ -272,3 +272,9 @@
65ee9ebf 821 # From: Benoit Sibaud <bsibaud@april.org>
49c71311
AG		 822 0 string \\[depot\\]\n\f Quick Database Manager, little endian
823 0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
65ee9ebf
AM		 824+
825+# Type: TokyoCabinet database
826+# URL: http://tokyocabinet.sourceforge.net/
827+# From: Benoit Sibaud <bsibaud@april.org>
49c71311
AG		 828+0 string ToKyO\ CaBiNeT\n TokyoCabinet database
829+>14 string x (version %s)
830Author: Werner Fink <werner@suse.de>
831Description: Adds new magic for CROM filesystem.
65ee9ebf
AM		 832
833diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
834--- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000
835+++ file/magic/Magdir/filesystems 2008-07-15 13:43:26.000000000 +0000
836@@ -1327,3 +1327,15 @@
837 # dvdisaster's .ecc
838 # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
839 0 string *dvdisaster* dvdisaster error correction file
840+
841+# Type: CROM filesystem
842+# From: Werner Fink <werner@suse.de>
843+0 string CROMFS CROMFS
844+>6 string >\0 \b version %2.2s,
845+>8 ulequad >0 \b block data at %lld,
846+>16 ulequad >0 \b fblock table at %lld,
847+>24 ulequad >0 \b inode table at %lld,
848+>32 ulequad >0 \b root at %lld,
849+>40 ulelong >0 \b fblock size = %ld,
850+>44 ulelong >0 \b block size = %ld,
851+>48 ulequad >0 \b bytes = %lld
49c71311
AG		 852Author: Werner Fink <werner@suse.de>
853Description: Adds new magics for Scribus.
65ee9ebf 854
49c71311
AG		 855diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
856--- file.orig/magic/Magdir/wordprocessors 2008-05-21 09:49:43.000000000 +0000
857+++ file/magic/Magdir/wordprocessors 2008-05-21 09:50:54.000000000 +0000
65ee9ebf
AM		 858@@ -153,3 +153,9 @@
859 # From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
860 0 string/cB \<map\ version Freemind document
861 !:mime application/x-freemind
862+
863+# Type: Scribus
864+# From: Werner Fink <werner@suse.de>
865+0 string \<SCRIBUSUTF8\ Version Scribus Document
866+0 string \<SCRIBUSUTF8NEW\ Version Scribus Document
867+!:mime application/x-scribus
49c71311
AG		 868Author: Russell Coker <russell@coker.com.au>
869Description: Adds new magics for SE Linux (Closes: #485886).
65ee9ebf
AM		 870
871diff -Naurp file.orig/magic/Magdir/selinux file/magic/Magdir/selinux
872--- file.orig/magic/Magdir/selinux 1970-01-01 01:00:00.000000000 +0100
873+++ file/magic/Magdir/selinux 2008-06-13 09:07:24.000000000 +0200
874@@ -0,0 +1,24 @@
875+# Type: SE Linux policy modules *.pp reference policy
876+# for Fedora 5 to 9, RHEL5, and Debian Etch and Lenny.
877+# URL: http://doc.coker.com.au/computers/selinux-magic
878+# From: Russell Coker <russell@coker.com.au>
879+
880+0 lelong 0xf97cff8f SE Linux modular policy
881+>4 lelong x version %d,
882+>8 lelong x %d sections,
883+>>(12.l) lelong 0xf97cff8d
884+>>>(12.l+27) lelong x mod version %d,
885+>>>(12.l+31) lelong 0 Not MLS,
886+>>>(12.l+31) lelong 1 MLS,
887+>>>(12.l+23) lelong 2
888+>>>>(12.l+47) string >\0 module name %s
889+>>>(12.l+23) lelong 1 base
890+
891+1 string policy_module( SE Linux policy module source
892+2 string policy_module( SE Linux policy module source
893+
894+0 string ##\ <summary> SE Linux policy interface source
895+
896+#0 search gen_context( SE Linux policy file contexts
897+
898+#0 search gen_sens( SE Linux policy MLS constraints source
899diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
900--- file.orig/magic/Makefile.am 2008-06-13 09:07:45.000000000 +0200
901+++ file/magic/Makefile.am 2008-06-13 09:08:16.000000000 +0200
902@@ -164,6 +164,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
903 $(MAGIC_FRAGMENT_DIR)/sccs \
904 $(MAGIC_FRAGMENT_DIR)/scientific \
905 $(MAGIC_FRAGMENT_DIR)/securitycerts \
906+$(MAGIC_FRAGMENT_DIR)/selinux \
907 $(MAGIC_FRAGMENT_DIR)/sendmail \
908 $(MAGIC_FRAGMENT_DIR)/sequent \
909 $(MAGIC_FRAGMENT_DIR)/sgi \
910diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
911--- file.orig/magic/Makefile.in 2008-06-13 09:07:45.000000000 +0200
912+++ file/magic/Makefile.in 2008-06-13 09:08:23.000000000 +0200
913@@ -324,6 +324,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
914 $(MAGIC_FRAGMENT_DIR)/sccs \
915 $(MAGIC_FRAGMENT_DIR)/scientific \
916 $(MAGIC_FRAGMENT_DIR)/securitycerts \
917+$(MAGIC_FRAGMENT_DIR)/selinux \
918 $(MAGIC_FRAGMENT_DIR)/sendmail \
919 $(MAGIC_FRAGMENT_DIR)/sequent \
920 $(MAGIC_FRAGMENT_DIR)/sgi \
49c71311
AG		 921Author: Jelmer Vernooij <jelmer@samba.org>
922Description: Adds new magics for bzr (Closes: #488742).
65ee9ebf
AM		 923
924diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
925--- file.orig/magic/Magdir/revision 2008-07-01 15:42:16.000000000 +0200
926+++ file/magic/Magdir/revision 2008-07-01 15:43:34.000000000 +0200
927@@ -22,3 +22,9 @@
928 # From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
929 0 string SVN-fs-dump-format-version: Subversion dumpfile
930 >28 string >\0 (version: %s)
931+
932+# Type: Bazaar revision bundles and merge requests
933+# URL: http://www.bazaar-vcs.org/
934+# From: Jelmer Vernooij <jelmer@samba.org>
935+0 string #\ Bazaar\ revision\ bundle\ v Bazaar Bundle
936+0 string #\ Bazaar\ merge\ directive\ format Bazaar merge directive
49c71311
AG		 937Author: Adam Buchbinder <adam.buchbinder@gmail.com>
938Description:
939 Add detection for git packs and indexes, making sure it doesn't clash with id
940 Software PACK files (Closes: #509942).
941
942diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
943--- file.orig/magic/Magdir/games 2009-03-21 09:20:03.000000000 +0000
944+++ file/magic/Magdir/games 2009-03-21 17:13:30.000000000 +0000
945@@ -33,6 +33,7 @@
946 # Quake
947
948 0 string PACK Quake I or II world or extension
949+>8 lelong >0 \b, %d entries
950
951 #0 string -1\x0a Quake I demo
952 #>30 string x version %.4s
953diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
954--- file.orig/magic/Magdir/revision 2009-03-21 09:20:03.000000000 +0000
955+++ file/magic/Magdir/revision 2009-03-21 17:13:30.000000000 +0000
956@@ -12,6 +12,21 @@
957 # From: Josh Triplett <josh@freedesktop.org>
958 0 string #\ v2\ git\ bundle\n Git bundle
959
960+# Type: Git pack
961+# From: Adam Buchbinder <adam.buchbinder@gmail.com>
962+# The actual magic is 'PACK', but that clashes with Doom/Quake packs. However,
963+# those have a little-endian offset immediately following the magic 'PACK',
964+# the first byte of which is never 0, while the first byte of the Git pack
965+# version, since it's a tiny number stored in big-endian format, is always 0.
966+0 string PACK\0 Git pack
967+>4 belong >0 \b, version %d
968+>>8 belong >0 \b, %d objects
969+
970+# Type: Git pack index
971+# From: Adam Buchbinder <adam.buchbinder@gmail.com>
972+0 string \377tOc Git pack index
973+>4 belong =2 \b, version 2
974+
975 # Type: Mercurial bundles
976 # From: Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
977 0 string HG10 Mercurial bundle,
978Author: Daniel Baumann <daniel@debian.org>
979Description: Reverting upstream change of stopping to build plain magic file (Closes: #481247).
980
981diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
982--- file.orig/magic/Makefile.am 2009-05-03 00:07:11.000000000 +0000
983+++ file/magic/Makefile.am 2009-05-03 08:51:56.000000000 +0000
984@@ -4,7 +4,7 @@
985 MAGIC_FRAGMENT_BASE = Magdir
986 MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
987
988-pkgdata_DATA = magic.mgc
989+pkgdata_DATA = magic.mgc magic
990
991 EXTRA_DIST = Header Localstuff \
992 $(MAGIC_FRAGMENT_DIR)/acorn \
993@@ -220,8 +220,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
994 $(MAGIC_FRAGMENT_DIR)/zilog \
995 $(MAGIC_FRAGMENT_DIR)/zyxel
996
997+RAW = magic
998 MAGIC = magic.mgc
999-CLEANFILES = ${MAGIC}
1000+CLEANFILES = ${MAGIC} ${RAW}
1001+
1002+${RAW}: Header Localstuff $(EXTRA_DIST)
1003+ cat /dev/null > $@
1004+ for frag in $(EXTRA_DIST); do \
1005+ if test -f $(srcdir)/$$frag; then \
1006+ f=$(srcdir)/$$frag; \
1007+ else \
1008+ f=$$frag; \
1009+ fi; \
1010+ cat $$f; \
1011+ done >> $@
1012
1013 # FIXME: Build file natively as well so that it can be used to compile
1014 # the target's magic file
1015@@ -233,6 +245,5 @@ FILE_COMPILE = $(top_builddir)/src/file
1016 FILE_COMPILE_DEP = $(FILE_COMPILE)
1017 endif
1018
1019-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
1020- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
1021- @mv $(MAGIC_FRAGMENT_BASE).mgc $@
1022+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
1023+ $(FILE_COMPILE) -C -m $(RAW)
1024diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
1025--- file.orig/magic/Makefile.in 2009-05-03 00:07:11.000000000 +0000
1026+++ file/magic/Makefile.in 2009-05-03 08:55:09.000000000 +0000
1027@@ -170,7 +170,7 @@ top_srcdir = @top_srcdir@
1028 #
1029 MAGIC_FRAGMENT_BASE = Magdir
1030 MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
1031-pkgdata_DATA = magic.mgc
1032+pkgdata_DATA = magic.mgc magic
1033 EXTRA_DIST = Header Localstuff \
1034 $(MAGIC_FRAGMENT_DIR)/acorn \
1035 $(MAGIC_FRAGMENT_DIR)/adi \
1036@@ -385,8 +385,21 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
1037 $(MAGIC_FRAGMENT_DIR)/zilog \
1038 $(MAGIC_FRAGMENT_DIR)/zyxel
1039
1040+RAW = magic
1041 MAGIC = magic.mgc
1042-CLEANFILES = ${MAGIC}
1043+CLEANFILES = ${MAGIC} ${RAW}
1044+
1045+${RAW}: Header Localstuff $(EXTRA_DIST)
1046+ cat /dev/null > $@
1047+ for frag in $(EXTRA_DIST); do \
1048+ if test -f $(srcdir)/$$frag; then \
1049+ f=$(srcdir)/$$frag; \
1050+ else \
1051+ f=$$frag; \
1052+ fi; \
1053+ cat $$f; \
1054+ done >> $@
1055+
1056 @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
1057
1058 # FIXME: Build file natively as well so that it can be used to compile
1059@@ -582,10 +595,8 @@ uninstall-am: uninstall-pkgdataDATA
1060 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1061 uninstall uninstall-am uninstall-pkgdataDATA
1062
1063-
1064-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
1065- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
1066- @mv $(MAGIC_FRAGMENT_BASE).mgc $@
1067+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
1068+ $(FILE_COMPILE) -C -m $(RAW)
1069 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1070 # Otherwise a system limit (for SysV at least) may be exceeded.
1071 .NOEXPORT:
1072Author: Michael Piefel <piefel@debian.org>
1073Description: No longer includes Localstuff in /usr/share/misc/magic. Local definitions should go to /etc/magic.
1074
1075diff -Naurp file.orig/magic/Header file/magic/Header
1076--- file.orig/magic/Header 2000-08-05 17:36:46.000000000 +0000
1077+++ file/magic/Header 2008-09-08 11:53:44.000000000 +0000
1078@@ -1,5 +1,5 @@
1079-# Magic
1080 # Magic data for file(1) command.
1081-# Machine-generated from src/cmd/file/magdir/*; edit there only!
1082-# Format is described in magic(files), where:
1083-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
1084+# Format is described in magic(5).
1085+# Don't edit this file, edit /etc/magic or send your suggested inclusions to
1086+# this file as a wishlist bug against file (using the reportbug utility).
1087+
1088diff -Naurp file.orig/magic/magic.local file/magic/magic.local
1089--- file.orig/magic/magic.local 1970-01-01 00:00:00.000000000 +0000
1090+++ file/magic/magic.local 2008-09-08 11:53:44.000000000 +0000
1091@@ -0,0 +1,3 @@
1092+# Magic local data for file(1) command.
1093+# Insert here your local magic data. Format is described in magic(5).
1094+
1095diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
1096--- file.orig/src/Makefile.am 2008-07-15 17:10:47.000000000 +0000
1097+++ file/src/Makefile.am 2008-09-08 11:52:51.000000000 +0000
1098@@ -4,7 +4,7 @@ include_HEADERS = magic.h
1099
1100 bin_PROGRAMS = file
1101
1102-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
1103+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
1104 AM_CFLAGS = @WARNINGS@
1105
1106 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
1107diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
1108--- file.orig/src/Makefile.in 2008-08-30 10:01:42.000000000 +0000
1109+++ file/src/Makefile.in 2008-09-08 11:53:21.000000000 +0000
1110@@ -198,7 +198,7 @@ top_srcdir = @top_srcdir@
1111 MAGIC = $(pkgdatadir)/magic
1112 lib_LTLIBRARIES = libmagic.la
1113 include_HEADERS = magic.h
1114-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
1115+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
1116 AM_CFLAGS = @WARNINGS@
1117 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
1118 compress.c is_tar.c readelf.c print.c fsmagic.c \
1119Author: Michael Piefel <piefel@debian.org>
1120Description: n/a
1121
1122diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
1123--- file.orig/src/Makefile.in 2008-01-12 17:55:24.000000000 +0000
1124+++ file/src/Makefile.in 2008-01-12 17:56:46.000000000 +0000
1125@@ -300,7 +300,7 @@ clean-binPROGRAMS:
1126 done
1127 file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES)
1128 @rm -f file$(EXEEXT)
1129- $(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
1130+ $(LINK) $(file_OBJECTS) $(file_LDADD)
1131
1132 mostlyclean-compile:
1133 -rm -f *.$(OBJEXT)
1134Author: Michael Casadevall <sonicmctails@gmail.com>
1135Description: Fixes a FTBFS on hurd (Closes: #433716).
1136
1137diff -Naur file.orig/src/magic.c file/src/magic.c
1138--- file.orig/src/magic.c 2007-03-26 17:59:50.000000000 +0000
1139+++ file/src/magic.c 2007-07-19 06:25:16.000000000 +0000
1140@@ -58,6 +58,11 @@
1141 #include <locale.h>
1142 #endif
1143
1144+#ifndef PIPE_BUF
1145+// Get the PIPE_BUF from pathconf
1146+#define PIPE_BUF pathconf(".", _PC_PIPE_BUF)
1147+#endif
1148+
1149 #include <netinet/in.h> /* for byte swapping */
1150
1151 #include "patchlevel.h"
1152Author: Michael Piefel <piefel@debian.org>
1153Description: FIXME, and #417511.
1154
1155diff -Naurp file.orig/doc/file.man file/doc/file.man
1156--- file.orig/doc/file.man 2008-11-06 23:18:35.000000000 +0000
1157+++ file/doc/file.man 2009-02-18 12:28:42.000000000 +0000
1158@@ -51,7 +51,7 @@ meaning anything else (data is usually
1159 or non-printable).
1160 Exceptions are well-known file formats (core files, tar archives)
1161 that are known to contain binary data.
1162-When modifying magic files or the program itself, make sure to
1163+When adding local definitions to /etc/magic, make sure to
1164 .Em "preserve these keywords" .
1165 Users depend on knowing that all the readable files in a directory
1166 have the word
1167@@ -95,7 +95,8 @@ The concept of a
1168 has been applied by extension to data files.
1169 Any file with some invariant identifier at a small fixed
1170 offset into the file can usually be described in this way.
1171-The information identifying these files is read from the compiled
1172+The information identifying these files is read from /etc/magic
1173+and the the compiled
1174 magic file
1175 .Pa __MAGIC__.mgc ,
1176 or the files in the directory
1177@@ -325,6 +326,11 @@ will not attempt to open
1178 adds
1179 .Sq .mgc
1180 to the value of this variable as appropriate.
1181+However,
1182+.Pa file
1183+has to exist in order for
1184+.Pa file.mime
1185+to be considered.
1186 The environment variable
1187 .Dv POSIXLY_CORRECT
1188 controls (on systems that support symbolic links), whether
1189@@ -400,12 +406,6 @@ will be distributed periodically.
1190 The order of entries in the magic file is significant.
1191 Depending on what system you are using, the order that
1192 they are put together may be incorrect.
1193-If your old
1194-.Nm
1195-command uses a magic file,
1196-keep the old magic file around for comparison purposes
1197-(rename it to
1198-.Pa __MAGIC__.orig ).
1199 .Sh EXAMPLES
1200 .Bd -literal -offset indent
1201 $ file file.c file /dev/{wd0a,hda}
1202@@ -547,3 +547,8 @@ on
1203 .Dv ftp.astron.com
1204 in the directory
1205 .Dv /pub/file/file-X.YZ.tar.gz
1206+.Pp
1207+This Debian version adds a number of new magic entries. It can be
1208+obtained from every site carrying a Debian distribution (that is
1209+.Dv ftp.debian.org
1210+and mirrors).
1211Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1212Description:
1213 A spacing error causes a reference to the hexdump manpage to show up as
1214 "hexdump(1,)" rather than "hexdump(1),"; this patch fixes it (Closes: #515761).
1215
1216diff -Naurp file.orig/doc/file.man file/doc/file.man
1217--- file.orig/doc/file.man 2009-03-21 09:20:04.000000000 +0000
1218+++ file/doc/file.man 2009-03-21 16:57:49.000000000 +0000
1219@@ -341,7 +341,7 @@ options.
1220 .Xr magic __FSECTION__ ,
1221 .Xr strings 1 ,
1222 .Xr od 1 ,
1223-.Xr hexdump 1,
1224+.Xr hexdump 1 ,
1225 .Xr file 1posix
1226 .Sh STANDARDS CONFORMANCE
1227 This program is believed to exceed the System V Interface Definition
1228Author: Michael Piefel <piefel@debian.org>
1229Description: Needs to be broken out (FIXME).
1230
1231diff -Naurp file.orig/src/fsmagic.c file/src/fsmagic.c
1232--- file.orig/src/fsmagic.c 2008-02-14 20:14:52.000000000 +0000
1233+++ file/src/fsmagic.c 2008-04-07 08:32:13.000000000 +0000
1234@@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
1235 if (file_printf(ms, "cannot open `%s' (%s)",
1236 fn, strerror(errno)) == -1)
1237 return -1;
1238- return 1;
1239+ ms->event_flags |= EVENT_HAD_ERR;
1240+ return -1;
1241 }
1242
1243 if (mime) {
A utility for determining file types
This page took 0.187781 seconds and 4 git commands to generate.